1008 files changed, 51331 insertions, 25870 deletions

diff --git a/.htaccess b/.htaccess
index f4b5a241d..481bd091a 100644
--- a/.htaccess
+++ b/.htaccess
@@ -31,7 +31,8 @@ RewriteEngine On
 RewriteRule ^favicon\.ico$ skins/larry/images/favicon.ico
 # security rules
 RewriteRule .git - [F]
-RewriteRule ^/?(README(.md)?|INSTALL|LICENSE|SQL|bin|CHANGELOG|UPGRADING)$ - [F]
+RewriteRule ^/?(README(.md)?|INSTALL|LICENSE|CHANGELOG|UPGRADING)$ - [F]
+RewriteRule ^/?(SQL|bin) - [F]
 </IfModule>
 
 <IfModule mod_deflate.c>
diff --git a/.tx/config b/.tx/config
new file mode 100644
index 000000000..31c1eabdf
--- /dev/null
+++ b/.tx/config
@@ -0,0 +1,85 @@
+[main]
+host = https://www.transifex.com
+lang_map = be: be_BE, sr: sr_CS, fa: fa_AF
+type = PHP_ALT_ARRAY
+
+[roundcube-webmail.labels]
+file_filter = program/localization/<lang>/labels.inc
+source_file = program/localization/en_US/labels.inc
+source_lang = en_US
+
+[roundcube-webmail.messages]
+file_filter = program/localization/<lang>/messages.inc
+source_file = program/localization/en_US/messages.inc
+source_lang = en_US
+
+[roundcube-webmail.plugin-acl]
+file_filter = plugins/acl/localization/<lang>.inc
+source_file = plugins/acl/localization/en_US.inc
+source_lang = en_US
+
+[roundcube-webmail.plugin-archive]
+file_filter = plugins/archive/localization/<lang>.inc
+source_file = plugins/archive/localization/en_US.inc
+source_lang = en_US
+
+[roundcube-webmail.plugin-attachment_reminder]
+file_filter = plugins/attachment_reminder/localization/<lang>.inc
+source_file = plugins/attachment_reminder/localization/en_US.inc
+source_lang = en_US
+
+[roundcube-webmail.plugin-help]
+file_filter = plugins/help/localization/<lang>.inc
+source_file = plugins/help/localization/en_US.inc
+source_lang = en_US
+
+[roundcube-webmail.plugin-hide_blockquote]
+file_filter = plugins/hide_blockquote/localization/<lang>.inc
+source_file = plugins/hide_blockquote/localization/en_US.inc
+source_lang = en_US
+
+[roundcube-webmail.plugin-managesieve]
+file_filter = plugins/managesieve/localization/<lang>.inc
+source_file = plugins/managesieve/localization/en_US.inc
+source_lang = en_US
+
+[roundcube-webmail.plugin-markasjunk]
+file_filter = plugins/markasjunk/localization/<lang>.inc
+source_file = plugins/markasjunk/localization/en_US.inc
+source_lang = en_US
+
+[roundcube-webmail.plugin-new_user_dialog]
+file_filter = plugins/new_user_dialog/localization/<lang>.inc
+source_file = plugins/new_user_dialog/localization/en_US.inc
+source_lang = en_US
+
+[roundcube-webmail.plugin-newmail_notifier]
+file_filter = plugins/newmail_notifier/localization/<lang>.inc
+source_file = plugins/newmail_notifier/localization/en_US.inc
+source_lang = en_US
+
+[roundcube-webmail.plugin-password]
+file_filter = plugins/password/localization/<lang>.inc
+source_file = plugins/password/localization/en_US.inc
+source_lang = en_US
+
+[roundcube-webmail.plugin-subscriptions_option]
+file_filter = plugins/subscriptions_option/localization/<lang>.inc
+source_file = plugins/subscriptions_option/localization/en_US.inc
+source_lang = en_US
+
+[roundcube-webmail.plugin-userinfo]
+file_filter = plugins/userinfo/localization/<lang>.inc
+source_file = plugins/userinfo/localization/en_US.inc
+source_lang = en_US
+
+[roundcube-webmail.plugin-vcard_attachments]
+file_filter = plugins/vcard_attachments/localization/<lang>.inc
+source_file = plugins/vcard_attachments/localization/en_US.inc
+source_lang = en_US
+
+[roundcube-webmail.plugin-zipdownload]
+file_filter = plugins/zipdownload/localization/<lang>.inc
+source_file = plugins/zipdownload/localization/en_US.inc
+source_lang = en_US
+
diff --git a/CHANGELOG b/CHANGELOG
index 1341189b4..eaffa7099 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,17 +1,148 @@
 CHANGELOG Roundcube Webmail
 ===========================
 
+- Fix session issues when local and database time differs (#1486132)
+- Fix thread cache syncronization/validation (#1489028)
+- Add option show_real_foldernames to disable localization of special folders
+- Fix database cache expunge issues (#1489149)
+- Fix date format issues on MS SQL Server (#1488918)
+- Add imap_cache_ttl option to configure TTL of imap_cache
+- Make LDAP cache engine configurable via ldap_cache and ldap_cache_ttl options
+- Fix "duplicate entry" errors on inserts to imap cache tables (#1489146)
+- Improved handling of Reply-To/Bcc addresses of identity in compose form (#1489016)
+- Added user preference to open all popups as standard windows
+- Implemented shared cache (rcube_cache_shared)
+- Change Reply-All button label/title when mailing list is detected (#1488938)
+- Fix SMTP connection using IPv6 address in smtp_server option (#1489024)
+- Added attachment_reminder plugin
+- Make PHP code eval() free, use create_function()
+- Add option to display email address together with a name in mail preview (#1488732)
+- Support CSV import from Atmail (#1489045)
+- Add db_prefix configuration option in place of db_table_*/db_sequence_* options
+- Make possible to use db_prefix for schema initialization in Installer (#1489067)
+- Fix updatedb.sh script so it recognizes also table prefix for external DDL files
+- Fix parsing invalid date string (#1489035)
+- Add "with attachment" option to messages list filter (#1485382)
+- Call resize handler in intervals to prevent lags and double onresize calls in Chrome (#1489005)
+- Add rel="noreferrer" for links in displayed messages (#1484686)
+- Add ability to toggle between HTML and text while viewing a message (#1486939)
+- Remove "HTML message" from attachments list while viewing a message in text mode (#1486939)
+- Support IMAP MOVE extension [RFC 6851]
+- Add attachment menu with Open and Download options (#1488975)
+- Display user-friendly message on IMAP "over quota" errors (#1484164)
+- Extended archive plugin with user-configurable options to store messages into subfolders
+- Fix export of selected contacts from search result (#1488905)
+- Feature to export only selected contacts from addressbook (by Phil Weir)
+
+RELEASE 0.9.2
+-------------
+- Fix image thumbnails display in print mode (#1489134)
+- Fix height of message headers block (#1489108)
+- Fix timeout issue on drag&drop uploads (#1489170)
+- Fix default sorting of threaded list when THREAD=REFS isn't supported
+- Fix list mode switch to 'List' after saving list settings in Larry skin (#1489164)
+- Fix error when there's no writeable addressbook source (#1489162)
+- Fix zipdownload plugin issue with filenames charset (#1489156)
+- Fix so non-inline images aren't skipped on forward (#1489150)
+- Fix "null" instead of empty string on messages list in IE10 (#1489145)
+- Fix legacy options handling
+- Fix so bounces addresses in Sender headers are skipped on Reply-All (#1489011)
+- Fix bug where serialized strings were truncated in PDO::quote() (#1489142)
+- Fix displaying messages with invalid self-closing HTML tags (#1489137)
+- Fix PHP warning when responding to a message with many Return-Path headers (#1489136)
+- Fix unintentional compose window resize (#1489114)
+- Fix performance regression in text wrapping function (#1489133)
+- Fix connection to posgtres db using unix socket (#1489132)
+- Fix handling of comma when adding contact from contacts widget (#1489107)
+- Fix bug where a message was opened in both preview pane and new window on double-click (#1489122)
+- Fix fatal error when xdebug.max_nesting_level was exceeded in rcube_washtml (#1489110)
+- Fix PHP warning in html_table::set_row_attribs() in PHP 5.4 (#1489094)
+- Fix invalid option selected in default_font selector when font is unset (#1489112)
+- Fix displaying contact with ID divisible by 100 in sql addressbook (#1489121)
+- Fix browser warnings on PDF plugin detection (#1489118)
+- Fix fatal error when parsing UUencoded messages (#1489119)
+
+RELEASE 0.9.1
+-------------
+- Better German labels for from/to to avoid conflicts with 'sender' (#1489084)
+- Fix problem where security warning was displayed for valid images with image/jpg type (#1489097)
+- Fix handling of invalid email addresses in headers (#1489092)
+- Fix IMAP connection issue with default_socket_timeout < 0 and imap_timeout < 0 (#1489090)
+- Fix various PHP code bugs found using static analysis (#1489086)
+- Fix backslash character handling on vCard import (#1489085)
+- Fix csv import from Thunderbird with French localization (#1489059)
+- Fix messages list focus issue in Opera and Webkit (#1489058)
+- Fix Reply-To header handling in Reply-All action (#1489037)
+- Fix so Sender: address is added to Cc: field on reply to all (#1489011)
+- Fix so addressbook_search_mode works also for group search (#1489079)
+- Fix removal of a contact from a group in LDAP addressbook (#1489081)
+- Inlcude SQL query in the log on SQL error (#1489064)
+- Fix handling untagged responses in IMAP FETCH - "could not load message" error (#1489074)
+- Fix very small window size in Chrome (#1488931)
+- Fix list page reset when viewing a message in Larry skin (#1489076)
+- Fix min_refresh_interval handling on preferences save (#1489073)
+- Fix PDF support detection for Firefox PDF.js (#1488972)
+- Fix possible collision in generated thumbnail cache key (#1489069)
+- Fix exit code on bootsrap errors in CLI mode (#1489044)
+- Fix error handling in CLI mode, use STDERR and non-empty exit code (#1489043)
+- Fix error when using check_referer=true
+- Fix incorrect handling of some specific links (#1489060)
+- Fix incorrect handling of leading spaces in text wrapping
+- Fix unintentional messages list jumps on click in Internet Explorer (#1489056)
+- Fix list of required configuration options (#1489055)
+- Fix DB error when creating a new contact and a group is selected (#1489051)
+- Fix handling of deprecated boolean value of reply_mode option (#1489052)
+
+RELEASE 0.9.0
+-------------
+- Fix display of HTML entities in protected folder name (#1489042)
+- Set minimal permissions to temp files (#1488996)
+- Improve content check for embedded images without filename (#1489029)
+- Fix handling of invalid characters in message headers and output (#1489032)
+- Fix selecting collapsed rows on select-all (#1489036)
+- Avoid race-conditions with concurrent attachment uploads (#1488422)
+- Fix possible header duplicates when using additional headers (#1489033)
+- Fix session issues with use_https=true (#1488986)
+- Fix blockquote width in sent mail (#1489031)
+- Fix keyboard events on list widgets in Internet Explorer (#1489025)
+
+RELEASE 0.9-rc2
+---------------
+- Fix security issue in save-pref command
+- Remove sig_above configuration option, use reply_mode only (#1489001)
+- Refresh current folder in opener window after draft save or message sent (#1488997)
+- Fix saving draft just after entering compose window (#1489012)
+- Fix javascript error in IE9 when loading form with placeholders into an iframe (#1489008)
+- Fix handling of some conditional comment tags in HTML message (#1489004)
+- Fix so forward as attachment works if additional attachment is added by message_compose hook (#1489000)
+- Better handling of session errors in ajax requests (#1488960)
+- Fix HTML part detection for some specific message structures (#1488992)
+- Don't show fake address - phishing prevention (#1488981)
+- Fix forward as attachment bug with editormode != 1 (#1488991)
+- Fix LIMIT/OFFSET queries handling on MS SQL Server (#1488984)
+- Fix so task name can really contain all from a-z0-9_- characters (#1488941)
+- Fix javascript errors when working in a page opened with taget="_blank"
+- Mention SQLite database format change in UPGRADING file (#1488983)
+- Increase maxlength to 254 chars for email input fields in addressbook (#1488987)
+- Fix thumbnail size when GD extension is used for image resize (#1488985)
+- Display notice that message is encrypted also for application/pkcs7-mime messages (#1488526)
+
+RELEASE 0.9-rc
+--------------
+- Fix plain text spellchecker incorrect highlighting in non-ASCII text (#1488973)
+- Add workaround for invalid message charset detection by IMAP servers (#1488968)
+- Fix NUL characters in content-type of ms-tnef attachment (#1488964)
+- Fix regression in handling LDAP contact identifiers (#1488959)
+- Updated translations from Transifex
+- Fix buggy error template in a frame (#1488938)
 - Add addressbook widget on compose page in classic skin
 - Add search box to compose address book widget (#1488381)
 - Fix login in case when default_host is an array with one element (#1488928)
 - Use LDAP fallback hosts on connect + bind instead of ldap_connect() only.
 - Add config option for LDAP bind timeout (sets LDAP_OPT_NETWORK_TIMEOUT option)
 - Submit Addressbook advanced search form with Enter key (#1488568)
-- Extended archive plugin with user-configurable options to store messages into subfolders
 - Also block remote images in HTML part view (#1488827)
 - Improved database schema upgrade procedure, added updatedb.sh script
-- Fix export of selected contacts from search result (#1488905)
-- Feature to export only selected contacts from addressbook (by Phil Weir)
 - Force autocommit mode in mysql database driver (#1488902)
 
 RELEASE 0.9-beta
@@ -19,7 +150,6 @@ RELEASE 0.9-beta
 - Fix searching by date in address book (#1488888)
 - Improve charset detection by prioritizing charset according to user language (#1485669)
 - Fix handling of escaped separator in vCard file (#1488896)
-- Fix #countcontrols issue in IE<=8 when text is very long (#1488890)
 - Add option to use envelope From address for MDN responses (#1488880)
 - Add possibility to search in message body only (#1488770)
 - Support "multipart/relative" as an alias for "multipart/related" type (#1488886)
@@ -32,24 +162,16 @@ RELEASE 0.9-beta
 - Plugin API: Added message_before_send hook
 - Fix contact copy/add-to-group operations on search result (#1488862)
 - Use matching identity in MDN response (#1488864)
-- Fix unwanted horizontal scrollbar in message preview header (#1488866)
 - Fix handling of signatures on draft edit (#1488798)
 - Fix so compacting of non-empty folder is possible also when messages list is empty (#1488858)
 - Allow forwarding of multiple emails (#1486854)
 - Fix big memory consumption of DB layer (#1488856)
-- Add workaround for IE<=8 bug where Content-Disposition:inline was ignored (#1488844)
-- Fix XSS vulnerability in vbscript: and data:text links handling (#1488850)
 - Fix broken message/part bodies when FETCH response contains more untagged lines (#1488836)
 - Fix empty email on identities list after identity update (#1488834)
 - Add new identities_level: (4) one identity with possibility to edit only signature
 - Use Delivered-To and Envelope-To headers for identity selection (#1488840, #1488553)
 - Fix XSS vulnerability using Flash files (#1488828)
-- Fix absolute positioning in HTML messages (#1488819)
-- Fix cache (in)validation after setting \Deleted flag
-- Fix keybord events on messages list in opera browser (#1488823)
-- Fix selection of collapsed thread rows (#1488772)
 - Always save drafts with format=flowed in order to keep original line wraps (#1488799)
-- Fix wrapping of quoted text with format=flowed (#1488177)
 - Select default_addressbook on the list in Address Book (#1488280)
 - Fix so mobile phone has TYPE=CELL in exported vCard (#1488812)
 - Support contacts import from CSV file (#1486399)
@@ -107,6 +229,18 @@ RELEASE 0.9-beta
     Better classes separation
     Framework files moved to lib/Roundcube
 
+RELEASE 0.8.5
+-------------
+- Fix #countcontrols issue in IE<=8 when text is very long (#1488890)
+- Fix unwanted horizontal scrollbar in message preview header (#1488866)
+- Add workaround for IE<=8 bug where Content-Disposition:inline was ignored (#1488844)
+- Fix XSS vulnerability in vbscript: and data:text links handling (#1488850)
+- Fix absolute positioning in HTML messages (#1488819)
+- Fix cache (in)validation after setting \Deleted flag
+- Fix keybord events on messages list in opera browser (#1488823)
+- Fix selection of collapsed thread rows (#1488772)
+- Fix wrapping of quoted text with format=flowed (#1488177)
+
 RELEASE 0.8.4
 -------------
 - Fix regression where unintentional page reload was done after request abort (#1488802)
diff --git a/INSTALL b/INSTALL
index 326ef889f..3876f632c 100644
--- a/INSTALL
+++ b/INSTALL
@@ -34,7 +34,7 @@ REQUIREMENTS
    - magic_quotes_runtime disabled
    - magic_quotes_sybase disabled
 * PHP compiled with OpenSSL to connect to IMAPS and to use the spell checker
-* A MySQL (4.0.8 or newer), PostgreSQL, MSSQL database engine
+* A MySQL (4.0.8 or newer), PostgreSQL, MS SQL Server (2005 or newer) database engine
   or SQLite support in PHP
 * One of the above databases with permission to create tables
 * An SMTP server (recommended) or PHP configured for mail delivery
@@ -116,22 +116,23 @@ To use Roundcube with PostgreSQL support you have to follow these
 simple steps, which have to be done as the postgres system user (or
 which ever is the database superuser):
 
-$ createuser roundcube
+$ createuser -P roundcube
 $ createdb -O roundcube -E UNICODE roundcubemail
-$ psql roundcubemail
+$ psql -U roundcube -f SQL/postgres.initial.sql roundcubemail
 
-roundcubemail =# ALTER USER roundcube WITH PASSWORD 'the_new_password';
-roundcubemail =# \c - roundcube
-roundcubemail => \i SQL/postgres.initial.sql
+Note: in some system configurations you might need to add '-U postgres' to
+createuser and createdb commands.
 
-All this has been tested with PostgreSQL 8.x and 7.4.x. Older
-versions don't have a -O option for the createdb, so if you are
-using that version you'll have to change ownership of the DB later.
+
+* Microsoft SQL Server
+----------------------
+Language/locale of the database must be set to us_english (1033). More info
+on this at http://trac.roundcube.net/ticket/1488918.
 
 
 Database cleaning
 -----------------
-Do keep your database slick and clean we recommend to periodically execute
+To keep your database slick and clean we recommend to periodically execute
 bin/cleandb.sh which finally removes all records that are marked as deleted.
 Best solution is to install a cronjob running this script daily.
 
@@ -232,5 +233,3 @@ $HTTP["host"] == "www.example.com" {
 
     compress.filetype = ("text/plain", "text/html", "text/javascript", "text/css", "text/xml", "image/gif", "image/png")
 }
-
-
diff --git a/SQL/mssql.initial.sql b/SQL/mssql.initial.sql
index 694fe7efb..1027867e3 100644
--- a/SQL/mssql.initial.sql
+++ b/SQL/mssql.initial.sql
@@ -2,6 +2,15 @@ CREATE TABLE [dbo].[cache] (
 	[user_id] [int] NOT NULL ,

 	[cache_key] [varchar] (128) COLLATE Latin1_General_CI_AI NOT NULL ,

 	[created] [datetime] NOT NULL ,

+	[expires] [datetime] NULL ,

+	[data] [text] COLLATE Latin1_General_CI_AI NOT NULL 

+) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]

+GO

+

+CREATE TABLE [dbo].[cache_shared] (

+	[cache_key] [varchar] (255) COLLATE Latin1_General_CI_AI NOT NULL ,

+	[created] [datetime] NOT NULL ,

+	[expires] [datetime] NULL ,

 	[data] [text] COLLATE Latin1_General_CI_AI NOT NULL 

 ) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]

 GO

@@ -9,7 +18,7 @@ GO
 CREATE TABLE [dbo].[cache_index] (

 	[user_id] [int] NOT NULL ,

 	[mailbox] [varchar] (128) COLLATE Latin1_General_CI_AI NOT NULL ,

-	[changed] [datetime] NOT NULL ,

+	[expires] [datetime] NULL ,

 	[valid] [char] (1) COLLATE Latin1_General_CI_AI NOT NULL ,

 	[data] [text] COLLATE Latin1_General_CI_AI NOT NULL 

 ) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]

@@ -18,7 +27,7 @@ GO
 CREATE TABLE [dbo].[cache_thread] (

 	[user_id] [int] NOT NULL ,

 	[mailbox] [varchar] (128) COLLATE Latin1_General_CI_AI NOT NULL ,

-	[changed] [datetime] NOT NULL ,

+	[expires] [datetime] NULL ,

 	[data] [text] COLLATE Latin1_General_CI_AI NOT NULL 

 ) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]

 GO

@@ -27,7 +36,7 @@ CREATE TABLE [dbo].[cache_messages] (
 	[user_id] [int] NOT NULL ,

 	[mailbox] [varchar] (128) COLLATE Latin1_General_CI_AI NOT NULL ,

 	[uid] [int] NOT NULL ,

-	[changed] [datetime] NOT NULL ,

+	[expires] [datetime] NULL ,

 	[data] [text] COLLATE Latin1_General_CI_AI NOT NULL ,

 	[flags] [int] NOT NULL

 ) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]

@@ -204,36 +213,49 @@ ALTER TABLE [dbo].[cache] ADD
 	CONSTRAINT [DF_cache_created] DEFAULT (getdate()) FOR [created]

 GO

 

+ALTER TABLE [dbo].[cache_shared] ADD 

+	CONSTRAINT [DF_cache_shared_created] DEFAULT (getdate()) FOR [created]

+GO

+

+ALTER TABLE [dbo].[cache_index] ADD 

+	CONSTRAINT [DF_cache_index_valid] DEFAULT ('0') FOR [valid]

+GO

+

+ALTER TABLE [dbo].[cache_messages] ADD 

+	CONSTRAINT [DF_cache_messages_flags] DEFAULT (0) FOR [flags]

+GO

+

 CREATE  INDEX [IX_cache_user_id] ON [dbo].[cache]([user_id]) ON [PRIMARY]

 GO

 

 CREATE  INDEX [IX_cache_cache_key] ON [dbo].[cache]([cache_key]) ON [PRIMARY]

 GO

 

-CREATE  INDEX [IX_cache_created] ON [dbo].[cache]([created]) ON [PRIMARY]

+CREATE  INDEX [IX_cache_shared_cache_key] ON [dbo].[cache_shared]([cache_key]) ON [PRIMARY]

 GO

 

-ALTER TABLE [dbo].[cache_index] ADD 

-	CONSTRAINT [DF_cache_index_changed] DEFAULT (getdate()) FOR [changed],

-	CONSTRAINT [DF_cache_index_valid] DEFAULT ('0') FOR [valid]

+CREATE  INDEX [IX_cache_index_user_id] ON [dbo].[cache_index]([user_id]) ON [PRIMARY]

 GO

 

-CREATE  INDEX [IX_cache_index_user_id] ON [dbo].[cache_index]([user_id]) ON [PRIMARY]

+CREATE  INDEX [IX_cache_thread_user_id] ON [dbo].[cache_thread]([user_id]) ON [PRIMARY]

+GO

+

+CREATE  INDEX [IX_cache_messages_user_id] ON [dbo].[cache_messages]([user_id]) ON [PRIMARY]

 GO

 

-ALTER TABLE [dbo].[cache_thread] ADD 

-	CONSTRAINT [DF_cache_thread_changed] DEFAULT (getdate()) FOR [changed]

+CREATE INDEX [IX_cache_expires] ON [dbo].[cache]([expires]) ON [PRIMARY]

 GO

 

-CREATE  INDEX [IX_cache_thread_user_id] ON [dbo].[cache_thread]([user_id]) ON [PRIMARY]

+CREATE INDEX [IX_cache_shared_expires] ON [dbo].[cache_shared]([expires]) ON [PRIMARY]

 GO

 

-ALTER TABLE [dbo].[cache_messages] ADD 

-	CONSTRAINT [DF_cache_messages_changed] DEFAULT (getdate()) FOR [changed],

-	CONSTRAINT [DF_cache_messages_flags] DEFAULT (0) FOR [flags]

+CREATE INDEX [IX_cache_index_expires] ON [dbo].[cache_index]([expires]) ON [PRIMARY]

 GO

 

-CREATE  INDEX [IX_cache_messages_user_id] ON [dbo].[cache_messages]([user_id]) ON [PRIMARY]

+CREATE INDEX [IX_cache_thread_expires] ON [dbo].[cache_thread]([expires]) ON [PRIMARY]

+GO

+

+CREATE INDEX [IX_cache_messages_expires] ON [dbo].[cache_messages]([expires]) ON [PRIMARY]

 GO

 

 ALTER TABLE [dbo].[contacts] ADD 

@@ -371,6 +393,6 @@ CREATE TRIGGER [contact_delete_member] ON [dbo].[contacts]
     WHERE [contact_id] IN (SELECT [contact_id] FROM deleted)

 GO

 

-INSERT INTO [dbo].[system] ([name], [value]) VALUES ('roundcube-version', '2013011700.sql')

+INSERT INTO [dbo].[system] ([name], [value]) VALUES ('roundcube-version', '2013061000')

 GO

 
\ No newline at end of file
diff --git a/SQL/mssql/2013042700.sql b/SQL/mssql/2013042700.sql
new file mode 100644
index 000000000..fe6741a02
--- /dev/null
+++ b/SQL/mssql/2013042700.sql
@@ -0,0 +1 @@
+-- empty
\ No newline at end of file
diff --git a/SQL/mssql/2013052500.sql b/SQL/mssql/2013052500.sql
new file mode 100644
index 000000000..6a7e31d46
--- /dev/null
+++ b/SQL/mssql/2013052500.sql
@@ -0,0 +1,17 @@
+CREATE TABLE [dbo].[cache_shared] (

+	[cache_key] [varchar] (255) COLLATE Latin1_General_CI_AI NOT NULL ,

+	[created] [datetime] NOT NULL ,

+	[data] [text] COLLATE Latin1_General_CI_AI NOT NULL 

+) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]

+GO

+

+ALTER TABLE [dbo].[cache_shared] ADD 

+	CONSTRAINT [DF_cache_shared_created] DEFAULT (getdate()) FOR [created]

+GO

+

+CREATE  INDEX [IX_cache_shared_cache_key] ON [dbo].[cache_shared]([cache_key]) ON [PRIMARY]

+GO

+

+CREATE  INDEX [IX_cache_shared_created] ON [dbo].[cache_shared]([created]) ON [PRIMARY]

+GO

+

diff --git a/SQL/mssql/2013061000.sql b/SQL/mssql/2013061000.sql
new file mode 100644
index 000000000..55b5ec3a5
--- /dev/null
+++ b/SQL/mssql/2013061000.sql
@@ -0,0 +1,44 @@
+ALTER TABLE [dbo].[cache] ADD COLUMN [expires] [datetime] NULL

+GO

+ALTER TABLE [dbo].[cache_shared] ADD COLUMN [expires] [datetime] NULL

+GO

+ALTER TABLE [dbo].[cache_index] ADD COLUMN [expires] [datetime] NULL

+GO

+ALTER TABLE [dbo].[cache_thread] ADD COLUMN [expires] [datetime] NULL

+GO

+ALTER TABLE [dbo].[cache_messages] ADD COLUMN [expires] [datetime] NULL

+GO

+

+UPDATE [dbo].[cache] SET [expires] = DATEADD(second, 604800, [created])

+GO

+UPDATE [dbo].[cache_shared] SET [expires] = DATEADD(second, 604800, [created])

+GO

+UPDATE [dbo].[cache_index] SET [expires] = DATEADD(second, 604800, [changed])

+GO

+UPDATE [dbo].[cache_thread] SET [expires] = DATEADD(second, 604800, [changed])

+GO

+UPDATE [dbo].[cache_messages] SET [expires] = DATEADD(second, 604800, [changed])

+GO

+

+DROP INDEX [IX_cache_created]

+GO

+DROP INDEX [IX_cache_shared_created]

+GO

+ALTER TABLE [dbo].[cache_index] DROP COLUMN [changed]

+GO

+ALTER TABLE [dbo].[cache_thread] DROP COLUMN [changed]

+GO

+ALTER TABLE [dbo].[cache_messages] DROP COLUMN [changed]

+GO

+

+CREATE INDEX [IX_cache_expires] ON [dbo].[cache]([expires]) ON [PRIMARY]

+GO

+CREATE INDEX [IX_cache_shared_expires] ON [dbo].[cache_shared]([expires]) ON [PRIMARY]

+GO

+CREATE INDEX [IX_cache_index_expires] ON [dbo].[cache_index]([expires]) ON [PRIMARY]

+GO

+CREATE INDEX [IX_cache_thread_expires] ON [dbo].[cache_thread]([expires]) ON [PRIMARY]

+GO

+CREATE INDEX [IX_cache_messages_expires] ON [dbo].[cache_messages]([expires]) ON [PRIMARY]

+GO

+
\ No newline at end of file
diff --git a/SQL/mysql.initial.sql b/SQL/mysql.initial.sql
index 3d6bae48a..4e4833a62 100644
--- a/SQL/mysql.initial.sql
+++ b/SQL/mysql.initial.sql
@@ -35,27 +35,40 @@ CREATE TABLE `users` (
 
 CREATE TABLE `cache` (
  `user_id` int(10) UNSIGNED NOT NULL,
- `cache_key` varchar(128) /*!40101 CHARACTER SET ascii COLLATE ascii_general_ci */ NOT NULL ,
+ `cache_key` varchar(128) /*!40101 CHARACTER SET ascii COLLATE ascii_general_ci */ NOT NULL,
  `created` datetime NOT NULL DEFAULT '1000-01-01 00:00:00',
+ `expires` datetime DEFAULT NULL,
  `data` longtext NOT NULL,
  CONSTRAINT `user_id_fk_cache` FOREIGN KEY (`user_id`)
    REFERENCES `users`(`user_id`) ON DELETE CASCADE ON UPDATE CASCADE,
- INDEX `created_index` (`created`),
+ INDEX `expires_index` (`expires`),
  INDEX `user_cache_index` (`user_id`,`cache_key`)
 ) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
 
 
+-- Table structure for table `cache_shared`
+
+CREATE TABLE `cache_shared` (
+ `cache_key` varchar(255) /*!40101 CHARACTER SET ascii COLLATE ascii_general_ci */ NOT NULL,
+ `created` datetime NOT NULL DEFAULT '1000-01-01 00:00:00',
+ `expires` datetime DEFAULT NULL,
+ `data` longtext NOT NULL,
+ INDEX `expires_index` (`expires`),
+ INDEX `cache_key_index` (`cache_key`)
+) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
+
+
 -- Table structure for table `cache_index`
 
 CREATE TABLE `cache_index` (
  `user_id` int(10) UNSIGNED NOT NULL,
  `mailbox` varchar(255) BINARY NOT NULL,
- `changed` datetime NOT NULL DEFAULT '1000-01-01 00:00:00',
+ `expires` datetime DEFAULT NULL,
  `valid` tinyint(1) NOT NULL DEFAULT '0',
  `data` longtext NOT NULL,
  CONSTRAINT `user_id_fk_cache_index` FOREIGN KEY (`user_id`)
    REFERENCES `users`(`user_id`) ON DELETE CASCADE ON UPDATE CASCADE,
- INDEX `changed_index` (`changed`),
+ INDEX `expires_index` (`expires`),
  PRIMARY KEY (`user_id`, `mailbox`)
 ) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
 
@@ -65,11 +78,11 @@ CREATE TABLE `cache_index` (
 CREATE TABLE `cache_thread` (
  `user_id` int(10) UNSIGNED NOT NULL,
  `mailbox` varchar(255) BINARY NOT NULL,
- `changed` datetime NOT NULL DEFAULT '1000-01-01 00:00:00',
+ `expires` datetime DEFAULT NULL,
  `data` longtext NOT NULL,
  CONSTRAINT `user_id_fk_cache_thread` FOREIGN KEY (`user_id`)
    REFERENCES `users`(`user_id`) ON DELETE CASCADE ON UPDATE CASCADE,
- INDEX `changed_index` (`changed`),
+ INDEX `expires_index` (`expires`),
  PRIMARY KEY (`user_id`, `mailbox`)
 ) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
 
@@ -80,12 +93,12 @@ CREATE TABLE `cache_messages` (
  `user_id` int(10) UNSIGNED NOT NULL,
  `mailbox` varchar(255) BINARY NOT NULL,
  `uid` int(11) UNSIGNED NOT NULL DEFAULT '0',
- `changed` datetime NOT NULL DEFAULT '1000-01-01 00:00:00',
+ `expires` datetime DEFAULT NULL,
  `data` longtext NOT NULL,
  `flags` int(11) NOT NULL DEFAULT '0',
  CONSTRAINT `user_id_fk_cache_messages` FOREIGN KEY (`user_id`)
    REFERENCES `users`(`user_id`) ON DELETE CASCADE ON UPDATE CASCADE,
- INDEX `changed_index` (`changed`),
+ INDEX `expires_index` (`expires`),
  PRIMARY KEY (`user_id`, `mailbox`, `uid`)
 ) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
 
@@ -196,4 +209,4 @@ CREATE TABLE `system` (
 
 /*!40014 SET FOREIGN_KEY_CHECKS=1 */;
 
-INSERT INTO system (name, value) VALUES ('roundcube-version', '2013011700.sql');
+INSERT INTO system (name, value) VALUES ('roundcube-version', '2013061000');
diff --git a/SQL/mysql/2013011000.sql b/SQL/mysql/2013011000.sql
index f0b5e6a03..d1ea001db 100644
--- a/SQL/mysql/2013011000.sql
+++ b/SQL/mysql/2013011000.sql
@@ -1,6 +1,6 @@
 -- Upgrade from 0.9-beta
 
-CREATE TABLE `system` (
+CREATE TABLE IF NOT EXISTS `system` (
  `name` varchar(64) NOT NULL,
  `value` mediumtext,
  PRIMARY KEY(`name`)
diff --git a/SQL/mysql/2013042700.sql b/SQL/mysql/2013042700.sql
new file mode 100644
index 000000000..fe6741a02
--- /dev/null
+++ b/SQL/mysql/2013042700.sql
@@ -0,0 +1 @@
+-- empty
\ No newline at end of file
diff --git a/SQL/mysql/2013052500.sql b/SQL/mysql/2013052500.sql
new file mode 100644
index 000000000..b5f72b8ab
--- /dev/null
+++ b/SQL/mysql/2013052500.sql
@@ -0,0 +1,7 @@
+CREATE TABLE `cache_shared` (
+ `cache_key` varchar(255) /*!40101 CHARACTER SET ascii COLLATE ascii_general_ci */ NOT NULL,
+ `created` datetime NOT NULL DEFAULT '1000-01-01 00:00:00',
+ `data` longtext NOT NULL,
+ INDEX `created_index` (`created`),
+ INDEX `cache_key_index` (`cache_key`)
+) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
diff --git a/SQL/mysql/2013061000.sql b/SQL/mysql/2013061000.sql
new file mode 100644
index 000000000..54041b340
--- /dev/null
+++ b/SQL/mysql/2013061000.sql
@@ -0,0 +1,24 @@
+ALTER TABLE `cache` ADD `expires` datetime DEFAULT NULL;
+ALTER TABLE `cache_shared` ADD `expires` datetime DEFAULT NULL;
+ALTER TABLE `cache_index` ADD `expires` datetime DEFAULT NULL;
+ALTER TABLE `cache_thread` ADD `expires` datetime DEFAULT NULL;
+ALTER TABLE `cache_messages` ADD `expires` datetime DEFAULT NULL;
+
+-- initialize expires column with created/changed date + 7days
+UPDATE `cache` SET `expires` = `created` + interval 604800 second;
+UPDATE `cache_shared` SET `expires` = `created` + interval 604800 second;
+UPDATE `cache_index` SET `expires` = `changed` + interval 604800 second;
+UPDATE `cache_thread` SET `expires` = `changed` + interval 604800 second;
+UPDATE `cache_messages` SET `expires` = `changed` + interval 604800 second;
+
+ALTER TABLE `cache` DROP INDEX `created_index`;
+ALTER TABLE `cache_shared` DROP INDEX `created_index`;
+ALTER TABLE `cache_index` DROP `changed`;
+ALTER TABLE `cache_thread` DROP `changed`;
+ALTER TABLE `cache_messages` DROP `changed`;
+
+ALTER TABLE `cache` ADD INDEX `expires_index` (`expires`);
+ALTER TABLE `cache_shared` ADD INDEX `expires_index` (`expires`);
+ALTER TABLE `cache_index` ADD INDEX `expires_index` (`expires`);
+ALTER TABLE `cache_thread` ADD INDEX `expires_index` (`expires`);
+ALTER TABLE `cache_messages` ADD INDEX `expires_index` (`expires`);
diff --git a/SQL/postgres.initial.sql b/SQL/postgres.initial.sql
index d6acb5d69..f18cb6ad0 100644
--- a/SQL/postgres.initial.sql
+++ b/SQL/postgres.initial.sql
@@ -1,11 +1,11 @@
 -- Roundcube Webmail initial database structure
 
 --
--- Sequence "user_ids"
--- Name: user_ids; Type: SEQUENCE; Schema: public; Owner: postgres
+-- Sequence "users_seq"
+-- Name: users_seq; Type: SEQUENCE; Schema: public; Owner: postgres
 --
 
-CREATE SEQUENCE user_ids
+CREATE SEQUENCE users_seq
     INCREMENT BY 1
     NO MAXVALUE
     NO MINVALUE
@@ -17,7 +17,7 @@ CREATE SEQUENCE user_ids
 --
 
 CREATE TABLE users (
-    user_id integer DEFAULT nextval('user_ids'::text) PRIMARY KEY,
+    user_id integer DEFAULT nextval('users_seq'::text) PRIMARY KEY,
     username varchar(128) DEFAULT '' NOT NULL,
     mail_host varchar(128) DEFAULT '' NOT NULL,
     created timestamp with time zone DEFAULT now() NOT NULL,
@@ -45,11 +45,11 @@ CREATE INDEX session_changed_idx ON session (changed);
 
 
 --
--- Sequence "identity_ids"
--- Name: identity_ids; Type: SEQUENCE; Schema: public; Owner: postgres
+-- Sequence "identities_seq"
+-- Name: identities_seq; Type: SEQUENCE; Schema: public; Owner: postgres
 --
 
-CREATE SEQUENCE identity_ids
+CREATE SEQUENCE identities_seq
     START WITH 1
     INCREMENT BY 1
     NO MAXVALUE
@@ -62,7 +62,7 @@ CREATE SEQUENCE identity_ids
 --
 
 CREATE TABLE identities (
-    identity_id integer DEFAULT nextval('identity_ids'::text) PRIMARY KEY,
+    identity_id integer DEFAULT nextval('identities_seq'::text) PRIMARY KEY,
     user_id integer NOT NULL
         REFERENCES users (user_id) ON DELETE CASCADE ON UPDATE CASCADE,
     changed timestamp with time zone DEFAULT now() NOT NULL,
@@ -82,11 +82,11 @@ CREATE INDEX identities_email_idx ON identities (email, del);
 
 
 --
--- Sequence "contact_ids"
--- Name: contact_ids; Type: SEQUENCE; Schema: public; Owner: postgres
+-- Sequence "contacts_seq"
+-- Name: contacts_seq; Type: SEQUENCE; Schema: public; Owner: postgres
 --
 
-CREATE SEQUENCE contact_ids
+CREATE SEQUENCE contacts_seq
     START WITH 1
     INCREMENT BY 1
     NO MAXVALUE
@@ -99,7 +99,7 @@ CREATE SEQUENCE contact_ids
 --
 
 CREATE TABLE contacts (
-    contact_id integer DEFAULT nextval('contact_ids'::text) PRIMARY KEY,
+    contact_id integer DEFAULT nextval('contacts_seq'::text) PRIMARY KEY,
     user_id integer NOT NULL
         REFERENCES users (user_id) ON DELETE CASCADE ON UPDATE CASCADE,
     changed timestamp with time zone DEFAULT now() NOT NULL,
@@ -115,11 +115,11 @@ CREATE TABLE contacts (
 CREATE INDEX contacts_user_id_idx ON contacts (user_id, del);
 
 --
--- Sequence "contactgroups_ids"
--- Name: contactgroups_ids; Type: SEQUENCE; Schema: public; Owner: postgres
+-- Sequence "contactgroups_seq"
+-- Name: contactgroups_seq; Type: SEQUENCE; Schema: public; Owner: postgres
 --
 
-CREATE SEQUENCE contactgroups_ids
+CREATE SEQUENCE contactgroups_seq
     INCREMENT BY 1
     NO MAXVALUE
     NO MINVALUE
@@ -131,7 +131,7 @@ CREATE SEQUENCE contactgroups_ids
 --
 
 CREATE TABLE contactgroups (
-    contactgroup_id integer DEFAULT nextval('contactgroups_ids'::text) PRIMARY KEY,
+    contactgroup_id integer DEFAULT nextval('contactgroups_seq'::text) PRIMARY KEY,
     user_id integer NOT NULL
         REFERENCES users(user_id) ON DELETE CASCADE ON UPDATE CASCADE,
     changed timestamp with time zone DEFAULT now() NOT NULL,
@@ -164,14 +164,30 @@ CREATE INDEX contactgroupmembers_contact_id_idx ON contactgroupmembers (contact_
 
 CREATE TABLE "cache" (
     user_id integer NOT NULL
-    	REFERENCES users (user_id) ON DELETE CASCADE ON UPDATE CASCADE,
+        REFERENCES users (user_id) ON DELETE CASCADE ON UPDATE CASCADE,
     cache_key varchar(128) DEFAULT '' NOT NULL,
     created timestamp with time zone DEFAULT now() NOT NULL,
+    expires timestamp with time zone DEFAULT NULL,
     data text NOT NULL
 );
 
 CREATE INDEX cache_user_id_idx ON "cache" (user_id, cache_key);
-CREATE INDEX cache_created_idx ON "cache" (created);
+CREATE INDEX cache_expires_idx ON "cache" (expires);
+
+--
+-- Table "cache_shared"
+-- Name: cache_shared; Type: TABLE; Schema: public; Owner: postgres
+--
+
+CREATE TABLE "cache_shared" (
+    cache_key varchar(255) NOT NULL,
+    created timestamp with time zone DEFAULT now() NOT NULL,
+    expires timestamp with time zone DEFAULT NULL,
+    data text NOT NULL
+);
+
+CREATE INDEX cache_shared_cache_key_idx ON "cache_shared" (cache_key);
+CREATE INDEX cache_shared_expires_idx ON "cache_shared" (expires);
 
 --
 -- Table "cache_index"
@@ -180,15 +196,15 @@ CREATE INDEX cache_created_idx ON "cache" (created);
 
 CREATE TABLE cache_index (
     user_id integer NOT NULL
-    	REFERENCES users (user_id) ON DELETE CASCADE ON UPDATE CASCADE,
+        REFERENCES users (user_id) ON DELETE CASCADE ON UPDATE CASCADE,
     mailbox varchar(255) NOT NULL,
-    changed timestamp with time zone DEFAULT now() NOT NULL,
+    expires timestamp with time zone DEFAULT NULL,
     valid smallint NOT NULL DEFAULT 0,
     data text NOT NULL,
     PRIMARY KEY (user_id, mailbox)
 );
 
-CREATE INDEX cache_index_changed_idx ON cache_index (changed);
+CREATE INDEX cache_index_expires_idx ON cache_index (expires);
 
 --
 -- Table "cache_thread"
@@ -197,14 +213,14 @@ CREATE INDEX cache_index_changed_idx ON cache_index (changed);
 
 CREATE TABLE cache_thread (
     user_id integer NOT NULL
-    	REFERENCES users (user_id) ON DELETE CASCADE ON UPDATE CASCADE,
+        REFERENCES users (user_id) ON DELETE CASCADE ON UPDATE CASCADE,
     mailbox varchar(255) NOT NULL,
-    changed timestamp with time zone DEFAULT now() NOT NULL,
+    expires timestamp with time zone DEFAULT NULL,
     data text NOT NULL,
     PRIMARY KEY (user_id, mailbox)
 );
 
-CREATE INDEX cache_thread_changed_idx ON cache_thread (changed);
+CREATE INDEX cache_thread_expires_idx ON cache_thread (expires);
 
 --
 -- Table "cache_messages"
@@ -213,16 +229,16 @@ CREATE INDEX cache_thread_changed_idx ON cache_thread (changed);
 
 CREATE TABLE cache_messages (
     user_id integer NOT NULL
-    	REFERENCES users (user_id) ON DELETE CASCADE ON UPDATE CASCADE,
+        REFERENCES users (user_id) ON DELETE CASCADE ON UPDATE CASCADE,
     mailbox varchar(255) NOT NULL,
     uid integer NOT NULL,
-    changed timestamp with time zone DEFAULT now() NOT NULL,
+    expires timestamp with time zone DEFAULT NULL,
     data text NOT NULL,
     flags integer NOT NULL DEFAULT 0,
     PRIMARY KEY (user_id, mailbox, uid)
 );
 
-CREATE INDEX cache_messages_changed_idx ON cache_messages (changed);
+CREATE INDEX cache_messages_expires_idx ON cache_messages (expires);
 
 --
 -- Table "dictionary"
@@ -231,18 +247,18 @@ CREATE INDEX cache_messages_changed_idx ON cache_messages (changed);
 
 CREATE TABLE dictionary (
     user_id integer DEFAULT NULL
-    	REFERENCES users (user_id) ON DELETE CASCADE ON UPDATE CASCADE,
+        REFERENCES users (user_id) ON DELETE CASCADE ON UPDATE CASCADE,
    "language" varchar(5) NOT NULL,
     data text NOT NULL,
     CONSTRAINT dictionary_user_id_language_key UNIQUE (user_id, "language")
 );
 
 --
--- Sequence "searches_ids"
--- Name: searches_ids; Type: SEQUENCE; Schema: public; Owner: postgres
+-- Sequence "searches_seq"
+-- Name: searches_seq; Type: SEQUENCE; Schema: public; Owner: postgres
 --
 
-CREATE SEQUENCE search_ids
+CREATE SEQUENCE searches_seq
     INCREMENT BY 1
     NO MAXVALUE
     NO MINVALUE
@@ -254,7 +270,7 @@ CREATE SEQUENCE search_ids
 --
 
 CREATE TABLE searches (
-    search_id integer DEFAULT nextval('search_ids'::text) PRIMARY KEY,
+    search_id integer DEFAULT nextval('searches_seq'::text) PRIMARY KEY,
     user_id integer NOT NULL
         REFERENCES users (user_id) ON DELETE CASCADE ON UPDATE CASCADE,
     "type" smallint DEFAULT 0 NOT NULL,
@@ -274,4 +290,4 @@ CREATE TABLE "system" (
     value text
 );
 
-INSERT INTO system (name, value) VALUES ('roundcube-version', '2013011700.sql');
+INSERT INTO system (name, value) VALUES ('roundcube-version', '2013061000');
diff --git a/SQL/postgres/2013042700.sql b/SQL/postgres/2013042700.sql
new file mode 100644
index 000000000..bbd567515
--- /dev/null
+++ b/SQL/postgres/2013042700.sql
@@ -0,0 +1,14 @@
+ALTER SEQUENCE user_ids RENAME TO users_seq;
+ALTER TABLE users ALTER COLUMN user_id SET DEFAULT nextval('users_seq'::text);
+
+ALTER SEQUENCE identity_ids RENAME TO identities_seq;
+ALTER TABLE identities ALTER COLUMN identity_id SET DEFAULT nextval('identities_seq'::text);
+
+ALTER SEQUENCE contact_ids RENAME TO contacts_seq;
+ALTER TABLE contacts ALTER COLUMN contact_id SET DEFAULT nextval('contacts_seq'::text);
+
+ALTER SEQUENCE contactgroups_ids RENAME TO contactgroups_seq;
+ALTER TABLE contactgroups ALTER COLUMN contactgroup_id SET DEFAULT nextval('contactgroups_seq'::text);
+
+ALTER SEQUENCE search_ids RENAME TO searches_seq;
+ALTER TABLE searches ALTER COLUMN search_id SET DEFAULT nextval('searches_seq'::text);
diff --git a/SQL/postgres/2013052500.sql b/SQL/postgres/2013052500.sql
new file mode 100644
index 000000000..471e57176
--- /dev/null
+++ b/SQL/postgres/2013052500.sql
@@ -0,0 +1,8 @@
+CREATE TABLE "cache_shared" (
+    cache_key varchar(255) NOT NULL,
+    created timestamp with time zone DEFAULT now() NOT NULL,
+    data text NOT NULL
+);
+
+CREATE INDEX cache_shared_cache_key_idx ON "cache_shared" (cache_key);
+CREATE INDEX cache_shared_created_idx ON "cache_shared" (created);
diff --git a/SQL/postgres/2013061000.sql b/SQL/postgres/2013061000.sql
new file mode 100644
index 000000000..9db0ebcd7
--- /dev/null
+++ b/SQL/postgres/2013061000.sql
@@ -0,0 +1,24 @@
+ALTER TABLE "cache" ADD expires timestamp with time zone DEFAULT NULL;
+ALTER TABLE "cache_shared" ADD expires timestamp with time zone DEFAULT NULL;
+ALTER TABLE "cache_index" ADD expires timestamp with time zone DEFAULT NULL;
+ALTER TABLE "cache_thread" ADD expires timestamp with time zone DEFAULT NULL;
+ALTER TABLE "cache_messages" ADD expires timestamp with time zone DEFAULT NULL;
+
+-- initialize expires column with created/changed date + 7days
+UPDATE "cache" SET expires = created + interval '604800 seconds';
+UPDATE "cache_shared" SET expires = created + interval '604800 seconds';
+UPDATE "cache_index" SET expires = changed + interval '604800 seconds';
+UPDATE "cache_thread" SET expires = changed + interval '604800 seconds';
+UPDATE "cache_messages" SET expires = changed + interval '604800 seconds';
+
+DROP INDEX cache_created_idx;
+DROP INDEX cache_shared_created_idx;
+ALTER TABLE "cache_index" DROP "changed";
+ALTER TABLE "cache_thread" DROP "changed";
+ALTER TABLE "cache_messages" DROP "changed";
+
+CREATE INDEX cache_expires_idx ON "cache" (expires);
+CREATE INDEX cache_shared_expires_idx ON "cache_shared" (expires);
+CREATE INDEX cache_index_expires_idx ON "cache_index" (expires);
+CREATE INDEX cache_thread_expires_idx ON "cache_thread" (expires);
+CREATE INDEX cache_messages_expires_idx ON "cache_messages" (expires);
diff --git a/SQL/sqlite.initial.sql b/SQL/sqlite.initial.sql
index a9c7f5047..28a43680d 100644
--- a/SQL/sqlite.initial.sql
+++ b/SQL/sqlite.initial.sql
@@ -1,23 +1,6 @@
 -- Roundcube Webmail initial database structure
 
 -- 
--- Table structure for table cache
--- 
-
-CREATE TABLE cache (
-  user_id integer NOT NULL default 0,
-  cache_key varchar(128) NOT NULL default '',
-  created datetime NOT NULL default '0000-00-00 00:00:00',
-  data text NOT NULL
-);
-
-CREATE INDEX ix_cache_user_cache_key ON cache(user_id, cache_key);
-CREATE INDEX ix_cache_created ON cache(created);
-
-
--- --------------------------------------------------------
-
--- 
 -- Table structure for table contacts and related
 -- 
 
@@ -57,9 +40,6 @@ CREATE TABLE contactgroupmembers (
 
 CREATE INDEX ix_contactgroupmembers_contact_id ON contactgroupmembers (contact_id);
 
-
--- --------------------------------------------------------
-
 -- 
 -- Table structure for table identities
 -- 
@@ -82,9 +62,6 @@ CREATE TABLE identities (
 CREATE INDEX ix_identities_user_id ON identities(user_id, del);
 CREATE INDEX ix_identities_email ON identities(email, del);
 
-
--- --------------------------------------------------------
-
 -- 
 -- Table structure for table users
 -- 
@@ -101,8 +78,6 @@ CREATE TABLE users (
 
 CREATE UNIQUE INDEX ix_users_username ON users(username, mail_host);
 
--- --------------------------------------------------------
-
 -- 
 -- Table structure for table session
 -- 
@@ -117,8 +92,6 @@ CREATE TABLE session (
 
 CREATE INDEX ix_session_changed ON session (changed);
 
--- --------------------------------------------------------
-
 --
 -- Table structure for table dictionary
 --
@@ -131,8 +104,6 @@ CREATE TABLE dictionary (
 
 CREATE UNIQUE INDEX ix_dictionary_user_language ON dictionary (user_id, "language");
 
--- --------------------------------------------------------
-
 --
 -- Table structure for table searches
 --
@@ -147,7 +118,34 @@ CREATE TABLE searches (
 
 CREATE UNIQUE INDEX ix_searches_user_type_name ON searches (user_id, type, name);
 
--- --------------------------------------------------------
+-- 
+-- Table structure for table cache
+-- 
+
+CREATE TABLE cache (
+  user_id integer NOT NULL default 0,
+  cache_key varchar(128) NOT NULL default '',
+  created datetime NOT NULL default '0000-00-00 00:00:00',
+  expires datetime DEFAULT NOT,
+  data text NOT NULL
+);
+
+CREATE INDEX ix_cache_user_cache_key ON cache(user_id, cache_key);
+CREATE INDEX ix_cache_expires ON cache(expires);
+
+-- 
+-- Table structure for table cache_shared
+-- 
+
+CREATE TABLE cache_shared (
+  cache_key varchar(255) NOT NULL,
+  created datetime NOT NULL default '0000-00-00 00:00:00',
+  expires datetime DEFAULT NULL,
+  data text NOT NULL
+);
+
+CREATE INDEX ix_cache_shared_cache_key ON cache_shared(cache_key);
+CREATE INDEX ix_cache_shared_expires ON cache_shared(expires);
 
 --
 -- Table structure for table cache_index
@@ -156,15 +154,13 @@ CREATE UNIQUE INDEX ix_searches_user_type_name ON searches (user_id, type, name)
 CREATE TABLE cache_index (
     user_id integer NOT NULL,
     mailbox varchar(255) NOT NULL,
-    changed datetime NOT NULL default '0000-00-00 00:00:00',
+    expires datetime DEFAULT NULL,
     valid smallint NOT NULL DEFAULT '0',
     data text NOT NULL,
     PRIMARY KEY (user_id, mailbox)
 );
 
-CREATE INDEX ix_cache_index_changed ON cache_index (changed);
-
--- --------------------------------------------------------
+CREATE INDEX ix_cache_index_expires ON cache_index (expires);
 
 --
 -- Table structure for table cache_thread
@@ -173,14 +169,12 @@ CREATE INDEX ix_cache_index_changed ON cache_index (changed);
 CREATE TABLE cache_thread (
     user_id integer NOT NULL,
     mailbox varchar(255) NOT NULL,
-    changed datetime NOT NULL default '0000-00-00 00:00:00',
+    expires datetime DEFAULT NULL,
     data text NOT NULL,
     PRIMARY KEY (user_id, mailbox)
 );
 
-CREATE INDEX ix_cache_thread_changed ON cache_thread (changed);
-
--- --------------------------------------------------------
+CREATE INDEX ix_cache_thread_expires ON cache_thread (expires);
 
 --
 -- Table structure for table cache_messages
@@ -190,15 +184,13 @@ CREATE TABLE cache_messages (
     user_id integer NOT NULL,
     mailbox varchar(255) NOT NULL,
     uid integer NOT NULL,
-    changed datetime NOT NULL default '0000-00-00 00:00:00',
+    expires datetime DEFAULT NULL,
     data text NOT NULL,
     flags integer NOT NULL DEFAULT '0',
     PRIMARY KEY (user_id, mailbox, uid)
 );
 
-CREATE INDEX ix_cache_messages_changed ON cache_messages (changed);
-
--- --------------------------------------------------------
+CREATE INDEX ix_cache_messages_expires ON cache_messages (expires);
 
 --
 -- Table structure for table system
@@ -209,4 +201,4 @@ CREATE TABLE system (
   value text NOT NULL
 );
 
-INSERT INTO system (name, value) VALUES ('roundcube-version', '2013011700.sql');
+INSERT INTO system (name, value) VALUES ('roundcube-version', '2013061000');
diff --git a/SQL/sqlite/2013011000.sql b/SQL/sqlite/2013011000.sql
index 2c66ef95e..ec261a635 100644
--- a/SQL/sqlite/2013011000.sql
+++ b/SQL/sqlite/2013011000.sql
@@ -1,6 +1,6 @@
 -- Updates from version 0.9-beta
 
-CREATE TABLE system (
+CREATE TABLE IF NOT EXISTS system (
   name varchar(64) NOT NULL PRIMARY KEY,
   value text NOT NULL
 );
diff --git a/SQL/sqlite/2013042700.sql b/SQL/sqlite/2013042700.sql
new file mode 100644
index 000000000..fe6741a02
--- /dev/null
+++ b/SQL/sqlite/2013042700.sql
@@ -0,0 +1 @@
+-- empty
\ No newline at end of file
diff --git a/SQL/sqlite/2013052500.sql b/SQL/sqlite/2013052500.sql
new file mode 100644
index 000000000..19ae1b110
--- /dev/null
+++ b/SQL/sqlite/2013052500.sql
@@ -0,0 +1,8 @@
+CREATE TABLE cache_shared (
+  cache_key varchar(255) NOT NULL,
+  created datetime NOT NULL default '0000-00-00 00:00:00',
+  data text NOT NULL
+);
+
+CREATE INDEX ix_cache_shared_cache_key ON cache_shared(cache_key);
+CREATE INDEX ix_cache_shared_created ON cache_shared(created);
diff --git a/SQL/sqlite/2013061000.sql b/SQL/sqlite/2013061000.sql
new file mode 100644
index 000000000..3c6b43eac
--- /dev/null
+++ b/SQL/sqlite/2013061000.sql
@@ -0,0 +1,48 @@
+DROP TABLE cache_index;
+DROP TABLE cache_thread;
+DROP TABLE cache_messages;
+
+ALTER TABLE cache ADD expires datetime DEFAULT NULL;
+DROP INDEX ix_cache_created;
+
+ALTER TABLE cache_shared ADD expires datetime DEFAULT NULL;
+DROP INDEX ix_cache_shared_created;
+
+UPDATE cache SET expires = datetime(created, '+604800 seconds');
+UPDATE cache_shared SET expires = datetime(created, '+604800 seconds');
+
+CREATE INDEX ix_cache_expires ON cache(expires);
+CREATE INDEX ix_cache_shared_expires ON cache_shared(expires);
+
+CREATE TABLE cache_index (
+    user_id integer NOT NULL,
+    mailbox varchar(255) NOT NULL,
+    expires datetime DEFAULT NULL,
+    valid smallint NOT NULL DEFAULT '0',
+    data text NOT NULL,
+    PRIMARY KEY (user_id, mailbox)
+);
+
+CREATE INDEX ix_cache_index_expires ON cache_index (expires);
+
+CREATE TABLE cache_thread (
+    user_id integer NOT NULL,
+    mailbox varchar(255) NOT NULL,
+    expires datetime DEFAULT NULL,
+    data text NOT NULL,
+    PRIMARY KEY (user_id, mailbox)
+);
+
+CREATE INDEX ix_cache_thread_expires ON cache_thread (expires);
+
+CREATE TABLE cache_messages (
+    user_id integer NOT NULL,
+    mailbox varchar(255) NOT NULL,
+    uid integer NOT NULL,
+    expires datetime DEFAULT NULL,
+    data text NOT NULL,
+    flags integer NOT NULL DEFAULT '0',
+    PRIMARY KEY (user_id, mailbox, uid)
+);
+
+CREATE INDEX ix_cache_messages_expires ON cache_messages (expires);
diff --git a/UPGRADING b/UPGRADING
index 67c1245ec..03d549920 100644
--- a/UPGRADING
+++ b/UPGRADING
@@ -40,6 +40,7 @@ it on a unix system, you need to do the following operations by hand:
    open http://url-to-roundcube/installer/ in a browser and choose "3 Test config".
    To enable the latter one, you have to temporary set 'enable_installer'
    to true in your local config/main.inc.php file.
+   WARNING: See SQLite database upgrade below.
 4. Let the update script/installer check your configuration and
    update your config files and database schema as suggested by the updater.
 5. Make sure 'enable_installer' is set to false again.
@@ -54,3 +55,11 @@ Post-Upgrade Activities
    your folder settings contain namespace prefix. For example Courier users
    should add INBOX. prefix to folder names in main configuration file.
 4. Check system requirements in INSTALL file.
+
+SQLite database upgrade
+-----------------------
+Versions older than 0.9 were supporting SQLite v2 only. Newer versions require
+database in v3 format. The best what you can do is to convert database file
+to the new format using command line tools:
+
+sqlite OLD.DB .dump | sqlite3 NEW.DB
diff --git a/bin/cleandb.sh b/bin/cleandb.sh
index ecf258320..ea905c873 100755
--- a/bin/cleandb.sh
+++ b/bin/cleandb.sh
@@ -34,8 +34,9 @@ $RCMAIL = rcmail::get_instance();
 $db = $RCMAIL->get_dbh();
 $db->db_connect('w');
 
-if (!$db->is_connected() || $db->is_error())
-    die("No DB connection\n");
+if (!$db->is_connected() || $db->is_error()) {
+    rcube::raise_error("No DB connection", false, true);
+}
 
 if (!empty($_SERVER['argv'][1]))
     $days = intval($_SERVER['argv'][1]);
diff --git a/bin/decrypt.sh b/bin/decrypt.sh
index 95fdefc42..ff7c43038 100755
--- a/bin/decrypt.sh
+++ b/bin/decrypt.sh
@@ -19,7 +19,7 @@
  +-----------------------------------------------------------------------+
 */
 
-/*-
+/**
  * If http_received_header_encrypt is configured, the IP address and the
  * host name of the added Received: header is encrypted with 3DES, to
  * protect information that some could consider sensitve, yet their
@@ -28,8 +28,8 @@
  * Such an encrypted Received: header might look like:
  *
  * Received: from DzgkvJBO5+bw+oje5JACeNIa/uSI4mRw2cy5YoPBba73eyBmjtyHnQ==
- * 	[my0nUbjZXKtl7KVBZcsvWOxxtyVFxza4]
- *	with HTTP/1.1 (POST); Thu, 14 May 2009 19:17:28 +0200
+ *  [my0nUbjZXKtl7KVBZcsvWOxxtyVFxza4]
+ *  with HTTP/1.1 (POST); Thu, 14 May 2009 19:17:28 +0200
  *
  * In this example, the two encrypted components are the sender host name
  * (DzgkvJBO5+bw+oje5JACeNIa/uSI4mRw2cy5YoPBba73eyBmjtyHnQ==) and the IP
@@ -48,7 +48,7 @@
  *
  * If (most likely binary) junk is shown, then
  *  - either the encryption password has, between the time the mail was sent
- *    and `now', changed, or
+ *    and 'now', changed, or
  *  - you are dealing with counterfeit header data.
  */
 
diff --git a/bin/gc.sh b/bin/gc.sh
new file mode 100755
index 000000000..1ee610741
--- /dev/null
+++ b/bin/gc.sh
@@ -0,0 +1,27 @@
+#!/usr/bin/env php
+<?php
+/*
+ +-----------------------------------------------------------------------+
+ | bin/gc.sh                                                             |
+ |                                                                       |
+ | This file is part of the Roundcube Webmail client                     |
+ | Copyright (C) 2013, The Roundcube Dev Team                            |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ | PURPOSE:                                                              |
+ |   Trigger garbage collecting routines manually (e.g. via cronjob)     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas Bruederli <roundcube@gmail.com>                        |
+ +-----------------------------------------------------------------------+
+*/
+
+define('INSTALL_PATH', realpath(dirname(__FILE__) . '/..') . '/' );
+
+require INSTALL_PATH.'program/include/clisetup.php';
+
+$rcmail = rcube::get_instance();
+$rcmail->gc();
diff --git a/bin/indexcontacts.sh b/bin/indexcontacts.sh
index a9a5a952a..c85a535a7 100755
--- a/bin/indexcontacts.sh
+++ b/bin/indexcontacts.sh
@@ -30,17 +30,18 @@ $RCMAIL = rcmail::get_instance();
 $db = $RCMAIL->get_dbh();
 $db->db_connect('w');
 
-if (!$db->is_connected() || $db->is_error())
-    die("No DB connection\n");
+if (!$db->is_connected() || $db->is_error()) {
+    rcube::raise_error("No DB connection", false, true);
+}
 
 // iterate over all users
-$sql_result = $db->query("SELECT user_id FROM " . $RCMAIL->config->get('db_table_users', 'users')." WHERE 1=1");
+$sql_result = $db->query("SELECT user_id FROM " . $db->table_name('users') . " ORDER BY user_id");
 while ($sql_result && ($sql_arr = $db->fetch_assoc($sql_result))) {
     echo "Indexing contacts for user " . $sql_arr['user_id'] . "...";
-    
+
     $contacts = new rcube_contacts($db, $sql_arr['user_id']);
     $contacts->set_pagesize(9999);
-    
+
     $result = $contacts->list_records();
     while ($result->count && ($row = $result->next())) {
         unset($row['words']);
diff --git a/bin/installto.sh b/bin/installto.sh
index e6cf79d7d..8e1ab1fbf 100755
--- a/bin/installto.sh
+++ b/bin/installto.sh
@@ -26,17 +26,17 @@ require_once INSTALL_PATH . 'program/include/clisetup.php';
 $target_dir = unslashify($_SERVER['argv'][1]);
 
 if (empty($target_dir) || !is_dir(realpath($target_dir)))
-  die("Invalid target: not a directory\nUsage: installto.sh <TARGET>\n");
+  rcube::raise_error("Invalid target: not a directory\nUsage: installto.sh <TARGET>", false, true);
 
 // read version from iniset.php
 $iniset = @file_get_contents($target_dir . '/program/include/iniset.php');
 if (!preg_match('/define\(.RCMAIL_VERSION.,\s*.([0-9.]+[a-z-]*)/', $iniset, $m))
-  die("No valid Roundcube installation found at $target_dir\n");
+  rcube::raise_error("No valid Roundcube installation found at $target_dir", false, true);
 
 $oldversion = $m[1];
 
 if (version_compare(version_parse($oldversion), version_parse(RCMAIL_VERSION), '>='))
-  die("Installation at target location is up-to-date!\n");
+  rcube::raise_error("Installation at target location is up-to-date!", false, true);
 
 echo "Upgrading from $oldversion. Do you want to continue? (y/N)\n";
 $input = trim(fgets(STDIN));
diff --git a/bin/jsshrink.sh b/bin/jsshrink.sh
index 1d77ff388..c79f90405 100755
--- a/bin/jsshrink.sh
+++ b/bin/jsshrink.sh
@@ -56,7 +56,7 @@ if [ $# -gt 0 ]; then
 fi
 
 # default: compress application scripts
-for fn in app common googiespell list; do
+for fn in app common googiespell list treelist; do
 	if [ -r "$JS_DIR/${fn}.js.src" ]; then
 		echo "$JS_DIR/${fn}.js.src already exists, not overwriting"
 	else
diff --git a/bin/jsunshrink.sh b/bin/jsunshrink.sh
index 9d7755092..ef1bb47a1 100755
--- a/bin/jsunshrink.sh
+++ b/bin/jsunshrink.sh
@@ -6,7 +6,7 @@ if [ ! -d "$JS_DIR" ]; then
 	exit 1
 fi
 
-for fn in app common googiespell list; do
+for fn in app common googiespell list treelist; do
 	if [ -r "$JS_DIR/${fn}.js.src" ]; then
 		mv "$JS_DIR/${fn}.js.src" "$JS_DIR/${fn}.js"
 		echo "Reverted $JS_DIR/${fn}.js"
diff --git a/bin/moduserprefs.sh b/bin/moduserprefs.sh
index b8ba98578..9bbc885a6 100755
--- a/bin/moduserprefs.sh
+++ b/bin/moduserprefs.sh
@@ -2,7 +2,7 @@
 <?php
 /*
  +-----------------------------------------------------------------------+
- | bin/moduserprefs.sh                                                      |
+ | bin/moduserprefs.sh                                                   |
  |                                                                       |
  | This file is part of the Roundcube Webmail client                     |
  | Copyright (C) 2012, The Roundcube Dev Team                            |
@@ -61,7 +61,7 @@ if ($args['user'])
 	$query = 'user_id=' . intval($args['user']);
 
 // iterate over all users
-$sql_result = $db->query("SELECT * FROM " . $rcmail->config->get('db_table_users', 'users')." WHERE $query");
+$sql_result = $db->query("SELECT * FROM " . $db->table_name('users') . " WHERE $query");
 while ($sql_result && ($sql_arr = $db->fetch_assoc($sql_result))) {
 	echo "Updating prefs for user " . $sql_arr['user_id'] . "...";
 
diff --git a/bin/msgimport.sh b/bin/msgimport.sh
index 41bcd7e53..1fcc34680 100755
--- a/bin/msgimport.sh
+++ b/bin/msgimport.sh
@@ -33,8 +33,7 @@ else if (!($args['host'] && $args['file']))
 }
 else if (!is_file($args['file']))
 {
-	print "Cannot read message file\n";
-	exit;
+	rcube::raise_error("Cannot read message file.", false, true);
 }
 
 // prompt for username if not set
@@ -87,7 +86,7 @@ if ($IMAP->connect($host, $args['user'], $args['pass'], $imap_port, $imap_ssl))
 				if ($IMAP->save_message($args['mbox'], rtrim($message)))
 					$count++;
 				else
-					die("Failed to save message to {$args['mbox']}\n");
+					rcube::raise_error("Failed to save message to {$args['mbox']}", false, true);
 				$message = '';
 			}
 			continue;
@@ -108,7 +107,7 @@ if ($IMAP->connect($host, $args['user'], $args['pass'], $imap_port, $imap_ssl))
 }
 else
 {
-	print "IMAP login failed.\n";
+	rcube::raise_error("IMAP login failed.", false, true);
 }
 
 ?>
diff --git a/bin/update.sh b/bin/update.sh
index be952cc2f..05956b933 100755
--- a/bin/update.sh
+++ b/bin/update.sh
@@ -32,9 +32,11 @@ if (!$opts['version']) {
   echo "What version are you upgrading from? Type '?' if you don't know.\n";
   if (($input = trim(fgets(STDIN))) && preg_match('/^[0-9.]+[a-z-]*$/', $input))
     $opts['version'] = $input;
+  else
+    $opts['version'] = RCMAIL_VERSION;
 }
 
-if ($opts['version'] && version_compare(version_parse($opts['version']), version_parse(RCMAIL_VERSION), '>'))
+if ($opts['version'] && version_compare(version_parse($opts['version']), version_parse(RCMAIL_VERSION), '>='))
   die("Nothing to be done here. Bye!\n");
 
 
diff --git a/bin/updatecss.sh b/bin/updatecss.sh
new file mode 100755
index 000000000..53d237c77
--- /dev/null
+++ b/bin/updatecss.sh
@@ -0,0 +1,122 @@
+#!/usr/bin/env php
+<?php
+/*
+ +-----------------------------------------------------------------------+
+ | bin/updatecss.sh                                                      |
+ |                                                                       |
+ | This file is part of the Roundcube Webmail client                     |
+ | Copyright (C) 2010-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ | PURPOSE:                                                              |
+ |   Update cache-baster marks for css background images                 |
+ +-----------------------------------------------------------------------+
+ | Author: Aleksander Machniak <alec@alec.pl>                            |
+ +-----------------------------------------------------------------------+
+*/
+
+define('INSTALL_PATH', realpath(dirname(__FILE__) . '/..') . '/' );
+
+require_once INSTALL_PATH . 'program/include/clisetup.php';
+
+// get arguments
+$opts = rcube_utils::get_opt(array(
+    'd' => 'dir',
+));
+
+if (empty($opts['dir'])) {
+    print "Skin directory not specified (--dir). Using skins/ and plugins/*/skins/.\n";
+
+    $dir     = INSTALL_PATH . 'skins';
+    $dir_p   = INSTALL_PATH . 'plugins';
+    $skins   = glob("$dir/*", GLOB_ONLYDIR);
+    $skins_p = glob("$dir_p/*/skins/*", GLOB_ONLYDIR);
+
+    $dirs = array_merge($skins, $skins_p);
+}
+// Check if directory exists
+else if (!file_exists($opts['dir'])) {
+    rcube::raise_error("Specified directory doesn't exist.", false, true);
+}
+else {
+    $dirs = array($opts['dir']);
+}
+
+foreach ($dirs as $dir) {
+    $img_dir = $dir . '/images';
+    if (!file_exists($img_dir)) {
+        continue;
+    }
+
+    $files   = get_files($dir);
+    $images  = get_images($img_dir);
+    $find    = array();
+    $replace = array();
+
+    // build regexps array
+    foreach ($images as $path => $sum) {
+        $path_ex   = str_replace('.', '\\.', $path);
+        $find[]    = "#url\(['\"]?images/$path_ex(\?v=[a-f0-9-\.]+)?['\"]?\)#";
+        $replace[] = "url(images/$path?v=$sum)";
+    }
+
+    foreach ($files as $file) {
+        $file    = $dir . '/' . $file;
+        print "File: $file\n";
+        $content = file_get_contents($file);
+        $content = preg_replace($find, $replace, $content, -1, $count);
+        if ($count) {
+            file_put_contents($file, $content);
+        }
+    }
+}
+
+
+function get_images($dir)
+{
+    $images = array();
+    $dh     = opendir($dir);
+
+    while ($file = readdir($dh)) {
+        if (preg_match('/^(.+)\.(gif|ico|png|jpg|jpeg)$/', $file, $m)) {
+            $filepath = "$dir/$file";
+            $images[$file] = substr(md5_file($filepath), 0, 4) . '.' . filesize($filepath);
+            print "Image: $filepath ({$images[$file]})\n";
+        }
+        else if ($file != '.' && $file != '..' && is_dir($dir . '/' . $file)) {
+            foreach (get_images($dir . '/' . $file) as $img => $sum) {
+                $images[$file . '/' . $img] = $sum;
+            }
+        }
+    }
+
+    closedir($dh);
+
+    return $images;
+}
+
+function get_files($dir)
+{
+    $files = array();
+    $dh    = opendir($dir);
+
+    while ($file = readdir($dh)) {
+        if (preg_match('/^(.+)\.(css|html)$/', $file, $m)) {
+            $files[] = $file;
+        }
+        else if ($file != '.' && $file != '..' && is_dir($dir . '/' . $file)) {
+            foreach (get_files($dir . '/' . $file) as $f) {
+                $files[] = $file . '/' . $f;
+            }
+        }
+    }
+
+    closedir($dh);
+
+    return $files;
+}
+
+?>
diff --git a/bin/updatedb.sh b/bin/updatedb.sh
index 4b922ea83..b4ed8b7ba 100755
--- a/bin/updatedb.sh
+++ b/bin/updatedb.sh
@@ -31,18 +31,15 @@ $opts = rcube_utils::get_opt(array(
 ));
 
 if (empty($opts['dir'])) {
-  echo "ERROR: Database schema directory not specified (--dir).\n";
-  exit(1);
+    rcube::raise_error("Database schema directory not specified (--dir).", false, true);
 }
 if (empty($opts['package'])) {
-  echo "ERROR: Database schema package name not specified (--package).\n";
-  exit(1);
+    rcube::raise_error("Database schema package name not specified (--package).", false, true);
 }
 
 // Check if directory exists
 if (!file_exists($opts['dir'])) {
-  echo "ERROR: Specified database schema directory doesn't exist.\n";
-  exit(1);
+    rcube::raise_error("Specified database schema directory doesn't exist.", false, true);
 }
 
 $RC = rcube::get_instance();
@@ -51,19 +48,18 @@ $DB = rcube_db::factory($RC->config->get('db_dsnw'));
 // Connect to database
 $DB->db_connect('w');
 if (!$DB->is_connected()) {
-    echo "Error connecting to database: " . $DB->is_error() . ".\n";
-    exit(1);
+    rcube::raise_error("Error connecting to database: " . $DB->is_error(), false, true);
 }
 
 // Read DB schema version from database (if 'system' table exists)
-if (in_array('system', (array)$DB->list_tables())) {
+if (in_array($DB->table_name('system'), (array)$DB->list_tables())) {
     $DB->query("SELECT " . $DB->quote_identifier('value')
         ." FROM " . $DB->quote_identifier($DB->table_name('system'))
         ." WHERE " . $DB->quote_identifier('name') ." = ?",
         $opts['package'] . '-version');
 
     $row     = $DB->fetch_array();
-    $version = $row[0];
+    $version = preg_replace('/[^0-9]/', '', $row[0]);
 }
 
 // DB version not found, but release version is specified
@@ -90,6 +86,7 @@ if (!$version && $opts['version']) {
         '0.7.1'      => 2011111600,
         '0.7.2'      => 2011111600,
         '0.7.3'      => 2011111600,
+        '0.7.4'      => 2011111600,
         '0.8-beta'   => 2011121400,
         '0.8-rc'     => 2011121400,
         '0.8.0'      => 2011121400,
@@ -97,6 +94,8 @@ if (!$version && $opts['version']) {
         '0.8.2'      => 2011121400,
         '0.8.3'      => 2011121400,
         '0.8.4'      => 2011121400,
+        '0.8.5'      => 2011121400,
+        '0.8.6'      => 2011121400,
         '0.9-beta'   => 2012080700,
     );
 
@@ -110,8 +109,7 @@ if (empty($version)) {
 
 $dir = $opts['dir'] . DIRECTORY_SEPARATOR . $DB->db_provider;
 if (!file_exists($dir)) {
-    echo "DDL Upgrade files for " . $DB->db_provider . " driver not found.\n";
-    exit(1);
+    rcube::raise_error("DDL Upgrade files for " . $DB->db_provider . " driver not found.", false, true);
 }
 
 $dh     = opendir($dir);
@@ -129,13 +127,12 @@ foreach ($result as $v) {
     $error = update_db_schema($opts['package'], $v, $dir . DIRECTORY_SEPARATOR . "$v.sql");
 
     if ($error) {
-        echo "\nError in DDL upgrade $v: $error\n";
-        exit(1);
+        echo "[FAILED]\n";
+        rcube::raise_error("Error in DDL upgrade $v: $error", false, true);
     }
     echo "[OK]\n";
 }
 
-exit(0);
 
 function update_db_schema($package, $version, $file)
 {
@@ -150,7 +147,7 @@ function update_db_schema($package, $version, $file)
 
             $sql .= $line . "\n";
             if (preg_match('/(;|^GO)$/', trim($line))) {
-                @$DB->query($sql);
+                @$DB->query(fix_table_names($sql));
                 $sql = '';
                 if ($error = $DB->is_error()) {
                     return $error;
@@ -181,4 +178,51 @@ function update_db_schema($package, $version, $file)
     return $DB->is_error();
 }
 
+function fix_table_names($sql)
+{
+    global $DB, $RC, $dir;
+    static $tables;
+    static $sequences;
+
+    $prefix = $RC->config->get('db_prefix');
+    $engine = $DB->db_provider;
+
+    if (empty($prefix)) {
+        return $sql;
+    }
+
+    if ($tables === null) {
+        $tables    = array();
+        $sequences = array();
+
+        // read complete schema (initial) file
+        $filename = "$dir/../$engine.initial.sql";
+        $schema    = @file_get_contents($filename);
+
+        // find table names
+        if (preg_match_all('/CREATE TABLE (\[dbo\]\.|IF NOT EXISTS )?[`"\[\]]*([^`"\[\] \r\n]+)/i', $schema, $matches)) {
+            foreach ($matches[2] as $table) {
+                $tables[$table] = $prefix . $table;
+            }
+        }
+        // find sequence names
+        if ($engine == 'postgres' && preg_match_all('/CREATE SEQUENCE (IF NOT EXISTS )?"?([^" \n\r]+)/i', $schema, $matches)) {
+            foreach ($matches[2] as $sequence) {
+                $sequences[$sequence] = $prefix . $sequence;
+            }
+        }
+    }
+
+    // replace table names
+    foreach ($tables as $table => $real_table) {
+        $sql = preg_replace("/([^a-zA-Z0-9_])$table([^a-zA-Z0-9_])/", "\\1$real_table\\2", $sql);
+    }
+    // replace sequence names
+    foreach ($sequences as $sequence => $real_sequence) {
+        $sql = preg_replace("/([^a-zA-Z0-9_])$sequence([^a-zA-Z0-9_])/", "\\1$real_sequence\\2", $sql);
+    }
+
+    return $sql;
+}
+
 ?>
diff --git a/composer.json-dist b/composer.json-dist
index cfa825a25..e7462038d 100644
--- a/composer.json-dist
+++ b/composer.json-dist
@@ -1,35 +1,16 @@
 {
     "name": "roundcube/roundcubemail",
     "description": "The Roundcube Webmail suite",
-    "license": "GPL-3.0",
+    "license": "GPL-3.0+",
     "repositories": [
         {
             "type": "composer",
             "url": "http://plugins.roundcube.net/"
-        },
-        {
-            "type": "pear",
-            "url": "http://pear.php.net/"
-        },
-        {
-            "type": "package",
-            "package": {
-                "name": "Net_SMTP",
-                "version": "dev-master",
-                "source": {
-                    "url": "http://github.com/pear/Net_SMTP",
-                    "type": "git",
-                    "reference": "master"
-                }
-            }
         }
     ],
-    "require" : {
-        "pear-pear/Mail_Mime": ">=1.8.1",
-        "pear-pear/Mail_mimeDecode": ">=1.5.5",
-        "Net_SMTP": "dev-master",
-        "pear-pear/Net_IDNA2": ">=0.1.1",
-        "pear-pear/Auth_SASL": ">=1.0.6"
+    "require": {
+        "php": ">=5.3.0",
+        "roundcube/plugin-installer": ">=0.1.3"
     },
     "minimum-stability": "dev"
 }
diff --git a/config/db.inc.php.dist b/config/db.inc.php.dist
index 9bbf7d75b..b1f142e56 100644
--- a/config/db.inc.php.dist
+++ b/config/db.inc.php.dist
@@ -5,29 +5,24 @@
  | Configuration file for database access                                |
  |                                                                       |
  | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2005-2012, The Roundcube Dev Team                       |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
  | See the README file for a full license statement.                     |
- |                                                                       |
  +-----------------------------------------------------------------------+
-
 */
 
 $rcmail_config = array();
 
-// PEAR database DSN for read/write operations
-// format is db_provider://user:password@host/database 
+// Database connection string (DSN) for read+write operations
+// Format (compatible with PEAR MDB2): db_provider://user:password@host/database
+// Currently supported db_providers: mysql, pgsql, sqlite, mssql or sqlsrv
 // For examples see http://pear.php.net/manual/en/package.database.mdb2.intro-dsn.php
-// currently supported db_providers: mysql, mysqli, pgsql, sqlite, mssql or sqlsrv
-
+// NOTE: for SQLite use absolute path: 'sqlite:////full/path/to/sqlite.db?mode=0646'
 $rcmail_config['db_dsnw'] = 'mysql://roundcube:pass@localhost/roundcubemail';
-// postgres example: 'pgsql://roundcube:pass@localhost/roundcubemail';
-// Warning: for SQLite use absolute path in DSN:
-// sqlite example: 'sqlite:////full/path/to/sqlite.db?mode=0646';
 
-// PEAR database DSN for read only operations (if empty write database will be used)
+// Database DSN for read-only operations (if empty write database will be used)
 // useful for database replication
 $rcmail_config['db_dsnr'] = '';
 
@@ -36,27 +31,5 @@ $rcmail_config['db_dsnr'] = '';
 // see: http://www.php.net/manual/en/features.persistent-connections.php
 $rcmail_config['db_persistent'] = FALSE;
 
-// you can define specific table names used to store webmail data
-$rcmail_config['db_table_users'] = 'users';
-$rcmail_config['db_table_identities'] = 'identities';
-$rcmail_config['db_table_contacts'] = 'contacts';
-$rcmail_config['db_table_contactgroups'] = 'contactgroups';
-$rcmail_config['db_table_contactgroupmembers'] = 'contactgroupmembers';
-$rcmail_config['db_table_session'] = 'session';
-$rcmail_config['db_table_cache'] = 'cache';
-$rcmail_config['db_table_cache_index'] = 'cache_index';
-$rcmail_config['db_table_cache_thread'] = 'cache_thread';
-$rcmail_config['db_table_cache_messages'] = 'cache_messages';
-$rcmail_config['db_table_dictionary'] = 'dictionary';
-$rcmail_config['db_table_searches'] = 'searches';
-$rcmail_config['db_table_system'] = 'system';
-
-// you can define specific sequence names used in PostgreSQL
-$rcmail_config['db_sequence_users'] = 'user_ids';
-$rcmail_config['db_sequence_identities'] = 'identity_ids';
-$rcmail_config['db_sequence_contacts'] = 'contact_ids';
-$rcmail_config['db_sequence_contactgroups'] = 'contactgroups_ids';
-$rcmail_config['db_sequence_searches'] = 'search_ids';
-
-
-// end db config file
+// you can define specific table (and sequence) names prefix
+$rcmail_config['db_prefix'] = '';
diff --git a/config/main.inc.php.dist b/config/main.inc.php.dist
index b113b41a8..84a0a7a61 100644
--- a/config/main.inc.php.dist
+++ b/config/main.inc.php.dist
@@ -128,6 +128,11 @@ $rcmail_config['imap_cache'] = null;
 // Enables messages cache. Only 'db' cache is supported.
 $rcmail_config['messages_cache'] = false;
 
+// Lifetime of IMAP indexes cache. Possible units: s, m, h, d, w
+$rcmail_config['imap_cache_ttl'] = '10d';
+
+// Lifetime of messages cache. Possible units: s, m, h, d, w
+$rcmail_config['messages_cache_ttl'] = '10d';
 
 // ----------------------------------
 // SMTP
@@ -170,13 +175,23 @@ $rcmail_config['smtp_auth_pw'] = null;
 // SMTP HELO host 
 // Hostname to give to the remote server for SMTP 'HELO' or 'EHLO' messages 
 // Leave this blank and you will get the server variable 'server_name' or 
-// localhost if that isn't defined. 
+// localhost if that isn't defined.
 $rcmail_config['smtp_helo_host'] = '';
 
 // SMTP connection timeout, in seconds. Default: 0 (no limit)
 $rcmail_config['smtp_timeout'] = 0;
 
 // ----------------------------------
+// LDAP
+// ----------------------------------
+
+// Type of LDAP cache. Supported values: 'db', 'apc' and 'memcache'.
+$rcmail_config['ldap_cache'] = 'db';
+
+// Lifetime of LDAP cache. Possible units: s, m, h, d, w
+$rcmail_config['ldap_cache_ttl'] = '10m';
+
+// ----------------------------------
 // SYSTEM
 // ----------------------------------
 
@@ -210,10 +225,6 @@ $rcmail_config['log_dir'] = 'logs/';
 // use this folder to store temp files (must be writeable for apache user)
 $rcmail_config['temp_dir'] = 'temp/';
 
-// lifetime of message cache
-// possible units: s, m, h, d, w
-$rcmail_config['message_cache_lifetime'] = '10d';
-
 // enforce connections over https
 // with this option enabled, all non-secure connections will be redirected.
 // set the port for the ssl connection as value of this option if it differs from the default 443
@@ -254,9 +265,10 @@ $rcmail_config['session_name'] = null;
 // Session path. Defaults to PHP session.cookie_path setting.
 $rcmail_config['session_path'] = null;
 
-// Backend to use for session storage. Can either be 'db' (default) or 'memcache'
-// If set to memcache, a list of servers need to be specified in 'memcache_hosts'
+// Backend to use for session storage. Can either be 'db' (default), 'memcache' or 'php'
+// If set to 'memcache', a list of servers need to be specified in 'memcache_hosts'
 // Make sure the Memcache extension (http://pecl.php.net/package/memcache) version >= 2.0.0 is installed
+// Setting this value to 'php' will use the default session save handler configured in PHP
 $rcmail_config['session_storage'] = 'db';
 
 // Use these hosts for accessing memcached
@@ -469,6 +481,9 @@ $rcmail_config['trash_mbox'] = 'Trash';
 // NOTE: Use folder names with namespace prefix (INBOX. on Courier-IMAP)
 $rcmail_config['default_folders'] = array('INBOX', 'Drafts', 'Sent', 'Junk', 'Trash');
 
+// Disable localization of the default folder names listed above
+$rcmail_config['show_real_foldernames'] = false;
+
 // automatically create the above listed default folders on first login
 $rcmail_config['create_default_folders'] = false;
 
@@ -723,6 +738,10 @@ $rcmail_config['default_charset'] = 'ISO-8859-1';
 // skin name: folder from skins/
 $rcmail_config['skin'] = 'larry';
 
+// Enables using standard browser windows (that can be handled as tabs)
+// instead of popup windows
+$rcmail_config['standard_windows'] = false;
+
 // show up to X items in messages list view
 $rcmail_config['mail_pagesize'] = 50;
 
@@ -835,9 +854,6 @@ $rcmail_config['strip_existing_sig'] = true;
 // 3 - Forwards and Replies only
 $rcmail_config['show_sig'] = 1;
 
-// When replying or forwarding place sender's signature above existing message
-$rcmail_config['sig_above'] = false;
-
 // Use MIME encoding (quoted-printable) for 8bit characters in message body
 $rcmail_config['force_7bit'] = false;
 
@@ -891,6 +907,7 @@ $rcmail_config['autocomplete_single'] = false;
 // Default font for composed HTML message.
 // Supported values: Andale Mono, Arial, Arial Black, Book Antiqua, Courier New,
 // Georgia, Helvetica, Impact, Tahoma, Terminal, Times New Roman, Trebuchet MS, Verdana
-$rcmail_config['default_font'] = '';
+$rcmail_config['default_font'] = 'Verdana';
 
-// end of config file
+// Enables display of email address with name instead of a name (and address in title)
+$rcmail_config['message_show_email'] = false;
diff --git a/index.php b/index.php
index 3e398c00d..5d5257142 100644
--- a/index.php
+++ b/index.php
@@ -2,7 +2,7 @@
 /*
  +-------------------------------------------------------------------------+
  | Roundcube Webmail IMAP Client                                           |
- | Version 0.9-git                                                         |
+ | Version 1.0-git                                                         |
  |                                                                         |
  | Copyright (C) 2005-2013, The Roundcube Dev Team                         |
  |                                                                         |
@@ -161,7 +161,7 @@ if ($RCMAIL->task == 'login' && $RCMAIL->action == 'login') {
 }
 
 // end session (after optional referer check)
-else if ($RCMAIL->task == 'logout' && isset($_SESSION['user_id']) && (!$RCMAIL->config->get('referer_check') || rcmail::check_referer())) {
+else if ($RCMAIL->task == 'logout' && isset($_SESSION['user_id']) && (!$RCMAIL->config->get('referer_check') || rcube_utils::check_referer())) {
   $userdata = array(
     'user' => $_SESSION['username'],
     'host' => $_SESSION['storage_host'],
@@ -236,7 +236,7 @@ else {
     }
 
     // check referer if configured
-    if ($RCMAIL->config->get('referer_check') && !rcmail::check_referer()) {
+    if ($RCMAIL->config->get('referer_check') && !rcube_utils::check_referer()) {
       raise_error(array(
         'code' => 403, 'type' => 'php',
         'message' => "Referer check failed"), true, true);
diff --git a/installer/check.php b/installer/check.php
index 14fc4f06e..fcf35025e 100644
--- a/installer/check.php
+++ b/installer/check.php
@@ -64,12 +64,12 @@ $source_urls = array(
     'Intl'      => 'http://www.php.net/manual/en/book.intl.php',
     'Exif'      => 'http://www.php.net/manual/en/book.exif.php',
     'PDO'       => 'http://www.php.net/manual/en/book.pdo.php',
-    'pdo_mysql'   => 'http://www.php.net/manual/en/book.pdo-mysql.php',
-    'pdo_pgsql'   => 'http://www.php.net/manual/en/book.pdo-pgsql.php',
-    'pdo_sqlite'  => 'http://www.php.net/manual/en/book.pdo-sqlite.php',
-    'pdo_sqlite2' => 'http://www.php.net/manual/en/book.pdo-sqlite.php',
-    'pdo_sqlsrv'  => 'http://www.php.net/manual/en/book.pdo-sqlsrv.php',
-    'pdo_dblib'   => 'http://www.php.net/manual/en/book.pdo-dblib.php',
+    'pdo_mysql'   => 'http://www.php.net/manual/en/ref.pdo-mysql.php',
+    'pdo_pgsql'   => 'http://www.php.net/manual/en/ref.pdo-pgsql.php',
+    'pdo_sqlite'  => 'http://www.php.net/manual/en/ref.pdo-sqlite.php',
+    'pdo_sqlite2' => 'http://www.php.net/manual/en/ref.pdo-sqlite.php',
+    'pdo_sqlsrv'  => 'http://www.php.net/manual/en/ref.pdo-sqlsrv.php',
+    'pdo_dblib'   => 'http://www.php.net/manual/en/ref.pdo-dblib.php',
     'PEAR'      => 'http://pear.php.net',
     'Net_SMTP'  => 'http://pear.php.net/package/Net_SMTP',
     'Mail_mime' => 'http://pear.php.net/package/Mail_mime',
diff --git a/installer/config.php b/installer/config.php
index d6846edc7..4fcf5b08e 100644
--- a/installer/config.php
+++ b/installer/config.php
@@ -15,7 +15,6 @@ $RCI->load_defaults();
 // register these boolean fields
 $RCI->bool_config_props = array(
   'ip_check' => 1,
-  'enable_caching' => 1,
   'enable_spellcheck' => 1,
   'auto_create_user' => 1,
   'smtp_log' => 1,
@@ -127,16 +126,6 @@ echo $check_ipcheck->show(intval($RCI->getprop('ip_check')), array('value' => 1)
 <p class="hint">This increases security but can cause sudden logouts when someone uses a proxy with changing IPs.</p>
 </dd>
 
-<dt class="propname">enable_caching</dt>
-<dd>
-<?php
-
-$check_caching = new html_checkbox(array('name' => '_enable_caching', 'id' => "cfgcache"));
-echo $check_caching->show(intval($RCI->getprop('enable_caching')), array('value' => 1));
-
-?>
-<label for="cfgcache">Cache messages in local database</label><br />
-</dd>
 
 <dt class="propname">enable_spellcheck</dt>
 <dd>
@@ -301,6 +290,18 @@ echo '<label for="cfgdbpass">Database password (omit for sqlite)</label><br />';
 
 ?>
 </dd>
+
+<dt class="propname">db_prefix</dt>
+<dd>
+<?php
+
+$input_prefix = new html_inputfield(array('name' => '_db_prefix', 'size' => 20, 'id' => "cfgdbprefix"));
+echo $input_prefix->show($RCI->getprop('db_prefix'));
+
+?>
+<div>Optional prefix that will be added to database object names (tables and sequences).</div>
+</dd>
+
 </dl>
 </fieldset>
 
diff --git a/installer/rcube_install.php b/installer/rcube_install.php
index 2805dc77e..c95d936d2 100644
--- a/installer/rcube_install.php
+++ b/installer/rcube_install.php
@@ -46,8 +46,7 @@ class rcube_install
 
   // these config options are required for a working system
   var $required_config = array(
-    'db_dsnw', 'db_table_contactgroups', 'db_table_contactgroupmembers',
-    'des_key', 'session_lifetime', 'support_url',
+    'db_dsnw', 'des_key', 'session_lifetime',
   );
 
   // list of supported database drivers
@@ -288,7 +287,7 @@ class rcube_install
     if ($this->config['log_driver'] == 'syslog') {
       if (!function_exists('openlog')) {
         $out['dependencies'][] = array('prop' => 'log_driver',
-          'explain' => 'This requires the <tt>sylog</tt> extension which could not be loaded.');
+          'explain' => 'This requires the <tt>syslog</tt> extension which could not be loaded.');
       }
       if (empty($this->config['syslog_id'])) {
         $out['dependencies'][] = array('prop' => 'syslog_id',
@@ -348,7 +347,7 @@ class rcube_install
 
     $this->config  = array_merge($this->config, $current);
 
-    foreach ((array)$current['ldap_public'] as $key => $values) {
+    foreach (array_keys((array)$current['ldap_public']) as $key) {
       $this->config['ldap_public'][$key] = $current['ldap_public'][$key];
     }
   }
@@ -357,10 +356,11 @@ class rcube_install
    * Compare the local database schema with the reference schema
    * required for this version of Roundcube
    *
-   * @param boolean True if the schema schould be updated
+   * @param rcube_db Database object
+   *
    * @return boolean True if the schema is up-to-date, false if not or an error occured
    */
-  function db_schema_check($DB, $update = false)
+  function db_schema_check($DB)
   {
     if (!$this->configured)
       return false;
@@ -373,7 +373,7 @@ class rcube_install
     $existing_tables = $DB->list_tables();
 
     foreach ($db_schema as $table => $cols) {
-      $table = !empty($this->config['db_table_'.$table]) ? $this->config['db_table_'.$table] : $table;
+      $table = $this->config['db_prefix'] . $table;
       if (!in_array($table, $existing_tables)) {
         $errors[] = "Missing table '".$table."'";
       }
@@ -452,11 +452,12 @@ class rcube_install
         '0.2-alpha', '0.2-beta', '0.2-stable',
         '0.3-stable', '0.3.1',
         '0.4-beta', '0.4.2',
-        '0.5-beta', '0.5', '0.5.1',
+        '0.5-beta', '0.5', '0.5.1', '0.5.2', '0.5.3', '0.5.4',
         '0.6-beta', '0.6',
-        '0.7-beta', '0.7', '0.7.1', '0.7.2', '0.7.3',
-        '0.8-beta', '0.8-rc', '0.8.0', '0.8.1', '0.8.2', '0.8.3', '0.8.4',
-        '0.9-beta',
+        '0.7-beta', '0.7', '0.7.1', '0.7.2', '0.7.3', '0.7.4',
+        '0.8-beta', '0.8-rc', '0.8.0', '0.8.1', '0.8.2', '0.8.3', '0.8.4', '0.8.5', '0.8.6',
+        '0.9-beta', '0.9-rc', '0.9-rc2',
+        // Note: Do not add newer versions here
     ));
     return $select;
   }
@@ -584,7 +585,7 @@ class rcube_install
       }
       else {  // check if all keys are numeric
         $isnum = true;
-        foreach ($var as $key => $value) {
+        foreach (array_keys($var) as $key) {
           if (!is_numeric($key)) {
             $isnum = false;
             break;
@@ -638,8 +639,10 @@ class rcube_install
    */
   function update_db($version)
   {
-    system(INSTALL_PATH . "bin/updatedb.sh --package=roundcube --version=" . $version
-      . " --dir=" . INSTALL_PATH . "SQL", $result);
+    system(INSTALL_PATH . "bin/updatedb.sh --package=roundcube"
+      . " --version=" . escapeshellarg($version)
+      . " --dir=" . INSTALL_PATH . "SQL"
+      . " 2>&1", $result);
 
     return !$result;
   }
@@ -654,6 +657,7 @@ class rcube_install
    */
   function exec_sql($sql, $DB)
   {
+    $sql = $this->fix_table_names($sql, $DB);
     $buff = '';
     foreach (explode("\n", $sql) as $line) {
       if (preg_match('/^--/', $line) || trim($line) == '')
@@ -673,6 +677,35 @@ class rcube_install
 
 
   /**
+   * Parse SQL file and fix table names according to db_prefix
+   * Note: This need to be a complete database initial file
+   */
+  private function fix_table_names($sql, $DB)
+  {
+    if (empty($this->config['db_prefix'])) {
+        return $sql;
+    }
+
+    // replace table names
+    if (preg_match_all('/CREATE TABLE (\[dbo\]\.|IF NOT EXISTS )?[`"\[\]]*([^`"\[\] \r\n]+)/i', $sql, $matches)) {
+      foreach ($matches[2] as $table) {
+        $real_table = $this->config['db_prefix'] . $table;
+        $sql = preg_replace("/([^a-zA-Z0-9_])$table([^a-zA-Z0-9_])/", "\\1$real_table\\2", $sql);
+      }
+    }
+    // replace sequence names
+    if ($DB->db_provider == 'postgres' && preg_match_all('/CREATE SEQUENCE (IF NOT EXISTS )?"?([^" \n\r]+)/i', $sql, $matches)) {
+      foreach ($matches[2] as $sequence) {
+        $real_sequence = $this->config['db_prefix'] . $sequence;
+        $sql = preg_replace("/([^a-zA-Z0-9_])$sequence([^a-zA-Z0-9_])/", "\\1$real_sequence\\2", $sql);
+      }
+    }
+
+    return $sql;
+  }
+
+
+  /**
    * Handler for Roundcube errors
    */
   function raise_error($p)
diff --git a/installer/test.php b/installer/test.php
index bd49ac523..fb3e7e937 100644
--- a/installer/test.php
+++ b/installer/test.php
@@ -24,7 +24,7 @@ else if (!$read_main) {
 }
 echo '<br />';
 
-if ($read_db && !empty($RCI->config['db_table_users'])) {
+if ($read_db && !empty($RCI->config['db_dsnw'])) {
   $RCI->pass('db.inc.php');
 }
 else if ($read_db) {
@@ -38,13 +38,13 @@ if ($RCI->configured && ($messages = $RCI->check_config())) {
   
   if (is_array($messages['missing'])) {
     echo '<h3 class="warning">Missing config options</h3>';
-    echo '<p class="hint">The following config options are not present in the current configuration.<br/>';
-    echo 'Please check the default config files and add the missing properties to your local config files.</p>';
-    
-    echo '<ul class="configwarings">';
+    echo '<p class="hint">The following config options are not set (not present or empty) in the current configuration.<br/>';
+    echo 'Please check the default config files and set the missing properties in your local config files.</p>';
+
+    echo '<ul class="configwarnings">';
     foreach ($messages['missing'] as $msg) {
       echo html::tag('li', null, html::span('propname', $msg['prop']) . ($msg['name'] ? ':&nbsp;' . $msg['name'] : ''));
-    }    
+    }
     echo '</ul>';
   }
 
@@ -171,7 +171,7 @@ else if ($db_working && $_POST['updatedb']) {
 
 // test database
 if ($db_working) {
-    $db_read = $DB->query("SELECT count(*) FROM {$RCI->config['db_table_users']}");
+    $db_read = $DB->query("SELECT count(*) FROM {$RCI->config['db_prefix']}users");
     if ($DB->is_error()) {
         $RCI->fail('DB Schema', "Database not initialized");
         echo '<p><input type="submit" name="initdb" value="Initialize database" /></p>';
@@ -195,11 +195,11 @@ if ($db_working) {
 if ($db_working) {
     // write test
     $insert_id = md5(uniqid());
-    $db_write = $DB->query("INSERT INTO {$RCI->config['db_table_session']} (sess_id, created, ip, vars) VALUES (?, ".$DB->now().", '127.0.0.1', 'foo')", $insert_id);
+    $db_write = $DB->query("INSERT INTO {$RCI->config['db_prefix']}session (sess_id, created, ip, vars) VALUES (?, ".$DB->now().", '127.0.0.1', 'foo')", $insert_id);
 
     if ($db_write) {
       $RCI->pass('DB Write');
-      $DB->query("DELETE FROM {$RCI->config['db_table_session']} WHERE sess_id=?", $insert_id);
+      $DB->query("DELETE FROM {$RCI->config['db_prefix']}session WHERE sess_id=?", $insert_id);
     }
     else {
       $RCI->fail('DB Write', $RCI->get_error());
diff --git a/plugins/acl/acl.js b/plugins/acl/acl.js
index b6e2c811d..d6934780f 100644
--- a/plugins/acl/acl.js
+++ b/plugins/acl/acl.js
@@ -302,7 +302,7 @@ rcube_webmail.prototype.acl_init_form = function(id)
         li_elements.map(function() {
             val = this.value;
             td = $('td.'+this.id, row);
-            if (td && td.hasClass('enabled'))
+            if (td.length && td.hasClass('enabled'))
                 this.checked = true;
         });
 
diff --git a/plugins/acl/acl.php b/plugins/acl/acl.php
index ffaa51b6d..59406262e 100644
--- a/plugins/acl/acl.php
+++ b/plugins/acl/acl.php
@@ -234,7 +234,8 @@ class acl extends rcube_plugin
 
         // Advanced rights
         $attrib['id'] = 'advancedrights';
-        foreach ($supported as $idx => $val) {
+        foreach ($supported as $key => $val) {
+            $id = "acl$val";
             $ul .= html::tag('li', null,
                 $input->show('', array(
                     'name' => "acl[$val]", 'value' => $val, 'id' => $id))
@@ -384,7 +385,6 @@ class acl extends rcube_plugin
             $table->add_header(array('class' => 'acl'.$key, 'title' => $label), $label);
         }
 
-        $i = 1;
         $js_table = array();
         foreach ($acl as $user => $rights) {
             if ($this->rc->storage->conn->user == $user) {
@@ -433,8 +433,9 @@ class acl extends rcube_plugin
         $acl   = trim(rcube_utils::get_input_value('_acl', rcube_utils::INPUT_GPC));
         $oldid = trim(rcube_utils::get_input_value('_old', rcube_utils::INPUT_GPC));
 
-        $acl   = array_intersect(str_split($acl), $this->rights_supported());
-        $users = $oldid ? array($user) : explode(',', $user);
+        $acl    = array_intersect(str_split($acl), $this->rights_supported());
+        $users  = $oldid ? array($user) : explode(',', $user);
+        $result = 0;
 
         foreach ($users as $user) {
             $user = trim($user);
@@ -442,7 +443,7 @@ class acl extends rcube_plugin
             if (!empty($this->specials) && in_array($user, $this->specials)) {
                 $username = $this->gettext($user);
             }
-            else {
+            else if (!empty($user)) {
                 if (!strpos($user, '@') && ($realm = $this->get_realm())) {
                     $user .= '@' . rcube_utils::idn_to_ascii(preg_replace('/^@/', '', $realm));
                 }
@@ -453,6 +454,9 @@ class acl extends rcube_plugin
                 continue;
             }
 
+            $user     = $this->mod_login($user);
+            $username = $this->mod_login($username);
+
             if ($user != $_SESSION['username'] && $username != $_SESSION['username']) {
                 if ($this->rc->storage->set_acl($mbox, $user, $acl)) {
                     $ret = array('id' => rcube_utils::html_identifier($user),
@@ -704,4 +708,23 @@ class acl extends rcube_plugin
 
         return $this->ldap->ready;
     }
+
+    /**
+     * Modify user login according to 'login_lc' setting
+     */
+    protected function mod_login($user)
+    {
+        $login_lc = $this->rc->config->get('login_lc');
+
+        if ($login_lc === true || $login_lc == 2) {
+            $user = mb_strtolower($user);
+        }
+        // lowercase domain name
+        else if ($login_lc && strpos($user, '@')) {
+            list($local, $domain) = explode('@', $user);
+            $user = $local . '@' . mb_strtolower($domain);
+        }
+
+        return $user;
+    }
 }
diff --git a/plugins/acl/localization/az_AZ.inc b/plugins/acl/localization/az_AZ.inc
index 77d1d9d84..d5543ddaa 100644
--- a/plugins/acl/localization/az_AZ.inc
+++ b/plugins/acl/localization/az_AZ.inc
@@ -2,18 +2,20 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/az_AZ/labels.inc                                         |
+ | plugins/acl/localization/<lang>.inc                                   |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail ACL plugin                 |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Orkhan Guliyev <proger@box.az>                                |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
 
-$labels = array();
 $labels['sharing'] = 'Paylaşma';
 $labels['myrights'] = 'Giriş hüququ';
 $labels['username'] = 'İstifadəçi:';
@@ -23,44 +25,48 @@ $labels['actions'] = 'Giriş hüququ ilə hərəkət...';
 $labels['anyone'] = 'Bütün istifadəçilər (istənilən)';
 $labels['anonymous'] = 'Qonaqlar (anonimlər)';
 $labels['identifier'] = 'İdentifikator';
+
 $labels['acll'] = 'Baxış';
-$labels['shortacll'] = 'Baxış';
 $labels['aclr'] = 'Məktubu oxu';
 $labels['acls'] = 'Oxunulan kimi saxla';
 $labels['aclw'] = 'Yazı bayrağı';
 $labels['acli'] = 'Əlavə et (kopyala)';
 $labels['aclp'] = 'Yazı';
-$labels['shortaclp'] = 'Yazı';
 $labels['aclc'] = 'Qovluqaltı yarat';
 $labels['aclk'] = 'Qovluqaltı yarat';
 $labels['acld'] = 'Məktubu sil';
 $labels['aclt'] = 'Məktubu sil';
 $labels['acle'] = 'Poz';
-$labels['shortacle'] = 'Poz';
 $labels['aclx'] = 'Qovluğu sil';
 $labels['acla'] = 'İdarə';
-$labels['shortacla'] = 'İdarə';
+
 $labels['aclfull'] = 'Tam idarə';
 $labels['aclother'] = 'Digər';
-$labels['shortaclother'] = 'Digər';
 $labels['aclread'] = 'Oxu';
-$labels['shortaclr'] = 'Oxu';
-$labels['shortaclread'] = 'Oxu';
 $labels['aclwrite'] = 'Yaz';
-$labels['shortaclw'] = 'Yaz';
-$labels['shortaclwrite'] = 'Yaz';
 $labels['acldelete'] = 'Sil';
-$labels['shortacld'] = 'Sil';
-$labels['shortaclt'] = 'Sil';
-$labels['shortacldelete'] = 'Sil';
+
+$labels['shortacll'] = 'Baxış';
+$labels['shortaclr'] = 'Oxu';
 $labels['shortacls'] = 'Saxla';
+$labels['shortaclw'] = 'Yaz';
 $labels['shortacli'] = 'Yerləşdir';
+$labels['shortaclp'] = 'Yazı';
 $labels['shortaclc'] = 'Yarat';
 $labels['shortaclk'] = 'Yarat';
+$labels['shortacld'] = 'Sil';
+$labels['shortaclt'] = 'Sil';
+$labels['shortacle'] = 'Poz';
 $labels['shortaclx'] = 'Qovluğun silinməsi';
+$labels['shortacla'] = 'İdarə';
+
+$labels['shortaclother'] = 'Digər';
+$labels['shortaclread'] = 'Oxu';
+$labels['shortaclwrite'] = 'Yaz';
+$labels['shortacldelete'] = 'Sil';
+
 $labels['longacll'] = 'Qovluq siyahıda görünür və yazılmağa hazırdır';
 $labels['longaclr'] = 'Bu qovluq oxunmaq üçün açıla bilər';
-$labels['longaclread'] = 'Bu qovluq oxunmaq üçün açıla bilər';
 $labels['longacls'] = 'Oxunulan flaqı dəyişdirilə bilər';
 $labels['longaclw'] = 'Oxunulan və silinənlərdən başqa flaqlar və açar sözləri dəyişdirilə bilər';
 $labels['longacli'] = 'Məktub qovluğa yazıla və ya saxlanıla bilər';
@@ -72,18 +78,22 @@ $labels['longaclt'] = 'Silinən flaqı dəyişdirilə bilər';
 $labels['longacle'] = 'Məktublar pozula bilər';
 $labels['longaclx'] = 'Bu qovluq silinə və ya adı dəyişdirilə bilər';
 $labels['longacla'] = 'Bu qovluğa giriş hüququ dəyişdirilə bilər';
+
 $labels['longaclfull'] = 'Qovluğun idarəsi ilə birlikdə, tam giriş.';
+$labels['longaclread'] = 'Bu qovluq oxunmaq üçün açıla bilər';
 $labels['longaclwrite'] = 'Məktubu bu qovluğa qeyd etmək, yazmaq və kopyalamaq olar';
 $labels['longacldelete'] = 'Məktubu silmək olar';
-$labels['deleting'] = 'Giriş hüququnun silinməsi...';
-$labels['saving'] = 'Giriş hüququnun saxlanılması...';
-$labels['updatesuccess'] = 'Giriş hüququ dəyişdirildi';
-$labels['deletesuccess'] = 'Giriş hüququ silindi';
-$labels['createsuccess'] = 'Giriş hüququ əlavə edildi';
-$labels['updateerror'] = 'Giriş hüququnu yeniləmək mümkün deyil';
-$labels['deleteerror'] = 'Giriş hüququnu silmək mümkün deyil';
-$labels['createerror'] = 'Giriş hüququnu əlavə etmək mümkün deyil';
-$labels['deleteconfirm'] = 'Seçilmiş istifadəçilərin giriş hüququnu silməkdə əminsiniz?';
-$labels['norights'] = 'Giriş hüquqları göstərilməyib!';
-$labels['nouser'] = 'İstifadəçi adı təyin olunmayıb!';
 
+$messages['deleting'] = 'Giriş hüququnun silinməsi...';
+$messages['saving'] = 'Giriş hüququnun saxlanılması...';
+$messages['updatesuccess'] = 'Giriş hüququ dəyişdirildi';
+$messages['deletesuccess'] = 'Giriş hüququ silindi';
+$messages['createsuccess'] = 'Giriş hüququ əlavə edildi';
+$messages['updateerror'] = 'Giriş hüququnu yeniləmək mümkün deyil';
+$messages['deleteerror'] = 'Giriş hüququnu silmək mümkün deyil';
+$messages['createerror'] = 'Giriş hüququnu əlavə etmək mümkün deyil';
+$messages['deleteconfirm'] = 'Seçilmiş istifadəçilərin giriş hüququnu silməkdə əminsiniz?';
+$messages['norights'] = 'Giriş hüquqları göstərilməyib!';
+$messages['nouser'] = 'İstifadəçi adı təyin olunmayıb!';
+
+?>
diff --git a/plugins/acl/localization/bs_BA.inc b/plugins/acl/localization/bs_BA.inc
index 90eb254ad..b14db1b67 100644
--- a/plugins/acl/localization/bs_BA.inc
+++ b/plugins/acl/localization/bs_BA.inc
@@ -2,18 +2,20 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/bs_BA/labels.inc                                         |
+ | plugins/acl/localization/<lang>.inc                                   |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail ACL plugin                 |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Kenan Dervišević <kenan3008@gmail.com>                      |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
 
-$labels = array();
 $labels['sharing'] = 'Razmjena';
 $labels['myrights'] = 'Prava pristupa';
 $labels['username'] = 'Korisnik:';
@@ -23,44 +25,48 @@ $labels['actions'] = 'Akcije za prava pristupa...';
 $labels['anyone'] = 'Svi korisnici (bilo ko)';
 $labels['anonymous'] = 'Gosti (anonimno)';
 $labels['identifier'] = 'Identifikator';
+
 $labels['acll'] = 'Pronađi';
-$labels['shortacll'] = 'Pronađi';
 $labels['aclr'] = 'Pročitaj poruke';
 $labels['acls'] = 'Zadrži stanje pregleda';
 $labels['aclw'] = 'Oznake za pisanje';
 $labels['acli'] = 'Umetni (Kopiraj u)';
 $labels['aclp'] = 'Objavi';
-$labels['shortaclp'] = 'Objavi';
 $labels['aclc'] = 'Napravi podfoldere';
 $labels['aclk'] = 'Napravi podfoldere';
 $labels['acld'] = 'Obriši poruke';
 $labels['aclt'] = 'Obriši poruke';
 $labels['acle'] = 'Izbriši';
-$labels['shortacle'] = 'Izbriši';
 $labels['aclx'] = 'Obriši folder';
 $labels['acla'] = 'Administracija';
-$labels['shortacla'] = 'Administracija';
+
 $labels['aclfull'] = 'Puna kontrola';
 $labels['aclother'] = 'Ostalo';
-$labels['shortaclother'] = 'Ostalo';
 $labels['aclread'] = 'Pročitano';
-$labels['shortaclr'] = 'Pročitano';
-$labels['shortaclread'] = 'Pročitano';
 $labels['aclwrite'] = 'Piši';
-$labels['shortaclw'] = 'Piši';
-$labels['shortaclwrite'] = 'Piši';
 $labels['acldelete'] = 'Obriši';
-$labels['shortacld'] = 'Obriši';
-$labels['shortaclt'] = 'Obriši';
-$labels['shortacldelete'] = 'Obriši';
+
+$labels['shortacll'] = 'Pronađi';
+$labels['shortaclr'] = 'Pročitano';
 $labels['shortacls'] = 'Zadrži';
+$labels['shortaclw'] = 'Piši';
 $labels['shortacli'] = 'Umetni';
+$labels['shortaclp'] = 'Objavi';
 $labels['shortaclc'] = 'Kreiraj';
 $labels['shortaclk'] = 'Kreiraj';
+$labels['shortacld'] = 'Obriši';
+$labels['shortaclt'] = 'Obriši';
+$labels['shortacle'] = 'Izbriši';
 $labels['shortaclx'] = 'Brisanje foldera';
+$labels['shortacla'] = 'Administracija';
+
+$labels['shortaclother'] = 'Ostalo';
+$labels['shortaclread'] = 'Pročitano';
+$labels['shortaclwrite'] = 'Piši';
+$labels['shortacldelete'] = 'Obriši';
+
 $labels['longacll'] = 'Ovaj folder je vidljiv u listama i moguće je izvršiti pretplatu na njega';
 $labels['longaclr'] = 'Folder je moguće otvoriti radi čitanja';
-$labels['longaclread'] = 'Folder je moguće otvoriti radi čitanja';
 $labels['longacls'] = 'Oznaka čitanja za poruke se može promijeniti';
 $labels['longaclw'] = 'Oznake za poruke i ključne riječi je moguće promijeniti, osim za pregledano i obrisano';
 $labels['longacli'] = 'Moguće je kopirati i zapisivati poruke u folder';
@@ -72,18 +78,22 @@ $labels['longaclt'] = 'Oznaka za obrisane poruke se može mijenjati';
 $labels['longacle'] = 'Poruke je moguće obrisati';
 $labels['longaclx'] = 'Folder je moguće obrisati ili preimenovati';
 $labels['longacla'] = 'Pristupna prava foldera je moguće promijeniti';
+
 $labels['longaclfull'] = 'Puna kontrola uključujući i administraciju foldera';
+$labels['longaclread'] = 'Folder je moguće otvoriti radi čitanja';
 $labels['longaclwrite'] = 'Moguće je označavati, zapisivati i kopirati poruke u folder';
 $labels['longacldelete'] = 'Moguće je obrisati poruke';
-$labels['deleting'] = 'Brišem prava pristupa...';
-$labels['saving'] = 'Snimam prava pristupa...';
-$labels['updatesuccess'] = 'Prava pristupa su uspješno promijenjena';
-$labels['deletesuccess'] = 'Prava pristupa su uspješno obrisana';
-$labels['createsuccess'] = 'Prava pristupa su uspješno dodana';
-$labels['updateerror'] = 'Nije moguće ažurirati prava pristupa';
-$labels['deleteerror'] = 'Nije moguće obrisati prava pristupa';
-$labels['createerror'] = 'Nije moguće dodati prava pristupa';
-$labels['deleteconfirm'] = 'Jeste li sigurni da želite ukloniti prava pristupa za odabrane korisnike?';
-$labels['norights'] = 'Niste odabrali prava pristupa!';
-$labels['nouser'] = 'Niste odabrali korisničko ime!';
 
+$messages['deleting'] = 'Brišem prava pristupa...';
+$messages['saving'] = 'Snimam prava pristupa...';
+$messages['updatesuccess'] = 'Prava pristupa su uspješno promijenjena';
+$messages['deletesuccess'] = 'Prava pristupa su uspješno obrisana';
+$messages['createsuccess'] = 'Prava pristupa su uspješno dodana';
+$messages['updateerror'] = 'Nije moguće ažurirati prava pristupa';
+$messages['deleteerror'] = 'Nije moguće obrisati prava pristupa';
+$messages['createerror'] = 'Nije moguće dodati prava pristupa';
+$messages['deleteconfirm'] = 'Jeste li sigurni da želite ukloniti prava pristupa za odabrane korisnike?';
+$messages['norights'] = 'Niste odabrali prava pristupa!';
+$messages['nouser'] = 'Niste odabrali korisničko ime!';
+
+?>
diff --git a/plugins/acl/localization/ca_ES.inc b/plugins/acl/localization/ca_ES.inc
index c182736c2..f660b8505 100644
--- a/plugins/acl/localization/ca_ES.inc
+++ b/plugins/acl/localization/ca_ES.inc
@@ -2,18 +2,20 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ca_ES/labels.inc                                         |
+ | plugins/acl/localization/<lang>.inc                                   |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail ACL plugin                 |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Jordi Sanfeliu <jordi@fibranet.cat>                           |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
 
-$labels = array();
 $labels['sharing'] = 'Comparteix';
 $labels['myrights'] = 'Permisos d\'accés';
 $labels['username'] = 'Usuari:';
@@ -23,44 +25,48 @@ $labels['actions'] = 'Accions dels permisos d\'accés';
 $labels['anyone'] = 'Tots els usuaris';
 $labels['anonymous'] = 'Convidats';
 $labels['identifier'] = 'Identificador';
+
 $labels['acll'] = 'Cerca';
-$labels['shortacll'] = 'Cerca';
 $labels['aclr'] = 'Llegeix missatges';
 $labels['acls'] = 'Conserva\'l com a llegit';
 $labels['aclw'] = 'Escriu marques';
 $labels['acli'] = 'Insereix (copia dins)';
 $labels['aclp'] = 'Envia l\'entrada';
-$labels['shortaclp'] = 'Envia l\'entrada';
 $labels['aclc'] = 'Crea subcarpetes';
 $labels['aclk'] = 'Crea subcarpetes';
 $labels['acld'] = 'Suprimeix missatges';
 $labels['aclt'] = 'Suprimeix missatges';
 $labels['acle'] = 'Buida';
-$labels['shortacle'] = 'Buida';
 $labels['aclx'] = 'Suprimeix carpeta';
 $labels['acla'] = 'Administra';
-$labels['shortacla'] = 'Administra';
+
 $labels['aclfull'] = 'Control total';
 $labels['aclother'] = 'Un altre';
-$labels['shortaclother'] = 'Un altre';
 $labels['aclread'] = 'Lectura';
-$labels['shortaclr'] = 'Lectura';
-$labels['shortaclread'] = 'Lectura';
 $labels['aclwrite'] = 'Escriptura';
-$labels['shortaclw'] = 'Escriptura';
-$labels['shortaclwrite'] = 'Escriptura';
 $labels['acldelete'] = 'Suprimeix';
-$labels['shortacld'] = 'Suprimeix';
-$labels['shortaclt'] = 'Suprimeix';
-$labels['shortacldelete'] = 'Suprimeix';
+
+$labels['shortacll'] = 'Cerca';
+$labels['shortaclr'] = 'Lectura';
 $labels['shortacls'] = 'Conserva';
+$labels['shortaclw'] = 'Escriptura';
 $labels['shortacli'] = 'Insereix';
+$labels['shortaclp'] = 'Envia l\'entrada';
 $labels['shortaclc'] = 'Crea';
 $labels['shortaclk'] = 'Crea';
+$labels['shortacld'] = 'Suprimeix';
+$labels['shortaclt'] = 'Suprimeix';
+$labels['shortacle'] = 'Buida';
 $labels['shortaclx'] = 'Suprimeix carpeta';
+$labels['shortacla'] = 'Administra';
+
+$labels['shortaclother'] = 'Un altre';
+$labels['shortaclread'] = 'Lectura';
+$labels['shortaclwrite'] = 'Escriptura';
+$labels['shortacldelete'] = 'Suprimeix';
+
 $labels['longacll'] = 'La carpeta és visible a les llistes i s\'hi pot subscriure';
 $labels['longaclr'] = 'La carpeta pot ser oberta per llegir';
-$labels['longaclread'] = 'La carpeta pot ser oberta per llegir';
 $labels['longacls'] = 'Els missatges marcats com a Llegit poden ser canviats';
 $labels['longaclw'] = 'Les marques i les paraules clau dels missatges poden ser canviats, excepte els Llegit i Suprimit';
 $labels['longacli'] = 'Els missatges poden ser escrits i copiats a la carpeta';
@@ -72,18 +78,22 @@ $labels['longaclt'] = 'Poden ser canviats els missatges amb l\'indicador Suprimi
 $labels['longacle'] = 'Els missatges poden ser purgats';
 $labels['longaclx'] = 'La carpeta pot ser suprimida o reanomenada';
 $labels['longacla'] = 'Els permisos d\'accés a la carpeta poden ser canviats';
+
 $labels['longaclfull'] = 'Control total fins i tot la gestió de carpetes';
+$labels['longaclread'] = 'La carpeta pot ser oberta per llegir';
 $labels['longaclwrite'] = 'Els missatges poden ser marcats, escrits o copiats a la carpeta';
 $labels['longacldelete'] = 'Els missatges poden ser suprimits';
-$labels['deleting'] = 'Suprimint els permisos d\'accés...';
-$labels['saving'] = 'Desant els permisos d\'accés...';
-$labels['updatesuccess'] = 'Els permisos d\'accés han estat canviats correctament';
-$labels['deletesuccess'] = 'Els permisos d\'accés han estat suprimits correctament';
-$labels['createsuccess'] = 'Els permisos d\'accés han afegits suprimits correctament';
-$labels['updateerror'] = 'No s\'ha pogut actualitzar els permisos d\'accés';
-$labels['deleteerror'] = 'No s\'ha pogut suprimir els permisos d\'accés';
-$labels['createerror'] = 'No s\'ha pogut afegir els permisos d\'accés';
-$labels['deleteconfirm'] = 'Esteu segurs que voleu suprimir els permisos d\'accés de l\'usuari o usuaris seleccionats?';
-$labels['norights'] = 'No s\'ha especificat cap permís';
-$labels['nouser'] = 'No s\'ha especificat cap nom d\'usuari';
 
+$messages['deleting'] = 'Suprimint els permisos d\'accés...';
+$messages['saving'] = 'Desant els permisos d\'accés...';
+$messages['updatesuccess'] = 'Els permisos d\'accés han estat canviats correctament';
+$messages['deletesuccess'] = 'Els permisos d\'accés han estat suprimits correctament';
+$messages['createsuccess'] = 'Els permisos d\'accés han afegits suprimits correctament';
+$messages['updateerror'] = 'No s\'ha pogut actualitzar els permisos d\'accés';
+$messages['deleteerror'] = 'No s\'ha pogut suprimir els permisos d\'accés';
+$messages['createerror'] = 'No s\'ha pogut afegir els permisos d\'accés';
+$messages['deleteconfirm'] = 'Esteu segurs que voleu suprimir els permisos d\'accés de l\'usuari o usuaris seleccionats?';
+$messages['norights'] = 'No s\'ha especificat cap permís';
+$messages['nouser'] = 'No s\'ha especificat cap nom d\'usuari';
+
+?>
diff --git a/plugins/acl/localization/cs_CZ.inc b/plugins/acl/localization/cs_CZ.inc
index f3bef5335..167788b4c 100644
--- a/plugins/acl/localization/cs_CZ.inc
+++ b/plugins/acl/localization/cs_CZ.inc
@@ -2,62 +2,73 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/cs_CZ/labels.inc                                         |
+ | plugins/acl/localization/<lang>.inc                                   |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail ACL plugin                 |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Zbynek Vanzura <heptau@gmail.com>                             |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
 
-$labels = array();
 $labels['sharing'] = 'Sdílení';
 $labels['myrights'] = 'Přístupová práva';
 $labels['username'] = 'Uživatel:';
 $labels['advanced'] = 'pokročilý režim';
 $labels['newuser'] = 'Přidat záznam';
+$labels['actions'] = 'Přístupové právo akce ...';
 $labels['anyone'] = 'Všichni uživatelé (kdokoli)';
 $labels['anonymous'] = 'Hosté (anonymní)';
 $labels['identifier'] = 'Identifikátor';
+
+$labels['acll'] = 'Vyhledat';
 $labels['aclr'] = 'Číst zprávy';
+$labels['acls'] = 'Ponechat stav Přečteno';
 $labels['aclw'] = 'Zapsat označení';
 $labels['acli'] = 'Vložit (Kopírovat do)';
 $labels['aclp'] = 'Odeslat';
-$labels['shortaclp'] = 'Odeslat';
 $labels['aclc'] = 'Vytvořit podsložky';
 $labels['aclk'] = 'Vytvořit podsložky';
 $labels['acld'] = 'Smazat zprávy';
 $labels['aclt'] = 'Smazat zprávy';
 $labels['acle'] = 'Vyprázdnit';
-$labels['shortacle'] = 'Vyprázdnit';
 $labels['aclx'] = 'Smazat složku';
 $labels['acla'] = 'Spravovat';
-$labels['shortacla'] = 'Spravovat';
+
 $labels['aclfull'] = 'Plný přístup';
 $labels['aclother'] = 'Ostatní';
-$labels['shortaclother'] = 'Ostatní';
 $labels['aclread'] = 'Číst';
-$labels['shortaclr'] = 'Číst';
-$labels['shortaclread'] = 'Číst';
 $labels['aclwrite'] = 'Zapsat';
-$labels['shortaclw'] = 'Zapsat';
-$labels['shortaclwrite'] = 'Zapsat';
 $labels['acldelete'] = 'Smazat';
-$labels['shortacld'] = 'Smazat';
-$labels['shortaclt'] = 'Smazat';
-$labels['shortacldelete'] = 'Smazat';
+
+$labels['shortacll'] = 'Vyhledat';
+$labels['shortaclr'] = 'Číst';
 $labels['shortacls'] = 'Zachovat';
+$labels['shortaclw'] = 'Zapsat';
 $labels['shortacli'] = 'Vložit';
+$labels['shortaclp'] = 'Odeslat';
 $labels['shortaclc'] = 'Vytvořit';
 $labels['shortaclk'] = 'Vytvořit';
+$labels['shortacld'] = 'Smazat';
+$labels['shortaclt'] = 'Smazat';
+$labels['shortacle'] = 'Vyprázdnit';
 $labels['shortaclx'] = 'Mazat složky';
+$labels['shortacla'] = 'Spravovat';
+
+$labels['shortaclother'] = 'Ostatní';
+$labels['shortaclread'] = 'Číst';
+$labels['shortaclwrite'] = 'Zapsat';
+$labels['shortacldelete'] = 'Smazat';
+
 $labels['longacll'] = 'Složka je viditelná v seznamu a může být přihlášena';
 $labels['longaclr'] = 'Složka může být otevřena pro čtení';
-$labels['longaclread'] = 'Složka může být otevřena pro čtení';
 $labels['longacls'] = 'Označená zpráva byla změněna';
+$labels['longaclw'] = 'Značky a klíčová slova u zpráv je možné měnit, kromě příznaku Přečteno a Smazáno';
 $labels['longacli'] = 'Zpŕava může být napsána nebo zkopírována do složky';
 $labels['longaclp'] = 'Zpráva byla odeslána do složky';
 $labels['longaclc'] = 'Složka může být vytvořena (nebo přejmenována) přimo v této složce';
@@ -67,18 +78,22 @@ $labels['longaclt'] = 'Značka o smazání zprávy může být změněna';
 $labels['longacle'] = 'Zpráva může být smazána';
 $labels['longaclx'] = 'Složka může být smazána nebo přejmenována';
 $labels['longacla'] = 'Přístupová práva složky mohou být změněna';
+
 $labels['longaclfull'] = 'Plný přístup včetně správy složky';
+$labels['longaclread'] = 'Složka může být otevřena pro čtení';
 $labels['longaclwrite'] = 'Zpráva může být označena, napsána nebo zkopírována do složky';
 $labels['longacldelete'] = 'Zprávy mohou být smazány';
-$labels['deleting'] = 'Odstraňuji přístupová práva...';
-$labels['saving'] = 'Ukládám přístupová práva...';
-$labels['updatesuccess'] = 'Přístupová práva byla úspěšně změněna';
-$labels['deletesuccess'] = 'Přístupová páva byla úspěšně odstraněna';
-$labels['createsuccess'] = 'Přístupová práva byla úspěšně přídána';
-$labels['updateerror'] = 'Nelze upravit přístupová práva';
-$labels['deleteerror'] = 'Nelze odstranit přístupová práva';
-$labels['createerror'] = 'Nelze přidat přístupová práva';
-$labels['deleteconfirm'] = 'Opravdu si přejete odstranit přístupová práva pro vybrané(ho) uživatele?';
-$labels['norights'] = 'Nejsou specifikována žádná práva!';
-$labels['nouser'] = 'Není specifikováno uživatelské jméno';
 
+$messages['deleting'] = 'Odstraňuji přístupová práva...';
+$messages['saving'] = 'Ukládám přístupová práva...';
+$messages['updatesuccess'] = 'Přístupová práva byla úspěšně změněna';
+$messages['deletesuccess'] = 'Přístupová páva byla úspěšně odstraněna';
+$messages['createsuccess'] = 'Přístupová práva byla úspěšně přídána';
+$messages['updateerror'] = 'Nelze upravit přístupová práva';
+$messages['deleteerror'] = 'Nelze odstranit přístupová práva';
+$messages['createerror'] = 'Nelze přidat přístupová práva';
+$messages['deleteconfirm'] = 'Opravdu si přejete odstranit přístupová práva pro vybrané(ho) uživatele?';
+$messages['norights'] = 'Nejsou specifikována žádná práva!';
+$messages['nouser'] = 'Není specifikováno uživatelské jméno';
+
+?>
diff --git a/plugins/acl/localization/cy_GB.inc b/plugins/acl/localization/cy_GB.inc
index 20dd1495b..bf6e870e8 100644
--- a/plugins/acl/localization/cy_GB.inc
+++ b/plugins/acl/localization/cy_GB.inc
@@ -2,18 +2,20 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/cy_GB/labels.inc                                         |
+ | plugins/acl/localization/<lang>.inc                                   |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail ACL plugin                 |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Dafydd Tomos                                                  |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
 
-$labels = array();
 $labels['sharing'] = 'Rhannu';
 $labels['myrights'] = 'Hawliau Mynediad';
 $labels['username'] = 'Defnyddiwr:';
@@ -23,44 +25,48 @@ $labels['actions'] = 'Gweithredoedd hawl mynediad...';
 $labels['anyone'] = 'Pob defnyddiwr (unrhywun)';
 $labels['anonymous'] = 'Gwestai (anhysbys)';
 $labels['identifier'] = 'Dynodwr';
+
 $labels['acll'] = 'Chwilio';
-$labels['shortacll'] = 'Chwilio';
 $labels['aclr'] = 'Darllen negeseuon';
 $labels['acls'] = 'Cadw stad Gwelwyd';
 $labels['aclw'] = 'Fflagiau ysgrifennu';
 $labels['acli'] = 'Mewnosod (Copïo fewn i)';
 $labels['aclp'] = 'Postio';
-$labels['shortaclp'] = 'Postio';
 $labels['aclc'] = 'Creu is-ffolderi';
 $labels['aclk'] = 'Creu is-ffolderi';
 $labels['acld'] = 'Dileu negeseuon';
 $labels['aclt'] = 'Dileu negeseuon';
 $labels['acle'] = 'Dileu';
-$labels['shortacle'] = 'Dileu';
 $labels['aclx'] = 'Dileu ffolder';
 $labels['acla'] = 'Gweinyddu';
-$labels['shortacla'] = 'Gweinyddu';
+
 $labels['aclfull'] = 'Rheolaeth lawn';
 $labels['aclother'] = 'Arall';
-$labels['shortaclother'] = 'Arall';
 $labels['aclread'] = 'Darllen';
-$labels['shortaclr'] = 'Darllen';
-$labels['shortaclread'] = 'Darllen';
 $labels['aclwrite'] = 'Ysgrifennu';
-$labels['shortaclw'] = 'Ysgrifennu';
-$labels['shortaclwrite'] = 'Ysgrifennu';
 $labels['acldelete'] = 'Dileu';
-$labels['shortacld'] = 'Dileu';
-$labels['shortaclt'] = 'Dileu';
-$labels['shortacldelete'] = 'Dileu';
+
+$labels['shortacll'] = 'Chwilio';
+$labels['shortaclr'] = 'Darllen';
 $labels['shortacls'] = 'Cadw';
+$labels['shortaclw'] = 'Ysgrifennu';
 $labels['shortacli'] = 'Mewnosod';
+$labels['shortaclp'] = 'Postio';
 $labels['shortaclc'] = 'Creu';
 $labels['shortaclk'] = 'Creu';
+$labels['shortacld'] = 'Dileu';
+$labels['shortaclt'] = 'Dileu';
+$labels['shortacle'] = 'Dileu';
 $labels['shortaclx'] = 'Dileu ffolder';
+$labels['shortacla'] = 'Gweinyddu';
+
+$labels['shortaclother'] = 'Arall';
+$labels['shortaclread'] = 'Darllen';
+$labels['shortaclwrite'] = 'Ysgrifennu';
+$labels['shortacldelete'] = 'Dileu';
+
 $labels['longacll'] = 'Mae\'r ffolder hwn i\'w weld ar y rhestrau a mae\'n bosib tanysgrifio iddo';
 $labels['longaclr'] = 'Gellir agor y ffolder hwn i\'w ddarllen';
-$labels['longaclread'] = 'Gellir agor y ffolder hwn i\'w ddarllen';
 $labels['longacls'] = 'Gellir newid y fflag negeseuon Gwelwyd';
 $labels['longaclw'] = 'Gellir newid y fflagiau negeseuon a allweddeiriau, heblaw Gwelwyd a Dilëuwyd';
 $labels['longacli'] = 'Gellir ysgrifennu neu copïo negeseuon i\'r ffolder';
@@ -72,18 +78,22 @@ $labels['longaclt'] = 'Gellir newid fflag neges Dileu';
 $labels['longacle'] = 'Gellir gwaredu negeseuon';
 $labels['longaclx'] = 'Gellir dileu neu ail-enwi\'r ffolder';
 $labels['longacla'] = 'Gellir newid hawliau mynediad y ffolder';
+
 $labels['longaclfull'] = 'Rheolaeth lawn yn cynnwys rheolaeth ffolderi';
+$labels['longaclread'] = 'Gellir agor y ffolder hwn i\'w ddarllen';
 $labels['longaclwrite'] = 'Gellir nodi, ysgrifennu neu copïo negeseuon i\'r ffolder';
 $labels['longacldelete'] = 'Gellir dileu negeseuon';
-$labels['deleting'] = 'Yn dileu hawliau mynediad...';
-$labels['saving'] = 'Yn cadw hawliau mynediad...';
-$labels['updatesuccess'] = 'Wedi newid hawliau mynediad yn llwyddiannus';
-$labels['deletesuccess'] = 'Wedi dileu hawliau mynediad yn llwyddiannus';
-$labels['createsuccess'] = 'Wedi ychwanegu hawliau mynediad yn llwyddiannus';
-$labels['updateerror'] = 'Methwyd diweddaru hawliau mynediad';
-$labels['deleteerror'] = 'Methwyd dileu hawliau mynediad';
-$labels['createerror'] = 'Methwyd ychwanegu hawliau mynediad';
-$labels['deleteconfirm'] = 'Ydych chi\'n siwr eich bod am ddileu hawliau mynediad y defnyddiwr/wyr ddewiswyd?';
-$labels['norights'] = 'Nid oes hawliau wedi eu nodi!';
-$labels['nouser'] = 'Nid oes enw defnyddiwr wedi ei nodi!';
 
+$messages['deleting'] = 'Yn dileu hawliau mynediad...';
+$messages['saving'] = 'Yn cadw hawliau mynediad...';
+$messages['updatesuccess'] = 'Wedi newid hawliau mynediad yn llwyddiannus';
+$messages['deletesuccess'] = 'Wedi dileu hawliau mynediad yn llwyddiannus';
+$messages['createsuccess'] = 'Wedi ychwanegu hawliau mynediad yn llwyddiannus';
+$messages['updateerror'] = 'Methwyd diweddaru hawliau mynediad';
+$messages['deleteerror'] = 'Methwyd dileu hawliau mynediad';
+$messages['createerror'] = 'Methwyd ychwanegu hawliau mynediad';
+$messages['deleteconfirm'] = 'Ydych chi\'n siwr eich bod am ddileu hawliau mynediad y defnyddiwr/wyr ddewiswyd?';
+$messages['norights'] = 'Nid oes hawliau wedi eu nodi!';
+$messages['nouser'] = 'Nid oes enw defnyddiwr wedi ei nodi!';
+
+?>
diff --git a/plugins/acl/localization/da_DK.inc b/plugins/acl/localization/da_DK.inc
index d37e7c410..0830ccd99 100644
--- a/plugins/acl/localization/da_DK.inc
+++ b/plugins/acl/localization/da_DK.inc
@@ -2,18 +2,20 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/da_DK/labels.inc                                         |
+ | plugins/acl/localization/<lang>.inc                                   |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail ACL plugin                 |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Johannes Hessellund <osos@openeyes.dk>                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
 
-$labels = array();
 $labels['sharing'] = 'Deling';
 $labels['myrights'] = 'Adgangrettigheder';
 $labels['username'] = 'Bruger:';
@@ -23,44 +25,48 @@ $labels['actions'] = 'Tilgangsrettigheder...';
 $labels['anyone'] = 'Alle brugere';
 $labels['anonymous'] = 'Gæst (anonym)';
 $labels['identifier'] = 'Identifikator';
+
 $labels['acll'] = 'Slå op';
-$labels['shortacll'] = 'Slå op';
 $labels['aclr'] = 'Læs beskeder';
 $labels['acls'] = 'Behold læst-status';
 $labels['aclw'] = 'Skriv flag';
 $labels['acli'] = 'Indsæt (kopier ind i)';
 $labels['aclp'] = 'Send';
-$labels['shortaclp'] = 'Send';
 $labels['aclc'] = 'Opret undermapper';
 $labels['aclk'] = 'Opret undermapper';
 $labels['acld'] = 'Slet beskeder';
 $labels['aclt'] = 'Slet beskeder';
 $labels['acle'] = 'Udslet';
-$labels['shortacle'] = 'Udslet';
 $labels['aclx'] = 'Slet mappe';
 $labels['acla'] = 'Administrer';
-$labels['shortacla'] = 'Administrer';
+
 $labels['aclfull'] = 'Fuld kontrol';
 $labels['aclother'] = 'Andet';
-$labels['shortaclother'] = 'Andet';
 $labels['aclread'] = 'Læse';
-$labels['shortaclr'] = 'Læse';
-$labels['shortaclread'] = 'Læse';
 $labels['aclwrite'] = 'Skrive';
-$labels['shortaclw'] = 'Skrive';
-$labels['shortaclwrite'] = 'Skrive';
 $labels['acldelete'] = 'Slet';
-$labels['shortacld'] = 'Slet';
-$labels['shortaclt'] = 'Slet';
-$labels['shortacldelete'] = 'Slet';
+
+$labels['shortacll'] = 'Slå op';
+$labels['shortaclr'] = 'Læse';
 $labels['shortacls'] = 'Behold';
+$labels['shortaclw'] = 'Skrive';
 $labels['shortacli'] = 'Indsæt';
+$labels['shortaclp'] = 'Send';
 $labels['shortaclc'] = 'Opret';
 $labels['shortaclk'] = 'Opret';
+$labels['shortacld'] = 'Slet';
+$labels['shortaclt'] = 'Slet';
+$labels['shortacle'] = 'Udslet';
 $labels['shortaclx'] = 'Slet mappe';
+$labels['shortacla'] = 'Administrer';
+
+$labels['shortaclother'] = 'Andet';
+$labels['shortaclread'] = 'Læse';
+$labels['shortaclwrite'] = 'Skrive';
+$labels['shortacldelete'] = 'Slet';
+
 $labels['longacll'] = 'Mappen er synlig på listen og kan abonneres på';
 $labels['longaclr'] = 'Mappen kan åbnes for læsning';
-$labels['longaclread'] = 'Mappen kan åbnes for læsning';
 $labels['longacls'] = 'Beskeders Læst-flag kan ændres';
 $labels['longaclw'] = 'Beskeders flag og nøgleord kan ændres med undtagelse af Læst og Slettet';
 $labels['longacli'] = 'Beskeder kan blive skrevet eller kopieret til mappen';
@@ -72,18 +78,22 @@ $labels['longaclt'] = 'Beskeders Slet-flag kan ændres';
 $labels['longacle'] = 'Beskeder kan slettes';
 $labels['longaclx'] = 'Mappen kan blive slettet eller omdøbt';
 $labels['longacla'] = 'Mappen adgangsrettigheder kan ændres';
+
 $labels['longaclfull'] = 'Fuld kontrol inklusiv mappeadministration';
+$labels['longaclread'] = 'Mappen kan åbnes for læsning';
 $labels['longaclwrite'] = 'Beskeder kan blive markeret, skrevet eller kopieret til mappen';
 $labels['longacldelete'] = 'Beskeder kan slettes';
-$labels['deleting'] = 'Slette rettigheder...';
-$labels['saving'] = 'Gemme rettigheder...';
-$labels['updatesuccess'] = 'Tilgangsrettighederne blev ændret';
-$labels['deletesuccess'] = 'Sletterettigheder blev ændret';
-$labels['createsuccess'] = 'Tilgangsrettigheder blev tilføjet';
-$labels['updateerror'] = 'Kunne ikke opdatere tilgangsrettigheder';
-$labels['deleteerror'] = 'Kunne ikke slette tilgangsrettigheder';
-$labels['createerror'] = 'Kunne ikke tilføje tilgangsrettigheder';
-$labels['deleteconfirm'] = 'Er du sikker på, at du vil slette tilgangsrettigheder fra de(n) valgte bruger(e)?';
-$labels['norights'] = 'Der er ikke specificeret nogle rettigheder!';
-$labels['nouser'] = 'Der er ikke angiver et brugernavn!';
 
+$messages['deleting'] = 'Slette rettigheder...';
+$messages['saving'] = 'Gemme rettigheder...';
+$messages['updatesuccess'] = 'Tilgangsrettighederne blev ændret';
+$messages['deletesuccess'] = 'Sletterettigheder blev ændret';
+$messages['createsuccess'] = 'Tilgangsrettigheder blev tilføjet';
+$messages['updateerror'] = 'Kunne ikke opdatere tilgangsrettigheder';
+$messages['deleteerror'] = 'Kunne ikke slette tilgangsrettigheder';
+$messages['createerror'] = 'Kunne ikke tilføje tilgangsrettigheder';
+$messages['deleteconfirm'] = 'Er du sikker på, at du vil slette tilgangsrettigheder fra de(n) valgte bruger(e)?';
+$messages['norights'] = 'Der er ikke specificeret nogle rettigheder!';
+$messages['nouser'] = 'Der er ikke angiver et brugernavn!';
+
+?>
diff --git a/plugins/acl/localization/de_CH.inc b/plugins/acl/localization/de_CH.inc
index 65b56ff22..4f596678c 100644
--- a/plugins/acl/localization/de_CH.inc
+++ b/plugins/acl/localization/de_CH.inc
@@ -2,10 +2,10 @@
 
 /*
  +-----------------------------------------------------------------------+
- | plugins/acl/localization/<lang>.inc                                    |
+ | plugins/acl/localization/<lang>.inc                                   |
  |                                                                       |
  | Localization file of the Roundcube Webmail ACL plugin                 |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
diff --git a/plugins/acl/localization/de_DE.inc b/plugins/acl/localization/de_DE.inc
index cfb685c73..de8c13a33 100644
--- a/plugins/acl/localization/de_DE.inc
+++ b/plugins/acl/localization/de_DE.inc
@@ -2,18 +2,20 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/de_DE/labels.inc                                         |
+ | plugins/acl/localization/<lang>.inc                                   |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail ACL plugin                 |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
 
-$labels = array();
 $labels['sharing'] = 'Freigabe';
 $labels['myrights'] = 'Zugriffsrechte';
 $labels['username'] = 'Benutzer:';
@@ -23,44 +25,48 @@ $labels['actions'] = 'Zugriffsrechte Aktionen...';
 $labels['anyone'] = 'Alle Benutzer (anyone)';
 $labels['anonymous'] = 'Gäste (anonymous)';
 $labels['identifier'] = 'Bezeichnung';
+
 $labels['acll'] = 'Sichtbar';
-$labels['shortacll'] = 'Sichtbar';
 $labels['aclr'] = 'Nachrichten lesen';
 $labels['acls'] = 'Lesestatus ändern';
 $labels['aclw'] = 'Flags schreiben';
-$labels['acli'] = 'Nachrichten Hinzufügen';
+$labels['acli'] = 'Nachrichten hinzufügen';
 $labels['aclp'] = 'Senden an';
-$labels['shortaclp'] = 'Senden an';
 $labels['aclc'] = 'Unterordner erstellen';
 $labels['aclk'] = 'Unterordner erstellen';
 $labels['acld'] = 'Nachrichten als gelöscht markieren';
 $labels['aclt'] = 'Nachrichten als gelöscht markieren';
-$labels['acle'] = 'endgültig löschen';
-$labels['shortacle'] = 'endgültig löschen';
+$labels['acle'] = 'Endgültig löschen';
 $labels['aclx'] = 'Ordner löschen';
 $labels['acla'] = 'Verwalten';
-$labels['shortacla'] = 'Verwalten';
+
 $labels['aclfull'] = 'Vollzugriff';
 $labels['aclother'] = 'Andere';
-$labels['shortaclother'] = 'Andere';
 $labels['aclread'] = 'Lesen';
-$labels['shortaclr'] = 'Lesen';
-$labels['shortaclread'] = 'Lesen';
 $labels['aclwrite'] = 'Schreiben';
-$labels['shortaclw'] = 'Schreiben';
-$labels['shortaclwrite'] = 'Schreiben';
 $labels['acldelete'] = 'Löschen';
-$labels['shortacld'] = 'Löschen';
-$labels['shortaclt'] = 'Löschen';
-$labels['shortacldelete'] = 'Löschen';
+
+$labels['shortacll'] = 'Sichtbar';
+$labels['shortaclr'] = 'Lesen';
 $labels['shortacls'] = 'Lesestatus';
+$labels['shortaclw'] = 'Schreiben';
 $labels['shortacli'] = 'Hinzufügen';
+$labels['shortaclp'] = 'Senden an';
 $labels['shortaclc'] = 'Erstellen';
 $labels['shortaclk'] = 'Erstellen';
+$labels['shortacld'] = 'Löschen';
+$labels['shortaclt'] = 'Löschen';
+$labels['shortacle'] = 'Endgültig löschen';
 $labels['shortaclx'] = 'Ordner löschen';
+$labels['shortacla'] = 'Verwalten';
+
+$labels['shortaclother'] = 'Andere';
+$labels['shortaclread'] = 'Lesen';
+$labels['shortaclwrite'] = 'Schreiben';
+$labels['shortacldelete'] = 'Löschen';
+
 $labels['longacll'] = 'Der Ordner ist sichtbar und kann abonniert werden';
 $labels['longaclr'] = 'Der Ordnerinhalt kann gelesen werden';
-$labels['longaclread'] = 'Der Ordnerinhalt kann gelesen werden';
 $labels['longacls'] = 'Der Lesestatus von Nachrichten kann geändert werden';
 $labels['longaclw'] = 'Alle Nachrichten-Flags und Schlüsselwörter außer "Gelesen" und "Gelöscht" können geändert werden';
 $labels['longacli'] = 'Nachrichten können in diesen Ordner kopiert oder verschoben werden';
@@ -72,18 +78,22 @@ $labels['longaclt'] = 'Der "gelöscht" Status von Nachrichten kann geändert wer
 $labels['longacle'] = 'Als "gelöscht" markiert Nachrichten können gelöscht werden.';
 $labels['longaclx'] = 'Der Ordner kann gelöscht oder umbenannt werden';
 $labels['longacla'] = 'Die Zugriffsrechte des Ordners können geändert werden';
+
 $labels['longaclfull'] = 'Vollzugriff inklusive Ordner-Verwaltung';
+$labels['longaclread'] = 'Der Ordnerinhalt kann gelesen werden';
 $labels['longaclwrite'] = 'Nachrichten können markiert, an den Ordner gesendet und in den Ordner kopiert oder verschoben werden';
 $labels['longacldelete'] = 'Nachrichten können gelöscht werden';
-$labels['deleting'] = 'Zugriffsrechte werden entzogen...';
-$labels['saving'] = 'Zugriffsrechte werden gewährt...';
-$labels['updatesuccess'] = 'Zugriffsrechte erfolgreich geändert';
-$labels['deletesuccess'] = 'Zugriffsrechte erfolgreich entzogen';
-$labels['createsuccess'] = 'Zugriffsrechte erfolgreich gewährt';
-$labels['updateerror'] = 'Zugriffsrechte konnten nicht geändert werden';
-$labels['deleteerror'] = 'Zugriffsrechte konnten nicht entzogen werden';
-$labels['createerror'] = 'Zugriffsrechte konnten nicht gewährt werden';
-$labels['deleteconfirm'] = 'Sind Sie sicher, daß Sie die Zugriffsrechte den ausgewählten Benutzern entziehen möchten?';
-$labels['norights'] = 'Es wurden keine Zugriffsrechte ausgewählt!';
-$labels['nouser'] = 'Es wurde kein Benutzer ausgewählt!';
 
+$messages['deleting'] = 'Zugriffsrechte werden entzogen...';
+$messages['saving'] = 'Zugriffsrechte werden gewährt...';
+$messages['updatesuccess'] = 'Zugriffsrechte erfolgreich geändert';
+$messages['deletesuccess'] = 'Zugriffsrechte erfolgreich entzogen';
+$messages['createsuccess'] = 'Zugriffsrechte erfolgreich gewährt';
+$messages['updateerror'] = 'Zugriffsrechte konnten nicht geändert werden';
+$messages['deleteerror'] = 'Zugriffsrechte konnten nicht entzogen werden';
+$messages['createerror'] = 'Zugriffsrechte konnten nicht gewährt werden';
+$messages['deleteconfirm'] = 'Sind Sie sicher, daß Sie die Zugriffsrechte den ausgewählten Benutzern entziehen möchten?';
+$messages['norights'] = 'Es wurden keine Zugriffsrechte ausgewählt!';
+$messages['nouser'] = 'Es wurde kein Benutzer ausgewählt!';
+
+?>
diff --git a/plugins/acl/localization/en_GB.inc b/plugins/acl/localization/en_GB.inc
index 201cb3c0b..e1b33fbfc 100644
--- a/plugins/acl/localization/en_GB.inc
+++ b/plugins/acl/localization/en_GB.inc
@@ -2,18 +2,20 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/en_GB/labels.inc                                         |
+ | plugins/acl/localization/<lang>.inc                                   |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail ACL plugin                 |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Lazlo                                                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
 
-$labels = array();
 $labels['sharing'] = 'Sharing';
 $labels['myrights'] = 'Access Rights';
 $labels['username'] = 'User:';
@@ -23,44 +25,48 @@ $labels['actions'] = 'Access right actions...';
 $labels['anyone'] = 'All users (anyone)';
 $labels['anonymous'] = 'Guests (anonymous)';
 $labels['identifier'] = 'Identifier';
+
 $labels['acll'] = 'Look-up';
-$labels['shortacll'] = 'Look-up';
 $labels['aclr'] = 'Read messages';
 $labels['acls'] = 'Keep Seen state';
 $labels['aclw'] = 'Write flags';
 $labels['acli'] = 'Insert (copy into)';
 $labels['aclp'] = 'Post';
-$labels['shortaclp'] = 'Post';
 $labels['aclc'] = 'Create sub-folders';
 $labels['aclk'] = 'Create sub-folders';
 $labels['acld'] = 'Delete messages';
 $labels['aclt'] = 'Delete messages';
 $labels['acle'] = 'Expunge';
-$labels['shortacle'] = 'Expunge';
 $labels['aclx'] = 'Delete folder';
 $labels['acla'] = 'Administer';
-$labels['shortacla'] = 'Administer';
+
 $labels['aclfull'] = 'Full control';
 $labels['aclother'] = 'Other';
-$labels['shortaclother'] = 'Other';
 $labels['aclread'] = 'Read';
-$labels['shortaclr'] = 'Read';
-$labels['shortaclread'] = 'Read';
 $labels['aclwrite'] = 'Write';
-$labels['shortaclw'] = 'Write';
-$labels['shortaclwrite'] = 'Write';
 $labels['acldelete'] = 'Delete';
-$labels['shortacld'] = 'Delete';
-$labels['shortaclt'] = 'Delete';
-$labels['shortacldelete'] = 'Delete';
+
+$labels['shortacll'] = 'Look-up';
+$labels['shortaclr'] = 'Read';
 $labels['shortacls'] = 'Keep';
+$labels['shortaclw'] = 'Write';
 $labels['shortacli'] = 'Insert';
+$labels['shortaclp'] = 'Post';
 $labels['shortaclc'] = 'Create';
 $labels['shortaclk'] = 'Create';
+$labels['shortacld'] = 'Delete';
+$labels['shortaclt'] = 'Delete';
+$labels['shortacle'] = 'Expunge';
 $labels['shortaclx'] = 'Folder delete';
+$labels['shortacla'] = 'Administer';
+
+$labels['shortaclother'] = 'Other';
+$labels['shortaclread'] = 'Read';
+$labels['shortaclwrite'] = 'Write';
+$labels['shortacldelete'] = 'Delete';
+
 $labels['longacll'] = 'The folder is visible on lists and can be subscribed to.';
 $labels['longaclr'] = 'The folder can be opened for reading';
-$labels['longaclread'] = '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'] = 'Messages can be written or copied to the folder';
@@ -72,18 +78,22 @@ $labels['longaclt'] = 'Messages Delete flag can be changed';
 $labels['longacle'] = 'Messages can be expunged';
 $labels['longaclx'] = 'The folder can be deleted or renamed';
 $labels['longacla'] = 'The folder access rights can be changed';
+
 $labels['longaclfull'] = 'Full control including folder administration';
+$labels['longaclread'] = 'The folder can be opened for reading';
 $labels['longaclwrite'] = 'Messages can be marked, written or copied to the folder';
 $labels['longacldelete'] = 'Messages can be deleted';
-$labels['deleting'] = 'Deleting access rights...';
-$labels['saving'] = 'Saving access rights...';
-$labels['updatesuccess'] = 'Successfully changed access rights';
-$labels['deletesuccess'] = 'Successfully deleted access rights';
-$labels['createsuccess'] = 'Successfully added access rights';
-$labels['updateerror'] = 'Ubable to update access rights';
-$labels['deleteerror'] = 'Unable to delete access rights';
-$labels['createerror'] = 'Unable to add access rights';
-$labels['deleteconfirm'] = 'Are you sure, you want to remove access rights of selected user(s)?';
-$labels['norights'] = 'No rights has been specified!';
-$labels['nouser'] = 'No username has been specified!';
 
+$messages['deleting'] = 'Deleting access rights...';
+$messages['saving'] = 'Saving access rights...';
+$messages['updatesuccess'] = 'Successfully changed access rights';
+$messages['deletesuccess'] = 'Successfully deleted access rights';
+$messages['createsuccess'] = 'Successfully added access rights';
+$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!';
+
+?>
diff --git a/plugins/acl/localization/en_US.inc b/plugins/acl/localization/en_US.inc
index 8eebdc60c..3c61266be 100644
--- a/plugins/acl/localization/en_US.inc
+++ b/plugins/acl/localization/en_US.inc
@@ -5,7 +5,7 @@
  | plugins/acl/localization/<lang>.inc                                   |
  |                                                                       |
  | Localization file of the Roundcube Webmail ACL plugin                 |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -89,7 +89,7 @@ $messages['saving'] = 'Saving access rights...';
 $messages['updatesuccess'] = 'Successfully changed access rights';
 $messages['deletesuccess'] = 'Successfully deleted access rights';
 $messages['createsuccess'] = 'Successfully added access rights';
-$messages['updateerror'] = 'Ubable to update access rights';
+$messages['updateerror'] = 'Unable 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)?';
diff --git a/plugins/acl/localization/eo.inc b/plugins/acl/localization/eo.inc
index b24ebcc9f..ddfacd6f8 100644
--- a/plugins/acl/localization/eo.inc
+++ b/plugins/acl/localization/eo.inc
@@ -2,18 +2,20 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/eo/labels.inc                                         |
+ | plugins/acl/localization/<lang>.inc                                   |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail ACL plugin                 |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Michael Moroni <michael.moroni@mailoo.org>                    |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
 
-$labels = array();
 $labels['sharing'] = 'Kunhavigado';
 $labels['myrights'] = 'Atingrajtoj';
 $labels['username'] = 'Uzanto:';
@@ -23,41 +25,75 @@ $labels['actions'] = 'Agoj de atingrajtoj...';
 $labels['anyone'] = 'Ĉiuj uzantoj (iu ajn)';
 $labels['anonymous'] = 'Gasto (sennome)';
 $labels['identifier'] = 'Identigilo';
+
 $labels['acll'] = 'Elserĉo';
-$labels['shortacll'] = 'Elserĉo';
 $labels['aclr'] = 'Legi mesaĝojn';
 $labels['acls'] = 'Manteni legitan staton';
+$labels['aclw'] = 'Write flags';
 $labels['acli'] = 'Enmeti (alglui)';
 $labels['aclp'] = 'Afiŝi';
-$labels['shortaclp'] = 'Afiŝi';
 $labels['aclc'] = 'Krei subdosierujojn';
 $labels['aclk'] = 'Krei subdosierujojn';
 $labels['acld'] = 'Forigi mesaĝojn';
 $labels['aclt'] = 'Forigi mesaĝojn';
+$labels['acle'] = 'Expunge';
 $labels['aclx'] = 'Forigi dosierujon';
 $labels['acla'] = 'Administri';
-$labels['shortacla'] = 'Administri';
+
 $labels['aclfull'] = 'Plena kontrolo';
 $labels['aclother'] = 'Alia';
-$labels['shortaclother'] = 'Alia';
 $labels['aclread'] = 'Legi';
-$labels['shortaclr'] = 'Legi';
-$labels['shortaclread'] = 'Legi';
 $labels['aclwrite'] = 'Skribi';
-$labels['shortaclw'] = 'Skribi';
-$labels['shortaclwrite'] = 'Skribi';
 $labels['acldelete'] = 'Forigi';
-$labels['shortacld'] = 'Forigi';
-$labels['shortaclt'] = 'Forigi';
-$labels['shortacldelete'] = 'Forigi';
+
+$labels['shortacll'] = 'Elserĉo';
+$labels['shortaclr'] = 'Legi';
 $labels['shortacls'] = 'Manteni';
+$labels['shortaclw'] = 'Skribi';
 $labels['shortacli'] = 'Enmeti';
+$labels['shortaclp'] = 'Afiŝi';
 $labels['shortaclc'] = 'Krei';
 $labels['shortaclk'] = 'Krei';
+$labels['shortacld'] = 'Forigi';
+$labels['shortaclt'] = 'Forigi';
+$labels['shortacle'] = 'Expunge';
 $labels['shortaclx'] = 'Forigo de dosierujo';
+$labels['shortacla'] = 'Administri';
+
+$labels['shortaclother'] = 'Alia';
+$labels['shortaclread'] = 'Legi';
+$labels['shortaclwrite'] = 'Skribi';
+$labels['shortacldelete'] = 'Forigi';
+
 $labels['longacll'] = 'La dosierujo videblas en listoj kaj oni povas aboni al ĝi';
 $labels['longaclr'] = 'La dosierujo malfermeblas por legado';
-$labels['longaclread'] = 'La dosierujo malfermeblas por legado';
+$labels['longacls'] = 'Messages Seen flag can be changed';
+$labels['longaclw'] = 'Messages flags and keywords can be changed, except Seen and Deleted';
 $labels['longacli'] = 'Mesaĝoj skribeblas aŭ kopieblas en la dosierujo';
 $labels['longaclp'] = 'Mesaĝoj afiŝeblas en ĉi tiu dosierujo';
+$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'] = 'Messages can be expunged';
+$labels['longaclx'] = 'The folder can be deleted or renamed';
+$labels['longacla'] = 'The folder access rights can be changed';
+
+$labels['longaclfull'] = 'Full control including folder administration';
+$labels['longaclread'] = 'La dosierujo malfermeblas por legado';
+$labels['longaclwrite'] = 'Messages can be marked, written or copied to the folder';
+$labels['longacldelete'] = 'Messages can be deleted';
+
+$messages['deleting'] = 'Deleting access rights...';
+$messages['saving'] = 'Saving access rights...';
+$messages['updatesuccess'] = 'Successfully changed access rights';
+$messages['deletesuccess'] = 'Successfully deleted access rights';
+$messages['createsuccess'] = 'Successfully added access rights';
+$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!';
 
+?>
diff --git a/plugins/acl/localization/es_ES.inc b/plugins/acl/localization/es_ES.inc
index a95dcc589..62f89dcea 100644
--- a/plugins/acl/localization/es_ES.inc
+++ b/plugins/acl/localization/es_ES.inc
@@ -2,18 +2,20 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/es_ES/labels.inc                                         |
+ | plugins/acl/localization/<lang>.inc                                   |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail ACL plugin                 |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: pompilos <ciordia@gmail.com>                                  |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
 
-$labels = array();
 $labels['sharing'] = 'Compartir';
 $labels['myrights'] = 'Permisos de acceso';
 $labels['username'] = 'Usuario:';
@@ -23,44 +25,48 @@ $labels['actions'] = 'Acciones sobre los permisos de acceso…';
 $labels['anyone'] = 'Todos los usuarios (cualquiera)';
 $labels['anonymous'] = 'Invitados (anónimo)';
 $labels['identifier'] = 'Identificador';
+
 $labels['acll'] = 'Búsqueda';
-$labels['shortacll'] = 'Búsqueda';
 $labels['aclr'] = 'Leer mensajes';
 $labels['acls'] = 'Mantener como "Leído';
 $labels['aclw'] = 'Escribir etiquetas';
 $labels['acli'] = 'Insertar (Copiar dentro)';
 $labels['aclp'] = 'Enviar';
-$labels['shortaclp'] = 'Enviar';
 $labels['aclc'] = 'Crear subcarpetas';
 $labels['aclk'] = 'Crear subcarpetas';
 $labels['acld'] = 'Borrar mensajes';
 $labels['aclt'] = 'Borrar mensajes';
 $labels['acle'] = 'Expurgar';
-$labels['shortacle'] = 'Expurgar';
 $labels['aclx'] = 'Borrar carpeta';
 $labels['acla'] = 'Administrar';
-$labels['shortacla'] = 'Administrar';
+
 $labels['aclfull'] = 'Control total';
 $labels['aclother'] = 'Otro';
-$labels['shortaclother'] = 'Otro';
 $labels['aclread'] = 'Leer';
-$labels['shortaclr'] = 'Leer';
-$labels['shortaclread'] = 'Leer';
 $labels['aclwrite'] = 'Escribir';
-$labels['shortaclw'] = 'Escribir';
-$labels['shortaclwrite'] = 'Escribir';
 $labels['acldelete'] = 'Borrar';
-$labels['shortacld'] = 'Borrar';
-$labels['shortaclt'] = 'Borrar';
-$labels['shortacldelete'] = 'Borrar';
+
+$labels['shortacll'] = 'Búsqueda';
+$labels['shortaclr'] = 'Leer';
 $labels['shortacls'] = 'Conservar';
+$labels['shortaclw'] = 'Escribir';
 $labels['shortacli'] = 'Insertar';
+$labels['shortaclp'] = 'Enviar';
 $labels['shortaclc'] = 'Crear';
 $labels['shortaclk'] = 'Crear';
+$labels['shortacld'] = 'Borrar';
+$labels['shortaclt'] = 'Borrar';
+$labels['shortacle'] = 'Expurgar';
 $labels['shortaclx'] = 'Borrar carpeta';
+$labels['shortacla'] = 'Administrar';
+
+$labels['shortaclother'] = 'Otro';
+$labels['shortaclread'] = 'Leer';
+$labels['shortaclwrite'] = 'Escribir';
+$labels['shortacldelete'] = 'Borrar';
+
 $labels['longacll'] = 'La carpeta es visible en las listas y es posible suscribirse a ella';
 $labels['longaclr'] = 'Se puede abrir la carpeta para leer';
-$labels['longaclread'] = 'Se puede abrir la carpeta para leer';
 $labels['longacls'] = 'Se pueden cambiar los mensajes con la etiqueta "Leído';
 $labels['longaclw'] = 'Las etiquetas de mensaje y las palabras clave se pueden cambiar, excepto "Leído" y "Borrado';
 $labels['longacli'] = 'Se pueden escribir mensajes o copiarlos a la carpeta';
@@ -72,18 +78,22 @@ $labels['longaclt'] = 'No se pueden cambiar los mensajes etiquetados como "Borra
 $labels['longacle'] = 'No se pueden expurgar los mensajes';
 $labels['longaclx'] = 'La carpeta se puede borrar o renombrar';
 $labels['longacla'] = 'Se pueden cambiar los permisos de acceso';
+
 $labels['longaclfull'] = 'Control total, incluyendo la gestión de carpetas';
+$labels['longaclread'] = 'Se puede abrir la carpeta para leer';
 $labels['longaclwrite'] = 'Se pueden etiquetar, escribir o copiar mensajes a la carpeta';
 $labels['longacldelete'] = 'Los mensajes se pueden borrar';
-$labels['deleting'] = 'Borrando permisos de acceso…';
-$labels['saving'] = 'Guardando permisos de acceso…';
-$labels['updatesuccess'] = 'Se han cambiado los permisos de acceso';
-$labels['deletesuccess'] = 'Se han borrado los permisos de acceso';
-$labels['createsuccess'] = 'Se han añadido los permisos de acceso';
-$labels['updateerror'] = 'No se han podido actualizar los permisos de acceso';
-$labels['deleteerror'] = 'No se han podido borrar los permisos de acceso';
-$labels['createerror'] = 'No se han podido añadir los permisos de acceso';
-$labels['deleteconfirm'] = '¿Seguro que quiere borrar los permisos de acceso del usuairo seleccionado?';
-$labels['norights'] = 'No se han especificado los permisos de acceso';
-$labels['nouser'] = 'No se ha especificado un nombre de usuario';
 
+$messages['deleting'] = 'Borrando permisos de acceso…';
+$messages['saving'] = 'Guardando permisos de acceso…';
+$messages['updatesuccess'] = 'Se han cambiado los permisos de acceso';
+$messages['deletesuccess'] = 'Se han borrado los permisos de acceso';
+$messages['createsuccess'] = 'Se han añadido los permisos de acceso';
+$messages['updateerror'] = 'No se han podido actualizar los permisos de acceso';
+$messages['deleteerror'] = 'No se han podido borrar los permisos de acceso';
+$messages['createerror'] = 'No se han podido añadir los permisos de acceso';
+$messages['deleteconfirm'] = '¿Seguro que quiere borrar los permisos de acceso del usuairo seleccionado?';
+$messages['norights'] = 'No se han especificado los permisos de acceso';
+$messages['nouser'] = 'No se ha especificado un nombre de usuario';
+
+?>
diff --git a/plugins/acl/localization/et_EE.inc b/plugins/acl/localization/et_EE.inc
index 80aa93593..f89e7d6b7 100644
--- a/plugins/acl/localization/et_EE.inc
+++ b/plugins/acl/localization/et_EE.inc
@@ -2,57 +2,98 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/et_EE/labels.inc                                         |
+ | plugins/acl/localization/<lang>.inc                                   |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail ACL plugin                 |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: yllar                                                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
 
-$labels = array();
 $labels['sharing'] = 'Jagamine';
 $labels['myrights'] = 'Ligipääsuõigused';
 $labels['username'] = 'Kasutaja:';
+$labels['advanced'] = 'laiendatud režiim';
 $labels['newuser'] = 'Lisa sissekanne';
+$labels['actions'] = 'Ligipääsuõiguste toimingud...';
 $labels['anyone'] = 'Kõik kasutajad';
 $labels['anonymous'] = 'Külalised (anonüümsed)';
+$labels['identifier'] = 'Tuvastaja';
+
+$labels['acll'] = 'Lookup';
 $labels['aclr'] = 'Lugeda kirju';
+$labels['acls'] = 'Keep Seen state';
+$labels['aclw'] = 'Write flags';
 $labels['acli'] = 'Sisesta (kopeeri)';
 $labels['aclp'] = 'Postita';
-$labels['shortaclp'] = 'Postita';
 $labels['aclc'] = 'Luua alamkaustu';
 $labels['aclk'] = 'Luua alamkaustu';
 $labels['acld'] = 'Kustutada kirju';
 $labels['aclt'] = 'Kustutada kirju';
 $labels['acle'] = 'Eemalda';
-$labels['shortacle'] = 'Eemalda';
 $labels['aclx'] = 'Kustutada kausta';
 $labels['acla'] = 'Administreerida';
-$labels['shortacla'] = 'Administreerida';
+
 $labels['aclfull'] = 'Täis kontroll';
 $labels['aclother'] = 'Muu';
-$labels['shortaclother'] = 'Muu';
 $labels['aclread'] = 'Loe';
-$labels['shortaclr'] = 'Loe';
-$labels['shortaclread'] = 'Loe';
 $labels['aclwrite'] = 'Kirjuta';
-$labels['shortaclw'] = 'Kirjuta';
-$labels['shortaclwrite'] = 'Kirjuta';
 $labels['acldelete'] = 'Kustuta';
-$labels['shortacld'] = 'Kustuta';
-$labels['shortaclt'] = 'Kustuta';
-$labels['shortacldelete'] = 'Kustuta';
+
+$labels['shortacll'] = 'Lookup';
+$labels['shortaclr'] = 'Loe';
 $labels['shortacls'] = 'Säilita';
+$labels['shortaclw'] = 'Kirjuta';
 $labels['shortacli'] = 'Lisa';
+$labels['shortaclp'] = 'Postita';
 $labels['shortaclc'] = 'Loo';
 $labels['shortaclk'] = 'Loo';
+$labels['shortacld'] = 'Kustuta';
+$labels['shortaclt'] = 'Kustuta';
+$labels['shortacle'] = 'Eemalda';
+$labels['shortaclx'] = 'Kausta kustutamine';
+$labels['shortacla'] = 'Administreerida';
+
+$labels['shortaclother'] = 'Muu';
+$labels['shortaclread'] = 'Loe';
+$labels['shortaclwrite'] = 'Kirjuta';
+$labels['shortacldelete'] = 'Kustuta';
+
+$labels['longacll'] = 'See kaust on nimekirjas nähtav ja seda saab tellida';
 $labels['longaclr'] = 'Kausta saab lugemiseks avada';
-$labels['longaclread'] = 'Kausta saab lugemiseks avada';
+$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['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'] = 'Kirju saab eemaldada';
 $labels['longaclx'] = 'Seda kausta ei saa kustutada ega ümber nimetada';
-$labels['norights'] = 'Õigusi pole määratud!';
-$labels['nouser'] = 'Kasutajanime pole määratud!';
+$labels['longacla'] = 'Selle kausta ligipääsuõigusi saab muuta';
+
+$labels['longaclfull'] = 'Täielik kontroll koos kaustade haldamisega';
+$labels['longaclread'] = 'Kausta saab lugemiseks avada';
+$labels['longaclwrite'] = 'Messages can be marked, written or copied to the folder';
+$labels['longacldelete'] = 'Kirju saab kustutada';
+
+$messages['deleting'] = 'Ligipääsuõiguste kustutamine...';
+$messages['saving'] = 'Ligipääsuõiguste salvestamine...';
+$messages['updatesuccess'] = 'Ligipääsuõigused on muudetud';
+$messages['deletesuccess'] = 'Ligipääsuõigused on kustutatud';
+$messages['createsuccess'] = 'Ligipääsuõigused on lisatud';
+$messages['updateerror'] = 'Ligipääsuõiguste uuendamine nurjus';
+$messages['deleteerror'] = 'Ligipääsuõiguste kustutamine nurjus';
+$messages['createerror'] = 'Ligipääsuõiguste andmine nurjus';
+$messages['deleteconfirm'] = 'Oled sa kindel, et sa soovid valitudkasutaja(te) õiguseid kustutada?';
+$messages['norights'] = 'Õigusi pole määratud!';
+$messages['nouser'] = 'Kasutajanime pole määratud!';
 
+?>
diff --git a/plugins/acl/localization/fa_IR.inc b/plugins/acl/localization/fa_IR.inc
index db2c496eb..48fb8a225 100644
--- a/plugins/acl/localization/fa_IR.inc
+++ b/plugins/acl/localization/fa_IR.inc
@@ -2,18 +2,20 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/fa_IR/labels.inc                                         |
+ | plugins/acl/localization/<lang>.inc                                   |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail ACL plugin                 |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Hamid <abbaszadeh.h@gmail.com>                                |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
 
-$labels = array();
 $labels['sharing'] = 'اشتراک‌گذاری';
 $labels['myrights'] = 'مجوزهای دسترسی';
 $labels['username'] = 'کاربر:';
@@ -23,44 +25,48 @@ $labels['actions'] = 'فعالیت‌های مجوز دسترسی...';
 $labels['anyone'] = 'همه کاربران (هر کسی)';
 $labels['anonymous'] = 'مهمان‌ها (ناشناس‌ها)';
 $labels['identifier'] = 'شناساگر';
+
 $labels['acll'] = 'یافتن';
-$labels['shortacll'] = 'یافتن';
 $labels['aclr'] = 'پیام های خوانده شده';
 $labels['acls'] = 'نگه داشتن حالت بازدید';
 $labels['aclw'] = 'پرچم‌های نوشتن';
 $labels['acli'] = 'وارد کردن (کپی کردن در)';
 $labels['aclp'] = 'نوشته';
-$labels['shortaclp'] = 'نوشته';
 $labels['aclc'] = 'ایجاد زیرپوشه‌ها';
 $labels['aclk'] = 'ایجاد زیرپوشه‌ها';
 $labels['acld'] = 'پاک کردن پیغام‌ها';
 $labels['aclt'] = 'پاک کردن پیغام‌ها';
 $labels['acle'] = 'پاک کردن';
-$labels['shortacle'] = 'پاک کردن';
 $labels['aclx'] = 'حذف پوشه';
 $labels['acla'] = 'مدیر';
-$labels['shortacla'] = 'مدیر';
+
 $labels['aclfull'] = 'کنترل کامل';
 $labels['aclother'] = 'دیگر';
-$labels['shortaclother'] = 'دیگر';
 $labels['aclread'] = 'خوانده شده';
-$labels['shortaclr'] = 'خوانده شده';
-$labels['shortaclread'] = 'خوانده شده';
 $labels['aclwrite'] = 'نوشتن';
-$labels['shortaclw'] = 'نوشتن';
-$labels['shortaclwrite'] = 'نوشتن';
 $labels['acldelete'] = 'حذف';
-$labels['shortacld'] = 'حذف';
-$labels['shortaclt'] = 'حذف';
-$labels['shortacldelete'] = 'حذف';
+
+$labels['shortacll'] = 'یافتن';
+$labels['shortaclr'] = 'خوانده شده';
 $labels['shortacls'] = 'نگه داشتن';
+$labels['shortaclw'] = 'نوشتن';
 $labels['shortacli'] = 'جاگذارى';
+$labels['shortaclp'] = 'نوشته';
 $labels['shortaclc'] = 'ایجاد';
 $labels['shortaclk'] = 'ایجاد';
+$labels['shortacld'] = 'حذف';
+$labels['shortaclt'] = 'حذف';
+$labels['shortacle'] = 'پاک کردن';
 $labels['shortaclx'] = 'حذف کردن پوشه';
+$labels['shortacla'] = 'مدیر';
+
+$labels['shortaclother'] = 'دیگر';
+$labels['shortaclread'] = 'خوانده شده';
+$labels['shortaclwrite'] = 'نوشتن';
+$labels['shortacldelete'] = 'حذف';
+
 $labels['longacll'] = 'پوشه در فهرست‌ها قابل مشاهده است و می‌تواند مشترک به';
 $labels['longaclr'] = 'پوشه می‌تواند برای خواندن باز شود';
-$labels['longaclread'] = 'پوشه می‌تواند برای خواندن باز شود';
 $labels['longacls'] = 'پرچم بازدید پیغام‌ها می‌تواند تغییر داده شود';
 $labels['longaclw'] = 'پرچم و کلیدواژه پیغام‌ها می‌تواند تغییر داده شود، به غیر از بازدید و حذف';
 $labels['longacli'] = 'پیغام‌ها می‌توانند کپی یا نوشته شوند به پوشه';
@@ -72,18 +78,22 @@ $labels['longaclt'] = 'پرچم حذف پیغام‌ها می‌تواند تغ�
 $labels['longacle'] = 'پیغام‌ها می‌توانند حذف شوند';
 $labels['longaclx'] = 'پوشه می‌تواند حذف یا تغییر نام داده شود';
 $labels['longacla'] = 'قوانین دسترسی پوشه می‌تواند تغییر داده شود';
+
 $labels['longaclfull'] = 'کنترل کامل شما مدیریت پوشه';
+$labels['longaclread'] = 'پوشه می‌تواند برای خواندن باز شود';
 $labels['longaclwrite'] = 'پیغام‌ها می‌توانند علامتگذاری، نوشته و یا کپی شوند در پوشه';
 $labels['longacldelete'] = 'پیغام‌ها می‌توانند حذف شوند';
-$labels['deleting'] = 'حذف کردن قوانین دسترسی...';
-$labels['saving'] = 'ذخیره قوانین دسترسی...';
-$labels['updatesuccess'] = 'قوانین دسترسی با موفقیت تغییر کردند';
-$labels['deletesuccess'] = 'قوانین دسترسی با موفقیت حذف شدند';
-$labels['createsuccess'] = 'قوانین دسترسی با موفقیت اضافه شدند';
-$labels['updateerror'] = 'ناتوانی در بروزرسانی قوانین دسترسی';
-$labels['deleteerror'] = 'ناتوانی در حذف قوانین دسترسی';
-$labels['createerror'] = 'ناتوانی در اضافه کردن قوانین دسترسی';
-$labels['deleteconfirm'] = 'آیا شما مطمئن هستید که می‌خواهید قوانین دسترسی را برای کاربر(ان) انتخاب شده حذف نمایید؟';
-$labels['norights'] = 'هیچ قانونی مشخص نشده است!';
-$labels['nouser'] = 'هیج نام‌کاربری‌ای مشخص نشده است!';
 
+$messages['deleting'] = 'حذف کردن قوانین دسترسی...';
+$messages['saving'] = 'ذخیره قوانین دسترسی...';
+$messages['updatesuccess'] = 'قوانین دسترسی با موفقیت تغییر کردند';
+$messages['deletesuccess'] = 'قوانین دسترسی با موفقیت حذف شدند';
+$messages['createsuccess'] = 'قوانین دسترسی با موفقیت اضافه شدند';
+$messages['updateerror'] = 'ناتوانی در بروزرسانی قوانین دسترسی';
+$messages['deleteerror'] = 'ناتوانی در حذف قوانین دسترسی';
+$messages['createerror'] = 'ناتوانی در اضافه کردن قوانین دسترسی';
+$messages['deleteconfirm'] = 'آیا شما مطمئن هستید که می‌خواهید قوانین دسترسی را برای کاربر(ان) انتخاب شده حذف نمایید؟';
+$messages['norights'] = 'هیچ قانونی مشخص نشده است!';
+$messages['nouser'] = 'هیج نام‌کاربری‌ای مشخص نشده است!';
+
+?>
diff --git a/plugins/acl/localization/fi_FI.inc b/plugins/acl/localization/fi_FI.inc
index 7af5b3e26..e2b6899fa 100644
--- a/plugins/acl/localization/fi_FI.inc
+++ b/plugins/acl/localization/fi_FI.inc
@@ -2,60 +2,98 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/fi_FI/labels.inc                                         |
+ | plugins/acl/localization/<lang>.inc                                   |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail ACL plugin                 |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Jiri Grönroos                                                |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
 
-$labels = array();
 $labels['sharing'] = 'Jakaminen';
 $labels['myrights'] = 'Käyttöoikeudet';
 $labels['username'] = 'Käyttäjä:';
 $labels['advanced'] = 'edistynyt tila';
+$labels['newuser'] = 'Add entry';
+$labels['actions'] = 'Access right actions...';
 $labels['anyone'] = 'Kaikki käyttäjät (kuka tahansa)';
 $labels['anonymous'] = 'Vieraat (anonyymit)';
-$labels['aclr'] = 'Lue viestejä';
-$labels['aclc'] = 'Luo alikansioita';
-$labels['aclk'] = 'Luo alikansioita';
-$labels['acld'] = 'Poista viestejä';
-$labels['aclt'] = 'Poista viestejä';
-$labels['aclx'] = 'Poista kansio';
-$labels['aclfull'] = 'Täysi hallinta';
-$labels['aclother'] = 'Muu';
-$labels['shortaclother'] = 'Muu';
-$labels['aclread'] = 'Luku';
-$labels['shortaclr'] = 'Luku';
-$labels['shortaclread'] = 'Luku';
-$labels['aclwrite'] = 'Kirjoitus';
-$labels['shortaclw'] = 'Kirjoitus';
-$labels['shortaclwrite'] = 'Kirjoitus';
-$labels['acldelete'] = 'Poisto';
-$labels['shortacld'] = 'Poisto';
-$labels['shortaclt'] = 'Poisto';
-$labels['shortacldelete'] = 'Poisto';
+$labels['identifier'] = 'Identifier';
+
+$labels['acll'] = 'Lookup';
+$labels['aclr'] = 'Read messages';
+$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['acld'] = 'Delete messages';
+$labels['aclt'] = 'Delete messages';
+$labels['acle'] = 'Expunge';
+$labels['aclx'] = 'Delete folder';
+$labels['acla'] = 'Administer';
+
+$labels['aclfull'] = 'Full control';
+$labels['aclother'] = 'Other';
+$labels['aclread'] = 'Read';
+$labels['aclwrite'] = 'Write';
+$labels['acldelete'] = 'Delete';
+
+$labels['shortacll'] = 'Lookup';
+$labels['shortaclr'] = 'Read';
+$labels['shortacls'] = 'Keep';
+$labels['shortaclw'] = 'Write';
+$labels['shortacli'] = 'Insert';
+$labels['shortaclp'] = 'Post';
 $labels['shortaclc'] = 'Luo';
 $labels['shortaclk'] = 'Luo';
-$labels['longaclr'] = 'Kansio voidaan avata lukua varten';
-$labels['longaclread'] = 'Kansio voidaan avata lukua varten';
-$labels['longaclc'] = 'Kansioita voi luoda (tai nimetä uudelleen) tämän kansion alla';
-$labels['longaclk'] = 'Kansioita voi luoda (tai nimetä uudelleen) tämän kansion alla';
-$labels['longaclx'] = 'Kansion voi poistaa tai nimetä uudelleen';
-$labels['longacla'] = 'Kansion käyttöoikeuksia voi muuttaa';
-$labels['longaclfull'] = 'Täysi hallinta mukaan lukien kansioiden ylläpidon';
-$labels['longacldelete'] = 'Viestejä voi poistaa';
-$labels['deleting'] = 'Poistetaan käyttöoikeuksia...';
-$labels['saving'] = 'Tallennetaan käyttöoikeuksia...';
-$labels['updatesuccess'] = 'Käyttöoikeudet on muutettu onnistuneesti';
-$labels['deletesuccess'] = 'Käyttöoikeudet on poistettu onnistuneesti';
-$labels['createsuccess'] = 'Käyttöoikeudet on lisätty onnistuneesti';
-$labels['deleteerror'] = 'Käyttöoikeuksien poisto epäonnistui';
-$labels['createerror'] = 'Käyttöoikeuksien lisäys epäonnistui';
-$labels['norights'] = 'Käyttöoikeuksia ei ole määritelty!';
-$labels['nouser'] = 'Käyttäjätunnusta ei ole määritelty!';
+$labels['shortacld'] = 'Poista';
+$labels['shortaclt'] = 'Poista';
+$labels['shortacle'] = 'Expunge';
+$labels['shortaclx'] = 'Folder delete';
+$labels['shortacla'] = 'Administer';
+
+$labels['shortaclother'] = 'Muu';
+$labels['shortaclread'] = 'Read';
+$labels['shortaclwrite'] = 'Write';
+$labels['shortacldelete'] = 'Delete';
+
+$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'] = 'Messages can be written or copied to the folder';
+$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'] = 'Messages can be expunged';
+$labels['longaclx'] = 'The folder can be deleted or renamed';
+$labels['longacla'] = 'The folder access rights can be changed';
+
+$labels['longaclfull'] = 'Full control including folder administration';
+$labels['longaclread'] = 'The folder can be opened for reading';
+$labels['longaclwrite'] = 'Messages can be marked, written or copied to the folder';
+$labels['longacldelete'] = 'Messages can be deleted';
+
+$messages['deleting'] = 'Deleting access rights...';
+$messages['saving'] = 'Saving access rights...';
+$messages['updatesuccess'] = 'Successfully changed access rights';
+$messages['deletesuccess'] = 'Successfully deleted access rights';
+$messages['createsuccess'] = 'Successfully added access rights';
+$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!';
 
+?>
diff --git a/plugins/acl/localization/fr_FR.inc b/plugins/acl/localization/fr_FR.inc
index e4239dc46..4ac90b6d2 100644
--- a/plugins/acl/localization/fr_FR.inc
+++ b/plugins/acl/localization/fr_FR.inc
@@ -2,18 +2,20 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/fr_FR/labels.inc                                         |
+ | plugins/acl/localization/<lang>.inc                                   |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail ACL plugin                 |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Tr4sK                                                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
 
-$labels = array();
 $labels['sharing'] = 'Partage';
 $labels['myrights'] = 'Droits d\'accès';
 $labels['username'] = 'Utilisateur :';
@@ -23,44 +25,48 @@ $labels['actions'] = 'Action sur les droits d\'accès...';
 $labels['anyone'] = 'Tous les utilisateurs (tout le monde)';
 $labels['anonymous'] = 'Invités (anonymes)';
 $labels['identifier'] = 'Identifiant';
+
 $labels['acll'] = 'Consultation';
-$labels['shortacll'] = 'Consultation';
 $labels['aclr'] = 'Lire les messages';
 $labels['acls'] = 'Garder l\'état vu';
 $labels['aclw'] = 'Écrire une étiquette';
 $labels['acli'] = 'Insérer (Copier dans)';
 $labels['aclp'] = 'Envoyer';
-$labels['shortaclp'] = 'Envoyer';
 $labels['aclc'] = 'Créer des sous-dossiers';
 $labels['aclk'] = 'Créer des sous-dossiers';
 $labels['acld'] = 'Supprimer des messages';
 $labels['aclt'] = 'Supprimer des messages';
 $labels['acle'] = 'Purger';
-$labels['shortacle'] = 'Purger';
 $labels['aclx'] = 'Supprimer un dossier';
 $labels['acla'] = 'Administrer';
-$labels['shortacla'] = 'Administrer';
+
 $labels['aclfull'] = 'Contrôle total';
 $labels['aclother'] = 'Autre';
-$labels['shortaclother'] = 'Autre';
 $labels['aclread'] = 'Lecture';
-$labels['shortaclr'] = 'Lecture';
-$labels['shortaclread'] = 'Lecture';
 $labels['aclwrite'] = 'Écriture';
-$labels['shortaclw'] = 'Écriture';
-$labels['shortaclwrite'] = 'Écriture';
 $labels['acldelete'] = 'Translation can be either \'Supprimer\' or \'Effacer\'  depends of the whole context.';
-$labels['shortacld'] = 'Translation can be either \'Supprimer\' or \'Effacer\'  depends of the whole context.';
-$labels['shortaclt'] = 'Translation can be either \'Supprimer\' or \'Effacer\'  depends of the whole context.';
-$labels['shortacldelete'] = 'Translation can be either \'Supprimer\' or \'Effacer\'  depends of the whole context.';
+
+$labels['shortacll'] = 'Consultation';
+$labels['shortaclr'] = 'Lecture';
 $labels['shortacls'] = 'Conserver';
+$labels['shortaclw'] = 'Écriture';
 $labels['shortacli'] = 'Insérer';
+$labels['shortaclp'] = 'Envoyer';
 $labels['shortaclc'] = 'Créer';
 $labels['shortaclk'] = 'Créer';
+$labels['shortacld'] = 'Translation can be either \'Supprimer\' or \'Effacer\'  depends of the whole context.';
+$labels['shortaclt'] = 'Translation can be either \'Supprimer\' or \'Effacer\'  depends of the whole context.';
+$labels['shortacle'] = 'Purger';
 $labels['shortaclx'] = 'Supprimer un dossier';
+$labels['shortacla'] = 'Administrer';
+
+$labels['shortaclother'] = 'Autre';
+$labels['shortaclread'] = 'Lecture';
+$labels['shortaclwrite'] = 'Écriture';
+$labels['shortacldelete'] = 'Translation can be either \'Supprimer\' or \'Effacer\'  depends of the whole context.';
+
 $labels['longacll'] = 'Ce dossier est visible dans les listes et peut être souscrit';
 $labels['longaclr'] = 'Le dossier peut-être ouvert pour lecture';
-$labels['longaclread'] = 'Le dossier peut-être ouvert pour lecture';
 $labels['longacls'] = 'L\'étiquette Lu peut-être changée';
 $labels['longaclw'] = 'Les étiquettes et les mot-clés peuvent-être changé, sauf pour Vu et Supprimé';
 $labels['longacli'] = 'Les messages peuvent-être écrit ou copié dans le dossier';
@@ -72,18 +78,22 @@ $labels['longaclt'] = 'L\'étiquette de suppression des messages peut-être modi
 $labels['longacle'] = 'Les messages peuvent-être purgés';
 $labels['longaclx'] = 'Le dossier peut-être supprimé ou renommé';
 $labels['longacla'] = 'Les droits d\'accès au dossier peuvent-être modifiés';
+
 $labels['longaclfull'] = 'Contrôle total, dossier d\'administration inclus';
+$labels['longaclread'] = 'Le dossier peut-être ouvert pour lecture';
 $labels['longaclwrite'] = 'Les messages peuvent-être marqué, écrit ou copié dans ce dossier';
 $labels['longacldelete'] = 'Les messages peuvent-être supprimé';
-$labels['deleting'] = 'Suppression des droits d\'accès…';
-$labels['saving'] = 'Sauvegarde des droits d\'accès…';
-$labels['updatesuccess'] = 'Les droits d\'accès ont été changé avec succès';
-$labels['deletesuccess'] = 'Les droits d\'accès ont été supprimé avec succès';
-$labels['createsuccess'] = 'Les droits d\'accès ont été ajouté avec succès';
-$labels['updateerror'] = 'Impossible de mettre à jour les droits d\'accès';
-$labels['deleteerror'] = 'Impossible de supprimer les droits d\'accès';
-$labels['createerror'] = 'Impossible d\'ajouter des droits d\'accès';
-$labels['deleteconfirm'] = 'Êtes-vous sûr de vouloir retirer les droits d\'accès du/des utilisateur(s) sélectionné ?';
-$labels['norights'] = 'Aucun droit n\'a été spécifié !';
-$labels['nouser'] = 'Aucun nom d\'utilisateur n\'a été spécifié !';
 
+$messages['deleting'] = 'Suppression des droits d\'accès…';
+$messages['saving'] = 'Sauvegarde des droits d\'accès…';
+$messages['updatesuccess'] = 'Les droits d\'accès ont été changé avec succès';
+$messages['deletesuccess'] = 'Les droits d\'accès ont été supprimé avec succès';
+$messages['createsuccess'] = 'Les droits d\'accès ont été ajouté avec succès';
+$messages['updateerror'] = 'Impossible de mettre à jour les droits d\'accès';
+$messages['deleteerror'] = 'Impossible de supprimer les droits d\'accès';
+$messages['createerror'] = 'Impossible d\'ajouter des droits d\'accès';
+$messages['deleteconfirm'] = 'Êtes-vous sûr de vouloir retirer les droits d\'accès du/des utilisateur(s) sélectionné ?';
+$messages['norights'] = 'Aucun droit n\'a été spécifié !';
+$messages['nouser'] = 'Aucun nom d\'utilisateur n\'a été spécifié !';
+
+?>
diff --git a/plugins/acl/localization/gl_ES.inc b/plugins/acl/localization/gl_ES.inc
index cf1d80c45..bb8837190 100644
--- a/plugins/acl/localization/gl_ES.inc
+++ b/plugins/acl/localization/gl_ES.inc
@@ -2,18 +2,20 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/gl_ES/labels.inc                                         |
+ | plugins/acl/localization/<lang>.inc                                   |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail ACL plugin                 |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: ghas                                                          |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
 
-$labels = array();
 $labels['sharing'] = 'Compartindo';
 $labels['myrights'] = 'Dereitos de acceso';
 $labels['username'] = 'Usuario:';
@@ -23,10 +25,75 @@ $labels['actions'] = 'Accións sobre os dereitos de acceso...';
 $labels['anyone'] = 'Tódolos usuarios (calquera)';
 $labels['anonymous'] = 'Invitados (anónimo)';
 $labels['identifier'] = 'Identificador';
+
+$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'] = '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'] = 'Control total';
+$labels['aclother'] = 'Outros';
+$labels['aclread'] = 'Lectura';
+$labels['aclwrite'] = 'Escritura';
+$labels['acldelete'] = 'Borrado';
+
+$labels['shortacll'] = 'Busca';
+$labels['shortaclr'] = 'Ler';
+$labels['shortacls'] = 'Manter';
+$labels['shortaclw'] = 'Escribir';
+$labels['shortacli'] = 'Insertar';
+$labels['shortaclp'] = 'Post';
+$labels['shortaclc'] = 'Crear';
+$labels['shortaclk'] = 'Crear';
+$labels['shortacld'] = 'Borrar';
+$labels['shortaclt'] = 'Borrar';
+$labels['shortacle'] = 'Expunge';
+$labels['shortaclx'] = 'Borrar cartafol';
 $labels['shortacla'] = 'Administrar';
 
+$labels['shortaclother'] = 'Outros';
+$labels['shortaclread'] = 'Lectura';
+$labels['shortaclwrite'] = 'Escritura';
+$labels['shortacldelete'] = 'Borrado';
+
+$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';
+$labels['longacli'] = 'Messages can be written or copied to the folder';
+$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'] = 'Messages can be expunged';
+$labels['longaclx'] = 'The folder can be deleted or renamed';
+$labels['longacla'] = 'The folder access rights can be changed';
+
+$labels['longaclfull'] = 'Full control including folder administration';
+$labels['longaclread'] = 'The folder can be opened for reading';
+$labels['longaclwrite'] = 'Messages can be marked, written or copied to the folder';
+$labels['longacldelete'] = 'Messages can be deleted';
+
+$messages['deleting'] = 'Deleting access rights...';
+$messages['saving'] = 'Saving access rights...';
+$messages['updatesuccess'] = 'Successfully changed access rights';
+$messages['deletesuccess'] = 'Successfully deleted access rights';
+$messages['createsuccess'] = 'Successfully added access rights';
+$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'] = 'Non se especificaron permisos!';
+$messages['nouser'] = 'Non se especificou o nome de usuario!';
+
+?>
diff --git a/plugins/acl/localization/he_IL.inc b/plugins/acl/localization/he_IL.inc
index 83b3f8292..d7b027a40 100644
--- a/plugins/acl/localization/he_IL.inc
+++ b/plugins/acl/localization/he_IL.inc
@@ -2,18 +2,20 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/he_IL/labels.inc                                         |
+ | plugins/acl/localization/<lang>.inc                                   |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail ACL plugin                 |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Moshe Leibovitch <moish@mln.co.il>                            |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
 
-$labels = array();
 $labels['sharing'] = 'שיתוף';
 $labels['myrights'] = 'זכויות גישה';
 $labels['username'] = 'משתמש:';
@@ -23,44 +25,48 @@ $labels['actions'] = 'פעולות על זכויות גישה...';
 $labels['anyone'] = 'כל המשתמשים (כל אחד)';
 $labels['anonymous'] = 'אורחים (אנונימי)';
 $labels['identifier'] = 'מזהה';
+
 $labels['acll'] = 'חיפוש';
-$labels['shortacll'] = 'חיפוש';
 $labels['aclr'] = 'קריאת הודעות';
 $labels['acls'] = 'שמירה על סטטוס נראה';
 $labels['aclw'] = 'דגלי כתיבה';
 $labels['acli'] = 'הוספה בין ערכים (העתקה לתוך)';
 $labels['aclp'] = 'פרסום';
-$labels['shortaclp'] = 'פרסום';
 $labels['aclc'] = 'יצירת תת־תיקיות';
 $labels['aclk'] = 'יצירת תת־תיקיות';
 $labels['acld'] = 'מחיקת הודעות';
 $labels['aclt'] = 'מחיקת הודעות';
 $labels['acle'] = 'ניקוי רשומות שבוטלו';
-$labels['shortacle'] = 'ניקוי רשומות שבוטלו';
 $labels['aclx'] = 'מחיקת תיקיה';
 $labels['acla'] = 'מנהל';
-$labels['shortacla'] = 'מנהל';
+
 $labels['aclfull'] = 'שליטה מלאה';
 $labels['aclother'] = 'אחר';
-$labels['shortaclother'] = 'אחר';
 $labels['aclread'] = 'קריאה';
-$labels['shortaclr'] = 'קריאה';
-$labels['shortaclread'] = 'קריאה';
 $labels['aclwrite'] = 'כתיבה';
-$labels['shortaclw'] = 'כתיבה';
-$labels['shortaclwrite'] = 'כתיבה';
 $labels['acldelete'] = 'מחיקה';
-$labels['shortacld'] = 'מחיקה';
-$labels['shortaclt'] = 'מחיקה';
-$labels['shortacldelete'] = 'מחיקה';
+
+$labels['shortacll'] = 'חיפוש';
+$labels['shortaclr'] = 'קריאה';
 $labels['shortacls'] = 'להשאיר';
+$labels['shortaclw'] = 'כתיבה';
 $labels['shortacli'] = 'הוספה בין ערכים';
+$labels['shortaclp'] = 'פרסום';
 $labels['shortaclc'] = 'יצירה';
 $labels['shortaclk'] = 'יצירה';
+$labels['shortacld'] = 'מחיקה';
+$labels['shortaclt'] = 'מחיקה';
+$labels['shortacle'] = 'ניקוי רשומות שבוטלו';
 $labels['shortaclx'] = 'מחיקת תיקיה';
+$labels['shortacla'] = 'מנהל';
+
+$labels['shortaclother'] = 'אחר';
+$labels['shortaclread'] = 'קריאה';
+$labels['shortaclwrite'] = 'כתיבה';
+$labels['shortacldelete'] = 'מחיקה';
+
 $labels['longacll'] = 'התיקיה תראה ברשימות וניתן יהיה להרשם אליה';
 $labels['longaclr'] = 'ניתן לפתוח את התיקיה ולקרוא בה';
-$labels['longaclread'] = 'ניתן לפתוח את התיקיה ולקרוא בה';
 $labels['longacls'] = 'ניתן לשנות דגל נראה בהודעות';
 $labels['longaclw'] = 'ניתן לשנות דגלים ומילות מפתח בהודעות, למעט נראה ונמחק';
 $labels['longacli'] = 'ניתן לכתוב הודעות לתיקיה או למוחקן';
@@ -72,18 +78,22 @@ $labels['longaclt'] = 'ניתן לשנות דגל נמחק של הודעות';
 $labels['longacle'] = 'ניתן לנקות הודעות שסומנו כמבוטלות';
 $labels['longaclx'] = 'ניתן למחוק תיקיה זו או לשנות שמה';
 $labels['longacla'] = 'ניתן לשנות זכויות גישה של תיקיה זו';
+
 $labels['longaclfull'] = 'שליטה מלאה כולל ניהול התיקיה';
+$labels['longaclread'] = 'ניתן לפתוח את התיקיה ולקרוא בה';
 $labels['longaclwrite'] = 'ניתן לסמן, לכתוב או להעתיק הודעות לתיקיה זו';
 $labels['longacldelete'] = 'ניתן למחוק הודעות';
-$labels['deleting'] = 'זכויות גישה נמחקות...';
-$labels['saving'] = 'זכויות גישה נשמרות...';
-$labels['updatesuccess'] = 'זכויות גישה שונו בהצלחה';
-$labels['deletesuccess'] = 'זכויות גישה נמחקו בהצלחה';
-$labels['createsuccess'] = 'זכויות גישה נוספו בהצלחה';
-$labels['updateerror'] = 'לא ניתן לעדכן זכויות גישה';
-$labels['deleteerror'] = 'לא ניתן למחוק זכויות גישה';
-$labels['createerror'] = 'לא ניתן להוסיף זכויות גישה';
-$labels['deleteconfirm'] = 'האם ודאי שברצונך להסיר זכויות גישה של המשתמש(ים) שנבחרו?';
-$labels['norights'] = 'לא צוינו זכויות גישה כלשהן !';
-$labels['nouser'] = 'לא צוין שם משתמש כלשהו!';
 
+$messages['deleting'] = 'זכויות גישה נמחקות...';
+$messages['saving'] = 'זכויות גישה נשמרות...';
+$messages['updatesuccess'] = 'זכויות גישה שונו בהצלחה';
+$messages['deletesuccess'] = 'זכויות גישה נמחקו בהצלחה';
+$messages['createsuccess'] = 'זכויות גישה נוספו בהצלחה';
+$messages['updateerror'] = 'לא ניתן לעדכן זכויות גישה';
+$messages['deleteerror'] = 'לא ניתן למחוק זכויות גישה';
+$messages['createerror'] = 'לא ניתן להוסיף זכויות גישה';
+$messages['deleteconfirm'] = 'האם ודאי שברצונך להסיר זכויות גישה של המשתמש(ים) שנבחרו?';
+$messages['norights'] = 'לא צוינו זכויות גישה כלשהן !';
+$messages['nouser'] = 'לא צוין שם משתמש כלשהו!';
+
+?>
diff --git a/plugins/acl/localization/hu_HU.inc b/plugins/acl/localization/hu_HU.inc
index f5ca78fe4..adc6ad8b3 100644
--- a/plugins/acl/localization/hu_HU.inc
+++ b/plugins/acl/localization/hu_HU.inc
@@ -2,18 +2,20 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/hu_HU/labels.inc                                         |
+ | plugins/acl/localization/<lang>.inc                                   |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail ACL plugin                 |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: bela                                                          |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
 
-$labels = array();
 $labels['sharing'] = 'Megosztás';
 $labels['myrights'] = 'Hozzáférési jogok';
 $labels['username'] = 'Felhasználó:';
@@ -23,44 +25,48 @@ $labels['actions'] = 'Hozzáférési jogok müveletei..';
 $labels['anyone'] = 'Minden felhasználó (bárki)';
 $labels['anonymous'] = 'Vendégek (névtelen)';
 $labels['identifier'] = 'Azonosító';
+
 $labels['acll'] = 'Keresés';
-$labels['shortacll'] = 'Keresés';
 $labels['aclr'] = 'Üzenetek olvasása';
 $labels['acls'] = 'Olvasottsági állapot megtartása';
 $labels['aclw'] = 'Üzenet jelölése';
 $labels['acli'] = 'Beillesztés (Bemásolás)';
 $labels['aclp'] = 'Bejegyzés';
-$labels['shortaclp'] = 'Bejegyzés';
 $labels['aclc'] = 'Almappa létrehozás';
 $labels['aclk'] = 'Almappa létrehozás';
 $labels['acld'] = 'Üzenetek törlése';
 $labels['aclt'] = 'Üzenetek törlése';
 $labels['acle'] = 'Törölt üzenetek eltávolítása';
-$labels['shortacle'] = 'Törölt üzenetek eltávolítása';
 $labels['aclx'] = 'Mappa törlés';
 $labels['acla'] = 'Adminisztrátor';
-$labels['shortacla'] = 'Adminisztrátor';
+
 $labels['aclfull'] = 'Teljes hozzáférés';
 $labels['aclother'] = 'Egyéb';
-$labels['shortaclother'] = 'Egyéb';
 $labels['aclread'] = 'Olvasás';
-$labels['shortaclr'] = 'Olvasás';
-$labels['shortaclread'] = 'Olvasás';
 $labels['aclwrite'] = 'Írás';
-$labels['shortaclw'] = 'Írás';
-$labels['shortaclwrite'] = 'Írás';
 $labels['acldelete'] = 'Törlés';
-$labels['shortacld'] = 'Törlés';
-$labels['shortaclt'] = 'Törlés';
-$labels['shortacldelete'] = 'Törlés';
+
+$labels['shortacll'] = 'Keresés';
+$labels['shortaclr'] = 'Olvasás';
 $labels['shortacls'] = 'Megtartás';
+$labels['shortaclw'] = 'Írás';
 $labels['shortacli'] = 'Beszúrás';
+$labels['shortaclp'] = 'Bejegyzés';
 $labels['shortaclc'] = 'Létrehozás';
 $labels['shortaclk'] = 'Létrehozás';
+$labels['shortacld'] = 'Törlés';
+$labels['shortaclt'] = 'Törlés';
+$labels['shortacle'] = 'Törölt üzenetek eltávolítása';
 $labels['shortaclx'] = 'Mappa törlése';
+$labels['shortacla'] = 'Adminisztrátor';
+
+$labels['shortaclother'] = 'Egyéb';
+$labels['shortaclread'] = 'Olvasás';
+$labels['shortaclwrite'] = 'Írás';
+$labels['shortacldelete'] = 'Törlés';
+
 $labels['longacll'] = 'A mappa látható a listán és fel tudsz rá iratkozni.';
 $labels['longaclr'] = 'A mappa olvasásra megnyitható';
-$labels['longaclread'] = 'A mappa olvasásra megnyitható';
 $labels['longacls'] = 'Az üzenet megtekintési állapota módosítható';
 $labels['longaclw'] = 'Az üzenetek jelölései és kulcsszavai módosíthatóak, kivéve az olvasottsági állapotot és az üzenet törölt állapotát.';
 $labels['longacli'] = 'Üzenetek irhatóak és máolshatóak a mappába.';
@@ -72,18 +78,22 @@ $labels['longaclt'] = 'Üzenet törölve jelző módositható.';
 $labels['longacle'] = 'Az üzenetek véglegesen eltávolíthatóak';
 $labels['longaclx'] = 'A mappa törölhető vagy átnevezhető';
 $labels['longacla'] = 'A mappa hozzáférési jogai módosíthatóak';
+
 $labels['longaclfull'] = 'Teljes hozzáférés beleértve a mappák kezelését';
+$labels['longaclread'] = 'A mappa olvasásra megnyitható';
 $labels['longaclwrite'] = 'Az üzenetek megjelölhetök, irhatók és másolhatók ebbe a mappába';
 $labels['longacldelete'] = 'Az üzenetek törölhetőek';
-$labels['deleting'] = 'Hozzáférési jogok törlése...';
-$labels['saving'] = 'Hozzáférési jogok mentése...';
-$labels['updatesuccess'] = 'A hozzáférési jogok sikeresen módosultak.';
-$labels['deletesuccess'] = 'A hozzáférési jogok törlése sikeresen megtörtént.';
-$labels['createsuccess'] = 'A hozzáférési jogok hozzáadása sikeresen megtörtént.';
-$labels['updateerror'] = 'Nem sikerült módosítani a hozzáférési jogokat.';
-$labels['deleteerror'] = 'Nem sikerült törölni a hozzáférési jogokat.';
-$labels['createerror'] = 'Nem sikerült a hozzáférési jogok hozzáadása';
-$labels['deleteconfirm'] = 'Biztosan eltávolítja a kiválasztott felhasználó(k) hozzáférési jogait?';
-$labels['norights'] = 'Nincsennek jogok megadva.';
-$labels['nouser'] = 'A felhasználónév nincs megadva.';
 
+$messages['deleting'] = 'Hozzáférési jogok törlése...';
+$messages['saving'] = 'Hozzáférési jogok mentése...';
+$messages['updatesuccess'] = 'A hozzáférési jogok sikeresen módosultak.';
+$messages['deletesuccess'] = 'A hozzáférési jogok törlése sikeresen megtörtént.';
+$messages['createsuccess'] = 'A hozzáférési jogok hozzáadása sikeresen megtörtént.';
+$messages['updateerror'] = 'Nem sikerült módosítani a hozzáférési jogokat.';
+$messages['deleteerror'] = 'Nem sikerült törölni a hozzáférési jogokat.';
+$messages['createerror'] = 'Nem sikerült a hozzáférési jogok hozzáadása';
+$messages['deleteconfirm'] = 'Biztosan eltávolítja a kiválasztott felhasználó(k) hozzáférési jogait?';
+$messages['norights'] = 'Nincsennek jogok megadva.';
+$messages['nouser'] = 'A felhasználónév nincs megadva.';
+
+?>
diff --git a/plugins/acl/localization/hy_AM.inc b/plugins/acl/localization/hy_AM.inc
index 86292984a..d39c19a46 100644
--- a/plugins/acl/localization/hy_AM.inc
+++ b/plugins/acl/localization/hy_AM.inc
@@ -2,18 +2,20 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/hy_AM/labels.inc                                         |
+ | plugins/acl/localization/<lang>.inc                                   |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail ACL plugin                 |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Vahan Yerkanian <vahan@yerkanian.com>                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
 
-$labels = array();
 $labels['sharing'] = 'Կիսվել';
 $labels['myrights'] = 'Մուտքի իրավունքներ';
 $labels['username'] = 'Օգտատեր`';
@@ -23,44 +25,48 @@ $labels['actions'] = 'Մուտքի իրավունքների գործողությ
 $labels['anyone'] = 'Բոլոր օգտվողները (ցանկացած)';
 $labels['anonymous'] = 'Հյուրերը (անանուն)';
 $labels['identifier'] = 'Նկարագրիչ';
+
 $labels['acll'] = 'Փնտրում';
-$labels['shortacll'] = 'Փնտրում';
 $labels['aclr'] = 'Կարդալ հաղորդագրությունները';
 $labels['acls'] = 'Պահպանել դիտման կարգավիճակը';
 $labels['aclw'] = 'Գրառման նշումներ';
 $labels['acli'] = 'Ներդնել (Պատճենել ներս)';
 $labels['aclp'] = 'Հրապարակել';
-$labels['shortaclp'] = 'Հրապարակել';
 $labels['aclc'] = 'Ստեղծել ենթապանակներ';
 $labels['aclk'] = 'Ստեղծել ենթապանակներ';
 $labels['acld'] = 'Ջնջել հաղորդագրությունները';
 $labels['aclt'] = 'Ջնջել հաղորդագրությունները';
 $labels['acle'] = 'Հեռացնել';
-$labels['shortacle'] = 'Հեռացնել';
 $labels['aclx'] = 'Ջնջել պանակը';
 $labels['acla'] = 'Կառավարել';
-$labels['shortacla'] = 'Կառավարել';
+
 $labels['aclfull'] = 'Լրիվ վերահսկում';
 $labels['aclother'] = 'Այլ';
-$labels['shortaclother'] = 'Այլ';
 $labels['aclread'] = 'Կարդալ';
-$labels['shortaclr'] = 'Կարդալ';
-$labels['shortaclread'] = 'Կարդալ';
 $labels['aclwrite'] = 'Գրել';
-$labels['shortaclw'] = 'Գրել';
-$labels['shortaclwrite'] = 'Գրել';
 $labels['acldelete'] = 'Ջնջել';
-$labels['shortacld'] = 'Ջնջել';
-$labels['shortaclt'] = 'Ջնջել';
-$labels['shortacldelete'] = 'Ջնջել';
+
+$labels['shortacll'] = 'Փնտրում';
+$labels['shortaclr'] = 'Կարդալ';
 $labels['shortacls'] = 'Պահել';
+$labels['shortaclw'] = 'Գրել';
 $labels['shortacli'] = 'Ներդնել';
+$labels['shortaclp'] = 'Հրապարակել';
 $labels['shortaclc'] = 'Ստեղծել';
 $labels['shortaclk'] = 'Ստեղծել';
+$labels['shortacld'] = 'Ջնջել';
+$labels['shortaclt'] = 'Ջնջել';
+$labels['shortacle'] = 'Հեռացնել';
 $labels['shortaclx'] = 'Պանակի ջնջում';
+$labels['shortacla'] = 'Կառավարել';
+
+$labels['shortaclother'] = 'Այլ';
+$labels['shortaclread'] = 'Կարդալ';
+$labels['shortaclwrite'] = 'Գրել';
+$labels['shortacldelete'] = 'Ջնջել';
+
 $labels['longacll'] = 'Պանակը երևում է ցուցակներում և նրան հնարավոր է բաժանորդագրվել';
 $labels['longaclr'] = 'Պանակը կարող է բացվել ընթերցման համար';
-$labels['longaclread'] = 'Պանակը կարող է բացվել ընթերցման համար';
 $labels['longacls'] = 'Տեսված հաղորդագրությունների նշումը կարող է փոփոխվել';
 $labels['longaclw'] = 'Հաղորդագրությունների նշումները և հիմնաբառերը կարող են փոփոխվել, բացառությամբ Տեսած և Ջնջված նշումների';
 $labels['longacli'] = 'Հաղորդագրությունները կարող են գրվել և պատճենվել պանակի մեջ';
@@ -72,18 +78,22 @@ $labels['longaclt'] = 'Հաղորդագրությունների Ջնջել նշ�
 $labels['longacle'] = 'Հաղորդագրությունները կարող են հեռացվել';
 $labels['longaclx'] = 'Պանակը կարող է ջնջվել կամ վերանվանվել';
 $labels['longacla'] = 'Պանակի մուտքի իրավունքները կարող են փոփոխվել';
+
 $labels['longaclfull'] = 'Լրիվ վերահսկում ներառյալ պանակների կառավարումը';
+$labels['longaclread'] = 'Պանակը կարող է բացվել ընթերցման համար';
 $labels['longaclwrite'] = 'Հաղորդագրությունները կարող են նշվել, ստեղծվել և պատճենվել այս պանակում';
 $labels['longacldelete'] = 'Հաղորդագրությունները կարող են ջնջվել';
-$labels['deleting'] = 'Ջնջվում են մուտքի իրավունքները…';
-$labels['saving'] = 'Պահպանվում են մուտքի իրավունքները…';
-$labels['updatesuccess'] = 'Մուտքի իրավունքները բարեհաջող փոփոխվեցին։';
-$labels['deletesuccess'] = 'Մուտքի իրավունքները բարեհաջող ջնջվեցին։';
-$labels['createsuccess'] = 'Մուտքի իրավունքները բարեհաջող ավելացվեցվին։';
-$labels['updateerror'] = 'Մուտքի իրավունքները թարմացումը ձախողվեց։';
-$labels['deleteerror'] = 'Մուտքի իրավունքները ջնջումը ձախողվեց։';
-$labels['createerror'] = 'Մուտքի իրավունքները ավելացումը ձախողվեց։';
-$labels['deleteconfirm'] = 'Դուք վստա՞հ էք, որ ցանկանում եք նշված օգտվողներին զրկել մուտքի իրավունքներից։';
-$labels['norights'] = 'Ոչ մի իրավունք չի՛ նշվել։';
-$labels['nouser'] = 'Օգտվողի անունը չի՛ նշվել։';
 
+$messages['deleting'] = 'Ջնջվում են մուտքի իրավունքները…';
+$messages['saving'] = 'Պահպանվում են մուտքի իրավունքները…';
+$messages['updatesuccess'] = 'Մուտքի իրավունքները բարեհաջող փոփոխվեցին։';
+$messages['deletesuccess'] = 'Մուտքի իրավունքները բարեհաջող ջնջվեցին։';
+$messages['createsuccess'] = 'Մուտքի իրավունքները բարեհաջող ավելացվեցվին։';
+$messages['updateerror'] = 'Մուտքի իրավունքները թարմացումը ձախողվեց։';
+$messages['deleteerror'] = 'Մուտքի իրավունքները ջնջումը ձախողվեց։';
+$messages['createerror'] = 'Մուտքի իրավունքները ավելացումը ձախողվեց։';
+$messages['deleteconfirm'] = 'Դուք վստա՞հ էք, որ ցանկանում եք նշված օգտվողներին զրկել մուտքի իրավունքներից։';
+$messages['norights'] = 'Ոչ մի իրավունք չի՛ նշվել։';
+$messages['nouser'] = 'Օգտվողի անունը չի՛ նշվել։';
+
+?>
diff --git a/plugins/acl/localization/id_ID.inc b/plugins/acl/localization/id_ID.inc
index e38070d93..8e8afc0b8 100644
--- a/plugins/acl/localization/id_ID.inc
+++ b/plugins/acl/localization/id_ID.inc
@@ -2,27 +2,98 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/id_ID/labels.inc                                         |
+ | plugins/acl/localization/<lang>.inc                                   |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail ACL plugin                 |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Lazlo                                                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
 
-$labels = array();
 $labels['sharing'] = 'Berbagi';
 $labels['myrights'] = 'Hak Akses';
 $labels['username'] = 'Pengguna:';
-$labels['identifier'] = 'Identifair';
+$labels['advanced'] = 'mode canggih';
+$labels['newuser'] = 'Tambahkan entri';
+$labels['actions'] = 'Aksi hak akses...';
+$labels['anyone'] = 'Semua pengguna (siapa saja)';
+$labels['anonymous'] = 'Para tamu (anonim)';
+$labels['identifier'] = 'Yang mengidentifikasi';
+
 $labels['acll'] = 'Cari';
-$labels['shortacll'] = 'Cari';
+$labels['aclr'] = 'Baca pesan';
+$labels['acls'] = 'Jaga status terbaca';
+$labels['aclw'] = 'Membuat tanda';
+$labels['acli'] = 'Sisipkan (Salin kedalam)';
 $labels['aclp'] = 'Tulisan';
-$labels['shortaclp'] = 'Tulisan';
 $labels['aclc'] = 'Buat subfolder';
 $labels['aclk'] = 'Buat subfolder';
+$labels['acld'] = 'Hapus pesan';
+$labels['aclt'] = 'Hapus pesan';
+$labels['acle'] = 'Menghapus';
 $labels['aclx'] = 'Hapus folder';
+$labels['acla'] = 'Kelola';
+
+$labels['aclfull'] = 'Kendali penuh';
+$labels['aclother'] = 'Lainnya';
+$labels['aclread'] = 'Baca';
+$labels['aclwrite'] = 'Tulis';
+$labels['acldelete'] = 'Hapus';
+
+$labels['shortacll'] = 'Cari';
+$labels['shortaclr'] = 'Baca';
+$labels['shortacls'] = 'Simpan';
+$labels['shortaclw'] = 'Tulis';
+$labels['shortacli'] = 'Sisipkan';
+$labels['shortaclp'] = 'Tulisan';
+$labels['shortaclc'] = 'Buat';
+$labels['shortaclk'] = 'Buat';
+$labels['shortacld'] = 'Hapus';
+$labels['shortaclt'] = 'Hapus';
+$labels['shortacle'] = 'Buang';
+$labels['shortaclx'] = 'Hapus folder';
+$labels['shortacla'] = 'Kelola';
+
+$labels['shortaclother'] = 'Lainnya';
+$labels['shortaclread'] = 'Baca';
+$labels['shortaclwrite'] = 'Tulis';
+$labels['shortacldelete'] = 'Hapus';
+
+$labels['longacll'] = 'Folder terlihat di daftar dan dapat dijadikan langganan';
+$labels['longaclr'] = 'Folder dapat dibuka untuk dibaca';
+$labels['longacls'] = 'Tanda pesan terbaca dapat diubah';
+$labels['longaclw'] = 'Tanda pesan dan kata kunci dapat diubah, kecuali Terbaca dan Terhapus';
+$labels['longacli'] = 'Pesan dapat ditulis atau disalin kedalam folder';
+$labels['longaclp'] = 'Pesan dapat dikirim ke folder ini';
+$labels['longaclc'] = 'Folder dapat dibuat (atau diubah namanya) langsung dari folder ini';
+$labels['longaclk'] = 'Folder dapat dibuat (atau diubah namanya) langsung dari folder ini';
+$labels['longacld'] = 'Tanda hapus pesan dapat diubah';
+$labels['longaclt'] = 'Tanda hapus pesan dapat diubah';
+$labels['longacle'] = 'Pesan dapat dibuang';
+$labels['longaclx'] = 'Folder dapat dihapus atau diubah namanya';
+$labels['longacla'] = 'Hak akses folder dapat diubah';
+
+$labels['longaclfull'] = 'Kendali penuh penuh termasuk administrasi';
+$labels['longaclread'] = 'Folder dapat dibuka untuk dibaca';
+$labels['longaclwrite'] = 'Pesan dapat ditandai, ditulis atau disalin kedalam folder';
+$labels['longacldelete'] = 'Pesan dapat dihapus';
+
+$messages['deleting'] = 'Menghapus hak akses...';
+$messages['saving'] = 'Menyimpan hak akses...';
+$messages['updatesuccess'] = 'Hak akses berhasil diubah';
+$messages['deletesuccess'] = 'Hak akses berhasil dihapus';
+$messages['createsuccess'] = 'Hak akses berhasil ditambahkan';
+$messages['updateerror'] = 'Tidak dapat memperbaharui hak akses';
+$messages['deleteerror'] = 'Tidak dapat menghapus hak akses';
+$messages['createerror'] = 'Tidak dapat menambah hak akses';
+$messages['deleteconfirm'] = 'Apakah Anda yakin ingin menghapus hak akses dari user terpilih?';
+$messages['norights'] = 'Hak belum ditentukan!';
+$messages['nouser'] = 'Username belum ditentukan!';
 
+?>
diff --git a/plugins/acl/localization/it_IT.inc b/plugins/acl/localization/it_IT.inc
index ce3751c8b..11d905387 100644
--- a/plugins/acl/localization/it_IT.inc
+++ b/plugins/acl/localization/it_IT.inc
@@ -2,79 +2,98 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/it_IT/labels.inc                                         |
+ | plugins/acl/localization/<lang>.inc                                   |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail ACL plugin                 |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Andrea Bernini <andrea.bernini@gmail.com>                     |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
 
-$labels = array();
 $labels['sharing'] = 'Condivisione';
 $labels['myrights'] = 'Diritti d\'accesso';
 $labels['username'] = 'Utente:';
 $labels['advanced'] = 'modalità avanzata';
 $labels['newuser'] = 'Aggiungi voce';
+$labels['actions'] = 'Azioni permessi d\'accesso...';
 $labels['anyone'] = 'Tutti gli utenti';
 $labels['anonymous'] = 'Osptiti (anonimi)';
 $labels['identifier'] = 'Identificatore';
+
 $labels['acll'] = 'Ricerca';
-$labels['shortacll'] = 'Ricerca';
 $labels['aclr'] = 'Leggi messaggi';
 $labels['acls'] = 'Mantieni lo stato Visto';
 $labels['aclw'] = 'Flag di scrittura';
 $labels['acli'] = 'Inserisci (Copia in)';
+$labels['aclp'] = 'Invio';
 $labels['aclc'] = 'Crea sottocartelle';
 $labels['aclk'] = 'Crea sottocartelle';
 $labels['acld'] = 'Elimina messaggi';
 $labels['aclt'] = 'Elimina messaggi';
+$labels['acle'] = 'Elimina';
 $labels['aclx'] = 'Elimina cartella';
 $labels['acla'] = 'Amministra';
-$labels['shortacla'] = 'Amministra';
+
 $labels['aclfull'] = 'Controllo completo';
-$labels['aclother'] = 'Altri';
-$labels['shortaclother'] = 'Altri';
+$labels['aclother'] = 'Altro';
 $labels['aclread'] = 'Lettura';
-$labels['shortaclr'] = 'Lettura';
-$labels['shortaclread'] = 'Lettura';
 $labels['aclwrite'] = 'Scrittura';
-$labels['shortaclw'] = 'Scrittura';
-$labels['shortaclwrite'] = 'Scrittura';
 $labels['acldelete'] = 'Elimina';
-$labels['shortacld'] = 'Elimina';
-$labels['shortaclt'] = 'Elimina';
-$labels['shortacldelete'] = 'Elimina';
+
+$labels['shortacll'] = 'Ricerca';
+$labels['shortaclr'] = 'Lettura';
 $labels['shortacls'] = 'Mantieni';
+$labels['shortaclw'] = 'Scrittura';
 $labels['shortacli'] = 'Inserisci';
+$labels['shortaclp'] = 'Invio';
 $labels['shortaclc'] = 'Crea';
 $labels['shortaclk'] = 'Crea';
-$labels['shortaclx'] = 'Cancella cartella';
+$labels['shortacld'] = 'Elimina';
+$labels['shortaclt'] = 'Elimina';
+$labels['shortacle'] = 'Elimina';
+$labels['shortaclx'] = 'Elimina cartella';
+$labels['shortacla'] = 'Amministra';
+
+$labels['shortaclother'] = 'Altro';
+$labels['shortaclread'] = 'Lettura';
+$labels['shortaclwrite'] = 'Scrittura';
+$labels['shortacldelete'] = 'Elimina';
+
 $labels['longacll'] = 'La cartella è visibile sulle liste e può essere sottoscritta';
 $labels['longaclr'] = 'Questa cartella può essere aperta in lettura';
-$labels['longaclread'] = 'Questa cartella può essere aperta in lettura';
 $labels['longacls'] = 'Il flag Messaggio Visto può essere cambiato';
 $labels['longaclw'] = 'I flag dei messaggi e le keywords possono essere cambiati, ad esclusione di Visto ed Eliminato';
 $labels['longacli'] = 'I messaggi possono essere scritti o copiati nella cartella';
+$labels['longaclp'] = 'I messaggi possono essere inviati a questa cartella';
+$labels['longaclc'] = 'Possono essere create (o rinominata) cartelle direttamente in questa cartella.';
+$labels['longaclk'] = 'Possono essere create (o rinominata) cartelle direttamente in questa cartella.';
 $labels['longacld'] = 'Il flag Messaggio Eliminato può essere cambiato';
 $labels['longaclt'] = 'Il flag Messaggio Eliminato può essere cambiato';
+$labels['longacle'] = 'I messaggi possono essere cancellati';
 $labels['longaclx'] = 'La cartella può essere eliminata o rinominata';
 $labels['longacla'] = 'I diritti di accesso della cartella possono essere cambiati';
+
 $labels['longaclfull'] = 'Controllo completo incluso cartella di amministrazione';
+$labels['longaclread'] = 'Questa cartella può essere aperta in lettura';
 $labels['longaclwrite'] = 'I messaggi possono essere marcati, scritti o copiati nella cartella';
 $labels['longacldelete'] = 'I messaggi possono essere eliminati';
-$labels['deleting'] = 'Sto eliminando i diritti di accesso...';
-$labels['saving'] = 'Sto salvando i diritti di accesso...';
-$labels['updatesuccess'] = 'I diritti d\'accesso sono stati cambiati';
-$labels['deletesuccess'] = 'I diritti d\'accesso sono stati eliminati';
-$labels['createsuccess'] = 'I diritti d\'accesso sono stati aggiunti';
-$labels['updateerror'] = 'Impossibile aggiornare i diritti d\'accesso';
-$labels['deleteerror'] = 'Impossibile eliminare i diritti d\'accesso';
-$labels['createerror'] = 'Impossibile aggiungere i diritti d\'accesso';
-$labels['deleteconfirm'] = 'Sei sicuro, vuoi rimuovere i diritti d\'accesso degli utenti selezionati?';
-$labels['norights'] = 'Nessun diritto specificato!';
-$labels['nouser'] = 'Lo username non è stato specificato!';
 
+$messages['deleting'] = 'Sto eliminando i diritti di accesso...';
+$messages['saving'] = 'Sto salvando i diritti di accesso...';
+$messages['updatesuccess'] = 'I diritti d\'accesso sono stati cambiati';
+$messages['deletesuccess'] = 'I diritti d\'accesso sono stati eliminati';
+$messages['createsuccess'] = 'I diritti d\'accesso sono stati aggiunti';
+$messages['updateerror'] = 'Impossibile aggiornare i diritti d\'accesso';
+$messages['deleteerror'] = 'Impossibile eliminare i diritti d\'accesso';
+$messages['createerror'] = 'Impossibile aggiungere i diritti d\'accesso';
+$messages['deleteconfirm'] = 'Sei sicuro, vuoi rimuovere i diritti d\'accesso degli utenti selezionati?';
+$messages['norights'] = 'Nessun diritto specificato!';
+$messages['nouser'] = 'Lo username non è stato specificato!';
+
+?>
diff --git a/plugins/acl/localization/ja_JP.inc b/plugins/acl/localization/ja_JP.inc
index 3f915e291..29e96e6fe 100644
--- a/plugins/acl/localization/ja_JP.inc
+++ b/plugins/acl/localization/ja_JP.inc
@@ -2,18 +2,20 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ja_JP/labels.inc                                         |
+ | plugins/acl/localization/<lang>.inc                                   |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail ACL plugin                 |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Takahiro Kambe                                                |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
 
-$labels = array();
 $labels['sharing'] = '共有';
 $labels['myrights'] = 'アクセス権';
 $labels['username'] = 'ユーザー:';
@@ -23,44 +25,48 @@ $labels['actions'] = 'アクセス権の動作...';
 $labels['anyone'] = '(誰でも)すべてのユーザー';
 $labels['anonymous'] = 'ゲスト(匿名)';
 $labels['identifier'] = '識別子';
+
 $labels['acll'] = '検索';
-$labels['shortacll'] = '検索';
 $labels['aclr'] = 'メッセージを読む';
 $labels['acls'] = '既読の状態を保持';
 $labels['aclw'] = '書き込みフラッグ';
 $labels['acli'] = '挿入(中に複製)';
 $labels['aclp'] = '投稿';
-$labels['shortaclp'] = '投稿';
 $labels['aclc'] = 'サブフォルダを作成';
 $labels['aclk'] = 'サブフォルダを作成';
 $labels['acld'] = 'メッセージを削除';
 $labels['aclt'] = 'メッセージを削除';
 $labels['acle'] = '抹消';
-$labels['shortacle'] = '抹消';
 $labels['aclx'] = 'フォルダーを削除';
 $labels['acla'] = '管理';
-$labels['shortacla'] = '管理';
+
 $labels['aclfull'] = '完全な制御';
 $labels['aclother'] = 'その他';
-$labels['shortaclother'] = 'その他';
 $labels['aclread'] = '読み込み';
-$labels['shortaclr'] = '読み込み';
-$labels['shortaclread'] = '読み込み';
 $labels['aclwrite'] = '書き込み';
-$labels['shortaclw'] = '書き込み';
-$labels['shortaclwrite'] = '書き込み';
 $labels['acldelete'] = '削除';
-$labels['shortacld'] = '削除';
-$labels['shortaclt'] = '削除';
-$labels['shortacldelete'] = '削除';
+
+$labels['shortacll'] = '検索';
+$labels['shortaclr'] = '読み込み';
 $labels['shortacls'] = '保持';
+$labels['shortaclw'] = '書き込み';
 $labels['shortacli'] = '挿入';
+$labels['shortaclp'] = '投稿';
 $labels['shortaclc'] = '作成';
 $labels['shortaclk'] = '作成';
+$labels['shortacld'] = '削除';
+$labels['shortaclt'] = '削除';
+$labels['shortacle'] = '抹消';
 $labels['shortaclx'] = 'フォルダーの削除';
+$labels['shortacla'] = '管理';
+
+$labels['shortaclother'] = 'その他';
+$labels['shortaclread'] = '読み込み';
+$labels['shortaclwrite'] = '書き込み';
+$labels['shortacldelete'] = '削除';
+
 $labels['longacll'] = 'フォルダーをリストに見えるようにして登録可能:';
 $labels['longaclr'] = 'フォルダーを読むことを可能';
-$labels['longaclread'] = 'フォルダーを読むことを可能';
 $labels['longacls'] = 'メッセージの既読のフラッグの変更を可能';
 $labels['longaclw'] = '既読と削除のフラッグを除く、メッセージのフラッグとキーワードの変更を可能';
 $labels['longacli'] = 'メッセージに書き込みとフォルダーへの複製を可能';
@@ -72,18 +78,22 @@ $labels['longaclt'] = 'メッセージの削除フラッグの変更を可能';
 $labels['longacle'] = 'メッセージの抹消を可能';
 $labels['longaclx'] = 'このフォルダーの削除や名前の変更を可能';
 $labels['longacla'] = 'フォルダーのアクセス権の変更を可能';
+
 $labels['longaclfull'] = 'フォルダーの管理を含めた完全な制御を可能';
+$labels['longaclread'] = 'フォルダーを読むことを可能';
 $labels['longaclwrite'] = 'メッセージにマークの設定、書き込み、フォルダーに複製を可能';
 $labels['longacldelete'] = 'メッセージの削除を可能';
-$labels['deleting'] = 'アクセス権を削除中...';
-$labels['saving'] = 'アクセス権を保存中...';
-$labels['updatesuccess'] = 'アクセス権を変更しました。';
-$labels['deletesuccess'] = 'アクセス権を削除しました。';
-$labels['createsuccess'] = 'アクセス権を追加しました。';
-$labels['updateerror'] = 'アクセス権を更新できません。';
-$labels['deleteerror'] = 'アクセス権を削除できません。';
-$labels['createerror'] = 'アクセス権を追加できません。';
-$labels['deleteconfirm'] = '選択したユーザーのアクセス件を本当に削除したいですか?';
-$labels['norights'] = '何の権限も指定されていません!';
-$labels['nouser'] = 'ユーザー名を指定していません!';
 
+$messages['deleting'] = 'アクセス権を削除中...';
+$messages['saving'] = 'アクセス権を保存中...';
+$messages['updatesuccess'] = 'アクセス権を変更しました。';
+$messages['deletesuccess'] = 'アクセス権を削除しました。';
+$messages['createsuccess'] = 'アクセス権を追加しました。';
+$messages['updateerror'] = 'アクセス権を更新できません。';
+$messages['deleteerror'] = 'アクセス権を削除できません。';
+$messages['createerror'] = 'アクセス権を追加できません。';
+$messages['deleteconfirm'] = '選択したユーザーのアクセス件を本当に削除したいですか?';
+$messages['norights'] = '何の権限も指定されていません!';
+$messages['nouser'] = 'ユーザー名を指定していません!';
+
+?>
diff --git a/plugins/acl/localization/ko_KR.inc b/plugins/acl/localization/ko_KR.inc
index 54f7d4032..524427a4e 100644
--- a/plugins/acl/localization/ko_KR.inc
+++ b/plugins/acl/localization/ko_KR.inc
@@ -2,54 +2,98 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ko_KR/labels.inc                                         |
+ | plugins/acl/localization/<lang>.inc                                   |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail ACL plugin                 |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Kim, Woohyun <woohyun.kim@gmail.com>                          |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
 
-$labels = array();
 $labels['sharing'] = '공유';
 $labels['myrights'] = '접근 권한';
 $labels['username'] = '사용자:';
+$labels['advanced'] = '고급 모드';
 $labels['newuser'] = '엔트리 추가';
+$labels['actions'] = '접근 권한 동작...';
+$labels['anyone'] = '모든 사용자 (아무나)';
+$labels['anonymous'] = '방문자 (익명)';
 $labels['identifier'] = '식별자';
+
+$labels['acll'] = '조회';
+$labels['aclr'] = '읽은 메시지';
 $labels['acls'] = '읽은 상태로 유지';
+$labels['aclw'] = '쓰기 깃발';
+$labels['acli'] = '삽입 (복사할 위치)';
 $labels['aclp'] = '게시';
-$labels['shortaclp'] = '게시';
 $labels['aclc'] = '하위 폴더 만들기';
 $labels['aclk'] = '하위 폴더 만들기';
 $labels['acld'] = '메시지 삭제';
 $labels['aclt'] = '메시지 삭제';
+$labels['acle'] = '영구 제거';
 $labels['aclx'] = '폴더 삭제';
 $labels['acla'] = '관리자';
-$labels['shortacla'] = '관리자';
+
+$labels['aclfull'] = '전체 제어권';
+$labels['aclother'] = '기타';
+$labels['aclread'] = '읽기';
+$labels['aclwrite'] = '쓰기';
+$labels['acldelete'] = '삭제';
+
+$labels['shortacll'] = '조회';
+$labels['shortaclr'] = '읽기';
+$labels['shortacls'] = '보관';
+$labels['shortaclw'] = '쓰기';
+$labels['shortacli'] = '삽입';
+$labels['shortaclp'] = '게시';
+$labels['shortaclc'] = '생성';
+$labels['shortaclk'] = '생성';
+$labels['shortacld'] = '삭제';
+$labels['shortaclt'] = '삭제';
+$labels['shortacle'] = '지움';
 $labels['shortaclx'] = '폴더 삭제';
-$labels['longacli'] = '폴더에 메시지를 복사하거나 작성할 수 있음';
-$labels['longaclp'] = '이 폴더로 메시지를 게시할 수 있음';
-$labels['longaclc'] = '이 폴더의 바로 밑에 폴더를 생성(또는 이름 변경)할 수 있음';
-$labels['longaclk'] = '이 폴더의 바로 밑에 폴더를 생성(또는 이름 변경)할 수 있음';
-$labels['longacld'] = '메시지 삭제 플래그가 변경될 수 있음';
-$labels['longaclt'] = '메시지 삭제 플래그가 변경될 수 있음';
-$labels['longaclx'] = '폴더를 삭제하거나 이름 변경 할 수 있음';
+$labels['shortacla'] = '관리';
+
+$labels['shortaclother'] = '기타';
+$labels['shortaclread'] = '읽기';
+$labels['shortaclwrite'] = '쓱';
+$labels['shortacldelete'] = '삭제';
+
+$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['longaclwrite'] = '메시지에 표시하거나, 폴더로 메시지를 복사하거나 작성할 수 있음';
+$labels['longaclread'] = '폴더를 열어 읽을 수 있음';
+$labels['longaclwrite'] = '메시지에 표시하거나, 폴더로 이동하거나 복사할 수 있음';
 $labels['longacldelete'] = '메시지를 삭제할 수 있음';
-$labels['deleting'] = '접근 권한 삭제 중...';
-$labels['saving'] = '접근 권한 저장 중...';
-$labels['updatesuccess'] = '접근 권한을 변경하는데 성공 함.';
-$labels['deletesuccess'] = '접근 권한을 삭제하는데 성공 함.';
-$labels['createsuccess'] = '접근 권한을 추가하는데 성공 함.';
-$labels['updateerror'] = '접근 권한을 갱신할 수 없음.';
-$labels['deleteerror'] = '접근 권한을 삭제할 수 없음.';
-$labels['createerror'] = '접근 권한을 추가할 수 없음.';
-$labels['deleteconfirm'] = '선택한 사용자(들)의 접근 권한을 삭제하고자 하는 것이 확실 합니까?';
-$labels['norights'] = '지정된 권한이 없음!';
-$labels['nouser'] = '지정된 username이 없음!';
 
+$messages['deleting'] = '접근 권한을 삭제하는 중...';
+$messages['saving'] = '접근 권한을 저장하는 중...';
+$messages['updatesuccess'] = '접근 권한을 성공적으로 변경함.';
+$messages['deletesuccess'] = '접근 권한을 성공적으로 삭제함.';
+$messages['createsuccess'] = '접근 권한을 성공적으로 추가함.';
+$messages['updateerror'] = '접근 권한을 업데이트할 수 없음.';
+$messages['deleteerror'] = '접근 권한을 삭제할 수 없음.';
+$messages['createerror'] = '접근 권한을 추가할 수 없음.';
+$messages['deleteconfirm'] = '정말로 선택한 사용자의 접근 권한을 삭제하시겠습니까?';
+$messages['norights'] = '지정된 권한이 없음!';
+$messages['nouser'] = '지정된 사용자명이 없음!';
+
+?>
diff --git a/plugins/acl/localization/lt_LT.inc b/plugins/acl/localization/lt_LT.inc
index d43dd2e30..59393012f 100644
--- a/plugins/acl/localization/lt_LT.inc
+++ b/plugins/acl/localization/lt_LT.inc
@@ -2,67 +2,98 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/lt_LT/labels.inc                                         |
+ | plugins/acl/localization/<lang>.inc                                   |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail ACL plugin                 |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Linvydas Lapinskas <win0lin1@gmail.com>                       |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
 
-$labels = array();
 $labels['sharing'] = 'Dalinimasis';
 $labels['myrights'] = 'Prieigos teisės';
 $labels['username'] = 'Vartotojas:';
 $labels['advanced'] = 'pažengusio vartotojo rėžimas';
 $labels['newuser'] = 'Pridėti įrašą';
+$labels['actions'] = 'Prieigos teisių veiksmai...';
 $labels['anyone'] = 'Visi vartotojai (bet kas)';
 $labels['anonymous'] = 'Svečias (anonimas)';
 $labels['identifier'] = 'Identifikatorius';
+
 $labels['acll'] = 'Paieška';
-$labels['shortacll'] = 'Paieška';
 $labels['aclr'] = 'Perskaityti pranešimus';
+$labels['acls'] = 'Palikti būseną "Žiūrėtas"';
 $labels['aclw'] = 'Įrašyti vėliavėles';
 $labels['acli'] = 'Įterpti (kopijuoti į)';
 $labels['aclp'] = 'Įrašas';
-$labels['shortaclp'] = 'Įrašas';
 $labels['aclc'] = 'Kurti poaplankius';
 $labels['aclk'] = 'Kurti poaplankius';
 $labels['acld'] = 'Ištrinti žinutes';
 $labels['aclt'] = 'Ištrinti žinutes';
+$labels['acle'] = 'Išbraukti';
 $labels['aclx'] = 'Ištrinti aplanką';
+$labels['acla'] = 'Valdyti';
+
+$labels['aclfull'] = 'Visiška kontrolė';
 $labels['aclother'] = 'Kita';
-$labels['shortaclother'] = 'Kita';
 $labels['aclread'] = 'Skaityti';
-$labels['shortaclr'] = 'Skaityti';
-$labels['shortaclread'] = 'Skaityti';
 $labels['aclwrite'] = 'Įrašyti';
-$labels['shortaclw'] = 'Įrašyti';
-$labels['shortaclwrite'] = 'Įrašyti';
 $labels['acldelete'] = 'Trinti';
-$labels['shortacld'] = 'Trinti';
-$labels['shortaclt'] = 'Trinti';
-$labels['shortacldelete'] = 'Trinti';
+
+$labels['shortacll'] = 'Paieška';
+$labels['shortaclr'] = 'Skaityti';
 $labels['shortacls'] = 'Palikti';
+$labels['shortaclw'] = 'Įrašyti';
 $labels['shortacli'] = 'Įterpti';
+$labels['shortaclp'] = 'Įrašas';
 $labels['shortaclc'] = 'Sukurti';
 $labels['shortaclk'] = 'Sukurti';
+$labels['shortacld'] = 'Trinti';
+$labels['shortaclt'] = 'Trinti';
+$labels['shortacle'] = 'Išbraukti';
 $labels['shortaclx'] = 'Ištrinti aplanką';
+$labels['shortacla'] = 'Valdyti';
+
+$labels['shortaclother'] = 'Kita';
+$labels['shortaclread'] = 'Skaityti';
+$labels['shortaclwrite'] = 'Įrašyti';
+$labels['shortacldelete'] = 'Trinti';
+
+$labels['longacll'] = 'Aplankas yra matomas sąrašuose ir gali būti prenumeruojamas';
+$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'] = 'Į šį 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';
+$labels['longaclt'] = 'Pranešimų vėliavėlė "Ištrintas" gali būti pakeista';
 $labels['longacle'] = 'Pranešimai gali būti išbraukti';
 $labels['longaclx'] = 'Aplankas gali būti pašalintas arba pervadintas';
+$labels['longacla'] = 'Aplanko prieigos teisės gali būti pakeistos';
+
 $labels['longaclfull'] = 'Visiška kontrolė įskaitant aplanko administravimą';
+$labels['longaclread'] = 'Aplanką galima peržiūrėti';
 $labels['longaclwrite'] = 'Pranešimai gali būti pažymėti, įrašyti arba nukopijuoti į aplanką';
 $labels['longacldelete'] = 'Pranešimai gali būti ištrinti';
-$labels['deleting'] = 'Panaikinamos prieigos teisės';
-$labels['saving'] = 'Išsaugomos prieigos teisės';
-$labels['updatesuccess'] = 'Prieigos teisės sėkmingai pakeistos';
-$labels['deletesuccess'] = 'Prieigos teisės sėkmingai panaikintos';
-$labels['createsuccess'] = 'Prieigos teisės sėkmingai pridėtos';
-$labels['updateerror'] = 'Neįmanoma atnaujinti prieigos teises';
-$labels['deleteerror'] = 'Neįmanoma panaikinti prieigos teises';
-$labels['createerror'] = 'Neišeina pridėti prieigos teises';
 
+$messages['deleting'] = 'Panaikinamos prieigos teisės';
+$messages['saving'] = 'Išsaugomos prieigos teisės';
+$messages['updatesuccess'] = 'Prieigos teisės sėkmingai pakeistos';
+$messages['deletesuccess'] = 'Prieigos teisės sėkmingai panaikintos';
+$messages['createsuccess'] = 'Prieigos teisės sėkmingai pridėtos';
+$messages['updateerror'] = 'Neįmanoma atnaujinti prieigos teises';
+$messages['deleteerror'] = 'Neįmanoma panaikinti prieigos teises';
+$messages['createerror'] = 'Neišeina pridėti prieigos teises';
+$messages['deleteconfirm'] = 'Ar jūs esate įsitikinę, jog norite panaikinti prieigos teises pažymėtiems vartotojams(-ui)?';
+$messages['norights'] = 'Nenurodytos jokios teisės!';
+$messages['nouser'] = 'Nenurodytas joks vartotojas!';
+
+?>
diff --git a/plugins/acl/localization/nb_NO.inc b/plugins/acl/localization/nb_NO.inc
index 0ff45fdf8..26171578b 100644
--- a/plugins/acl/localization/nb_NO.inc
+++ b/plugins/acl/localization/nb_NO.inc
@@ -2,18 +2,20 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/nb_NB/labels.inc                                         |
+ | plugins/acl/localization/<lang>.inc                                   |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail ACL plugin                 |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Fredrik Larsen <fredrik.h.larsen@gmail.com>                   |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
 
-$labels = array();
 $labels['sharing'] = 'Deling';
 $labels['myrights'] = 'Tilgangsrettigheter';
 $labels['username'] = 'Bruker:';
@@ -23,44 +25,48 @@ $labels['actions'] = 'Valg for tilgangsrettigheter.';
 $labels['anyone'] = 'Alle brukere (alle)';
 $labels['anonymous'] = 'Gjester (anonyme)';
 $labels['identifier'] = 'Identifikator';
+
 $labels['acll'] = 'Oppslag';
-$labels['shortacll'] = 'Oppslag';
 $labels['aclr'] = 'Les meldinger';
 $labels['acls'] = 'Behold lesestatus';
 $labels['aclw'] = 'Lagre flagg';
 $labels['acli'] = 'Lim inn';
 $labels['aclp'] = 'Post';
-$labels['shortaclp'] = 'Post';
 $labels['aclc'] = 'Opprett undermapper';
 $labels['aclk'] = 'Opprett undermapper';
 $labels['acld'] = 'Slett meldinger';
 $labels['aclt'] = 'Slett meldinger';
 $labels['acle'] = 'Slett fullstendig';
-$labels['shortacle'] = 'Slett fullstendig';
 $labels['aclx'] = 'Slett mappe';
 $labels['acla'] = 'Administrer';
-$labels['shortacla'] = 'Administrer';
+
 $labels['aclfull'] = 'Full kontroll';
 $labels['aclother'] = 'Annet';
-$labels['shortaclother'] = 'Annet';
 $labels['aclread'] = 'Les';
-$labels['shortaclr'] = 'Les';
-$labels['shortaclread'] = 'Les';
 $labels['aclwrite'] = 'Skriv';
-$labels['shortaclw'] = 'Skriv';
-$labels['shortaclwrite'] = 'Skriv';
 $labels['acldelete'] = 'Slett';
-$labels['shortacld'] = 'Slett';
-$labels['shortaclt'] = 'Slett';
-$labels['shortacldelete'] = 'Slett';
+
+$labels['shortacll'] = 'Oppslag';
+$labels['shortaclr'] = 'Les';
 $labels['shortacls'] = 'Behold';
+$labels['shortaclw'] = 'Skriv';
 $labels['shortacli'] = 'Sett inn';
+$labels['shortaclp'] = 'Post';
 $labels['shortaclc'] = 'Opprett';
 $labels['shortaclk'] = 'Opprett';
+$labels['shortacld'] = 'Slett';
+$labels['shortaclt'] = 'Slett';
+$labels['shortacle'] = 'Slett fullstendig';
 $labels['shortaclx'] = 'Slett mappe';
+$labels['shortacla'] = 'Administrer';
+
+$labels['shortaclother'] = 'Annet';
+$labels['shortaclread'] = 'Les';
+$labels['shortaclwrite'] = 'Skriv';
+$labels['shortacldelete'] = 'Slett';
+
 $labels['longacll'] = 'Mappen er synlig og kan abonneres på';
 $labels['longaclr'] = 'Mappen kan åpnes for lesing';
-$labels['longaclread'] = 'Mappen kan åpnes for lesing';
 $labels['longacls'] = 'Meldingenes lesestatusflagg kan endres';
 $labels['longaclw'] = 'Meldingsflagg og -nøkkelord kan endres, bortsett fra status for lesing og sletting';
 $labels['longacli'] = 'Meldinger kan lagres eller kopieres til mappen';
@@ -72,18 +78,22 @@ $labels['longaclt'] = 'Meldingenes flagg for sletting kan endres';
 $labels['longacle'] = 'Meldingen kan slettes for godt';
 $labels['longaclx'] = 'Mappen kan slettes eller gis nytt navn';
 $labels['longacla'] = 'Mappens tilgangsrettigheter kan endres';
+
 $labels['longaclfull'] = 'Full kontroll, inkludert mappeadministrasjon';
+$labels['longaclread'] = 'Mappen kan åpnes for lesing';
 $labels['longaclwrite'] = 'Meldinger kan merkes, lagres i eller flyttes til mappen';
 $labels['longacldelete'] = 'Meldingen kan slettes';
-$labels['deleting'] = 'Sletter tilgangsrettigheter';
-$labels['saving'] = 'Lagrer tilgangsrettigheter';
-$labels['updatesuccess'] = 'Tilgangsrettigheter ble endret';
-$labels['deletesuccess'] = 'Tilgangsrettigheter ble slettet';
-$labels['createsuccess'] = 'Tilgangsrettigheter ble lagt til';
-$labels['updateerror'] = 'Kunne ikke oppdatere tilgangsrettigheter';
-$labels['deleteerror'] = 'Kunne ikke fjerne tilgangsrettigheter';
-$labels['createerror'] = 'Kunne ikke legge til tilgangsrettigheter';
-$labels['deleteconfirm'] = 'Er du sikker på at du vil fjerne tilgangen til  valgte brukere';
-$labels['norights'] = 'Ingen rettigheter er spesifisert!';
-$labels['nouser'] = 'Brukernavn er ikke spesifisert!';
 
+$messages['deleting'] = 'Sletter tilgangsrettigheter';
+$messages['saving'] = 'Lagrer tilgangsrettigheter';
+$messages['updatesuccess'] = 'Tilgangsrettigheter ble endret';
+$messages['deletesuccess'] = 'Tilgangsrettigheter ble slettet';
+$messages['createsuccess'] = 'Tilgangsrettigheter ble lagt til';
+$messages['updateerror'] = 'Kunne ikke oppdatere tilgangsrettigheter';
+$messages['deleteerror'] = 'Kunne ikke fjerne tilgangsrettigheter';
+$messages['createerror'] = 'Kunne ikke legge til tilgangsrettigheter';
+$messages['deleteconfirm'] = 'Er du sikker på at du vil fjerne tilgangen til  valgte brukere';
+$messages['norights'] = 'Ingen rettigheter er spesifisert!';
+$messages['nouser'] = 'Brukernavn er ikke spesifisert!';
+
+?>
diff --git a/plugins/acl/localization/nl_NL.inc b/plugins/acl/localization/nl_NL.inc
index 68dcc7f96..b5ca0c3d8 100644
--- a/plugins/acl/localization/nl_NL.inc
+++ b/plugins/acl/localization/nl_NL.inc
@@ -2,18 +2,20 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/nl_NL/labels.inc                                         |
+ | plugins/acl/localization/<lang>.inc                                   |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail ACL plugin                 |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Geert Wirken                                                  |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
 
-$labels = array();
 $labels['sharing'] = 'Delen';
 $labels['myrights'] = 'Toegangsrechten';
 $labels['username'] = 'Gebruiker:';
@@ -23,44 +25,48 @@ $labels['actions'] = 'Toegangsrechtenopties...';
 $labels['anyone'] = 'Alle gebruikers (iedereen)';
 $labels['anonymous'] = 'Gasten (anoniem)';
 $labels['identifier'] = 'Identificatie';
+
 $labels['acll'] = 'Opzoeken';
-$labels['shortacll'] = 'Opzoeken';
 $labels['aclr'] = 'Berichten lezen';
 $labels['acls'] = 'Onthoud gelezen-status';
 $labels['aclw'] = 'Markeringen instellen';
-$labels['acli'] = 'Invoergen (kopiëren naar)';
+$labels['acli'] = 'Invoegen (kopiëren naar)';
 $labels['aclp'] = 'Plaatsen';
-$labels['shortaclp'] = 'Plaatsen';
 $labels['aclc'] = 'Submappen aanmaken';
 $labels['aclk'] = 'Submappen aanmaken';
 $labels['acld'] = 'Berichten verwijderen';
 $labels['aclt'] = 'Berichten verwijderen';
 $labels['acle'] = 'Vernietigen';
-$labels['shortacle'] = 'Vernietigen';
 $labels['aclx'] = 'Map verwijderen';
 $labels['acla'] = 'Beheren';
-$labels['shortacla'] = 'Beheren';
+
 $labels['aclfull'] = 'Volledige toegang';
 $labels['aclother'] = 'Overig';
-$labels['shortaclother'] = 'Overig';
 $labels['aclread'] = 'Lezen';
-$labels['shortaclr'] = 'Lezen';
-$labels['shortaclread'] = 'Lezen';
 $labels['aclwrite'] = 'Schrijven';
-$labels['shortaclw'] = 'Schrijven';
-$labels['shortaclwrite'] = 'Schrijven';
 $labels['acldelete'] = 'Verwijderen';
-$labels['shortacld'] = 'Verwijderen';
-$labels['shortaclt'] = 'Verwijderen';
-$labels['shortacldelete'] = 'Verwijderen';
+
+$labels['shortacll'] = 'Opzoeken';
+$labels['shortaclr'] = 'Lezen';
 $labels['shortacls'] = 'Behouden';
+$labels['shortaclw'] = 'Schrijven';
 $labels['shortacli'] = 'Invoegen';
+$labels['shortaclp'] = 'Plaatsen';
 $labels['shortaclc'] = 'Aanmaken';
 $labels['shortaclk'] = 'Aanmaken';
+$labels['shortacld'] = 'Verwijderen';
+$labels['shortaclt'] = 'Verwijderen';
+$labels['shortacle'] = 'Vernietigen';
 $labels['shortaclx'] = 'Map verwijderen';
+$labels['shortacla'] = 'Beheren';
+
+$labels['shortaclother'] = 'Overig';
+$labels['shortaclread'] = 'Lezen';
+$labels['shortaclwrite'] = 'Schrijven';
+$labels['shortacldelete'] = 'Verwijderen';
+
 $labels['longacll'] = 'De map is zichtbaar in lijsten en het is mogelijk om te abonneren op deze map';
 $labels['longaclr'] = 'De map kan geopend worden om te lezen';
-$labels['longaclread'] = 'De map kan geopend worden om te lezen';
 $labels['longacls'] = 'De berichtmarkering \'Gelezen\' kan aangepast worden';
 $labels['longaclw'] = 'Berichtmarkeringen en labels kunnen aangepast worden, behalve \'Gelezen\' en \'Verwijderd\'';
 $labels['longacli'] = 'Berichten kunnen opgesteld worden of gekopieerd worden naar deze map';
@@ -72,18 +78,22 @@ $labels['longaclt'] = 'De berichtmarkering \'Verwijderd\' kan aangepast worden';
 $labels['longacle'] = 'Berichten kunnen vernietigd worden';
 $labels['longaclx'] = 'De map kan verwijderd of hernoemd worden';
 $labels['longacla'] = 'De toegangsrechten voor deze map kunnen veranderd worden';
+
 $labels['longaclfull'] = 'Volledige controle inclusief mappenbeheer';
+$labels['longaclread'] = 'De map kan geopend worden om te lezen';
 $labels['longaclwrite'] = 'Berichten kunnen gemarkeerd worden, opgesteld worden of gekopieerd worden naar deze map';
 $labels['longacldelete'] = 'Berichten kunnen verwijderd worden';
-$labels['deleting'] = 'Toegangsrechten worden verwijderd...';
-$labels['saving'] = 'Toegangsrechten worden opgeslagen...';
-$labels['updatesuccess'] = 'Toegangsrechten succesvol veranderd';
-$labels['deletesuccess'] = 'Toegangsrechten succesvol verwijderd';
-$labels['createsuccess'] = 'Toegangsrechten succesvol toegevoegd';
-$labels['updateerror'] = 'Toegangsrechten kunnen niet bijgewerkt worden';
-$labels['deleteerror'] = 'Toegangsrechten kunnen niet verwijderd worden';
-$labels['createerror'] = 'Toegangsrechten kunnen niet toegevoegd worden';
-$labels['deleteconfirm'] = 'Weet u zeker dat u de toegangsrechten van de geselecteerde gebruiker(s) wilt verwijderen?';
-$labels['norights'] = 'Er zijn geen toegangsrechten opgegeven!';
-$labels['nouser'] = 'Er is geen gebruikersnaam opgegeven!';
 
+$messages['deleting'] = 'Toegangsrechten worden verwijderd...';
+$messages['saving'] = 'Toegangsrechten worden opgeslagen...';
+$messages['updatesuccess'] = 'Toegangsrechten succesvol veranderd';
+$messages['deletesuccess'] = 'Toegangsrechten succesvol verwijderd';
+$messages['createsuccess'] = 'Toegangsrechten succesvol toegevoegd';
+$messages['updateerror'] = 'Toegangsrechten kunnen niet bijgewerkt worden';
+$messages['deleteerror'] = 'Toegangsrechten kunnen niet verwijderd worden';
+$messages['createerror'] = 'Toegangsrechten kunnen niet toegevoegd worden';
+$messages['deleteconfirm'] = 'Weet u zeker dat u de toegangsrechten van de geselecteerde gebruiker(s) wilt verwijderen?';
+$messages['norights'] = 'Er zijn geen toegangsrechten opgegeven!';
+$messages['nouser'] = 'Er is geen gebruikersnaam opgegeven!';
+
+?>
diff --git a/plugins/acl/localization/nn_NO.inc b/plugins/acl/localization/nn_NO.inc
index 5930fcf80..743d2c8b8 100644
--- a/plugins/acl/localization/nn_NO.inc
+++ b/plugins/acl/localization/nn_NO.inc
@@ -2,18 +2,20 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/nn_NN/labels.inc                                         |
+ | plugins/acl/localization/<lang>.inc                                   |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail ACL plugin                 |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Fredrik Larsen <fredrik.h.larsen@gmail.com>                   |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
 
-$labels = array();
 $labels['sharing'] = 'Deling';
 $labels['myrights'] = 'Tilgangsrettar';
 $labels['username'] = 'Brukar:';
@@ -23,44 +25,48 @@ $labels['actions'] = 'Val for tilgangsrettar...';
 $labels['anyone'] = 'Alle brukarar (alle)';
 $labels['anonymous'] = 'Gjester (anonyme)';
 $labels['identifier'] = 'Identifikator';
+
 $labels['acll'] = 'Oppslag';
-$labels['shortacll'] = 'Oppslag';
 $labels['aclr'] = 'Les meldingar';
 $labels['acls'] = 'Behald lesestatus';
 $labels['aclw'] = 'Skriveflagg';
 $labels['acli'] = 'Lim inn';
 $labels['aclp'] = 'Post';
-$labels['shortaclp'] = 'Post';
 $labels['aclc'] = 'Opprett undermapper';
 $labels['aclk'] = 'Opprett undermapper';
 $labels['acld'] = 'Slett meldingar';
 $labels['aclt'] = 'Slett meldingar';
 $labels['acle'] = 'Slett fullstendig';
-$labels['shortacle'] = 'Slett fullstendig';
 $labels['aclx'] = 'Slett mappe';
 $labels['acla'] = 'Administrér';
-$labels['shortacla'] = 'Administrér';
+
 $labels['aclfull'] = 'Full kontroll';
 $labels['aclother'] = 'Anna';
-$labels['shortaclother'] = 'Anna';
 $labels['aclread'] = 'Les';
-$labels['shortaclr'] = 'Les';
-$labels['shortaclread'] = 'Les';
 $labels['aclwrite'] = 'Skriv';
-$labels['shortaclw'] = 'Skriv';
-$labels['shortaclwrite'] = 'Skriv';
 $labels['acldelete'] = 'Slett';
-$labels['shortacld'] = 'Slett';
-$labels['shortaclt'] = 'Slett';
-$labels['shortacldelete'] = 'Slett';
+
+$labels['shortacll'] = 'Oppslag';
+$labels['shortaclr'] = 'Les';
 $labels['shortacls'] = 'Behald';
+$labels['shortaclw'] = 'Skriv';
 $labels['shortacli'] = 'Sett inn';
+$labels['shortaclp'] = 'Post';
 $labels['shortaclc'] = 'Opprett';
 $labels['shortaclk'] = 'Opprett';
+$labels['shortacld'] = 'Slett';
+$labels['shortaclt'] = 'Slett';
+$labels['shortacle'] = 'Slett fullstendig';
 $labels['shortaclx'] = 'Slett mappe';
+$labels['shortacla'] = 'Administrér';
+
+$labels['shortaclother'] = 'Anna';
+$labels['shortaclread'] = 'Les';
+$labels['shortaclwrite'] = 'Skriv';
+$labels['shortacldelete'] = 'Slett';
+
 $labels['longacll'] = 'Mappa er synleg og kan abonnerast på';
 $labels['longaclr'] = 'Mappa kan opnast for lesing';
-$labels['longaclread'] = 'Mappa kan opnast for lesing';
 $labels['longacls'] = 'Meldingane sine lesestatusflagg kan endrast';
 $labels['longaclw'] = 'Meldingsflagg og -nøkkelord kan endrast, bortsett frå status for lesing og sletting';
 $labels['longacli'] = 'Meldingar kan lagrast eller kopierast til mappa';
@@ -72,18 +78,22 @@ $labels['longaclt'] = 'Meldingane sine flagg for sletting kan endrast';
 $labels['longacle'] = 'Meldinga kan slettast for godt';
 $labels['longaclx'] = 'Mappa kan slettast eller få nytt namn';
 $labels['longacla'] = 'Mappa sine tilgangsrettar kan endrast';
+
 $labels['longaclfull'] = 'Full kontroll, inkludert mappeadministrasjon';
+$labels['longaclread'] = 'Mappa kan opnast for lesing';
 $labels['longaclwrite'] = 'Meldingar kan merkast, lagrast i eller flyttast til mappa';
 $labels['longacldelete'] = 'Meldinga kan slettast';
-$labels['deleting'] = 'Slettar tilgangsrettar…';
-$labels['saving'] = 'Lagrar tilgangsrettar…';
-$labels['updatesuccess'] = 'Tilgangsrettiar vart endra';
-$labels['deletesuccess'] = 'Tilgangsretter vart sletta';
-$labels['createsuccess'] = 'Tilgangsrettar vart legne til';
-$labels['updateerror'] = 'Kunne ikkje oppdatere tilgangsrettar';
-$labels['deleteerror'] = 'Kunne ikkje fjerne tilgangsrettar';
-$labels['createerror'] = 'Kunne ikkje leggje til tilgangsrettar';
-$labels['deleteconfirm'] = 'Er du sikker på at du vil fjerne tilgangen til  valde brukarar?';
-$labels['norights'] = 'Ingen rettar er spesifisert!';
-$labels['nouser'] = 'Brukarnamn er ikkje spesifisert!';
 
+$messages['deleting'] = 'Slettar tilgangsrettar…';
+$messages['saving'] = 'Lagrar tilgangsrettar…';
+$messages['updatesuccess'] = 'Tilgangsrettiar vart endra';
+$messages['deletesuccess'] = 'Tilgangsretter vart sletta';
+$messages['createsuccess'] = 'Tilgangsrettar vart legne til';
+$messages['updateerror'] = 'Kunne ikkje oppdatere tilgangsrettar';
+$messages['deleteerror'] = 'Kunne ikkje fjerne tilgangsrettar';
+$messages['createerror'] = 'Kunne ikkje leggje til tilgangsrettar';
+$messages['deleteconfirm'] = 'Er du sikker på at du vil fjerne tilgangen til  valde brukarar?';
+$messages['norights'] = 'Ingen rettar er spesifisert!';
+$messages['nouser'] = 'Brukarnamn er ikkje spesifisert!';
+
+?>
diff --git a/plugins/acl/localization/pl_PL.inc b/plugins/acl/localization/pl_PL.inc
index b8007f025..73c0fc4fb 100644
--- a/plugins/acl/localization/pl_PL.inc
+++ b/plugins/acl/localization/pl_PL.inc
@@ -2,18 +2,20 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/pl_PL/labels.inc                                         |
+ | plugins/acl/localization/<lang>.inc                                   |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail ACL plugin                 |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
 
-$labels = array();
 $labels['sharing'] = 'Udostępnianie';
 $labels['myrights'] = 'Prawa dostępu';
 $labels['username'] = 'Użytkownik:';
@@ -23,44 +25,48 @@ $labels['actions'] = 'Akcje na prawach...';
 $labels['anyone'] = 'Wszyscy (anyone)';
 $labels['anonymous'] = 'Goście (anonymous)';
 $labels['identifier'] = 'Identyfikator';
+
 $labels['acll'] = 'Podgląd';
-$labels['shortacll'] = 'Podgląd';
 $labels['aclr'] = 'Odczyt (Read)';
 $labels['acls'] = 'Zmiana stanu wiadomości (Keep)';
 $labels['aclw'] = 'Zmiana flag wiadomości (Write)';
 $labels['acli'] = 'Dodawanie/Kopiowanie do (Insert)';
 $labels['aclp'] = 'Wysyłanie';
-$labels['shortaclp'] = 'Wysyłanie';
 $labels['aclc'] = 'Tworzenie podfolderów (Create)';
 $labels['aclk'] = 'Tworzenie podfolderów (Create)';
 $labels['acld'] = 'Usuwanie wiadomości (Delete)';
 $labels['aclt'] = 'Usuwanie wiadomości (Delete)';
 $labels['acle'] = 'Porządkowanie';
-$labels['shortacle'] = 'Porządkowanie';
 $labels['aclx'] = 'Usuwanie folderu (Delete)';
 $labels['acla'] = 'Administracja';
-$labels['shortacla'] = 'Administracja';
+
 $labels['aclfull'] = 'Wszystkie';
 $labels['aclother'] = 'Pozostałe';
-$labels['shortaclother'] = 'Pozostałe';
 $labels['aclread'] = 'Odczyt';
-$labels['shortaclr'] = 'Odczyt';
-$labels['shortaclread'] = 'Odczyt';
 $labels['aclwrite'] = 'Zapis';
-$labels['shortaclw'] = 'Zapis';
-$labels['shortaclwrite'] = 'Zapis';
 $labels['acldelete'] = 'Usuwanie';
-$labels['shortacld'] = 'Usuwanie';
-$labels['shortaclt'] = 'Usuwanie';
-$labels['shortacldelete'] = 'Usuwanie';
+
+$labels['shortacll'] = 'Podgląd';
+$labels['shortaclr'] = 'Odczyt';
 $labels['shortacls'] = 'Zmiana';
+$labels['shortaclw'] = 'Zapis';
 $labels['shortacli'] = 'Dodawanie';
+$labels['shortaclp'] = 'Wysyłanie';
 $labels['shortaclc'] = 'Tworzenie';
 $labels['shortaclk'] = 'Tworzenie';
+$labels['shortacld'] = 'Usuwanie';
+$labels['shortaclt'] = 'Usuwanie';
+$labels['shortacle'] = 'Porządkowanie';
 $labels['shortaclx'] = 'Usuwanie folderu';
+$labels['shortacla'] = 'Administracja';
+
+$labels['shortaclother'] = 'Pozostałe';
+$labels['shortaclread'] = 'Odczyt';
+$labels['shortaclwrite'] = 'Zapis';
+$labels['shortacldelete'] = 'Usuwanie';
+
 $labels['longacll'] = 'Pozwala na subskrybowanie folderu i powoduje, że jest on widoczny na liście';
 $labels['longaclr'] = 'Folder może być otwarty w trybie do odczytu';
-$labels['longaclread'] = 'Folder może być otwarty w trybie do odczytu';
 $labels['longacls'] = 'Pozwala na zmienę stanu wiadomości';
 $labels['longaclw'] = 'Pozwala zmieniać wszystkie flagi wiadomości, oprócz "Przeczytano" i "Usunięto';
 $labels['longacli'] = 'Pozwala zapisywać wiadomości i kopiować do folderu';
@@ -72,18 +78,22 @@ $labels['longaclt'] = 'Pozwala zmianiać flagę "Usunięto" wiadomości';
 $labels['longacle'] = 'Pozwala na usuwanie wiadomości oznaczonych do usunięcia';
 $labels['longaclx'] = 'Pozwala na zmianę nazwy lub usunięcie folderu';
 $labels['longacla'] = 'Pozwala na zmiane praw dostępu do folderu';
+
 $labels['longaclfull'] = 'Pełna kontrola włącznie z administrowaniem folderem';
+$labels['longaclread'] = 'Folder może być otwarty w trybie do odczytu';
 $labels['longaclwrite'] = 'Wiadomości mogą być oznaczane, zapisywane i kopiowane do folderu';
 $labels['longacldelete'] = 'Wiadomości mogą być usuwane';
-$labels['deleting'] = 'Usuwanie praw dostępu...';
-$labels['saving'] = 'Zapisywanie praw dostępu...';
-$labels['updatesuccess'] = 'Pomyślnie zmieniono prawa dostępu';
-$labels['deletesuccess'] = 'Pomyślnie usunięto prawa dostępu';
-$labels['createsuccess'] = 'Pomyślnie dodano prawa dostępu';
-$labels['updateerror'] = 'Nie udało się zmienić praw dostępu';
-$labels['deleteerror'] = 'Nie udało się usunąć praw dostępu';
-$labels['createerror'] = 'Nie udało się dodać praw dostępu';
-$labels['deleteconfirm'] = 'Czy na pewno chcesz usunąć prawa wybranym użytkownikom?';
-$labels['norights'] = 'Nie wybrano praw dostępu!';
-$labels['nouser'] = 'Nie podano nazwy użytkownika!';
 
+$messages['deleting'] = 'Usuwanie praw dostępu...';
+$messages['saving'] = 'Zapisywanie praw dostępu...';
+$messages['updatesuccess'] = 'Pomyślnie zmieniono prawa dostępu';
+$messages['deletesuccess'] = 'Pomyślnie usunięto prawa dostępu';
+$messages['createsuccess'] = 'Pomyślnie dodano prawa dostępu';
+$messages['updateerror'] = 'Nie udało się zmienić praw dostępu';
+$messages['deleteerror'] = 'Nie udało się usunąć praw dostępu';
+$messages['createerror'] = 'Nie udało się dodać praw dostępu';
+$messages['deleteconfirm'] = 'Czy na pewno chcesz usunąć prawa wybranym użytkownikom?';
+$messages['norights'] = 'Nie wybrano praw dostępu!';
+$messages['nouser'] = 'Nie podano nazwy użytkownika!';
+
+?>
diff --git a/plugins/acl/localization/pt_BR.inc b/plugins/acl/localization/pt_BR.inc
index 2e4828304..eaf042110 100644
--- a/plugins/acl/localization/pt_BR.inc
+++ b/plugins/acl/localization/pt_BR.inc
@@ -2,18 +2,20 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/pt_BR/labels.inc                                         |
+ | plugins/acl/localization/<lang>.inc                                   |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail ACL plugin                 |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Claudio F Filho <filhocf@gmail.com>                           |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
 
-$labels = array();
 $labels['sharing'] = 'Compartilhamento';
 $labels['myrights'] = 'Permissões de Acesso';
 $labels['username'] = 'Usuário:';
@@ -23,44 +25,48 @@ $labels['actions'] = 'Ações de direito de acesso...';
 $labels['anyone'] = 'Todos os usuários (qualquer um)';
 $labels['anonymous'] = 'Convidados (anônimos)';
 $labels['identifier'] = 'Identificador';
+
 $labels['acll'] = 'Pesquisar';
-$labels['shortacll'] = 'Pesquisar';
 $labels['aclr'] = 'Ler mensagens';
 $labels['acls'] = 'Manter estado de enviado';
 $labels['aclw'] = 'Salvar marcadores';
 $labels['acli'] = 'Inserir (Cópia em)';
 $labels['aclp'] = 'Enviar';
-$labels['shortaclp'] = 'Enviar';
 $labels['aclc'] = 'Criar subpastas';
 $labels['aclk'] = 'Criar subpastas';
 $labels['acld'] = 'Apagar mensagens';
 $labels['aclt'] = 'Apagar mensagens';
 $labels['acle'] = 'Expurgar';
-$labels['shortacle'] = 'Expurgar';
 $labels['aclx'] = 'Apagar pasta';
 $labels['acla'] = 'Administrar';
-$labels['shortacla'] = 'Administrar';
+
 $labels['aclfull'] = 'Controle total';
 $labels['aclother'] = 'Outro';
-$labels['shortaclother'] = 'Outro';
 $labels['aclread'] = 'Ler';
-$labels['shortaclr'] = 'Ler';
-$labels['shortaclread'] = 'Ler';
 $labels['aclwrite'] = 'Salvar';
-$labels['shortaclw'] = 'Salvar';
-$labels['shortaclwrite'] = 'Salvar';
 $labels['acldelete'] = 'Excluir';
-$labels['shortacld'] = 'Excluir';
-$labels['shortaclt'] = 'Excluir';
-$labels['shortacldelete'] = 'Excluir';
+
+$labels['shortacll'] = 'Pesquisar';
+$labels['shortaclr'] = 'Ler';
 $labels['shortacls'] = 'Manter';
+$labels['shortaclw'] = 'Salvar';
 $labels['shortacli'] = 'Inserir';
+$labels['shortaclp'] = 'Enviar';
 $labels['shortaclc'] = 'Criar';
 $labels['shortaclk'] = 'Criar';
+$labels['shortacld'] = 'Excluir';
+$labels['shortaclt'] = 'Excluir';
+$labels['shortacle'] = 'Expurgar';
 $labels['shortaclx'] = 'Excluir pasta';
+$labels['shortacla'] = 'Administrar';
+
+$labels['shortaclother'] = 'Outro';
+$labels['shortaclread'] = 'Ler';
+$labels['shortaclwrite'] = 'Salvar';
+$labels['shortacldelete'] = 'Excluir';
+
 $labels['longacll'] = 'A pasta está visível nas listas e pode ser inscrita para';
 $labels['longaclr'] = 'A pasta pode ser aberta para leitura';
-$labels['longaclread'] = 'A pasta pode ser aberta para leitura';
 $labels['longacls'] = 'Marcador de Mensagem Enviada pode ser modificadas';
 $labels['longaclw'] = 'Marcadores de mensagens e palavras-chave podem ser modificadas, exceto de Enviadas e Excluídas';
 $labels['longacli'] = 'As mensagens podem ser escritas ou copiadas para a pasta';
@@ -72,18 +78,22 @@ $labels['longaclt'] = 'O marcador de Mensagens Excluídas podem ser modificadas'
 $labels['longacle'] = 'As mensagens podem ser expurgadas';
 $labels['longaclx'] = 'A pasta pode ser apagada ou renomeada';
 $labels['longacla'] = 'As permissões de acesso da pasta podem ser alteradas';
+
 $labels['longaclfull'] = 'Controle total incluindo a pasta de administração';
+$labels['longaclread'] = 'A pasta pode ser aberta para leitura';
 $labels['longaclwrite'] = 'As mensagens podem ser marcadas, salvas ou copiadas para a pasta';
 $labels['longacldelete'] = 'Mensagens podem ser apagadas';
-$labels['deleting'] = 'Apagando permissões de acesso...';
-$labels['saving'] = 'Salvando permissões de acesso...';
-$labels['updatesuccess'] = 'Permissões de acesso alteradas com sucesso';
-$labels['deletesuccess'] = 'Permissões de acesso apagadas com sucesso';
-$labels['createsuccess'] = 'Permissões de acesso adicionadas com sucesso';
-$labels['updateerror'] = 'Não foi possível atualizar as permissões de acesso';
-$labels['deleteerror'] = 'Não foi possível apagar as permissões de acesso';
-$labels['createerror'] = 'Não foi possível adicionar as permissões de acesso';
-$labels['deleteconfirm'] = 'Tem certeza que deseja remover as permissões de acesso do(s) usuário(s) delecionado(s)?';
-$labels['norights'] = 'Não foram definidas permissões!';
-$labels['nouser'] = 'Nome de usuário não especificado!';
 
+$messages['deleting'] = 'Apagando permissões de acesso...';
+$messages['saving'] = 'Salvando permissões de acesso...';
+$messages['updatesuccess'] = 'Permissões de acesso alteradas com sucesso';
+$messages['deletesuccess'] = 'Permissões de acesso apagadas com sucesso';
+$messages['createsuccess'] = 'Permissões de acesso adicionadas com sucesso';
+$messages['updateerror'] = 'Não foi possível atualizar as permissões de acesso';
+$messages['deleteerror'] = 'Não foi possível apagar as permissões de acesso';
+$messages['createerror'] = 'Não foi possível adicionar as permissões de acesso';
+$messages['deleteconfirm'] = 'Tem certeza que deseja remover as permissões de acesso do(s) usuário(s) delecionado(s)?';
+$messages['norights'] = 'Não foram definidas permissões!';
+$messages['nouser'] = 'Nome de usuário não especificado!';
+
+?>
diff --git a/plugins/acl/localization/pt_PT.inc b/plugins/acl/localization/pt_PT.inc
index 72c595afa..9a2e9a320 100644
--- a/plugins/acl/localization/pt_PT.inc
+++ b/plugins/acl/localization/pt_PT.inc
@@ -2,18 +2,20 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/pt_PT/labels.inc                                         |
+ | plugins/acl/localization/<lang>.inc                                   |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail ACL plugin                 |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: David                                                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
 
-$labels = array();
 $labels['sharing'] = 'Partilhar';
 $labels['myrights'] = 'Permissões de acesso';
 $labels['username'] = 'Utilizador:';
@@ -23,44 +25,48 @@ $labels['actions'] = 'Acções de permissão de acesso...';
 $labels['anyone'] = 'Todos os utilizadores (todos)';
 $labels['anonymous'] = 'Convidado (anónimo)';
 $labels['identifier'] = 'Identificador';
+
 $labels['acll'] = 'Pesquisar';
-$labels['shortacll'] = 'Pesquisar';
 $labels['aclr'] = 'Ler mensagens';
 $labels['acls'] = 'Manter estado de enviado';
 $labels['aclw'] = 'Guardar marcadores';
 $labels['acli'] = 'Inserir (cópia em)';
 $labels['aclp'] = 'Publicar';
-$labels['shortaclp'] = 'Publicar';
 $labels['aclc'] = 'Criar subpastas';
 $labels['aclk'] = 'Criar subpastas';
 $labels['acld'] = 'Eliminar mensagens';
 $labels['aclt'] = 'Eliminar mensagens';
 $labels['acle'] = 'Eliminar';
-$labels['shortacle'] = 'Eliminar';
 $labels['aclx'] = 'Eliminar pasta';
 $labels['acla'] = 'Administrar';
-$labels['shortacla'] = 'Administrar';
+
 $labels['aclfull'] = 'Controlo total';
 $labels['aclother'] = 'Outro';
-$labels['shortaclother'] = 'Outro';
 $labels['aclread'] = 'Ler';
-$labels['shortaclr'] = 'Ler';
-$labels['shortaclread'] = 'Ler';
 $labels['aclwrite'] = 'Guardar';
-$labels['shortaclw'] = 'Guardar';
-$labels['shortaclwrite'] = 'Guardar';
 $labels['acldelete'] = 'Eliminar';
-$labels['shortacld'] = 'Eliminar';
-$labels['shortaclt'] = 'Eliminar';
-$labels['shortacldelete'] = 'Eliminar';
+
+$labels['shortacll'] = 'Pesquisar';
+$labels['shortaclr'] = 'Ler';
 $labels['shortacls'] = 'Manter';
+$labels['shortaclw'] = 'Guardar';
 $labels['shortacli'] = 'Inserir';
+$labels['shortaclp'] = 'Publicar';
 $labels['shortaclc'] = 'Criar';
 $labels['shortaclk'] = 'Criar';
+$labels['shortacld'] = 'Eliminar';
+$labels['shortaclt'] = 'Eliminar';
+$labels['shortacle'] = 'Eliminar';
 $labels['shortaclx'] = 'Eliminar pasta';
+$labels['shortacla'] = 'Administrar';
+
+$labels['shortaclother'] = 'Outro';
+$labels['shortaclread'] = 'Ler';
+$labels['shortaclwrite'] = 'Guardar';
+$labels['shortacldelete'] = 'Eliminar';
+
 $labels['longacll'] = 'A pasta está visível na lista e pode subscrita para';
 $labels['longaclr'] = 'A pasta pode ser aberta para leitura';
-$labels['longaclread'] = 'A pasta pode ser aberta para leitura';
 $labels['longacls'] = 'O marcador de mensagem enviada pode ser alterado';
 $labels['longaclw'] = 'Marcadores de mensagens e palavras-chave podem ser alterados, excepto de Enviadas e Eliminadas';
 $labels['longacli'] = 'As mensagens podem ser escritas e copiadas para a pasta';
@@ -72,18 +78,22 @@ $labels['longaclt'] = 'O marcador de mensagens Eliminadas pode ser alterado';
 $labels['longacle'] = 'As mensagens podem ser eliminadas';
 $labels['longaclx'] = 'A pasta pode ser eliminada ou renomeada';
 $labels['longacla'] = 'As permissões de acesso da pasta podem ser alteradas';
+
 $labels['longaclfull'] = 'Controlo total incluindo administração da pasta';
+$labels['longaclread'] = 'A pasta pode ser aberta para leitura';
 $labels['longaclwrite'] = 'As mensagens podem ser marcadas, guardadas ou copiadas para a pasta';
 $labels['longacldelete'] = 'As mensagens podem ser eliminadas';
-$labels['deleting'] = 'A eliminar as permissões de acesso...';
-$labels['saving'] = 'A guardar as permissões de acesso...';
-$labels['updatesuccess'] = 'Permissões de acesso alteradas com sucesso';
-$labels['deletesuccess'] = 'Permissões de acesso eliminadas com sucesso';
-$labels['createsuccess'] = 'Permissões de acesso adicionadas com sucesso';
-$labels['updateerror'] = 'Não foi possível actualizar as permissões de acesso';
-$labels['deleteerror'] = 'Não foi possível eliminar as permissões de acesso';
-$labels['createerror'] = 'Não foi possível adicionar as permissões de acesso';
-$labels['deleteconfirm'] = 'Tem a certeza que pretende remover as permissões de acesso do(s) utilizador(es) seleccionado(s)?';
-$labels['norights'] = 'Não foram especificadas quaisquer permissões!';
-$labels['nouser'] = 'Não foi especificado nenhum nome de utilizador!';
 
+$messages['deleting'] = 'A eliminar as permissões de acesso...';
+$messages['saving'] = 'A guardar as permissões de acesso...';
+$messages['updatesuccess'] = 'Permissões de acesso alteradas com sucesso';
+$messages['deletesuccess'] = 'Permissões de acesso eliminadas com sucesso';
+$messages['createsuccess'] = 'Permissões de acesso adicionadas com sucesso';
+$messages['updateerror'] = 'Não foi possível actualizar as permissões de acesso';
+$messages['deleteerror'] = 'Não foi possível eliminar as permissões de acesso';
+$messages['createerror'] = 'Não foi possível adicionar as permissões de acesso';
+$messages['deleteconfirm'] = 'Tem a certeza que pretende remover as permissões de acesso do(s) utilizador(es) seleccionado(s)?';
+$messages['norights'] = 'Não foram especificadas quaisquer permissões!';
+$messages['nouser'] = 'Não foi especificado nenhum nome de utilizador!';
+
+?>
diff --git a/plugins/acl/localization/ro_RO.inc b/plugins/acl/localization/ro_RO.inc
index 5d51f392c..e87524a6c 100644
--- a/plugins/acl/localization/ro_RO.inc
+++ b/plugins/acl/localization/ro_RO.inc
@@ -2,51 +2,98 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ro_RO/labels.inc                                         |
+ | plugins/acl/localization/<lang>.inc                                   |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail ACL plugin                 |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Raduta Alex <raduta.alex@gmail.com>                           |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
 
-$labels = array();
+$labels['sharing'] = 'Partajare';
+$labels['myrights'] = 'Drepturi de acces';
 $labels['username'] = 'Utilizator:';
 $labels['advanced'] = 'mod avansat';
 $labels['newuser'] = 'Adăugare intrare';
+$labels['actions'] = 'Acțiunea drepturilor de acces...';
+$labels['anyone'] = 'Toți utilizatori (oricare)';
 $labels['anonymous'] = 'Vizitator';
 $labels['identifier'] = 'Identificator';
+
 $labels['acll'] = 'Caută';
-$labels['shortacll'] = 'Caută';
 $labels['aclr'] = 'Citire mesaje';
+$labels['acls'] = 'Menține starea de Vâzut';
+$labels['aclw'] = 'Indicator scriere';
+$labels['acli'] = 'Inserare (copiere în)';
 $labels['aclp'] = 'Postează';
-$labels['shortaclp'] = 'Postează';
 $labels['aclc'] = 'Creează subdirectoare';
 $labels['aclk'] = 'Creează subdirectoare';
 $labels['acld'] = 'Ștergere mesaje';
 $labels['aclt'] = 'Ștergere mesaje';
 $labels['acle'] = 'Elimină';
-$labels['shortacle'] = 'Elimină';
 $labels['aclx'] = 'Ștergere dosar';
 $labels['acla'] = 'Administrează';
-$labels['shortacla'] = 'Administrează';
+
+$labels['aclfull'] = 'Control complet';
 $labels['aclother'] = 'Altul';
-$labels['shortaclother'] = 'Altul';
 $labels['aclread'] = 'Citeşte';
-$labels['shortaclr'] = 'Citeşte';
-$labels['shortaclread'] = 'Citeşte';
 $labels['aclwrite'] = 'Scrie';
-$labels['shortaclw'] = 'Scrie';
-$labels['shortaclwrite'] = 'Scrie';
 $labels['acldelete'] = 'Șterge';
-$labels['shortacld'] = 'Șterge';
-$labels['shortaclt'] = 'Șterge';
-$labels['shortacldelete'] = 'Șterge';
+
+$labels['shortacll'] = 'Caută';
+$labels['shortaclr'] = 'Citeşte';
 $labels['shortacls'] = 'Păstrează';
+$labels['shortaclw'] = 'Scrie';
 $labels['shortacli'] = 'Inserează';
+$labels['shortaclp'] = 'Postează';
 $labels['shortaclc'] = 'Creează';
 $labels['shortaclk'] = 'Creează';
+$labels['shortacld'] = 'Șterge';
+$labels['shortaclt'] = 'Șterge';
+$labels['shortacle'] = 'Elimină';
+$labels['shortaclx'] = 'Ștergere dosar';
+$labels['shortacla'] = 'Administrează';
+
+$labels['shortaclother'] = 'Altul';
+$labels['shortaclread'] = 'Citeşte';
+$labels['shortaclwrite'] = 'Scrie';
+$labels['shortacldelete'] = 'Șterge';
+
+$labels['longacll'] = 'Dosarul este vizibil pe liste și se poate înscrie pe el';
+$labels['longaclr'] = 'Dosarul se poate deschide pentru citire';
+$labels['longacls'] = 'Indicatorul de Văzut a fost schimbat';
+$labels['longaclw'] = 'Indicatoarele și cuvintele cheie ale mesajelor se pot schimba cu excepția Văzut și Șters';
+$labels['longacli'] = 'Mesajul se poate scrie sau copia într-un dosar';
+$labels['longaclp'] = 'Mesajele se pot trimite către acest dosar';
+$labels['longaclc'] = 'Dosarele se pot crea (sau redenumi) direct sub acest dosar';
+$labels['longaclk'] = 'Dosarele se pot crea (sau redenumi) direct sub acest dosar';
+$labels['longacld'] = 'Indicatorul de Șters al mesajelor se pot modifica';
+$labels['longaclt'] = 'Indicatorul de Șters al mesajelor se pot modifica';
+$labels['longacle'] = 'Mesajele se pot elimina';
+$labels['longaclx'] = 'Dosarul se poate șterge sau redenumi';
+$labels['longacla'] = 'Drepturile de acces la dosar se pot schimba';
+
+$labels['longaclfull'] = 'Control complet include și administrare dosar';
+$labels['longaclread'] = 'Dosarul se poate deschide pentru citire';
+$labels['longaclwrite'] = 'Mesajul se poate marca, scrie sau copia într-un dosar';
+$labels['longacldelete'] = 'Mesajul se poate șterge';
+
+$messages['deleting'] = 'Drepturile de acces la ștergere...';
+$messages['saving'] = 'Drepturile de acces la salvare...';
+$messages['updatesuccess'] = 'Drepturile de acces au fost schimbate cu succes';
+$messages['deletesuccess'] = 'Drepturile de acces au fost șterse cu succes';
+$messages['createsuccess'] = 'Drepturile de acces au fost adăugate cu succes';
+$messages['updateerror'] = 'Nu sau putut actualiza drepturile de acces';
+$messages['deleteerror'] = 'Nu sau putut șterge drepturile de acces';
+$messages['createerror'] = 'Nu sau putut adăuga drepturi de acces';
+$messages['deleteconfirm'] = 'Sunteți sigur că doriți să ștergeți drepturile de acces la utilizatorul(i) selectați?';
+$messages['norights'] = 'Nu au fost specificate drepturi!';
+$messages['nouser'] = 'Nu a fost specificat nume de utilizator!';
 
+?>
diff --git a/plugins/acl/localization/ru_RU.inc b/plugins/acl/localization/ru_RU.inc
index f50610a03..93eb9eff2 100644
--- a/plugins/acl/localization/ru_RU.inc
+++ b/plugins/acl/localization/ru_RU.inc
@@ -2,18 +2,20 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ru_RU/labels.inc                                         |
+ | plugins/acl/localization/<lang>.inc                                   |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail ACL plugin                 |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Vahan Yerkanian <vahan@yerkanian.com>                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
 
-$labels = array();
 $labels['sharing'] = 'Совместный доступ';
 $labels['myrights'] = 'Права доступа';
 $labels['username'] = 'Пользователь:';
@@ -23,44 +25,48 @@ $labels['actions'] = 'Действия с правами доступа...';
 $labels['anyone'] = 'Все пользователи (любые)';
 $labels['anonymous'] = 'Гости (анонимные)';
 $labels['identifier'] = 'Идентификатор';
+
 $labels['acll'] = 'Поиск';
-$labels['shortacll'] = 'Поиск';
 $labels['aclr'] = 'Прочитать сообщения';
 $labels['acls'] = 'Оставить состояние Увидено';
 $labels['aclw'] = 'Флаги записи';
 $labels['acli'] = 'Вставить (копировать в...)';
 $labels['aclp'] = 'Отправить';
-$labels['shortaclp'] = 'Отправить';
 $labels['aclc'] = 'Создать вложенные папки';
 $labels['aclk'] = 'Создать вложенные папки';
 $labels['acld'] = 'Удалить сообщения';
 $labels['aclt'] = 'Удалить сообщения';
 $labels['acle'] = 'Уничтожить сообщения';
-$labels['shortacle'] = 'Уничтожить сообщения';
 $labels['aclx'] = 'Удалить папку';
 $labels['acla'] = 'Администрировать';
-$labels['shortacla'] = 'Администрировать';
+
 $labels['aclfull'] = 'Полный доступ';
 $labels['aclother'] = 'Другое';
-$labels['shortaclother'] = 'Другое';
 $labels['aclread'] = 'Чтение';
-$labels['shortaclr'] = 'Чтение';
-$labels['shortaclread'] = 'Чтение';
 $labels['aclwrite'] = 'Запись';
-$labels['shortaclw'] = 'Запись';
-$labels['shortaclwrite'] = 'Запись';
 $labels['acldelete'] = 'Удаление';
-$labels['shortacld'] = 'Удаление';
-$labels['shortaclt'] = 'Удаление';
-$labels['shortacldelete'] = 'Удаление';
+
+$labels['shortacll'] = 'Поиск';
+$labels['shortaclr'] = 'Чтение';
 $labels['shortacls'] = 'Оставить';
+$labels['shortaclw'] = 'Запись';
 $labels['shortacli'] = 'Вставить';
+$labels['shortaclp'] = 'Отправить';
 $labels['shortaclc'] = 'Создать';
 $labels['shortaclk'] = 'Создать';
+$labels['shortacld'] = 'Удаление';
+$labels['shortaclt'] = 'Удаление';
+$labels['shortacle'] = 'Уничтожить сообщения';
 $labels['shortaclx'] = 'Удаление папки';
+$labels['shortacla'] = 'Администрировать';
+
+$labels['shortaclother'] = 'Другое';
+$labels['shortaclread'] = 'Чтение';
+$labels['shortaclwrite'] = 'Запись';
+$labels['shortacldelete'] = 'Удаление';
+
 $labels['longacll'] = 'Папка видима в списках и доступна для подписки';
 $labels['longaclr'] = 'Эта папка может быть открыта для чтения';
-$labels['longaclread'] = 'Эта папка может быть открыта для чтения';
 $labels['longacls'] = 'Флаг Прочитано может быть изменен';
 $labels['longaclw'] = 'Флаги и ключевые слова, кроме Прочитано и Удалено, могут быть изменены';
 $labels['longacli'] = 'Сообщения могут быть записаны или скопированы в папку';
@@ -72,18 +78,22 @@ $labels['longaclt'] = 'Флаг Удалено может быть измене�
 $labels['longacle'] = 'Сообщения могут быть уничтожены';
 $labels['longaclx'] = 'Эта папка может быть переименована или удалена';
 $labels['longacla'] = 'Права доступа к папке могут быть изменены';
+
 $labels['longaclfull'] = 'Полный доступ, включая управление папкой';
+$labels['longaclread'] = 'Эта папка может быть открыта для чтения';
 $labels['longaclwrite'] = 'Сообщения можно помечать, записывать или копировать в папку';
 $labels['longacldelete'] = 'Сообщения можно удалять';
-$labels['deleting'] = 'Удаление прав доступа...';
-$labels['saving'] = 'Сохранение прав доступа...';
-$labels['updatesuccess'] = 'Права доступа успешно изменены';
-$labels['deletesuccess'] = 'Права доступа успешно удалены';
-$labels['createsuccess'] = 'Успешно добавлены права доступа';
-$labels['updateerror'] = 'Невозможно обновить права доступа';
-$labels['deleteerror'] = 'Невозможно удалить права доступа';
-$labels['createerror'] = 'Невозможно добавить права доступа';
-$labels['deleteconfirm'] = 'Вы уверены в том, что хотите удалить права доступа выбранных пользователей?';
-$labels['norights'] = 'Права доступа не установлены!';
-$labels['nouser'] = 'Не определено имя пользователя!';
 
+$messages['deleting'] = 'Удаление прав доступа...';
+$messages['saving'] = 'Сохранение прав доступа...';
+$messages['updatesuccess'] = 'Права доступа успешно изменены';
+$messages['deletesuccess'] = 'Права доступа успешно удалены';
+$messages['createsuccess'] = 'Успешно добавлены права доступа';
+$messages['updateerror'] = 'Невозможно обновить права доступа';
+$messages['deleteerror'] = 'Невозможно удалить права доступа';
+$messages['createerror'] = 'Невозможно добавить права доступа';
+$messages['deleteconfirm'] = 'Вы уверены в том, что хотите удалить права доступа выбранных пользователей?';
+$messages['norights'] = 'Права доступа не установлены!';
+$messages['nouser'] = 'Не определено имя пользователя!';
+
+?>
diff --git a/plugins/acl/localization/sk_SK.inc b/plugins/acl/localization/sk_SK.inc
index 7bd702a52..64b146cfc 100644
--- a/plugins/acl/localization/sk_SK.inc
+++ b/plugins/acl/localization/sk_SK.inc
@@ -2,18 +2,20 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/sk_SK/labels.inc                                         |
+ | plugins/acl/localization/<lang>.inc                                   |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail ACL plugin                 |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Miroslav Ďurian                                              |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
 
-$labels = array();
 $labels['sharing'] = 'Zdieľanie';
 $labels['myrights'] = 'Prístupové práva';
 $labels['username'] = 'Používateľ:';
@@ -23,42 +25,48 @@ $labels['actions'] = 'Prístupové práva činností...';
 $labels['anyone'] = 'Všetci užívatelia (ktokoľvek)';
 $labels['anonymous'] = 'Hostia (anonymne)';
 $labels['identifier'] = 'Identifikátor';
+
 $labels['acll'] = 'Vyhľadať';
-$labels['shortacll'] = 'Vyhľadať';
 $labels['aclr'] = 'Čítať správy';
 $labels['acls'] = 'Ponechať ako prečítané';
 $labels['aclw'] = 'Príznaky na zapisovanie';
 $labels['acli'] = 'Vložiť (Skopírovať do)';
+$labels['aclp'] = 'Post';
 $labels['aclc'] = 'Vytvoriť podpriečinky';
 $labels['aclk'] = 'Vytvoriť podpriečinky';
 $labels['acld'] = 'Zmazať správy';
 $labels['aclt'] = 'Zmazať správy';
 $labels['acle'] = 'Vyčistiť';
-$labels['shortacle'] = 'Vyčistiť';
 $labels['aclx'] = 'Zmazať priečinok';
 $labels['acla'] = 'Spravovať';
-$labels['shortacla'] = 'Spravovať';
+
 $labels['aclfull'] = 'Plný prístup';
 $labels['aclother'] = 'Ostatné';
-$labels['shortaclother'] = 'Ostatné';
 $labels['aclread'] = 'Čítanie';
-$labels['shortaclr'] = 'Čítanie';
-$labels['shortaclread'] = 'Čítanie';
 $labels['aclwrite'] = 'Zápis';
-$labels['shortaclw'] = 'Zápis';
-$labels['shortaclwrite'] = 'Zápis';
 $labels['acldelete'] = 'Odstrániť';
-$labels['shortacld'] = 'Odstrániť';
-$labels['shortaclt'] = 'Odstrániť';
-$labels['shortacldelete'] = 'Odstrániť';
+
+$labels['shortacll'] = 'Vyhľadať';
+$labels['shortaclr'] = 'Čítanie';
 $labels['shortacls'] = 'Ponechať';
+$labels['shortaclw'] = 'Zápis';
 $labels['shortacli'] = 'Vložiť';
+$labels['shortaclp'] = 'Post';
 $labels['shortaclc'] = 'Vytvoriť';
 $labels['shortaclk'] = 'Vytvoriť';
+$labels['shortacld'] = 'Odstrániť';
+$labels['shortaclt'] = 'Odstrániť';
+$labels['shortacle'] = 'Vyčistiť';
 $labels['shortaclx'] = 'Odstrániť priečinok';
+$labels['shortacla'] = 'Spravovať';
+
+$labels['shortaclother'] = 'Ostatné';
+$labels['shortaclread'] = 'Čítanie';
+$labels['shortaclwrite'] = 'Zápis';
+$labels['shortacldelete'] = 'Odstrániť';
+
 $labels['longacll'] = 'Priečinok je v zoznamoch viditeľný a dá sa doň zapísať';
 $labels['longaclr'] = 'Prečinok je možné otvoriť na čítanie';
-$labels['longaclread'] = 'Prečinok je možné otvoriť na čítanie';
 $labels['longacls'] = 'Príznak "Prečítané" je možné zmeniť';
 $labels['longaclw'] = 'Príznaky správ a kľúčové slová je možné zmeniť, okrem "Prečítané" a "Vymazané';
 $labels['longacli'] = 'Do tohto priečinka je možné zapisovať alebo kopírovať správy';
@@ -70,18 +78,22 @@ $labels['longaclt'] = 'Príznak správ "Vymazané" je možné zmeniť';
 $labels['longacle'] = 'Správy je možné vymazať';
 $labels['longaclx'] = 'Priečinok je možné vymazať alebo premenovať';
 $labels['longacla'] = 'Je možné zmeniť prístupové práva k priečinku';
+
 $labels['longaclfull'] = 'Úplný prístup, vrátane správy priečinka';
+$labels['longaclread'] = 'Prečinok je možné otvoriť na čítanie';
 $labels['longaclwrite'] = 'Správy je možné označiť, zapísať alebo skopírovať do prečinka';
 $labels['longacldelete'] = 'Správy je možné vymazať';
-$labels['deleting'] = 'Odstraňovanie prístupových práv...';
-$labels['saving'] = 'Ukladanie prístupových práv...';
-$labels['updatesuccess'] = 'Prístupové práva boli úspešne zmenené';
-$labels['deletesuccess'] = 'Prístupové práva boli úspešne vymazané';
-$labels['createsuccess'] = 'Prístupové práva boli úspešne pridané';
-$labels['updateerror'] = 'Prístupové práva sa nepodarilo aktualizovať';
-$labels['deleteerror'] = 'Prístupové práva sa nepodarilo vymazať';
-$labels['createerror'] = 'Prístupové práva sa nepodarilo pridať';
-$labels['deleteconfirm'] = 'Ste si istý, že chcete odstrániť prístupové práva vybranému používateľovi/používateľom?';
-$labels['norights'] = 'Neboli určené žiadne práva!';
-$labels['nouser'] = 'Nebolo určené žiadne meno používateľa!';
 
+$messages['deleting'] = 'Odstraňovanie prístupových práv...';
+$messages['saving'] = 'Ukladanie prístupových práv...';
+$messages['updatesuccess'] = 'Prístupové práva boli úspešne zmenené';
+$messages['deletesuccess'] = 'Prístupové práva boli úspešne vymazané';
+$messages['createsuccess'] = 'Prístupové práva boli úspešne pridané';
+$messages['updateerror'] = 'Prístupové práva sa nepodarilo aktualizovať';
+$messages['deleteerror'] = 'Prístupové práva sa nepodarilo vymazať';
+$messages['createerror'] = 'Prístupové práva sa nepodarilo pridať';
+$messages['deleteconfirm'] = 'Ste si istý, že chcete odstrániť prístupové práva vybranému používateľovi/používateľom?';
+$messages['norights'] = 'Neboli určené žiadne práva!';
+$messages['nouser'] = 'Nebolo určené žiadne meno používateľa!';
+
+?>
diff --git a/plugins/acl/localization/sl_SI.inc b/plugins/acl/localization/sl_SI.inc
index e644c9d14..8c8a552a7 100644
--- a/plugins/acl/localization/sl_SI.inc
+++ b/plugins/acl/localization/sl_SI.inc
@@ -2,18 +2,20 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/sl_SI/labels.inc                                         |
+ | plugins/acl/localization/<lang>.inc                                   |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail ACL plugin                 |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Teja Cetinski <teja.cetinski@gmail.com>                       |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
 
-$labels = array();
 $labels['sharing'] = 'Skupna raba';
 $labels['myrights'] = 'Pravice dostopa';
 $labels['username'] = 'Uporabnik:';
@@ -23,44 +25,48 @@ $labels['actions'] = 'Nastavitve pravic dostopa';
 $labels['anyone'] = 'Vsi uporabniki';
 $labels['anonymous'] = 'Gosti';
 $labels['identifier'] = 'Označevalnik';
+
 $labels['acll'] = 'Iskanje';
-$labels['shortacll'] = 'Iskanje';
 $labels['aclr'] = 'Prebrana sporočila';
 $labels['acls'] = 'Ohrani status \'Prebrano\'';
 $labels['aclw'] = 'Označi pisanje sporočila';
 $labels['acli'] = 'Vstavi (Kopiraj v)';
 $labels['aclp'] = 'Objava';
-$labels['shortaclp'] = 'Objava';
 $labels['aclc'] = 'Ustvari podmape';
 $labels['aclk'] = 'Ustvari podmape';
 $labels['acld'] = 'Izbriši sporočila';
 $labels['aclt'] = 'Izbriši sporočila';
 $labels['acle'] = 'Izbriši';
-$labels['shortacle'] = 'Izbriši';
 $labels['aclx'] = 'Izbriši mapo';
 $labels['acla'] = 'Uredi';
-$labels['shortacla'] = 'Uredi';
+
 $labels['aclfull'] = 'Popolno upravljanje';
 $labels['aclother'] = 'Ostalo';
-$labels['shortaclother'] = 'Ostalo';
 $labels['aclread'] = 'Preberi';
-$labels['shortaclr'] = 'Preberi';
-$labels['shortaclread'] = 'Preberi';
 $labels['aclwrite'] = 'Sestavi';
-$labels['shortaclw'] = 'Sestavi';
-$labels['shortaclwrite'] = 'Sestavi';
 $labels['acldelete'] = 'Izbriši';
-$labels['shortacld'] = 'Izbriši';
-$labels['shortaclt'] = 'Izbriši';
-$labels['shortacldelete'] = 'Izbriši';
+
+$labels['shortacll'] = 'Iskanje';
+$labels['shortaclr'] = 'Preberi';
 $labels['shortacls'] = 'Ohrani';
+$labels['shortaclw'] = 'Sestavi';
 $labels['shortacli'] = 'Vstavi';
+$labels['shortaclp'] = 'Objava';
 $labels['shortaclc'] = 'Ustvari';
 $labels['shortaclk'] = 'Ustvari';
+$labels['shortacld'] = 'Izbriši';
+$labels['shortaclt'] = 'Izbriši';
+$labels['shortacle'] = 'Izbriši';
 $labels['shortaclx'] = 'Izbriši mapo';
+$labels['shortacla'] = 'Uredi';
+
+$labels['shortaclother'] = 'Ostalo';
+$labels['shortaclread'] = 'Preberi';
+$labels['shortaclwrite'] = 'Sestavi';
+$labels['shortacldelete'] = 'Izbriši';
+
 $labels['longacll'] = 'Mapa je vidna na seznamih in jo lahko naročite';
 $labels['longaclr'] = 'Mapa je na voljo za branje';
-$labels['longaclread'] = 'Mapa je na voljo za branje';
 $labels['longacls'] = 'Oznaka \'Prebrano sporočilo\' je lahko spremenjena';
 $labels['longaclw'] = 'Oznake sporočil in ključne besede je mogoče spremeniti, z izjemo oznak "Prebrano" in "Izbrisano';
 $labels['longacli'] = 'Sporočilo je lahko poslano ali kopirano v mapo';
@@ -72,18 +78,22 @@ $labels['longaclt'] = 'Oznako sporočila  \'Izbrisano\' je mogoče spremeniti';
 $labels['longacle'] = 'Sporočila so lahko izbrisana';
 $labels['longaclx'] = 'Mapa je lahko izbrisana ali preimenovana';
 $labels['longacla'] = 'Pravice na mapi so lahko spremenjene';
+
 $labels['longaclfull'] = 'Popolno upravljanje, vključno z urejanjem map';
+$labels['longaclread'] = 'Mapa je na voljo za branje';
 $labels['longaclwrite'] = 'Sporočila je mogoče označiti, sestaviti ali kopirati v mapo';
 $labels['longacldelete'] = 'Sporočila so lahko izbrisana';
-$labels['deleting'] = 'Brisanje pravic';
-$labels['saving'] = 'Shranjevanje pravic';
-$labels['updatesuccess'] = 'Pravice so bile uspešno spremenjene';
-$labels['deletesuccess'] = 'Pravice so bile uspešno izbrisane';
-$labels['createsuccess'] = 'Pravice so bile uspešno dodane';
-$labels['updateerror'] = 'Pravic ni mogoče posodobiti';
-$labels['deleteerror'] = 'Pravic ni mogoče izbrisati';
-$labels['createerror'] = 'Pravic ni bilo mogoče dodati';
-$labels['deleteconfirm'] = 'Ste prepričani, da želite odstraniti pravice dostopa za izbrane uporabnike?';
-$labels['norights'] = 'Pravic niste določili';
-$labels['nouser'] = 'Niste določili uporabnišlega imena';
 
+$messages['deleting'] = 'Brisanje pravic';
+$messages['saving'] = 'Shranjevanje pravic';
+$messages['updatesuccess'] = 'Pravice so bile uspešno spremenjene';
+$messages['deletesuccess'] = 'Pravice so bile uspešno izbrisane';
+$messages['createsuccess'] = 'Pravice so bile uspešno dodane';
+$messages['updateerror'] = 'Pravic ni mogoče posodobiti';
+$messages['deleteerror'] = 'Pravic ni mogoče izbrisati';
+$messages['createerror'] = 'Pravic ni bilo mogoče dodati';
+$messages['deleteconfirm'] = 'Ste prepričani, da želite odstraniti pravice dostopa za izbrane uporabnike?';
+$messages['norights'] = 'Pravic niste določili';
+$messages['nouser'] = 'Niste določili uporabnišlega imena';
+
+?>
diff --git a/plugins/acl/localization/sr_CS.inc b/plugins/acl/localization/sr_CS.inc
index c76e9c0b4..19f744066 100644
--- a/plugins/acl/localization/sr_CS.inc
+++ b/plugins/acl/localization/sr_CS.inc
@@ -2,20 +2,98 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/sr_CS/labels.inc                                         |
+ | plugins/acl/localization/<lang>.inc                                   |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail ACL plugin                 |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Данило Шеган                                       |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
 
-$labels = array();
 $labels['sharing'] = 'Дељење';
 $labels['myrights'] = 'Права приступа';
 $labels['username'] = 'Корисник:';
+$labels['advanced'] = 'advanced mode';
 $labels['newuser'] = 'Додај унос';
+$labels['actions'] = 'Access right actions...';
+$labels['anyone'] = 'All users (anyone)';
+$labels['anonymous'] = 'Guests (anonymous)';
+$labels['identifier'] = 'Identifier';
+
+$labels['acll'] = 'Lookup';
+$labels['aclr'] = 'Read messages';
+$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['acld'] = 'Delete messages';
+$labels['aclt'] = 'Delete messages';
+$labels['acle'] = 'Expunge';
+$labels['aclx'] = 'Delete folder';
+$labels['acla'] = 'Administer';
+
+$labels['aclfull'] = 'Full control';
+$labels['aclother'] = 'Other';
+$labels['aclread'] = 'Read';
+$labels['aclwrite'] = 'Write';
+$labels['acldelete'] = 'Delete';
+
+$labels['shortacll'] = 'Lookup';
+$labels['shortaclr'] = 'Read';
+$labels['shortacls'] = 'Keep';
+$labels['shortaclw'] = 'Write';
+$labels['shortacli'] = 'Insert';
+$labels['shortaclp'] = 'Post';
+$labels['shortaclc'] = 'Create';
+$labels['shortaclk'] = 'Create';
+$labels['shortacld'] = 'Delete';
+$labels['shortaclt'] = 'Delete';
+$labels['shortacle'] = 'Expunge';
+$labels['shortaclx'] = 'Folder delete';
+$labels['shortacla'] = 'Administer';
+
+$labels['shortaclother'] = 'Other';
+$labels['shortaclread'] = 'Read';
+$labels['shortaclwrite'] = 'Write';
+$labels['shortacldelete'] = 'Delete';
+
+$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'] = 'Messages can be written or copied to the folder';
+$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'] = 'Messages can be expunged';
+$labels['longaclx'] = 'The folder can be deleted or renamed';
+$labels['longacla'] = 'The folder access rights can be changed';
+
+$labels['longaclfull'] = 'Full control including folder administration';
+$labels['longaclread'] = 'The folder can be opened for reading';
+$labels['longaclwrite'] = 'Messages can be marked, written or copied to the folder';
+$labels['longacldelete'] = 'Messages can be deleted';
+
+$messages['deleting'] = 'Deleting access rights...';
+$messages['saving'] = 'Saving access rights...';
+$messages['updatesuccess'] = 'Successfully changed access rights';
+$messages['deletesuccess'] = 'Successfully deleted access rights';
+$messages['createsuccess'] = 'Successfully added access rights';
+$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!';
 
+?>
diff --git a/plugins/acl/localization/sv_SE.inc b/plugins/acl/localization/sv_SE.inc
index a2f41dcaa..6c68080de 100644
--- a/plugins/acl/localization/sv_SE.inc
+++ b/plugins/acl/localization/sv_SE.inc
@@ -2,18 +2,20 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/sv_SE/labels.inc                                         |
+ | plugins/acl/localization/<lang>.inc                                   |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail ACL plugin                 |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Jonas Nasholm                                                 |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
 
-$labels = array();
 $labels['sharing'] = 'Utdelning';
 $labels['myrights'] = 'Åtkomsträttigheter';
 $labels['username'] = 'Användare:';
@@ -23,44 +25,48 @@ $labels['actions'] = 'Hantera åtkomsträttigheter...';
 $labels['anyone'] = 'Alla användare (alla)';
 $labels['anonymous'] = 'Gäster (anonyma)';
 $labels['identifier'] = 'Identifikation';
+
 $labels['acll'] = 'Uppslagning';
-$labels['shortacll'] = 'Uppslagning';
 $labels['aclr'] = 'Läs meddelanden';
 $labels['acls'] = 'Behåll status Sett';
 $labels['aclw'] = 'Skriv flaggor';
 $labels['acli'] = 'Infoga (kopiera in)';
 $labels['aclp'] = 'Posta';
-$labels['shortaclp'] = 'Posta';
 $labels['aclc'] = 'Skapa underkataloger';
 $labels['aclk'] = 'Skapa underkataloger';
 $labels['acld'] = 'Ta bort meddelanden';
 $labels['aclt'] = 'Ta bort meddelanden';
 $labels['acle'] = 'Utplåna';
-$labels['shortacle'] = 'Utplåna';
 $labels['aclx'] = 'Ta bort katalog';
 $labels['acla'] = 'Administrera';
-$labels['shortacla'] = 'Administrera';
+
 $labels['aclfull'] = 'Full kontroll';
 $labels['aclother'] = 'Övrig';
-$labels['shortaclother'] = 'Övrig';
 $labels['aclread'] = 'Läs';
-$labels['shortaclr'] = 'Läs';
-$labels['shortaclread'] = 'Läs';
 $labels['aclwrite'] = 'Skriv';
-$labels['shortaclw'] = 'Skriv';
-$labels['shortaclwrite'] = 'Skriv';
 $labels['acldelete'] = 'Ta bort';
-$labels['shortacld'] = 'Ta bort';
-$labels['shortaclt'] = 'Ta bort';
-$labels['shortacldelete'] = 'Ta bort';
+
+$labels['shortacll'] = 'Uppslagning';
+$labels['shortaclr'] = 'Läs';
 $labels['shortacls'] = 'Behåll';
+$labels['shortaclw'] = 'Skriv';
 $labels['shortacli'] = 'Infoga';
+$labels['shortaclp'] = 'Posta';
 $labels['shortaclc'] = 'Skapa';
 $labels['shortaclk'] = 'Skapa';
+$labels['shortacld'] = 'Ta bort';
+$labels['shortaclt'] = 'Ta bort';
+$labels['shortacle'] = 'Utplåna';
 $labels['shortaclx'] = 'Ta bort katalog';
+$labels['shortacla'] = 'Administrera';
+
+$labels['shortaclother'] = 'Övrig';
+$labels['shortaclread'] = 'Läs';
+$labels['shortaclwrite'] = 'Skriv';
+$labels['shortacldelete'] = 'Ta bort';
+
 $labels['longacll'] = 'Katalogen är synlig i listor och den kan prenumereras på';
 $labels['longaclr'] = 'Katalogen kan öppnas för läsning';
-$labels['longaclread'] = 'Katalogen kan öppnas för läsning';
 $labels['longacls'] = 'Meddelandeflagga Sett kan ändras';
 $labels['longaclw'] = 'Meddelandeflaggor och nyckelord kan ändras, undantaget Sett och Raderat';
 $labels['longacli'] = 'Meddelanden kan skrivas eller kopieras till katalogen';
@@ -72,18 +78,22 @@ $labels['longaclt'] = 'Meddelandeflagga Raderat kan ändras';
 $labels['longacle'] = 'Meddelanden kan utplånas';
 $labels['longaclx'] = 'Katalogen kan tas bort eller ges annat namn';
 $labels['longacla'] = 'Katalogens åtkomsträttigheter kan ändras';
+
 $labels['longaclfull'] = 'Full kontroll inklusive katalogadministration';
+$labels['longaclread'] = 'Katalogen kan öppnas för läsning';
 $labels['longaclwrite'] = 'Meddelanden kan märkas, skrivas eller kopieras till katalogen';
 $labels['longacldelete'] = 'Meddelanden kan tas bort';
-$labels['deleting'] = 'Tar bort åtkomsträttigheter...';
-$labels['saving'] = 'Sparar åtkomsträttigheter...';
-$labels['updatesuccess'] = 'Åtkomsträttigheterna är ändrade';
-$labels['deletesuccess'] = 'Åtkomsträttigheterna är borttagna';
-$labels['createsuccess'] = 'Åtkomsträttigheterna är tillagda';
-$labels['updateerror'] = 'Åtkomsträttigheterna kunde inte ändras';
-$labels['deleteerror'] = 'Åtkomsträttigheterna kunde inte tas bort';
-$labels['createerror'] = 'Åtkomsträttigheterna kunde inte läggas till';
-$labels['deleteconfirm'] = 'Vill du verkligen ta bort åtkomsträttigheterna för markerade användare?';
-$labels['norights'] = 'Inga åtkomsträttigheter angavs!';
-$labels['nouser'] = 'Inget användarnamn angavs!';
 
+$messages['deleting'] = 'Tar bort åtkomsträttigheter...';
+$messages['saving'] = 'Sparar åtkomsträttigheter...';
+$messages['updatesuccess'] = 'Åtkomsträttigheterna är ändrade';
+$messages['deletesuccess'] = 'Åtkomsträttigheterna är borttagna';
+$messages['createsuccess'] = 'Åtkomsträttigheterna är tillagda';
+$messages['updateerror'] = 'Åtkomsträttigheterna kunde inte ändras';
+$messages['deleteerror'] = 'Åtkomsträttigheterna kunde inte tas bort';
+$messages['createerror'] = 'Åtkomsträttigheterna kunde inte läggas till';
+$messages['deleteconfirm'] = 'Vill du verkligen ta bort åtkomsträttigheterna för markerade användare?';
+$messages['norights'] = 'Inga åtkomsträttigheter angavs!';
+$messages['nouser'] = 'Inget användarnamn angavs!';
+
+?>
diff --git a/plugins/acl/localization/tr_TR.inc b/plugins/acl/localization/tr_TR.inc
index 509effaad..1569b5926 100644
--- a/plugins/acl/localization/tr_TR.inc
+++ b/plugins/acl/localization/tr_TR.inc
@@ -2,18 +2,20 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/tr_TR/labels.inc                                         |
+ | plugins/acl/localization/<lang>.inc                                   |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail ACL plugin                 |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: ismail yenigul                                                |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
 
-$labels = array();
 $labels['sharing'] = 'Paylaşım';
 $labels['myrights'] = 'Erişim Hakları';
 $labels['username'] = 'Kullanıcı:';
@@ -23,44 +25,48 @@ $labels['actions'] = 'Erişim hakları aksiyonları...';
 $labels['anyone'] = 'Tüm kullanıcılar(kim olursa)';
 $labels['anonymous'] = 'Ziyaretçiler(anonim)';
 $labels['identifier'] = 'Tanımlayıcı';
+
 $labels['acll'] = 'Arama';
-$labels['shortacll'] = 'Arama';
 $labels['aclr'] = 'Mesajları oku';
 $labels['acls'] = 'Göründü durumunu muhafaza et';
 $labels['aclw'] = 'Yazma bayrakları';
 $labels['acli'] = 'Ekle(kopyala)';
 $labels['aclp'] = 'Gönder';
-$labels['shortaclp'] = 'Gönder';
 $labels['aclc'] = 'Alt dizinler oluştur';
 $labels['aclk'] = 'Alt dizinler oluştur';
 $labels['acld'] = 'Mesajları  sil';
 $labels['aclt'] = 'Mesajları  sil';
 $labels['acle'] = 'Sil';
-$labels['shortacle'] = 'Sil';
 $labels['aclx'] = 'Dizini sil';
 $labels['acla'] = 'Yönet';
-$labels['shortacla'] = 'Yönet';
+
 $labels['aclfull'] = 'Tam kontrol';
 $labels['aclother'] = 'Diğer';
-$labels['shortaclother'] = 'Diğer';
 $labels['aclread'] = 'Oku';
-$labels['shortaclr'] = 'Oku';
-$labels['shortaclread'] = 'Oku';
 $labels['aclwrite'] = 'Yaz';
-$labels['shortaclw'] = 'Yaz';
-$labels['shortaclwrite'] = 'Yaz';
 $labels['acldelete'] = 'Sil';
-$labels['shortacld'] = 'Sil';
-$labels['shortaclt'] = 'Sil';
-$labels['shortacldelete'] = 'Sil';
+
+$labels['shortacll'] = 'Arama';
+$labels['shortaclr'] = 'Oku';
 $labels['shortacls'] = 'Koru';
+$labels['shortaclw'] = 'Yaz';
 $labels['shortacli'] = 'Ekle';
+$labels['shortaclp'] = 'Gönder';
 $labels['shortaclc'] = 'Oluştur';
 $labels['shortaclk'] = 'Oluştur';
+$labels['shortacld'] = 'Sil';
+$labels['shortaclt'] = 'Sil';
+$labels['shortacle'] = 'Sil';
 $labels['shortaclx'] = 'Dizin sil';
+$labels['shortacla'] = 'Yönet';
+
+$labels['shortaclother'] = 'Diğer';
+$labels['shortaclread'] = 'Oku';
+$labels['shortaclwrite'] = 'Yaz';
+$labels['shortacldelete'] = 'Sil';
+
 $labels['longacll'] = 'Klasör listesinde görülebilir ve abone olunabilir';
 $labels['longaclr'] = 'Dizin yazma için okunabilir';
-$labels['longaclread'] = 'Dizin yazma için okunabilir';
 $labels['longacls'] = 'Mesajların göründü bayrağı değiştirilebilir';
 $labels['longaclw'] = 'Görülme ve Silinme bayrakları hariç bayraklar ve anahtar kelimeler değiştirilebilir';
 $labels['longacli'] = 'Mesajlar dizini yazılabilir veya kopyalanabilir';
@@ -72,18 +78,22 @@ $labels['longaclt'] = 'mesajları sil bayrakları değiştirilebilir';
 $labels['longacle'] = 'Mesajlar silinebilir';
 $labels['longaclx'] = 'Klasörü silinebilir veya yeniden adlandırılabilir';
 $labels['longacla'] = 'Dizin erişim hakları değiştirilebilir';
+
 $labels['longaclfull'] = 'Dizin yönetimi de dahil olmak üzere tam kontrol';
+$labels['longaclread'] = 'Dizin yazma için okunabilir';
 $labels['longaclwrite'] = 'Dizin yönetimi de dahil olmak üzere tam kontrol';
 $labels['longacldelete'] = 'Mesajlar silinebilir';
-$labels['deleting'] = 'Erişim hakları siliniyor...';
-$labels['saving'] = 'Erişim hakları saklanıyor...';
-$labels['updatesuccess'] = 'Erişim hakları başarıyla değiştirildi';
-$labels['deletesuccess'] = 'Erişim hakları başarıyla silindi';
-$labels['createsuccess'] = 'Erişim hakları başarıyla eklendi';
-$labels['updateerror'] = 'Erişim haklarını güncellenemedi';
-$labels['deleteerror'] = 'Erişim haklarını silinemedi';
-$labels['createerror'] = 'Erişim hakları eklenemedi';
-$labels['deleteconfirm'] = 'Seçilen kullanıcılar için erişim haklarını silmek istediğinizden emin misiniz?';
-$labels['norights'] = 'Hiçbir hak belirtilmemiş!';
-$labels['nouser'] = 'Hiçbir kullanıcı belirtilmemiş!';
 
+$messages['deleting'] = 'Erişim hakları siliniyor...';
+$messages['saving'] = 'Erişim hakları saklanıyor...';
+$messages['updatesuccess'] = 'Erişim hakları başarıyla değiştirildi';
+$messages['deletesuccess'] = 'Erişim hakları başarıyla silindi';
+$messages['createsuccess'] = 'Erişim hakları başarıyla eklendi';
+$messages['updateerror'] = 'Erişim haklarını güncellenemedi';
+$messages['deleteerror'] = 'Erişim haklarını silinemedi';
+$messages['createerror'] = 'Erişim hakları eklenemedi';
+$messages['deleteconfirm'] = 'Seçilen kullanıcılar için erişim haklarını silmek istediğinizden emin misiniz?';
+$messages['norights'] = 'Hiçbir hak belirtilmemiş!';
+$messages['nouser'] = 'Hiçbir kullanıcı belirtilmemiş!';
+
+?>
diff --git a/plugins/acl/localization/vi_VN.inc b/plugins/acl/localization/vi_VN.inc
index 65dc96dd3..1a6ea58e7 100644
--- a/plugins/acl/localization/vi_VN.inc
+++ b/plugins/acl/localization/vi_VN.inc
@@ -2,18 +2,20 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/vi_VN/labels.inc                                         |
+ | plugins/acl/localization/<lang>.inc                                   |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail ACL plugin                 |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Kenny Tran <kennethanh@gmail.com>                             |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
 
-$labels = array();
 $labels['sharing'] = 'Chia sẻ';
 $labels['myrights'] = 'Quyền truy cập';
 $labels['username'] = 'Người dùng:';
@@ -23,44 +25,48 @@ $labels['actions'] = 'Cách ứng xử quyền truy cập';
 $labels['anyone'] = 'Tất cả người dùng (bất kỳ ai)';
 $labels['anonymous'] = 'Khách (nặc danh)';
 $labels['identifier'] = 'Định danh';
+
 $labels['acll'] = 'Tìm kiếm';
-$labels['shortacll'] = 'Tìm kiếm';
 $labels['aclr'] = 'Đọc thư';
 $labels['acls'] = 'Giữ trạng thái đã xem qua';
 $labels['aclw'] = 'Cờ đánh dấu cho mục viết';
 $labels['acli'] = 'Chèn thêm (sao chép vào)';
 $labels['aclp'] = 'Đăng bài';
-$labels['shortaclp'] = 'Đăng bài';
 $labels['aclc'] = 'Tạo giữ liệu con';
 $labels['aclk'] = 'Tạo giữ liệu con';
 $labels['acld'] = 'Xóa thư';
 $labels['aclt'] = 'Xóa thư';
 $labels['acle'] = 'Thải bỏ';
-$labels['shortacle'] = 'Thải bỏ';
 $labels['aclx'] = 'Xóa giữ liệu';
 $labels['acla'] = 'Quản lý';
-$labels['shortacla'] = 'Quản lý';
+
 $labels['aclfull'] = 'Quản lý toàn bộ';
 $labels['aclother'] = 'Loại khác';
-$labels['shortaclother'] = 'Loại khác';
 $labels['aclread'] = 'Đọc';
-$labels['shortaclr'] = 'Đọc';
-$labels['shortaclread'] = 'Đọc';
 $labels['aclwrite'] = 'Viết';
-$labels['shortaclw'] = 'Viết';
-$labels['shortaclwrite'] = 'Viết';
 $labels['acldelete'] = 'Xoá';
-$labels['shortacld'] = 'Xoá';
-$labels['shortaclt'] = 'Xoá';
-$labels['shortacldelete'] = 'Xoá';
+
+$labels['shortacll'] = 'Tìm kiếm';
+$labels['shortaclr'] = 'Đọc';
 $labels['shortacls'] = 'Giữ';
+$labels['shortaclw'] = 'Viết';
 $labels['shortacli'] = 'Chèn';
+$labels['shortaclp'] = 'Đăng bài';
 $labels['shortaclc'] = 'Tạo mới';
 $labels['shortaclk'] = 'Tạo mới';
+$labels['shortacld'] = 'Xoá';
+$labels['shortaclt'] = 'Xoá';
+$labels['shortacle'] = 'Thải bỏ';
 $labels['shortaclx'] = 'Giữ liệu được xóa';
+$labels['shortacla'] = 'Quản lý';
+
+$labels['shortaclother'] = 'Loại khác';
+$labels['shortaclread'] = 'Đọc';
+$labels['shortaclwrite'] = 'Viết';
+$labels['shortacldelete'] = 'Xoá';
+
 $labels['longacll'] = 'Giữ liệu đã được liệt kê và có thể đóng góp';
 $labels['longaclr'] = 'Giữ liệu có thể được mở để đọc';
-$labels['longaclread'] = 'Giữ liệu có thể được mở để đọc';
 $labels['longacls'] = 'Cờ đánh dấu thư đã xem qua có thể thay đổi';
 $labels['longaclw'] = 'Cờ thư và từ khóa có thể thay đổi, ngoại trừ đã xem qua và bị xóa';
 $labels['longacli'] = 'Thư có thể được ghi hoặc sao chép vào giữ liệu';
@@ -72,18 +78,22 @@ $labels['longaclt'] = 'Cờ đánh dấu thư xóa có thể thay đổi';
 $labels['longacle'] = 'Thư có thể thải bỏ';
 $labels['longaclx'] = 'Giữ liệu có thể xóa được hoặc đặt lại tên';
 $labels['longacla'] = 'Quyên truy cập giữ liệu có thể thay đổi';
+
 $labels['longaclfull'] = 'Quản lý toàn bộ bao gồm cả sự thi hành giữ liệu';
+$labels['longaclread'] = 'Giữ liệu có thể được mở để đọc';
 $labels['longaclwrite'] = 'Thư có thể được đánh dấu, ghi hoăc sao chép vào giữ liệu';
 $labels['longacldelete'] = 'Thư có thể bị xóa';
-$labels['deleting'] = 'Xóa quyền truy cập...';
-$labels['saving'] = 'Lưu quyền truy cập...';
-$labels['updatesuccess'] = 'Thay đổi quyền truy cập thành công...';
-$labels['deletesuccess'] = 'Xóa quyền truy cập thành công...';
-$labels['createsuccess'] = 'Thêm quyền truy cập thành công...';
-$labels['updateerror'] = 'Không thể cập nhật quyền truy cập';
-$labels['deleteerror'] = 'Khôngthể xóa quyền truy cập';
-$labels['createerror'] = 'Không thể thêm quyền truy cập';
-$labels['deleteconfirm'] = 'Bạn có chắc là muốn xóa bỏ quyền truy cập của người dùng được chọn?';
-$labels['norights'] = 'Chưa có quyền nào được chỉ định!';
-$labels['nouser'] = 'Chưa có tên truy nhập được chỉ định!';
 
+$messages['deleting'] = 'Xóa quyền truy cập...';
+$messages['saving'] = 'Lưu quyền truy cập...';
+$messages['updatesuccess'] = 'Thay đổi quyền truy cập thành công...';
+$messages['deletesuccess'] = 'Xóa quyền truy cập thành công...';
+$messages['createsuccess'] = 'Thêm quyền truy cập thành công...';
+$messages['updateerror'] = 'Không thể cập nhật quyền truy cập';
+$messages['deleteerror'] = 'Khôngthể xóa quyền truy cập';
+$messages['createerror'] = 'Không thể thêm quyền truy cập';
+$messages['deleteconfirm'] = 'Bạn có chắc là muốn xóa bỏ quyền truy cập của người dùng được chọn?';
+$messages['norights'] = 'Chưa có quyền nào được chỉ định!';
+$messages['nouser'] = 'Chưa có tên truy nhập được chỉ định!';
+
+?>
diff --git a/plugins/acl/localization/zh_CN.inc b/plugins/acl/localization/zh_CN.inc
index 3cde07aa8..ebf314043 100644
--- a/plugins/acl/localization/zh_CN.inc
+++ b/plugins/acl/localization/zh_CN.inc
@@ -2,67 +2,98 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/zh_CN/labels.inc                                         |
+ | plugins/acl/localization/<lang>.inc                                   |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail ACL plugin                 |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: WeiHua.Deng <mcp2000@gmail.com>                               |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
 
-$labels = array();
-$labels['sharing'] = '共享中';
+$labels['sharing'] = '共享';
 $labels['myrights'] = '访问权限';
-$labels['username'] = '用户名：';
+$labels['username'] = '用户：';
 $labels['advanced'] = '高级模式';
-$labels['newuser'] = '添加条目';
+$labels['newuser'] = '新增条目';
+$labels['actions'] = '权限设置...';
 $labels['anyone'] = '所有用户(任何人)';
 $labels['anonymous'] = '来宾(匿名)';
 $labels['identifier'] = '标识符';
+
 $labels['acll'] = '查找';
-$labels['shortacll'] = '查找';
 $labels['aclr'] = '读取消息';
 $labels['acls'] = '保存已读状态';
+$labels['aclw'] = '写入标志';
 $labels['acli'] = '插入(复制至)';
 $labels['aclp'] = '发送';
-$labels['shortaclp'] = '发送';
 $labels['aclc'] = '创建子文件夹';
 $labels['aclk'] = '创建子文件夹';
 $labels['acld'] = '删除消息';
 $labels['aclt'] = '删除消息';
+$labels['acle'] = '清除';
 $labels['aclx'] = '删除文件夹';
 $labels['acla'] = '管理';
-$labels['shortacla'] = '管理';
-$labels['aclother'] = '其他';
-$labels['shortaclother'] = '其他';
-$labels['aclwrite'] = '撰写';
-$labels['shortaclw'] = '撰写';
-$labels['shortaclwrite'] = '撰写';
+
+$labels['aclfull'] = '全部控制';
+$labels['aclother'] = '其它';
+$labels['aclread'] = '读取';
+$labels['aclwrite'] = '写入';
 $labels['acldelete'] = '删除';
-$labels['shortacld'] = '删除';
-$labels['shortaclt'] = '删除';
-$labels['shortacldelete'] = '删除';
-$labels['shortacls'] = '保留';
+
+$labels['shortacll'] = '查找';
+$labels['shortaclr'] = '读取';
+$labels['shortacls'] = '保存';
+$labels['shortaclw'] = '写入';
 $labels['shortacli'] = '插入';
+$labels['shortaclp'] = '发送';
 $labels['shortaclc'] = '新建';
 $labels['shortaclk'] = '新建';
+$labels['shortacld'] = '删除';
+$labels['shortaclt'] = '删除';
+$labels['shortacle'] = '清除';
 $labels['shortaclx'] = '删除文件夹';
+$labels['shortacla'] = '管理';
+
+$labels['shortaclother'] = '其他';
+$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'] = '消息可写或可被复制至文件夹中';
+$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['longacla'] = '文件夹访问权限可被修改';
+
+$labels['longaclfull'] = 'Full control including folder administration';
 $labels['longaclread'] = '该文件夹可被打开阅读';
-$labels['longaclx'] = '该文件夹可悲删除或重命名';
-$labels['deleting'] = '删除访问权限中…';
-$labels['saving'] = '保存访问权限中…';
-$labels['updatesuccess'] = '成功修改访问权限';
-$labels['deletesuccess'] = '成功删除访问权限';
-$labels['createsuccess'] = '成功添加访问权限';
-$labels['updateerror'] = '无法更新访问权限';
-$labels['deleteerror'] = '无法删除访问权限';
-$labels['createerror'] = '无法添加访问权限';
-$labels['deleteconfirm'] = '您确定要移除选中用户的访问权限吗?';
-$labels['norights'] = '没有已指定的权限!';
-$labels['nouser'] = '没有已指定的用户名!';
+$labels['longaclwrite'] = '消息可被标记，撰写或复制至文件夹中';
+$labels['longacldelete'] = '信息可被删除';
+
+$messages['deleting'] = '删除访问权限中…';
+$messages['saving'] = '保存访问权限中…';
+$messages['updatesuccess'] = '成功修改访问权限';
+$messages['deletesuccess'] = '成功删除访问权限';
+$messages['createsuccess'] = '成功添加访问权限';
+$messages['updateerror'] = '无法更新访问权限';
+$messages['deleteerror'] = '无法删除访问权限';
+$messages['createerror'] = '无法添加访问权限';
+$messages['deleteconfirm'] = '您确定要移除选中用户的访问权限吗?';
+$messages['norights'] = '没有已指定的权限!';
+$messages['nouser'] = '没有已指定的用户名!';
 
+?>
diff --git a/plugins/acl/localization/zh_TW.inc b/plugins/acl/localization/zh_TW.inc
index f04e0b9a2..821f7b321 100644
--- a/plugins/acl/localization/zh_TW.inc
+++ b/plugins/acl/localization/zh_TW.inc
@@ -2,18 +2,20 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/zh_TW/labels.inc                                         |
+ | plugins/acl/localization/<lang>.inc                                   |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail ACL plugin                 |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: 林子忠                                                     |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
 */
 
-$labels = array();
 $labels['sharing'] = '分享';
 $labels['myrights'] = '存取權限';
 $labels['username'] = '使用者：';
@@ -23,44 +25,50 @@ $labels['actions'] = '權限設定';
 $labels['anyone'] = '所有使用者 (anyone)';
 $labels['anonymous'] = '訪客 (anonymous)';
 $labels['identifier'] = '識別';
+
 $labels['acll'] = '尋找';
-$labels['shortacll'] = '尋找';
 $labels['aclr'] = '讀取訊息';
 $labels['acls'] = '保持上線狀態';
 $labels['aclw'] = '寫入標幟';
 $labels['acli'] = '插入(複製到這裡)';
 $labels['aclp'] = '發表';
-$labels['shortaclp'] = '發表';
 $labels['aclc'] = '建立子資料夾';
 $labels['aclk'] = '建立子資料夾';
 $labels['acld'] = '刪除訊息';
 $labels['aclt'] = '刪除訊息';
 $labels['acle'] = '刪去';
-$labels['shortacle'] = '刪去';
 $labels['aclx'] = '刪除資料夾';
 $labels['acla'] = '管理者';
-$labels['shortacla'] = '管理者';
+
 $labels['aclfull'] = '完全控制';
 $labels['aclother'] = '其它';
-$labels['shortaclother'] = '其它';
 $labels['aclread'] = '讀取';
-$labels['shortaclr'] = '讀取';
-$labels['shortaclread'] = '讀取';
 $labels['aclwrite'] = '寫入';
-$labels['shortaclw'] = '寫入';
-$labels['shortaclwrite'] = '寫入';
 $labels['acldelete'] = '刪除';
-$labels['shortacld'] = '刪除';
-$labels['shortaclt'] = '刪除';
-$labels['shortacldelete'] = '刪除';
+
+$labels['shortacll'] = '尋找';
+$labels['shortaclr'] = '讀取';
 $labels['shortacls'] = '保存';
+$labels['shortaclw'] = '寫入';
 $labels['shortacli'] = '插入';
+$labels['shortaclp'] = '發表';
 $labels['shortaclc'] = '建立';
 $labels['shortaclk'] = '建立';
+$labels['shortacld'] = '刪除';
+$labels['shortaclt'] = '刪除';
+$labels['shortacle'] = '刪去';
 $labels['shortaclx'] = '資料夾刪除';
+$labels['shortacla'] = '管理者';
+
+$labels['shortaclother'] = '其它';
+$labels['shortaclread'] = '讀取';
+$labels['shortaclwrite'] = '寫入';
+$labels['shortacldelete'] = '刪除';
+
+$labels['longacll'] = '此資料夾權限可以訂閱和瀏覽';
 $labels['longaclr'] = '資料夾能被打開與讀取';
-$labels['longaclread'] = '資料夾能被打開與讀取';
 $labels['longacls'] = '能修改訊息標幟';
+$labels['longaclw'] = '內容旗標和關鍵字可以變更,不包含已檢視和刪除的';
 $labels['longacli'] = '訊息能寫入或複製到資料夾';
 $labels['longaclp'] = '訊息能被投遞到這個資料夾';
 $labels['longaclc'] = '這個資料夾之下可以建子資料夾(或重新命名）';
@@ -70,18 +78,22 @@ $labels['longaclt'] = '能修改訊息刪除標幟';
 $labels['longacle'] = '能抹除訊息';
 $labels['longaclx'] = '資料夾能被刪除或重新命名';
 $labels['longacla'] = '能變更資料夾權限';
+
 $labels['longaclfull'] = '完全控制包含資料夾管理';
+$labels['longaclread'] = '資料夾能被打開與讀取';
 $labels['longaclwrite'] = '信件可以被標記、編寫或複製到資料夾';
 $labels['longacldelete'] = '訊息能被刪除';
-$labels['deleting'] = '刪除權限...';
-$labels['saving'] = '儲存權限...';
-$labels['updatesuccess'] = '權限變更完成';
-$labels['deletesuccess'] = '權限刪除完成';
-$labels['createsuccess'] = '權限新增完成';
-$labels['updateerror'] = '無法更新權限';
-$labels['deleteerror'] = '無法刪除權限';
-$labels['createerror'] = '無法新增權限';
-$labels['deleteconfirm'] = '您確定要刪除所選取使用者的權限嗎?';
-$labels['norights'] = '沒有指定任何權限';
-$labels['nouser'] = '沒有指定用戶名稱';
 
+$messages['deleting'] = '刪除權限...';
+$messages['saving'] = '儲存權限...';
+$messages['updatesuccess'] = '權限變更完成';
+$messages['deletesuccess'] = '權限刪除完成';
+$messages['createsuccess'] = '權限新增完成';
+$messages['updateerror'] = '無法更新權限';
+$messages['deleteerror'] = '無法刪除權限';
+$messages['createerror'] = '無法新增權限';
+$messages['deleteconfirm'] = '您確定要刪除所選取使用者的權限嗎?';
+$messages['norights'] = '沒有指定任何權限';
+$messages['nouser'] = '沒有指定用戶名稱';
+
+?>
diff --git a/plugins/acl/package.xml b/plugins/acl/package.xml
index e5d411e18..52e234f37 100644
--- a/plugins/acl/package.xml
+++ b/plugins/acl/package.xml
@@ -13,9 +13,9 @@
 		<email>alec@alec.pl</email>
 		<active>yes</active>
 	</lead>
-	<date>2012-06-28</date>
+	<date>2013-03-01</date>
 	<version>
-		<release>1.0</release>
+		<release>1.2</release>
 		<api>0.7</api>
 	</version>
 	<stability>
diff --git a/plugins/archive/archive.php b/plugins/archive/archive.php
index 38b4f9fcb..7a81606ab 100644
--- a/plugins/archive/archive.php
+++ b/plugins/archive/archive.php
@@ -41,7 +41,7 @@ class archive extends rcube_plugin
             'domain' => $this->ID,
         ),
         'toolbar');
-      
+
       // register hook to localize the archive folder
       $this->add_hook('render_mailboxlist', array($this, 'render_mailboxlist'));
 
@@ -75,10 +75,10 @@ class archive extends rcube_plugin
   {
     $rcmail = rcmail::get_instance();
     $archive_folder = $rcmail->config->get('archive_mbox');
-    $localize_name = $rcmail->config->get('archive_localize_name', true);
+    $show_real_name = $rcmail->config->get('show_real_foldernames');
 
     // set localized name for the configured archive folder
-    if ($archive_folder && $localize_name) {
+    if ($archive_folder && !$show_real_name) {
       if (isset($p['list'][$archive_folder]))
         $p['list'][$archive_folder]['name'] = $this->gettext('archivefolder');
       else // search in subfolders
diff --git a/plugins/archive/localization/ar_SA.inc b/plugins/archive/localization/ar_SA.inc
index 053891f2e..33e15c56f 100644
--- a/plugins/archive/localization/ar_SA.inc
+++ b/plugins/archive/localization/ar_SA.inc
@@ -2,20 +2,33 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ar_SA/labels.inc                                         |
+ | plugins/archive/localization/<lang>.inc                                |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Archive plugin             |
+ | Copyright (C) 2013, The Roundcube Dev Team                            |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Ossama M. Khayat <okhayat@yahoo.com>                          |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
 
 $labels = array();
 $labels['buttontext'] = 'الأرشيف';
-$labels['archivefolder'] = 'الأرشيف';
 $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['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';
 
+?>
diff --git a/plugins/archive/localization/az_AZ.inc b/plugins/archive/localization/az_AZ.inc
index a4f3bffb7..19a409d41 100644
--- a/plugins/archive/localization/az_AZ.inc
+++ b/plugins/archive/localization/az_AZ.inc
@@ -2,20 +2,33 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/az_AZ/labels.inc                                         |
+ | plugins/archive/localization/<lang>.inc                                |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Archive plugin             |
+ | Copyright (C) 2013, The Roundcube Dev Team                            |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Orkhan Guliyev <proger@box.az>                                |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
 
 $labels = array();
 $labels['buttontext'] = 'Arxiv';
-$labels['archivefolder'] = 'Arxiv';
 $labels['buttontitle'] = 'Mesajı arxivə göndər';
 $labels['archived'] = 'Arxivə göndərildi';
+$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'] = '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/be_BE.inc b/plugins/archive/localization/be_BE.inc
index 7e56c3bb2..ab78b2912 100644
--- a/plugins/archive/localization/be_BE.inc
+++ b/plugins/archive/localization/be_BE.inc
@@ -2,20 +2,33 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/be_BE/labels.inc                                         |
+ | plugins/archive/localization/<lang>.inc                                |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Archive plugin             |
+ | Copyright (C) 2013, The Roundcube Dev Team                            |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Alex Nehaichik <alex.nehaichik@gmail.com>                     |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
 
 $labels = array();
 $labels['buttontext'] = 'Архіў';
-$labels['archivefolder'] = 'Архіў';
 $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['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';
 
+?>
diff --git a/plugins/archive/localization/bg_BG.inc b/plugins/archive/localization/bg_BG.inc
index 1e19af3e4..b7be242e0 100644
--- a/plugins/archive/localization/bg_BG.inc
+++ b/plugins/archive/localization/bg_BG.inc
@@ -2,20 +2,33 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/bg_BG/labels.inc                                         |
+ | plugins/archive/localization/<lang>.inc                                |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Archive plugin             |
+ | Copyright (C) 2013, The Roundcube Dev Team                            |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Nikolai Nikolov <nick@kytex.bg>                               |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
 
 $labels = array();
 $labels['buttontext'] = 'Архивиране';
-$labels['archivefolder'] = 'Архивиране';
 $labels['buttontitle'] = 'Архивиране на съобщението';
 $labels['archived'] = 'Архивирането е успешно';
+$labels['archivedreload'] = 'Успешно архивирано. Презаредете страницата за да видите архивираните папки.';
+$labels['archiveerror'] = 'Някои съобщения не бяха архивирани';
+$labels['archivefolder'] = 'Архивиране';
+$labels['settingstitle'] = 'Архив';
+$labels['archivetype'] = 'Раздели архива по';
+$labels['archivetypeyear'] = 'Година (пр. Архив/2012)';
+$labels['archivetypemonth'] = 'Месец (пр. Архив/2012/06)';
+$labels['archivetypefolder'] = 'Оригинална папка';
+$labels['archivetypesender'] = 'Email адрес на изпращача';
+$labels['unkownsender'] = 'неизвестно';
 
+?>
diff --git a/plugins/archive/localization/br.inc b/plugins/archive/localization/br.inc
index ce9e3d904..6b7859936 100644
--- a/plugins/archive/localization/br.inc
+++ b/plugins/archive/localization/br.inc
@@ -2,20 +2,33 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/br/labels.inc                                         |
+ | plugins/archive/localization/<lang>.inc                                |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Archive plugin             |
+ | Copyright (C) 2013, The Roundcube Dev Team                            |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Denis                                                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
 
 $labels = array();
 $labels['buttontext'] = 'Diell';
-$labels['archivefolder'] = 'Diell';
 $labels['buttontitle'] = 'Dielliñ ar gemenadenn-mañ';
 $labels['archived'] = 'Diellet gant berzh';
+$labels['archivedreload'] = 'Successfully archived. Reload the page to see the new archive folders.';
+$labels['archiveerror'] = 'Some messages could not be archived';
+$labels['archivefolder'] = 'Diell';
+$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';
 
+?>
diff --git a/plugins/archive/localization/bs_BA.inc b/plugins/archive/localization/bs_BA.inc
index ec795e23b..06a5999a0 100644
--- a/plugins/archive/localization/bs_BA.inc
+++ b/plugins/archive/localization/bs_BA.inc
@@ -2,20 +2,33 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/bs_BA/labels.inc                                         |
+ | plugins/archive/localization/<lang>.inc                                |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Archive plugin             |
+ | Copyright (C) 2013, The Roundcube Dev Team                            |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Kenan Dervišević <kenan3008@gmail.com>                      |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
 
 $labels = array();
 $labels['buttontext'] = 'Arhiva';
-$labels['archivefolder'] = 'Arhiva';
 $labels['buttontitle'] = 'Arhiviraj ovu poruku';
 $labels['archived'] = 'Arhiviranje uspješno';
+$labels['archivedreload'] = 'Uspješno arhivirano. Ponovo učitajte stranicu da biste vidjeli nove foldere za arhiviranje.';
+$labels['archiveerror'] = 'Neke poruke nisu mogle biti arhivirane';
+$labels['archivefolder'] = 'Arhiva';
+$labels['settingstitle'] = 'Arhiva';
+$labels['archivetype'] = 'Podijeli arhivu po';
+$labels['archivetypeyear'] = 'Godinama (npr. Arhiva/2012)';
+$labels['archivetypemonth'] = 'Mjesecima (npr Arhiva/2012/06)';
+$labels['archivetypefolder'] = 'Originalni folder';
+$labels['archivetypesender'] = 'Email pošiljaoca';
+$labels['unkownsender'] = 'nepoznato';
 
+?>
diff --git a/plugins/archive/localization/ca_ES.inc b/plugins/archive/localization/ca_ES.inc
index 22502f008..04ade1dbf 100644
--- a/plugins/archive/localization/ca_ES.inc
+++ b/plugins/archive/localization/ca_ES.inc
@@ -2,20 +2,33 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ca_ES/labels.inc                                         |
+ | plugins/archive/localization/<lang>.inc                                |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Archive plugin             |
+ | Copyright (C) 2013, The Roundcube Dev Team                            |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Emi Bcn                                                       |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
 
 $labels = array();
 $labels['buttontext'] = 'Arxiva';
-$labels['archivefolder'] = 'Arxiva';
 $labels['buttontitle'] = 'Arxiva aquest missatge';
 $labels['archived'] = 'Arxivat correctament';
+$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'] = '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 28a41913b..e71aa5fa6 100644
--- a/plugins/archive/localization/cs_CZ.inc
+++ b/plugins/archive/localization/cs_CZ.inc
@@ -2,20 +2,33 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/cs_CZ/labels.inc                                         |
+ | plugins/archive/localization/<lang>.inc                                |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Archive plugin             |
+ | Copyright (C) 2013, The Roundcube Dev Team                            |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
 
 $labels = array();
 $labels['buttontext'] = 'Archiv';
-$labels['archivefolder'] = 'Archiv';
 $labels['buttontitle'] = 'Archivovat zprávu';
 $labels['archived'] = 'Úspěšně vloženo do archivu';
+$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'] = '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 579c5b16e..454c26da5 100644
--- a/plugins/archive/localization/cy_GB.inc
+++ b/plugins/archive/localization/cy_GB.inc
@@ -2,20 +2,33 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/cy_GB/labels.inc                                         |
+ | plugins/archive/localization/<lang>.inc                                |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Archive plugin             |
+ | Copyright (C) 2013, The Roundcube Dev Team                            |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Dafydd Tomos                                                  |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
 
 $labels = array();
 $labels['buttontext'] = 'Archif';
-$labels['archivefolder'] = 'Archif';
 $labels['buttontitle'] = 'Archifo\'r neges hwn';
 $labels['archived'] = 'Archifwyd yn llwyddiannus';
+$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'] = '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 936c05cbe..ac67700a4 100644
--- a/plugins/archive/localization/da_DK.inc
+++ b/plugins/archive/localization/da_DK.inc
@@ -2,20 +2,33 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/da_DK/labels.inc                                         |
+ | plugins/archive/localization/<lang>.inc                                |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Archive plugin             |
+ | Copyright (C) 2013, The Roundcube Dev Team                            |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Johannes Hessellund <osos@openeyes.dk>                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
 
 $labels = array();
 $labels['buttontext'] = 'Arkiv';
-$labels['archivefolder'] = 'Arkiv';
 $labels['buttontitle'] = 'Arkivér denne besked';
 $labels['archived'] = 'Succesfuldt arkiveret.';
+$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'] = '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/de_CH.inc b/plugins/archive/localization/de_CH.inc
index 654f5a143..65cf6efe0 100644
--- a/plugins/archive/localization/de_CH.inc
+++ b/plugins/archive/localization/de_CH.inc
@@ -5,7 +5,7 @@
  | plugins/archive/localization/<lang>.inc                                |
  |                                                                       |
  | Localization file of the Roundcube Webmail Archive plugin             |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Copyright (C) 2013, The Roundcube Dev Team                            |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -18,8 +18,17 @@
 
 $labels = array();
 $labels['buttontext'] = 'Archiv';
-$labels['buttontitle'] = 'Nachricht archivieren';
-$labels['archived'] = 'Nachricht erfolgreich archiviert';
+$labels['buttontitle'] = 'Nachricht(en) archivieren';
+$labels['archived'] = 'Nachricht(en) erfolgreich archiviert';
+$labels['archivedreload'] = 'Nachrichten wurden archiviert. Laden Sie die Seite neu, um die neuen Archivordner zu sehen.';
+$labels['archiveerror'] = 'Einige Nachrichten konnten nicht archiviert werden';
 $labels['archivefolder'] = 'Archiv';
+$labels['settingstitle'] = 'Archiv';
+$labels['archivetype'] = 'Erstelle Unterordner nach';
+$labels['archivetypeyear'] = 'Jahr (z.B. Archiv/2012)';
+$labels['archivetypemonth'] = 'Monat (z.B. Archiv/2012/06)';
+$labels['archivetypefolder'] = 'Originalordner';
+$labels['archivetypesender'] = 'Absender';
+$labels['unkownsender'] = 'unbekannt';
 
 ?>
diff --git a/plugins/archive/localization/de_DE.inc b/plugins/archive/localization/de_DE.inc
index c525837fd..8d4f9e39f 100644
--- a/plugins/archive/localization/de_DE.inc
+++ b/plugins/archive/localization/de_DE.inc
@@ -2,20 +2,33 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/de_DE/labels.inc                                         |
+ | plugins/archive/localization/<lang>.inc                                |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Archive plugin             |
+ | Copyright (C) 2013, The Roundcube Dev Team                            |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
 
 $labels = array();
 $labels['buttontext'] = 'Archiv';
-$labels['archivefolder'] = 'Archiv';
 $labels['buttontitle'] = 'Nachricht archivieren';
 $labels['archived'] = 'Nachricht erfolgreich archiviert';
+$labels['archivedreload'] = 'Erfolgreich archiviert. Seite aktualisieren um die neuen Archiv-Ordner zu sehen';
+$labels['archiveerror'] = 'Einige Nachrichten konnten nicht archiviert werden';
+$labels['archivefolder'] = 'Archiv';
+$labels['settingstitle'] = 'Archiv';
+$labels['archivetype'] = 'Archiv aufteilen nach';
+$labels['archivetypeyear'] = 'Jahr (z.B. Archiv/2012)';
+$labels['archivetypemonth'] = 'Monat (z.B. Archiv/2012/06)';
+$labels['archivetypefolder'] = 'Originalordner';
+$labels['archivetypesender'] = 'Absender E-Mail';
+$labels['unkownsender'] = 'unbekannt';
 
+?>
diff --git a/plugins/archive/localization/el_GR.inc b/plugins/archive/localization/el_GR.inc
index a06372c00..6da9f7dbf 100644
--- a/plugins/archive/localization/el_GR.inc
+++ b/plugins/archive/localization/el_GR.inc
@@ -2,20 +2,33 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/el_GR/labels.inc                                         |
+ | plugins/archive/localization/<lang>.inc                                |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Archive plugin             |
+ | Copyright (C) 2013, The Roundcube Dev Team                            |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Nikos Keramidis <info@torus.gr>                               |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
 
 $labels = array();
 $labels['buttontext'] = 'Αρχειοθέτηση';
-$labels['archivefolder'] = 'Αρχειοθέτηση';
 $labels['buttontitle'] = 'Αρχειοθέτηση μηνύματος';
 $labels['archived'] = 'Αρχειοθετήθηκε με επιτυχία';
+$labels['archivedreload'] = 'Επιτυχής αρχειοθετηση. Ανανέωση της σελίδας για να δείτε τους νέους φακέλους αρχειοθέτησης. ';
+$labels['archiveerror'] = 'Ορισμένα μηνύματα δεν μπορεσαν να αρχειοθετηθουν. ';
+$labels['archivefolder'] = 'Αρχειοθέτηση';
+$labels['settingstitle'] = 'Αρχειοθέτηση';
+$labels['archivetype'] = 'Χασμα αρχειου απο';
+$labels['archivetypeyear'] = 'Χρονος (π.χ. Αρχειο/2012)';
+$labels['archivetypemonth'] = 'Μηνας (π.χ. Αρχειο/2012/06)';
+$labels['archivetypefolder'] = 'Αυθεντικος φακελος';
+$labels['archivetypesender'] = 'Αποστολέας email';
+$labels['unkownsender'] = 'άγνωστο';
 
+?>
diff --git a/plugins/archive/localization/en_GB.inc b/plugins/archive/localization/en_GB.inc
index c65672e6e..d3714c118 100644
--- a/plugins/archive/localization/en_GB.inc
+++ b/plugins/archive/localization/en_GB.inc
@@ -2,20 +2,33 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/en_GB/labels.inc                                         |
+ | plugins/archive/localization/<lang>.inc                                |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Archive plugin             |
+ | Copyright (C) 2013, The Roundcube Dev Team                            |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Chris January                                                 |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
 
 $labels = array();
 $labels['buttontext'] = 'Archive';
-$labels['archivefolder'] = 'Archive';
 $labels['buttontitle'] = 'Archive this message';
 $labels['archived'] = 'Successfully archived';
+$labels['archivedreload'] = 'Successfully archived. Reload the page to see the new archive folders.';
+$labels['archiveerror'] = 'Some messages could not be archived';
+$labels['archivefolder'] = 'Archive';
+$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';
 
+?>
diff --git a/plugins/archive/localization/eo.inc b/plugins/archive/localization/eo.inc
index e878635ee..fa323effd 100644
--- a/plugins/archive/localization/eo.inc
+++ b/plugins/archive/localization/eo.inc
@@ -2,20 +2,33 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/eo/labels.inc                                         |
+ | plugins/archive/localization/<lang>.inc                                |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Archive plugin             |
+ | Copyright (C) 2013, The Roundcube Dev Team                            |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Michael Moroni <michael.moroni@mailoo.org>                    |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
 
 $labels = array();
-$labels['buttontext'] = 'Arkivo';
-$labels['archivefolder'] = 'Arkivo';
+$labels['buttontext'] = 'Arkivigi';
 $labels['buttontitle'] = 'Arkivigi ĉi tiun mesaĝon';
 $labels['archived'] = 'Sukcese arkivigita';
+$labels['archivedreload'] = 'Successfully archived. Reload the page to see the new archive folders.';
+$labels['archiveerror'] = 'Some messages could not be archived';
+$labels['archivefolder'] = 'Arkivo';
+$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';
 
+?>
diff --git a/plugins/archive/localization/es_AR.inc b/plugins/archive/localization/es_AR.inc
index 39466a980..5fb082497 100644
--- a/plugins/archive/localization/es_AR.inc
+++ b/plugins/archive/localization/es_AR.inc
@@ -2,20 +2,33 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/es_AR/labels.inc                                         |
+ | plugins/archive/localization/<lang>.inc                                |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Archive plugin             |
+ | Copyright (C) 2013, The Roundcube Dev Team                            |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
 
 $labels = array();
 $labels['buttontext'] = 'Archivo';
-$labels['archivefolder'] = 'Archivo';
 $labels['buttontitle'] = 'Archivar este mensaje';
 $labels['archived'] = 'Mensaje Archivado';
+$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'] = '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/es_ES.inc b/plugins/archive/localization/es_ES.inc
index 7cd5917c6..44b27691b 100644
--- a/plugins/archive/localization/es_ES.inc
+++ b/plugins/archive/localization/es_ES.inc
@@ -2,20 +2,33 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/es_ES/labels.inc                                         |
+ | plugins/archive/localization/<lang>.inc                                |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Archive plugin             |
+ | Copyright (C) 2013, The Roundcube Dev Team                            |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
 
 $labels = array();
 $labels['buttontext'] = 'Archivo';
-$labels['archivefolder'] = 'Archivo';
 $labels['buttontitle'] = 'Archivar este mensaje';
 $labels['archived'] = 'Mensaje Archivado';
+$labels['archivedreload'] = 'Archivado con éxito. Recargue la página para ver las nuevas carpetas de archivo.';
+$labels['archiveerror'] = 'No se ha podido archivar algunos mensajes';
+$labels['archivefolder'] = 'Archivo';
+$labels['settingstitle'] = 'Archivo';
+$labels['archivetype'] = 'Dividir el archivo por';
+$labels['archivetypeyear'] = 'Año (p.ej. Archivo/2012)';
+$labels['archivetypemonth'] = 'Mes (p.ej. Archivo/2012/06)';
+$labels['archivetypefolder'] = 'Bandeja original';
+$labels['archivetypesender'] = 'Email del remitente';
+$labels['unkownsender'] = 'desconocido';
 
+?>
diff --git a/plugins/archive/localization/et_EE.inc b/plugins/archive/localization/et_EE.inc
index 53e9b2504..55cdbc934 100644
--- a/plugins/archive/localization/et_EE.inc
+++ b/plugins/archive/localization/et_EE.inc
@@ -2,20 +2,33 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/et_EE/labels.inc                                         |
+ | plugins/archive/localization/<lang>.inc                                |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Archive plugin             |
+ | Copyright (C) 2013, The Roundcube Dev Team                            |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
 
 $labels = array();
 $labels['buttontext'] = 'Arhiveeri';
-$labels['archivefolder'] = 'Arhiveeri';
 $labels['buttontitle'] = 'Arhiveeri see kiri';
 $labels['archived'] = 'Edukalt arhiveeritud';
+$labels['archivedreload'] = 'Arhiveerimine õnnestus. Uute arhiivi kaustada nägemiseks laadi leht uuesti.';
+$labels['archiveerror'] = 'Mõnda kirja ei õnnestusnud arhiveerida';
+$labels['archivefolder'] = 'Arhiiv';
+$labels['settingstitle'] = 'Arhiiv';
+$labels['archivetype'] = 'Jaga arhiiv';
+$labels['archivetypeyear'] = 'Aasta (nt. Arhiiv/2012)';
+$labels['archivetypemonth'] = 'Kuu (nt. Arhiiv/2012/06)';
+$labels['archivetypefolder'] = 'Esialgne kaust';
+$labels['archivetypesender'] = 'Saatja e-post';
+$labels['unkownsender'] = 'teadmata';
 
+?>
diff --git a/plugins/archive/localization/fa_IR.inc b/plugins/archive/localization/fa_IR.inc
index c3f236837..9df31ed31 100644
--- a/plugins/archive/localization/fa_IR.inc
+++ b/plugins/archive/localization/fa_IR.inc
@@ -2,20 +2,33 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/fa_IR/labels.inc                                         |
+ | plugins/archive/localization/<lang>.inc                                |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Archive plugin             |
+ | Copyright (C) 2013, The Roundcube Dev Team                            |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Hamid <abbaszadeh.h@gmail.com>                                |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
 
 $labels = array();
 $labels['buttontext'] = 'بایگانی';
-$labels['archivefolder'] = 'بایگانی';
 $labels['buttontitle'] = 'بایگانی این پیغام';
 $labels['archived'] = 'با موفقیت بایگانی شد';
+$labels['archivedreload'] = 'با موفقیت بایگانی شد، بارگذاری مجدد صفحه برای دیدن پوشه‌های بایگانی جدید.';
+$labels['archiveerror'] = 'برخی پیغام‌ها بایگانی نخواهند شد';
+$labels['archivefolder'] = 'بایگانی';
+$labels['settingstitle'] = 'بایگانی';
+$labels['archivetype'] = 'جدا کردن بایگانی با';
+$labels['archivetypeyear'] = 'سال (به عنوان مثال بایگانی/۲۰۱۲)';
+$labels['archivetypemonth'] = 'ماه (به عنوان مثال بایگانی/۲۰۱۲/۰۶)';
+$labels['archivetypefolder'] = 'پوشه اصلی';
+$labels['archivetypesender'] = 'ایمیل فرستنده';
+$labels['unkownsender'] = 'ناشناخته';
 
+?>
diff --git a/plugins/archive/localization/fi_FI.inc b/plugins/archive/localization/fi_FI.inc
index f2b693283..261bc19ec 100644
--- a/plugins/archive/localization/fi_FI.inc
+++ b/plugins/archive/localization/fi_FI.inc
@@ -2,20 +2,33 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/fi_FI/labels.inc                                         |
+ | plugins/archive/localization/<lang>.inc                                |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Archive plugin             |
+ | Copyright (C) 2013, The Roundcube Dev Team                            |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Jiri Grönroos                                                |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
 
 $labels = array();
 $labels['buttontext'] = 'Arkistoi';
-$labels['archivefolder'] = 'Arkistoi';
 $labels['buttontitle'] = 'Arkistoi viesti';
 $labels['archived'] = 'Arkistoitu onnistuneesti';
+$labels['archivedreload'] = 'Successfully archived. Reload the page to see the new archive folders.';
+$labels['archiveerror'] = 'Some messages could not be archived';
+$labels['archivefolder'] = 'Arkistoi';
+$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';
 
+?>
diff --git a/plugins/archive/localization/fr_FR.inc b/plugins/archive/localization/fr_FR.inc
index 35434dac1..fbed8725b 100644
--- a/plugins/archive/localization/fr_FR.inc
+++ b/plugins/archive/localization/fr_FR.inc
@@ -2,20 +2,33 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/fr_FR/labels.inc                                         |
+ | plugins/archive/localization/<lang>.inc                                |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Archive plugin             |
+ | Copyright (C) 2013, The Roundcube Dev Team                            |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
 
 $labels = array();
 $labels['buttontext'] = 'Archive';
-$labels['archivefolder'] = 'Archive';
 $labels['buttontitle'] = 'Archiver ce message';
 $labels['archived'] = 'Message archivé avec success';
+$labels['archivedreload'] = 'Archivé avec succès. Rechargez la page pour voir les nouveaux dossiers d\'archivage.';
+$labels['archiveerror'] = 'Certains messages n\'ont pas pu être archivés.';
+$labels['archivefolder'] = 'Archive';
+$labels['settingstitle'] = 'Archive';
+$labels['archivetype'] = 'Diviser l\'archive en';
+$labels['archivetypeyear'] = 'Année (ex Archives/2012)';
+$labels['archivetypemonth'] = 'Mois (ex Archives/2012/06)';
+$labels['archivetypefolder'] = 'Dossier original';
+$labels['archivetypesender'] = 'Email de l\'émetteur';
+$labels['unkownsender'] = 'inconnu';
 
+?>
diff --git a/plugins/archive/localization/gl_ES.inc b/plugins/archive/localization/gl_ES.inc
index 1e6c620f9..55180fefe 100644
--- a/plugins/archive/localization/gl_ES.inc
+++ b/plugins/archive/localization/gl_ES.inc
@@ -2,20 +2,33 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/gl_ES/labels.inc                                         |
+ | plugins/archive/localization/<lang>.inc                                |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Archive plugin             |
+ | Copyright (C) 2013, The Roundcube Dev Team                            |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
 
 $labels = array();
 $labels['buttontext'] = 'Arquivo';
-$labels['archivefolder'] = 'Arquivo';
 $labels['buttontitle'] = 'Arquivar esta mensaxe';
 $labels['archived'] = 'Aquivouse a mensaxe';
+$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'] = '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 2243bea93..37bcaaa3f 100644
--- a/plugins/archive/localization/he_IL.inc
+++ b/plugins/archive/localization/he_IL.inc
@@ -2,20 +2,33 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/he_IL/labels.inc                                         |
+ | plugins/archive/localization/<lang>.inc                                |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Archive plugin             |
+ | Copyright (C) 2013, The Roundcube Dev Team                            |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Moshe Leibovitch <moish@mln.co.il>                            |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
 
 $labels = array();
 $labels['buttontext'] = 'ארכיון';
-$labels['archivefolder'] = 'ארכיון';
 $labels['buttontitle'] = 'משלוח ההודעה לארכיב';
 $labels['archived'] = 'עדכון הארכיון הצליח';
+$labels['archivedreload'] = 'נשמר בהצלחה בארכיב. יש לרענו את הדף כדי לראות את התיקיות החדשות בארכיב.';
+$labels['archiveerror'] = 'לא ניתן היה להעביר לארכיב חלק מההודעות';
+$labels['archivefolder'] = 'ארכיון';
+$labels['settingstitle'] = 'ארכיב';
+$labels['archivetype'] = 'לחלק את הארכיב על ידי';
+$labels['archivetypeyear'] = 'שנה ( לדוגמה, ארכיב/2012/96 )';
+$labels['archivetypemonth'] = 'חודש ( לדוגמה, ארכיב/2012/96 )';
+$labels['archivetypefolder'] = 'תיקיה מקורית';
+$labels['archivetypesender'] = 'שולח ההודעה';
+$labels['unkownsender'] = 'לא ידוע';
 
+?>
diff --git a/plugins/archive/localization/hr_HR.inc b/plugins/archive/localization/hr_HR.inc
index 3ef79d4dd..86ef2a98f 100644
--- a/plugins/archive/localization/hr_HR.inc
+++ b/plugins/archive/localization/hr_HR.inc
@@ -2,20 +2,33 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/hr_HR/labels.inc                                         |
+ | plugins/archive/localization/<lang>.inc                                |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Archive plugin             |
+ | Copyright (C) 2013, The Roundcube Dev Team                            |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Svebor Prstačić <svebor.prstacic@gmail.com>                 |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
 
 $labels = array();
 $labels['buttontext'] = 'Arhiva';
-$labels['archivefolder'] = 'Arhiva';
 $labels['buttontitle'] = 'Arhiviraj poruku';
 $labels['archived'] = 'Uspješno arhivirana';
+$labels['archivedreload'] = 'Successfully archived. Reload the page to see the new archive folders.';
+$labels['archiveerror'] = 'Some messages could not be archived';
+$labels['archivefolder'] = 'Arhiva';
+$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';
 
+?>
diff --git a/plugins/archive/localization/hu_HU.inc b/plugins/archive/localization/hu_HU.inc
index edc915191..970a24184 100644
--- a/plugins/archive/localization/hu_HU.inc
+++ b/plugins/archive/localization/hu_HU.inc
@@ -2,20 +2,33 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/hu_HU/labels.inc                                         |
+ | plugins/archive/localization/<lang>.inc                                |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Archive plugin             |
+ | Copyright (C) 2013, The Roundcube Dev Team                            |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Droszler Gabor <droszler@datatrans.hu>                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
 
 $labels = array();
 $labels['buttontext'] = 'Archiválás';
-$labels['archivefolder'] = 'Archiválás';
 $labels['buttontitle'] = 'Üzenet archiválása';
 $labels['archived'] = 'Sikeres archiválás';
+$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'] = '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/hy_AM.inc b/plugins/archive/localization/hy_AM.inc
index ff29d198c..d807ae507 100644
--- a/plugins/archive/localization/hy_AM.inc
+++ b/plugins/archive/localization/hy_AM.inc
@@ -2,20 +2,33 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/hy_AM/labels.inc                                         |
+ | plugins/archive/localization/<lang>.inc                                |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Archive plugin             |
+ | Copyright (C) 2013, The Roundcube Dev Team                            |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Vahan Yerkanian <vahan@yerkanian.com>                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
 
 $labels = array();
 $labels['buttontext'] = 'Արխիվ';
-$labels['archivefolder'] = 'Արխիվ';
 $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['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';
 
+?>
diff --git a/plugins/archive/localization/id_ID.inc b/plugins/archive/localization/id_ID.inc
index aee53a564..09b5ed547 100644
--- a/plugins/archive/localization/id_ID.inc
+++ b/plugins/archive/localization/id_ID.inc
@@ -2,20 +2,33 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/id_ID/labels.inc                                         |
+ | plugins/archive/localization/<lang>.inc                                |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Archive plugin             |
+ | Copyright (C) 2013, The Roundcube Dev Team                            |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Putu Arya Sabda Wijaya                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
 
 $labels = array();
 $labels['buttontext'] = 'Arsip';
-$labels['archivefolder'] = 'Arsip';
 $labels['buttontitle'] = 'Arsipkan pesan ini';
 $labels['archived'] = 'Berhasil mengarsipkan';
+$labels['archivedreload'] = 'Berhasil diarsipkan. Reload halaman untuk melihat folder arsip baru.';
+$labels['archiveerror'] = 'Beberapa pesan tidak dapat diarsipkan';
+$labels['archivefolder'] = 'Arsip';
+$labels['settingstitle'] = 'Arsip';
+$labels['archivetype'] = 'Pisah arsip berdasarkan';
+$labels['archivetypeyear'] = 'Tahun (contoh: Arsip/2012)';
+$labels['archivetypemonth'] = 'Bulan (contoh: Arsip/2012/06)';
+$labels['archivetypefolder'] = 'Folder asli';
+$labels['archivetypesender'] = 'Email pengirim';
+$labels['unkownsender'] = 'Tidak dikenal';
 
+?>
diff --git a/plugins/archive/localization/it_IT.inc b/plugins/archive/localization/it_IT.inc
index 636965df7..66092f8ae 100644
--- a/plugins/archive/localization/it_IT.inc
+++ b/plugins/archive/localization/it_IT.inc
@@ -2,20 +2,33 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/it_IT/labels.inc                                         |
+ | plugins/archive/localization/<lang>.inc                                |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Archive plugin             |
+ | Copyright (C) 2013, The Roundcube Dev Team                            |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: emilio brambilla                                              |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
 
 $labels = array();
 $labels['buttontext'] = 'Archivio';
-$labels['archivefolder'] = 'Archivio';
 $labels['buttontitle'] = 'Archivia questo messaggio';
 $labels['archived'] = 'Archiviato correttamente';
+$labels['archivedreload'] = 'Archiviata con successo. Ricarica la pagina per visualizzare le nuove cartelle.';
+$labels['archiveerror'] = 'Alcuni messaggi non possono essere archiviati';
+$labels['archivefolder'] = 'Archivio';
+$labels['settingstitle'] = 'Archivio';
+$labels['archivetype'] = 'Dividi archivio per';
+$labels['archivetypeyear'] = 'Anno (es. Archivio/2012)';
+$labels['archivetypemonth'] = 'Mese (es. Archivio/2012/06)';
+$labels['archivetypefolder'] = 'Cartella originale';
+$labels['archivetypesender'] = 'Mittente email';
+$labels['unkownsender'] = 'sconosciuto';
 
+?>
diff --git a/plugins/archive/localization/ja_JP.inc b/plugins/archive/localization/ja_JP.inc
index 1de4de0d1..b260e2458 100644
--- a/plugins/archive/localization/ja_JP.inc
+++ b/plugins/archive/localization/ja_JP.inc
@@ -2,20 +2,33 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ja_JP/labels.inc                                         |
+ | plugins/archive/localization/<lang>.inc                                |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Archive plugin             |
+ | Copyright (C) 2013, The Roundcube Dev Team                            |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Takahiro Kambe                                                |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
 
 $labels = array();
 $labels['buttontext'] = 'アーカイブ';
-$labels['archivefolder'] = 'アーカイブ';
 $labels['buttontitle'] = 'このメッセージをアーカイブ';
 $labels['archived'] = 'アーカイブしました。';
+$labels['archivedreload'] = 'アーカイブしました。ページを再読み込みすると、新しいアーカイブのフォルダーを表示します。';
+$labels['archiveerror'] = 'アーカイブできないメッセージがありました';
+$labels['archivefolder'] = 'アーカイブ';
+$labels['settingstitle'] = 'アーカイブ';
+$labels['archivetype'] = 'アーカイブを分割: ';
+$labels['archivetypeyear'] = '年 (例: アーカイブ/2012)';
+$labels['archivetypemonth'] = '月 (e.g. アーカイブ/2012/06)';
+$labels['archivetypefolder'] = '元のフォルダー';
+$labels['archivetypesender'] = '電子メールの送信者';
+$labels['unkownsender'] = '不明';
 
+?>
diff --git a/plugins/archive/localization/km_KH.inc b/plugins/archive/localization/km_KH.inc
index 3e880dcb9..6872026ec 100644
--- a/plugins/archive/localization/km_KH.inc
+++ b/plugins/archive/localization/km_KH.inc
@@ -2,20 +2,33 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/km_KH/labels.inc                                         |
+ | plugins/archive/localization/<lang>.inc                                |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Archive plugin             |
+ | Copyright (C) 2013, The Roundcube Dev Team                            |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: samdyk                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
 
 $labels = array();
 $labels['buttontext'] = 'ប័ណ្ណសារ';
-$labels['archivefolder'] = 'ប័ណ្ណសារ';
 $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['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';
 
+?>
diff --git a/plugins/archive/localization/ko_KR.inc b/plugins/archive/localization/ko_KR.inc
index b067356a6..4226420a0 100644
--- a/plugins/archive/localization/ko_KR.inc
+++ b/plugins/archive/localization/ko_KR.inc
@@ -2,20 +2,33 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ko_KR/labels.inc                                         |
+ | plugins/archive/localization/<lang>.inc                                |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Archive plugin             |
+ | Copyright (C) 2013, The Roundcube Dev Team                            |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Kim, Woohyun <woohyun.kim@gmail.com>                          |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
 
 $labels = array();
 $labels['buttontext'] = '보관';
-$labels['archivefolder'] = '보관';
 $labels['buttontitle'] = '이 메시지를 보관';
-$labels['archived'] = '성공적으로 보관 됨';
+$labels['archived'] = '성공적으로 보관됨';
+$labels['archivedreload'] = '성공적으로 보관됨. 페이지를 다시 불러와서 새 보관 폴더를 확인하세요.';
+$labels['archiveerror'] = '일부 메시지가 보관되지 않음';
+$labels['archivefolder'] = '보관';
+$labels['settingstitle'] = '보관';
+$labels['archivetype'] = '보관된 메시지 정리 기준';
+$labels['archivetypeyear'] = '연도 (예: 보관 편지함/2012)';
+$labels['archivetypemonth'] = '월 (예: 보관 편지함/2012/06)';
+$labels['archivetypefolder'] = '원본 폴더';
+$labels['archivetypesender'] = '발신인 이메일';
+$labels['unkownsender'] = '알 수 없음';
 
+?>
diff --git a/plugins/archive/localization/ku.inc b/plugins/archive/localization/ku.inc
index 235eedf39..15a7c61b1 100644
--- a/plugins/archive/localization/ku.inc
+++ b/plugins/archive/localization/ku.inc
@@ -2,20 +2,33 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ku/labels.inc                                         |
+ | plugins/archive/localization/<lang>.inc                                |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Archive plugin             |
+ | Copyright (C) 2013, The Roundcube Dev Team                            |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: david absalan <absalan@live.com>                              |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
 
 $labels = array();
 $labels['buttontext'] = 'Arşîv';
-$labels['archivefolder'] = 'Arşîv';
 $labels['buttontitle'] = 'am masaja bxa arşiv';
 $labels['archived'] = 'ba gşti Arşiv kra';
+$labels['archivedreload'] = 'Successfully archived. Reload the page to see the new archive folders.';
+$labels['archiveerror'] = 'Some messages could not be archived';
+$labels['archivefolder'] = 'Arşîv';
+$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';
 
+?>
diff --git a/plugins/archive/localization/lt_LT.inc b/plugins/archive/localization/lt_LT.inc
index 2beb03136..069a65665 100644
--- a/plugins/archive/localization/lt_LT.inc
+++ b/plugins/archive/localization/lt_LT.inc
@@ -2,20 +2,33 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/lt_LT/labels.inc                                         |
+ | plugins/archive/localization/<lang>.inc                                |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Archive plugin             |
+ | Copyright (C) 2013, The Roundcube Dev Team                            |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Rimas Kudelis <rq@akl.lt>                                     |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
 
 $labels = array();
 $labels['buttontext'] = 'Archyvuoti';
-$labels['archivefolder'] = 'Archyvuoti';
 $labels['buttontitle'] = 'Perkelti šį laišką į archyvą';
 $labels['archived'] = 'Laiškas sėkmingai perkeltas į archyvą';
+$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'] = '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/lv_LV.inc b/plugins/archive/localization/lv_LV.inc
index d806fcf65..ad2812fba 100644
--- a/plugins/archive/localization/lv_LV.inc
+++ b/plugins/archive/localization/lv_LV.inc
@@ -2,20 +2,33 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/lv_LV/labels.inc                                         |
+ | plugins/archive/localization/<lang>.inc                                |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Archive plugin             |
+ | Copyright (C) 2013, The Roundcube Dev Team                            |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Ivars Strazdiņš                                             |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
 
 $labels = array();
 $labels['buttontext'] = 'Arhīvs';
-$labels['archivefolder'] = 'Arhīvs';
 $labels['buttontitle'] = 'Arhivēt vēstuli';
 $labels['archived'] = 'Vēstule sekmīgi arhivēta';
+$labels['archivedreload'] = 'Successfully archived. Reload the page to see the new archive folders.';
+$labels['archiveerror'] = 'Some messages could not be archived';
+$labels['archivefolder'] = 'Arhīvs';
+$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';
 
+?>
diff --git a/plugins/archive/localization/ml_IN.inc b/plugins/archive/localization/ml_IN.inc
index 13569bf12..097ea14b9 100644
--- a/plugins/archive/localization/ml_IN.inc
+++ b/plugins/archive/localization/ml_IN.inc
@@ -2,20 +2,33 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ml_IN/labels.inc                                         |
+ | plugins/archive/localization/<lang>.inc                                |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Archive plugin             |
+ | Copyright (C) 2013, The Roundcube Dev Team                            |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Anish A <aneesh.nl@gmail.com>                                 |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
 
 $labels = array();
 $labels['buttontext'] = 'ശേഖരം';
-$labels['archivefolder'] = 'ശേഖരം';
 $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['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';
 
+?>
diff --git a/plugins/archive/localization/mr_IN.inc b/plugins/archive/localization/mr_IN.inc
index 5b66f43a3..8b2397937 100644
--- a/plugins/archive/localization/mr_IN.inc
+++ b/plugins/archive/localization/mr_IN.inc
@@ -2,20 +2,33 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/mr_IN/labels.inc                                         |
+ | plugins/archive/localization/<lang>.inc                                |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Archive plugin             |
+ | Copyright (C) 2013, The Roundcube Dev Team                            |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Devendra Buddhikot <devendradb@rediffmail.com>                |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
 
 $labels = array();
 $labels['buttontext'] = 'जतन केलेला';
-$labels['archivefolder'] = 'जतन केलेला';
 $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['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';
 
+?>
diff --git a/plugins/archive/localization/nb_NO.inc b/plugins/archive/localization/nb_NO.inc
index 46e49aba0..62ea381ca 100644
--- a/plugins/archive/localization/nb_NO.inc
+++ b/plugins/archive/localization/nb_NO.inc
@@ -2,20 +2,33 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/nb_NB/labels.inc                                         |
+ | plugins/archive/localization/<lang>.inc                                |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Archive plugin             |
+ | Copyright (C) 2013, The Roundcube Dev Team                            |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Tobias V. Langhoff <spug@thespug.net>                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
 
 $labels = array();
 $labels['buttontext'] = 'Arkiv';
-$labels['archivefolder'] = 'Arkiv';
 $labels['buttontitle'] = 'Arkiver meldingen';
 $labels['archived'] = 'Arkivert';
+$labels['archivedreload'] = 'Arkivering vellykket. Last inn siden på nytt for å se de nye arkivmappene.';
+$labels['archiveerror'] = 'Noen meldinger kunne ikke arkiveres';
+$labels['archivefolder'] = 'Arkiv';
+$labels['settingstitle'] = 'Arkiv';
+$labels['archivetype'] = 'Del arkiv etter';
+$labels['archivetypeyear'] = 'År (f.eks. Arkiv/2012)';
+$labels['archivetypemonth'] = 'Måned (f.eks. Arkiv/2012/06)';
+$labels['archivetypefolder'] = 'Opprinnelig mappe';
+$labels['archivetypesender'] = 'Sender email';
+$labels['unkownsender'] = 'ukjent';
 
+?>
diff --git a/plugins/archive/localization/nl_NL.inc b/plugins/archive/localization/nl_NL.inc
index 44f671239..263874236 100644
--- a/plugins/archive/localization/nl_NL.inc
+++ b/plugins/archive/localization/nl_NL.inc
@@ -2,20 +2,33 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/nl_NL/labels.inc                                         |
+ | plugins/archive/localization/<lang>.inc                                |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Archive plugin             |
+ | Copyright (C) 2013, The Roundcube Dev Team                            |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
 
 $labels = array();
 $labels['buttontext'] = 'Archief';
-$labels['archivefolder'] = 'Archief';
 $labels['buttontitle'] = 'Archiveer dit bericht';
 $labels['archived'] = 'Succesvol gearchiveerd';
+$labels['archivedreload'] = 'Succesvol gearchiveerd. Herlaad de pagina om de nieuwe archiefmappen te bekijken.';
+$labels['archiveerror'] = 'Sommige berichten kunnen niet gearchiveerd worden';
+$labels['archivefolder'] = 'Archief';
+$labels['settingstitle'] = 'Archiveren';
+$labels['archivetype'] = 'Archief opdelen in';
+$labels['archivetypeyear'] = 'Jaar (bijv. Archief/2012)';
+$labels['archivetypemonth'] = 'Maand (bijv. Archief/2012/06)';
+$labels['archivetypefolder'] = 'Originele map';
+$labels['archivetypesender'] = 'Afzender e-mail';
+$labels['unkownsender'] = 'onbekend';
 
+?>
diff --git a/plugins/archive/localization/nn_NO.inc b/plugins/archive/localization/nn_NO.inc
index d870f1f83..01effaa62 100644
--- a/plugins/archive/localization/nn_NO.inc
+++ b/plugins/archive/localization/nn_NO.inc
@@ -2,20 +2,33 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/nn_NN/labels.inc                                         |
+ | plugins/archive/localization/<lang>.inc                                |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Archive plugin             |
+ | Copyright (C) 2013, The Roundcube Dev Team                            |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Fredrik Larsen <fredrik.h.larsen@gmail.com>                   |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
 
 $labels = array();
 $labels['buttontext'] = 'Arkiver';
-$labels['archivefolder'] = 'Arkiver';
 $labels['buttontitle'] = 'Arkiver meldinga';
 $labels['archived'] = 'Arkivert';
+$labels['archivedreload'] = 'Arkivering vellukka. Last inn sida på nytt for å sjå dei nye arkivmappene.';
+$labels['archiveerror'] = 'Nokre meldingar kunne ikkje arkiverast';
+$labels['archivefolder'] = 'Arkiver';
+$labels['settingstitle'] = 'Arkiv';
+$labels['archivetype'] = 'Del arkiv etter';
+$labels['archivetypeyear'] = 'År (f.eks. Arkiv/2012)';
+$labels['archivetypemonth'] = 'Månad (f.eks. Arkiv/2012/06)';
+$labels['archivetypefolder'] = 'Opprinneleg mappe';
+$labels['archivetypesender'] = 'Sender email';
+$labels['unkownsender'] = 'ukjent';
 
+?>
diff --git a/plugins/archive/localization/pl_PL.inc b/plugins/archive/localization/pl_PL.inc
index 1e6ff0b44..316ca702d 100644
--- a/plugins/archive/localization/pl_PL.inc
+++ b/plugins/archive/localization/pl_PL.inc
@@ -2,20 +2,33 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/pl_PL/labels.inc                                         |
+ | plugins/archive/localization/<lang>.inc                                |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Archive plugin             |
+ | Copyright (C) 2013, The Roundcube Dev Team                            |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
 
 $labels = array();
 $labels['buttontext'] = 'Archiwum';
-$labels['archivefolder'] = 'Archiwum';
 $labels['buttontitle'] = 'Przenieś do archiwum';
 $labels['archived'] = 'Pomyślnie zarchiwizowano';
+$labels['archivedreload'] = 'Pomyślnie zarchiwizowano. Odśwież stronę aby zobaczyć nowe foldery.';
+$labels['archiveerror'] = 'Nie można zarchiwizować niektórych wiadomości';
+$labels['archivefolder'] = 'Archiwum';
+$labels['settingstitle'] = 'Archiwum';
+$labels['archivetype'] = 'Podziel archiwum wg';
+$labels['archivetypeyear'] = 'Roku (np. Archiwum/2012)';
+$labels['archivetypemonth'] = 'Miesiąca (np. Archiwum/2012/06)';
+$labels['archivetypefolder'] = 'Oryginalny folder';
+$labels['archivetypesender'] = 'E-mail nadawcy';
+$labels['unkownsender'] = 'nieznany';
 
+?>
diff --git a/plugins/archive/localization/pt_BR.inc b/plugins/archive/localization/pt_BR.inc
index 1991290eb..05508e2e3 100644
--- a/plugins/archive/localization/pt_BR.inc
+++ b/plugins/archive/localization/pt_BR.inc
@@ -2,20 +2,33 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/pt_BR/labels.inc                                         |
+ | plugins/archive/localization/<lang>.inc                                |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Archive plugin             |
+ | Copyright (C) 2013, The Roundcube Dev Team                            |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
 
 $labels = array();
 $labels['buttontext'] = 'Arquivo';
-$labels['archivefolder'] = '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['archiveerror'] = 'Some messages could not be archived';
+$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';
 
+?>
diff --git a/plugins/archive/localization/pt_PT.inc b/plugins/archive/localization/pt_PT.inc
index 712e05b5f..b932022b5 100644
--- a/plugins/archive/localization/pt_PT.inc
+++ b/plugins/archive/localization/pt_PT.inc
@@ -2,20 +2,33 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/pt_PT/labels.inc                                         |
+ | plugins/archive/localization/<lang>.inc                                |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Archive plugin             |
+ | Copyright (C) 2013, The Roundcube Dev Team                            |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: David                                                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
 
 $labels = array();
 $labels['buttontext'] = 'Arquivo';
-$labels['archivefolder'] = 'Arquivo';
 $labels['buttontitle'] = 'Arquivar esta mensagem';
 $labels['archived'] = 'Arquivada com sucesso';
+$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'] = 'Arquivo';
+$labels['archivetype'] = 'Dividir arquivo por';
+$labels['archivetypeyear'] = 'Ano (ex. Arquivo/2012)';
+$labels['archivetypemonth'] = 'Mês (ex. Arquivo/2012/06)';
+$labels['archivetypefolder'] = 'Pasta original';
+$labels['archivetypesender'] = 'E-mail do remetente';
+$labels['unkownsender'] = 'desconhecido';
 
+?>
diff --git a/plugins/archive/localization/ro_RO.inc b/plugins/archive/localization/ro_RO.inc
index 1d3c6e4c8..e88e918fa 100644
--- a/plugins/archive/localization/ro_RO.inc
+++ b/plugins/archive/localization/ro_RO.inc
@@ -2,20 +2,33 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ro_RO/labels.inc                                         |
+ | plugins/archive/localization/<lang>.inc                                |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Archive plugin             |
+ | Copyright (C) 2013, The Roundcube Dev Team                            |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: tudor <tudor@starnet-alba.ro>                                 |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
 
 $labels = array();
 $labels['buttontext'] = 'Arhivă';
-$labels['archivefolder'] = 'Arhivă';
 $labels['buttontitle'] = 'Arhivează acest mesaj.';
 $labels['archived'] = 'Arhivare reuşită.';
+$labels['archivedreload'] = 'Arhivat cu succes. Reîncărcați pagina pentru a vedea noul dosar de arhivare.';
+$labels['archiveerror'] = 'Câteva mesaje nu au putut fi arhivate';
+$labels['archivefolder'] = 'Arhivă';
+$labels['settingstitle'] = 'Arhivă';
+$labels['archivetype'] = 'Divide arhiva pe';
+$labels['archivetypeyear'] = 'Ani (ex. Arhiva/2013)';
+$labels['archivetypemonth'] = 'Luni (ex. Arhiva/2013/06)';
+$labels['archivetypefolder'] = 'Dosar original';
+$labels['archivetypesender'] = 'E-mail expeditor';
+$labels['unkownsender'] = 'necunoscut';
 
+?>
diff --git a/plugins/archive/localization/ru_RU.inc b/plugins/archive/localization/ru_RU.inc
index 6fd1dab28..9a18981d3 100644
--- a/plugins/archive/localization/ru_RU.inc
+++ b/plugins/archive/localization/ru_RU.inc
@@ -2,20 +2,33 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ru_RU/labels.inc                                         |
+ | plugins/archive/localization/<lang>.inc                                |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Archive plugin             |
+ | Copyright (C) 2013, The Roundcube Dev Team                            |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
 
 $labels = array();
 $labels['buttontext'] = 'Архив';
-$labels['archivefolder'] = 'Архив';
 $labels['buttontitle'] = 'Переместить выбранное в архив';
 $labels['archived'] = 'Перенесено в Архив';
+$labels['archivedreload'] = 'Успешно заархивировано. Обновите страницу, чтобы увидеть новые папки архива.';
+$labels['archiveerror'] = 'Некоторые сообщения не могут быть заархивированы';
+$labels['archivefolder'] = 'Архив';
+$labels['settingstitle'] = 'Архив';
+$labels['archivetype'] = 'Разделить архив по';
+$labels['archivetypeyear'] = 'Год (например, Архив/2012)';
+$labels['archivetypemonth'] = 'Месяц (например, Архив/2012/06)';
+$labels['archivetypefolder'] = 'Исходная папка';
+$labels['archivetypesender'] = 'Адрес отправителя';
+$labels['unkownsender'] = 'неизвестно';
 
+?>
diff --git a/plugins/archive/localization/si_LK.inc b/plugins/archive/localization/si_LK.inc
index 46acc199e..91e47aee0 100644
--- a/plugins/archive/localization/si_LK.inc
+++ b/plugins/archive/localization/si_LK.inc
@@ -2,20 +2,33 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/si_LK/labels.inc                                         |
+ | plugins/archive/localization/<lang>.inc                                |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Archive plugin             |
+ | Copyright (C) 2013, The Roundcube Dev Team                            |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Mohamed Rizmi                                                 |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
 
 $labels = array();
 $labels['buttontext'] = 'සංරක්‍ෂණය';
-$labels['archivefolder'] = 'සංරක්‍ෂණය';
 $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['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';
 
+?>
diff --git a/plugins/archive/localization/sk_SK.inc b/plugins/archive/localization/sk_SK.inc
index d5310795c..ce7f63e1c 100644
--- a/plugins/archive/localization/sk_SK.inc
+++ b/plugins/archive/localization/sk_SK.inc
@@ -2,20 +2,33 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/sk_SK/labels.inc                                         |
+ | plugins/archive/localization/<lang>.inc                                |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Archive plugin             |
+ | Copyright (C) 2013, The Roundcube Dev Team                            |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: panda                                                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
 
 $labels = array();
 $labels['buttontext'] = 'Archivovať';
-$labels['archivefolder'] = 'Archivovať';
 $labels['buttontitle'] = 'Archivovať túto správu';
 $labels['archived'] = 'Úspešne archivované';
+$labels['archivedreload'] = 'Successfully archived. Reload the page to see the new archive folders.';
+$labels['archiveerror'] = 'Some messages could not be archived';
+$labels['archivefolder'] = 'Archivovať';
+$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';
 
+?>
diff --git a/plugins/archive/localization/sl_SI.inc b/plugins/archive/localization/sl_SI.inc
index 9a50bb59a..b49fe93ab 100644
--- a/plugins/archive/localization/sl_SI.inc
+++ b/plugins/archive/localization/sl_SI.inc
@@ -2,20 +2,33 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/sl_SI/labels.inc                                         |
+ | plugins/archive/localization/<lang>.inc                                |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Archive plugin             |
+ | Copyright (C) 2013, The Roundcube Dev Team                            |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Barbara Krasovec <barbarak@arnes.si>                          |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
 
 $labels = array();
 $labels['buttontext'] = 'Arhiv';
-$labels['archivefolder'] = 'Arhiv';
 $labels['buttontitle'] = 'Arhiviraj to sporočilo';
 $labels['archived'] = 'Sporočilo je bilo uspešno arhivirano';
+$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'] = '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/sr_CS.inc b/plugins/archive/localization/sr_CS.inc
index 81128c4ca..686038d4c 100644
--- a/plugins/archive/localization/sr_CS.inc
+++ b/plugins/archive/localization/sr_CS.inc
@@ -2,20 +2,33 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/sr_CS/labels.inc                                         |
+ | plugins/archive/localization/<lang>.inc                                |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Archive plugin             |
+ | Copyright (C) 2013, The Roundcube Dev Team                            |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Saša Zejnilović <zejnils@gmail.com>                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
 
 $labels = array();
 $labels['buttontext'] = 'Arhiva';
-$labels['archivefolder'] = 'Arhiva';
 $labels['buttontitle'] = 'Arhivirati ovu poruku';
 $labels['archived'] = 'Uspěšno arhivirano';
+$labels['archivedreload'] = 'Successfully archived. Reload the page to see the new archive folders.';
+$labels['archiveerror'] = 'Some messages could not be archived';
+$labels['archivefolder'] = 'Arhiva';
+$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';
 
+?>
diff --git a/plugins/archive/localization/sv_SE.inc b/plugins/archive/localization/sv_SE.inc
index 13d0cf007..49ab09300 100644
--- a/plugins/archive/localization/sv_SE.inc
+++ b/plugins/archive/localization/sv_SE.inc
@@ -2,20 +2,33 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/sv_SE/labels.inc                                         |
+ | plugins/archive/localization/<lang>.inc                                |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Archive plugin             |
+ | Copyright (C) 2013, The Roundcube Dev Team                            |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Jonas Nasholm                                                 |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
 
 $labels = array();
-$labels['buttontext'] = 'Arkiv';
-$labels['archivefolder'] = 'Arkiv';
+$labels['buttontext'] = 'Arkivera';
 $labels['buttontitle'] = 'Arkivera meddelande';
 $labels['archived'] = 'Meddelandet är arkiverat';
+$labels['archivedreload'] = 'Meddelandet är arkiverat. Ladda om sidan för att se de nya arkivkatalogerna.';
+$labels['archiveerror'] = 'Några meddelanden kunde inte arkiveras';
+$labels['archivefolder'] = 'Arkiv';
+$labels['settingstitle'] = 'Arkiv';
+$labels['archivetype'] = 'Uppdelning av arkiv';
+$labels['archivetypeyear'] = 'År (ex. Arkiv/2012)';
+$labels['archivetypemonth'] = 'Månad (ex. Arkiv/2012/06)';
+$labels['archivetypefolder'] = 'Ursprunglig katalog';
+$labels['archivetypesender'] = 'Avsändaradress';
+$labels['unkownsender'] = 'Okänd';
 
+?>
diff --git a/plugins/archive/localization/tr_TR.inc b/plugins/archive/localization/tr_TR.inc
index 6b63dc87c..b6960ea89 100644
--- a/plugins/archive/localization/tr_TR.inc
+++ b/plugins/archive/localization/tr_TR.inc
@@ -2,20 +2,33 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/tr_TR/labels.inc                                         |
+ | plugins/archive/localization/<lang>.inc                                |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Archive plugin             |
+ | Copyright (C) 2013, The Roundcube Dev Team                            |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: ismail yenigul                                                |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
 
 $labels = array();
 $labels['buttontext'] = 'Arşiv';
-$labels['archivefolder'] = 'Arşiv';
 $labels['buttontitle'] = 'Bu postayı arşivle';
 $labels['archived'] = 'Başarıyla arşivlendi';
+$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'] = '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/uk_UA.inc b/plugins/archive/localization/uk_UA.inc
index 18d5f9344..777be6167 100644
--- a/plugins/archive/localization/uk_UA.inc
+++ b/plugins/archive/localization/uk_UA.inc
@@ -2,20 +2,33 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/uk_UA/labels.inc                                         |
+ | plugins/archive/localization/<lang>.inc                                |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Archive plugin             |
+ | Copyright (C) 2013, The Roundcube Dev Team                            |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Anton Gladky                                                  |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
 
 $labels = array();
 $labels['buttontext'] = 'Архів';
-$labels['archivefolder'] = 'Архів';
 $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['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';
 
+?>
diff --git a/plugins/archive/localization/vi_VN.inc b/plugins/archive/localization/vi_VN.inc
index 07775c9b0..fa2be9895 100644
--- a/plugins/archive/localization/vi_VN.inc
+++ b/plugins/archive/localization/vi_VN.inc
@@ -2,20 +2,33 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/vi_VN/labels.inc                                         |
+ | plugins/archive/localization/<lang>.inc                                |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Archive plugin             |
+ | Copyright (C) 2013, The Roundcube Dev Team                            |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Kenny Tran <kennethanh@gmail.com>                             |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
 
 $labels = array();
 $labels['buttontext'] = 'Lưu trữ';
-$labels['archivefolder'] = 'Lưu trữ';
 $labels['buttontitle'] = 'Lưu lại bức thư này';
 $labels['archived'] = 'Lưu lại thành công';
+$labels['archivedreload'] = 'Successfully archived. Reload the page to see the new archive folders.';
+$labels['archiveerror'] = 'Some messages could not be archived';
+$labels['archivefolder'] = 'Lưu trữ';
+$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';
 
+?>
diff --git a/plugins/archive/localization/zh_CN.inc b/plugins/archive/localization/zh_CN.inc
index a9eca45ae..17af54cde 100644
--- a/plugins/archive/localization/zh_CN.inc
+++ b/plugins/archive/localization/zh_CN.inc
@@ -2,20 +2,33 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/zh_CN/labels.inc                                         |
+ | plugins/archive/localization/<lang>.inc                                |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Archive plugin             |
+ | Copyright (C) 2013, The Roundcube Dev Team                            |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: waring_id                                                     |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
 
 $labels = array();
 $labels['buttontext'] = '存档';
-$labels['archivefolder'] = '存档';
 $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['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';
 
+?>
diff --git a/plugins/archive/localization/zh_TW.inc b/plugins/archive/localization/zh_TW.inc
index 0f6e9b943..6eac3a391 100644
--- a/plugins/archive/localization/zh_TW.inc
+++ b/plugins/archive/localization/zh_TW.inc
@@ -2,20 +2,33 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/zh_TW/labels.inc                                         |
+ | plugins/archive/localization/<lang>.inc                                |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Archive plugin             |
+ | Copyright (C) 2013, The Roundcube Dev Team                            |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-archive/
 */
 
 $labels = array();
 $labels['buttontext'] = '封存';
-$labels['archivefolder'] = '封存';
 $labels['buttontitle'] = '封存此信件';
 $labels['archived'] = '已成功封存';
+$labels['archivedreload'] = '封存動作完成.重新載入頁面瀏覽新的封存資料夾';
+$labels['archiveerror'] = '部分資訊無法完成封存';
+$labels['archivefolder'] = '封存';
+$labels['settingstitle'] = '封存';
+$labels['archivetype'] = '封存檔案切割方式';
+$labels['archivetypeyear'] = '年分(例如: 封存/2012)';
+$labels['archivetypemonth'] = '月份(例如: 封存/2012/06)';
+$labels['archivetypefolder'] = '原始資料夾';
+$labels['archivetypesender'] = '寄件者電子信箱';
+$labels['unkownsender'] = '未知';
 
+?>
diff --git a/plugins/attachment_reminder/attachment_reminder.js b/plugins/attachment_reminder/attachment_reminder.js
new file mode 100755
index 000000000..50d661b3b
--- /dev/null
+++ b/plugins/attachment_reminder/attachment_reminder.js
@@ -0,0 +1,68 @@
+/* Attachment Reminder plugin script */
+
+function rcmail_get_compose_message()
+{
+  var msg;
+
+  if (window.tinyMCE && (ed = tinyMCE.get(rcmail.env.composebody))) {
+    msg = ed.getContent();
+    msg = msg.replace(/<blockquote[^>]*>(.|[\r\n])*<\/blockquote>/gmi, '');
+  }
+  else {
+    msg = $('#' + rcmail.env.composebody).val();
+    msg = msg.replace(/^>.*$/gmi, '');
+  }
+
+  return msg;
+};
+
+function rcmail_check_message(msg)
+{
+  var i, rx, keywords = rcmail.gettext('keywords', 'attachment_reminder').split(",").concat([".doc", ".pdf"]);
+
+  $.each(keywords, function(n) { return RegExp.escape(n); });
+  rx = new RegExp('(' + keywords.join('|') + ')', 'i');
+
+  return msg.search(rx) != -1;
+};
+
+function rcmail_have_attachments()
+{
+  return rcmail.env.attachments && $('li', rcmail.gui_objects.attachmentlist).length;
+};
+
+function rcmail_attachment_reminder_dialog()
+{
+  var buttons = {};
+
+  buttons[rcmail.gettext('addattachment')] = function() {
+    $(this).remove();
+    if (window.UI && UI.show_uploadform) // Larry skin
+      UI.show_uploadform();
+    else if (window.rcmail_ui && rcmail_ui.show_popup) // classic skin
+      rcmail_ui.show_popup('uploadmenu', true);
+  };
+  buttons[rcmail.gettext('send')] = function(e) {
+    $(this).remove();
+    rcmail.env.attachment_reminder = true;
+    rcmail.command('send', '', e);
+  };
+
+  rcmail.env.attachment_reminder = false;
+  rcmail.show_popup_dialog(rcmail.gettext('attachment_reminder.forgotattachment'), '', buttons);
+};
+
+
+if (window.rcmail) {
+  rcmail.addEventListener('beforesend', function(evt) {
+    var msg = rcmail_get_compose_message(),
+      subject = $('#compose-subject').val();
+
+    if (!rcmail.env.attachment_reminder && !rcmail_have_attachments()
+      && (rcmail_check_message(msg) || rcmail_check_message(subject))
+    ) {
+      rcmail_attachment_reminder_dialog();
+      return false;
+    }
+  });
+}
diff --git a/plugins/attachment_reminder/attachment_reminder.php b/plugins/attachment_reminder/attachment_reminder.php
new file mode 100755
index 000000000..a215ff57c
--- /dev/null
+++ b/plugins/attachment_reminder/attachment_reminder.php
@@ -0,0 +1,82 @@
+<?php
+/**
+ * Attachement Reminder
+ *
+ * A plugin that reminds a user to attach the files
+ *
+ * @version @package_version@
+ * @author Thomas Yu - Sian, Liu
+ * @author Aleksander Machniak <machniak@kolabsys.com>
+ *
+ * Copyright (C) 2013 Thomas Yu - Sian, Liu
+ * Copyright (C) 2013, Kolab Systems AG
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ */
+
+class attachment_reminder extends rcube_plugin
+{
+    public $task = 'mail|settings';
+    public $noajax = true;
+
+
+    function init()
+    {
+        $rcmail = rcube::get_instance();
+
+        if ($rcmail->task == 'mail' && $rcmail->action == 'compose') {
+            $this->include_script('attachment_reminder.js');
+            $this->add_texts('localization/', array('keywords', 'forgotattachment'));
+            $rcmail->output->add_label('addattachment', 'send');
+        }
+
+        if ($rcmail->task == 'settings') {
+            $dont_override = $rcmail->config->get('dont_override', array());
+
+            if (!in_array('attachment_reminder', $dont_override)) {
+                $this->add_hook('preferences_list', array($this, 'prefs_list'));
+                $this->add_hook('preferences_save', array($this, 'prefs_save'));
+            }
+        }
+    }
+
+    function prefs_list($args)
+    {
+        if ($args['section'] == 'compose') {
+            $this->add_texts('localization/');
+            $reminder = rcube::get_instance()->config->get('attachment_reminder');
+            $field_id = 'rcmfd_attachment_reminder';
+            $checkbox = new html_checkbox(array('name' => '_attachment_reminder', 'id' => $field_id, 'value' => 1));
+
+            $args['blocks']['main']['options']['attachment_reminder'] = array(
+                'title' => html::label($field_id, rcube::Q($this->gettext('reminderoption'))),
+                'content' => $checkbox->show($reminder ? 1 : 0),
+            );
+        }
+
+        return $args;
+    }
+
+    function prefs_save($args)
+    {
+        if ($args['section'] == 'compose') {
+            $dont_override = rcube::get_instance()->config->get('dont_override', array());
+            if (!in_array('attachment_reminder', $dont_override)) {
+                $args['prefs']['attachment_reminder'] = !empty($_POST['_attachment_reminder']);
+            }
+        }
+        return $args;
+    }
+
+}
diff --git a/plugins/attachment_reminder/localization/de_CH.inc b/plugins/attachment_reminder/localization/de_CH.inc
new file mode 100644
index 000000000..ad9f8d4f4
--- /dev/null
+++ b/plugins/attachment_reminder/localization/de_CH.inc
@@ -0,0 +1,22 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/attachment_reminder/localization/<lang>.inc                   |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail Archive plugin             |
+ | Copyright (C) 2013, The Roundcube Dev Team                            |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-attachment_reminder/
+*/
+
+$messages = array();
+$messages['forgotattachment'] = "Haben Sie möglicherweise vergessen eine Datei anzuhängen?";
+$messages['reminderoption'] = "Vor vergessenen Anhängen warnen";
+$messages['keywords'] = "anbei,anhang,angehängt,angefügt,beigefügt,beliegend";
diff --git a/plugins/attachment_reminder/localization/de_DE.inc b/plugins/attachment_reminder/localization/de_DE.inc
new file mode 100644
index 000000000..7de41d1fc
--- /dev/null
+++ b/plugins/attachment_reminder/localization/de_DE.inc
@@ -0,0 +1,6 @@
+<?php
+
+$messages = array();
+$messages['forgotattachment'] = "Haben Sie möglicherweise vergessen eine Datei anzuhängen?";
+$messages['reminderoption'] = "Remind about forgotten attachments";
+$messages['keywords'] = "anbei,im anhang,angehängt,angefügt,beigefügt,beliegend";
diff --git a/plugins/attachment_reminder/localization/en_US.inc b/plugins/attachment_reminder/localization/en_US.inc
new file mode 100644
index 000000000..488b0df37
--- /dev/null
+++ b/plugins/attachment_reminder/localization/en_US.inc
@@ -0,0 +1,22 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/attachment_reminder/localization/<lang>.inc                   |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail Archive plugin             |
+ | Copyright (C) 2013, The Roundcube Dev Team                            |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-attachment_reminder/
+*/
+
+$messages = array();
+$messages['forgotattachment'] = "Did you forget to attach a file?";
+$messages['reminderoption'] = "Remind about forgotten attachments";
+$messages['keywords'] = "attachment,file,attach,attached,attaching,enclosed,CV,cover letter";
diff --git a/plugins/attachment_reminder/localization/es_ES.inc b/plugins/attachment_reminder/localization/es_ES.inc
new file mode 100644
index 000000000..79225d77e
--- /dev/null
+++ b/plugins/attachment_reminder/localization/es_ES.inc
@@ -0,0 +1,6 @@
+<?php
+
+$messages = array();
+$messages['forgotattachment'] = "¿Olvidó adjuntar un fichero al mensaje?";
+$messages['reminderoption'] = "Remind about forgotten attachments";
+$messages['keywords'] = "adjunto";
diff --git a/plugins/attachment_reminder/localization/fr_FR.inc b/plugins/attachment_reminder/localization/fr_FR.inc
new file mode 100644
index 000000000..78522c2e1
--- /dev/null
+++ b/plugins/attachment_reminder/localization/fr_FR.inc
@@ -0,0 +1,6 @@
+<?php
+
+$messages = array();
+$messages['forgotattachment'] = "Avez vous oublié d'attacher un fichier ?";
+$messages['reminderoption'] = "Remind about forgotten attachments";
+$messages['keywords'] = "joins,joint,attaché,CV";
diff --git a/plugins/attachment_reminder/localization/it_IT.inc b/plugins/attachment_reminder/localization/it_IT.inc
new file mode 100644
index 000000000..d326a6065
--- /dev/null
+++ b/plugins/attachment_reminder/localization/it_IT.inc
@@ -0,0 +1,6 @@
+<?php
+
+$messages = array();
+$messages['forgotattachment'] = "Sembra che tu abbia dimenticato di allegare un file!\nPremere Annulla per inviare lo stesso.\nOK per tornare al messaggio senza inviare.";
+$messages['reminderoption'] = "Remind about forgotten attachments";
+$messages['keywords'] = "allegato,allegati,allegata,allegate,allega,allego,alleghi,attaccato,file,attachment,attach";
diff --git a/plugins/attachment_reminder/localization/nl_NL.inc b/plugins/attachment_reminder/localization/nl_NL.inc
new file mode 100644
index 000000000..d80bfe9a9
--- /dev/null
+++ b/plugins/attachment_reminder/localization/nl_NL.inc
@@ -0,0 +1,6 @@
+<?php
+
+$messages = array();
+$messages['forgotattachment'] = "Ben je vergeten het bestand bij te voegen?";
+$messages['reminderoption'] = "Remind about forgotten attachments";
+$messages['keywords'] = "attachment,bestand,bijgaand,bijgaande,brief,bijgevoegd,bijgesloten,CV";
diff --git a/plugins/attachment_reminder/localization/pl_PL.inc b/plugins/attachment_reminder/localization/pl_PL.inc
new file mode 100644
index 000000000..96f4f4989
--- /dev/null
+++ b/plugins/attachment_reminder/localization/pl_PL.inc
@@ -0,0 +1,6 @@
+<?php
+
+$messages = array();
+$messages['forgotattachment'] = "Czy nie zapomniałeś załączyć pliku?";
+$messages['reminderoption'] = "Włącz przypominanie o brakującym załączniku";
+$messages['keywords'] = "załącznik,plik,załącz,CV";
diff --git a/plugins/attachment_reminder/localization/zh_CN.inc b/plugins/attachment_reminder/localization/zh_CN.inc
new file mode 100644
index 000000000..367191ffb
--- /dev/null
+++ b/plugins/attachment_reminder/localization/zh_CN.inc
@@ -0,0 +1,6 @@
+<?php
+
+$messages = array();
+$messages['forgotattachment'] = "您似乎忘記加入附件了，你確定要寄出？";
+$messages['reminderoption'] = "Remind about forgotten attachments";
+$messages['keywords'] = "附件,附加,附檔,附上,附加檔案";
diff --git a/plugins/attachment_reminder/localization/zh_TW.inc b/plugins/attachment_reminder/localization/zh_TW.inc
new file mode 100644
index 000000000..367191ffb
--- /dev/null
+++ b/plugins/attachment_reminder/localization/zh_TW.inc
@@ -0,0 +1,6 @@
+<?php
+
+$messages = array();
+$messages['forgotattachment'] = "您似乎忘記加入附件了，你確定要寄出？";
+$messages['reminderoption'] = "Remind about forgotten attachments";
+$messages['keywords'] = "附件,附加,附檔,附上,附加檔案";
diff --git a/plugins/attachment_reminder/package.xml b/plugins/attachment_reminder/package.xml
new file mode 100644
index 000000000..78768d534
--- /dev/null
+++ b/plugins/attachment_reminder/package.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<package xmlns="http://pear.php.net/dtd/package-2.0" xmlns:tasks="http://pear.php.net/dtd/tasks-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" packagerversion="1.9.0" version="2.0" xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0
+    http://pear.php.net/dtd/tasks-1.0.xsd
+    http://pear.php.net/dtd/package-2.0
+    http://pear.php.net/dtd/package-2.0.xsd">
+	<name>Attachment Reminder</name>
+	<summary>Roundcube plugin that prompts you if it looks like you wanted to attach a file but you didn't.</summary>
+	<description>
+		This Roundcube plugin reminds the user to attach a file if the composed message text indicates that there should be any.
+	</description>
+	<lead>
+		<name>Aleksander Machniak</name>
+		<user>alec</user>
+		<email>alec@alec.pl</email>
+		<active>yes</active>
+	</lead>
+	<lead>
+		<name>Thomas Yu - Sian, Liu</name>
+		<active>yes</active>
+	</lead>
+    <date>2013-05-20</date>
+	<version>
+		<release>1.1</release>
+		<api>1.0</api>
+	</version>
+	<stability>
+		<release>stable</release>
+		<api>stable</api>
+	</stability>
+	<license uri="http://www.gnu.org/licenses/gpl.html">GNU GPLv3+</license>
+	<notes>-</notes>
+	<contents>
+		<dir baseinstalldir="/" name="/">
+			<file name="attachment_reminder.php" role="php">
+				<tasks:replace from="@name@" to="name" type="package-info"/>
+				<tasks:replace from="@package_version@" to="version" type="package-info"/>
+			</file>
+			<file name="attachment_reminder.js" role="data">
+				<tasks:replace from="@name@" to="name" type="package-info"/>
+				<tasks:replace from="@package_version@" to="version" type="package-info"/>
+			</file>
+
+			<file name="localization/de_CH.inc" role="data"></file>
+			<file name="localization/de_DE.inc" role="data"></file>
+			<file name="localization/en_US.inc" role="data"></file>
+			<file name="localization/es_ES.inc" role="data"></file>
+			<file name="localization/fr_FR.inc" role="data"></file>
+			<file name="localization/it_IT.inc" role="data"></file>
+			<file name="localization/nl_NL.inc" role="data"></file>
+			<file name="localization/pl_PL.inc" role="data"></file>
+			<file name="localization/zh_CN.inc" role="data"></file>
+			<file name="localization/zh_TW.inc" role="data"></file>
+		</dir>
+		<!-- / -->
+	</contents>
+	<dependencies>
+		<required>
+			<php>
+				<min>5.2.1</min>
+			</php>
+			<pearinstaller>
+				<min>1.7.0</min>
+			</pearinstaller>
+		</required>
+	</dependencies>
+	<phprelease/>
+</package>
diff --git a/plugins/autologon/autologon.php b/plugins/autologon/autologon.php
index 63ffb943e..9c7d5b6fc 100644
--- a/plugins/autologon/autologon.php
+++ b/plugins/autologon/autologon.php
@@ -19,8 +19,6 @@ class autologon extends rcube_plugin
 
   function startup($args)
   {
-    $rcmail = rcmail::get_instance();
-
     // change action to login
     if (empty($_SESSION['user_id']) && !empty($_GET['_autologin']) && $this->is_localhost())
       $args['action'] = 'login';
@@ -37,7 +35,7 @@ class autologon extends rcube_plugin
       $args['cookiecheck'] = false;
       $args['valid'] = true;
     }
-  
+
     return $args;
   }
 
diff --git a/plugins/database_attachments/config.inc.php.dist b/plugins/database_attachments/config.inc.php.dist
new file mode 100644
index 000000000..b23a9a1be
--- /dev/null
+++ b/plugins/database_attachments/config.inc.php.dist
@@ -0,0 +1,12 @@
+<?php
+
+// By default this plugin stores attachments in filesystem
+// and copies them into sql database.
+// You can change it to use 'memcache' or 'apc'.
+$rcmail_config['database_attachments_cache'] = 'db';
+
+// Attachment data expires after specied TTL time in seconds (max.2592000).
+// Default is 12 hours.
+$rcmail_config['database_attachments_cache_ttl'] = 12 * 60 * 60;
+
+?>
diff --git a/plugins/database_attachments/database_attachments.php b/plugins/database_attachments/database_attachments.php
index 2511dbbb2..47e2b5222 100644
--- a/plugins/database_attachments/database_attachments.php
+++ b/plugins/database_attachments/database_attachments.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Filesystem Attachments
+ * Database Attachments
  *
  * This plugin which provides database backed storage for temporary
  * attachment file handling.  The primary advantage of this plugin
@@ -16,18 +16,11 @@
 require_once('plugins/filesystem_attachments/filesystem_attachments.php');
 class database_attachments extends filesystem_attachments
 {
+    // Cache object
+    protected $cache;
 
     // A prefix for the cache key used in the session and in the key field of the cache table
-    private $cache_prefix = "db_attach";
-
-    /**
-     * Helper method to generate a unique key for the given attachment file
-     */
-    private function _key($args)
-    {
-        $uname = $args['path'] ? $args['path'] : $args['name'];
-        return  $this->cache_prefix . $args['group'] . md5(mktime() . $uname . $_SESSION['user_id']);
-    }
+    protected $prefix = "db_attach";
 
     /**
      * Save a newly uploaded attachment
@@ -35,23 +28,17 @@ class database_attachments extends filesystem_attachments
     function upload($args)
     {
         $args['status'] = false;
-        $rcmail = rcmail::get_instance();
-        $key = $this->_key($args);
 
-        $data = file_get_contents($args['path']);
+        $cache = $this->get_cache();
+        $key   = $this->_key($args);
+        $data  = file_get_contents($args['path']);
 
-        if ($data === false)
+        if ($data === false) {
             return $args;
+        }
 
-        $data = base64_encode($data);
-
-        $status = $rcmail->db->query(
-            "INSERT INTO ".$rcmail->db->table_name('cache')
-             ." (created, user_id, cache_key, data)"
-             ." VALUES (".$rcmail->db->now().", ?, ?, ?)",
-            $_SESSION['user_id'],
-            $key,
-            $data);
+        $data   = base64_encode($data);
+        $status = $cache->write($key, $data);
 
         if ($status) {
             $args['id'] = $key;
@@ -68,26 +55,20 @@ class database_attachments extends filesystem_attachments
     function save($args)
     {
         $args['status'] = false;
-        $rcmail = rcmail::get_instance();
 
-        $key = $this->_key($args);
+        $cache = $this->get_cache();
+        $key   = $this->_key($args);
 
         if ($args['path']) {
             $args['data'] = file_get_contents($args['path']);
 
-            if ($args['data'] === false)
+            if ($args['data'] === false) {
                 return $args;
+            }
         }
 
-        $data = base64_encode($args['data']);
-
-        $status = $rcmail->db->query(
-            "INSERT INTO ".$rcmail->db->table_name('cache')
-             ." (created, user_id, cache_key, data)"
-             ." VALUES (".$rcmail->db->now().", ?, ?, ?)",
-            $_SESSION['user_id'],
-            $key,
-            $data);
+        $data   = base64_encode($args['data']);
+        $status = $cache->write($key, $data);
 
         if ($status) {
             $args['id'] = $key;
@@ -104,13 +85,9 @@ class database_attachments extends filesystem_attachments
     function remove($args)
     {
         $args['status'] = false;
-        $rcmail = rcmail::get_instance();
-        $status = $rcmail->db->query(
-            "DELETE FROM ".$rcmail->db->table_name('cache')
-             ." WHERE user_id = ?"
-                ." AND cache_key = ?",
-            $_SESSION['user_id'],
-            $args['id']);
+
+        $cache  = $this->get_cache();
+        $status = $cache->remove($args['id']);
 
         if ($status) {
             $args['status'] = true;
@@ -135,18 +112,11 @@ class database_attachments extends filesystem_attachments
      */
     function get($args)
     {
-        $rcmail = rcmail::get_instance();
-
-        $sql_result = $rcmail->db->query(
-            "SELECT data"
-             ." FROM ".$rcmail->db->table_name('cache')
-             ." WHERE user_id=?"
-                ." AND cache_key=?",
-            $_SESSION['user_id'],
-            $args['id']);
-
-        if ($sql_arr = $rcmail->db->fetch_assoc($sql_result)) {
-            $args['data'] = base64_decode($sql_arr['data']);
+        $cache = $this->get_cache();
+        $data  = $cache->read($args['id']);
+
+        if ($data) {
+            $args['data'] = base64_decode($data);
             $args['status'] = true;
         }
 
@@ -158,12 +128,36 @@ class database_attachments extends filesystem_attachments
      */
     function cleanup($args)
     {
-        $prefix = $this->cache_prefix . $args['group'];
-        $rcmail = rcmail::get_instance();
-        $rcmail->db->query(
-            "DELETE FROM ".$rcmail->db->table_name('cache')
-            ." WHERE user_id = ?"
-                ." AND cache_key LIKE '{$prefix}%'",
-            $_SESSION['user_id']);
+        $cache = $this->get_cache();
+        $cache->remove($args['group'], true);
+    }
+
+    /**
+     * Helper method to generate a unique key for the given attachment file
+     */
+    protected function _key($args)
+    {
+        $uname = $args['path'] ? $args['path'] : $args['name'];
+        return $args['group'] . md5(mktime() . $uname . $_SESSION['user_id']);
+    }
+
+    /**
+     * Initialize and return cache object
+     */
+    protected function get_cache()
+    {
+        if (!$this->cache) {
+            $this->load_config();
+
+            $rcmail = rcube::get_instance();
+            $ttl    = 12 * 60 * 60; // default: 12 hours
+            $ttl    = $rcmail->config->get('database_attachments_cache_ttl', $ttl);
+            $type   = $rcmail->config->get('database_attachments_cache', 'db');
+
+            // Init SQL cache (disable cache data serialization)
+            $this->cache = $rcmail->get_cache($this->prefix, 'db', $ttl, false);
+        }
+
+        return $this->cache;
     }
 }
diff --git a/plugins/database_attachments/package.xml b/plugins/database_attachments/package.xml
index 40db858a4..44adc219e 100644
--- a/plugins/database_attachments/package.xml
+++ b/plugins/database_attachments/package.xml
@@ -5,7 +5,7 @@
     http://pear.php.net/dtd/package-2.0.xsd">
 	<name>database_attachments</name>
 	<channel>pear.roundcube.net</channel>
-	<summary>SQL database storage for uploaded attachments</summary>
+	<summary>Database storage for uploaded attachments</summary>
 	<description>
 	    This plugin which provides database backed storage for temporary
         attachment file handling. The primary advantage of this plugin
@@ -24,9 +24,9 @@
 		<email>ziba@umich.edu</email>
 		<active>yes</active>
 	</developer>
-	<date>2011-11-21</date>
+	<date>2013-06-13</date>
 	<version>
-		<release>1.0</release>
+		<release>1.1</release>
 		<api>1.0</api>
 	</version>
 	<stability>
diff --git a/plugins/debug_logger/runlog/runlog.php b/plugins/debug_logger/runlog/runlog.php
index c9f672615..0c766a13c 100644
--- a/plugins/debug_logger/runlog/runlog.php
+++ b/plugins/debug_logger/runlog/runlog.php
@@ -194,7 +194,7 @@ class runlog {
 
     public function print_totals(){
         $totals = array();
-        foreach ( $this->run_log as $k => $entry ) {
+        foreach ($this->run_log as $entry) {
             if ( $entry['type'] == 'start'  && $entry['ended'] == true) {
                 $totals[$entry['value']]['duration'] += $entry['duration'];
                 $totals[$entry['value']]['count'] += 1;
diff --git a/plugins/enigma/enigma.php b/plugins/enigma/enigma.php
index c96b94620..25520a27d 100644
--- a/plugins/enigma/enigma.php
+++ b/plugins/enigma/enigma.php
@@ -47,6 +47,8 @@ class enigma extends rcube_plugin
         $rcmail = rcmail::get_instance();
         $this->rc = $rcmail;
 
+        $section = rcube_utils::get_input_value('_section', rcube_utils::INPUT_GET);
+
         if ($this->rc->task == 'mail') {
             // message parse/display hooks
             $this->add_hook('message_part_structure', array($this, 'parse_structure'));
@@ -79,7 +81,6 @@ class enigma extends rcube_plugin
             $this->register_action('plugin.enigma', array($this, 'preferences_ui'));
 
             // grab keys/certs management iframe requests
-            $section = rcube_utils::get_input_value('_section', rcube_utils::INPUT_GET);
             if ($this->rc->action == 'edit-prefs' && preg_match('/^enigma(certs|keys)/', $section)) {
                 $this->load_ui();
                 $this->ui->init($section);
@@ -148,7 +149,7 @@ class enigma extends rcube_plugin
      */
     function parse_structure($p)
     {
-        $struct = $p['structure'];
+//        $struct = $p['structure'];
 
         if ($p['mimetype'] == 'text/plain' || $p['mimetype'] == 'application/pgp') {
             $this->parse_plain($p);
@@ -390,7 +391,7 @@ class enigma extends rcube_plugin
     function message_load($p)
     {
         $this->message = $p['object'];
-    
+
         // handle attachments vcard attachments
         foreach ((array)$this->message->attachments as $attachment) {
             if ($this->is_keys_part($attachment)) {
@@ -398,7 +399,7 @@ class enigma extends rcube_plugin
             }
         }
         // the same with message bodies
-        foreach ((array)$this->message->parts as $idx => $part) {
+        foreach ((array)$this->message->parts as $part) {
             if ($this->is_keys_part($part)) {
                 $this->keys_parts[] = $part->mime_id;
                 $this->keys_bodies[] = $part->mime_id;
diff --git a/plugins/enigma/lib/enigma_engine.php b/plugins/enigma/lib/enigma_engine.php
index 220d6c0b3..8a64c07ff 100644
--- a/plugins/enigma/lib/enigma_engine.php
+++ b/plugins/enigma/lib/enigma_engine.php
@@ -374,17 +374,15 @@ class enigma_engine
     {
         // @TODO: Handle big bodies using (temp) files
         // @TODO: caching of verification result
-        
-         $sig = $this->pgp_driver->verify($msg_body, $sig_body);
+        $sig = $this->pgp_driver->verify($msg_body, $sig_body);
 
-         if (($sig instanceof enigma_error) && $sig->getCode() != enigma_error::E_KEYNOTFOUND)
-             rcube::raise_error(array(
+        if (($sig instanceof enigma_error) && $sig->getCode() != enigma_error::E_KEYNOTFOUND)
+            rcube::raise_error(array(
                 'code' => 600, 'type' => 'php',
                 'file' => __FILE__, 'line' => __LINE__,
-                'message' => "Enigma plugin: " . $error->getMessage()
+                'message' => "Enigma plugin: " . $sig->getMessage()
                 ), true, false);
 
-//print_r($sig);
         return $sig;
     }
 
@@ -399,11 +397,9 @@ class enigma_engine
     {
         // @TODO: Handle big bodies using (temp) files
         // @TODO: caching of verification result
-        
+        $key = ''; $pass = ''; // @TODO
         $result = $this->pgp_driver->decrypt($msg_body, $key, $pass);
 
-//print_r($result);
-
         if ($result instanceof enigma_error) {
             $err_code = $result->getCode();
             if (!in_array($err_code, array(enigma_error::E_KEYNOTFOUND, enigma_error::E_BADPASS)))
@@ -430,7 +426,7 @@ class enigma_engine
     {
         $this->load_pgp_driver();
         $result = $this->pgp_driver->list_keys($pattern);
-    
+
         if ($result instanceof enigma_error) {
             rcube::raise_error(array(
                 'code' => 600, 'type' => 'php',
@@ -438,7 +434,7 @@ class enigma_engine
                 'message' => "Enigma plugin: " . $result->getMessage()
                 ), true, false);
         }
-        
+
         return $result;
     }
 
@@ -501,9 +497,11 @@ class enigma_engine
         $uid     = rcube_utils::get_input_value('_uid', rcube_utils::INPUT_POST);
         $mbox    = rcube_utils::get_input_value('_mbox', rcube_utils::INPUT_POST);
         $mime_id = rcube_utils::get_input_value('_part', rcube_utils::INPUT_POST);
+        $storage = $this->rc->get_storage();
 
         if ($uid && $mime_id) {
-            $part = $this->rc->storage->get_message_part($uid, $mime_id);
+            $storage->set_folder($mbox);
+            $part = $storage->get_message_part($uid, $mime_id);
         }
 
         if ($part && is_array($result = $this->import_key($part))) {
@@ -532,16 +530,4 @@ class enigma_engine
                 $uid, $part->mime_id, $part);
         }
     }
-
-    /**
-     * Adds CSS style file to the page header.
-     */
-    private function add_css()
-    {
-        $skin = $this->rc->config->get('skin');
-        if (!file_exists($this->home . "/skins/$skin/enigma.css"))
-            $skin = 'default';
-
-        $this->include_stylesheet("skins/$skin/enigma.css");                                                
-    }
 }
diff --git a/plugins/enigma/lib/enigma_ui.php b/plugins/enigma/lib/enigma_ui.php
index 47366b7e8..adb619d0c 100644
--- a/plugins/enigma/lib/enigma_ui.php
+++ b/plugins/enigma/lib/enigma_ui.php
@@ -176,8 +176,7 @@ class enigma_ui
         $search   = rcube_utils::get_input_value('_q', rcube_utils::INPUT_GPC);
 
         // define list of cols to be displayed
-        $a_show_cols = array('name');
-        $result = array();
+//        $a_show_cols = array('name');
 
         // Get the list
         $list = $this->enigma->engine->list_keys($search);
@@ -200,7 +199,7 @@ class enigma_ui
                 $size = count($list);
 
                 // Add rows
-                foreach($list as $idx => $key) {
+                foreach ($list as $key) {
                     $this->rc->output->command('enigma_add_list_row',
                         array('name' => rcube::Q($key->name), 'id' => $key->id));
                 }
diff --git a/plugins/filesystem_attachments/filesystem_attachments.php b/plugins/filesystem_attachments/filesystem_attachments.php
index fa147795f..d952e5a75 100644
--- a/plugins/filesystem_attachments/filesystem_attachments.php
+++ b/plugins/filesystem_attachments/filesystem_attachments.php
@@ -60,6 +60,7 @@ class filesystem_attachments extends rcube_plugin
             $args['id'] = $this->file_id();
             $args['path'] = $tmpfname;
             $args['status'] = true;
+            @chmod($tmpfname, 0600);  // set correct permissions (#1488996)
 
             // Note the file for later cleanup
             $_SESSION['plugins']['filesystem_attachments'][$group][] = $tmpfname;
diff --git a/plugins/help/help.php b/plugins/help/help.php
index 4b11dceb3..69da6828e 100644
--- a/plugins/help/help.php
+++ b/plugins/help/help.php
@@ -21,8 +21,6 @@ class help extends rcube_plugin
 
     function init()
     {
-        $rcmail = rcmail::get_instance();
-
         $this->add_texts('localization/', false);
 
         // register task
diff --git a/plugins/help/localization/ar_SA.inc b/plugins/help/localization/ar_SA.inc
index 574ea64c1..c92f79fba 100644
--- a/plugins/help/localization/ar_SA.inc
+++ b/plugins/help/localization/ar_SA.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ar_SA/labels.inc                                         |
+ | plugins/help/localization/<lang>.inc                                  |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Help plugin                |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Benfarhat Elyes <benfarhat.elyes@gmail.com>                   |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $labels['help'] = 'مساعدة';
 $labels['about'] = 'حوْل';
 $labels['license'] = 'الرخصة';
 
+?>
diff --git a/plugins/help/localization/az_AZ.inc b/plugins/help/localization/az_AZ.inc
index 80a46a75f..73fc3659e 100644
--- a/plugins/help/localization/az_AZ.inc
+++ b/plugins/help/localization/az_AZ.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/az_AZ/labels.inc                                         |
+ | plugins/help/localization/<lang>.inc                                  |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Help plugin                |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Orkhan Guliyev <proger@box.az>                                |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $labels['help'] = 'Kömək';
 $labels['about'] = 'Haqqında';
 $labels['license'] = 'Lisenziya';
 
+?>
diff --git a/plugins/help/localization/br.inc b/plugins/help/localization/br.inc
index 81826578e..3ea6c029c 100644
--- a/plugins/help/localization/br.inc
+++ b/plugins/help/localization/br.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/br/labels.inc                                         |
+ | plugins/help/localization/<lang>.inc                                  |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Help plugin                |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Denis                                                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $labels['help'] = 'Skoazell';
 $labels['about'] = 'Diwar-benn';
 $labels['license'] = 'Lañvaz';
 
+?>
diff --git a/plugins/help/localization/bs_BA.inc b/plugins/help/localization/bs_BA.inc
index 714d4e775..2b502d182 100644
--- a/plugins/help/localization/bs_BA.inc
+++ b/plugins/help/localization/bs_BA.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/bs_BA/labels.inc                                         |
+ | plugins/help/localization/<lang>.inc                                  |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Help plugin                |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Kenan Dervišević <kenan3008@gmail.com>                      |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $labels['help'] = 'Pomoć';
 $labels['about'] = 'O programu';
 $labels['license'] = 'Licenca';
 
+?>
diff --git a/plugins/help/localization/ca_ES.inc b/plugins/help/localization/ca_ES.inc
index bd45469cd..f2630d81f 100644
--- a/plugins/help/localization/ca_ES.inc
+++ b/plugins/help/localization/ca_ES.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ca_ES/labels.inc                                         |
+ | plugins/help/localization/<lang>.inc                                  |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Help plugin                |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Jordi Sanfeliu <jordi@fibranet.cat>                           |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $labels['help'] = 'Ajuda';
 $labels['about'] = 'Quant a';
 $labels['license'] = 'Llicència';
 
+?>
diff --git a/plugins/help/localization/cs_CZ.inc b/plugins/help/localization/cs_CZ.inc
index ae8b39a06..6147c0a7a 100644
--- a/plugins/help/localization/cs_CZ.inc
+++ b/plugins/help/localization/cs_CZ.inc
@@ -1,20 +1,19 @@
 <?php
 
 /*
+ +-----------------------------------------------------------------------+
+ | plugins/help/localization/<lang>.inc                                  |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail Help plugin                |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
 
-+-----------------------------------------------------------------------+
-| language/cs_CZ/labels.inc                                             |
-|                                                                       |
-| Language file of the Roundcube help plugin                            |
-| Copyright (C) 2005-2009, The Roundcube Dev Team                       |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Author: Milan Kozak <hodza@hodza.net>                                 |
-+-----------------------------------------------------------------------+
-
-@version $Id: labels.inc 2993 2009-09-26 18:32:07Z alec $
-
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
 
 $labels = array();
diff --git a/plugins/help/localization/cy_GB.inc b/plugins/help/localization/cy_GB.inc
index 78969b9d2..a2decbbf9 100644
--- a/plugins/help/localization/cy_GB.inc
+++ b/plugins/help/localization/cy_GB.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/cy_GB/labels.inc                                         |
+ | plugins/help/localization/<lang>.inc                                  |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Help plugin                |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Dafydd Tomos                                                  |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $labels['help'] = 'Cymorth';
 $labels['about'] = 'Amdan';
 $labels['license'] = 'Trwydded';
 
+?>
diff --git a/plugins/help/localization/da_DK.inc b/plugins/help/localization/da_DK.inc
index 753301220..bbb3f61b3 100644
--- a/plugins/help/localization/da_DK.inc
+++ b/plugins/help/localization/da_DK.inc
@@ -1,5 +1,21 @@
 <?php
 
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/help/localization/<lang>.inc                                  |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail Help plugin                |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
+*/
+
 $labels = array();
 $labels['help'] = 'Hjælp';
 $labels['about'] = 'Om';
diff --git a/plugins/help/localization/de_CH.inc b/plugins/help/localization/de_CH.inc
index c7c030b2c..964723993 100644
--- a/plugins/help/localization/de_CH.inc
+++ b/plugins/help/localization/de_CH.inc
@@ -2,10 +2,10 @@
 
 /*
  +-----------------------------------------------------------------------+
- | plugins/help/localization/<lang>.inc                                   |
+ | plugins/help/localization/<lang>.inc                                  |
  |                                                                       |
  | Localization file of the Roundcube Webmail Help plugin                |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
diff --git a/plugins/help/localization/de_DE.inc b/plugins/help/localization/de_DE.inc
index 55d75e21c..70c50646e 100644
--- a/plugins/help/localization/de_DE.inc
+++ b/plugins/help/localization/de_DE.inc
@@ -1,5 +1,21 @@
 <?php
-// translation done by Ulli Heist - http://heist.hobby-site.org/
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/help/localization/<lang>.inc                                  |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail Help plugin                |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
+*/
+
 $labels = array();
 $labels['help'] = 'Hilfe';
 $labels['about'] = '&Uuml;ber';
diff --git a/plugins/help/localization/en_GB.inc b/plugins/help/localization/en_GB.inc
index 206856af7..df8bff280 100644
--- a/plugins/help/localization/en_GB.inc
+++ b/plugins/help/localization/en_GB.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/en_GB/labels.inc                                         |
+ | plugins/help/localization/<lang>.inc                                  |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Help plugin                |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Anthony Harrington <untaintableangel@ubuntu.com>              |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $labels['help'] = 'Help';
 $labels['about'] = 'About';
 $labels['license'] = 'Licence';
 
+?>
diff --git a/plugins/help/localization/en_US.inc b/plugins/help/localization/en_US.inc
index cf6c0aaaf..b81f02fb9 100644
--- a/plugins/help/localization/en_US.inc
+++ b/plugins/help/localization/en_US.inc
@@ -2,10 +2,10 @@
 
 /*
  +-----------------------------------------------------------------------+
- | plugins/help/localization/<lang>.inc                                   |
+ | plugins/help/localization/<lang>.inc                                  |
  |                                                                       |
  | Localization file of the Roundcube Webmail Help plugin                |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
diff --git a/plugins/help/localization/eo.inc b/plugins/help/localization/eo.inc
index 0347b770f..c496c96cb 100644
--- a/plugins/help/localization/eo.inc
+++ b/plugins/help/localization/eo.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/eo/labels.inc                                         |
+ | plugins/help/localization/<lang>.inc                                  |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Help plugin                |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Michael Moroni <michael.moroni@mailoo.org>                    |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $labels['help'] = 'Helpo';
 $labels['about'] = 'Pri';
 $labels['license'] = 'Permesilo';
 
+?>
diff --git a/plugins/help/localization/es_ES.inc b/plugins/help/localization/es_ES.inc
index 1d921859a..446172f47 100644
--- a/plugins/help/localization/es_ES.inc
+++ b/plugins/help/localization/es_ES.inc
@@ -1,5 +1,21 @@
 <?php
 
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/help/localization/<lang>.inc                                  |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail Help plugin                |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
+*/
+
 $labels = array();
 $labels['help'] = 'Ayuda';
 $labels['about'] = 'Acerca de';
diff --git a/plugins/help/localization/et_EE.inc b/plugins/help/localization/et_EE.inc
index f95f09824..a55348ad9 100644
--- a/plugins/help/localization/et_EE.inc
+++ b/plugins/help/localization/et_EE.inc
@@ -1,5 +1,21 @@
 <?php
 
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/help/localization/<lang>.inc                                  |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail Help plugin                |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
+*/
+
 $labels = array();
 $labels['help'] = 'Abi';
 $labels['about'] = 'Roundcube info';
diff --git a/plugins/help/localization/fa_IR.inc b/plugins/help/localization/fa_IR.inc
index 5635d70bf..016d548ab 100644
--- a/plugins/help/localization/fa_IR.inc
+++ b/plugins/help/localization/fa_IR.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/fa_IR/labels.inc                                         |
+ | plugins/help/localization/<lang>.inc                                  |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Help plugin                |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Hamid <abbaszadeh.h@gmail.com>                                |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $labels['help'] = 'راهنما';
 $labels['about'] = 'درباره';
 $labels['license'] = 'گواهینامه';
 
+?>
diff --git a/plugins/help/localization/fi_FI.inc b/plugins/help/localization/fi_FI.inc
index 3ca3da356..1803a6c4d 100644
--- a/plugins/help/localization/fi_FI.inc
+++ b/plugins/help/localization/fi_FI.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/fi_FI/labels.inc                                         |
+ | plugins/help/localization/<lang>.inc                                  |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Help plugin                |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Jiri Grönroos                                                |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $labels['help'] = 'Ohje';
 $labels['about'] = 'Tietoja';
 $labels['license'] = 'Lisenssi';
 
+?>
diff --git a/plugins/help/localization/fr_FR.inc b/plugins/help/localization/fr_FR.inc
index 269723972..16a33696b 100644
--- a/plugins/help/localization/fr_FR.inc
+++ b/plugins/help/localization/fr_FR.inc
@@ -1,5 +1,21 @@
 <?php
 
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/help/localization/<lang>.inc                                  |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail Help plugin                |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
+*/
+
 $labels = array();
 $labels['help'] = 'Aide';
 $labels['about'] = 'A propos';
diff --git a/plugins/help/localization/gl_ES.inc b/plugins/help/localization/gl_ES.inc
index 2895dad30..432623751 100644
--- a/plugins/help/localization/gl_ES.inc
+++ b/plugins/help/localization/gl_ES.inc
@@ -1,5 +1,21 @@
 <?php
 
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/help/localization/<lang>.inc                                  |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail Help plugin                |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
+*/
+
 $labels = array();
 $labels['help'] = 'Axuda';
 $labels['about'] = 'Acerca de';
diff --git a/plugins/help/localization/he_IL.inc b/plugins/help/localization/he_IL.inc
index 105acbd16..3c56ca1fa 100644
--- a/plugins/help/localization/he_IL.inc
+++ b/plugins/help/localization/he_IL.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/he_IL/labels.inc                                         |
+ | plugins/help/localization/<lang>.inc                                  |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Help plugin                |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Moshe Leibovitch <moish@mln.co.il>                            |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $labels['help'] = 'עזרה';
 $labels['about'] = 'אודות';
 $labels['license'] = 'רשיון';
 
+?>
diff --git a/plugins/help/localization/hu_HU.inc b/plugins/help/localization/hu_HU.inc
index 6ff4f248e..8ea50b620 100644
--- a/plugins/help/localization/hu_HU.inc
+++ b/plugins/help/localization/hu_HU.inc
@@ -1,5 +1,21 @@
 <?php
 
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/help/localization/<lang>.inc                                  |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail Help plugin                |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
+*/
+
 $labels = array();
 $labels['help'] = 'Segítség';
 $labels['about'] = 'Névjegy';
diff --git a/plugins/help/localization/hy_AM.inc b/plugins/help/localization/hy_AM.inc
index 7e56fda1b..daf891602 100644
--- a/plugins/help/localization/hy_AM.inc
+++ b/plugins/help/localization/hy_AM.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/hy_AM/labels.inc                                         |
+ | plugins/help/localization/<lang>.inc                                  |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Help plugin                |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Vahan Yerkanian <vahan@yerkanian.com>                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $labels['help'] = 'Օգնություն';
 $labels['about'] = 'Նկարագիր';
 $labels['license'] = 'Արտոնագիր';
 
+?>
diff --git a/plugins/help/localization/id_ID.inc b/plugins/help/localization/id_ID.inc
index 9066c0982..d4bc3d9a0 100644
--- a/plugins/help/localization/id_ID.inc
+++ b/plugins/help/localization/id_ID.inc
@@ -2,19 +2,23 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/id_ID/labels.inc                                         |
+ | plugins/help/localization/<lang>.inc                                  |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Help plugin                |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Lazlo                                                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
 
 $labels = array();
-$labels['help'] = 'Panduan';
+$labels['help'] = 'Bantuan';
 $labels['about'] = 'Tentang';
 $labels['license'] = 'Lisensi';
 
+?>
diff --git a/plugins/help/localization/it_IT.inc b/plugins/help/localization/it_IT.inc
index b81904da5..18e1cc9e1 100644
--- a/plugins/help/localization/it_IT.inc
+++ b/plugins/help/localization/it_IT.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/it_IT/labels.inc                                         |
+ | plugins/help/localization/<lang>.inc                                  |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Help plugin                |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Andrea Bernini <andrea.bernini@gmail.com>                     |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $labels['help'] = 'Aiuto';
 $labels['about'] = 'Informazioni';
 $labels['license'] = 'Licenza';
 
+?>
diff --git a/plugins/help/localization/ja_JP.inc b/plugins/help/localization/ja_JP.inc
index a41a3b103..4b91c6d8d 100644
--- a/plugins/help/localization/ja_JP.inc
+++ b/plugins/help/localization/ja_JP.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ja_JP/labels.inc                                         |
+ | plugins/help/localization/<lang>.inc                                  |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Help plugin                |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Takahiro Kambe                                                |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $labels['help'] = 'ヘルプ';
 $labels['about'] = 'このプログラムについて';
 $labels['license'] = 'ライセンス';
 
+?>
diff --git a/plugins/help/localization/km_KH.inc b/plugins/help/localization/km_KH.inc
index 3a62f937d..4cc29cab0 100644
--- a/plugins/help/localization/km_KH.inc
+++ b/plugins/help/localization/km_KH.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/km_KH/labels.inc                                         |
+ | plugins/help/localization/<lang>.inc                                  |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Help plugin                |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: samdyk                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $labels['help'] = 'ជំនួយ';
 $labels['about'] = 'អំពី';
 $labels['license'] = 'អាជ្ញាប័ណ្ណ';
 
+?>
diff --git a/plugins/help/localization/ko_KR.inc b/plugins/help/localization/ko_KR.inc
index c57dfa0f5..836da6639 100644
--- a/plugins/help/localization/ko_KR.inc
+++ b/plugins/help/localization/ko_KR.inc
@@ -2,19 +2,23 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ko_KR/labels.inc                                         |
+ | plugins/help/localization/<lang>.inc                                  |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Help plugin                |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Kim, Woohyun <woohyun.kim@gmail.com>                          |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
 
 $labels = array();
 $labels['help'] = '도움말';
 $labels['about'] = '정보';
-$labels['license'] = '라이센스';
+$labels['license'] = '라이선스';
 
+?>
diff --git a/plugins/help/localization/lt_LT.inc b/plugins/help/localization/lt_LT.inc
index a7a2b827d..6f615bd5a 100644
--- a/plugins/help/localization/lt_LT.inc
+++ b/plugins/help/localization/lt_LT.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/lt_LT/labels.inc                                         |
+ | plugins/help/localization/<lang>.inc                                  |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Help plugin                |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Rimas Kudelis <rq@akl.lt>                                     |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $labels['help'] = 'Žinynas';
 $labels['about'] = 'Apie';
 $labels['license'] = 'Licencija';
 
+?>
diff --git a/plugins/help/localization/nb_NO.inc b/plugins/help/localization/nb_NO.inc
index 34881d61d..702489483 100644
--- a/plugins/help/localization/nb_NO.inc
+++ b/plugins/help/localization/nb_NO.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/nb_NB/labels.inc                                         |
+ | plugins/help/localization/<lang>.inc                                  |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Help plugin                |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Tobias V. Langhoff <spug@thespug.net>                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $labels['help'] = 'Hjelp';
 $labels['about'] = 'Om';
 $labels['license'] = 'Lisensvilkår';
 
+?>
diff --git a/plugins/help/localization/nl_NL.inc b/plugins/help/localization/nl_NL.inc
index 6fdf8d4cb..e0e7bcc56 100644
--- a/plugins/help/localization/nl_NL.inc
+++ b/plugins/help/localization/nl_NL.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/nl_NL/labels.inc                                         |
+ | plugins/help/localization/<lang>.inc                                  |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Help plugin                |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Geert Wirken                                                  |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $labels['help'] = 'Help';
 $labels['about'] = 'Over';
 $labels['license'] = 'Licentie';
 
+?>
diff --git a/plugins/help/localization/nn_NO.inc b/plugins/help/localization/nn_NO.inc
index 223df0de3..17a694d80 100644
--- a/plugins/help/localization/nn_NO.inc
+++ b/plugins/help/localization/nn_NO.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/nn_NN/labels.inc                                         |
+ | plugins/help/localization/<lang>.inc                                  |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Help plugin                |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Åsmund Skjæveland <aasmunds@ulrik.uio.no>                   |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $labels['help'] = 'Hjelp';
 $labels['about'] = 'Om';
 $labels['license'] = 'Lisens';
 
+?>
diff --git a/plugins/help/localization/pl_PL.inc b/plugins/help/localization/pl_PL.inc
index 087bc0726..4884ac602 100644
--- a/plugins/help/localization/pl_PL.inc
+++ b/plugins/help/localization/pl_PL.inc
@@ -1,5 +1,21 @@
 <?php
 
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/help/localization/<lang>.inc                                  |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail Help plugin                |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
+*/
+
 $labels = array();
 $labels['help'] = 'Pomoc';
 $labels['about'] = 'O programie';
diff --git a/plugins/help/localization/pt_BR.inc b/plugins/help/localization/pt_BR.inc
index f557ad267..79746bdc2 100644
--- a/plugins/help/localization/pt_BR.inc
+++ b/plugins/help/localization/pt_BR.inc
@@ -1,5 +1,21 @@
 <?php
 
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/help/localization/<lang>.inc                                  |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail Help plugin                |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
+*/
+
 $labels = array();
 $labels['help'] = 'Ajuda';
 $labels['about'] = 'Sobre';
diff --git a/plugins/help/localization/pt_PT.inc b/plugins/help/localization/pt_PT.inc
index c28503b33..657c33ac5 100644
--- a/plugins/help/localization/pt_PT.inc
+++ b/plugins/help/localization/pt_PT.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/pt_PT/labels.inc                                         |
+ | plugins/help/localization/<lang>.inc                                  |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Help plugin                |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: David                                                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $labels['help'] = 'Ajuda';
 $labels['about'] = 'Sobre...';
 $labels['license'] = 'Licença';
 
+?>
diff --git a/plugins/help/localization/ru_RU.inc b/plugins/help/localization/ru_RU.inc
index 9f1de410c..c1d2e071b 100644
--- a/plugins/help/localization/ru_RU.inc
+++ b/plugins/help/localization/ru_RU.inc
@@ -1,18 +1,19 @@
 <?php
 
 /*
+ +-----------------------------------------------------------------------+
+ | plugins/help/localization/<lang>.inc                                  |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail Help plugin                |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
 
-+-----------------------------------------------------------------------+
-| plugins/help/localization/ru_RU.inc                                   |
-|                                                                       |
-| Language file of the Roundcube help plugin                            |
-| Copyright (C) 2005-2010, The Roundcube Dev Team                       |
-| Licensed under the GNU GPL                                            |
-|                                                                       |
-+-----------------------------------------------------------------------+
-| Author: Sergey Dukachev <iam@dukess.ru>                               |
-+-----------------------------------------------------------------------+
-
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
 
 $labels = array();
diff --git a/plugins/help/localization/sk_SK.inc b/plugins/help/localization/sk_SK.inc
index 6fdacd1b6..99d3082bd 100644
--- a/plugins/help/localization/sk_SK.inc
+++ b/plugins/help/localization/sk_SK.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/sk_SK/labels.inc                                         |
+ | plugins/help/localization/<lang>.inc                                  |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Help plugin                |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: panda                                                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $labels['help'] = 'Nápoveda';
 $labels['about'] = 'O aplikácii';
 $labels['license'] = 'Licencia';
 
+?>
diff --git a/plugins/help/localization/sl_SI.inc b/plugins/help/localization/sl_SI.inc
index d72cd1838..9e84d4cda 100644
--- a/plugins/help/localization/sl_SI.inc
+++ b/plugins/help/localization/sl_SI.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/sl_SI/labels.inc                                         |
+ | plugins/help/localization/<lang>.inc                                  |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Help plugin                |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Barbara Krasovec <barbarak@arnes.si>                          |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $labels['help'] = 'Pomoč';
 $labels['about'] = 'Vizitka';
 $labels['license'] = 'Licenca';
 
+?>
diff --git a/plugins/help/localization/sr_CS.inc b/plugins/help/localization/sr_CS.inc
index b0499f0ec..a514c1cfe 100644
--- a/plugins/help/localization/sr_CS.inc
+++ b/plugins/help/localization/sr_CS.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/sr_CS/labels.inc                                         |
+ | plugins/help/localization/<lang>.inc                                  |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Help plugin                |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Saša Zejnilović <zejnils@gmail.com>                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $labels['help'] = 'Помоћ';
 $labels['about'] = 'Info';
 $labels['license'] = 'Licenca';
 
+?>
diff --git a/plugins/help/localization/sv_SE.inc b/plugins/help/localization/sv_SE.inc
index 8b0d48741..ab23f8c69 100644
--- a/plugins/help/localization/sv_SE.inc
+++ b/plugins/help/localization/sv_SE.inc
@@ -1,5 +1,21 @@
 <?php
 
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/help/localization/<lang>.inc                                  |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail Help plugin                |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
+*/
+
 $labels = array();
 $labels['help'] = 'Hjälp';
 $labels['about'] = 'Om';
diff --git a/plugins/help/localization/tr_TR.inc b/plugins/help/localization/tr_TR.inc
index 306c1c462..cad257409 100644
--- a/plugins/help/localization/tr_TR.inc
+++ b/plugins/help/localization/tr_TR.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/tr_TR/labels.inc                                         |
+ | plugins/help/localization/<lang>.inc                                  |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Help plugin                |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: ismail yenigul                                                |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $labels['help'] = 'Yardım';
 $labels['about'] = 'Hakkında';
 $labels['license'] = 'Lisans';
 
+?>
diff --git a/plugins/help/localization/vi_VN.inc b/plugins/help/localization/vi_VN.inc
index 9d0f1e4aa..bd5fa57b6 100644
--- a/plugins/help/localization/vi_VN.inc
+++ b/plugins/help/localization/vi_VN.inc
@@ -2,19 +2,23 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/vi_VN/labels.inc                                         |
+ | plugins/help/localization/<lang>.inc                                  |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Help plugin                |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Kenny Tran <kennethanh@gmail.com>                             |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
 
 $labels = array();
 $labels['help'] = 'Trợ giúp';
-$labels['about'] = 'Lời ngõ';
+$labels['about'] = 'Giới thiệu';
 $labels['license'] = 'Bản quyền';
 
+?>
diff --git a/plugins/help/localization/zh_CN.inc b/plugins/help/localization/zh_CN.inc
index da7b7a8c6..59719477b 100644
--- a/plugins/help/localization/zh_CN.inc
+++ b/plugins/help/localization/zh_CN.inc
@@ -2,19 +2,23 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/zh_CN/labels.inc                                         |
+ | plugins/help/localization/<lang>.inc                                  |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Help plugin                |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Christopher Meng <cickumqt@gmail.com>                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
 
 $labels = array();
 $labels['help'] = '帮助';
 $labels['about'] = '关于';
-$labels['license'] = '许可协议';
+$labels['license'] = '授权信息';
 
+?>
diff --git a/plugins/help/localization/zh_TW.inc b/plugins/help/localization/zh_TW.inc
index 603283761..9fc68e482 100644
--- a/plugins/help/localization/zh_TW.inc
+++ b/plugins/help/localization/zh_TW.inc
@@ -1,5 +1,21 @@
 <?php
 
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/help/localization/<lang>.inc                                  |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail Help plugin                |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
+*/
+
 $labels = array();
 $labels['help'] = '說明';
 $labels['about'] = '關於';
diff --git a/plugins/hide_blockquote/localization/az_AZ.inc b/plugins/hide_blockquote/localization/az_AZ.inc
index 6d1563f42..e0c60077a 100644
--- a/plugins/hide_blockquote/localization/az_AZ.inc
+++ b/plugins/hide_blockquote/localization/az_AZ.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/az_AZ/labels.inc                                         |
+ | plugins/hide_blockquote/localization/<lang>.inc                       |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Hide-Blockquote plugin     |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Orkhan Guliyev <proger@box.az>                                |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $labels['hide'] = 'Gizlət';
 $labels['show'] = 'Göstər';
 $labels['quotelimit'] = 'Sətr saytı göstəriləndən çoxdursa sitatı gizlə:';
 
+?>
diff --git a/plugins/hide_blockquote/localization/bs_BA.inc b/plugins/hide_blockquote/localization/bs_BA.inc
index ae9bda580..0b8075b31 100644
--- a/plugins/hide_blockquote/localization/bs_BA.inc
+++ b/plugins/hide_blockquote/localization/bs_BA.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/bs_BA/labels.inc                                         |
+ | plugins/hide_blockquote/localization/<lang>.inc                       |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Hide-Blockquote plugin     |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Kenan Dervišević <kenan3008@gmail.com>                      |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $labels['hide'] = 'Sakrij';
 $labels['show'] = 'Prikaži';
 $labels['quotelimit'] = 'Sakrij citate kada je broj linija veći od';
 
+?>
diff --git a/plugins/hide_blockquote/localization/ca_ES.inc b/plugins/hide_blockquote/localization/ca_ES.inc
index d8ca7c919..9a0fc3cc4 100644
--- a/plugins/hide_blockquote/localization/ca_ES.inc
+++ b/plugins/hide_blockquote/localization/ca_ES.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ca_ES/labels.inc                                         |
+ | plugins/hide_blockquote/localization/<lang>.inc                       |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Hide-Blockquote plugin     |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Jordi Sanfeliu <jordi@fibranet.cat>                           |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $labels['hide'] = 'Amaga';
 $labels['show'] = 'Mostra';
 $labels['quotelimit'] = 'Amaga la cita quan el nombre de línies sigui més gran de';
 
+?>
diff --git a/plugins/hide_blockquote/localization/cs_CZ.inc b/plugins/hide_blockquote/localization/cs_CZ.inc
index 22b2e87e1..5e3cd657c 100644
--- a/plugins/hide_blockquote/localization/cs_CZ.inc
+++ b/plugins/hide_blockquote/localization/cs_CZ.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/cs_CZ/labels.inc                                         |
+ | plugins/hide_blockquote/localization/<lang>.inc                       |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Hide-Blockquote plugin     |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Tomáš Kyzlink                                               |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $labels['hide'] = 'Skrýt';
 $labels['show'] = 'Zobrazit';
 $labels['quotelimit'] = 'Skrýt citaci pokud je počet řádků větší než';
 
+?>
diff --git a/plugins/hide_blockquote/localization/cy_GB.inc b/plugins/hide_blockquote/localization/cy_GB.inc
index 40b0ec207..f55fab41a 100644
--- a/plugins/hide_blockquote/localization/cy_GB.inc
+++ b/plugins/hide_blockquote/localization/cy_GB.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/cy_GB/labels.inc                                         |
+ | plugins/hide_blockquote/localization/<lang>.inc                       |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Hide-Blockquote plugin     |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Dafydd Tomos                                                  |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $labels['hide'] = 'Cuddio';
 $labels['show'] = 'Dangos';
 $labels['quotelimit'] = 'Cuddio dyfynniad pan mae\'r nifer o linellau yn fwy na';
 
+?>
diff --git a/plugins/hide_blockquote/localization/da_DK.inc b/plugins/hide_blockquote/localization/da_DK.inc
index 50fbc718d..a807cc34f 100644
--- a/plugins/hide_blockquote/localization/da_DK.inc
+++ b/plugins/hide_blockquote/localization/da_DK.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/da_DK/labels.inc                                         |
+ | plugins/hide_blockquote/localization/<lang>.inc                       |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Hide-Blockquote plugin     |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Johannes Hessellund <osos@openeyes.dk>                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $labels['hide'] = 'Skjul';
 $labels['show'] = 'Vis';
 $labels['quotelimit'] = 'Skjul citat antallet af linjer er højere end';
 
+?>
diff --git a/plugins/hide_blockquote/localization/de_CH.inc b/plugins/hide_blockquote/localization/de_CH.inc
index 28802df97..66c9e4823 100644
--- a/plugins/hide_blockquote/localization/de_CH.inc
+++ b/plugins/hide_blockquote/localization/de_CH.inc
@@ -2,10 +2,10 @@
 
 /*
  +-----------------------------------------------------------------------+
- | plugins/hide_blockquote/localization/<lang>.inc                        |
+ | plugins/hide_blockquote/localization/<lang>.inc                       |
  |                                                                       |
  | Localization file of the Roundcube Webmail Hide-Blockquote plugin     |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
diff --git a/plugins/hide_blockquote/localization/de_DE.inc b/plugins/hide_blockquote/localization/de_DE.inc
index 4ae3b96e7..66c9e4823 100644
--- a/plugins/hide_blockquote/localization/de_DE.inc
+++ b/plugins/hide_blockquote/localization/de_DE.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/de_DE/labels.inc                                         |
+ | plugins/hide_blockquote/localization/<lang>.inc                       |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Hide-Blockquote plugin     |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $labels['hide'] = 'ausblenden';
 $labels['show'] = 'einblenden';
 $labels['quotelimit'] = 'Zitate verbergen ab einer Zeilenlänge von';
 
+?>
diff --git a/plugins/hide_blockquote/localization/en_GB.inc b/plugins/hide_blockquote/localization/en_GB.inc
index 68f634e00..90dd28955 100644
--- a/plugins/hide_blockquote/localization/en_GB.inc
+++ b/plugins/hide_blockquote/localization/en_GB.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/en_GB/labels.inc                                         |
+ | plugins/hide_blockquote/localization/<lang>.inc                       |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Hide-Blockquote plugin     |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Aleksander Machniak <alec@alec.pl>                            |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $labels['hide'] = 'Hide';
 $labels['show'] = 'Show';
 $labels['quotelimit'] = 'Hide citation when lines count is greater than';
 
+?>
diff --git a/plugins/hide_blockquote/localization/en_US.inc b/plugins/hide_blockquote/localization/en_US.inc
index c3a5ca019..90dd28955 100644
--- a/plugins/hide_blockquote/localization/en_US.inc
+++ b/plugins/hide_blockquote/localization/en_US.inc
@@ -2,10 +2,10 @@
 
 /*
  +-----------------------------------------------------------------------+
- | plugins/hide_blockquote/localization/<lang>.inc                        |
+ | plugins/hide_blockquote/localization/<lang>.inc                       |
  |                                                                       |
  | Localization file of the Roundcube Webmail Hide-Blockquote plugin     |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
diff --git a/plugins/hide_blockquote/localization/eo.inc b/plugins/hide_blockquote/localization/eo.inc
index 81628a388..5ffaaad56 100644
--- a/plugins/hide_blockquote/localization/eo.inc
+++ b/plugins/hide_blockquote/localization/eo.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/eo/labels.inc                                         |
+ | plugins/hide_blockquote/localization/<lang>.inc                       |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Hide-Blockquote plugin     |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Michael Moroni <michael.moroni@mailoo.org>                    |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $labels['hide'] = 'Kaŝi';
 $labels['show'] = 'Montri';
 $labels['quotelimit'] = 'Kaŝi citaĵon kiam la nombro de linioj estas pligranda ol';
 
+?>
diff --git a/plugins/hide_blockquote/localization/es_ES.inc b/plugins/hide_blockquote/localization/es_ES.inc
index 485fef551..b59629413 100644
--- a/plugins/hide_blockquote/localization/es_ES.inc
+++ b/plugins/hide_blockquote/localization/es_ES.inc
@@ -2,19 +2,23 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/es_ES/labels.inc                                         |
+ | plugins/hide_blockquote/localization/<lang>.inc                       |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Hide-Blockquote plugin     |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Eduardo Alberto Calvo                                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
 
 $labels = array();
 $labels['hide'] = 'Ocultar';
 $labels['show'] = 'Mostrar';
-$labels['quotelimit'] = 'Ocultar la cita cuando el numero de lineas es mayor que';
+$labels['quotelimit'] = 'Ocultar la cita cuando el número de lineas es mayor que';
 
+?>
diff --git a/plugins/hide_blockquote/localization/et_EE.inc b/plugins/hide_blockquote/localization/et_EE.inc
index ae426f915..e49dbfb22 100644
--- a/plugins/hide_blockquote/localization/et_EE.inc
+++ b/plugins/hide_blockquote/localization/et_EE.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/et_EE/labels.inc                                         |
+ | plugins/hide_blockquote/localization/<lang>.inc                       |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Hide-Blockquote plugin     |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: yllar                                                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $labels['hide'] = 'Peida';
 $labels['show'] = 'Näita';
 $labels['quotelimit'] = 'Peida tsitaat kui ridade arv on suurem kui';
 
+?>
diff --git a/plugins/hide_blockquote/localization/fa_IR.inc b/plugins/hide_blockquote/localization/fa_IR.inc
index 02934f1e3..8edc7aed7 100644
--- a/plugins/hide_blockquote/localization/fa_IR.inc
+++ b/plugins/hide_blockquote/localization/fa_IR.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/fa_IR/labels.inc                                         |
+ | plugins/hide_blockquote/localization/<lang>.inc                       |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Hide-Blockquote plugin     |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Hamid <abbaszadeh.h@gmail.com>                                |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $labels['hide'] = 'مخفی کردن';
 $labels['show'] = 'نشان دادن';
 $labels['quotelimit'] = 'مخفی کردن نقل‌قول وقتی تعداد خطوط بیشتر است از';
 
+?>
diff --git a/plugins/hide_blockquote/localization/fi_FI.inc b/plugins/hide_blockquote/localization/fi_FI.inc
index ada6d754a..cb7c8aaa4 100644
--- a/plugins/hide_blockquote/localization/fi_FI.inc
+++ b/plugins/hide_blockquote/localization/fi_FI.inc
@@ -2,19 +2,23 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/fi_FI/labels.inc                                         |
+ | plugins/hide_blockquote/localization/<lang>.inc                       |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Hide-Blockquote plugin     |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Jiri Grönroos                                                |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
 
 $labels = array();
 $labels['hide'] = 'Piilota';
 $labels['show'] = 'Näytä';
-$labels['quotelimit'] = 'Piilota lainaus, kun rivien lukumäärä on suurempi kuin';
+$labels['quotelimit'] = 'Hide citation when lines count is greater than';
 
+?>
diff --git a/plugins/hide_blockquote/localization/fr_FR.inc b/plugins/hide_blockquote/localization/fr_FR.inc
index 5964186af..e789fb842 100644
--- a/plugins/hide_blockquote/localization/fr_FR.inc
+++ b/plugins/hide_blockquote/localization/fr_FR.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/fr_FR/labels.inc                                         |
+ | plugins/hide_blockquote/localization/<lang>.inc                       |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Hide-Blockquote plugin     |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Patrick Fiquet                                                |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $labels['hide'] = 'Cacher';
 $labels['show'] = 'Afficher';
 $labels['quotelimit'] = 'Cacher la citation quand le nombre de lignes est plus grand que';
 
+?>
diff --git a/plugins/hide_blockquote/localization/gl_ES.inc b/plugins/hide_blockquote/localization/gl_ES.inc
index bb45812cc..37a81e418 100644
--- a/plugins/hide_blockquote/localization/gl_ES.inc
+++ b/plugins/hide_blockquote/localization/gl_ES.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/gl_ES/labels.inc                                         |
+ | plugins/hide_blockquote/localization/<lang>.inc                       |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Hide-Blockquote plugin     |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: oterobueu <oterobueu@gmail.com>                               |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $labels['hide'] = 'Agochar';
 $labels['show'] = 'Amosar';
 $labels['quotelimit'] = 'Agochar mencións cando haxa demasiadas liñas';
 
+?>
diff --git a/plugins/hide_blockquote/localization/he_IL.inc b/plugins/hide_blockquote/localization/he_IL.inc
index 9ddc6bd2a..edcba5040 100644
--- a/plugins/hide_blockquote/localization/he_IL.inc
+++ b/plugins/hide_blockquote/localization/he_IL.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/he_IL/labels.inc                                         |
+ | plugins/hide_blockquote/localization/<lang>.inc                       |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Hide-Blockquote plugin     |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Moshe Leibovitch <moish@mln.co.il>                            |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $labels['hide'] = 'הסתר';
 $labels['show'] = 'הצג';
 $labels['quotelimit'] = 'הסתר ציטוט כאשר מספר השורות גדול מ-';
 
+?>
diff --git a/plugins/hide_blockquote/localization/hu_HU.inc b/plugins/hide_blockquote/localization/hu_HU.inc
index a3418f4a6..964d1ae9d 100644
--- a/plugins/hide_blockquote/localization/hu_HU.inc
+++ b/plugins/hide_blockquote/localization/hu_HU.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/hu_HU/labels.inc                                         |
+ | plugins/hide_blockquote/localization/<lang>.inc                       |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Hide-Blockquote plugin     |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: bela                                                          |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $labels['hide'] = 'Elrejtés';
 $labels['show'] = 'Megjelenítés';
 $labels['quotelimit'] = 'Idézet elrejtése ha a sorok száma több mint';
 
+?>
diff --git a/plugins/hide_blockquote/localization/hy_AM.inc b/plugins/hide_blockquote/localization/hy_AM.inc
index 8aa5f2d12..5ad32d861 100644
--- a/plugins/hide_blockquote/localization/hy_AM.inc
+++ b/plugins/hide_blockquote/localization/hy_AM.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/hy_AM/labels.inc                                         |
+ | plugins/hide_blockquote/localization/<lang>.inc                       |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Hide-Blockquote plugin     |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Vahan Yerkanian <vahan@yerkanian.com>                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $labels['hide'] = 'Թաքցնել';
 $labels['show'] = 'Ցուցադրել';
 $labels['quotelimit'] = 'Թաքցնել ցիտումը երբ տողերի քանակը գերազանցում է';
 
+?>
diff --git a/plugins/hide_blockquote/localization/id_ID.inc b/plugins/hide_blockquote/localization/id_ID.inc
index 8be79a601..5b3785d6a 100644
--- a/plugins/hide_blockquote/localization/id_ID.inc
+++ b/plugins/hide_blockquote/localization/id_ID.inc
@@ -2,18 +2,23 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/id_ID/labels.inc                                         |
+ | plugins/hide_blockquote/localization/<lang>.inc                       |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Hide-Blockquote plugin     |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Lazlo                                                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
 
 $labels = array();
 $labels['hide'] = 'Sembunyi';
-$labels['show'] = 'Tampak';
+$labels['show'] = 'Tampil';
+$labels['quotelimit'] = 'Sembunyikan kutipan ketika jumlah baris lebih besar dari';
 
+?>
diff --git a/plugins/hide_blockquote/localization/it_IT.inc b/plugins/hide_blockquote/localization/it_IT.inc
index 6ae2b6ec4..40a93a9b0 100644
--- a/plugins/hide_blockquote/localization/it_IT.inc
+++ b/plugins/hide_blockquote/localization/it_IT.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/it_IT/labels.inc                                         |
+ | plugins/hide_blockquote/localization/<lang>.inc                       |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Hide-Blockquote plugin     |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Andrea Bernini <andrea.bernini@gmail.com>                     |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $labels['hide'] = 'Nascondi';
 $labels['show'] = 'Mostra';
 $labels['quotelimit'] = 'Nascondi la citazione quando il numero di righe è maggiore di';
 
+?>
diff --git a/plugins/hide_blockquote/localization/ja_JP.inc b/plugins/hide_blockquote/localization/ja_JP.inc
index 3fbbb2806..b3006999d 100644
--- a/plugins/hide_blockquote/localization/ja_JP.inc
+++ b/plugins/hide_blockquote/localization/ja_JP.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ja_JP/labels.inc                                         |
+ | plugins/hide_blockquote/localization/<lang>.inc                       |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Hide-Blockquote plugin     |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Takahiro Kambe                                                |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $labels['hide'] = '隠す';
 $labels['show'] = '表示';
 $labels['quotelimit'] = '次の行数より多い引用を非表示';
 
+?>
diff --git a/plugins/hide_blockquote/localization/ko_KR.inc b/plugins/hide_blockquote/localization/ko_KR.inc
index d83dd8bce..73895d18d 100644
--- a/plugins/hide_blockquote/localization/ko_KR.inc
+++ b/plugins/hide_blockquote/localization/ko_KR.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ko_KR/labels.inc                                         |
+ | plugins/hide_blockquote/localization/<lang>.inc                       |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Hide-Blockquote plugin     |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Kim, Woohyun <woohyun.kim@gmail.com>                          |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $labels['hide'] = '숨기기';
 $labels['show'] = '보이기';
 $labels['quotelimit'] = '라인 개수가 정해진 개수보다 클 때 인용구 감추기';
 
+?>
diff --git a/plugins/hide_blockquote/localization/lt_LT.inc b/plugins/hide_blockquote/localization/lt_LT.inc
index 159f1747d..931c2ee90 100644
--- a/plugins/hide_blockquote/localization/lt_LT.inc
+++ b/plugins/hide_blockquote/localization/lt_LT.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/lt_LT/labels.inc                                         |
+ | plugins/hide_blockquote/localization/<lang>.inc                       |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Hide-Blockquote plugin     |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Rimas Kudelis <rq@akl.lt>                                     |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $labels['hide'] = 'Paslėpti';
 $labels['show'] = 'Parodyti';
 $labels['quotelimit'] = 'Paslėpti citatą, kai joje eilučių daugiau negu';
 
+?>
diff --git a/plugins/hide_blockquote/localization/nb_NO.inc b/plugins/hide_blockquote/localization/nb_NO.inc
index da50e8560..5dafd7f1c 100644
--- a/plugins/hide_blockquote/localization/nb_NO.inc
+++ b/plugins/hide_blockquote/localization/nb_NO.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/nb_NB/labels.inc                                         |
+ | plugins/hide_blockquote/localization/<lang>.inc                       |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Hide-Blockquote plugin     |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Tobias V. Langhoff <spug@thespug.net>                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $labels['hide'] = 'Skjul';
 $labels['show'] = 'Vis';
 $labels['quotelimit'] = 'Skjul sitat når antall linjer er flere enn';
 
+?>
diff --git a/plugins/hide_blockquote/localization/nl_NL.inc b/plugins/hide_blockquote/localization/nl_NL.inc
index 1e14835e0..a684b631b 100644
--- a/plugins/hide_blockquote/localization/nl_NL.inc
+++ b/plugins/hide_blockquote/localization/nl_NL.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/nl_NL/labels.inc                                         |
+ | plugins/hide_blockquote/localization/<lang>.inc                       |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Hide-Blockquote plugin     |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Geert Wirken                                                  |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $labels['hide'] = 'Verbergen';
 $labels['show'] = 'Tonen';
 $labels['quotelimit'] = 'Verberg citaat wanneer aantal regels groter is dan';
 
+?>
diff --git a/plugins/hide_blockquote/localization/nn_NO.inc b/plugins/hide_blockquote/localization/nn_NO.inc
index 32085ca29..fd7b49d63 100644
--- a/plugins/hide_blockquote/localization/nn_NO.inc
+++ b/plugins/hide_blockquote/localization/nn_NO.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/nn_NN/labels.inc                                         |
+ | plugins/hide_blockquote/localization/<lang>.inc                       |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Hide-Blockquote plugin     |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Åsmund Skjæveland <aasmunds@ulrik.uio.no>                   |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $labels['hide'] = 'Gøym';
 $labels['show'] = 'Vis';
 $labels['quotelimit'] = 'Gøym sitat når talet på linjer er større enn';
 
+?>
diff --git a/plugins/hide_blockquote/localization/pl_PL.inc b/plugins/hide_blockquote/localization/pl_PL.inc
index 0a8339149..dbca969e4 100644
--- a/plugins/hide_blockquote/localization/pl_PL.inc
+++ b/plugins/hide_blockquote/localization/pl_PL.inc
@@ -1,5 +1,21 @@
 <?php
 
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/hide_blockquote/localization/<lang>.inc                       |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail Hide-Blockquote plugin     |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
+*/
+
 $labels = array();
 $labels['hide'] = 'Ukryj';
 $labels['show'] = 'Pokaż';
diff --git a/plugins/hide_blockquote/localization/pt_BR.inc b/plugins/hide_blockquote/localization/pt_BR.inc
index 3acdd4534..76c856a53 100644
--- a/plugins/hide_blockquote/localization/pt_BR.inc
+++ b/plugins/hide_blockquote/localization/pt_BR.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/pt_BR/labels.inc                                         |
+ | plugins/hide_blockquote/localization/<lang>.inc                       |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Hide-Blockquote plugin     |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Victor Benincasa <vbenincasa@gmail.com>                       |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $labels['hide'] = 'Ocultar';
 $labels['show'] = 'Exibir';
 $labels['quotelimit'] = 'Ocultar a citação quando o número de linhas for maior do que';
 
+?>
diff --git a/plugins/hide_blockquote/localization/pt_PT.inc b/plugins/hide_blockquote/localization/pt_PT.inc
index 8afa6d549..0ccfbe52d 100644
--- a/plugins/hide_blockquote/localization/pt_PT.inc
+++ b/plugins/hide_blockquote/localization/pt_PT.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/pt_PT/labels.inc                                         |
+ | plugins/hide_blockquote/localization/<lang>.inc                       |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Hide-Blockquote plugin     |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: David                                                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $labels['hide'] = 'Ocultar';
 $labels['show'] = 'Mostrar';
 $labels['quotelimit'] = 'Ocultar citação quando o numero de linhas for maior que';
 
+?>
diff --git a/plugins/hide_blockquote/localization/ru_RU.inc b/plugins/hide_blockquote/localization/ru_RU.inc
index ab7733e0d..657548a5e 100644
--- a/plugins/hide_blockquote/localization/ru_RU.inc
+++ b/plugins/hide_blockquote/localization/ru_RU.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ru_RU/labels.inc                                         |
+ | plugins/hide_blockquote/localization/<lang>.inc                       |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Hide-Blockquote plugin     |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Sergey Dukachev <admin@mfitness.ru>                           |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $labels['hide'] = 'Скрыть';
 $labels['show'] = 'Показать';
 $labels['quotelimit'] = 'Скрыть цитату, если число строк более чем';
 
+?>
diff --git a/plugins/hide_blockquote/localization/sk_SK.inc b/plugins/hide_blockquote/localization/sk_SK.inc
index e9263833b..9a008369a 100644
--- a/plugins/hide_blockquote/localization/sk_SK.inc
+++ b/plugins/hide_blockquote/localization/sk_SK.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/sk_SK/labels.inc                                         |
+ | plugins/hide_blockquote/localization/<lang>.inc                       |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Hide-Blockquote plugin     |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: panda                                                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $labels['hide'] = 'Skryť';
 $labels['show'] = 'Zobraziť';
 $labels['quotelimit'] = 'Skryť citáciu pokiaľ je počet riadkov väčší než';
 
+?>
diff --git a/plugins/hide_blockquote/localization/sl_SI.inc b/plugins/hide_blockquote/localization/sl_SI.inc
index 31cfc3caa..66e4b4e9b 100644
--- a/plugins/hide_blockquote/localization/sl_SI.inc
+++ b/plugins/hide_blockquote/localization/sl_SI.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/sl_SI/labels.inc                                         |
+ | plugins/hide_blockquote/localization/<lang>.inc                       |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Hide-Blockquote plugin     |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Barbara Krasovec <barbarak@arnes.si>                          |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $labels['hide'] = 'Skrij';
 $labels['show'] = 'Prikaži';
 $labels['quotelimit'] = 'Skrij citiran tekst, ko je število vrstic večje od';
 
+?>
diff --git a/plugins/hide_blockquote/localization/sr_CS.inc b/plugins/hide_blockquote/localization/sr_CS.inc
index 485ef5966..5df13d3b1 100644
--- a/plugins/hide_blockquote/localization/sr_CS.inc
+++ b/plugins/hide_blockquote/localization/sr_CS.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/sr_CS/labels.inc                                         |
+ | plugins/hide_blockquote/localization/<lang>.inc                       |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Hide-Blockquote plugin     |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Saša Zejnilović <zejnils@gmail.com>                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $labels['hide'] = 'Сакриј';
 $labels['show'] = 'Прикажи';
 $labels['quotelimit'] = 'Сакриј цитат када је број редова већи од';
 
+?>
diff --git a/plugins/hide_blockquote/localization/sv_SE.inc b/plugins/hide_blockquote/localization/sv_SE.inc
index c6abb488f..a6e43f6ad 100644
--- a/plugins/hide_blockquote/localization/sv_SE.inc
+++ b/plugins/hide_blockquote/localization/sv_SE.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/sv_SE/labels.inc                                         |
+ | plugins/hide_blockquote/localization/<lang>.inc                       |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Hide-Blockquote plugin     |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Jonas Nasholm                                                 |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $labels['hide'] = 'Dölj';
 $labels['show'] = 'Visa';
 $labels['quotelimit'] = 'Dölj citat när antalet rader överstiger';
 
+?>
diff --git a/plugins/hide_blockquote/localization/tr_TR.inc b/plugins/hide_blockquote/localization/tr_TR.inc
index 525ec5064..350ccb238 100644
--- a/plugins/hide_blockquote/localization/tr_TR.inc
+++ b/plugins/hide_blockquote/localization/tr_TR.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/tr_TR/labels.inc                                         |
+ | plugins/hide_blockquote/localization/<lang>.inc                       |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Hide-Blockquote plugin     |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: ismail yenigul                                                |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $labels['hide'] = 'Gizle';
 $labels['show'] = 'Göster';
 $labels['quotelimit'] = 'Satır sayısı şu satır sayısındna fazla ile alıntıları gizle:';
 
+?>
diff --git a/plugins/hide_blockquote/localization/vi_VN.inc b/plugins/hide_blockquote/localization/vi_VN.inc
index fc2cb5011..9d467374f 100644
--- a/plugins/hide_blockquote/localization/vi_VN.inc
+++ b/plugins/hide_blockquote/localization/vi_VN.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/vi_VN/labels.inc                                         |
+ | plugins/hide_blockquote/localization/<lang>.inc                       |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Hide-Blockquote plugin     |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Hung Pham <phamhung77@gmail.com>                              |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $labels['hide'] = 'Ẩn';
 $labels['show'] = 'Hiển thị';
 $labels['quotelimit'] = 'Ẩn trích dẫn khi tổng số dòng lớn hơn';
 
+?>
diff --git a/plugins/hide_blockquote/localization/zh_CN.inc b/plugins/hide_blockquote/localization/zh_CN.inc
index 5d66f4dcf..1450dd6dc 100644
--- a/plugins/hide_blockquote/localization/zh_CN.inc
+++ b/plugins/hide_blockquote/localization/zh_CN.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/zh_CN/labels.inc                                         |
+ | plugins/hide_blockquote/localization/<lang>.inc                       |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Hide-Blockquote plugin     |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Christopher Meng <cickumqt@gmail.com>                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $labels['hide'] = '隐藏';
 $labels['show'] = '显示';
 $labels['quotelimit'] = '隐藏引用当行数大于';
 
+?>
diff --git a/plugins/hide_blockquote/localization/zh_TW.inc b/plugins/hide_blockquote/localization/zh_TW.inc
index c3a5fe51b..22ea645b4 100644
--- a/plugins/hide_blockquote/localization/zh_TW.inc
+++ b/plugins/hide_blockquote/localization/zh_TW.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/zh_TW/labels.inc                                         |
+ | plugins/hide_blockquote/localization/<lang>.inc                       |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Hide-Blockquote plugin     |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: 林子忠                                                     |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-hide_blockquote/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $labels['hide'] = '隱藏';
 $labels['show'] = '顯示';
 $labels['quotelimit'] = '隱藏引文當行數大於';
 
+?>
diff --git a/plugins/http_authentication/http_authentication.php b/plugins/http_authentication/http_authentication.php
index 57227cb03..2631537a0 100644
--- a/plugins/http_authentication/http_authentication.php
+++ b/plugins/http_authentication/http_authentication.php
@@ -52,7 +52,7 @@ class http_authentication extends rcube_plugin
         $this->load_config();
 
         $host = rcmail::get_instance()->config->get('http_authentication_host');
-        if (is_string($host) && trim($host) !== '')
+        if (is_string($host) && trim($host) !== '' && empty($args['host']))
             $args['host'] = rcube_utils::idn_to_ascii(rcube_utils::parse_host($host));
 
         // Allow entering other user data in login form,
diff --git a/plugins/managesieve/Changelog b/plugins/managesieve/Changelog
index d8baf63ef..2b28f61d5 100644
--- a/plugins/managesieve/Changelog
+++ b/plugins/managesieve/Changelog
@@ -1,5 +1,14 @@
+- Add vacation-seconds extension support (RFC 6131)
+- Several script parser code improvements
+- Support string list arguments in filter form (#1489018)
+- Support date, currendate and index tests - RFC5260 (#1488120)
+- Split plugin file into two files
+
+* version 6.2 [2013-02-17]
+-----------------------------------------------------------
 - Support tls:// prefix in managesieve_host option
 - Removed depracated functions usage
+- Don't trim whitespace in folder names (#1488955)
 
 * version 6.1 [2012-12-21]
 -----------------------------------------------------------
@@ -200,18 +209,18 @@
 - Added it_IT localization
 
 * version 1.1 [2009-05-27]
------------------------------------------------------------    
+-----------------------------------------------------------
 - Added new icons
 - Added support for headers lists (coma-separated) in rules
 - Added de_CH localization
 
 * version 1.0 [2009-05-21]
------------------------------------------------------------    
+-----------------------------------------------------------
 - Rewritten using plugin API
 - Added hu_HU localization (Tamas Tevesz)
 
 * version beta7 (svn-r2300) [2009-03-01]
------------------------------------------------------------    
+-----------------------------------------------------------
 - Added SquirrelMail script auto-import (Jonathan Ernst)
 - Added 'vacation' support (Jonathan Ernst & alec)
 - Added 'stop' support (Jonathan Ernst)
@@ -220,47 +229,47 @@
 - Small style fixes
 
 * version 0.2-stable1 (svn-r2205) [2009-01-03]
------------------------------------------------------------    
+-----------------------------------------------------------
 - Fix moving down filter row
 - Fixes for compressed js files in stable release package
 - Created patch for svn version r2205
 
 * version 0.2-stable [2008-12-31]
------------------------------------------------------------    
+-----------------------------------------------------------
 - Added ru_RU, fr_FR, zh_CN translation
 - Fixes for Roundcube 0.2-stable
 
-* version rc0.2beta [2008-09-21]
------------------------------------------------------------    
+* version 0.2-beta [2008-09-21]
+-----------------------------------------------------------
 - Small css fixes for IE
 - Fixes for Roundcube 0.2-beta
 
 * version beta6 [2008-08-08]
------------------------------------------------------------    
+-----------------------------------------------------------
 - Added de_DE translation
 - Fix for Roundcube r1634
 
 * version beta5 [2008-06-10]
------------------------------------------------------------    
+-----------------------------------------------------------
 - Fixed 'exists' operators
 - Fixed 'not*' operators for custom headers
 - Fixed filters deleting
 
 * version beta4 [2008-06-09]
------------------------------------------------------------    
+-----------------------------------------------------------
 - Fix for Roundcube r1490
 
 * version beta3 [2008-05-22]
------------------------------------------------------------    
+-----------------------------------------------------------
 - Fixed textarea error class setting
 - Added pagetitle setting
 - Added option 'managesieve_replace_delimiter'
 - Fixed errors on IE (still need some css fixes)
-    
+
 * version beta2 [2008-05-20]
------------------------------------------------------------    
+-----------------------------------------------------------
 - Use 'if' only for first filter and 'elsif' for the rest
 
 * version beta1 [2008-05-15]
------------------------------------------------------------    
+-----------------------------------------------------------
 - Initial version for Roundcube r1388.
diff --git a/plugins/managesieve/lib/Roundcube/rcube_sieve.php b/plugins/managesieve/lib/Roundcube/rcube_sieve.php
index 736f73146..a04e3c2a4 100644
--- a/plugins/managesieve/lib/Roundcube/rcube_sieve.php
+++ b/plugins/managesieve/lib/Roundcube/rcube_sieve.php
@@ -84,7 +84,7 @@ class rcube_sieve
             return $this->_set_error(SIEVE_ERROR_LOGIN);
         }
 
-        $this->exts     = $this->get_extensions();
+        $this->exts = $this->get_extensions();
 
         // disable features by config
         if (!empty($disabled)) {
diff --git a/plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php b/plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php
new file mode 100644
index 000000000..d93194765
--- /dev/null
+++ b/plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php
@@ -0,0 +1,2122 @@
+<?php
+
+/**
+ * Managesieve (Sieve Filters) Engine
+ *
+ * Engine part of Managesieve plugin implementing UI and backend access.
+ *
+ * Copyright (C) 2008-2013, The Roundcube Dev Team
+ * Copyright (C) 2011-2013, Kolab Systems AG
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+class rcube_sieve_engine
+{
+    private $rc;
+    private $sieve;
+    private $errors;
+    private $form;
+    private $tips = array();
+    private $script = array();
+    private $exts = array();
+    private $list;
+    private $active = array();
+    private $headers = array(
+        'subject' => 'Subject',
+        'from'    => 'From',
+        'to'      => 'To',
+    );
+    private $addr_headers = array(
+        // Required
+        "from", "to", "cc", "bcc", "sender", "resent-from", "resent-to",
+        // Additional (RFC 822 / RFC 2822)
+        "reply-to", "resent-reply-to", "resent-sender", "resent-cc", "resent-bcc",
+        // Non-standard (RFC 2076, draft-palme-mailext-headers-08.txt)
+        "for-approval", "for-handling", "for-comment", "apparently-to", "errors-to",
+        "delivered-to", "return-receipt-to", "x-admin", "read-receipt-to",
+        "x-confirm-reading-to", "return-receipt-requested",
+        "registered-mail-reply-requested-by", "mail-followup-to", "mail-reply-to",
+        "abuse-reports-to", "x-complaints-to", "x-report-abuse-to",
+        // Undocumented
+        "x-beenthere",
+    );
+
+    const VERSION  = '7.0';
+    const PROGNAME = 'Roundcube (Managesieve)';
+    const PORT     = 4190;
+
+
+    /**
+     * Class constructor
+     */
+    function __construct($plugin)
+    {
+        $this->rc     = rcmail::get_instance();
+        $this->plugin = $plugin;
+    }
+
+    /**
+     * Loads configuration, initializes plugin (including sieve connection)
+     */
+    function start()
+    {
+        // register UI objects
+        $this->rc->output->add_handlers(array(
+            'filterslist'    => array($this, 'filters_list'),
+            'filtersetslist' => array($this, 'filtersets_list'),
+            'filterframe'    => array($this, 'filter_frame'),
+            'filterform'     => array($this, 'filter_form'),
+            'filtersetform'  => array($this, 'filterset_form'),
+        ));
+
+        // Get connection parameters
+        $host = $this->rc->config->get('managesieve_host', 'localhost');
+        $port = $this->rc->config->get('managesieve_port');
+        $tls  = $this->rc->config->get('managesieve_usetls', false);
+
+        $host = rcube_utils::parse_host($host);
+        $host = rcube_utils::idn_to_ascii($host);
+
+        // remove tls:// prefix, set TLS flag
+        if (($host = preg_replace('|^tls://|i', '', $host, 1, $cnt)) && $cnt) {
+            $tls = true;
+        }
+
+        if (empty($port)) {
+            $port = getservbyname('sieve', 'tcp');
+            if (empty($port)) {
+                $port = self::PORT;
+            }
+        }
+
+        $plugin = $this->rc->plugins->exec_hook('managesieve_connect', array(
+            'user'      => $_SESSION['username'],
+            'password'  => $this->rc->decrypt($_SESSION['password']),
+            'host'      => $host,
+            'port'      => $port,
+            'usetls'    => $tls,
+            'auth_type' => $this->rc->config->get('managesieve_auth_type'),
+            'disabled'  => $this->rc->config->get('managesieve_disabled_extensions'),
+            'debug'     => $this->rc->config->get('managesieve_debug', false),
+            'auth_cid'  => $this->rc->config->get('managesieve_auth_cid'),
+            'auth_pw'   => $this->rc->config->get('managesieve_auth_pw'),
+        ));
+
+        // try to connect to managesieve server and to fetch the script
+        $this->sieve = new rcube_sieve(
+            $plugin['user'],
+            $plugin['password'],
+            $plugin['host'],
+            $plugin['port'],
+            $plugin['auth_type'],
+            $plugin['usetls'],
+            $plugin['disabled'],
+            $plugin['debug'],
+            $plugin['auth_cid'],
+            $plugin['auth_pw']
+        );
+
+        if (!($error = $this->sieve->error())) {
+            // Get list of scripts
+            $list = $this->list_scripts();
+
+            if (!empty($_GET['_set']) || !empty($_POST['_set'])) {
+                $script_name = rcube_utils::get_input_value('_set', rcube_utils::INPUT_GPC, true);
+            }
+            else if (!empty($_SESSION['managesieve_current'])) {
+                $script_name = $_SESSION['managesieve_current'];
+            }
+            else {
+                // get (first) active script
+                if (!empty($this->active[0])) {
+                    $script_name = $this->active[0];
+                }
+                else if ($list) {
+                    $script_name = $list[0];
+                }
+                // create a new (initial) script
+                else {
+                    // if script not exists build default script contents
+                    $script_file = $this->rc->config->get('managesieve_default');
+                    $script_name = $this->rc->config->get('managesieve_script_name');
+
+                    if (empty($script_name))
+                        $script_name = 'roundcube';
+
+                    if ($script_file && is_readable($script_file))
+                        $content = file_get_contents($script_file);
+
+                    // add script and set it active
+                    if ($this->sieve->save_script($script_name, $content)) {
+                        $this->activate_script($script_name);
+                        $this->list[] = $script_name;
+                    }
+                }
+            }
+
+            if ($script_name) {
+                $this->sieve->load($script_name);
+            }
+
+            $error = $this->sieve->error();
+        }
+
+        // finally set script objects
+        if ($error) {
+            switch ($error) {
+                case SIEVE_ERROR_CONNECTION:
+                case SIEVE_ERROR_LOGIN:
+                    $this->rc->output->show_message('managesieve.filterconnerror', 'error');
+                    break;
+                default:
+                    $this->rc->output->show_message('managesieve.filterunknownerror', 'error');
+                    break;
+            }
+
+            rcube::raise_error(array('code' => 403, 'type' => 'php',
+                'file' => __FILE__, 'line' => __LINE__,
+                'message' => "Unable to connect to managesieve on $host:$port"), true, false);
+
+            // to disable 'Add filter' button set env variable
+            $this->rc->output->set_env('filterconnerror', true);
+            $this->script = array();
+        }
+        else {
+            $this->exts = $this->sieve->get_extensions();
+            $this->script = $this->sieve->script->as_array();
+            $this->rc->output->set_env('currentset', $this->sieve->current);
+            $_SESSION['managesieve_current'] = $this->sieve->current;
+        }
+
+        return $error;
+    }
+
+    function actions()
+    {
+        $error = $this->start();
+
+        // Handle user requests
+        if ($action = rcube_utils::get_input_value('_act', rcube_utils::INPUT_GPC)) {
+            $fid = (int) rcube_utils::get_input_value('_fid', rcube_utils::INPUT_POST);
+
+            if ($action == 'delete' && !$error) {
+                if (isset($this->script[$fid])) {
+                    if ($this->sieve->script->delete_rule($fid))
+                        $result = $this->save_script();
+
+                    if ($result === true) {
+                        $this->rc->output->show_message('managesieve.filterdeleted', 'confirmation');
+                        $this->rc->output->command('managesieve_updatelist', 'del', array('id' => $fid));
+                    } else {
+                        $this->rc->output->show_message('managesieve.filterdeleteerror', 'error');
+                    }
+                }
+            }
+            else if ($action == 'move' && !$error) {
+                if (isset($this->script[$fid])) {
+                    $to   = (int) rcube_utils::get_input_value('_to', rcube_utils::INPUT_POST);
+                    $rule = $this->script[$fid];
+
+                    // remove rule
+                    unset($this->script[$fid]);
+                    $this->script = array_values($this->script);
+
+                    // add at target position
+                    if ($to >= count($this->script)) {
+                        $this->script[] = $rule;
+                    }
+                    else {
+                        $script = array();
+                        foreach ($this->script as $idx => $r) {
+                            if ($idx == $to)
+                                $script[] = $rule;
+                            $script[] = $r;
+                        }
+                        $this->script = $script;
+                    }
+
+                    $this->sieve->script->content = $this->script;
+                    $result = $this->save_script();
+
+                    if ($result === true) {
+                        $result = $this->list_rules();
+
+                        $this->rc->output->show_message('managesieve.moved', 'confirmation');
+                        $this->rc->output->command('managesieve_updatelist', 'list',
+                            array('list' => $result, 'clear' => true, 'set' => $to));
+                    } else {
+                        $this->rc->output->show_message('managesieve.moveerror', 'error');
+                    }
+                }
+            }
+            else if ($action == 'act' && !$error) {
+                if (isset($this->script[$fid])) {
+                    $rule     = $this->script[$fid];
+                    $disabled = $rule['disabled'] ? true : false;
+                    $rule['disabled'] = !$disabled;
+                    $result = $this->sieve->script->update_rule($fid, $rule);
+
+                    if ($result !== false)
+                        $result = $this->save_script();
+
+                    if ($result === true) {
+                        if ($rule['disabled'])
+                            $this->rc->output->show_message('managesieve.deactivated', 'confirmation');
+                        else
+                            $this->rc->output->show_message('managesieve.activated', 'confirmation');
+                        $this->rc->output->command('managesieve_updatelist', 'update',
+                            array('id' => $fid, 'disabled' => $rule['disabled']));
+                    } else {
+                        if ($rule['disabled'])
+                            $this->rc->output->show_message('managesieve.deactivateerror', 'error');
+                        else
+                            $this->rc->output->show_message('managesieve.activateerror', 'error');
+                    }
+                }
+            }
+            else if ($action == 'setact' && !$error) {
+                $script_name = rcube_utils::get_input_value('_set', rcube_utils::INPUT_GPC, true);
+                $result = $this->activate_script($script_name);
+                $kep14  = $this->rc->config->get('managesieve_kolab_master');
+
+                if ($result === true) {
+                    $this->rc->output->set_env('active_sets', $this->active);
+                    $this->rc->output->show_message('managesieve.setactivated', 'confirmation');
+                    $this->rc->output->command('managesieve_updatelist', 'setact',
+                        array('name' => $script_name, 'active' => true, 'all' => !$kep14));
+                } else {
+                    $this->rc->output->show_message('managesieve.setactivateerror', 'error');
+                }
+            }
+            else if ($action == 'deact' && !$error) {
+                $script_name = rcube_utils::get_input_value('_set', rcube_utils::INPUT_GPC, true);
+                $result = $this->deactivate_script($script_name);
+
+                if ($result === true) {
+                    $this->rc->output->set_env('active_sets', $this->active);
+                    $this->rc->output->show_message('managesieve.setdeactivated', 'confirmation');
+                    $this->rc->output->command('managesieve_updatelist', 'setact',
+                        array('name' => $script_name, 'active' => false));
+                } else {
+                    $this->rc->output->show_message('managesieve.setdeactivateerror', 'error');
+                }
+            }
+            else if ($action == 'setdel' && !$error) {
+                $script_name = rcube_utils::get_input_value('_set', rcube_utils::INPUT_GPC, true);
+                $result = $this->remove_script($script_name);
+
+                if ($result === true) {
+                    $this->rc->output->show_message('managesieve.setdeleted', 'confirmation');
+                    $this->rc->output->command('managesieve_updatelist', 'setdel',
+                        array('name' => $script_name));
+                    $this->rc->session->remove('managesieve_current');
+                } else {
+                    $this->rc->output->show_message('managesieve.setdeleteerror', 'error');
+                }
+            }
+            else if ($action == 'setget') {
+                $script_name = rcube_utils::get_input_value('_set', rcube_utils::INPUT_GPC, true);
+                $script = $this->sieve->get_script($script_name);
+
+                if (PEAR::isError($script))
+                    exit;
+
+                $browser = new rcube_browser;
+
+                // send download headers
+                header("Content-Type: application/octet-stream");
+                header("Content-Length: ".strlen($script));
+
+                if ($browser->ie)
+                    header("Content-Type: application/force-download");
+                if ($browser->ie && $browser->ver < 7)
+                    $filename = rawurlencode(abbreviate_string($script_name, 55));
+                else if ($browser->ie)
+                    $filename = rawurlencode($script_name);
+                else
+                    $filename = addcslashes($script_name, '\\"');
+
+                header("Content-Disposition: attachment; filename=\"$filename.txt\"");
+                echo $script;
+                exit;
+            }
+            else if ($action == 'list') {
+                $result = $this->list_rules();
+
+                $this->rc->output->command('managesieve_updatelist', 'list', array('list' => $result));
+            }
+            else if ($action == 'ruleadd') {
+                $rid = rcube_utils::get_input_value('_rid', rcube_utils::INPUT_GPC);
+                $id = $this->genid();
+                $content = $this->rule_div($fid, $id, false);
+
+                $this->rc->output->command('managesieve_rulefill', $content, $id, $rid);
+            }
+            else if ($action == 'actionadd') {
+                $aid = rcube_utils::get_input_value('_aid', rcube_utils::INPUT_GPC);
+                $id = $this->genid();
+                $content = $this->action_div($fid, $id, false);
+
+                $this->rc->output->command('managesieve_actionfill', $content, $id, $aid);
+            }
+
+            $this->rc->output->send();
+        }
+        else if ($this->rc->task == 'mail') {
+            // Initialize the form
+            $rules = rcube_utils::get_input_value('r', rcube_utils::INPUT_GET);
+            if (!empty($rules)) {
+                $i = 0;
+                foreach ($rules as $rule) {
+                    list($header, $value) = explode(':', $rule, 2);
+                    $tests[$i] = array(
+                        'type' => 'contains',
+                        'test' => 'header',
+                        'arg1' => $header,
+                        'arg2' => $value,
+                    );
+                    $i++;
+                }
+
+                $this->form = array(
+                    'join'  => count($tests) > 1 ? 'allof' : 'anyof',
+                    'name'  => '',
+                    'tests' => $tests,
+                    'actions' => array(
+                        0 => array('type' => 'fileinto'),
+                        1 => array('type' => 'stop'),
+                    ),
+                );
+            }
+        }
+
+        $this->send();
+    }
+
+    function save()
+    {
+        // Init plugin and handle managesieve connection
+        $error = $this->start();
+
+        // get request size limits (#1488648)
+        $max_post = max(array(
+            ini_get('max_input_vars'),
+            ini_get('suhosin.request.max_vars'),
+            ini_get('suhosin.post.max_vars'),
+        ));
+        $max_depth = max(array(
+            ini_get('suhosin.request.max_array_depth'),
+            ini_get('suhosin.post.max_array_depth'),
+        ));
+
+        // check request size limit
+        if ($max_post && count($_POST, COUNT_RECURSIVE) >= $max_post) {
+            rcube::raise_error(array(
+                'code' => 500, 'type' => 'php',
+                'file' => __FILE__, 'line' => __LINE__,
+                'message' => "Request size limit exceeded (one of max_input_vars/suhosin.request.max_vars/suhosin.post.max_vars)"
+                ), true, false);
+            $this->rc->output->show_message('managesieve.filtersaveerror', 'error');
+        }
+        // check request depth limits
+        else if ($max_depth && count($_POST['_header']) > $max_depth) {
+            rcube::raise_error(array(
+                'code' => 500, 'type' => 'php',
+                'file' => __FILE__, 'line' => __LINE__,
+                'message' => "Request size limit exceeded (one of suhosin.request.max_array_depth/suhosin.post.max_array_depth)"
+                ), true, false);
+            $this->rc->output->show_message('managesieve.filtersaveerror', 'error');
+        }
+        // filters set add action
+        else if (!empty($_POST['_newset'])) {
+            $name       = rcube_utils::get_input_value('_name', rcube_utils::INPUT_POST, true);
+            $copy       = rcube_utils::get_input_value('_copy', rcube_utils::INPUT_POST, true);
+            $from       = rcube_utils::get_input_value('_from', rcube_utils::INPUT_POST);
+            $exceptions = $this->rc->config->get('managesieve_filename_exceptions');
+            $kolab      = $this->rc->config->get('managesieve_kolab_master');
+            $name_uc    = mb_strtolower($name);
+            $list       = $this->list_scripts();
+
+            if (!$name) {
+                $this->errors['name'] = $this->plugin->gettext('cannotbeempty');
+            }
+            else if (mb_strlen($name) > 128) {
+                $this->errors['name'] = $this->plugin->gettext('nametoolong');
+            }
+            else if (!empty($exceptions) && in_array($name, (array)$exceptions)) {
+                $this->errors['name'] = $this->plugin->gettext('namereserved');
+            }
+            else if (!empty($kolab) && in_array($name_uc, array('MASTER', 'USER', 'MANAGEMENT'))) {
+                $this->errors['name'] = $this->plugin->gettext('namereserved');
+            }
+            else if (in_array($name, $list)) {
+                $this->errors['name'] = $this->plugin->gettext('setexist');
+            }
+            else if ($from == 'file') {
+                // from file
+                if (is_uploaded_file($_FILES['_file']['tmp_name'])) {
+                    $file = file_get_contents($_FILES['_file']['tmp_name']);
+                    $file = preg_replace('/\r/', '', $file);
+                    // for security don't save script directly
+                    // check syntax before, like this...
+                    $this->sieve->load_script($file);
+                    if (!$this->save_script($name)) {
+                        $this->errors['file'] = $this->plugin->gettext('setcreateerror');
+                    }
+                }
+                else {  // upload failed
+                    $err = $_FILES['_file']['error'];
+
+                    if ($err == UPLOAD_ERR_INI_SIZE || $err == UPLOAD_ERR_FORM_SIZE) {
+                        $msg = $this->rc->gettext(array('name' => 'filesizeerror',
+                            'vars' => array('size' =>
+                                $this->rc->show_bytes(parse_bytes(ini_get('upload_max_filesize'))))));
+                    }
+                    else {
+                        $this->errors['file'] = $this->plugin->gettext('fileuploaderror');
+                    }
+                }
+            }
+            else if (!$this->sieve->copy($name, $from == 'set' ? $copy : '')) {
+                $error = 'managesieve.setcreateerror';
+            }
+
+            if (!$error && empty($this->errors)) {
+                // Find position of the new script on the list
+                $list[] = $name;
+                asort($list, SORT_LOCALE_STRING);
+                $list  = array_values($list);
+                $index = array_search($name, $list);
+
+                $this->rc->output->show_message('managesieve.setcreated', 'confirmation');
+                $this->rc->output->command('parent.managesieve_updatelist', 'setadd',
+                    array('name' => $name, 'index' => $index));
+            } else if ($msg) {
+                $this->rc->output->command('display_message', $msg, 'error');
+            } else if ($error) {
+                $this->rc->output->show_message($error, 'error');
+            }
+        }
+        // filter add/edit action
+        else if (isset($_POST['_name'])) {
+            $name = trim(rcube_utils::get_input_value('_name', rcube_utils::INPUT_POST, true));
+            $fid  = trim(rcube_utils::get_input_value('_fid', rcube_utils::INPUT_POST));
+            $join = trim(rcube_utils::get_input_value('_join', rcube_utils::INPUT_POST));
+
+            // and arrays
+            $headers        = rcube_utils::get_input_value('_header', rcube_utils::INPUT_POST);
+            $cust_headers   = rcube_utils::get_input_value('_custom_header', rcube_utils::INPUT_POST);
+            $ops            = rcube_utils::get_input_value('_rule_op', rcube_utils::INPUT_POST);
+            $sizeops        = rcube_utils::get_input_value('_rule_size_op', rcube_utils::INPUT_POST);
+            $sizeitems      = rcube_utils::get_input_value('_rule_size_item', rcube_utils::INPUT_POST);
+            $sizetargets    = rcube_utils::get_input_value('_rule_size_target', rcube_utils::INPUT_POST);
+            $targets        = rcube_utils::get_input_value('_rule_target', rcube_utils::INPUT_POST, true);
+            $mods           = rcube_utils::get_input_value('_rule_mod', rcube_utils::INPUT_POST);
+            $mod_types      = rcube_utils::get_input_value('_rule_mod_type', rcube_utils::INPUT_POST);
+            $body_trans     = rcube_utils::get_input_value('_rule_trans', rcube_utils::INPUT_POST);
+            $body_types     = rcube_utils::get_input_value('_rule_trans_type', rcube_utils::INPUT_POST, true);
+            $comparators    = rcube_utils::get_input_value('_rule_comp', rcube_utils::INPUT_POST);
+            $indexes        = rcube_utils::get_input_value('_rule_index', rcube_utils::INPUT_POST);
+            $lastindexes    = rcube_utils::get_input_value('_rule_index_last', rcube_utils::INPUT_POST);
+            $dateheaders    = rcube_utils::get_input_value('_rule_date_header', rcube_utils::INPUT_POST);
+            $dateparts      = rcube_utils::get_input_value('_rule_date_part', rcube_utils::INPUT_POST);
+            $act_types      = rcube_utils::get_input_value('_action_type', rcube_utils::INPUT_POST, true);
+            $mailboxes      = rcube_utils::get_input_value('_action_mailbox', rcube_utils::INPUT_POST, true);
+            $act_targets    = rcube_utils::get_input_value('_action_target', rcube_utils::INPUT_POST, true);
+            $area_targets   = rcube_utils::get_input_value('_action_target_area', rcube_utils::INPUT_POST, true);
+            $reasons        = rcube_utils::get_input_value('_action_reason', rcube_utils::INPUT_POST, true);
+            $addresses      = rcube_utils::get_input_value('_action_addresses', rcube_utils::INPUT_POST, true);
+            $intervals      = rcube_utils::get_input_value('_action_interval', rcube_utils::INPUT_POST);
+            $interval_types = rcube_utils::get_input_value('_action_interval_type', rcube_utils::INPUT_POST);
+            $subject        = rcube_utils::get_input_value('_action_subject', rcube_utils::INPUT_POST, true);
+            $flags          = rcube_utils::get_input_value('_action_flags', rcube_utils::INPUT_POST);
+            $varnames       = rcube_utils::get_input_value('_action_varname', rcube_utils::INPUT_POST);
+            $varvalues      = rcube_utils::get_input_value('_action_varvalue', rcube_utils::INPUT_POST);
+            $varmods        = rcube_utils::get_input_value('_action_varmods', rcube_utils::INPUT_POST);
+            $notifyaddrs    = rcube_utils::get_input_value('_action_notifyaddress', rcube_utils::INPUT_POST);
+            $notifybodies   = rcube_utils::get_input_value('_action_notifybody', rcube_utils::INPUT_POST);
+            $notifymessages = rcube_utils::get_input_value('_action_notifymessage', rcube_utils::INPUT_POST);
+            $notifyfrom     = rcube_utils::get_input_value('_action_notifyfrom', rcube_utils::INPUT_POST);
+            $notifyimp      = rcube_utils::get_input_value('_action_notifyimportance', rcube_utils::INPUT_POST);
+
+            // we need a "hack" for radiobuttons
+            foreach ($sizeitems as $item)
+                $items[] = $item;
+
+            $this->form['disabled'] = $_POST['_disabled'] ? true : false;
+            $this->form['join']     = $join=='allof' ? true : false;
+            $this->form['name']     = $name;
+            $this->form['tests']    = array();
+            $this->form['actions']  = array();
+
+            if ($name == '')
+                $this->errors['name'] = $this->plugin->gettext('cannotbeempty');
+            else {
+                foreach($this->script as $idx => $rule)
+                    if($rule['name'] == $name && $idx != $fid) {
+                        $this->errors['name'] = $this->plugin->gettext('ruleexist');
+                        break;
+                    }
+            }
+
+            $i = 0;
+            // rules
+            if ($join == 'any') {
+                $this->form['tests'][0]['test'] = 'true';
+            }
+            else {
+                foreach ($headers as $idx => $header) {
+                    // targets are indexed differently (assume form order)
+                    $target     = $this->strip_value(array_shift($targets), true);
+                    $header     = $this->strip_value($header);
+                    $operator   = $this->strip_value($ops[$idx]);
+                    $comparator = $this->strip_value($comparators[$idx]);
+
+                    if ($header == 'size') {
+                        $sizeop     = $this->strip_value($sizeops[$idx]);
+                        $sizeitem   = $this->strip_value($items[$idx]);
+                        $sizetarget = $this->strip_value($sizetargets[$idx]);
+
+                        $this->form['tests'][$i]['test'] = 'size';
+                        $this->form['tests'][$i]['type'] = $sizeop;
+                        $this->form['tests'][$i]['arg']  = $sizetarget;
+
+                        if ($sizetarget == '')
+                            $this->errors['tests'][$i]['sizetarget'] = $this->plugin->gettext('cannotbeempty');
+                        else if (!preg_match('/^[0-9]+(K|M|G)?$/i', $sizetarget.$sizeitem, $m)) {
+                            $this->errors['tests'][$i]['sizetarget'] = $this->plugin->gettext('forbiddenchars');
+                            $this->form['tests'][$i]['item'] = $sizeitem;
+                        }
+                        else
+                            $this->form['tests'][$i]['arg'] .= $m[1];
+                    }
+                    else if ($header == 'currentdate') {
+                        $datepart = $this->strip_value($dateparts[$idx]);
+
+                        if (preg_match('/^not/', $operator))
+                            $this->form['tests'][$i]['not'] = true;
+                        $type = preg_replace('/^not/', '', $operator);
+
+                        if ($type == 'exists') {
+                            $this->errors['tests'][$i]['op'] = true;
+                        }
+
+                        $this->form['tests'][$i]['test'] = 'currentdate';
+                        $this->form['tests'][$i]['type'] = $type;
+                        $this->form['tests'][$i]['part'] = $datepart;
+                        $this->form['tests'][$i]['arg']  = $target;
+
+                        if ($type != 'exists') {
+                            if (!count($target)) {
+                                $this->errors['tests'][$i]['target'] = $this->plugin->gettext('cannotbeempty');
+                            }
+                            else if ($type != 'regex' && $type != 'matches') {
+                                foreach ($target as $arg) {
+                                    if (!$this->validate_date_part($datepart, $arg)) {
+                                        $this->errors['tests'][$i]['target'] = $this->plugin->gettext('invaliddateformat');
+                                        break;
+                                    }
+                                }
+                            }
+                        }
+                    }
+                    else if ($header == 'date') {
+                        $datepart    = $this->strip_value($dateparts[$idx]);
+                        $dateheader  = $this->strip_value($dateheaders[$idx]);
+                        $index       = $this->strip_value($indexes[$idx]);
+                        $indexlast   = $this->strip_value($lastindexes[$idx]);
+
+                        if (preg_match('/^not/', $operator))
+                            $this->form['tests'][$i]['not'] = true;
+                        $type = preg_replace('/^not/', '', $operator);
+
+                        if ($type == 'exists') {
+                            $this->errors['tests'][$i]['op'] = true;
+                        }
+
+                        if (!empty($index) && $mod != 'envelope') {
+                            $this->form['tests'][$i]['index'] = intval($index);
+                            $this->form['tests'][$i]['last']  = !empty($indexlast);
+                        }
+
+                        if (empty($dateheader)) {
+                            $dateheader = 'Date';
+                        }
+                        else if (!preg_match('/^[\x21-\x39\x41-\x7E]+$/i', $dateheader)) {
+                            $this->errors['tests'][$i]['dateheader'] = $this->plugin->gettext('forbiddenchars');
+                        }
+
+                        $this->form['tests'][$i]['test']   = 'date';
+                        $this->form['tests'][$i]['type']   = $type;
+                        $this->form['tests'][$i]['part']   = $datepart;
+                        $this->form['tests'][$i]['arg']    = $target;
+                        $this->form['tests'][$i]['header'] = $dateheader;
+
+                        if ($type != 'exists') {
+                            if (!count($target)) {
+                                $this->errors['tests'][$i]['target'] = $this->plugin->gettext('cannotbeempty');
+                            }
+                            else if ($type != 'regex' && $type != 'matches') {
+                                foreach ($target as $arg) {
+                                    if (!$this->validate_date_part($datepart, $arg)) {
+                                        $this->errors['tests'][$i]['target'] = $this->plugin->gettext('invaliddateformat');
+                                        break;
+                                    }
+                                }
+                            }
+                        }
+                    }
+                    else if ($header == 'body') {
+                        $trans      = $this->strip_value($body_trans[$idx]);
+                        $trans_type = $this->strip_value($body_types[$idx], true);
+
+                        if (preg_match('/^not/', $operator))
+                            $this->form['tests'][$i]['not'] = true;
+                        $type = preg_replace('/^not/', '', $operator);
+
+                        if ($type == 'exists') {
+                            $this->errors['tests'][$i]['op'] = true;
+                        }
+
+                        $this->form['tests'][$i]['test'] = 'body';
+                        $this->form['tests'][$i]['type'] = $type;
+                        $this->form['tests'][$i]['arg']  = $target;
+
+                        if (empty($target) && $type != 'exists') {
+                            $this->errors['tests'][$i]['target'] = $this->plugin->gettext('cannotbeempty');
+                        }
+                        else if (preg_match('/^(value|count)-/', $type)) {
+                            foreach ($target as $target_value) {
+                                if (!preg_match('/[0-9]+/', $target_value)) {
+                                    $this->errors['tests'][$i]['target'] = $this->plugin->gettext('forbiddenchars');
+                                }
+                            }
+                        }
+
+                        $this->form['tests'][$i]['part'] = $trans;
+                        if ($trans == 'content') {
+                            $this->form['tests'][$i]['content'] = $trans_type;
+                        }
+                    }
+                    else {
+                        $cust_header = $headers = $this->strip_value(array_shift($cust_headers));
+                        $mod         = $this->strip_value($mods[$idx]);
+                        $mod_type    = $this->strip_value($mod_types[$idx]);
+                        $index       = $this->strip_value($indexes[$idx]);
+                        $indexlast   = $this->strip_value($lastindexes[$idx]);
+
+                        if (preg_match('/^not/', $operator))
+                            $this->form['tests'][$i]['not'] = true;
+                        $type = preg_replace('/^not/', '', $operator);
+
+                        if (!empty($index) && $mod != 'envelope') {
+                            $this->form['tests'][$i]['index'] = intval($index);
+                            $this->form['tests'][$i]['last']  = !empty($indexlast);
+                        }
+
+                        if ($header == '...') {
+                            if (!count($headers))
+                                $this->errors['tests'][$i]['header'] = $this->plugin->gettext('cannotbeempty');
+                            else {
+                                foreach ($headers as $hr) {
+                                    // RFC2822: printable ASCII except colon
+                                    if (!preg_match('/^[\x21-\x39\x41-\x7E]+$/i', $hr)) {
+                                        $this->errors['tests'][$i]['header'] = $this->plugin->gettext('forbiddenchars');
+                                    }
+                                }
+                            }
+
+                            if (empty($this->errors['tests'][$i]['header']))
+                                $cust_header = (is_array($headers) && count($headers) == 1) ? $headers[0] : $headers;
+                        }
+
+                        if ($type == 'exists') {
+                            $this->form['tests'][$i]['test'] = 'exists';
+                            $this->form['tests'][$i]['arg'] = $header == '...' ? $cust_header : $header;
+                        }
+                        else {
+                            $test   = 'header';
+                            $header = $header == '...' ? $cust_header : $header;
+
+                            if ($mod == 'address' || $mod == 'envelope') {
+                                $found = false;
+                                if (empty($this->errors['tests'][$i]['header'])) {
+                                    foreach ((array)$header as $hdr) {
+                                        if (!in_array(strtolower(trim($hdr)), $this->addr_headers))
+                                            $found = true;
+                                    }
+                                }
+                                if (!$found)
+                                    $test = $mod;
+                            }
+
+                            $this->form['tests'][$i]['type'] = $type;
+                            $this->form['tests'][$i]['test'] = $test;
+                            $this->form['tests'][$i]['arg1'] = $header;
+                            $this->form['tests'][$i]['arg2'] = $target;
+
+                            if (empty($target)) {
+                                $this->errors['tests'][$i]['target'] = $this->plugin->gettext('cannotbeempty');
+                            }
+                            else if (preg_match('/^(value|count)-/', $type)) {
+                                foreach ($target as $target_value) {
+                                    if (!preg_match('/[0-9]+/', $target_value)) {
+                                        $this->errors['tests'][$i]['target'] = $this->plugin->gettext('forbiddenchars');
+                                    }
+                                }
+                            }
+
+                            if ($mod) {
+                                $this->form['tests'][$i]['part'] = $mod_type;
+                            }
+                        }
+                    }
+
+                    if ($header != 'size' && $comparator) {
+                        if (preg_match('/^(value|count)/', $this->form['tests'][$i]['type']))
+                            $comparator = 'i;ascii-numeric';
+
+                        $this->form['tests'][$i]['comparator'] = $comparator;
+                    }
+
+                    $i++;
+                }
+            }
+
+            $i = 0;
+            // actions
+            foreach($act_types as $idx => $type) {
+                $type   = $this->strip_value($type);
+                $target = $this->strip_value($act_targets[$idx]);
+
+                switch ($type) {
+
+                case 'fileinto':
+                case 'fileinto_copy':
+                    $mailbox = $this->strip_value($mailboxes[$idx], false, false);
+                    $this->form['actions'][$i]['target'] = $this->mod_mailbox($mailbox, 'in');
+                    if ($type == 'fileinto_copy') {
+                        $type = 'fileinto';
+                        $this->form['actions'][$i]['copy'] = true;
+                    }
+                    break;
+
+                case 'reject':
+                case 'ereject':
+                    $target = $this->strip_value($area_targets[$idx]);
+                    $this->form['actions'][$i]['target'] = str_replace("\r\n", "\n", $target);
+
+ //                 if ($target == '')
+//                      $this->errors['actions'][$i]['targetarea'] = $this->plugin->gettext('cannotbeempty');
+                    break;
+
+                case 'redirect':
+                case 'redirect_copy':
+                    $this->form['actions'][$i]['target'] = $target;
+
+                    if ($this->form['actions'][$i]['target'] == '')
+                        $this->errors['actions'][$i]['target'] = $this->plugin->gettext('cannotbeempty');
+                    else if (!rcube_utils::check_email($this->form['actions'][$i]['target']))
+                        $this->errors['actions'][$i]['target'] = $this->plugin->gettext('noemailwarning');
+
+                    if ($type == 'redirect_copy') {
+                        $type = 'redirect';
+                        $this->form['actions'][$i]['copy'] = true;
+                    }
+                    break;
+
+                case 'addflag':
+                case 'setflag':
+                case 'removeflag':
+                    $_target = array();
+                    if (empty($flags[$idx])) {
+                        $this->errors['actions'][$i]['target'] = $this->plugin->gettext('noflagset');
+                    }
+                    else {
+                        foreach ($flags[$idx] as $flag) {
+                            $_target[] = $this->strip_value($flag);
+                        }
+                    }
+                    $this->form['actions'][$i]['target'] = $_target;
+                    break;
+
+                case 'vacation':
+                    $reason        = $this->strip_value($reasons[$idx]);
+                    $interval_type = $interval_types[$idx] == 'seconds' ? 'seconds' : 'days';
+                    $this->form['actions'][$i]['reason']    = str_replace("\r\n", "\n", $reason);
+                    $this->form['actions'][$i]['subject']   = $subject[$idx];
+                    $this->form['actions'][$i]['addresses'] = array_shift($addresses);
+                    $this->form['actions'][$i][$interval_type] = $intervals[$idx];
+// @TODO: vacation :mime, :from, :handle
+
+                    foreach ((array)$this->form['actions'][$i]['addresses'] as $aidx => $address) {
+                        if (!rcube_utils::check_email($address)) {
+                            $this->errors['actions'][$i]['addresses'] = $this->plugin->gettext('noemailwarning');
+                            break;
+                        }
+                    }
+
+                    if ($this->form['actions'][$i]['reason'] == '')
+                        $this->errors['actions'][$i]['reason'] = $this->plugin->gettext('cannotbeempty');
+                    if ($this->form['actions'][$i][$interval_type] && !preg_match('/^[0-9]+$/', $this->form['actions'][$i][$interval_type]))
+                        $this->errors['actions'][$i]['interval'] = $this->plugin->gettext('forbiddenchars');
+                    break;
+
+                case 'set':
+                    $this->form['actions'][$i]['name'] = $varnames[$idx];
+                    $this->form['actions'][$i]['value'] = $varvalues[$idx];
+                    foreach ((array)$varmods[$idx] as $v_m) {
+                        $this->form['actions'][$i][$v_m] = true;
+                    }
+
+                    if (empty($varnames[$idx])) {
+                        $this->errors['actions'][$i]['name'] = $this->plugin->gettext('cannotbeempty');
+                    }
+                    else if (!preg_match('/^[0-9a-z_]+$/i', $varnames[$idx])) {
+                        $this->errors['actions'][$i]['name'] = $this->plugin->gettext('forbiddenchars');
+                    }
+
+                    if (!isset($varvalues[$idx]) || $varvalues[$idx] === '') {
+                        $this->errors['actions'][$i]['value'] = $this->plugin->gettext('cannotbeempty');
+                    }
+                    break;
+
+                case 'notify':
+                    if (empty($notifyaddrs[$idx])) {
+                        $this->errors['actions'][$i]['address'] = $this->plugin->gettext('cannotbeempty');
+                    }
+                    else if (!rcube_utils::check_email($notifyaddrs[$idx])) {
+                        $this->errors['actions'][$i]['address'] = $this->plugin->gettext('noemailwarning');
+                    }
+                    if (!empty($notifyfrom[$idx]) && !rcube_utils::check_email($notifyfrom[$idx])) {
+                        $this->errors['actions'][$i]['from'] = $this->plugin->gettext('noemailwarning');
+                    }
+                    $this->form['actions'][$i]['address'] = $notifyaddrs[$idx];
+                    $this->form['actions'][$i]['body'] = $notifybodies[$idx];
+                    $this->form['actions'][$i]['message'] = $notifymessages[$idx];
+                    $this->form['actions'][$i]['from'] = $notifyfrom[$idx];
+                    $this->form['actions'][$i]['importance'] = $notifyimp[$idx];
+                    break;
+                }
+
+                $this->form['actions'][$i]['type'] = $type;
+                $i++;
+            }
+
+            if (!$this->errors && !$error) {
+                // zapis skryptu
+                if (!isset($this->script[$fid])) {
+                    $fid = $this->sieve->script->add_rule($this->form);
+                    $new = true;
+                } else
+                    $fid = $this->sieve->script->update_rule($fid, $this->form);
+
+                if ($fid !== false)
+                    $save = $this->save_script();
+
+                if ($save && $fid !== false) {
+                    $this->rc->output->show_message('managesieve.filtersaved', 'confirmation');
+                    if ($this->rc->task != 'mail') {
+                        $this->rc->output->command('parent.managesieve_updatelist',
+                            isset($new) ? 'add' : 'update',
+                            array(
+                                'name' => rcube::Q($this->form['name']),
+                                'id' => $fid,
+                                'disabled' => $this->form['disabled']
+                        ));
+                    }
+                    else {
+                        $this->rc->output->command('managesieve_dialog_close');
+                        $this->rc->output->send('iframe');
+                    }
+                }
+                else {
+                    $this->rc->output->show_message('managesieve.filtersaveerror', 'error');
+//                  $this->rc->output->send();
+                }
+            }
+        }
+
+        $this->send();
+    }
+
+    private function send()
+    {
+        // Handle form action
+        if (isset($_GET['_framed']) || isset($_POST['_framed'])) {
+            if (isset($_GET['_newset']) || isset($_POST['_newset'])) {
+                $this->rc->output->send('managesieve.setedit');
+            }
+            else {
+                $this->rc->output->send('managesieve.filteredit');
+            }
+        } else {
+            $this->rc->output->set_pagetitle($this->plugin->gettext('filters'));
+            $this->rc->output->send('managesieve.managesieve');
+        }
+    }
+
+    // return the filters list as HTML table
+    function filters_list($attrib)
+    {
+        // add id to message list table if not specified
+        if (!strlen($attrib['id']))
+            $attrib['id'] = 'rcmfilterslist';
+
+        // define list of cols to be displayed
+        $a_show_cols = array('name');
+
+        $result = $this->list_rules();
+
+        // create XHTML table
+        $out = $this->rc->table_output($attrib, $result, $a_show_cols, 'id');
+
+        // set client env
+        $this->rc->output->add_gui_object('filterslist', $attrib['id']);
+        $this->rc->output->include_script('list.js');
+
+        // add some labels to client
+        $this->rc->output->add_label('managesieve.filterdeleteconfirm');
+
+        return $out;
+    }
+
+    // return the filters list as <SELECT>
+    function filtersets_list($attrib, $no_env = false)
+    {
+        // add id to message list table if not specified
+        if (!strlen($attrib['id']))
+            $attrib['id'] = 'rcmfiltersetslist';
+
+        $list = $this->list_scripts();
+
+        if ($list) {
+            asort($list, SORT_LOCALE_STRING);
+        }
+
+        if (!empty($attrib['type']) && $attrib['type'] == 'list') {
+            // define list of cols to be displayed
+            $a_show_cols = array('name');
+
+            if ($list) {
+                foreach ($list as $idx => $set) {
+                    $scripts['S'.$idx] = $set;
+                    $result[] = array(
+                        'name' => rcube::Q($set),
+                        'id' => 'S'.$idx,
+                        'class' => !in_array($set, $this->active) ? 'disabled' : '',
+                    );
+                }
+            }
+
+            // create XHTML table
+            $out = $this->rc->table_output($attrib, $result, $a_show_cols, 'id');
+
+            $this->rc->output->set_env('filtersets', $scripts);
+            $this->rc->output->include_script('list.js');
+        }
+        else {
+            $select = new html_select(array('name' => '_set', 'id' => $attrib['id'],
+                'onchange' => $this->rc->task != 'mail' ? 'rcmail.managesieve_set()' : ''));
+
+            if ($list) {
+                foreach ($list as $set)
+                    $select->add($set, $set);
+            }
+
+            $out = $select->show($this->sieve->current);
+        }
+
+        // set client env
+        if (!$no_env) {
+            $this->rc->output->add_gui_object('filtersetslist', $attrib['id']);
+            $this->rc->output->add_label('managesieve.setdeleteconfirm');
+        }
+
+        return $out;
+    }
+
+    function filter_frame($attrib)
+    {
+        if (!$attrib['id'])
+            $attrib['id'] = 'rcmfilterframe';
+
+        $attrib['name'] = $attrib['id'];
+
+        $this->rc->output->set_env('contentframe', $attrib['name']);
+        $this->rc->output->set_env('blankpage', $attrib['src'] ?
+        $this->rc->output->abs_url($attrib['src']) : 'program/resources/blank.gif');
+
+        return $this->rc->output->frame($attrib);
+    }
+
+    function filterset_form($attrib)
+    {
+        if (!$attrib['id'])
+            $attrib['id'] = 'rcmfiltersetform';
+
+        $out = '<form name="filtersetform" action="./" method="post" enctype="multipart/form-data">'."\n";
+
+        $hiddenfields = new html_hiddenfield(array('name' => '_task', 'value' => $this->rc->task));
+        $hiddenfields->add(array('name' => '_action', 'value' => 'plugin.managesieve-save'));
+        $hiddenfields->add(array('name' => '_framed', 'value' => ($_POST['_framed'] || $_GET['_framed'] ? 1 : 0)));
+        $hiddenfields->add(array('name' => '_newset', 'value' => 1));
+
+        $out .= $hiddenfields->show();
+
+        $name     = rcube_utils::get_input_value('_name', rcube_utils::INPUT_POST);
+        $copy     = rcube_utils::get_input_value('_copy', rcube_utils::INPUT_POST);
+        $selected = rcube_utils::get_input_value('_from', rcube_utils::INPUT_POST);
+
+        // filter set name input
+        $input_name = new html_inputfield(array('name' => '_name', 'id' => '_name', 'size' => 30,
+            'class' => ($this->errors['name'] ? 'error' : '')));
+
+        $out .= sprintf('<label for="%s"><b>%s:</b></label> %s<br /><br />',
+            '_name', rcube::Q($this->plugin->gettext('filtersetname')), $input_name->show($name));
+
+        $out .="\n<fieldset class=\"itemlist\"><legend>" . $this->plugin->gettext('filters') . ":</legend>\n";
+        $out .= '<input type="radio" id="from_none" name="_from" value="none"'
+            .(!$selected || $selected=='none' ? ' checked="checked"' : '').'></input>';
+        $out .= sprintf('<label for="%s">%s</label> ', 'from_none', rcube::Q($this->plugin->gettext('none')));
+
+        // filters set list
+        $list   = $this->list_scripts();
+        $select = new html_select(array('name' => '_copy', 'id' => '_copy'));
+
+        if (is_array($list)) {
+            asort($list, SORT_LOCALE_STRING);
+
+            if (!$copy)
+                $copy = $_SESSION['managesieve_current'];
+
+            foreach ($list as $set) {
+                $select->add($set, $set);
+            }
+
+            $out .= '<br /><input type="radio" id="from_set" name="_from" value="set"'
+                .($selected=='set' ? ' checked="checked"' : '').'></input>';
+            $out .= sprintf('<label for="%s">%s:</label> ', 'from_set', rcube::Q($this->plugin->gettext('fromset')));
+            $out .= $select->show($copy);
+        }
+
+        // script upload box
+        $upload = new html_inputfield(array('name' => '_file', 'id' => '_file', 'size' => 30,
+            'type' => 'file', 'class' => ($this->errors['file'] ? 'error' : '')));
+
+        $out .= '<br /><input type="radio" id="from_file" name="_from" value="file"'
+            .($selected=='file' ? ' checked="checked"' : '').'></input>';
+        $out .= sprintf('<label for="%s">%s:</label> ', 'from_file', rcube::Q($this->plugin->gettext('fromfile')));
+        $out .= $upload->show();
+        $out .= '</fieldset>';
+
+        $this->rc->output->add_gui_object('sieveform', 'filtersetform');
+
+        if ($this->errors['name'])
+            $this->add_tip('_name', $this->errors['name'], true);
+        if ($this->errors['file'])
+            $this->add_tip('_file', $this->errors['file'], true);
+
+        $this->print_tips();
+
+        return $out;
+    }
+
+
+    function filter_form($attrib)
+    {
+        if (!$attrib['id'])
+            $attrib['id'] = 'rcmfilterform';
+
+        $fid = rcube_utils::get_input_value('_fid', rcube_utils::INPUT_GPC);
+        $scr = isset($this->form) ? $this->form : $this->script[$fid];
+
+        $hiddenfields = new html_hiddenfield(array('name' => '_task', 'value' => $this->rc->task));
+        $hiddenfields->add(array('name' => '_action', 'value' => 'plugin.managesieve-save'));
+        $hiddenfields->add(array('name' => '_framed', 'value' => ($_POST['_framed'] || $_GET['_framed'] ? 1 : 0)));
+        $hiddenfields->add(array('name' => '_fid', 'value' => $fid));
+
+        $out = '<form name="filterform" action="./" method="post">'."\n";
+        $out .= $hiddenfields->show();
+
+        // 'any' flag
+        if (sizeof($scr['tests']) == 1 && $scr['tests'][0]['test'] == 'true' && !$scr['tests'][0]['not'])
+            $any = true;
+
+        // filter name input
+        $field_id = '_name';
+        $input_name = new html_inputfield(array('name' => '_name', 'id' => $field_id, 'size' => 30,
+            'class' => ($this->errors['name'] ? 'error' : '')));
+
+        if ($this->errors['name'])
+            $this->add_tip($field_id, $this->errors['name'], true);
+
+        if (isset($scr))
+            $input_name = $input_name->show($scr['name']);
+        else
+            $input_name = $input_name->show();
+
+        $out .= sprintf("\n<label for=\"%s\"><b>%s:</b></label> %s\n",
+            $field_id, rcube::Q($this->plugin->gettext('filtername')), $input_name);
+
+        // filter set selector
+        if ($this->rc->task == 'mail') {
+            $out .= sprintf("\n&nbsp;<label for=\"%s\"><b>%s:</b></label> %s\n",
+                $field_id, rcube::Q($this->plugin->gettext('filterset')),
+                $this->filtersets_list(array('id' => 'sievescriptname'), true));
+        }
+
+        $out .= '<br /><br /><fieldset><legend>' . rcube::Q($this->plugin->gettext('messagesrules')) . "</legend>\n";
+
+        // any, allof, anyof radio buttons
+        $field_id = '_allof';
+        $input_join = new html_radiobutton(array('name' => '_join', 'id' => $field_id, 'value' => 'allof',
+            'onclick' => 'rule_join_radio(\'allof\')', 'class' => 'radio'));
+
+        if (isset($scr) && !$any)
+            $input_join = $input_join->show($scr['join'] ? 'allof' : '');
+        else
+            $input_join = $input_join->show();
+
+        $out .= sprintf("%s<label for=\"%s\">%s</label>&nbsp;\n",
+            $input_join, $field_id, rcube::Q($this->plugin->gettext('filterallof')));
+
+        $field_id = '_anyof';
+        $input_join = new html_radiobutton(array('name' => '_join', 'id' => $field_id, 'value' => 'anyof',
+            'onclick' => 'rule_join_radio(\'anyof\')', 'class' => 'radio'));
+
+        if (isset($scr) && !$any)
+            $input_join = $input_join->show($scr['join'] ? '' : 'anyof');
+        else
+            $input_join = $input_join->show('anyof'); // default
+
+        $out .= sprintf("%s<label for=\"%s\">%s</label>\n",
+            $input_join, $field_id, rcube::Q($this->plugin->gettext('filteranyof')));
+
+        $field_id = '_any';
+        $input_join = new html_radiobutton(array('name' => '_join', 'id' => $field_id, 'value' => 'any',
+            'onclick' => 'rule_join_radio(\'any\')', 'class' => 'radio'));
+
+        $input_join = $input_join->show($any ? 'any' : '');
+
+        $out .= sprintf("%s<label for=\"%s\">%s</label>\n",
+            $input_join, $field_id, rcube::Q($this->plugin->gettext('filterany')));
+
+        $rows_num = isset($scr) ? sizeof($scr['tests']) : 1;
+
+        $out .= '<div id="rules"'.($any ? ' style="display: none"' : '').'>';
+        for ($x=0; $x<$rows_num; $x++)
+            $out .= $this->rule_div($fid, $x);
+        $out .= "</div>\n";
+
+        $out .= "</fieldset>\n";
+
+        // actions
+        $out .= '<fieldset><legend>' . rcube::Q($this->plugin->gettext('messagesactions')) . "</legend>\n";
+
+        $rows_num = isset($scr) ? sizeof($scr['actions']) : 1;
+
+        $out .= '<div id="actions">';
+        for ($x=0; $x<$rows_num; $x++)
+            $out .= $this->action_div($fid, $x);
+        $out .= "</div>\n";
+
+        $out .= "</fieldset>\n";
+
+        $this->print_tips();
+
+        if ($scr['disabled']) {
+            $this->rc->output->set_env('rule_disabled', true);
+        }
+        $this->rc->output->add_label(
+            'managesieve.ruledeleteconfirm',
+            'managesieve.actiondeleteconfirm'
+        );
+        $this->rc->output->add_gui_object('sieveform', 'filterform');
+
+        return $out;
+    }
+
+    function rule_div($fid, $id, $div=true)
+    {
+        $rule     = isset($this->form) ? $this->form['tests'][$id] : $this->script[$fid]['tests'][$id];
+        $rows_num = isset($this->form) ? sizeof($this->form['tests']) : sizeof($this->script[$fid]['tests']);
+
+        // headers select
+        $select_header = new html_select(array('name' => "_header[]", 'id' => 'header'.$id,
+            'onchange' => 'rule_header_select(' .$id .')'));
+
+        foreach ($this->headers as $name => $val)
+            $select_header->add(rcube::Q($this->plugin->gettext($name)), Q($val));
+        $select_header->add(rcube::Q($this->plugin->gettext('...')), '...');
+        if (in_array('body', $this->exts))
+            $select_header->add(rcube::Q($this->plugin->gettext('body')), 'body');
+        $select_header->add(rcube::Q($this->plugin->gettext('size')), 'size');
+        if (in_array('date', $this->exts)) {
+            $select_header->add(rcube::Q($this->plugin->gettext('datetest')), 'date');
+            $select_header->add(rcube::Q($this->plugin->gettext('currdate')), 'currentdate');
+        }
+
+        if (isset($rule['test'])) {
+            if (in_array($rule['test'], array('header', 'address', 'envelope'))
+                && !is_array($rule['arg1']) && in_array($rule['arg1'], $this->headers)
+            ) {
+                $test = $rule['arg1'];
+            }
+            else if ($rule['test'] == 'exists'
+                && !is_array($rule['arg']) && in_array($rule['arg'], $this->headers)
+            ) {
+                $test = $rule['arg'];
+            }
+            else if (in_array($rule['test'], array('size', 'body', 'date', 'currentdate'))) {
+                $test = $rule['test'];
+            }
+            else if ($rule['test'] != 'true') {
+                $test = '...';
+            }
+        }
+
+        $aout = $select_header->show($test);
+
+        // custom headers input
+        if (isset($rule['test']) && in_array($rule['test'], array('header', 'address', 'envelope'))) {
+            $custom = (array) $rule['arg1'];
+            if (count($custom) == 1 && isset($this->headers[strtolower($custom[0])])) {
+                unset($custom);
+            }
+        }
+        else if (isset($rule['test']) && $rule['test'] == 'exists') {
+            $custom = (array) $rule['arg'];
+            if (count($custom) == 1 && isset($this->headers[strtolower($custom[0])])) {
+                unset($custom);
+            }
+        }
+
+        $tout = $this->list_input($id, 'custom_header', $custom, isset($custom),
+            $this->error_class($id, 'test', 'header', 'custom_header'), 15) . "\n";
+
+        // matching type select (operator)
+        $select_op = new html_select(array('name' => "_rule_op[]", 'id' => 'rule_op'.$id,
+            'style' => 'display:' .($rule['test']!='size' ? 'inline' : 'none'),
+            'class' => 'operator_selector',
+            'onchange' => 'rule_op_select(this, '.$id.')'));
+        $select_op->add(rcube::Q($this->plugin->gettext('filtercontains')), 'contains');
+        $select_op->add(rcube::Q($this->plugin->gettext('filternotcontains')), 'notcontains');
+        $select_op->add(rcube::Q($this->plugin->gettext('filteris')), 'is');
+        $select_op->add(rcube::Q($this->plugin->gettext('filterisnot')), 'notis');
+        $select_op->add(rcube::Q($this->plugin->gettext('filterexists')), 'exists');
+        $select_op->add(rcube::Q($this->plugin->gettext('filternotexists')), 'notexists');
+        $select_op->add(rcube::Q($this->plugin->gettext('filtermatches')), 'matches');
+        $select_op->add(rcube::Q($this->plugin->gettext('filternotmatches')), 'notmatches');
+        if (in_array('regex', $this->exts)) {
+            $select_op->add(rcube::Q($this->plugin->gettext('filterregex')), 'regex');
+            $select_op->add(rcube::Q($this->plugin->gettext('filternotregex')), 'notregex');
+        }
+        if (in_array('relational', $this->exts)) {
+            $select_op->add(rcube::Q($this->plugin->gettext('countisgreaterthan')), 'count-gt');
+            $select_op->add(rcube::Q($this->plugin->gettext('countisgreaterthanequal')), 'count-ge');
+            $select_op->add(rcube::Q($this->plugin->gettext('countislessthan')), 'count-lt');
+            $select_op->add(rcube::Q($this->plugin->gettext('countislessthanequal')), 'count-le');
+            $select_op->add(rcube::Q($this->plugin->gettext('countequals')), 'count-eq');
+            $select_op->add(rcube::Q($this->plugin->gettext('countnotequals')), 'count-ne');
+            $select_op->add(rcube::Q($this->plugin->gettext('valueisgreaterthan')), 'value-gt');
+            $select_op->add(rcube::Q($this->plugin->gettext('valueisgreaterthanequal')), 'value-ge');
+            $select_op->add(rcube::Q($this->plugin->gettext('valueislessthan')), 'value-lt');
+            $select_op->add(rcube::Q($this->plugin->gettext('valueislessthanequal')), 'value-le');
+            $select_op->add(rcube::Q($this->plugin->gettext('valueequals')), 'value-eq');
+            $select_op->add(rcube::Q($this->plugin->gettext('valuenotequals')), 'value-ne');
+        }
+
+        // (current)date part select
+        if (in_array('date', $this->exts) || in_array('currentdate', $this->exts)) {
+            $date_parts = array('date', 'iso8601', 'std11', 'julian', 'time',
+                'year', 'month', 'day', 'hour', 'minute', 'second', 'weekday', 'zone');
+            $select_dp = new html_select(array('name' => "_rule_date_part[]", 'id' => 'rule_date_part'.$id,
+                'style' => $rule['test'] == 'currentdate' || $rule['test'] == 'date' ? '' : 'display:none',
+                'class' => 'datepart_selector',
+            ));
+
+            foreach ($date_parts as $part) {
+                $select_dp->add(rcube::Q($this->plugin->gettext($part)), $part);
+            }
+
+            $tout .= $select_dp->show($rule['test'] == 'currentdate' || $rule['test'] == 'date' ? $rule['part'] : '');
+        }
+
+        // target(s) input
+        if (in_array($rule['test'], array('header', 'address', 'envelope'))) {
+            $test   = ($rule['not'] ? 'not' : '').($rule['type'] ? $rule['type'] : 'is');
+            $target = $rule['arg2'];
+        }
+        else if (in_array($rule['test'], array('body', 'date', 'currentdate'))) {
+            $test   = ($rule['not'] ? 'not' : '').($rule['type'] ? $rule['type'] : 'is');
+            $target = $rule['arg'];
+        }
+        else if ($rule['test'] == 'size') {
+            $test   = '';
+            $target = '';
+            if (preg_match('/^([0-9]+)(K|M|G)?$/', $rule['arg'], $matches)) {
+                $sizetarget = $matches[1];
+                $sizeitem = $matches[2];
+            }
+            else {
+                $sizetarget = $rule['arg'];
+                $sizeitem = $rule['item'];
+            }
+        }
+        else {
+            $test   = ($rule['not'] ? 'not' : '').$rule['test'];
+            $target =  '';
+        }
+
+        $tout .= $select_op->show($test);
+        $tout .= $this->list_input($id, 'rule_target', $target,
+            $rule['test'] != 'size' && $rule['test'] != 'exists',
+            $this->error_class($id, 'test', 'target', 'rule_target')) . "\n";
+
+        $select_size_op = new html_select(array('name' => "_rule_size_op[]", 'id' => 'rule_size_op'.$id));
+        $select_size_op->add(rcube::Q($this->plugin->gettext('filterover')), 'over');
+        $select_size_op->add(rcube::Q($this->plugin->gettext('filterunder')), 'under');
+
+        $tout .= '<div id="rule_size' .$id. '" style="display:' . ($rule['test']=='size' ? 'inline' : 'none') .'">';
+        $tout .= $select_size_op->show($rule['test']=='size' ? $rule['type'] : '');
+        $tout .= '<input type="text" name="_rule_size_target[]" id="rule_size_i'.$id.'" value="'.$sizetarget.'" size="10" ' 
+            . $this->error_class($id, 'test', 'sizetarget', 'rule_size_i') .' />
+            <label><input type="radio" name="_rule_size_item['.$id.']" value=""'
+                . (!$sizeitem ? ' checked="checked"' : '') .' class="radio" />'.$this->rc->gettext('B').'</label>
+            <label><input type="radio" name="_rule_size_item['.$id.']" value="K"'
+                . ($sizeitem=='K' ? ' checked="checked"' : '') .' class="radio" />'.$this->rc->gettext('KB').'</label>
+            <label><input type="radio" name="_rule_size_item['.$id.']" value="M"'
+                . ($sizeitem=='M' ? ' checked="checked"' : '') .' class="radio" />'.$this->rc->gettext('MB').'</label>
+            <label><input type="radio" name="_rule_size_item['.$id.']" value="G"'
+                . ($sizeitem=='G' ? ' checked="checked"' : '') .' class="radio" />'.$this->rc->gettext('GB').'</label>';
+        $tout .= '</div>';
+
+        // Advanced modifiers (address, envelope)
+        $select_mod = new html_select(array('name' => "_rule_mod[]", 'id' => 'rule_mod_op'.$id,
+            'onchange' => 'rule_mod_select(' .$id .')'));
+        $select_mod->add(rcube::Q($this->plugin->gettext('none')), '');
+        $select_mod->add(rcube::Q($this->plugin->gettext('address')), 'address');
+        if (in_array('envelope', $this->exts))
+            $select_mod->add(rcube::Q($this->plugin->gettext('envelope')), 'envelope');
+
+        $select_type = new html_select(array('name' => "_rule_mod_type[]", 'id' => 'rule_mod_type'.$id));
+        $select_type->add(rcube::Q($this->plugin->gettext('allparts')), 'all');
+        $select_type->add(rcube::Q($this->plugin->gettext('domain')), 'domain');
+        $select_type->add(rcube::Q($this->plugin->gettext('localpart')), 'localpart');
+        if (in_array('subaddress', $this->exts)) {
+            $select_type->add(rcube::Q($this->plugin->gettext('user')), 'user');
+            $select_type->add(rcube::Q($this->plugin->gettext('detail')), 'detail');
+        }
+
+        $need_mod = $rule['test'] != 'size' && $rule['test'] != 'body';
+        $mout = '<div id="rule_mod' .$id. '" class="adv"' . (!$need_mod ? ' style="display:none"' : '') . '>';
+        $mout .= ' <span class="label">' . rcube::Q($this->plugin->gettext('modifier')) . ' </span>';
+        $mout .= $select_mod->show($rule['test']);
+        $mout .= ' <span id="rule_mod_type' . $id . '"';
+        $mout .= ' style="display:' . (in_array($rule['test'], array('address', 'envelope')) ? 'inline' : 'none') .'">';
+        $mout .= rcube::Q($this->plugin->gettext('modtype')) . ' ';
+        $mout .= $select_type->show($rule['part']);
+        $mout .= '</span>';
+        $mout .= '</div>';
+
+        // Advanced modifiers (body transformations)
+        $select_mod = new html_select(array('name' => "_rule_trans[]", 'id' => 'rule_trans_op'.$id,
+            'onchange' => 'rule_trans_select(' .$id .')'));
+        $select_mod->add(rcube::Q($this->plugin->gettext('text')), 'text');
+        $select_mod->add(rcube::Q($this->plugin->gettext('undecoded')), 'raw');
+        $select_mod->add(rcube::Q($this->plugin->gettext('contenttype')), 'content');
+
+        $mout .= '<div id="rule_trans' .$id. '" class="adv"' . ($rule['test'] != 'body' ? ' style="display:none"' : '') . '>';
+        $mout .= '<span class="label">' . rcube::Q($this->plugin->gettext('modifier')) . '</span>';
+        $mout .= $select_mod->show($rule['part']);
+        $mout .= '<input type="text" name="_rule_trans_type[]" id="rule_trans_type'.$id
+            . '" value="'.(is_array($rule['content']) ? implode(',', $rule['content']) : $rule['content'])
+            .'" size="20"' . ($rule['part'] != 'content' ? ' style="display:none"' : '')
+            . $this->error_class($id, 'test', 'part', 'rule_trans_type') .' />';
+        $mout .= '</div>';
+
+        // Advanced modifiers (body transformations)
+        $select_comp = new html_select(array('name' => "_rule_comp[]", 'id' => 'rule_comp_op'.$id));
+        $select_comp->add(rcube::Q($this->plugin->gettext('default')), '');
+        $select_comp->add(rcube::Q($this->plugin->gettext('octet')), 'i;octet');
+        $select_comp->add(rcube::Q($this->plugin->gettext('asciicasemap')), 'i;ascii-casemap');
+        if (in_array('comparator-i;ascii-numeric', $this->exts)) {
+            $select_comp->add(rcube::Q($this->plugin->gettext('asciinumeric')), 'i;ascii-numeric');
+        }
+
+        // Comparators
+        $mout .= '<div id="rule_comp' .$id. '" class="adv"' . ($rule['test'] == 'size' ? ' style="display:none"' : '') . '>';
+        $mout .= '<span class="label">' . rcube::Q($this->plugin->gettext('comparator')) . '</span>';
+        $mout .= $select_comp->show($rule['comparator']);
+        $mout .= '</div>';
+
+        // Date header
+        if (in_array('date', $this->exts)) {
+            $mout .= '<div id="rule_date_header_div' .$id. '" class="adv"'. ($rule['test'] != 'date' ? ' style="display:none"' : '') .'>';
+            $mout .= '<span class="label">' . rcube::Q($this->plugin->gettext('dateheader')) . '</span>';
+            $mout .= '<input type="text" name="_rule_date_header[]" id="rule_date_header'.$id
+                . '" value="'. Q($rule['test'] == 'date' ? $rule['header'] : '')
+                . '" size="15"' . $this->error_class($id, 'test', 'dateheader', 'rule_date_header') .' />';
+            $mout .= '</div>';
+        }
+
+        // Index
+        if (in_array('index', $this->exts)) {
+            $need_index = in_array($rule['test'], array('header', ', address', 'date'));
+            $mout .= '<div id="rule_index_div' .$id. '" class="adv"'. (!$need_index ? ' style="display:none"' : '') .'>';
+            $mout .= '<span class="label">' . rcube::Q($this->plugin->gettext('index')) . '</span>';
+            $mout .= '<input type="text" name="_rule_index[]" id="rule_index'.$id
+                . '" value="'. ($rule['index'] ? intval($rule['index']) : '')
+                . '" size="3"' . $this->error_class($id, 'test', 'index', 'rule_index') .' />';
+            $mout .= '&nbsp;<input type="checkbox" name="_rule_index_last[]" id="rule_index_last'.$id
+                . '" value="1"' . (!empty($rule['last']) ? ' checked="checked"' : '') . ' />'
+                . '<label for="rule_index_last'.$id.'">'.rcube::Q($this->plugin->gettext('indexlast')).'</label>';
+            $mout .= '</div>';
+        }
+
+        // Build output table
+        $out = $div ? '<div class="rulerow" id="rulerow' .$id .'">'."\n" : '';
+        $out .= '<table><tr>';
+        $out .= '<td class="advbutton">';
+        $out .= '<a href="#" id="ruleadv' . $id .'" title="'. rcube::Q($this->plugin->gettext('advancedopts')). '"
+            onclick="rule_adv_switch(' . $id .', this)" class="show">&nbsp;&nbsp;</a>';
+        $out .= '</td>';
+        $out .= '<td class="rowactions">' . $aout . '</td>';
+        $out .= '<td class="rowtargets">' . $tout . "\n";
+        $out .= '<div id="rule_advanced' .$id. '" style="display:none">' . $mout . '</div>';
+        $out .= '</td>';
+
+        // add/del buttons
+        $out .= '<td class="rowbuttons">';
+        $out .= '<a href="#" id="ruleadd' . $id .'" title="'. rcube::Q($this->plugin->gettext('add')). '"
+            onclick="rcmail.managesieve_ruleadd(' . $id .')" class="button add"></a>';
+        $out .= '<a href="#" id="ruledel' . $id .'" title="'. rcube::Q($this->plugin->gettext('del')). '"
+            onclick="rcmail.managesieve_ruledel(' . $id .')" class="button del' . ($rows_num<2 ? ' disabled' : '') .'"></a>';
+        $out .= '</td>';
+        $out .= '</tr></table>';
+
+        $out .= $div ? "</div>\n" : '';
+
+        return $out;
+    }
+
+    function action_div($fid, $id, $div=true)
+    {
+        $action   = isset($this->form) ? $this->form['actions'][$id] : $this->script[$fid]['actions'][$id];
+        $rows_num = isset($this->form) ? sizeof($this->form['actions']) : sizeof($this->script[$fid]['actions']);
+
+        $out = $div ? '<div class="actionrow" id="actionrow' .$id .'">'."\n" : '';
+
+        $out .= '<table><tr><td class="rowactions">';
+
+        // action select
+        $select_action = new html_select(array('name' => "_action_type[$id]", 'id' => 'action_type'.$id,
+            'onchange' => 'action_type_select(' .$id .')'));
+        if (in_array('fileinto', $this->exts))
+            $select_action->add(rcube::Q($this->plugin->gettext('messagemoveto')), 'fileinto');
+        if (in_array('fileinto', $this->exts) && in_array('copy', $this->exts))
+            $select_action->add(rcube::Q($this->plugin->gettext('messagecopyto')), 'fileinto_copy');
+        $select_action->add(rcube::Q($this->plugin->gettext('messageredirect')), 'redirect');
+        if (in_array('copy', $this->exts))
+            $select_action->add(rcube::Q($this->plugin->gettext('messagesendcopy')), 'redirect_copy');
+        if (in_array('reject', $this->exts))
+            $select_action->add(rcube::Q($this->plugin->gettext('messagediscard')), 'reject');
+        else if (in_array('ereject', $this->exts))
+            $select_action->add(rcube::Q($this->plugin->gettext('messagediscard')), 'ereject');
+        if (in_array('vacation', $this->exts))
+            $select_action->add(rcube::Q($this->plugin->gettext('messagereply')), 'vacation');
+        $select_action->add(rcube::Q($this->plugin->gettext('messagedelete')), 'discard');
+        if (in_array('imapflags', $this->exts) || in_array('imap4flags', $this->exts)) {
+            $select_action->add(rcube::Q($this->plugin->gettext('setflags')), 'setflag');
+            $select_action->add(rcube::Q($this->plugin->gettext('addflags')), 'addflag');
+            $select_action->add(rcube::Q($this->plugin->gettext('removeflags')), 'removeflag');
+        }
+        if (in_array('variables', $this->exts)) {
+            $select_action->add(rcube::Q($this->plugin->gettext('setvariable')), 'set');
+        }
+        if (in_array('enotify', $this->exts) || in_array('notify', $this->exts)) {
+            $select_action->add(rcube::Q($this->plugin->gettext('notify')), 'notify');
+        }
+        $select_action->add(rcube::Q($this->plugin->gettext('rulestop')), 'stop');
+
+        $select_type = $action['type'];
+        if (in_array($action['type'], array('fileinto', 'redirect')) && $action['copy']) {
+            $select_type .= '_copy';
+        }
+
+        $out .= $select_action->show($select_type);
+        $out .= '</td>';
+
+        // actions target inputs
+        $out .= '<td class="rowtargets">';
+        // shared targets
+        $out .= '<input type="text" name="_action_target['.$id.']" id="action_target' .$id. '" '
+            .'value="' .($action['type']=='redirect' ? rcube::Q($action['target'], 'strict', false) : ''). '" size="35" '
+            .'style="display:' .($action['type']=='redirect' ? 'inline' : 'none') .'" '
+            . $this->error_class($id, 'action', 'target', 'action_target') .' />';
+        $out .= '<textarea name="_action_target_area['.$id.']" id="action_target_area' .$id. '" '
+            .'rows="3" cols="35" '. $this->error_class($id, 'action', 'targetarea', 'action_target_area')
+            .'style="display:' .(in_array($action['type'], array('reject', 'ereject')) ? 'inline' : 'none') .'">'
+            . (in_array($action['type'], array('reject', 'ereject')) ? rcube::Q($action['target'], 'strict', false) : '')
+            . "</textarea>\n";
+
+        // vacation
+        $vsec = in_array('vacation-seconds', $this->exts);
+        $out .= '<div id="action_vacation' .$id.'" style="display:' .($action['type']=='vacation' ? 'inline' : 'none') .'">';
+        $out .= '<span class="label">'. rcube::Q($this->plugin->gettext('vacationreason')) .'</span><br />'
+            .'<textarea name="_action_reason['.$id.']" id="action_reason' .$id. '" '
+            .'rows="3" cols="35" '. $this->error_class($id, 'action', 'reason', 'action_reason') . '>'
+            . Q($action['reason'], 'strict', false) . "</textarea>\n";
+        $out .= '<br /><span class="label">' .rcube::Q($this->plugin->gettext('vacationsubject')) . '</span><br />'
+            .'<input type="text" name="_action_subject['.$id.']" id="action_subject'.$id.'" '
+            .'value="' . (is_array($action['subject']) ? rcube::Q(implode(', ', $action['subject']), 'strict', false) : $action['subject']) . '" size="35" '
+            . $this->error_class($id, 'action', 'subject', 'action_subject') .' />';
+        $out .= '<br /><span class="label">' .rcube::Q($this->plugin->gettext('vacationaddr')) . '</span><br />'
+            . $this->list_input($id, 'action_addresses', $action['addresses'], true,
+                $this->error_class($id, 'action', 'addresses', 'action_addresses'), 30);
+        $out .= '<br /><span class="label">' . rcube::Q($this->plugin->gettext($vsec ? 'vacationinterval' : 'vacationdays')) . '</span><br />'
+            .'<input type="text" name="_action_interval['.$id.']" id="action_interval'.$id.'" '
+            .'value="' .rcube::Q(isset($action['seconds']) ? $action['seconds'] : $action['days'], 'strict', false) . '" size="2" '
+            . $this->error_class($id, 'action', 'interval', 'action_interval') .' />';
+        if ($vsec) {
+            $out .= '&nbsp;<label><input type="radio" name="_action_interval_type['.$id.']" value="days"'
+                . (!isset($action['seconds']) ? ' checked="checked"' : '') .' class="radio" />'.$this->plugin->gettext('days').'</label>'
+                . '&nbsp;<label><input type="radio" name="_action_interval_type['.$id.']" value="seconds"'
+                . (isset($action['seconds']) ? ' checked="checked"' : '') .' class="radio" />'.$this->plugin->gettext('seconds').'</label>';
+        }
+        $out .= '</div>';
+
+        // flags
+        $flags = array(
+            'read'      => '\\Seen',
+            'answered'  => '\\Answered',
+            'flagged'   => '\\Flagged',
+            'deleted'   => '\\Deleted',
+            'draft'     => '\\Draft',
+        );
+        $flags_target = (array)$action['target'];
+
+        $out .= '<div id="action_flags' .$id.'" style="display:' 
+            . (preg_match('/^(set|add|remove)flag$/', $action['type']) ? 'inline' : 'none') . '"'
+            . $this->error_class($id, 'action', 'flags', 'action_flags') . '>';
+        foreach ($flags as $fidx => $flag) {
+            $out .= '<input type="checkbox" name="_action_flags[' .$id .'][]" value="' . $flag . '"'
+                . (in_array_nocase($flag, $flags_target) ? 'checked="checked"' : '') . ' />'
+                . rcube::Q($this->plugin->gettext('flag'.$fidx)) .'<br>';
+        }
+        $out .= '</div>';
+
+        // set variable
+        $set_modifiers = array(
+            'lower',
+            'upper',
+            'lowerfirst',
+            'upperfirst',
+            'quotewildcard',
+            'length'
+        );
+
+        $out .= '<div id="action_set' .$id.'" style="display:' .($action['type']=='set' ? 'inline' : 'none') .'">';
+        $out .= '<span class="label">' .rcube::Q($this->plugin->gettext('setvarname')) . '</span><br />'
+            .'<input type="text" name="_action_varname['.$id.']" id="action_varname'.$id.'" '
+            .'value="' . rcube::Q($action['name']) . '" size="35" '
+            . $this->error_class($id, 'action', 'name', 'action_varname') .' />';
+        $out .= '<br /><span class="label">' .rcube::Q($this->plugin->gettext('setvarvalue')) . '</span><br />'
+            .'<input type="text" name="_action_varvalue['.$id.']" id="action_varvalue'.$id.'" '
+            .'value="' . rcube::Q($action['value']) . '" size="35" '
+            . $this->error_class($id, 'action', 'value', 'action_varvalue') .' />';
+        $out .= '<br /><span class="label">' .rcube::Q($this->plugin->gettext('setvarmodifiers')) . '</span><br />';
+        foreach ($set_modifiers as $s_m) {
+            $s_m_id = 'action_varmods' . $id . $s_m;
+            $out .= sprintf('<input type="checkbox" name="_action_varmods[%s][]" value="%s" id="%s"%s />%s<br>',
+                $id, $s_m, $s_m_id,
+                (array_key_exists($s_m, (array)$action) && $action[$s_m] ? ' checked="checked"' : ''),
+                rcube::Q($this->plugin->gettext('var' . $s_m)));
+        }
+        $out .= '</div>';
+
+        // notify
+        // skip :options tag - not used by the mailto method
+        $out .= '<div id="action_notify' .$id.'" style="display:' .($action['type']=='notify' ? 'inline' : 'none') .'">';
+        $out .= '<span class="label">' .rcube::Q($this->plugin->gettext('notifyaddress')) . '</span><br />'
+            .'<input type="text" name="_action_notifyaddress['.$id.']" id="action_notifyaddress'.$id.'" '
+            .'value="' . rcube::Q($action['address']) . '" size="35" '
+            . $this->error_class($id, 'action', 'address', 'action_notifyaddress') .' />';
+        $out .= '<br /><span class="label">'. rcube::Q($this->plugin->gettext('notifybody')) .'</span><br />'
+            .'<textarea name="_action_notifybody['.$id.']" id="action_notifybody' .$id. '" '
+            .'rows="3" cols="35" '. $this->error_class($id, 'action', 'method', 'action_notifybody') . '>'
+            . rcube::Q($action['body'], 'strict', false) . "</textarea>\n";
+        $out .= '<br /><span class="label">' .rcube::Q($this->plugin->gettext('notifysubject')) . '</span><br />'
+            .'<input type="text" name="_action_notifymessage['.$id.']" id="action_notifymessage'.$id.'" '
+            .'value="' . rcube::Q($action['message']) . '" size="35" '
+            . $this->error_class($id, 'action', 'message', 'action_notifymessage') .' />';
+        $out .= '<br /><span class="label">' .rcube::Q($this->plugin->gettext('notifyfrom')) . '</span><br />'
+            .'<input type="text" name="_action_notifyfrom['.$id.']" id="action_notifyfrom'.$id.'" '
+            .'value="' . rcube::Q($action['from']) . '" size="35" '
+            . $this->error_class($id, 'action', 'from', 'action_notifyfrom') .' />';
+        $importance_options = array(
+            3 => 'notifyimportancelow',
+            2 => 'notifyimportancenormal',
+            1 => 'notifyimportancehigh'
+        );
+        $select_importance = new html_select(array(
+            'name' => '_action_notifyimportance[' . $id . ']',
+            'id' => '_action_notifyimportance' . $id,
+            'class' => $this->error_class($id, 'action', 'importance', 'action_notifyimportance')));
+        foreach ($importance_options as $io_v => $io_n) {
+            $select_importance->add(rcube::Q($this->plugin->gettext($io_n)), $io_v);
+        }
+        $out .= '<br /><span class="label">' . rcube::Q($this->plugin->gettext('notifyimportance')) . '</span><br />';
+        $out .= $select_importance->show($action['importance'] ? $action['importance'] : 2);
+        $out .= '</div>';
+
+        // mailbox select
+        if ($action['type'] == 'fileinto')
+            $mailbox = $this->mod_mailbox($action['target'], 'out');
+        else
+            $mailbox = '';
+
+        $select = $this->rc->folder_selector(array(
+            'realnames' => false,
+            'maxlength' => 100,
+            'id' => 'action_mailbox' . $id,
+            'name' => "_action_mailbox[$id]",
+            'style' => 'display:'.(!isset($action) || $action['type']=='fileinto' ? 'inline' : 'none')
+        ));
+        $out .= $select->show($mailbox);
+        $out .= '</td>';
+
+        // add/del buttons
+        $out .= '<td class="rowbuttons">';
+        $out .= '<a href="#" id="actionadd' . $id .'" title="'. rcube::Q($this->plugin->gettext('add')). '"
+            onclick="rcmail.managesieve_actionadd(' . $id .')" class="button add"></a>';
+        $out .= '<a href="#" id="actiondel' . $id .'" title="'. rcube::Q($this->plugin->gettext('del')). '"
+            onclick="rcmail.managesieve_actiondel(' . $id .')" class="button del' . ($rows_num<2 ? ' disabled' : '') .'"></a>';
+        $out .= '</td>';
+
+        $out .= '</tr></table>';
+
+        $out .= $div ? "</div>\n" : '';
+
+        return $out;
+    }
+
+    private function genid()
+    {
+        return preg_replace('/[^0-9]/', '', microtime(true));
+    }
+
+    private function strip_value($str, $allow_html = false, $trim = true)
+    {
+        if (is_array($str)) {
+            foreach ($str as $idx => $val) {
+                $val = $this->strip_value($val, $allow_html, $trim);
+
+                if ($val === '') {
+                    unset($str[$idx]);
+                }
+            }
+
+            return $str;
+        }
+
+        if (!$allow_html) {
+            $str = strip_tags($str);
+        }
+
+        return $trim ? trim($str) : $str;
+    }
+
+    private function error_class($id, $type, $target, $elem_prefix='')
+    {
+        // TODO: tooltips
+        if (($type == 'test' && ($str = $this->errors['tests'][$id][$target])) ||
+            ($type == 'action' && ($str = $this->errors['actions'][$id][$target]))
+        ) {
+            $this->add_tip($elem_prefix.$id, $str, true);
+            return ' class="error"';
+        }
+
+        return '';
+    }
+
+    private function add_tip($id, $str, $error=false)
+    {
+        if ($error)
+            $str = html::span('sieve error', $str);
+
+        $this->tips[] = array($id, $str);
+    }
+
+    private function print_tips()
+    {
+        if (empty($this->tips))
+            return;
+
+        $script = rcmail_output::JS_OBJECT_NAME.'.managesieve_tip_register('.json_encode($this->tips).');';
+        $this->rc->output->add_script($script, 'foot');
+    }
+
+    private function list_input($id, $name, $value, $enabled, $class, $size=null)
+    {
+        $value = (array) $value;
+        $value = array_map(array('rcube', 'Q'), $value);
+        $value = implode("\n", $value);
+
+        return '<textarea data-type="list" name="_' . $name . '['.$id.']" id="' . $name.$id . '"'
+            . ($enabled ? '' : ' disabled="disabled"')
+            . ($size ? ' data-size="'.$size.'"' : '')
+            . $class
+            . ' style="display:none">' . $value . '</textarea>';
+    }
+
+    /**
+     * Validate input for date part elements
+     */
+    private function validate_date_part($type, $value)
+    {
+        // we do simple validation of date/part format
+        switch ($type) {
+            case 'date': // yyyy-mm-dd
+                return preg_match('/^[0-9]{4}-[0-9]{2}-[0-9]{2}$/', $value);
+            case 'iso8601':
+                return preg_match('/^[0-9: .,ZWT+-]+$/', $value);
+            case 'std11':
+                return preg_match('/^((Sun|Mon|Tue|Wed|Thu|Fri|Sat),\s+)?[0-9]{1,2}\s+'
+                    . '(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)\s+[0-9]{2,4}\s+'
+                    . '[0-9]{2}:[0-9]{2}(:[0-9]{2})?\s+([+-]*[0-9]{4}|[A-Z]{1,3})$', $value);
+            case 'julian':
+                return preg_match('/^[0-9]+$/', $value);
+            case 'time': // hh:mm:ss
+                return preg_match('/^[0-9]{2}:[0-9]{2}:[0-9]{2}$/', $value);
+            case 'year':
+                return preg_match('/^[0-9]{4}$/', $value);
+            case 'month':
+                return preg_match('/^[0-9]{2}$/', $value) && $value > 0 && $value < 13;
+            case 'day':
+                return preg_match('/^[0-9]{2}$/', $value) && $value > 0 && $value < 32;
+            case 'hour':
+                return preg_match('/^[0-9]{2}$/', $value) && $value < 24;
+            case 'minute':
+                return preg_match('/^[0-9]{2}$/', $value) && $value < 60;
+            case 'second':
+                // According to RFC5260, seconds can be from 00 to 60
+                return preg_match('/^[0-9]{2}$/', $value) && $value < 61;
+            case 'weekday':
+                return preg_match('/^[0-9]$/', $value) && $value < 7;
+            case 'zone':
+                return preg_match('/^[+-][0-9]{4}$/', $value);
+        }
+    }
+
+    /**
+     * Converts mailbox name from/to UTF7-IMAP from/to internal Sieve encoding
+     * with delimiter replacement.
+     *
+     * @param string $mailbox Mailbox name
+     * @param string $mode    Conversion direction ('in'|'out')
+     *
+     * @return string Mailbox name
+     */
+    private function mod_mailbox($mailbox, $mode = 'out')
+    {
+        $delimiter         = $_SESSION['imap_delimiter'];
+        $replace_delimiter = $this->rc->config->get('managesieve_replace_delimiter');
+        $mbox_encoding     = $this->rc->config->get('managesieve_mbox_encoding', 'UTF7-IMAP');
+
+        if ($mode == 'out') {
+            $mailbox = rcube_charset::convert($mailbox, $mbox_encoding, 'UTF7-IMAP');
+            if ($replace_delimiter && $replace_delimiter != $delimiter)
+                $mailbox = str_replace($replace_delimiter, $delimiter, $mailbox);
+        }
+        else {
+            $mailbox = rcube_charset::convert($mailbox, 'UTF7-IMAP', $mbox_encoding);
+            if ($replace_delimiter && $replace_delimiter != $delimiter)
+                $mailbox = str_replace($delimiter, $replace_delimiter, $mailbox);
+        }
+
+        return $mailbox;
+    }
+
+    /**
+     * List sieve scripts
+     *
+     * @return array Scripts list
+     */
+    public function list_scripts()
+    {
+        if ($this->list !== null) {
+            return $this->list;
+        }
+
+        $this->list = $this->sieve->get_scripts();
+
+        // Handle active script(s) and list of scripts according to Kolab's KEP:14
+        if ($this->rc->config->get('managesieve_kolab_master')) {
+
+            // Skip protected names
+            foreach ((array)$this->list as $idx => $name) {
+                $_name = strtoupper($name);
+                if ($_name == 'MASTER')
+                    $master_script = $name;
+                else if ($_name == 'MANAGEMENT')
+                    $management_script = $name;
+                else if($_name == 'USER')
+                    $user_script = $name;
+                else
+                    continue;
+
+                unset($this->list[$idx]);
+            }
+
+            // get active script(s), read USER script
+            if ($user_script) {
+                $extension = $this->rc->config->get('managesieve_filename_extension', '.sieve');
+                $filename_regex = '/'.preg_quote($extension, '/').'$/';
+                $_SESSION['managesieve_user_script'] = $user_script;
+
+                $this->sieve->load($user_script);
+
+                foreach ($this->sieve->script->as_array() as $rules) {
+                    foreach ($rules['actions'] as $action) {
+                        if ($action['type'] == 'include' && empty($action['global'])) {
+                            $name = preg_replace($filename_regex, '', $action['target']);
+                            $this->active[] = $name;
+                        }
+                    }
+                }
+            }
+            // create USER script if it doesn't exist
+            else {
+                $content = "# USER Management Script\n"
+                    ."#\n"
+                    ."# This script includes the various active sieve scripts\n"
+                    ."# it is AUTOMATICALLY GENERATED. DO NOT EDIT MANUALLY!\n"
+                    ."#\n"
+                    ."# For more information, see http://wiki.kolab.org/KEP:14#USER\n"
+                    ."#\n";
+                if ($this->sieve->save_script('USER', $content)) {
+                    $_SESSION['managesieve_user_script'] = 'USER';
+                    if (empty($this->master_file))
+                        $this->sieve->activate('USER');
+                }
+            }
+        }
+        else if (!empty($this->list)) {
+            // Get active script name
+            if ($active = $this->sieve->get_active()) {
+                $this->active = array($active);
+            }
+
+            // Hide scripts from config
+            $exceptions = $this->rc->config->get('managesieve_filename_exceptions');
+            if (!empty($exceptions)) {
+                $this->list = array_diff($this->list, (array)$exceptions);
+            }
+        }
+
+        return $this->list;
+    }
+
+    /**
+     * Removes sieve script
+     *
+     * @param string $name Script name
+     *
+     * @return bool True on success, False on failure
+     */
+    public function remove_script($name)
+    {
+        $result = $this->sieve->remove($name);
+
+        // Kolab's KEP:14
+        if ($result && $this->rc->config->get('managesieve_kolab_master')) {
+            $this->deactivate_script($name);
+        }
+
+        return $result;
+    }
+
+    /**
+     * Activates sieve script
+     *
+     * @param string $name Script name
+     *
+     * @return bool True on success, False on failure
+     */
+    public function activate_script($name)
+    {
+        // Kolab's KEP:14
+        if ($this->rc->config->get('managesieve_kolab_master')) {
+            $extension   = $this->rc->config->get('managesieve_filename_extension', '.sieve');
+            $user_script = $_SESSION['managesieve_user_script'];
+
+            // if the script is not active...
+            if ($user_script && array_search($name, $this->active) === false) {
+                // ...rewrite USER file adding appropriate include command
+                if ($this->sieve->load($user_script)) {
+                    $script = $this->sieve->script->as_array();
+                    $list   = array();
+                    $regexp = '/' . preg_quote($extension, '/') . '$/';
+
+                    // Create new include entry
+                    $rule = array(
+                        'actions' => array(
+                            0 => array(
+                                'target'   => $name.$extension,
+                                'type'     => 'include',
+                                'personal' => true,
+                    )));
+
+                    // get all active scripts for sorting
+                    foreach ($script as $rid => $rules) {
+                        foreach ($rules['actions'] as $action) {
+                            if ($action['type'] == 'include' && empty($action['global'])) {
+                                $target = $extension ? preg_replace($regexp, '', $action['target']) : $action['target'];
+                                $list[] = $target;
+                            }
+                        }
+                    }
+                    $list[] = $name;
+
+                    // Sort and find current script position
+                    asort($list, SORT_LOCALE_STRING);
+                    $list = array_values($list);
+                    $index = array_search($name, $list);
+
+                    // add rule at the end of the script
+                    if ($index === false || $index == count($list)-1) {
+                        $this->sieve->script->add_rule($rule);
+                    }
+                    // add rule at index position
+                    else {
+                        $script2 = array();
+                        foreach ($script as $rid => $rules) {
+                            if ($rid == $index) {
+                                $script2[] = $rule;
+                            }
+                            $script2[] = $rules;
+                        }
+                        $this->sieve->script->content = $script2;
+                    }
+
+                    $result = $this->sieve->save();
+                    if ($result) {
+                        $this->active[] = $name;
+                    }
+                }
+            }
+        }
+        else {
+            $result = $this->sieve->activate($name);
+            if ($result)
+                $this->active = array($name);
+        }
+
+        return $result;
+    }
+
+    /**
+     * Deactivates sieve script
+     *
+     * @param string $name Script name
+     *
+     * @return bool True on success, False on failure
+     */
+    public function deactivate_script($name)
+    {
+        // Kolab's KEP:14
+        if ($this->rc->config->get('managesieve_kolab_master')) {
+            $extension   = $this->rc->config->get('managesieve_filename_extension', '.sieve');
+            $user_script = $_SESSION['managesieve_user_script'];
+
+            // if the script is active...
+            if ($user_script && ($key = array_search($name, $this->active)) !== false) {
+                // ...rewrite USER file removing appropriate include command
+                if ($this->sieve->load($user_script)) {
+                    $script = $this->sieve->script->as_array();
+                    $name   = $name.$extension;
+
+                    foreach ($script as $rid => $rules) {
+                        foreach ($rules['actions'] as $action) {
+                            if ($action['type'] == 'include' && empty($action['global'])
+                                && $action['target'] == $name
+                            ) {
+                                break 2;
+                            }
+                        }
+                    }
+
+                    // Entry found
+                    if ($rid < count($script)) {
+                        $this->sieve->script->delete_rule($rid);
+                        $result = $this->sieve->save();
+                        if ($result) {
+                            unset($this->active[$key]);
+                        }
+                    }
+                }
+            }
+        }
+        else {
+            $result = $this->sieve->deactivate();
+            if ($result)
+                $this->active = array();
+        }
+
+        return $result;
+    }
+
+    /**
+     * Saves current script (adding some variables)
+     */
+    public function save_script($name = null)
+    {
+        // Kolab's KEP:14
+        if ($this->rc->config->get('managesieve_kolab_master')) {
+            $this->sieve->script->set_var('EDITOR', self::PROGNAME);
+            $this->sieve->script->set_var('EDITOR_VERSION', self::VERSION);
+        }
+
+        return $this->sieve->save($name);
+    }
+
+    /**
+     * Returns list of rules from the current script
+     *
+     * @return array List of rules
+     */
+    public function list_rules()
+    {
+        $result = array();
+        $i      = 1;
+
+        foreach ($this->script as $idx => $filter) {
+            if ($filter['type'] != 'if') {
+                continue;
+            }
+            $fname = $filter['name'] ? $filter['name'] : "#$i";
+            $result[] = array(
+                'id'    => $idx,
+                'name'  => rcube::Q($fname),
+                'class' => $filter['disabled'] ? 'disabled' : '',
+            );
+            $i++;
+        }
+
+        return $result;
+    }
+}
diff --git a/plugins/managesieve/lib/Roundcube/rcube_sieve_script.php b/plugins/managesieve/lib/Roundcube/rcube_sieve_script.php
index 36eb1bcf8..78b4bc625 100644
--- a/plugins/managesieve/lib/Roundcube/rcube_sieve_script.php
+++ b/plugins/managesieve/lib/Roundcube/rcube_sieve_script.php
@@ -27,23 +27,26 @@ class rcube_sieve_script
     private $vars = array();        // "global" variables
     private $prefix = '';           // script header (comments)
     private $supported = array(     // Sieve extensions supported by class
-        'fileinto',                 // RFC5228
+        'body',                     // RFC5173
+        'copy',                     // RFC3894
+        'date',                     // RFC5260
+        'enotify',                  // RFC5435
         'envelope',                 // RFC5228
-        'reject',                   // RFC5429
         'ereject',                  // RFC5429
-        'copy',                     // RFC3894
-        'vacation',                 // RFC5230
-        'relational',               // RFC3431
-        'regex',                    // draft-ietf-sieve-regex-01
+        'fileinto',                 // RFC5228
         'imapflags',                // draft-melnikov-sieve-imapflags-06
         'imap4flags',               // RFC5232
         'include',                  // draft-ietf-sieve-include-12
-        'variables',                // RFC5229
-        'body',                     // RFC5173
-        'subaddress',               // RFC5233
-        'enotify',                  // RFC5435
+        'index',                    // RFC5260
         'notify',                   // draft-ietf-sieve-notify-00
-        // @TODO: spamtest+virustest, mailbox, date
+        'regex',                    // draft-ietf-sieve-regex-01
+        'reject',                   // RFC5429
+        'relational',               // RFC3431
+        'subaddress',               // RFC5233
+        'vacation',                 // RFC5230
+        'vacation-seconds',         // RFC6131
+        'variables',                // RFC5229
+        // @TODO: spamtest+virustest, mailbox
     );
 
     /**
@@ -205,7 +208,6 @@ class rcube_sieve_script
 
         // rules
         foreach ($this->content as $rule) {
-            $extension = '';
             $script    = '';
             $tests     = array();
             $i         = 0;
@@ -238,24 +240,8 @@ class rcube_sieve_script
                         $tests[$i] .= ($test['not'] ? 'not ' : '');
                         $tests[$i] .= 'header';
 
-                        if (!empty($test['type'])) {
-                            // relational operator + comparator
-                            if (preg_match('/^(value|count)-([gteqnl]{2})/', $test['type'], $m)) {
-                                array_push($exts, 'relational');
-                                array_push($exts, 'comparator-i;ascii-numeric');
-
-                                $tests[$i] .= ' :' . $m[1] . ' "' . $m[2] . '" :comparator "i;ascii-numeric"';
-                            }
-                            else {
-                                $this->add_comparator($test, $tests[$i], $exts);
-
-                                if ($test['type'] == 'regex') {
-                                    array_push($exts, 'regex');
-                                }
-
-                                $tests[$i] .= ' :' . $test['type'];
-                            }
-                        }
+                        $this->add_index($test, $tests[$i], $exts);
+                        $this->add_operator($test, $tests[$i], $exts);
 
                         $tests[$i] .= ' ' . self::escape_string($test['arg1']);
                         $tests[$i] .= ' ' . self::escape_string($test['arg2']);
@@ -270,6 +256,10 @@ class rcube_sieve_script
                         $tests[$i] .= ($test['not'] ? 'not ' : '');
                         $tests[$i] .= $test['test'];
 
+                        if ($test['test'] != 'envelope') {
+                            $this->add_index($test, $tests[$i], $exts);
+                        }
+
                         if (!empty($test['part'])) {
                             $tests[$i] .= ' :' . $test['part'];
                             if ($test['part'] == 'user' || $test['part'] == 'detail') {
@@ -277,14 +267,7 @@ class rcube_sieve_script
                             }
                         }
 
-                        $this->add_comparator($test, $tests[$i], $exts);
-
-                        if (!empty($test['type'])) {
-                            if ($test['type'] == 'regex') {
-                                array_push($exts, 'regex');
-                            }
-                            $tests[$i] .= ' :' . $test['type'];
-                        }
+                        $this->add_operator($test, $tests[$i], $exts);
 
                         $tests[$i] .= ' ' . self::escape_string($test['arg1']);
                         $tests[$i] .= ' ' . self::escape_string($test['arg2']);
@@ -295,8 +278,6 @@ class rcube_sieve_script
 
                         $tests[$i] .= ($test['not'] ? 'not ' : '') . 'body';
 
-                        $this->add_comparator($test, $tests[$i], $exts);
-
                         if (!empty($test['part'])) {
                             $tests[$i] .= ' :' . $test['part'];
 
@@ -305,14 +286,35 @@ class rcube_sieve_script
                             }
                         }
 
-                        if (!empty($test['type'])) {
-                            if ($test['type'] == 'regex') {
-                                array_push($exts, 'regex');
-                            }
-                            $tests[$i] .= ' :' . $test['type'];
+                        $this->add_operator($test, $tests[$i], $exts);
+
+                        $tests[$i] .= ' ' . self::escape_string($test['arg']);
+                        break;
+
+                    case 'date':
+                    case 'currentdate':
+                        array_push($exts, 'date');
+
+                        $tests[$i] .= ($test['not'] ? 'not ' : '') . $test['test'];
+
+                        $this->add_index($test, $tests[$i], $exts);
+
+                        if (!empty($test['originalzone']) && $test['test'] == 'date') {
+                            $tests[$i] .= ' :originalzone';
+                        }
+                        else if (!empty($test['zone'])) {
+                            $tests[$i] .= ' :zone ' . self::escape_string($test['zone']);
+                        }
+
+                        $this->add_operator($test, $tests[$i], $exts);
+
+                        if ($test['test'] == 'date') {
+                            $tests[$i] .= ' ' . self::escape_string($test['header']);
                         }
 
+                        $tests[$i] .= ' ' . self::escape_string($test['part']);
                         $tests[$i] .= ' ' . self::escape_string($test['arg']);
+
                         break;
                     }
                     $i++;
@@ -447,8 +449,13 @@ class rcube_sieve_script
                     case 'vacation':
                         array_push($exts, 'vacation');
                         $action_script .= 'vacation';
-                        if (!empty($action['days']))
-                            $action_script .= " :days " . $action['days'];
+                        if (isset($action['seconds'])) {
+                            array_push($exts, 'vacation-seconds');
+                            $action_script .= " :seconds " . intval($action['seconds']);
+                        }
+                        else if (!empty($action['days'])) {
+                            $action_script .= " :days " . intval($action['days']);
+                        }
                         if (!empty($action['addresses']))
                             $action_script .= " :addresses " . self::escape_string($action['addresses']);
                         if (!empty($action['subject']))
@@ -477,8 +484,17 @@ class rcube_sieve_script
         }
 
         // requires
-        if (!empty($exts))
-            $output = 'require ["' . implode('","', array_unique($exts)) . "\"];\n" . $output;
+        if (!empty($exts)) {
+            $exts = array_unique($exts);
+
+            if (in_array('vacation-seconds', $exts) && ($key = array_search('vacation', $exts)) !== false) {
+                unset($exts[$key]);
+            }
+
+            sort($exts); // for convenience use always the same order
+
+            $output = 'require ["' . implode('","', $exts) . "\"];\n" . $output;
+        }
 
         if (!empty($this->prefix)) {
             $output = $this->prefix . "\n\n" . $output;
@@ -640,86 +656,85 @@ class rcube_sieve_script
                 break;
 
             case 'size':
-                $size = array('test' => 'size', 'not'  => $not);
+                $test = array('test' => 'size', 'not'  => $not);
+
+                $test['arg'] = array_pop($tokens);
+
                 for ($i=0, $len=count($tokens); $i<$len; $i++) {
                     if (!is_array($tokens[$i])
                         && preg_match('/^:(under|over)$/i', $tokens[$i])
                     ) {
-                        $size['type'] = strtolower(substr($tokens[$i], 1));
-                    }
-                    else {
-                        $size['arg'] = $tokens[$i];
+                        $test['type'] = strtolower(substr($tokens[$i], 1));
                     }
                 }
 
-                $tests[] = $size;
+                $tests[] = $test;
                 break;
 
             case 'header':
-                $header = array('test' => 'header', 'not' => $not, 'arg1' => '', 'arg2' => '');
-                for ($i=0, $len=count($tokens); $i<$len; $i++) {
-                    if (!is_array($tokens[$i]) && preg_match('/^:comparator$/i', $tokens[$i])) {
-                        $header['comparator'] = $tokens[++$i];
-                    }
-                    else if (!is_array($tokens[$i]) && preg_match('/^:(count|value)$/i', $tokens[$i])) {
-                        $header['type'] = strtolower(substr($tokens[$i], 1)) . '-' . $tokens[++$i];
-                    }
-                    else if (!is_array($tokens[$i]) && preg_match('/^:(is|contains|matches|regex)$/i', $tokens[$i])) {
-                        $header['type'] = strtolower(substr($tokens[$i], 1));
-                    }
-                    else {
-                        $header['arg1'] = $header['arg2'];
-                        $header['arg2'] = $tokens[$i];
+            case 'address':
+            case 'envelope':
+                $test = array('test' => $token, 'not' => $not);
+
+                $test['arg2'] = array_pop($tokens);
+                $test['arg1'] = array_pop($tokens);
+
+                $test += $this->test_tokens($tokens);
+
+                if ($token != 'header' && !empty($tokens)) {
+                    for ($i=0, $len=count($tokens); $i<$len; $i++) {
+                        if (!is_array($tokens[$i]) && preg_match('/^:(localpart|domain|all|user|detail)$/i', $tokens[$i])) {
+                            $test['part'] = strtolower(substr($tokens[$i], 1));
+                        }
                     }
                 }
 
-                $tests[] = $header;
+                $tests[] = $test;
                 break;
 
-            case 'address':
-            case 'envelope':
-                $header = array('test' => $token, 'not' => $not, 'arg1' => '', 'arg2' => '');
+            case 'body':
+                $test = array('test' => 'body', 'not' => $not);
+
+                $test['arg'] = array_pop($tokens);
+
+                $test += $this->test_tokens($tokens);
+
                 for ($i=0, $len=count($tokens); $i<$len; $i++) {
-                    if (!is_array($tokens[$i]) && preg_match('/^:comparator$/i', $tokens[$i])) {
-                        $header['comparator'] = $tokens[++$i];
-                    }
-                    else if (!is_array($tokens[$i]) && preg_match('/^:(is|contains|matches|regex)$/i', $tokens[$i])) {
-                        $header['type'] = strtolower(substr($tokens[$i], 1));
-                    }
-                    else if (!is_array($tokens[$i]) && preg_match('/^:(localpart|domain|all|user|detail)$/i', $tokens[$i])) {
-                        $header['part'] = strtolower(substr($tokens[$i], 1));
-                    }
-                    else {
-                        $header['arg1'] = $header['arg2'];
-                        $header['arg2'] = $tokens[$i];
+                    if (!is_array($tokens[$i]) && preg_match('/^:(raw|content|text)$/i', $tokens[$i])) {
+                        $test['part'] = strtolower(substr($tokens[$i], 1));
+
+                        if ($test['part'] == 'content') {
+                            $test['content'] = $tokens[++$i];
+                        }
                     }
                 }
 
-                $tests[] = $header;
+                $tests[] = $test;
                 break;
 
-            case 'body':
-                $header = array('test' => 'body', 'not' => $not, 'arg' => '');
-                for ($i=0, $len=count($tokens); $i<$len; $i++) {
-                    if (!is_array($tokens[$i]) && preg_match('/^:comparator$/i', $tokens[$i])) {
-                        $header['comparator'] = $tokens[++$i];
-                    }
-                    else if (!is_array($tokens[$i]) && preg_match('/^:(is|contains|matches|regex)$/i', $tokens[$i])) {
-                        $header['type'] = strtolower(substr($tokens[$i], 1));
-                    }
-                    else if (!is_array($tokens[$i]) && preg_match('/^:(raw|content|text)$/i', $tokens[$i])) {
-                        $header['part'] = strtolower(substr($tokens[$i], 1));
+            case 'date':
+            case 'currentdate':
+                $test = array('test' => $token, 'not' => $not);
 
-                        if ($header['part'] == 'content') {
-                            $header['content'] = $tokens[++$i];
-                        }
+                $test['arg']  = array_pop($tokens);
+                $test['part'] = array_pop($tokens);
+
+                if ($token == 'date') {
+                    $test['header']  = array_pop($tokens);
+                }
+
+                $test += $this->test_tokens($tokens);
+
+                for ($i=0, $len=count($tokens); $i<$len; $i++) {
+                    if (!is_array($tokens[$i]) && preg_match('/^:zone$/i', $tokens[$i])) {
+                        $test['zone'] = $tokens[++$i];
                     }
-                    else {
-                        $header['arg'] = $tokens[$i];
+                    else if (!is_array($tokens[$i]) && preg_match('/^:originalzone$/i', $tokens[$i])) {
+                        $test['originalzone'] = true;
                     }
                 }
 
-                $tests[] = $header;
+                $tests[] = $test;
                 break;
 
             case 'exists':
@@ -771,15 +786,9 @@ class rcube_sieve_script
         $result = null;
 
         while (strlen($content)) {
-            $tokens = self::tokenize($content, true);
+            $tokens    = self::tokenize($content, true);
             $separator = array_pop($tokens);
-
-            if (!empty($tokens)) {
-                $token = array_shift($tokens);
-            }
-            else {
-                $token = $separator;
-            }
+            $token     = !empty($tokens) ? array_shift($tokens) : $separator;
 
             switch ($token) {
             case 'discard':
@@ -790,125 +799,78 @@ class rcube_sieve_script
 
             case 'fileinto':
             case 'redirect':
-                $copy   = false;
-                $target = '';
+                $action  = array('type' => $token, 'target' => array_pop($tokens));
+                $args    = array('copy');
+                $action += $this->action_arguments($tokens, $args);
 
-                for ($i=0, $len=count($tokens); $i<$len; $i++) {
-                    if (strtolower($tokens[$i]) == ':copy') {
-                        $copy = true;
-                    }
-                    else {
-                        $target = $tokens[$i];
-                    }
-                }
-
-                $result[] = array('type' => $token, 'copy' => $copy,
-                    'target' => $target);
-                break;
-
-            case 'reject':
-            case 'ereject':
-                $result[] = array('type' => $token, 'target' => array_pop($tokens));
+                $result[] = $action;
                 break;
 
             case 'vacation':
-                $vacation = array('type' => 'vacation', 'reason' => array_pop($tokens));
+                $action  = array('type' => 'vacation', 'reason' => array_pop($tokens));
+                $args    = array('mime');
+                $vargs   = array('seconds', 'days', 'addresses', 'subject', 'handle', 'from');
+                $action += $this->action_arguments($tokens, $args, $vargs);
 
-                for ($i=0, $len=count($tokens); $i<$len; $i++) {
-                    $tok = strtolower($tokens[$i]);
-                    if ($tok == ':days') {
-                        $vacation['days'] = $tokens[++$i];
-                    }
-                    else if ($tok == ':subject') {
-                        $vacation['subject'] = $tokens[++$i];
-                    }
-                    else if ($tok == ':addresses') {
-                        $vacation['addresses'] = $tokens[++$i];
-                    }
-                    else if ($tok == ':handle') {
-                        $vacation['handle'] = $tokens[++$i];
-                    }
-                    else if ($tok == ':from') {
-                        $vacation['from'] = $tokens[++$i];
-                    }
-                    else if ($tok == ':mime') {
-                        $vacation['mime'] = true;
-                    }
-                }
-
-                $result[] = $vacation;
+                $result[] = $action;
                 break;
 
+            case 'reject':
+            case 'ereject':
             case 'setflag':
             case 'addflag':
             case 'removeflag':
-                $result[] = array('type' => $token,
-                    // Flags list: last token (skip optional variable)
-                    'target' => $tokens[count($tokens)-1]
-                );
+                $result[] = array('type' => $token, 'target' => array_pop($tokens));
                 break;
 
             case 'include':
-                $include = array('type' => 'include', 'target' => array_pop($tokens));
+                $action  = array('type' => 'include', 'target' => array_pop($tokens));
+                $args    = array('once', 'optional', 'global', 'personal');
+                $action += $this->action_arguments($tokens, $args);
 
-                // Parameters: :once, :optional, :global, :personal
-                for ($i=0, $len=count($tokens); $i<$len; $i++) {
-                    $tok = strtolower($tokens[$i]);
-                    if ($tok[0] == ':') {
-                        $include[substr($tok, 1)] = true;
-                    }
-                }
-
-                $result[] = $include;
+                $result[] = $action;
                 break;
 
             case 'set':
-                $set = array('type' => 'set', 'value' => array_pop($tokens), 'name' => array_pop($tokens));
-
-                // Parameters: :lower :upper :lowerfirst :upperfirst :quotewildcard :length
-                for ($i=0, $len=count($tokens); $i<$len; $i++) {
-                    $tok = strtolower($tokens[$i]);
-                    if ($tok[0] == ':') {
-                        $set[substr($tok, 1)] = true;
-                    }
-                }
+                $action  = array('type' => 'set', 'value' => array_pop($tokens), 'name' => array_pop($tokens));
+                $args    = array('lower', 'upper', 'lowerfirst', 'upperfirst', 'quotewildcard', 'length');
+                $action += $this->action_arguments($tokens, $args);
 
-                $result[] = $set;
+                $result[] = $action;
                 break;
 
             case 'require':
                 // skip, will be build according to used commands
-                // $result[] = array('type' => 'require', 'target' => $tokens);
+                // $result[] = array('type' => 'require', 'target' => array_pop($tokens));
                 break;
 
             case 'notify':
-                $notify = array('type' => 'notify');
-                $priorities = array(':high' => 1, ':normal' => 2, ':low' => 3);
-
-                // Parameters: :from, :importance, :options, :message
-                //     additional (optional) :method parameter for notify extension
-                for ($i=0, $len=count($tokens); $i<$len; $i++) {
-                    $tok = strtolower($tokens[$i]);
-                    if ($tok[0] == ':') {
-                        // Here we support only 00 version of notify draft, there
-                        // were a couple regressions in 00 to 04 changelog, we use
-                        // the version used by Cyrus
-                        if (isset($priorities[$tok])) {
-                            $notify['importance'] = $priorities[$tok];
-                        }
-                        else {
-                            $notify[substr($tok, 1)] = $tokens[++$i];
+                $action     = array('type' => 'notify');
+                $priorities = array('high' => 1, 'normal' => 2, 'low' => 3);
+                $vargs      = array('from', 'importance', 'options', 'message', 'method');
+                $args       = array_keys($priorities);
+                $action    += $this->action_arguments($tokens, $args, $vargs);
+
+                // Here we support only 00 version of notify draft, there
+                // were a couple regressions in 00 to 04 changelog, we use
+                // the version used by Cyrus
+                if (!isset($action['importance'])) {
+                    foreach ($priorities as $key => $val) {
+                        if (isset($action[$key])) {
+                            $action['importance'] = $val;
+                            unset($action[$key]);
                         }
                     }
-                    else {
-                        // unnamed parameter is a :method in enotify extension
-                        $notify['method'] = $tokens[$i];
-                    }
                 }
 
-                $method_components = parse_url($notify['method']);
+                // unnamed parameter is a :method in enotify extension
+                if (!isset($action['method'])) {
+                    $action['method'] = array_pop($tokens);
+                }
+
+                $method_components = parse_url($action['method']);
                 if ($method_components['scheme'] == 'mailto') {
-                    $notify['address'] = $method_components['path'];
+                    $action['address'] = $method_components['path'];
                     $method_params = array();
                     if (array_key_exists('query', $method_components)) {
                         parse_str($method_components['query'], $method_params);
@@ -918,10 +880,10 @@ class rcube_sieve_script
                     if (ini_get('magic_quotes_gpc') || ini_get('magic_quotes_sybase')) {
                         array_map('stripslashes', $method_params);
                     }
-                    $notify['body'] = (array_key_exists('body', $method_params)) ? $method_params['body'] : '';
+                    $action['body'] = (array_key_exists('body', $method_params)) ? $method_params['body'] : '';
                 }
 
-                $result[] = $notify;
+                $result[] = $action;
                 break;
 
             }
@@ -934,7 +896,7 @@ class rcube_sieve_script
     }
 
     /**
-     *
+     * Add comparator to the test
      */
     private function add_comparator($test, &$out, &$exts)
     {
@@ -957,6 +919,111 @@ class rcube_sieve_script
     }
 
     /**
+     * Add index argument to the test
+     */
+    private function add_index($test, &$out, &$exts)
+    {
+        if (!empty($test['index'])) {
+            array_push($exts, 'index');
+            $out .= ' :index ' . intval($test['index']) . ($test['last'] ? ' :last' : '');
+        }
+    }
+
+    /**
+     * Add operators to the test
+     */
+    private function add_operator($test, &$out, &$exts)
+    {
+        if (empty($test['type'])) {
+            return;
+        }
+
+        // relational operator + comparator
+        if (preg_match('/^(value|count)-([gteqnl]{2})/', $test['type'], $m)) {
+            array_push($exts, 'relational');
+            array_push($exts, 'comparator-i;ascii-numeric');
+
+            $out .= ' :' . $m[1] . ' "' . $m[2] . '" :comparator "i;ascii-numeric"';
+        }
+        else {
+            $this->add_comparator($test, $out, $exts);
+
+            if ($test['type'] == 'regex') {
+                array_push($exts, 'regex');
+            }
+
+            $out .= ' :' . $test['type'];
+        }
+    }
+
+    /**
+     * Extract test tokens
+     */
+    private function test_tokens(&$tokens)
+    {
+        $test   = array();
+        $result = array();
+
+        for ($i=0, $len=count($tokens); $i<$len; $i++) {
+            if (!is_array($tokens[$i]) && preg_match('/^:comparator$/i', $tokens[$i])) {
+                $test['comparator'] = $tokens[++$i];
+            }
+            else if (!is_array($tokens[$i]) && preg_match('/^:(count|value)$/i', $tokens[$i])) {
+                $test['type'] = strtolower(substr($tokens[$i], 1)) . '-' . $tokens[++$i];
+            }
+            else if (!is_array($tokens[$i]) && preg_match('/^:(is|contains|matches|regex)$/i', $tokens[$i])) {
+                $test['type'] = strtolower(substr($tokens[$i], 1));
+            }
+            else if (!is_array($tokens[$i]) && preg_match('/^:index$/i', $tokens[$i])) {
+                $test['index'] = intval($tokens[++$i]);
+                if ($tokens[$i+1] && preg_match('/^:last$/i', $tokens[$i+1])) {
+                    $test['last'] = true;
+                    $i++;
+                }
+           }
+           else {
+               $result[] = $tokens[$i];
+           }
+        }
+
+        $tokens = $result;
+
+        return $test;
+    }
+
+    /**
+     * Extract action arguments
+     */
+    private function action_arguments(&$tokens, $bool_args, $val_args = array())
+    {
+        $action = array();
+        $result = array();
+
+        for ($i=0, $len=count($tokens); $i<$len; $i++) {
+            $tok = $tokens[$i];
+            if (!is_array($tok) && $tok[0] == ':') {
+                $tok = strtolower(substr($tok, 1));
+                if (in_array($tok, $bool_args)) {
+                    $action[$tok] = true;
+                }
+                else if (in_array($tok, $val_args)) {
+                    $action[$tok] = $tokens[++$i];
+                }
+                else {
+                    $result[] = $tok;
+                }
+            }
+            else {
+                $result[] = $tok;
+            }
+        }
+
+        $tokens = $result;
+
+        return $action;
+    }
+
+    /**
      * Escape special chars into quoted string value or multi-line string
      * or list of strings
      *
@@ -1014,11 +1081,10 @@ class rcube_sieve_script
      * @param mixed  $num     Number of tokens to return, 0 for all
      *                        or True for all tokens until separator is found.
      *                        Separator will be returned as last token.
-     * @param int    $in_list Enable to call recursively inside a list
      *
      * @return mixed Tokens array or string if $num=1
      */
-    static function tokenize(&$str, $num=0, $in_list=false)
+    static function tokenize(&$str, $num=0)
     {
         $result = array();
 
@@ -1053,7 +1119,7 @@ class rcube_sieve_script
             // Parenthesized list
             case '[':
                 $str = substr($str, 1);
-                $result[] = self::tokenize($str, 0, true);
+                $result[] = self::tokenize($str, 0);
                 break;
             case ']':
                 $str = substr($str, 1);
diff --git a/plugins/managesieve/localization/az_AZ.inc b/plugins/managesieve/localization/az_AZ.inc
index cc025b5a5..670162552 100644
--- a/plugins/managesieve/localization/az_AZ.inc
+++ b/plugins/managesieve/localization/az_AZ.inc
@@ -2,18 +2,21 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/az_AZ/labels.inc                                         |
+ | plugins/managesieve/localization/<lang>.inc                           |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Managesieve plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Orkhan Guliyev <proger@box.az>                                |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-managesieve/
 */
 
-$labels = array();
+
 $labels['filters'] = 'Süzgəclər';
 $labels['managefilters'] = 'Gələn məktub üçün süzgəclərin idarəsi';
 $labels['filtername'] = 'Süzgəcin adı';
@@ -52,8 +55,11 @@ $labels['add'] = 'Əlavə et';
 $labels['del'] = 'Sil';
 $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['vacationaddr'] = 'Əlavə ünvanlarım üçün siyahı:';
 $labels['vacationdays'] = 'Məktub neçə müddətdən bir göndərilsin (gündə):';
+$labels['vacationinterval'] = 'How often send messages:';
+$labels['days'] = 'days';
+$labels['seconds'] = 'seconds';
 $labels['vacationreason'] = 'Məktubun mətni (səbəb yoxdur):';
 $labels['vacationsubject'] = 'Məktubun mövzusu:';
 $labels['rulestop'] = 'Yerinə yetirməyi dayandır';
@@ -92,6 +98,25 @@ $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['setvarmodifiers'] = 'Modifikatorlar';
+$labels['varlower'] = 'aşağı registr';
+$labels['varupper'] = 'yuxarı registr';
+$labels['varlowerfirst'] = 'aşağı registrdə birinci simvol';
+$labels['varupperfirst'] = 'yuxarı registrdə birinci simvol';
+$labels['varquotewildcard'] = 'dırnaq simvolu';
+$labels['varlength'] = 'uzunluq';
+$labels['notify'] = 'Bildiriş göndər';
+$labels['notifyaddress'] = 'Poçt ünvanı:';
+$labels['notifybody'] = 'Bildiriş mətni';
+$labels['notifysubject'] = 'Bildiriş mövzusu';
+$labels['notifyfrom'] = 'Bildirişi yolla:';
+$labels['notifyimportance'] = 'Vaciblik';
+$labels['notifyimportancelow'] = 'aşağı';
+$labels['notifyimportancenormal'] = 'normal';
+$labels['notifyimportancehigh'] = 'yuxarı';
 $labels['filtercreate'] = 'Süzgəc yarat';
 $labels['usedata'] = 'Süzgəcdə bu məlumatları istifadə et:';
 $labels['nextstep'] = 'Sonrakı';
@@ -115,35 +140,38 @@ $labels['default'] = 'ön qurğulu';
 $labels['octet'] = 'ciddi (oktet)';
 $labels['asciicasemap'] = 'qeydiyyat üzrə müstəqil (ascii-casemap)';
 $labels['asciinumeric'] = 'ədədi (ascii-numeric)';
-$labels['filterunknownerror'] = 'Serverin naməlum xətası.';
-$labels['filterconnerror'] = 'Serverə qoşulmaq alınmır';
-$labels['filterdeleteerror'] = 'Süzgəci silmək mümkün deyil. Server xətası.';
-$labels['filterdeleted'] = 'Süzgəc uğurla silindi.';
-$labels['filtersaved'] = 'Süzgəc uğurla saxlanıldı.';
-$labels['filtersaveerror'] = 'Süzgəci saxlamaq mümkün deyil. Server xətası.';
-$labels['filterdeleteconfirm'] = 'Siz həqiqətən süzgəci silmək istəyirsiniz?';
-$labels['ruledeleteconfirm'] = 'Bu qaydanı silməkdə əminsiniz?';
-$labels['actiondeleteconfirm'] = 'Bu hərəkəti silməkdə əminsiniz?';
-$labels['forbiddenchars'] = 'Sahədə qadağan edilən işarələr.';
-$labels['cannotbeempty'] = 'Sahə boş ola bilməz.';
-$labels['ruleexist'] = 'Bu adla süzgəc artıq mövcuddur.';
-$labels['setactivateerror'] = 'Seçilmiş süzgəc dəstini yandırmaq mümkün deyil. Server xətası.';
-$labels['setdeactivateerror'] = 'Seçilmiş süzgəc dəstini söndürmək mümkün deyil. Server xətası.';
-$labels['setdeleteerror'] = 'Seçilmiş süzgəc dəstini silmək mümkün deyil. Server xətası.';
-$labels['setactivated'] = 'Süzgəc dəsti yandırıldı.';
-$labels['setdeactivated'] = 'Süzgəc dəsti söndürüldü.';
-$labels['setdeleted'] = 'Süzgəc dəsti silindi.';
-$labels['setdeleteconfirm'] = 'Bu süzgəc dəstini silməkdə əminsiniz?';
-$labels['setcreateerror'] = 'Süzgəc dəstini yaratmaq mümkün deyil. Server xərası.';
-$labels['setcreated'] = 'Süzgəc dəsti uğurla yaradıldı.';
-$labels['activateerror'] = 'Seçilmiş süzgəc(lər)i yandırmaq mümkün deyil. Server xətası.';
-$labels['deactivateerror'] = 'Seçilmiş süzgəc(lər)i söndürmək mümkün deyil. Server xətası.';
-$labels['activated'] = 'Süzgəc(lər) uğurla söndürüldü.';
-$labels['deactivated'] = 'Süzgəc(lər) uğurla yandırıldı.';
-$labels['moved'] = 'Süzgəc uğurla köçürüldü.';
-$labels['moveerror'] = 'Süzgəci köçürmək mümkün deyil. Server xətası.';
-$labels['nametoolong'] = 'Süzgəc dəstini yaratmaq mümkün deyil. Ad çox uzundur.';
-$labels['namereserved'] = 'Rezerv edilmiş ad.';
-$labels['setexist'] = 'Dəst artıq mövcuddur.';
-$labels['nodata'] = 'Heç olmasa bir mövqe tutmaq lazımdır!';
 
+$messages = array();
+$messages['filterunknownerror'] = 'Serverin naməlum xətası.';
+$messages['filterconnerror'] = 'Serverə qoşulmaq alınmır';
+$messages['filterdeleteerror'] = 'Süzgəci silmək mümkün deyil. Server xətası.';
+$messages['filterdeleted'] = 'Süzgəc uğurla silindi.';
+$messages['filtersaved'] = 'Süzgəc uğurla saxlanıldı.';
+$messages['filtersaveerror'] = 'Süzgəci saxlamaq mümkün deyil. Server xətası.';
+$messages['filterdeleteconfirm'] = 'Siz həqiqətən süzgəci silmək istəyirsiniz?';
+$messages['ruledeleteconfirm'] = 'Bu qaydanı silməkdə əminsiniz?';
+$messages['actiondeleteconfirm'] = 'Bu hərəkəti silməkdə əminsiniz?';
+$messages['forbiddenchars'] = 'Sahədə qadağan edilən işarələr.';
+$messages['cannotbeempty'] = 'Sahə boş ola bilməz.';
+$messages['ruleexist'] = 'Bu adla süzgəc artıq mövcuddur.';
+$messages['setactivateerror'] = 'Seçilmiş süzgəc dəstini yandırmaq mümkün deyil. Server xətası.';
+$messages['setdeactivateerror'] = 'Seçilmiş süzgəc dəstini söndürmək mümkün deyil. Server xətası.';
+$messages['setdeleteerror'] = 'Seçilmiş süzgəc dəstini silmək mümkün deyil. Server xətası.';
+$messages['setactivated'] = 'Süzgəc dəsti yandırıldı.';
+$messages['setdeactivated'] = 'Süzgəc dəsti söndürüldü.';
+$messages['setdeleted'] = 'Süzgəc dəsti silindi.';
+$messages['setdeleteconfirm'] = 'Bu süzgəc dəstini silməkdə əminsiniz?';
+$messages['setcreateerror'] = 'Süzgəc dəstini yaratmaq mümkün deyil. Server xərası.';
+$messages['setcreated'] = 'Süzgəc dəsti uğurla yaradıldı.';
+$messages['activateerror'] = 'Seçilmiş süzgəc(lər)i yandırmaq mümkün deyil. Server xətası.';
+$messages['deactivateerror'] = 'Seçilmiş süzgəc(lər)i söndürmək mümkün deyil. Server xətası.';
+$messages['deactivated'] = 'Süzgəc(lər) uğurla yandırıldı.';
+$messages['activated'] = 'Süzgəc(lər) uğurla söndürüldü.';
+$messages['moved'] = 'Süzgəc uğurla köçürüldü.';
+$messages['moveerror'] = 'Süzgəci köçürmək mümkün deyil. Server xətası.';
+$messages['nametoolong'] = 'Süzgəc dəstini yaratmaq mümkün deyil. Ad çox uzundur.';
+$messages['namereserved'] = 'Rezerv edilmiş ad.';
+$messages['setexist'] = 'Dəst artıq mövcuddur.';
+$messages['nodata'] = 'Heç olmasa bir mövqe tutmaq lazımdır!';
+
+?>
diff --git a/plugins/managesieve/localization/be_BE.inc b/plugins/managesieve/localization/be_BE.inc
index 00a409c8b..ff54c0546 100644
--- a/plugins/managesieve/localization/be_BE.inc
+++ b/plugins/managesieve/localization/be_BE.inc
@@ -2,19 +2,21 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/be_BE/labels.inc                                         |
+ | plugins/managesieve/localization/<lang>.inc                           |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Managesieve plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Alex Nehaichik <nab@mail.by>                                  |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-managesieve/
 */
 
-$labels = array();
+
 $labels['filters'] = 'Фільтры';
 $labels['managefilters'] = 'Кіраваць фільтрамі ўваходнае пошты';
 $labels['filtername'] = 'Назва фільтра';
@@ -36,6 +38,8 @@ $labels['filtermatches'] = 'супадае з выразам';
 $labels['filternotmatches'] = 'не супадае з выразам';
 $labels['filterregex'] = 'супадае са сталым выразам';
 $labels['filternotregex'] = 'не супадае са сталым выразам';
+$labels['filterunder'] = 'under';
+$labels['filterover'] = 'over';
 $labels['addrule'] = 'Дадаць правіла';
 $labels['delrule'] = 'Выдаліць правіла';
 $labels['messagemoveto'] = 'Перамясціць паведамленне ў';
@@ -44,10 +48,130 @@ $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['add'] = 'Дадаць';
 $labels['del'] = 'Выдаліць';
 $labels['sender'] = 'Ад каго';
 $labels['recipient'] = 'Каму';
-$labels['vacationaddresses'] = 'Дадатковы спіс атрымальнікаў (праз коску):';
+$labels['vacationaddr'] = 'Дадатковы спіс атрымальнікаў:';
 $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';
+$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['...'] = '...';
+$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)';
+
+$messages = array();
+$messages['filterunknownerror'] = 'Unknown server error.';
+$messages['filterconnerror'] = 'Unable to connect to server.';
+$messages['filterdeleteerror'] = 'Unable to delete filter. Server error occured.';
+$messages['filterdeleted'] = 'Filter deleted successfully.';
+$messages['filtersaved'] = 'Filter saved successfully.';
+$messages['filtersaveerror'] = 'Unable to save filter. Server error occured.';
+$messages['filterdeleteconfirm'] = 'Do you really want to delete selected filter?';
+$messages['ruledeleteconfirm'] = 'Are you sure, you want to delete selected rule?';
+$messages['actiondeleteconfirm'] = 'Are you sure, you want to delete selected action?';
+$messages['forbiddenchars'] = 'Forbidden characters in field.';
+$messages['cannotbeempty'] = 'Field cannot be empty.';
+$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!';
 
+?>
diff --git a/plugins/managesieve/localization/bg_BG.inc b/plugins/managesieve/localization/bg_BG.inc
index 785ac7b6e..e22290cff 100644
--- a/plugins/managesieve/localization/bg_BG.inc
+++ b/plugins/managesieve/localization/bg_BG.inc
@@ -2,19 +2,21 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/bg_BG/labels.inc                                         |
+ | plugins/managesieve/localization/<lang>.inc                           |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Managesieve plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-managesieve/
 */
 
-$labels = array();
+
 $labels['filters'] = 'Филтри';
 $labels['managefilters'] = 'Управление на филтри за входяща поща';
 $labels['filtername'] = 'Име на филтър';
@@ -32,30 +34,144 @@ $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'] = 'Пренасочване на съобщението до';
+$labels['messagecopyto'] = 'Копиране на съобщенията в';
+$labels['messagesendcopy'] = 'Изпращане на копие до';
 $labels['messagereply'] = 'Отговор със съобщение';
 $labels['messagedelete'] = 'Изтриване на съобщение';
 $labels['messagediscard'] = 'Отхвърляне със съобщение';
 $labels['messagesrules'] = 'За входящата поща:';
-$labels['messagesactions'] = '...изпълнение на следните действия';
+$labels['messagesactions'] = '... изпълнение на следните действия:';
 $labels['add'] = 'Добавяне';
 $labels['del'] = 'Изтриване';
 $labels['sender'] = 'Подател';
 $labels['recipient'] = 'Получател';
-$labels['filterunknownerror'] = 'Неизвестна грешка на сървъра';
-$labels['filterconnerror'] = 'Невъзможност за свързване с managesieve сървъра';
-$labels['filterdeleteerror'] = 'Невъзможност за изтриване на филтър. Сървър грешка';
-$labels['filterdeleted'] = 'Филтърът е изтрит успешно';
-$labels['filtersaved'] = 'Филтърът е записан успешно';
-$labels['filtersaveerror'] = 'Филтърът не може да бъде записан. Сървър грешка.';
-$labels['filterdeleteconfirm'] = 'Наистина ли искате да изтриете избрания филтър?';
-$labels['ruledeleteconfirm'] = 'Сигурни ли сте, че искате да изтриете избраното правило?';
-$labels['actiondeleteconfirm'] = 'Сигурни ли сте, че искате да изтриете избраното действие?';
-$labels['forbiddenchars'] = 'Забранени символи в полето';
-$labels['cannotbeempty'] = 'Полето не може да бъде празно';
+$labels['vacationaddr'] = 'Допълнителни e-mail адреси:';
+$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['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'] = 'До e-mail адреси:';
+$labels['notifybody'] = 'Известие:';
+$labels['notifysubject'] = 'Тема на известието';
+$labels['notifyfrom'] = 'Подател на известието';
+$labels['notifyimportance'] = 'Важност:';
+$labels['notifyimportancelow'] = 'ниска';
+$labels['notifyimportancenormal'] = 'нормална';
+$labels['notifyimportancehigh'] = 'висока';
+$labels['filtercreate'] = 'Нов филтър';
+$labels['usedata'] = 'Ползват се следните данни във филтъра:';
+$labels['nextstep'] = 'Следваща стъпка';
+$labels['...'] = '...';
+$labels['advancedopts'] = 'Разширени настройки';
+$labels['body'] = 'Основа';
+$labels['address'] = 'адрес';
+$labels['envelope'] = 'плик';
+$labels['modifier'] = 'промени:';
+$labels['text'] = 'текст';
+$labels['undecoded'] = 'без кодиране';
+$labels['contenttype'] = 'тип на съдържанието';
+$labels['modtype'] = 'тип:';
+$labels['allparts'] = 'всичко';
+$labels['domain'] = 'домейн';
+$labels['localpart'] = 'локална част';
+$labels['user'] = 'потребител';
+$labels['detail'] = 'данни';
+$labels['comparator'] = 'за сравнение:';
+$labels['default'] = 'по подразбиране';
+$labels['octet'] = 'стриктно';
+$labels['asciicasemap'] = 'без значение от малки/големи букви';
+$labels['asciinumeric'] = 'цифрово';
+
+$messages = array();
+$messages['filterunknownerror'] = 'Неизвестна грешка на сървъра';
+$messages['filterconnerror'] = 'Невъзможност за свързване с managesieve сървъра';
+$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'] = 'Поне една позиция трябва да е избрана!';
 
+?>
diff --git a/plugins/managesieve/localization/bs_BA.inc b/plugins/managesieve/localization/bs_BA.inc
index 438d99e9c..df9083129 100644
--- a/plugins/managesieve/localization/bs_BA.inc
+++ b/plugins/managesieve/localization/bs_BA.inc
@@ -2,18 +2,21 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/bs_BA/labels.inc                                         |
+ | plugins/managesieve/localization/<lang>.inc                           |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Managesieve plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Kenan Dervišević <kenan3008@gmail.com>                      |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-managesieve/
 */
 
-$labels = array();
+
 $labels['filters'] = 'Filteri';
 $labels['managefilters'] = 'Upravljanje dolaznim email filterima';
 $labels['filtername'] = 'Naziv filtera';
@@ -52,8 +55,11 @@ $labels['add'] = 'Dodaj';
 $labels['del'] = 'Obriši';
 $labels['sender'] = 'Pošiljaoc';
 $labels['recipient'] = 'Primaoc';
-$labels['vacationaddresses'] = 'Moje dodatne email adrese (odvojite zarezima):';
+$labels['vacationaddr'] = 'Moje dodatne email adrese:';
 $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';
@@ -92,6 +98,25 @@ $labels['flagdeleted'] = 'Obrisano';
 $labels['flaganswered'] = 'Odgovoreno';
 $labels['flagflagged'] = 'Važno';
 $labels['flagdraft'] = 'Skica';
+$labels['setvariable'] = 'Postavi promjenjivu';
+$labels['setvarname'] = 'Naziv promjenjive:';
+$labels['setvarvalue'] = 'Vrijednost promjenjive:';
+$labels['setvarmodifiers'] = 'Parametri:';
+$labels['varlower'] = 'mala slova';
+$labels['varupper'] = 'velika slova';
+$labels['varlowerfirst'] = 'prvi znak malim slovom';
+$labels['varupperfirst'] = 'prvi znak velikim slovom';
+$labels['varquotewildcard'] = 'citiraj specijalne znakove';
+$labels['varlength'] = 'dužina';
+$labels['notify'] = 'Pošalji napomenu';
+$labels['notifyaddress'] = 'Na email adresu:';
+$labels['notifybody'] = 'Sadržaj napomene:';
+$labels['notifysubject'] = 'Naslov napomene:';
+$labels['notifyfrom'] = 'Pošiljalac napomene:';
+$labels['notifyimportance'] = 'Prioritet:';
+$labels['notifyimportancelow'] = 'mali';
+$labels['notifyimportancenormal'] = 'obični';
+$labels['notifyimportancehigh'] = 'veliki';
 $labels['filtercreate'] = 'Kreiraj filter';
 $labels['usedata'] = 'Koristite sljedeće podatke u filteru:';
 $labels['nextstep'] = 'Sljedeći korak';
@@ -115,35 +140,38 @@ $labels['default'] = 'početno';
 $labels['octet'] = 'striktno (oktet)';
 $labels['asciicasemap'] = 'osjetljivo na velika/mala slova (ascii-casemap)';
 $labels['asciinumeric'] = 'numerički (ascii-numeric)';
-$labels['filterunknownerror'] = 'Nepoznata serverska greška.';
-$labels['filterconnerror'] = 'Nije se moguće povezati na server.';
-$labels['filterdeleteerror'] = 'Nije moguće obrisati filter. Desila se serverska greška.';
-$labels['filterdeleted'] = 'Filter je uspješno obrisan.';
-$labels['filtersaved'] = 'Filter je uspješno sačuvan.';
-$labels['filtersaveerror'] = 'Nije moguće sačuvati filter. Desila se serverska greška.';
-$labels['filterdeleteconfirm'] = 'Da li zaista želite obrisati označeni filter?';
-$labels['ruledeleteconfirm'] = 'Jeste li sigurni da želite obrisati označeno pravilo?';
-$labels['actiondeleteconfirm'] = 'Jeste li sigurni da želite obrisati označenu akciju?';
-$labels['forbiddenchars'] = 'U polje su uneseni nedozvoljeni znakovi.';
-$labels['cannotbeempty'] = 'Polje ne može biti prazno.';
-$labels['ruleexist'] = 'Filter s tim imenom već postoji.';
-$labels['setactivateerror'] = 'Nije moguće aktivirati označeni set filtera. Desila se serverska greška.';
-$labels['setdeactivateerror'] = 'Nije moguće deaktivirati označeni set filtera. Desila se serverska greška.';
-$labels['setdeleteerror'] = 'Nije moguće obrisati označeni set filtera. Desila se serverska greška.';
-$labels['setactivated'] = 'Set filtera je uspješno aktiviran.';
-$labels['setdeactivated'] = 'Set filtera je uspješno deaktiviran.';
-$labels['setdeleted'] = 'Set filtera je uspješno obrisan.';
-$labels['setdeleteconfirm'] = 'Jeste li sigurni da želite obrisati označeni set filtera?';
-$labels['setcreateerror'] = 'Nije moguće kreirati se filtera. Desila se serverska greška.';
-$labels['setcreated'] = 'Set filtera je uspješno kreiran.';
-$labels['activateerror'] = 'Nije moguće omogućiti označene filtere. Desila se serverska greška.';
-$labels['deactivateerror'] = 'Nije moguće onemogućiti označene filtere. Desila se serverska greška.';
-$labels['activated'] = 'Filteri su uspješno onemogućeni.';
-$labels['deactivated'] = 'Filteri su uspješno omogućeni.';
-$labels['moved'] = 'Filteri su uspješno premješteni.';
-$labels['moveerror'] = 'Nije moguće premjestiti označeni filter. Desila se serverska greška.';
-$labels['nametoolong'] = 'Ime je predugo.';
-$labels['namereserved'] = 'Ime je rezervisano.';
-$labels['setexist'] = 'Set već postoji.';
-$labels['nodata'] = 'Morate označiti barem jednu poziciju!';
 
+$messages = array();
+$messages['filterunknownerror'] = 'Nepoznata serverska greška.';
+$messages['filterconnerror'] = 'Nije se moguće povezati na server.';
+$messages['filterdeleteerror'] = 'Nije moguće obrisati filter. Desila se serverska greška.';
+$messages['filterdeleted'] = 'Filter je uspješno obrisan.';
+$messages['filtersaved'] = 'Filter je uspješno sačuvan.';
+$messages['filtersaveerror'] = 'Nije moguće sačuvati filter. Desila se serverska greška.';
+$messages['filterdeleteconfirm'] = 'Da li zaista želite obrisati označeni filter?';
+$messages['ruledeleteconfirm'] = 'Jeste li sigurni da želite obrisati označeno pravilo?';
+$messages['actiondeleteconfirm'] = 'Jeste li sigurni da želite obrisati označenu akciju?';
+$messages['forbiddenchars'] = 'U polje su uneseni nedozvoljeni znakovi.';
+$messages['cannotbeempty'] = 'Polje ne može biti prazno.';
+$messages['ruleexist'] = 'Filter s tim imenom već postoji.';
+$messages['setactivateerror'] = 'Nije moguće aktivirati označeni set filtera. Desila se serverska greška.';
+$messages['setdeactivateerror'] = 'Nije moguće deaktivirati označeni set filtera. Desila se serverska greška.';
+$messages['setdeleteerror'] = 'Nije moguće obrisati označeni set filtera. Desila se serverska greška.';
+$messages['setactivated'] = 'Set filtera je uspješno aktiviran.';
+$messages['setdeactivated'] = 'Set filtera je uspješno deaktiviran.';
+$messages['setdeleted'] = 'Set filtera je uspješno obrisan.';
+$messages['setdeleteconfirm'] = 'Jeste li sigurni da želite obrisati označeni set filtera?';
+$messages['setcreateerror'] = 'Nije moguće kreirati se filtera. Desila se serverska greška.';
+$messages['setcreated'] = 'Set filtera je uspješno kreiran.';
+$messages['activateerror'] = 'Nije moguće omogućiti označene filtere. Desila se serverska greška.';
+$messages['deactivateerror'] = 'Nije moguće onemogućiti označene filtere. Desila se serverska greška.';
+$messages['deactivated'] = 'Filteri su uspješno omogućeni.';
+$messages['activated'] = 'Filteri su uspješno onemogućeni.';
+$messages['moved'] = 'Filteri su uspješno premješteni.';
+$messages['moveerror'] = 'Nije moguće premjestiti označeni filter. Desila se serverska greška.';
+$messages['nametoolong'] = 'Ime je predugo.';
+$messages['namereserved'] = 'Ime je rezervisano.';
+$messages['setexist'] = 'Set već postoji.';
+$messages['nodata'] = 'Morate označiti barem jednu poziciju!';
+
+?>
diff --git a/plugins/managesieve/localization/ca_ES.inc b/plugins/managesieve/localization/ca_ES.inc
index d7e8b67be..7ebd2c049 100644
--- a/plugins/managesieve/localization/ca_ES.inc
+++ b/plugins/managesieve/localization/ca_ES.inc
@@ -2,18 +2,21 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ca_ES/labels.inc                                         |
+ | plugins/managesieve/localization/<lang>.inc                           |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Managesieve plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Jordi Sanfeliu <jordi@fibranet.cat>                           |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-managesieve/
 */
 
-$labels = array();
+
 $labels['filters'] = 'Filtres';
 $labels['managefilters'] = 'Gestiona els filtres dels missatges d\'entrada';
 $labels['filtername'] = 'Nom del filtre';
@@ -52,8 +55,11 @@ $labels['add'] = 'Afegeix';
 $labels['del'] = 'Suprimeix';
 $labels['sender'] = 'Remitent';
 $labels['recipient'] = 'Destinatari/a';
-$labels['vacationaddresses'] = 'Altres adreces electròniques meves (separades per coma)';
+$labels['vacationaddr'] = 'Altres adreces electròniques meves:';
 $labels['vacationdays'] = 'Cada quan enviar un missatge (en dies):';
+$labels['vacationinterval'] = 'How often send messages:';
+$labels['days'] = 'days';
+$labels['seconds'] = 'seconds';
 $labels['vacationreason'] = 'Cos del missatge (raó de les vacances):';
 $labels['vacationsubject'] = 'Assumpte del missatge:';
 $labels['rulestop'] = 'Deixa d\'avaluar regles';
@@ -92,6 +98,25 @@ $labels['flagdeleted'] = 'Suprimit';
 $labels['flaganswered'] = 'Respost';
 $labels['flagflagged'] = 'Marcat';
 $labels['flagdraft'] = 'Esborrany';
+$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'] = 'alta';
 $labels['filtercreate'] = 'Crea filtre';
 $labels['usedata'] = 'Fes servir les següents dades al filtre:';
 $labels['nextstep'] = 'Següent pas';
@@ -115,35 +140,38 @@ $labels['default'] = 'per omissió';
 $labels['octet'] = 'estricte (octet)';
 $labels['asciicasemap'] = 'No distingeix entre majúscules i minúscules  (ascii-casemap)';
 $labels['asciinumeric'] = 'numèric (ascii-numeric)';
-$labels['filterunknownerror'] = 'Error desconegut al servidor.';
-$labels['filterconnerror'] = 'No s\'ha pogut connectar al servidor.';
-$labels['filterdeleteerror'] = 'No s\'ha pogut suprimir el filtre. Hi ha hagut un error al servidor.';
-$labels['filterdeleted'] = 'El filtre s\'ha suprimit correctament.';
-$labels['filtersaved'] = 'Filtre desat correctament.';
-$labels['filtersaveerror'] = 'No s\'ha pogut desar el filtre. Hi ha hagut un error al servidor.';
-$labels['filterdeleteconfirm'] = 'Realment voleu suprimit el filtre seleccionat?';
-$labels['ruledeleteconfirm'] = 'Esteu segur que voleu suprimir la norma seleccionada?';
-$labels['actiondeleteconfirm'] = 'Esteu segur que voleu suprimir l\'acció seleccionada?';
-$labels['forbiddenchars'] = 'El camp conté caràcters prohibits.';
-$labels['cannotbeempty'] = 'El camp no pot estar buit.';
-$labels['ruleexist'] = 'Ja existeix un filtre amb aquest nom';
-$labels['setactivateerror'] = 'No s\'ha pogut activar el fitlre seleccionat. Hi ha hagut un error al servidor.';
-$labels['setdeactivateerror'] = 'No s\'ha pogut desactivar el fitlre seleccionat. Hi ha hagut un error al servidor.';
-$labels['setdeleteerror'] = 'No s\'ha pogut suprimir el conjunt de filtres seleccionats. Hi ha hagut un error al servidor.';
-$labels['setactivated'] = 'El conjunt de filtres s\'ha activat correctament.';
-$labels['setdeactivated'] = 'El conjunt de filtres s\'ha desactivat correctament.';
-$labels['setdeleted'] = 'El conjunt de filtres s\'ha suprimit correctament.';
-$labels['setdeleteconfirm'] = 'Esteu segurs que voleu suprimir el conjunt de filtres seleccionats?';
-$labels['setcreateerror'] = 'No s\'ha pogut crear el conjunt de filtres. Hi ha hagut un error al servidor.';
-$labels['setcreated'] = 'S\'ha creat correctament el conjunt de filtres.';
-$labels['activateerror'] = 'No s\'ha pogut habilitar el(s) filtre(s) seleccionat(s). Hi ha hagut un error al servidor.';
-$labels['deactivateerror'] = 'No s\'ha pogut deshabilitar el(s) filtre(s) seleccionat(s). Hi ha hagut un error al servidor.';
-$labels['activated'] = 'Filtre(s) deshabilitat(s) correctament.';
-$labels['deactivated'] = 'Filtre(s) habilitat(s) correctament.';
-$labels['moved'] = 'S\'ha mogut correctament el filtre.';
-$labels['moveerror'] = 'No s\'ha pogut moure el filtre seleccionat. Hi ha hagut un error al servidor.';
-$labels['nametoolong'] = 'El nom és massa llarg.';
-$labels['namereserved'] = 'Nom reservat.';
-$labels['setexist'] = 'El conjunt ja existeix.';
-$labels['nodata'] = 'S\'ha de seleccionar com a mínim una posició!';
 
+$messages = array();
+$messages['filterunknownerror'] = 'Error desconegut al servidor.';
+$messages['filterconnerror'] = 'No s\'ha pogut connectar al servidor.';
+$messages['filterdeleteerror'] = 'No s\'ha pogut suprimir el filtre. Hi ha hagut un error al servidor.';
+$messages['filterdeleted'] = 'El filtre s\'ha suprimit correctament.';
+$messages['filtersaved'] = 'Filtre desat correctament.';
+$messages['filtersaveerror'] = 'No s\'ha pogut desar el filtre. Hi ha hagut un error al servidor.';
+$messages['filterdeleteconfirm'] = 'Realment voleu suprimit el filtre seleccionat?';
+$messages['ruledeleteconfirm'] = 'Esteu segur que voleu suprimir la norma seleccionada?';
+$messages['actiondeleteconfirm'] = 'Esteu segur que voleu suprimir l\'acció seleccionada?';
+$messages['forbiddenchars'] = 'El camp conté caràcters prohibits.';
+$messages['cannotbeempty'] = 'El camp no pot estar buit.';
+$messages['ruleexist'] = 'Ja existeix un filtre amb aquest nom';
+$messages['setactivateerror'] = 'No s\'ha pogut activar el fitlre seleccionat. Hi ha hagut un error al servidor.';
+$messages['setdeactivateerror'] = 'No s\'ha pogut desactivar el fitlre seleccionat. Hi ha hagut un error al servidor.';
+$messages['setdeleteerror'] = 'No s\'ha pogut suprimir el conjunt de filtres seleccionats. Hi ha hagut un error al servidor.';
+$messages['setactivated'] = 'El conjunt de filtres s\'ha activat correctament.';
+$messages['setdeactivated'] = 'El conjunt de filtres s\'ha desactivat correctament.';
+$messages['setdeleted'] = 'El conjunt de filtres s\'ha suprimit correctament.';
+$messages['setdeleteconfirm'] = 'Esteu segurs que voleu suprimir el conjunt de filtres seleccionats?';
+$messages['setcreateerror'] = 'No s\'ha pogut crear el conjunt de filtres. Hi ha hagut un error al servidor.';
+$messages['setcreated'] = 'S\'ha creat correctament el conjunt de filtres.';
+$messages['activateerror'] = 'No s\'ha pogut habilitar el(s) filtre(s) seleccionat(s). Hi ha hagut un error al servidor.';
+$messages['deactivateerror'] = 'No s\'ha pogut deshabilitar el(s) filtre(s) seleccionat(s). Hi ha hagut un error al servidor.';
+$messages['deactivated'] = 'Filtre(s) habilitat(s) correctament.';
+$messages['activated'] = 'Filtre(s) deshabilitat(s) correctament.';
+$messages['moved'] = 'S\'ha mogut correctament el filtre.';
+$messages['moveerror'] = 'No s\'ha pogut moure el filtre seleccionat. Hi ha hagut un error al servidor.';
+$messages['nametoolong'] = 'El nom és massa llarg.';
+$messages['namereserved'] = 'Nom reservat.';
+$messages['setexist'] = 'El conjunt ja existeix.';
+$messages['nodata'] = 'S\'ha de seleccionar com a mínim una posició!';
+
+?>
diff --git a/plugins/managesieve/localization/cs_CZ.inc b/plugins/managesieve/localization/cs_CZ.inc
index 7239454fa..c14873bb7 100644
--- a/plugins/managesieve/localization/cs_CZ.inc
+++ b/plugins/managesieve/localization/cs_CZ.inc
@@ -2,18 +2,21 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/cs_CZ/labels.inc                                         |
+ | plugins/managesieve/localization/<lang>.inc                           |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Managesieve plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-managesieve/
 */
 
-$labels = array();
+
 $labels['filters'] = 'Filtry';
 $labels['managefilters'] = 'Nastavení filtrů';
 $labels['filtername'] = 'Název filtru';
@@ -52,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['vacationaddr'] = 'Moje další e-mailové adresy (aliasy) spojené s tímto účtem:';
 $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';
@@ -92,6 +98,25 @@ $labels['flagdeleted'] = 'Smazáno';
 $labels['flaganswered'] = 'Odpovězené';
 $labels['flagflagged'] = 'Označeno';
 $labels['flagdraft'] = 'Koncept';
+$labels['setvariable'] = 'Nastavit proměnnou';
+$labels['setvarname'] = 'Název proměnné:';
+$labels['setvarvalue'] = 'Hodnota proměnné:';
+$labels['setvarmodifiers'] = 'Modifikátory:';
+$labels['varlower'] = 'malá písmena';
+$labels['varupper'] = 'velká písmena';
+$labels['varlowerfirst'] = 'první písmeno malé';
+$labels['varupperfirst'] = 'první písmeno velké';
+$labels['varquotewildcard'] = 'uvodit speciální znaky uvozovkama';
+$labels['varlength'] = 'délka';
+$labels['notify'] = 'Odeslat oznámení';
+$labels['notifyaddress'] = 'Na emailovou adresu:';
+$labels['notifybody'] = 'Zpráva oznámení:';
+$labels['notifysubject'] = 'Předmět oznámení:';
+$labels['notifyfrom'] = 'Odesílatel oznámení:';
+$labels['notifyimportance'] = 'Důležitost:';
+$labels['notifyimportancelow'] = 'nízká';
+$labels['notifyimportancenormal'] = 'normální';
+$labels['notifyimportancehigh'] = 'vysoká';
 $labels['filtercreate'] = 'Vytvořit filtr';
 $labels['usedata'] = 'Použít následující údaje ve filtru:';
 $labels['nextstep'] = 'Další krok';
@@ -115,35 +140,38 @@ $labels['default'] = 'výchozí';
 $labels['octet'] = 'striktní (oktet)';
 $labels['asciicasemap'] = 'necitlivé na velikost písmen (ascii-casemap)';
 $labels['asciinumeric'] = 'číslené (ascii-numeric)';
-$labels['filterunknownerror'] = 'Neznámá chyba serveru';
-$labels['filterconnerror'] = 'Nebylo možné se připojit k sieve serveru';
-$labels['filterdeleteerror'] = 'Nebylo možné smazat filtr. Server nahlásil chybu';
-$labels['filterdeleted'] = 'Filtr byl smazán';
-$labels['filtersaved'] = 'Filtr byl uložen';
-$labels['filtersaveerror'] = 'Nebylo možné uložit filtr. Server nahlásil chybu.';
-$labels['filterdeleteconfirm'] = 'Opravdu chcete smazat vybraný filtr?';
-$labels['ruledeleteconfirm'] = 'Jste si jisti, že chcete smazat vybrané pravidlo?';
-$labels['actiondeleteconfirm'] = 'Jste si jisti, že chcete smazat vybranou akci?';
-$labels['forbiddenchars'] = 'Zakázané znaky v poli';
-$labels['cannotbeempty'] = 'Pole nemůže být prázdné';
-$labels['ruleexist'] = 'Filtr s uvedeným názvem již existuje.';
-$labels['setactivateerror'] = 'Nelze zapnout vybranou sadu filtrů. Došlo k chybě serveru.';
-$labels['setdeactivateerror'] = 'Nelze vypnout vybranou sadu filtrů. Došlo k chybě serveru.';
-$labels['setdeleteerror'] = 'Nelze odstranit vybranou sadu filtrů. Došlo k chybě serveru.';
-$labels['setactivated'] = 'Sada filtrů úspěšně zapnuta.';
-$labels['setdeactivated'] = 'Sada filtrů úspěšně vypnuta.';
-$labels['setdeleted'] = 'Sada filtrů úspěšně odstraněna.';
-$labels['setdeleteconfirm'] = 'Opravdu si přejete odebrat vybranou sadu filtrů.';
-$labels['setcreateerror'] = 'Nelze vytvořit sadu filtrů. Došlo k chybě serveru.';
-$labels['setcreated'] = 'Sada filtrů úspěšně vytvořena.';
-$labels['activateerror'] = 'Nelze zapnout vybrané filtr/y. Došlo k chybě serveru.';
-$labels['deactivateerror'] = 'Nelze vypnout vybrané filtr/y. Došlo k chybě serveru.';
-$labels['activated'] = 'Filtr/y úspěšne vypnuty.';
-$labels['deactivated'] = 'Filtr/y úspěšně zapnuty.';
-$labels['moved'] = 'Filtr byl úspěšně přesunut.';
-$labels['moveerror'] = 'Nelze přesunout vybraný filtr. Došlo k chybě na serveru.';
-$labels['nametoolong'] = 'Příliš dlouhý název.';
-$labels['namereserved'] = 'Vyhrazený název.';
-$labels['setexist'] = 'Sada již existuje.';
-$labels['nodata'] = 'Musí být vybrána minimálně jedna pozice!';
 
+$messages = array();
+$messages['filterunknownerror'] = 'Neznámá chyba serveru';
+$messages['filterconnerror'] = 'Nebylo možné se připojit k sieve serveru';
+$messages['filterdeleteerror'] = 'Nebylo možné smazat filtr. Server nahlásil chybu';
+$messages['filterdeleted'] = 'Filtr byl smazán';
+$messages['filtersaved'] = 'Filtr byl uložen';
+$messages['filtersaveerror'] = 'Nebylo možné uložit filtr. Server nahlásil chybu.';
+$messages['filterdeleteconfirm'] = 'Opravdu chcete smazat vybraný filtr?';
+$messages['ruledeleteconfirm'] = 'Jste si jisti, že chcete smazat vybrané pravidlo?';
+$messages['actiondeleteconfirm'] = 'Jste si jisti, že chcete smazat vybranou akci?';
+$messages['forbiddenchars'] = 'Zakázané znaky v poli';
+$messages['cannotbeempty'] = 'Pole nemůže být prázdné';
+$messages['ruleexist'] = 'Filtr s uvedeným názvem již existuje.';
+$messages['setactivateerror'] = 'Nelze zapnout vybranou sadu filtrů. Došlo k chybě serveru.';
+$messages['setdeactivateerror'] = 'Nelze vypnout vybranou sadu filtrů. Došlo k chybě serveru.';
+$messages['setdeleteerror'] = 'Nelze odstranit vybranou sadu filtrů. Došlo k chybě serveru.';
+$messages['setactivated'] = 'Sada filtrů úspěšně zapnuta.';
+$messages['setdeactivated'] = 'Sada filtrů úspěšně vypnuta.';
+$messages['setdeleted'] = 'Sada filtrů úspěšně odstraněna.';
+$messages['setdeleteconfirm'] = 'Opravdu si přejete odebrat vybranou sadu filtrů.';
+$messages['setcreateerror'] = 'Nelze vytvořit sadu filtrů. Došlo k chybě serveru.';
+$messages['setcreated'] = 'Sada filtrů úspěšně vytvořena.';
+$messages['activateerror'] = 'Nelze zapnout vybrané filtr/y. Došlo k chybě serveru.';
+$messages['deactivateerror'] = 'Nelze vypnout vybrané filtr/y. Došlo k chybě serveru.';
+$messages['deactivated'] = 'Filtr/y úspěšně zapnuty.';
+$messages['activated'] = 'Filtr/y úspěšne vypnuty.';
+$messages['moved'] = 'Filtr byl úspěšně přesunut.';
+$messages['moveerror'] = 'Nelze přesunout vybraný filtr. Došlo k chybě na serveru.';
+$messages['nametoolong'] = 'Příliš dlouhý název.';
+$messages['namereserved'] = 'Vyhrazený název.';
+$messages['setexist'] = 'Sada již existuje.';
+$messages['nodata'] = 'Musí být vybrána minimálně jedna pozice!';
+
+?>
diff --git a/plugins/managesieve/localization/cy_GB.inc b/plugins/managesieve/localization/cy_GB.inc
index bace9be6e..63d2e7100 100644
--- a/plugins/managesieve/localization/cy_GB.inc
+++ b/plugins/managesieve/localization/cy_GB.inc
@@ -2,18 +2,21 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/cy_GB/labels.inc                                         |
+ | plugins/managesieve/localization/<lang>.inc                           |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Managesieve plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Dafydd Tomos                                                  |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-managesieve/
 */
 
-$labels = array();
+
 $labels['filters'] = 'Hidlyddion';
 $labels['managefilters'] = 'Rheoli hidlyddion ebost i fewn';
 $labels['filtername'] = 'Enw hidlydd';
@@ -52,8 +55,11 @@ $labels['add'] = 'Ychwanegu';
 $labels['del'] = 'Dileu';
 $labels['sender'] = 'Anfonwr';
 $labels['recipient'] = 'Derbynnwr';
-$labels['vacationaddresses'] = 'Fy chyfeiriadau ebost ychwanegol (gwahanir gyda coma):';
+$labels['vacationaddr'] = 'Fy chyfeiriadau ebost ychwanegol:';
 $labels['vacationdays'] = 'Pa mor aml i ddanfon negeseuon (mewn dyddiau):';
+$labels['vacationinterval'] = 'How often send messages:';
+$labels['days'] = 'days';
+$labels['seconds'] = 'seconds';
 $labels['vacationreason'] = 'Corff neges (rheswm ar wyliau):';
 $labels['vacationsubject'] = 'Pwnc neges:';
 $labels['rulestop'] = 'Stopio gwerthuso rheolau';
@@ -92,6 +98,25 @@ $labels['flagdeleted'] = 'Dilewyd';
 $labels['flaganswered'] = 'Atebwyd';
 $labels['flagflagged'] = 'Nodwyd';
 $labels['flagdraft'] = 'Drafft';
+$labels['setvariable'] = 'Gosod newidyn';
+$labels['setvarname'] = 'Enw newidyn:';
+$labels['setvarvalue'] = 'Gwerth newidyn:';
+$labels['setvarmodifiers'] = 'Addasydd:';
+$labels['varlower'] = 'llythrennau bychain';
+$labels['varupper'] = 'priflythrennau';
+$labels['varlowerfirst'] = 'llythyren gyntaf yn fach';
+$labels['varupperfirst'] = 'llythyren gyntaf yn briflythyren';
+$labels['varquotewildcard'] = 'dyfynnu nodau arbennig';
+$labels['varlength'] = 'hyd';
+$labels['notify'] = 'Anfon hysbysiad';
+$labels['notifyaddress'] = 'I gyfeiriad ebost:';
+$labels['notifybody'] = 'Corff hysbysiad:';
+$labels['notifysubject'] = 'Pwnc hysbysiad:';
+$labels['notifyfrom'] = 'Anfonwr hysbysiad:';
+$labels['notifyimportance'] = 'Pwysigrwydd:';
+$labels['notifyimportancelow'] = 'isel';
+$labels['notifyimportancenormal'] = 'arferol';
+$labels['notifyimportancehigh'] = 'uchel';
 $labels['filtercreate'] = 'Creu hidlydd';
 $labels['usedata'] = 'Defnyddio\'r wybodaeth ganlynol yn yr hidlydd:';
 $labels['nextstep'] = 'Cam nesaf';
@@ -115,35 +140,38 @@ $labels['default'] = 'rhagosodiad';
 $labels['octet'] = 'llym (octet)';
 $labels['asciicasemap'] = 'maint llythrennau (ascii-casemap)';
 $labels['asciinumeric'] = 'rhifau (ascii-numeric)';
-$labels['filterunknownerror'] = 'Gwall gweinydd anhysbys.';
-$labels['filterconnerror'] = 'Methwyd cysylltu a\'r gweinydd.';
-$labels['filterdeleteerror'] = 'Methwyd dileu hidlydd. Cafwydd gwall gweinydd.';
-$labels['filterdeleted'] = 'Dilëuwyd hidlydd yn llwyddiannus.';
-$labels['filtersaved'] = 'Cadwyd hidlydd yn llwyddiannus.';
-$labels['filtersaveerror'] = 'Methwyd cadw hidlydd. Cafwyd gwall gweinydd.';
-$labels['filterdeleteconfirm'] = 'Ydych chi wir am ddileu yr hidlydd ddewiswyd?';
-$labels['ruledeleteconfirm'] = 'Ydych chi\'n siwr eich bod am ddileu\'r rheol ddewiswyd?';
-$labels['actiondeleteconfirm'] = 'Ydych chi\'n siwr eich bod am ddileu\'r weithred ddewiswyd?';
-$labels['forbiddenchars'] = 'Llythrennau gwaharddedig yn y maes.';
-$labels['cannotbeempty'] = 'Ni all y maes fod yn wag.';
-$labels['ruleexist'] = 'Mae hidlydd gyda\'r enw yma yn bodoli\'n barod.';
-$labels['setactivateerror'] = 'Methwyd bywiogi y set hidlydd dewiswyd. Cafwyd gwall gweinydd.';
-$labels['setdeactivateerror'] = 'Methwyd dadfywiogi y set hidlydd dewiswyd. Cafwyd gwall gweinydd.';
-$labels['setdeleteerror'] = 'Methwyd dileu y set hidlydd dewiswyd. Cafwyd gwall gweinydd.';
-$labels['setactivated'] = 'Bywiogwyd y set hidlydd yn llwyddiannus.';
-$labels['setdeactivated'] = 'Dadfywiogwyd y set hidlydd yn llwyddiannus.';
-$labels['setdeleted'] = 'Dilëuwyd y set hidlydd yn llwyddiannus.';
-$labels['setdeleteconfirm'] = 'Ydych chi\'n siwr eich bod am ddileu\'r set hidlydd ddewiswyd?';
-$labels['setcreateerror'] = 'Methwyd creu set hidlydd. Cafwyd gwall gweinydd.';
-$labels['setcreated'] = 'Crëuwyd y set hidlydd yn llwyddiannus.';
-$labels['activateerror'] = 'Methwyd galluogi y hidlydd(ion) dewiswyd. Cafwyd gwall gweinydd.';
-$labels['deactivateerror'] = 'Methwyd analluogi y hidlydd(ion) dewiswyd. Cafwyd gwall gweinydd.';
-$labels['activated'] = 'Analluogwyd y hidlydd(ion) yn llwyddiannus.';
-$labels['deactivated'] = 'Galluogwyd y hidlydd(ion) yn llwyddiannus.';
-$labels['moved'] = 'Symudwyd y hidlydd yn llwyddiannus.';
-$labels['moveerror'] = 'Methwyd symud y hidlydd dewiswyd. Cafwyd gwall gweinydd.';
-$labels['nametoolong'] = 'Enw yn rhy hir.';
-$labels['namereserved'] = 'Enw neilltuedig.';
-$labels['setexist'] = 'Mae\'r set yn bodoli\'n barod.';
-$labels['nodata'] = 'Rhaid dewis o leia un safle!';
 
+$messages = array();
+$messages['filterunknownerror'] = 'Gwall gweinydd anhysbys.';
+$messages['filterconnerror'] = 'Methwyd cysylltu a\'r gweinydd.';
+$messages['filterdeleteerror'] = 'Methwyd dileu hidlydd. Cafwydd gwall gweinydd.';
+$messages['filterdeleted'] = 'Dilëuwyd hidlydd yn llwyddiannus.';
+$messages['filtersaved'] = 'Cadwyd hidlydd yn llwyddiannus.';
+$messages['filtersaveerror'] = 'Methwyd cadw hidlydd. Cafwyd gwall gweinydd.';
+$messages['filterdeleteconfirm'] = 'Ydych chi wir am ddileu yr hidlydd ddewiswyd?';
+$messages['ruledeleteconfirm'] = 'Ydych chi\'n siwr eich bod am ddileu\'r rheol ddewiswyd?';
+$messages['actiondeleteconfirm'] = 'Ydych chi\'n siwr eich bod am ddileu\'r weithred ddewiswyd?';
+$messages['forbiddenchars'] = 'Llythrennau gwaharddedig yn y maes.';
+$messages['cannotbeempty'] = 'Ni all y maes fod yn wag.';
+$messages['ruleexist'] = 'Mae hidlydd gyda\'r enw yma yn bodoli\'n barod.';
+$messages['setactivateerror'] = 'Methwyd bywiogi y set hidlydd dewiswyd. Cafwyd gwall gweinydd.';
+$messages['setdeactivateerror'] = 'Methwyd dadfywiogi y set hidlydd dewiswyd. Cafwyd gwall gweinydd.';
+$messages['setdeleteerror'] = 'Methwyd dileu y set hidlydd dewiswyd. Cafwyd gwall gweinydd.';
+$messages['setactivated'] = 'Bywiogwyd y set hidlydd yn llwyddiannus.';
+$messages['setdeactivated'] = 'Dadfywiogwyd y set hidlydd yn llwyddiannus.';
+$messages['setdeleted'] = 'Dilëuwyd y set hidlydd yn llwyddiannus.';
+$messages['setdeleteconfirm'] = 'Ydych chi\'n siwr eich bod am ddileu\'r set hidlydd ddewiswyd?';
+$messages['setcreateerror'] = 'Methwyd creu set hidlydd. Cafwyd gwall gweinydd.';
+$messages['setcreated'] = 'Crëuwyd y set hidlydd yn llwyddiannus.';
+$messages['activateerror'] = 'Methwyd galluogi y hidlydd(ion) dewiswyd. Cafwyd gwall gweinydd.';
+$messages['deactivateerror'] = 'Methwyd analluogi y hidlydd(ion) dewiswyd. Cafwyd gwall gweinydd.';
+$messages['deactivated'] = 'Galluogwyd y hidlydd(ion) yn llwyddiannus.';
+$messages['activated'] = 'Analluogwyd y hidlydd(ion) yn llwyddiannus.';
+$messages['moved'] = 'Symudwyd y hidlydd yn llwyddiannus.';
+$messages['moveerror'] = 'Methwyd symud y hidlydd dewiswyd. Cafwyd gwall gweinydd.';
+$messages['nametoolong'] = 'Enw yn rhy hir.';
+$messages['namereserved'] = 'Enw neilltuedig.';
+$messages['setexist'] = 'Mae\'r set yn bodoli\'n barod.';
+$messages['nodata'] = 'Rhaid dewis o leia un safle!';
+
+?>
diff --git a/plugins/managesieve/localization/da_DK.inc b/plugins/managesieve/localization/da_DK.inc
index 91bc18dd7..058481031 100644
--- a/plugins/managesieve/localization/da_DK.inc
+++ b/plugins/managesieve/localization/da_DK.inc
@@ -2,18 +2,21 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/da_DK/labels.inc                                         |
+ | plugins/managesieve/localization/<lang>.inc                           |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Managesieve plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Johannes Hessellund <osos@openeyes.dk>                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-managesieve/
 */
 
-$labels = array();
+
 $labels['filters'] = 'Filtre';
 $labels['managefilters'] = 'Ændre indgående mail filtreing';
 $labels['filtername'] = 'Filter navn';
@@ -52,8 +55,11 @@ $labels['add'] = 'Tilføje';
 $labels['del'] = 'Fjern';
 $labels['sender'] = 'Afsender';
 $labels['recipient'] = 'Modtager';
-$labels['vacationaddresses'] = 'Mine alternative e-mailadresser (kommasepareret):';
+$labels['vacationaddr'] = 'Mine alternative e-mailadresser:';
 $labels['vacationdays'] = 'Hvor tit skal besked sendes (i dage):';
+$labels['vacationinterval'] = 'How often send messages:';
+$labels['days'] = 'days';
+$labels['seconds'] = 'seconds';
 $labels['vacationreason'] = 'Besked (ved ferie):';
 $labels['vacationsubject'] = 'Besked emne:';
 $labels['rulestop'] = 'Stop behandling af regler';
@@ -92,6 +98,25 @@ $labels['flagdeleted'] = 'Slettede';
 $labels['flaganswered'] = 'Besvaret';
 $labels['flagflagged'] = 'Markeret';
 $labels['flagdraft'] = 'Kladde';
+$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 meddelelse';
+$labels['notifyaddress'] = 'Til e-mail adresse:';
+$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';
 $labels['filtercreate'] = 'Opret filter';
 $labels['usedata'] = 'Brug følgende data i filteret:';
 $labels['nextstep'] = 'Næste trin';
@@ -115,35 +140,38 @@ $labels['default'] = 'standard';
 $labels['octet'] = 'præcis (oktet)';
 $labels['asciicasemap'] = 'store og små bogstaver (ascii-bogstaver)';
 $labels['asciinumeric'] = 'numerisk (ascii-numerisk)';
-$labels['filterunknownerror'] = 'Ukendt server fejl.';
-$labels['filterconnerror'] = 'Kan ikke forbinde til server.';
-$labels['filterdeleteerror'] = 'Kan ikke slette filter. Server fejl.';
-$labels['filterdeleted'] = 'Filter slettet.';
-$labels['filtersaved'] = 'Filter gemt.';
-$labels['filtersaveerror'] = 'Kan ikke gemme filter. Server fejl.';
-$labels['filterdeleteconfirm'] = 'Vil du slette det valgte filter?';
-$labels['ruledeleteconfirm'] = 'Er du sikker på at du vil slette den valgte regel?';
-$labels['actiondeleteconfirm'] = 'Er du sikker på du vil slette den valgte handling?';
-$labels['forbiddenchars'] = 'Ulovlige tegn i feltet';
-$labels['cannotbeempty'] = 'Feltet kan ikke være tomt.';
-$labels['ruleexist'] = 'Filter med dette navn eksisterer allerede.';
-$labels['setactivateerror'] = 'Kan ikke aktiverer valgt filter sæt. Server fejl.';
-$labels['setdeactivateerror'] = 'Kan ikke deaktivere valgt filter sæt. Server fejl.';
-$labels['setdeleteerror'] = 'Kan ikke slette valgt filter sæt. Server fejl.';
-$labels['setactivated'] = 'Filter sæt aktiveret.';
-$labels['setdeactivated'] = 'Filter sæt deaktiveret.';
-$labels['setdeleted'] = 'Filter sæt slettet.';
-$labels['setdeleteconfirm'] = 'Er du sikker på du vil slette valgt filter sæt?';
-$labels['setcreateerror'] = 'Kan ikke oprette filter sæt. Server fejl.';
-$labels['setcreated'] = 'Filter sæt oprettet.';
-$labels['activateerror'] = 'Kan ikek aktivere valgt filter sæt. Server fejl.';
-$labels['deactivateerror'] = 'Kan ikke deaktivere valgt filter sæt. Server fejl.';
-$labels['activated'] = 'Filter(filtre) deaktiveret.';
-$labels['deactivated'] = 'Filter(filtre) aktiveret.';
-$labels['moved'] = 'Filter flyttet.';
-$labels['moveerror'] = 'Kan ikke flytte valgt filter. Server fejl.';
-$labels['nametoolong'] = 'Navn er for langt.';
-$labels['namereserved'] = 'Reserveret navn.';
-$labels['setexist'] = 'Filterv sæt eksisterer allerede';
-$labels['nodata'] = 'Mindst en position skal vælges!';
 
+$messages = array();
+$messages['filterunknownerror'] = 'Ukendt server fejl.';
+$messages['filterconnerror'] = 'Kan ikke forbinde til server.';
+$messages['filterdeleteerror'] = 'Kan ikke slette filter. Server fejl.';
+$messages['filterdeleted'] = 'Filter slettet.';
+$messages['filtersaved'] = 'Filter gemt.';
+$messages['filtersaveerror'] = 'Kan ikke gemme filter. Server fejl.';
+$messages['filterdeleteconfirm'] = 'Vil du slette det valgte filter?';
+$messages['ruledeleteconfirm'] = 'Er du sikker på at du vil slette den valgte regel?';
+$messages['actiondeleteconfirm'] = 'Er du sikker på du vil slette den valgte handling?';
+$messages['forbiddenchars'] = 'Ulovlige tegn i feltet';
+$messages['cannotbeempty'] = 'Feltet kan ikke være tomt.';
+$messages['ruleexist'] = 'Filter med dette navn eksisterer allerede.';
+$messages['setactivateerror'] = 'Kan ikke aktiverer valgt filter sæt. Server fejl.';
+$messages['setdeactivateerror'] = 'Kan ikke deaktivere valgt filter sæt. Server fejl.';
+$messages['setdeleteerror'] = 'Kan ikke slette valgt filter sæt. Server fejl.';
+$messages['setactivated'] = 'Filter sæt aktiveret.';
+$messages['setdeactivated'] = 'Filter sæt deaktiveret.';
+$messages['setdeleted'] = 'Filter sæt slettet.';
+$messages['setdeleteconfirm'] = 'Er du sikker på du vil slette valgt filter sæt?';
+$messages['setcreateerror'] = 'Kan ikke oprette filter sæt. Server fejl.';
+$messages['setcreated'] = 'Filter sæt oprettet.';
+$messages['activateerror'] = 'Kan ikek aktivere valgt filter sæt. Server fejl.';
+$messages['deactivateerror'] = 'Kan ikke deaktivere valgt filter sæt. Server fejl.';
+$messages['deactivated'] = 'Filter(filtre) aktiveret.';
+$messages['activated'] = 'Filter(filtre) deaktiveret.';
+$messages['moved'] = 'Filter flyttet.';
+$messages['moveerror'] = 'Kan ikke flytte valgt filter. Server fejl.';
+$messages['nametoolong'] = 'Navn er for langt.';
+$messages['namereserved'] = 'Reserveret navn.';
+$messages['setexist'] = 'Filterv sæt eksisterer allerede';
+$messages['nodata'] = 'Mindst en position skal vælges!';
+
+?>
diff --git a/plugins/managesieve/localization/de_CH.inc b/plugins/managesieve/localization/de_CH.inc
index 2ce0305bb..19a9b9de3 100644
--- a/plugins/managesieve/localization/de_CH.inc
+++ b/plugins/managesieve/localization/de_CH.inc
@@ -2,10 +2,10 @@
 
 /*
  +-----------------------------------------------------------------------+
- | plugins/managesieve/localization/<lang>.inc                            |
+ | plugins/managesieve/localization/<lang>.inc                           |
  |                                                                       |
  | Localization file of the Roundcube Webmail Managesieve plugin         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -55,8 +55,11 @@ $labels['add'] = 'Hinzufügen';
 $labels['del'] = 'Löschen';
 $labels['sender'] = 'Absender';
 $labels['recipient'] = 'Empfänger';
-$labels['vacationaddresses'] = 'Zusätzliche Liste von Empfängern (Komma getrennt):';
+$labels['vacationaddr'] = 'Zusätzliche Liste von Empfängern:';
 $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 2b42917cf..4894904d6 100644
--- a/plugins/managesieve/localization/de_DE.inc
+++ b/plugins/managesieve/localization/de_DE.inc
@@ -2,18 +2,21 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/de_DE/labels.inc                                         |
+ | plugins/managesieve/localization/<lang>.inc                           |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Managesieve plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: SimonFS <simonschuette@arcor.de>                              |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-managesieve/
 */
 
-$labels = array();
+
 $labels['filters'] = 'Filter';
 $labels['managefilters'] = 'Filter für eingehende Nachrichten verwalten';
 $labels['filtername'] = 'Filtername';
@@ -52,8 +55,11 @@ $labels['add'] = 'Hinzufügen';
 $labels['del'] = 'Löschen';
 $labels['sender'] = 'Absender';
 $labels['recipient'] = 'Empfänger';
-$labels['vacationaddresses'] = 'Zusätzliche Liste von E-Mail Empfängern (Komma getrennt):';
+$labels['vacationaddr'] = 'Zusätzliche Liste von E-Mail Empfängern:';
 $labels['vacationdays'] = 'Wie oft sollen Nachrichten gesendet werden (in Tagen):';
+$labels['vacationinterval'] = 'How often send messages:';
+$labels['days'] = 'days';
+$labels['seconds'] = 'seconds';
 $labels['vacationreason'] = 'Nachrichteninhalt (Abwesenheitsgrund):';
 $labels['vacationsubject'] = 'Nachrichtenbetreff';
 $labels['rulestop'] = 'Regelauswertung anhalten';
@@ -92,6 +98,25 @@ $labels['flagdeleted'] = 'Gelöscht';
 $labels['flaganswered'] = 'Beantwortet';
 $labels['flagflagged'] = 'Markiert';
 $labels['flagdraft'] = 'Entwurf';
+$labels['setvariable'] = 'Variable setzen';
+$labels['setvarname'] = 'Name der Variable:';
+$labels['setvarvalue'] = 'Wert der Variable:';
+$labels['setvarmodifiers'] = 'Modifikatoren:';
+$labels['varlower'] = 'Kleinschreibung';
+$labels['varupper'] = 'Großschreibung';
+$labels['varlowerfirst'] = 'Erster Buchstabe kleingeschrieben';
+$labels['varupperfirst'] = 'Erster Buchstabe großgeschrieben';
+$labels['varquotewildcard'] = 'maskiere Sonderzeichen';
+$labels['varlength'] = 'Länge';
+$labels['notify'] = 'Sende Benachrichtigung';
+$labels['notifyaddress'] = 'An Email Adresse:';
+$labels['notifybody'] = 'Benachrichtigungs-Text:';
+$labels['notifysubject'] = 'Benachrichtigungs-Betreff:';
+$labels['notifyfrom'] = 'Benachrichtigungs-Absender:';
+$labels['notifyimportance'] = 'Priorität:';
+$labels['notifyimportancelow'] = 'niedrig';
+$labels['notifyimportancenormal'] = 'normal';
+$labels['notifyimportancehigh'] = 'hoch';
 $labels['filtercreate'] = 'Filter erstellen';
 $labels['usedata'] = 'Die folgenden Daten im Filter benutzen:';
 $labels['nextstep'] = 'Nächster Schritt';
@@ -115,35 +140,38 @@ $labels['default'] = 'Vorgabewert';
 $labels['octet'] = 'strikt (Oktett)';
 $labels['asciicasemap'] = 'Groß-/Kleinschreibung ignorieren';
 $labels['asciinumeric'] = 'numerisch (ascii-numeric)';
-$labels['filterunknownerror'] = 'Unbekannter Serverfehler';
-$labels['filterconnerror'] = 'Kann keine Verbindung mit Managesieve-Server herstellen';
-$labels['filterdeleteerror'] = 'Fehler beim Löschen des Filters. Serverfehler';
-$labels['filterdeleted'] = 'Filter erfolgreich gelöscht';
-$labels['filtersaved'] = 'Filter erfolgreich gespeichert';
-$labels['filtersaveerror'] = 'Fehler beim Speichern des Filters. Serverfehler';
-$labels['filterdeleteconfirm'] = 'Möchten Sie den ausgewählten Filter wirklich löschen?';
-$labels['ruledeleteconfirm'] = 'Sind Sie sicher, dass Sie die ausgewählte Regel löschen möchten?';
-$labels['actiondeleteconfirm'] = 'Sind Sie sicher, dass Sie die ausgewählte Aktion löschen möchten?';
-$labels['forbiddenchars'] = 'Unzulässige Zeichen im Eingabefeld';
-$labels['cannotbeempty'] = 'Eingabefeld darf nicht leer sein';
-$labels['ruleexist'] = 'Ein Filter mit dem angegebenen Namen existiert bereits.';
-$labels['setactivateerror'] = 'Kann ausgewählten Filtersatz nicht aktivieren. Serverfehler';
-$labels['setdeactivateerror'] = 'Kann ausgewählten Filtersatz nicht deaktivieren. Serverfehler';
-$labels['setdeleteerror'] = 'Kann ausgewählten Filtersatz nicht löschen. Serverfehler';
-$labels['setactivated'] = 'Filtersatz wurde erfolgreich aktiviert';
-$labels['setdeactivated'] = 'Filtersatz wurde erfolgreich deaktiviert';
-$labels['setdeleted'] = 'Filtersatz wurde erfolgreich gelöscht';
-$labels['setdeleteconfirm'] = 'Sind Sie sicher, dass Sie den ausgewählten Filtersatz löschen möchten?';
-$labels['setcreateerror'] = 'Erstellen von Filter Sätzen nicht möglich. Es ist ein Server Fehler aufgetreten.';
-$labels['setcreated'] = 'Filtersatz wurde erfolgreich erstellt';
-$labels['activateerror'] = 'Filter kann nicht aktiviert werden. Serverfehler.';
-$labels['deactivateerror'] = 'Filter kann nicht deaktiviert werden. Serverfehler.';
-$labels['activated'] = 'Filter erfolgreich aktiviert.';
-$labels['deactivated'] = 'Filter erfolgreich deaktiviert.';
-$labels['moved'] = 'Filter erfolgreich verschoben.';
-$labels['moveerror'] = 'Filter kann nicht verschoben werden. Serverfehler.';
-$labels['nametoolong'] = 'Kann Filtersatz nicht erstellen. Name zu lang';
-$labels['namereserved'] = 'Reservierter Name.';
-$labels['setexist'] = 'Filtersatz existiert bereits.';
-$labels['nodata'] = 'Mindestens eine Position muss ausgewählt werden!';
 
+$messages = array();
+$messages['filterunknownerror'] = 'Unbekannter Serverfehler';
+$messages['filterconnerror'] = 'Kann keine Verbindung mit Managesieve-Server herstellen';
+$messages['filterdeleteerror'] = 'Fehler beim Löschen des Filters. Serverfehler';
+$messages['filterdeleted'] = 'Filter erfolgreich gelöscht';
+$messages['filtersaved'] = 'Filter erfolgreich gespeichert';
+$messages['filtersaveerror'] = 'Fehler beim Speichern des Filters. Serverfehler';
+$messages['filterdeleteconfirm'] = 'Möchten Sie den ausgewählten Filter wirklich löschen?';
+$messages['ruledeleteconfirm'] = 'Sind Sie sicher, dass Sie die ausgewählte Regel löschen möchten?';
+$messages['actiondeleteconfirm'] = 'Sind Sie sicher, dass Sie die ausgewählte Aktion löschen möchten?';
+$messages['forbiddenchars'] = 'Unzulässige Zeichen im Eingabefeld';
+$messages['cannotbeempty'] = 'Eingabefeld darf nicht leer sein';
+$messages['ruleexist'] = 'Ein Filter mit dem angegebenen Namen existiert bereits.';
+$messages['setactivateerror'] = 'Kann ausgewählten Filtersatz nicht aktivieren. Serverfehler';
+$messages['setdeactivateerror'] = 'Kann ausgewählten Filtersatz nicht deaktivieren. Serverfehler';
+$messages['setdeleteerror'] = 'Kann ausgewählten Filtersatz nicht löschen. Serverfehler';
+$messages['setactivated'] = 'Filtersatz wurde erfolgreich aktiviert';
+$messages['setdeactivated'] = 'Filtersatz wurde erfolgreich deaktiviert';
+$messages['setdeleted'] = 'Filtersatz wurde erfolgreich gelöscht';
+$messages['setdeleteconfirm'] = 'Sind Sie sicher, dass Sie den ausgewählten Filtersatz löschen möchten?';
+$messages['setcreateerror'] = 'Erstellen von Filter Sätzen nicht möglich. Es ist ein Server Fehler aufgetreten.';
+$messages['setcreated'] = 'Filtersatz wurde erfolgreich erstellt';
+$messages['activateerror'] = 'Filter kann nicht aktiviert werden. Serverfehler.';
+$messages['deactivateerror'] = 'Filter kann nicht deaktiviert werden. Serverfehler.';
+$messages['deactivated'] = 'Filter erfolgreich deaktiviert.';
+$messages['activated'] = 'Filter erfolgreich aktiviert.';
+$messages['moved'] = 'Filter erfolgreich verschoben.';
+$messages['moveerror'] = 'Filter kann nicht verschoben werden. Serverfehler.';
+$messages['nametoolong'] = 'Kann Filtersatz nicht erstellen. Name zu lang';
+$messages['namereserved'] = 'Reservierter Name.';
+$messages['setexist'] = 'Filtersatz existiert bereits.';
+$messages['nodata'] = 'Mindestens eine Position muss ausgewählt werden!';
+
+?>
diff --git a/plugins/managesieve/localization/el_GR.inc b/plugins/managesieve/localization/el_GR.inc
index dada982d6..e5a1b792d 100644
--- a/plugins/managesieve/localization/el_GR.inc
+++ b/plugins/managesieve/localization/el_GR.inc
@@ -2,19 +2,21 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/el_GR/labels.inc                                         |
+ | plugins/managesieve/localization/<lang>.inc                           |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Managesieve plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-managesieve/
 */
 
-$labels = array();
+
 $labels['filters'] = 'Φίλτρα';
 $labels['managefilters'] = 'Διαχείριση φίλτρων εισερχόμενων';
 $labels['filtername'] = 'Ονομασία φίλτρου';
@@ -32,12 +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['filterunder'] = 'κάτω';
 $labels['filterover'] = 'πάνω';
 $labels['addrule'] = 'Προσθήκη κανόνα';
 $labels['delrule'] = 'Διαγραφή κανόνα';
 $labels['messagemoveto'] = 'Μετακίνηση μηνύματος στο';
 $labels['messageredirect'] = 'Προώθηση μηνύματος στο';
+$labels['messagecopyto'] = 'Copy message to';
+$labels['messagesendcopy'] = 'Send message copy to';
 $labels['messagereply'] = 'Απάντηση με μήνυμα';
 $labels['messagedelete'] = 'Διαγραφή μηνύματος';
 $labels['messagediscard'] = 'Απόρριψη με μήνυμα';
@@ -47,18 +55,123 @@ $labels['add'] = 'Προσθήκη';
 $labels['del'] = 'Διαγραφή';
 $labels['sender'] = 'Αποστολέας';
 $labels['recipient'] = 'Παραλήπτης';
-$labels['vacationaddresses'] = 'Πρόσθετη λίστα email παραληπτών (διαχωρισμένη με κόμματα):';
+$labels['vacationaddr'] = 'Πρόσθετη λίστα email παραληπτών:';
 $labels['vacationdays'] = 'Συχνότητα αποστολής μηνυμάτων (σε ημέρες):';
+$labels['vacationinterval'] = 'How often send messages:';
+$labels['days'] = 'days';
+$labels['seconds'] = 'seconds';
 $labels['vacationreason'] = 'Σώμα μηνύματος (λόγος απουσίας):';
+$labels['vacationsubject'] = 'Message subject:';
 $labels['rulestop'] = 'Παύση επαλήθευσης κανόνων';
-$labels['filterunknownerror'] = 'Άγνωστο σφάλμα διακομιστή';
-$labels['filterconnerror'] = 'Αδυναμία σύνδεσης στον διακομιστή managesieve';
-$labels['filterdeleteerror'] = 'Αδυναμία διαγραφής φίλτρου. Προέκυψε σφάλμα στον διακομιστή';
-$labels['filterdeleted'] = 'Το φίλτρο διαγράφηκε επιτυχώς';
-$labels['filtersaved'] = 'Το φίλτρο αποθηκεύτηκε επιτυχώς';
-$labels['filtersaveerror'] = 'Αδυναμία αποθήκευσης φίλτρου. Προέκυψε σφάλμα στον διακομιστή';
-$labels['ruledeleteconfirm'] = 'Θέλετε όντως να διαγράψετε τον επιλεγμένο κανόνα;';
-$labels['actiondeleteconfirm'] = 'Θέλετε όντως να διαγράψετε την επιλεγμένη ενέργεια;';
-$labels['forbiddenchars'] = 'Μη επιτρεπτοί χαρακτήρες στο πεδίο';
-$labels['cannotbeempty'] = 'Το πεδίο δεν μπορεί να είναι κενό';
+$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['...'] = '...';
+$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)';
+
+$messages = array();
+$messages['filterunknownerror'] = 'Άγνωστο σφάλμα διακομιστή';
+$messages['filterconnerror'] = 'Αδυναμία σύνδεσης στον διακομιστή managesieve';
+$messages['filterdeleteerror'] = 'Αδυναμία διαγραφής φίλτρου. Προέκυψε σφάλμα στον διακομιστή';
+$messages['filterdeleted'] = 'Το φίλτρο διαγράφηκε επιτυχώς';
+$messages['filtersaved'] = 'Το φίλτρο αποθηκεύτηκε επιτυχώς';
+$messages['filtersaveerror'] = 'Αδυναμία αποθήκευσης φίλτρου. Προέκυψε σφάλμα στον διακομιστή';
+$messages['filterdeleteconfirm'] = 'Do you really want to delete selected filter?';
+$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!';
 
+?>
diff --git a/plugins/managesieve/localization/en_GB.inc b/plugins/managesieve/localization/en_GB.inc
index 66ff5edea..ff4965ca0 100644
--- a/plugins/managesieve/localization/en_GB.inc
+++ b/plugins/managesieve/localization/en_GB.inc
@@ -2,18 +2,21 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/en_GB/labels.inc                                         |
+ | plugins/managesieve/localization/<lang>.inc                           |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Managesieve plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Vibhav Pant <vibhavp@gmail.com>                               |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-managesieve/
 */
 
-$labels = array();
+
 $labels['filters'] = 'Filters';
 $labels['managefilters'] = 'Manage incoming mail filters';
 $labels['filtername'] = 'Filter name';
@@ -52,8 +55,11 @@ $labels['add'] = 'Add';
 $labels['del'] = 'Delete';
 $labels['sender'] = 'Sender';
 $labels['recipient'] = 'Recipient';
-$labels['vacationaddresses'] = 'Additional list of recipient e-mails (comma separated):';
+$labels['vacationaddr'] = 'Additional list of recipient e-mails:';
 $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';
@@ -92,6 +98,25 @@ $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';
@@ -115,35 +140,38 @@ $labels['default'] = 'default';
 $labels['octet'] = 'strict (octet)';
 $labels['asciicasemap'] = 'case insensitive (ascii-casemap)';
 $labels['asciinumeric'] = 'numeric (ascii-numeric)';
-$labels['filterunknownerror'] = 'Unknown server error';
-$labels['filterconnerror'] = 'Unable to connect to managesieve server';
-$labels['filterdeleteerror'] = 'Unable to delete filter. Server error occured';
-$labels['filterdeleted'] = 'Filter deleted successfully';
-$labels['filtersaved'] = 'Filter saved successfully';
-$labels['filtersaveerror'] = 'Unable to save filter. Server error occured.';
-$labels['filterdeleteconfirm'] = 'Do you really want to delete selected filter?';
-$labels['ruledeleteconfirm'] = 'Are you sure, you want to delete selected rule?';
-$labels['actiondeleteconfirm'] = 'Are you sure, you want to delete selected action?';
-$labels['forbiddenchars'] = 'Forbidden characters in field';
-$labels['cannotbeempty'] = 'Field cannot be empty';
-$labels['ruleexist'] = 'Filter with specified name already exists.';
-$labels['setactivateerror'] = 'Unable to activate selected filters set. Server error occured.';
-$labels['setdeactivateerror'] = 'Unable to deactivate selected filters set. Server error occured.';
-$labels['setdeleteerror'] = 'Unable to delete selected filters set. Server error occured.';
-$labels['setactivated'] = 'Filters set activated successfully.';
-$labels['setdeactivated'] = 'Filters set deactivated successfully.';
-$labels['setdeleted'] = 'Filters set deleted successfully.';
-$labels['setdeleteconfirm'] = 'Are you sure, you want to delete selected filters set?';
-$labels['setcreateerror'] = 'Unable to create filters set. Server error occured.';
-$labels['setcreated'] = 'Filters set created successfully.';
-$labels['activateerror'] = 'Unable to enable selected filter(s). Server error occured.';
-$labels['deactivateerror'] = 'Unable to disable selected filter(s). Server error occured.';
-$labels['activated'] = 'Filter(s) enabled successfully.';
-$labels['deactivated'] = 'Filter(s) disabled successfully.';
-$labels['moved'] = 'Filter moved successfully.';
-$labels['moveerror'] = 'Unable to move selected filter. Server error occured.';
-$labels['nametoolong'] = 'Name too long.';
-$labels['namereserved'] = 'Reserved name.';
-$labels['setexist'] = 'Set already exists.';
-$labels['nodata'] = 'At least one position must be selected!';
 
+$messages = array();
+$messages['filterunknownerror'] = 'Unknown server error';
+$messages['filterconnerror'] = 'Unable to connect to managesieve server';
+$messages['filterdeleteerror'] = 'Unable to delete filter. Server error occured';
+$messages['filterdeleted'] = 'Filter deleted successfully';
+$messages['filtersaved'] = 'Filter saved successfully';
+$messages['filtersaveerror'] = 'Unable to save filter. Server error occured.';
+$messages['filterdeleteconfirm'] = 'Do you really want to delete selected filter?';
+$messages['ruledeleteconfirm'] = 'Are you sure, you want to delete selected rule?';
+$messages['actiondeleteconfirm'] = 'Are you sure, you want to delete selected action?';
+$messages['forbiddenchars'] = 'Forbidden characters in field';
+$messages['cannotbeempty'] = 'Field cannot be empty';
+$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!';
+
+?>
diff --git a/plugins/managesieve/localization/en_US.inc b/plugins/managesieve/localization/en_US.inc
index 2b23af6db..72bbf9d41 100644
--- a/plugins/managesieve/localization/en_US.inc
+++ b/plugins/managesieve/localization/en_US.inc
@@ -2,10 +2,10 @@
 
 /*
  +-----------------------------------------------------------------------+
- | plugins/managesieve/localization/<lang>.inc                            |
+ | plugins/managesieve/localization/<lang>.inc                           |
  |                                                                       |
  | Localization file of the Roundcube Webmail Managesieve plugin         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -55,8 +55,11 @@ $labels['add'] = 'Add';
 $labels['del'] = 'Delete';
 $labels['sender'] = 'Sender';
 $labels['recipient'] = 'Recipient';
-$labels['vacationaddresses'] = 'My additional e-mail addresse(s) (comma-separated):';
+$labels['vacationaddr'] = 'My additional e-mail addresse(s):';
 $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';
@@ -80,13 +83,13 @@ $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['countnotequals'] = 'count is not equal to';
 $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['valuenotequals'] = 'value is not equal to';
 $labels['setflags'] = 'Set flags to the message';
 $labels['addflags'] = 'Add flags to the message';
 $labels['removeflags'] = 'Remove flags from the message';
@@ -118,6 +121,22 @@ $labels['filtercreate'] = 'Create filter';
 $labels['usedata'] = 'Use following data in the filter:';
 $labels['nextstep'] = 'Next Step';
 $labels['...'] = '...';
+$labels['currdate'] = 'Current date';
+$labels['datetest'] = 'Date';
+$labels['dateheader'] = 'header:';
+$labels['year'] = 'year';
+$labels['month'] = 'month';
+$labels['day'] = 'day';
+$labels['date'] = 'date (yyyy-mm-dd)';
+$labels['julian'] = 'date (julian)';
+$labels['hour'] = 'hour';
+$labels['minute'] = 'minute';
+$labels['second'] = 'second';
+$labels['time'] = 'time (hh:mm:ss)';
+$labels['iso8601'] = 'date (ISO8601)';
+$labels['std11'] = 'date (RFC2822)';
+$labels['zone'] = 'time-zone';
+$labels['weekday'] = 'weekday (0-6)';
 $labels['advancedopts'] = 'Advanced options';
 $labels['body'] = 'Body';
 $labels['address'] = 'address';
@@ -137,6 +156,8 @@ $labels['default'] = 'default';
 $labels['octet'] = 'strict (octet)';
 $labels['asciicasemap'] = 'case insensitive (ascii-casemap)';
 $labels['asciinumeric'] = 'numeric (ascii-numeric)';
+$labels['index'] = 'index:';
+$labels['indexlast'] = 'backwards';
 
 $messages = array();
 $messages['filterunknownerror'] = 'Unknown server error.';
@@ -170,5 +191,6 @@ $messages['nametoolong'] = 'Name too long.';
 $messages['namereserved'] = 'Reserved name.';
 $messages['setexist'] = 'Set already exists.';
 $messages['nodata'] = 'At least one position must be selected!';
+$messages['invaliddateformat'] = 'Invalid date or date part format';
 
 ?>
diff --git a/plugins/managesieve/localization/eo.inc b/plugins/managesieve/localization/eo.inc
index 04ce69d87..3f54e2391 100644
--- a/plugins/managesieve/localization/eo.inc
+++ b/plugins/managesieve/localization/eo.inc
@@ -2,19 +2,21 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/eo/labels.inc                                         |
+ | plugins/managesieve/localization/<lang>.inc                           |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Managesieve plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Michael Moroni <michael.moroni@mailoo.org>                    |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-managesieve/
 */
 
-$labels = array();
+
 $labels['filters'] = 'Filtriloj';
 $labels['managefilters'] = 'Mastrumi filtrilojn pri enirantaj mesaĝoj';
 $labels['filtername'] = 'Nomo de filtrilo';
@@ -23,6 +25,8 @@ $labels['filteradd'] = 'Aldoni filtrilon';
 $labels['filterdel'] = 'Forigi filtrilon';
 $labels['moveup'] = 'Movi supren';
 $labels['movedown'] = 'Movi malsupren';
+$labels['filterallof'] = 'matching all of the following rules';
+$labels['filteranyof'] = 'matching any of the following rules';
 $labels['filterany'] = 'ĉiuj mesaĝoj';
 $labels['filtercontains'] = 'enhavas';
 $labels['filternotcontains'] = 'ne enhavas';
@@ -44,8 +48,130 @@ $labels['messagecopyto'] = 'Kopii mesaĝo en';
 $labels['messagesendcopy'] = 'Sendi kopion de mesaĝo al';
 $labels['messagereply'] = 'Respondi per mesaĝo';
 $labels['messagedelete'] = 'Forigi mesaĝon';
+$labels['messagediscard'] = 'Discard with message';
+$labels['messagesrules'] = 'For incoming mail:';
+$labels['messagesactions'] = '...execute the following actions:';
 $labels['add'] = 'Aldoni';
 $labels['del'] = 'Forigi';
 $labels['sender'] = 'Sendanto';
 $labels['recipient'] = 'Ricevanto';
+$labels['vacationaddr'] = 'My additional e-mail addresse(s):';
+$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';
+$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['...'] = '...';
+$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)';
+
+$messages = array();
+$messages['filterunknownerror'] = 'Unknown server error.';
+$messages['filterconnerror'] = 'Unable to connect to server.';
+$messages['filterdeleteerror'] = 'Unable to delete filter. Server error occured.';
+$messages['filterdeleted'] = 'Filter deleted successfully.';
+$messages['filtersaved'] = 'Filter saved successfully.';
+$messages['filtersaveerror'] = 'Unable to save filter. Server error occured.';
+$messages['filterdeleteconfirm'] = 'Do you really want to delete selected filter?';
+$messages['ruledeleteconfirm'] = 'Are you sure, you want to delete selected rule?';
+$messages['actiondeleteconfirm'] = 'Are you sure, you want to delete selected action?';
+$messages['forbiddenchars'] = 'Forbidden characters in field.';
+$messages['cannotbeempty'] = 'Field cannot be empty.';
+$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!';
 
+?>
diff --git a/plugins/managesieve/localization/es_AR.inc b/plugins/managesieve/localization/es_AR.inc
index b8e857d76..e8d90efcf 100644
--- a/plugins/managesieve/localization/es_AR.inc
+++ b/plugins/managesieve/localization/es_AR.inc
@@ -2,19 +2,21 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/es_AR/labels.inc                                         |
+ | plugins/managesieve/localization/<lang>.inc                           |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Managesieve plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-managesieve/
 */
 
-$labels = array();
+
 $labels['filters'] = 'Filtros';
 $labels['managefilters'] = 'Administrar filtros de correo entrante';
 $labels['filtername'] = 'Nombre del filtro';
@@ -32,6 +34,10 @@ $labels['filteris'] = 'es igual a';
 $labels['filterisnot'] = 'no es igual a';
 $labels['filterexists'] = 'existe';
 $labels['filternotexists'] = 'no existe';
+$labels['filtermatches'] = 'matches expression';
+$labels['filternotmatches'] = 'not matches expression';
+$labels['filterregex'] = 'matches regular expression';
+$labels['filternotregex'] = 'not matches regular expression';
 $labels['filterunder'] = 'bajo';
 $labels['filterover'] = 'sobre';
 $labels['addrule'] = 'Agregar regla';
@@ -49,11 +55,17 @@ $labels['add'] = 'Agregar';
 $labels['del'] = 'Eliminar';
 $labels['sender'] = 'Remitente';
 $labels['recipient'] = 'Destinatario';
-$labels['vacationaddresses'] = 'Lista de direcciones de correo de destinatarios adicionales (separados por comas):';
+$labels['vacationaddr'] = 'Lista de direcciones de correo de destinatarios adicionales:';
 $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';
+$labels['enable'] = 'Enable/Disable';
 $labels['filterset'] = 'Conjunto de filtros';
+$labels['filtersets'] = 'Filter sets';
 $labels['filtersetadd'] = 'Agregar conjunto de filtros';
 $labels['filtersetdel'] = 'Eliminar conjunto de filtros';
 $labels['filtersetact'] = 'Activar conjunto de filtros';
@@ -66,25 +78,100 @@ $labels['none'] = 'none';
 $labels['fromset'] = 'desde conjunto';
 $labels['fromfile'] = 'desde archivo';
 $labels['filterdisabled'] = 'Filtro deshabilitado';
-$labels['filterunknownerror'] = 'Error desconocido de servidor';
-$labels['filterconnerror'] = 'Imposible conectar con el servidor managesieve';
-$labels['filterdeleteerror'] = 'Imposible borrar filtro. Ha ocurrido un error en el servidor';
-$labels['filterdeleted'] = 'Filtro borrado satisfactoriamente';
-$labels['filtersaved'] = 'Filtro guardado satisfactoriamente';
-$labels['filtersaveerror'] = 'Imposible guardar ell filtro. Ha ocurrido un error en el servidor';
-$labels['filterdeleteconfirm'] = '¿Realmente desea borrar el filtro seleccionado?';
-$labels['ruledeleteconfirm'] = '¿Está seguro de que desea borrar la regla seleccionada?';
-$labels['actiondeleteconfirm'] = '¿Está seguro de que desea borrar la acción seleccionada?';
-$labels['forbiddenchars'] = 'Caracteres prohibidos en el campo';
-$labels['cannotbeempty'] = 'El campo no puede estar vacío';
-$labels['setactivateerror'] = 'Imposible activar el conjunto de filtros. Error en el servidor.';
-$labels['setdeactivateerror'] = 'Imposible desactivar el conjunto de filtros. Error en el servidor.';
-$labels['setdeleteerror'] = 'Imposible eliminar el conjunto de filtros. Error en el servidor.';
-$labels['setactivated'] = 'Conjunto de filtros activados correctamente';
-$labels['setdeactivated'] = 'Conjunto de filtros desactivados correctamente';
-$labels['setdeleted'] = 'Conjunto de filtros eliminados correctamente';
-$labels['setdeleteconfirm'] = '¿Esta seguro, que quiere eliminar el conjunto de filtros seleccionado?';
-$labels['setcreateerror'] = 'Imposible crear el conjunto de filtros. Error en el servidor.';
-$labels['setcreated'] = 'Conjunto de filtros creados correctamente';
-$labels['nametoolong'] = 'Imposible crear el conjunto de filtros. Nombre del conjunto de filtros muy largo';
+$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['...'] = '...';
+$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)';
+
+$messages = array();
+$messages['filterunknownerror'] = 'Error desconocido de servidor';
+$messages['filterconnerror'] = 'Imposible conectar con el servidor managesieve';
+$messages['filterdeleteerror'] = 'Imposible borrar filtro. Ha ocurrido un error en el servidor';
+$messages['filterdeleted'] = 'Filtro borrado satisfactoriamente';
+$messages['filtersaved'] = 'Filtro guardado satisfactoriamente';
+$messages['filtersaveerror'] = 'Imposible guardar ell filtro. Ha ocurrido un error en el servidor';
+$messages['filterdeleteconfirm'] = '¿Realmente desea borrar el filtro seleccionado?';
+$messages['ruledeleteconfirm'] = '¿Está seguro de que desea borrar la regla seleccionada?';
+$messages['actiondeleteconfirm'] = '¿Está seguro de que desea borrar la acción seleccionada?';
+$messages['forbiddenchars'] = 'Caracteres prohibidos en el campo';
+$messages['cannotbeempty'] = 'El campo no puede estar vacío';
+$messages['ruleexist'] = 'Filter with specified name already exists.';
+$messages['setactivateerror'] = 'Imposible activar el conjunto de filtros. Error en el servidor.';
+$messages['setdeactivateerror'] = 'Imposible desactivar el conjunto de filtros. Error en el servidor.';
+$messages['setdeleteerror'] = 'Imposible eliminar el conjunto de filtros. Error en el servidor.';
+$messages['setactivated'] = 'Conjunto de filtros activados correctamente';
+$messages['setdeactivated'] = 'Conjunto de filtros desactivados correctamente';
+$messages['setdeleted'] = 'Conjunto de filtros eliminados correctamente';
+$messages['setdeleteconfirm'] = '¿Esta seguro, que quiere eliminar el conjunto de filtros seleccionado?';
+$messages['setcreateerror'] = 'Imposible crear el conjunto de filtros. Error en el servidor.';
+$messages['setcreated'] = 'Conjunto de filtros creados correctamente';
+$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'] = 'Imposible crear el conjunto de filtros. Nombre del conjunto de filtros muy largo';
+$messages['namereserved'] = 'Reserved name.';
+$messages['setexist'] = 'Set already exists.';
+$messages['nodata'] = 'At least one position must be selected!';
 
+?>
diff --git a/plugins/managesieve/localization/es_ES.inc b/plugins/managesieve/localization/es_ES.inc
index 41c31edec..93ea89262 100644
--- a/plugins/managesieve/localization/es_ES.inc
+++ b/plugins/managesieve/localization/es_ES.inc
@@ -2,18 +2,21 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/es_ES/labels.inc                                         |
+ | plugins/managesieve/localization/<lang>.inc                           |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Managesieve plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-managesieve/
 */
 
-$labels = array();
+
 $labels['filters'] = 'Filtros';
 $labels['managefilters'] = 'Administrar filtros de correo entrante';
 $labels['filtername'] = 'Nombre del filtro';
@@ -52,14 +55,17 @@ $labels['add'] = 'Agregar';
 $labels['del'] = 'Eliminar';
 $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['vacationaddr'] = 'Lista de direcciones de correo de destinatarios adicionales:';
+$labels['vacationdays'] = 'Cada cuánto 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'] = 'Asunto del Mensaje:';
 $labels['rulestop'] = 'Parar de evaluar reglas';
 $labels['enable'] = 'Habilitar/Deshabilitar';
 $labels['filterset'] = 'Conjunto de filtros';
-$labels['filtersets'] = 'Conjunto de filtros';
+$labels['filtersets'] = 'Conjuntos de filtros';
 $labels['filtersetadd'] = 'Agregar conjunto de filtros';
 $labels['filtersetdel'] = 'Eliminar conjunto de filtros actual';
 $labels['filtersetact'] = 'Activar conjunto de filtros actual';
@@ -85,15 +91,34 @@ $labels['valueislessthanequal'] = 'el valor es menor o igual que';
 $labels['valueequals'] = 'el valor es igual que';
 $labels['valuenotequals'] = 'el valor es distinto que';
 $labels['setflags'] = 'Etiquetar el mensaje';
-$labels['addflags'] = 'Agregar etiqueta al mensaje';
+$labels['addflags'] = 'Agregar etiquetas al mensaje';
 $labels['removeflags'] = 'Eliminar etiquetas al mensaje';
-$labels['flagread'] = 'Leido';
+$labels['flagread'] = 'Leído';
 $labels['flagdeleted'] = 'Eliminado';
 $labels['flaganswered'] = 'Respondido';
 $labels['flagflagged'] = 'Marcado';
 $labels['flagdraft'] = 'Borrador';
+$labels['setvariable'] = 'Establecer variable';
+$labels['setvarname'] = 'Nombre de la variable:';
+$labels['setvarvalue'] = 'Valor de la variable:';
+$labels['setvarmodifiers'] = 'Modificadores';
+$labels['varlower'] = 'minúsculas';
+$labels['varupper'] = 'mayúsculas';
+$labels['varlowerfirst'] = 'inicial en minúsculas';
+$labels['varupperfirst'] = 'inicial en mayúsculas';
+$labels['varquotewildcard'] = 'entrecomillar caracteres especiales';
+$labels['varlength'] = 'longitud';
+$labels['notify'] = 'Enviar notificación';
+$labels['notifyaddress'] = 'A la dirección de correo:';
+$labels['notifybody'] = 'Cuerpo de la notificación:';
+$labels['notifysubject'] = 'Tema de la notificación:';
+$labels['notifyfrom'] = 'Remitente de la notificación:';
+$labels['notifyimportance'] = 'Importancia:';
+$labels['notifyimportancelow'] = 'baja';
+$labels['notifyimportancenormal'] = 'normal';
+$labels['notifyimportancehigh'] = 'alta';
 $labels['filtercreate'] = 'Crear Filtro';
-$labels['usedata'] = 'User los siguientes datos en el filtro:';
+$labels['usedata'] = 'Usar los siguientes datos en el filtro:';
 $labels['nextstep'] = 'Siguiente paso';
 $labels['...'] = '...';
 $labels['advancedopts'] = 'Opciones avanzadas';
@@ -115,35 +140,38 @@ $labels['default'] = 'predeterminado';
 $labels['octet'] = 'estricto (octeto)';
 $labels['asciicasemap'] = 'no sensible a mayúsculas (ascii-casemap)';
 $labels['asciinumeric'] = 'numerico (ascii-numeric)';
-$labels['filterunknownerror'] = 'Error desconocido de servidor';
-$labels['filterconnerror'] = 'Imposible conectar con el servidor managesieve';
-$labels['filterdeleteerror'] = 'Imposible borrar filtro. Ha ocurrido un error en el servidor';
-$labels['filterdeleted'] = 'Filtro borrado satisfactoriamente';
-$labels['filtersaved'] = 'Filtro guardado satisfactoriamente';
-$labels['filtersaveerror'] = 'Imposible guardar el filtro. Ha ocurrido un error en el servidor';
-$labels['filterdeleteconfirm'] = '¿Realmente desea borrar el filtro seleccionado?';
-$labels['ruledeleteconfirm'] = '¿Está seguro de que desea borrar la regla seleccionada?';
-$labels['actiondeleteconfirm'] = '¿Está seguro de que desea borrar la acción seleccionada?';
-$labels['forbiddenchars'] = 'Caracteres prohibidos en el campo';
-$labels['cannotbeempty'] = 'El campo no puede estar vacío';
-$labels['ruleexist'] = 'Ya existe un filtro con el nombre especificado.';
-$labels['setactivateerror'] = 'Imposible activar el conjunto de filtros seleccionado. Ha ocurrido un error en el servidor';
-$labels['setdeactivateerror'] = 'Imposible desactivar el conjunto de filtros seleccionado. Ha ocurrido un error en el servidor';
-$labels['setdeleteerror'] = 'Imposible borrar el conjunto de filtros seleccionado. Ha ocurrido un error en el servidor';
-$labels['setactivated'] = 'Conjunto de filtros activado satisfactoriamente';
-$labels['setdeactivated'] = 'Conjunto de filtros desactivado satisfactoriamente';
-$labels['setdeleted'] = 'Conjunto de filtros borrado satisfactoriamente';
-$labels['setdeleteconfirm'] = '¿Está seguro de que desea borrar el conjunto de filtros seleccionado?';
-$labels['setcreateerror'] = 'Imposible crear el conjunto de filtros. Ha ocurrido un error en el servidor';
-$labels['setcreated'] = 'Conjunto de filtros creado satisfactoriamente';
-$labels['activateerror'] = 'No se ha podido habilitar el filtro(s) seleccionado. Se ha producido un error de servidor.';
-$labels['deactivateerror'] = 'No se ha podido deshabilitar el filtro(s) seleccionado. Se ha producido un error de servidor.';
-$labels['activated'] = 'Filtro(s) deshabilitado(s) correctamente.';
-$labels['deactivated'] = 'Filtro(s) habilitado(s) correctamente.';
-$labels['moved'] = 'Filtro movido correctamente';
-$labels['moveerror'] = 'No se ha podido mover el filtro seleccionado. Ha ocurrido un error de servidor.';
-$labels['nametoolong'] = 'Imposible crear el conjunto de filtros. Nombre demasiado largo';
-$labels['namereserved'] = 'Nombre reservado.';
-$labels['setexist'] = 'El conjunto ya existe.';
-$labels['nodata'] = '¡Al menos una posicion debe ser seleccionada!';
 
+$messages = array();
+$messages['filterunknownerror'] = 'Error desconocido de servidor.';
+$messages['filterconnerror'] = 'Imposible conectar con el servidor managesieve.';
+$messages['filterdeleteerror'] = 'Imposible borrar filtro. Ha ocurrido un error en el servidor.';
+$messages['filterdeleted'] = 'Filtro borrado satisfactoriamente.';
+$messages['filtersaved'] = 'Filtro guardado satisfactoriamente.';
+$messages['filtersaveerror'] = 'Imposible guardar el filtro. Ha ocurrido un error en el servidor.';
+$messages['filterdeleteconfirm'] = '¿Realmente desea borrar el filtro seleccionado?';
+$messages['ruledeleteconfirm'] = '¿Está seguro de que desea borrar la regla seleccionada?';
+$messages['actiondeleteconfirm'] = '¿Está seguro de que desea borrar la acción seleccionada?';
+$messages['forbiddenchars'] = 'Caracteres prohibidos en el campo.';
+$messages['cannotbeempty'] = 'El campo no puede estar vacío.';
+$messages['ruleexist'] = 'Ya existe un filtro con el nombre especificado.';
+$messages['setactivateerror'] = 'Imposible activar el conjunto de filtros seleccionado. Ha ocurrido un error en el servidor.';
+$messages['setdeactivateerror'] = 'Imposible desactivar el conjunto de filtros seleccionado. Ha ocurrido un error en el servidor.';
+$messages['setdeleteerror'] = 'Imposible borrar el conjunto de filtros seleccionado. Ha ocurrido un error en el servidor.';
+$messages['setactivated'] = 'Conjunto de filtros activado satisfactoriamente.';
+$messages['setdeactivated'] = 'Conjunto de filtros desactivado satisfactoriamente.';
+$messages['setdeleted'] = 'Conjunto de filtros borrado satisfactoriamente.';
+$messages['setdeleteconfirm'] = '¿Está seguro de que desea borrar el conjunto de filtros seleccionado?';
+$messages['setcreateerror'] = 'Imposible crear el conjunto de filtros. Ha ocurrido un error en el servidor.';
+$messages['setcreated'] = 'Conjunto de filtros creado satisfactoriamente.';
+$messages['activateerror'] = 'No se ha podido habilitar el filtro(s) seleccionado. Se ha producido un error de servidor.';
+$messages['deactivateerror'] = 'No se ha podido deshabilitar el filtro(s) seleccionado. Se ha producido un error de servidor.';
+$messages['deactivated'] = 'Filtro(s) deshabilitado(s) correctamente.';
+$messages['activated'] = 'Filtro(s) habilitado(s) correctamente.';
+$messages['moved'] = 'Filtro movido correctamente.';
+$messages['moveerror'] = 'No se ha podido mover el filtro seleccionado. Ha ocurrido un error de servidor.';
+$messages['nametoolong'] = 'Imposible crear el conjunto de filtros. Nombre demasiado largo';
+$messages['namereserved'] = 'Nombre reservado.';
+$messages['setexist'] = 'El conjunto ya existe.';
+$messages['nodata'] = '¡Al menos una posición debe ser seleccionada!';
+
+?>
diff --git a/plugins/managesieve/localization/et_EE.inc b/plugins/managesieve/localization/et_EE.inc
index c96d5741b..7a10af41e 100644
--- a/plugins/managesieve/localization/et_EE.inc
+++ b/plugins/managesieve/localization/et_EE.inc
@@ -2,18 +2,21 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/et_EE/labels.inc                                         |
+ | plugins/managesieve/localization/<lang>.inc                           |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Managesieve plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: yllar                                                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-managesieve/
 */
 
-$labels = array();
+
 $labels['filters'] = 'Filtrid';
 $labels['managefilters'] = 'Halda sisenevate kirjade filtreid';
 $labels['filtername'] = 'Filtri nimi';
@@ -52,8 +55,11 @@ $labels['add'] = 'Lisa';
 $labels['del'] = 'Kustuta';
 $labels['sender'] = 'Saatja';
 $labels['recipient'] = 'Saaja';
-$labels['vacationaddresses'] = 'Lisanimekiri saaja e-posti aadressidest (komadega eraldatud):';
+$labels['vacationaddr'] = 'Lisanimekiri saaja e-posti aadressidest:';
 $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';
@@ -92,6 +98,25 @@ $labels['flagdeleted'] = 'Kustutatud';
 $labels['flaganswered'] = 'Vastatud';
 $labels['flagflagged'] = 'Märgistatud';
 $labels['flagdraft'] = 'Mustand';
+$labels['setvariable'] = 'Määra muutuja';
+$labels['setvarname'] = 'Muutuja nimi:';
+$labels['setvarvalue'] = 'Muutuja väärtus:';
+$labels['setvarmodifiers'] = 'Muutjad:';
+$labels['varlower'] = 'väiketähed';
+$labels['varupper'] = 'suurtähed';
+$labels['varlowerfirst'] = 'esimene märk on väiketäht';
+$labels['varupperfirst'] = 'esimene märk on suurtäht';
+$labels['varquotewildcard'] = 'tsiteeri erimärke';
+$labels['varlength'] = 'pikkus';
+$labels['notify'] = 'Saada teavitus';
+$labels['notifyaddress'] = 'Saaja e-posti aadress:';
+$labels['notifybody'] = 'Teavituse sisu:';
+$labels['notifysubject'] = 'Teavituse pealkiri:';
+$labels['notifyfrom'] = 'Teavituse saatja:';
+$labels['notifyimportance'] = 'Tähtsus:';
+$labels['notifyimportancelow'] = 'madal';
+$labels['notifyimportancenormal'] = 'tavaline';
+$labels['notifyimportancehigh'] = 'kõrge';
 $labels['filtercreate'] = 'Loo filter';
 $labels['usedata'] = 'Kasuta filtris järgmisi andmeid:';
 $labels['nextstep'] = 'Järgmine samm';
@@ -115,35 +140,38 @@ $labels['default'] = 'vaikimisi';
 $labels['octet'] = 'range (octet)';
 $labels['asciicasemap'] = 'tõstutundetu (ascii-casemap)';
 $labels['asciinumeric'] = 'numbriline (ascii-numeric)';
-$labels['filterunknownerror'] = 'Tundmatu serveri tõrge';
-$labels['filterconnerror'] = 'Managesieve serveriga ühendumine nurjus';
-$labels['filterdeleteerror'] = 'Filtri kustutamine nurjus. Ilmnes serveri tõrge.';
-$labels['filterdeleted'] = 'Filter edukalt kustutatud';
-$labels['filtersaved'] = 'Filter edukalt salvestatud';
-$labels['filtersaveerror'] = 'Filtri salvestamine nurjus. Ilmnes serveri tõrge.';
-$labels['filterdeleteconfirm'] = 'Soovid valitud filtri kustutada?';
-$labels['ruledeleteconfirm'] = 'Soovid valitud reegli kustutada?';
-$labels['actiondeleteconfirm'] = 'Soovid valitud tegevuse kustutada?';
-$labels['forbiddenchars'] = 'Väljal on lubamatu märk';
-$labels['cannotbeempty'] = 'Väli ei või tühi olla';
-$labels['ruleexist'] = 'Määratud nimega filter on juba olemas';
-$labels['setactivateerror'] = 'Valitud filtrite kogumi aktiveerimine nurjus. Ilmnes serveri tõrge.';
-$labels['setdeactivateerror'] = 'Valitud filtrite kogumi deaktiveerimine nurjus. Ilmnes serveri tõrge.';
-$labels['setdeleteerror'] = 'Valitud filtrite kogumi kustutamine nurjus. Ilmnes serveri tõrge.';
-$labels['setactivated'] = 'Filtrite kogumi aktiveerimine õnnestus.';
-$labels['setdeactivated'] = 'Filtrite kogumi deaktiveerimine õnnestus.';
-$labels['setdeleted'] = 'Filtrite kogumi kustutamine õnnestus.';
-$labels['setdeleteconfirm'] = 'Oled kindel, et soovid valitud filtrite kogumi kustutada?';
-$labels['setcreateerror'] = 'Filtrite kogumi loomine nurjus. Ilmnes serveri tõrge.';
-$labels['setcreated'] = 'Filtrite kogumi loomine õnnestus.';
-$labels['activateerror'] = 'Valitud filtrite lubamine nurjus. Ilmnes serveri tõrge.';
-$labels['deactivateerror'] = 'Valitud filtrite keelamine nurjus. Ilmnes serveri tõrge.';
-$labels['activated'] = 'Filter edukalt keelatud.';
-$labels['deactivated'] = 'Filter edukalt lubatud.';
-$labels['moved'] = 'Filter edukalt liigutatud.';
-$labels['moveerror'] = 'Valitud filtri liigutamine nurjus. Ilmnes serveri tõrge.';
-$labels['nametoolong'] = 'Nimi on liiga pikk.';
-$labels['namereserved'] = 'Nimi on reserveeritud.';
-$labels['setexist'] = 'Kogum on juba olemas.';
-$labels['nodata'] = 'Valitud peab olema vähemalt üks asukoht!';
 
+$messages = array();
+$messages['filterunknownerror'] = 'Tundmatu serveri tõrge';
+$messages['filterconnerror'] = 'Managesieve serveriga ühendumine nurjus';
+$messages['filterdeleteerror'] = 'Filtri kustutamine nurjus. Ilmnes serveri tõrge.';
+$messages['filterdeleted'] = 'Filter edukalt kustutatud';
+$messages['filtersaved'] = 'Filter edukalt salvestatud';
+$messages['filtersaveerror'] = 'Filtri salvestamine nurjus. Ilmnes serveri tõrge.';
+$messages['filterdeleteconfirm'] = 'Soovid valitud filtri kustutada?';
+$messages['ruledeleteconfirm'] = 'Soovid valitud reegli kustutada?';
+$messages['actiondeleteconfirm'] = 'Soovid valitud tegevuse kustutada?';
+$messages['forbiddenchars'] = 'Väljal on lubamatu märk';
+$messages['cannotbeempty'] = 'Väli ei või tühi olla';
+$messages['ruleexist'] = 'Määratud nimega filter on juba olemas';
+$messages['setactivateerror'] = 'Valitud filtrite kogumi aktiveerimine nurjus. Ilmnes serveri tõrge.';
+$messages['setdeactivateerror'] = 'Valitud filtrite kogumi deaktiveerimine nurjus. Ilmnes serveri tõrge.';
+$messages['setdeleteerror'] = 'Valitud filtrite kogumi kustutamine nurjus. Ilmnes serveri tõrge.';
+$messages['setactivated'] = 'Filtrite kogumi aktiveerimine õnnestus.';
+$messages['setdeactivated'] = 'Filtrite kogumi deaktiveerimine õnnestus.';
+$messages['setdeleted'] = 'Filtrite kogumi kustutamine õnnestus.';
+$messages['setdeleteconfirm'] = 'Oled kindel, et soovid valitud filtrite kogumi kustutada?';
+$messages['setcreateerror'] = 'Filtrite kogumi loomine nurjus. Ilmnes serveri tõrge.';
+$messages['setcreated'] = 'Filtrite kogumi loomine õnnestus.';
+$messages['activateerror'] = 'Valitud filtrite lubamine nurjus. Ilmnes serveri tõrge.';
+$messages['deactivateerror'] = 'Valitud filtrite keelamine nurjus. Ilmnes serveri tõrge.';
+$messages['deactivated'] = 'Filter edukalt lubatud.';
+$messages['activated'] = 'Filter edukalt keelatud.';
+$messages['moved'] = 'Filter edukalt liigutatud.';
+$messages['moveerror'] = 'Valitud filtri liigutamine nurjus. Ilmnes serveri tõrge.';
+$messages['nametoolong'] = 'Nimi on liiga pikk.';
+$messages['namereserved'] = 'Nimi on reserveeritud.';
+$messages['setexist'] = 'Kogum on juba olemas.';
+$messages['nodata'] = 'Valitud peab olema vähemalt üks asukoht!';
+
+?>
diff --git a/plugins/managesieve/localization/fa_IR.inc b/plugins/managesieve/localization/fa_IR.inc
index e4abb3f2a..1c8eace27 100644
--- a/plugins/managesieve/localization/fa_IR.inc
+++ b/plugins/managesieve/localization/fa_IR.inc
@@ -2,18 +2,21 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/fa_IR/labels.inc                                         |
+ | plugins/managesieve/localization/<lang>.inc                           |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Managesieve plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Hamid <abbaszadeh.h@gmail.com>                                |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-managesieve/
 */
 
-$labels = array();
+
 $labels['filters'] = 'صافی‌ها';
 $labels['managefilters'] = 'مدیریت صافی‌های نامه ورودی';
 $labels['filtername'] = 'نام صافی';
@@ -52,8 +55,10 @@ $labels['add'] = 'افزودن';
 $labels['del'] = 'حذف';
 $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'] = 'توقف قوانین ارزیابی';
@@ -92,6 +97,25 @@ $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'] = 'به آدرس پست الکترونیکی:';
+$labels['notifybody'] = 'بدنه تذکر:';
+$labels['notifysubject'] = 'موضوع تذکر:';
+$labels['notifyfrom'] = 'فرستنده تذکر:';
+$labels['notifyimportance'] = 'اهمیت:';
+$labels['notifyimportancelow'] = 'کم';
+$labels['notifyimportancenormal'] = 'معمولی';
+$labels['notifyimportancehigh'] = 'زیاد';
 $labels['filtercreate'] = 'ایجاد صافی';
 $labels['usedata'] = 'استفاده از داده ذیل در صافی:';
 $labels['nextstep'] = 'مرحله بعدی';
@@ -115,35 +139,38 @@ $labels['default'] = 'پیش‌فرض';
 $labels['octet'] = 'سخت (octet)';
 $labels['asciicasemap'] = 'حساس به حروه کوچک و بزرگ (ascii-casemap)';
 $labels['asciinumeric'] = 'عددی (ascii-numeric)';
-$labels['filterunknownerror'] = 'خطای سرور نامعلوم.';
-$labels['filterconnerror'] = 'ناتوانی در اتصال به سرور.';
-$labels['filterdeleteerror'] = 'ناتوانی در حذف صافی. خطای سرور رخ داد.';
-$labels['filterdeleted'] = 'صافی با موفقیت حذف شد.';
-$labels['filtersaved'] = 'صافی با موفقیت ذخیره شد.';
-$labels['filtersaveerror'] = 'ناتوانی در ذخیره فیلتر. خطای سرور رخ داد.';
-$labels['filterdeleteconfirm'] = 'آیا مطمئن به حذف صافی انتخاب شده هستید؟';
-$labels['ruledeleteconfirm'] = 'آیا مطمئن هستید که می خواهید قانون انتخاب شده را حذف کنید؟';
-$labels['actiondeleteconfirm'] = 'آیا مطمئن هستید که می خواهید عمل انتخاب شده را حذف کنید.';
-$labels['forbiddenchars'] = 'حروف ممنوعه در فیلد.';
-$labels['cannotbeempty'] = 'فیلد نمی تواند خالی باشد.';
-$labels['ruleexist'] = 'صافی با این نام مشخص وجود دارد.';
-$labels['setactivateerror'] = 'ناتوان در فعال کردن مجموعه صافی‌ها انتخاب شده. خطای سرور رخ داد.';
-$labels['setdeactivateerror'] = 'ناتوان در غیرفعال کردن مجموعه صافی‌ها انتخاب شده. خطای سرور رخ داد.';
-$labels['setdeleteerror'] = 'ناتوان در حذف مجموعه صافی‌ها انتخاب شده. خطای سرور رخ داد.';
-$labels['setactivated'] = 'مجموعه صافی‌ها با موفقیت فعال شد.';
-$labels['setdeactivated'] = 'مجموعه صافی‌ها با موفقیت غیرفعال شد.';
-$labels['setdeleted'] = 'مجموعه صافی‌ها با موفقیت حذف شد.';
-$labels['setdeleteconfirm'] = 'آیا مطمئن هستید که می‌خواهید مجموعه صافی‌ها انتخاب شده را حذف کنید؟';
-$labels['setcreateerror'] = 'ناتوانی در ایجاد مجموعه صافی‌ها. خطای سرور رخ داد.';
-$labels['setcreated'] = 'مجموعه صافی‌ها با موفقیت ایجاد شد.';
-$labels['activateerror'] = 'ناتوانی در فعال کردن صافی(های) انتخاب شده. خطای سرور رخ داد.';
-$labels['deactivateerror'] = 'ناتوانی در غیرفعال کردن صافی(های) انتخاب شده. خطای سرور رخ داد.';
-$labels['activated'] = 'صافی(ها) با موفقیت غیرفعال شدند.';
-$labels['deactivated'] = 'صافی(ها) با موفقیت فعال شدند.';
-$labels['moved'] = 'صافی با موفقیت منتقل شد.';
-$labels['moveerror'] = 'ناتوانی در انتقال صافی انتخاب شده. خطای سرور رخ داد.';
-$labels['nametoolong'] = 'نام خیلی بلند.';
-$labels['namereserved'] = 'نام رزرو شده.';
-$labels['setexist'] = 'مجموعه در حال حاضر موجود است.';
-$labels['nodata'] = 'حداقل باید یک موقعیت باید انتخاب شود.';
 
+$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['nametoolong'] = 'نام خیلی بلند.';
+$messages['namereserved'] = 'نام رزرو شده.';
+$messages['setexist'] = 'مجموعه در حال حاضر موجود است.';
+$messages['nodata'] = 'حداقل باید یک موقعیت باید انتخاب شود.';
+
+?>
diff --git a/plugins/managesieve/localization/fi_FI.inc b/plugins/managesieve/localization/fi_FI.inc
index 841eeec14..f006f6d23 100644
--- a/plugins/managesieve/localization/fi_FI.inc
+++ b/plugins/managesieve/localization/fi_FI.inc
@@ -2,28 +2,31 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/fi_FI/labels.inc                                         |
+ | plugins/managesieve/localization/<lang>.inc                           |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Managesieve plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-managesieve/
 */
 
-$labels = array();
+
 $labels['filters'] = 'Suodattimet';
-$labels['managefilters'] = 'Muokkaa saapuvan sähköpostin suodattimia';
+$labels['managefilters'] = 'Hallitse saapuvan sähköpostin suodattimia';
 $labels['filtername'] = 'Suodattimen nimi';
 $labels['newfilter'] = 'Uusi suodatin';
 $labels['filteradd'] = 'Lisää suodatin';
 $labels['filterdel'] = 'Poista suodatin';
 $labels['moveup'] = 'Siirrä ylös';
 $labels['movedown'] = 'Siirrä alas';
-$labels['filterallof'] = 'Täsmää kaikkien sääntöjen mukaan';
-$labels['filteranyof'] = 'Täsmää minkä tahansa sääntöjen mukaan';
+$labels['filterallof'] = 'Täsmää kaikkiin seuraaviin sääntöihin';
+$labels['filteranyof'] = 'Täsmää mihin tahansa seuraavista säännöistä';
 $labels['filterany'] = 'Kaikki viestit';
 $labels['filtercontains'] = 'Sisältää';
 $labels['filternotcontains'] = 'Ei sisällä';
@@ -31,119 +34,144 @@ $labels['filteris'] = 'on samanlainen kuin';
 $labels['filterisnot'] = 'ei ole samanlainen kuin';
 $labels['filterexists'] = 'on olemassa';
 $labels['filternotexists'] = 'ei ole olemassa';
-$labels['filtermatches'] = 'vastaa määritelmää';
-$labels['filternotmatches'] = 'ei vastaa määritelmää';
-$labels['filterregex'] = 'täsmää säännölliseen lausekkeeseen';
-$labels['filternotregex'] = 'ei täsmää säännölliseen lausekkeeseen';
-$labels['filterunder'] = 'alla';
-$labels['filterover'] = 'yli';
+$labels['filtermatches'] = 'matches expression';
+$labels['filternotmatches'] = 'not matches expression';
+$labels['filterregex'] = 'matches regular expression';
+$labels['filternotregex'] = 'not matches regular expression';
+$labels['filterunder'] = 'under';
+$labels['filterover'] = 'over';
 $labels['addrule'] = 'Lisää sääntö';
 $labels['delrule'] = 'Poista sääntö';
-$labels['messagemoveto'] = 'Siirrä viesti';
-$labels['messageredirect'] = 'Uudelleen ohjaa viesti';
-$labels['messagecopyto'] = 'Kopioi viesti';
-$labels['messagesendcopy'] = 'Lähetä viestin kopio';
-$labels['messagereply'] = 'Vastaa viestin kanssa';
-$labels['messagedelete'] = 'Poista viesti';
-$labels['messagediscard'] = 'Hylkää viesti';
-$labels['messagesrules'] = 'Saapuva sähköposti';
-$labels['messagesactions'] = 'Suorita seuraavat tapahtumat';
+$labels['messagemoveto'] = 'Move message to';
+$labels['messageredirect'] = 'Redirect message to';
+$labels['messagecopyto'] = 'Copy message to';
+$labels['messagesendcopy'] = 'Send message copy to';
+$labels['messagereply'] = 'Reply with message';
+$labels['messagedelete'] = 'Delete message';
+$labels['messagediscard'] = 'Discard with message';
+$labels['messagesrules'] = 'For incoming mail:';
+$labels['messagesactions'] = '...execute the following actions:';
 $labels['add'] = 'Lisää';
 $labels['del'] = 'Poista';
 $labels['sender'] = 'Lähettäjä';
 $labels['recipient'] = 'Vastaanottaja';
-$labels['vacationaddresses'] = 'Lähetä viesti myös seuraaviin osotteisiin (erottele pilkulla):';
-$labels['vacationdays'] = 'Kuinka monen päivän välein lähetetään uusi vastaus:';
-$labels['vacationreason'] = 'Viesti (poissaolon syy):';
+$labels['vacationaddr'] = 'My additional e-mail addresse(s):';
+$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'] = 'Viimeinen sääntö';
-$labels['enable'] = 'Kytke päälle / kytke pois päältä';
-$labels['filterset'] = 'Suodatinlista';
-$labels['filtersets'] = 'Suodatinlista';
-$labels['filtersetadd'] = 'Lisää suodatinlista';
-$labels['filtersetdel'] = 'Poista valittu suodatinlista';
-$labels['filtersetact'] = 'Aktivoi valittu suodatinlista';
-$labels['filtersetdeact'] = 'Kytke suodatinlista pois päältä';
-$labels['filterdef'] = 'Suodatinmääritykset';
-$labels['filtersetname'] = 'Suodatinlistan nimi';
-$labels['newfilterset'] = 'Uusi suodatinlista';
-$labels['active'] = 'aktiivinen';
-$labels['none'] = 'ei mitään';
-$labels['fromset'] = 'listasta';
-$labels['fromfile'] = 'tiedostosta';
-$labels['filterdisabled'] = 'Suodatin on poistettu käytöstä';
-$labels['countisgreaterthan'] = 'lukumäärä on suurempi kuin';
-$labels['countisgreaterthanequal'] = 'lukumäärä on suurempi kuin tai yhtä suuri kuin';
-$labels['countislessthan'] = 'lukumäärä on vähemmän kuin';
-$labels['countislessthanequal'] = 'lukumäärä on vähemmän kuin tai yhtä suuri kuin';
-$labels['countequals'] = 'lukumäärä on yhtä suuri kuin';
-$labels['countnotequals'] = 'luku ei ole yhtä suuri';
-$labels['valueisgreaterthan'] = 'arvo on suurempi kuin';
-$labels['valueisgreaterthanequal'] = 'arvo on suurempi kuin tai yhtä suuri kuin';
-$labels['valueislessthan'] = 'arvo on vähemmän kuin';
-$labels['valueislessthanequal'] = 'arvo on vähemmän kuin tai yhtä suuri kuin';
-$labels['valueequals'] = 'arvo on yhtä suuri kuin';
-$labels['valuenotequals'] = 'arvo ei ole yhtä suuri';
-$labels['setflags'] = 'Aseta seurantalippu viestiin';
-$labels['addflags'] = 'Lisää seurantalippu viestiin';
-$labels['removeflags'] = 'Poista seurantalippu viestistä';
-$labels['flagread'] = 'Luettu';
+$labels['rulestop'] = 'Stop evaluating rules';
+$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'] = 'Aseta liput viestiin';
+$labels['addflags'] = 'Lisää liput viestiin';
+$labels['removeflags'] = 'Poista liput viestistä';
+$labels['flagread'] = 'Read';
 $labels['flagdeleted'] = 'Poistettu';
 $labels['flaganswered'] = 'Vastattu';
-$labels['flagflagged'] = 'Merkitty lipulla';
+$labels['flagflagged'] = 'Liputettu';
 $labels['flagdraft'] = 'Luonnos';
+$labels['setvariable'] = 'Aseta muuttuja';
+$labels['setvarname'] = 'Muuttujan nimi:';
+$labels['setvarvalue'] = 'Muuttujan arvo:';
+$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'] = 'Tärkeysaste:';
+$labels['notifyimportancelow'] = 'low';
+$labels['notifyimportancenormal'] = 'normal';
+$labels['notifyimportancehigh'] = 'high';
 $labels['filtercreate'] = 'Luo suodatin';
-$labels['usedata'] = 'Käytä seuravaa sisältöä suodattimessa:';
-$labels['nextstep'] = 'Seuraava';
+$labels['usedata'] = 'Use following data in the filter:';
+$labels['nextstep'] = 'Next Step';
 $labels['...'] = '...';
-$labels['advancedopts'] = 'Lisäasetukset';
-$labels['body'] = 'Sisältö';
-$labels['address'] = 'osoite';
-$labels['envelope'] = 'kirjekuori';
-$labels['modifier'] = 'määrittäjä:';
-$labels['text'] = 'teksti';
-$labels['undecoded'] = 'purkamaton (käsittelemätön)';
-$labels['contenttype'] = 'sisällön tyyppi';
-$labels['modtype'] = 'tyyppi:';
-$labels['allparts'] = 'kaikki';
-$labels['domain'] = 'toimialue';
-$labels['localpart'] = 'paikallinen osa';
-$labels['user'] = 'käyttäjä';
-$labels['detail'] = 'yksityiskohta';
-$labels['comparator'] = 'vertaaja:';
+$labels['advancedopts'] = 'Lisävalinnat';
+$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'] = 'oletus';
-$labels['octet'] = 'tiukka (oktetti)';
-$labels['asciicasemap'] = 'kirjainasusta riippumaton (ascii-kirjainkartta)';
-$labels['asciinumeric'] = 'numeerinen (ascii-numerot)';
-$labels['filterunknownerror'] = 'Tuntematon palvelin virhe.';
-$labels['filterconnerror'] = 'Yhdistäminen palvelimeen epäonnistui';
-$labels['filterdeleteerror'] = 'Suodattimen poistaminen epäonnistui. Palvelin virhe';
-$labels['filterdeleted'] = 'Suodatin poistettu';
-$labels['filtersaved'] = 'Suodatin tallennettu';
-$labels['filtersaveerror'] = 'Suodattimen tallennus epäonnistui. Palvelin virhe';
-$labels['filterdeleteconfirm'] = 'Haluatko varmasti poistaa valitut suodattimet?';
-$labels['ruledeleteconfirm'] = 'Haluatko poistaa valitut säännöt?';
-$labels['actiondeleteconfirm'] = 'Haluatko poistaa valitut tapahtumat?';
-$labels['forbiddenchars'] = 'Sisältää kiellettyjä kirjaimia';
-$labels['cannotbeempty'] = 'Kenttä ei voi olla tyhjä';
-$labels['ruleexist'] = 'Annetun niminen suodatin on jo olemassa';
-$labels['setactivateerror'] = 'Valittua suodatin listaa ei voitu kytkeä päälle. Palvelin virhe.';
-$labels['setdeactivateerror'] = 'Valittua suodatin listaa ei voitu kytkeä pois päältä. Palvelin virhe.';
-$labels['setdeleteerror'] = 'Valittua suodatin listaa ei voitu poistaa. Palvelin virhe.';
-$labels['setactivated'] = 'Suodatinlista on kytketty päälle.';
-$labels['setdeactivated'] = 'Suodatinlista on kytketty pois päältä';
-$labels['setdeleted'] = 'Suodatinlista on poistettu poistettu.';
-$labels['setdeleteconfirm'] = 'Oletko varman, että haluat poistaa valitun suodatin listan?';
-$labels['setcreateerror'] = 'Suodatinlistan luonti epäonnistui. Palvelin virhe.';
-$labels['setcreated'] = 'Suodatinlistan luonti onnistui.';
-$labels['activateerror'] = 'Suodatinlistan päälle kytkeminen epäonnistui. Palvelin virhe.';
-$labels['deactivateerror'] = 'Suodatinlistan pois päältä kytkeminen epäonnistui. Palvelin virhe.';
-$labels['activated'] = 'Suodatinlista(t) kytketty pois päältä onnistuneesti.';
-$labels['deactivated'] = 'Suodatinlista(t) kytketty päälle onnistuneesti.';
-$labels['moved'] = 'Suodatin siirretty onnistuneesti.';
-$labels['moveerror'] = 'Valitun suodattimen siirto epäonnistui palvelinvirheen vuoksi.';
-$labels['nametoolong'] = 'Nimi on liian pitkä.';
-$labels['namereserved'] = 'Varattu nimi.';
-$labels['setexist'] = 'Lista on jo olemassa.';
-$labels['nodata'] = 'Vähintään yksi pitää valinta pitää tehdä!';
+$labels['octet'] = 'strict (octet)';
+$labels['asciicasemap'] = 'case insensitive (ascii-casemap)';
+$labels['asciinumeric'] = 'numeric (ascii-numeric)';
+
+$messages = array();
+$messages['filterunknownerror'] = 'Tuntematon palvelinvirhe.';
+$messages['filterconnerror'] = 'Yhteys palvelimeen epäonnistui.';
+$messages['filterdeleteerror'] = 'Suodattimen poisto epäonnistui palvelinvirheen vuoksi.';
+$messages['filterdeleted'] = 'Suodatin poistettu onnistuneesti.';
+$messages['filtersaved'] = 'Filter saved successfully.';
+$messages['filtersaveerror'] = 'Unable to save filter. Server error occured.';
+$messages['filterdeleteconfirm'] = 'Do you really want to delete selected filter?';
+$messages['ruledeleteconfirm'] = 'Are you sure, you want to delete selected rule?';
+$messages['actiondeleteconfirm'] = 'Are you sure, you want to delete selected action?';
+$messages['forbiddenchars'] = 'Forbidden characters in field.';
+$messages['cannotbeempty'] = 'Kenttä ei voi olla tyhjä.';
+$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'] = 'Suodatin siirretty onnistuneesti.';
+$messages['moveerror'] = 'Suodattimen siirtäminen epäonnistui palvelinvirheen vuoksi.';
+$messages['nametoolong'] = 'Nimi on liian pitkä.';
+$messages['namereserved'] = 'Reserved name.';
+$messages['setexist'] = 'Set already exists.';
+$messages['nodata'] = 'At least one position must be selected!';
 
+?>
diff --git a/plugins/managesieve/localization/fr_FR.inc b/plugins/managesieve/localization/fr_FR.inc
index 1f260ab3a..047c455ef 100644
--- a/plugins/managesieve/localization/fr_FR.inc
+++ b/plugins/managesieve/localization/fr_FR.inc
@@ -2,18 +2,21 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/fr_FR/labels.inc                                         |
+ | plugins/managesieve/localization/<lang>.inc                           |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Managesieve plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-managesieve/
 */
 
-$labels = array();
+
 $labels['filters'] = 'Filtres';
 $labels['managefilters'] = 'Gestion des filtres sur les mails entrants';
 $labels['filtername'] = 'Nom du filtre';
@@ -52,9 +55,12 @@ $labels['add'] = 'Ajouter';
 $labels['del'] = 'Supprimer';
 $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['vacationreason'] = 'Corps du message (raison de l\'absence) :';
+$labels['vacationaddr'] = 'Liste des destinataires:';
+$labels['vacationdays'] = 'Ne pas renvoyer un message avant (jours):';
+$labels['vacationinterval'] = 'How often send messages:';
+$labels['days'] = 'days';
+$labels['seconds'] = 'seconds';
+$labels['vacationreason'] = 'Corps du message (raison de l\'absence):';
 $labels['vacationsubject'] = 'Sujet du message:';
 $labels['rulestop'] = 'Arrêter d\'évaluer les prochaines règles';
 $labels['enable'] = 'Activer/Désactiver';
@@ -92,6 +98,25 @@ $labels['flagdeleted'] = 'Supprimé';
 $labels['flaganswered'] = 'Répondu';
 $labels['flagflagged'] = 'Marqué';
 $labels['flagdraft'] = 'Brouillon';
+$labels['setvariable'] = 'Définir une variable';
+$labels['setvarname'] = 'Nom de la variable :';
+$labels['setvarvalue'] = 'Valeur de la variable :';
+$labels['setvarmodifiers'] = 'Modifications :';
+$labels['varlower'] = 'minuscule';
+$labels['varupper'] = 'majuscule';
+$labels['varlowerfirst'] = 'premier caractère minuscule';
+$labels['varupperfirst'] = 'premier caractère majuscule';
+$labels['varquotewildcard'] = 'Échapper les caractères spéciaux';
+$labels['varlength'] = 'longueur';
+$labels['notify'] = 'Envoyer la notification';
+$labels['notifyaddress'] = 'A l\'adresse e-mail :';
+$labels['notifybody'] = 'Corps de la notification :';
+$labels['notifysubject'] = 'Objet de la notification :';
+$labels['notifyfrom'] = 'Expéditeur de la notification :';
+$labels['notifyimportance'] = 'Importance :';
+$labels['notifyimportancelow'] = 'faible';
+$labels['notifyimportancenormal'] = 'normal';
+$labels['notifyimportancehigh'] = 'haute';
 $labels['filtercreate'] = 'Créer un filtre';
 $labels['usedata'] = 'Utiliser les informations suivantes dans le filtre';
 $labels['nextstep'] = 'Étape suivante';
@@ -115,35 +140,38 @@ $labels['default'] = 'par défaut';
 $labels['octet'] = 'strict (octet)';
 $labels['asciicasemap'] = 'insensible à la casse (ascii-casemap)';
 $labels['asciinumeric'] = 'numérique (ascii-numeric)';
-$labels['filterunknownerror'] = 'Erreur du serveur inconnue';
-$labels['filterconnerror'] = 'Connexion au serveur Managesieve impossible';
-$labels['filterdeleteerror'] = 'Suppression du filtre impossible. Le serveur à produit une erreur';
-$labels['filterdeleted'] = 'Le filtre a bien été supprimé';
-$labels['filtersaved'] = 'Le filtre a bien été enregistré';
-$labels['filtersaveerror'] = 'Enregistrement du filtre impossibe. Le serveur à produit une erreur';
-$labels['filterdeleteconfirm'] = 'Voulez-vous vraiment supprimer le filtre sélectionné?';
-$labels['ruledeleteconfirm'] = 'Voulez-vous vraiment supprimer la règle sélectionnée?';
-$labels['actiondeleteconfirm'] = 'Voulez-vous vraiment supprimer l\'action sélectionnée?';
-$labels['forbiddenchars'] = 'Caractères interdits dans le champ';
-$labels['cannotbeempty'] = 'Le champ ne peut pas être vide';
-$labels['ruleexist'] = 'Un filtre existe déjà avec ce nom.';
-$labels['setactivateerror'] = 'Impossible d\'aactiver le groupe de filtres sélectionné. Le serveur a rencontré une erreur.';
-$labels['setdeactivateerror'] = 'Impossible de désactiver le groupe de filtres sélectionné. Le serveur a rencontré une erreur.';
-$labels['setdeleteerror'] = 'Impossible de supprimer le groupe de filtres sélectionné. Le serveur a rencontré une erreur.';
-$labels['setactivated'] = 'Le groupe de filtres a bien été activé.';
-$labels['setdeactivated'] = 'Le groupe de filtres a bien été désactivé.';
-$labels['setdeleted'] = 'Le groupe de filtres a bien été supprimé.';
-$labels['setdeleteconfirm'] = 'Voulez vous vraiment supprimer le groupe de filtres sélectionné ?';
-$labels['setcreateerror'] = 'Impossible de créer le groupe de filtres. Le serveur a rencontré une erreur.';
-$labels['setcreated'] = 'Le groupe de filtres a bien été créé.';
-$labels['activateerror'] = 'Impossible d\'activer le(s) filtre(s) sélectionné(s). Une erreur serveur s\'est produite.';
-$labels['deactivateerror'] = 'Impossible de désactiver le(s) filtre(s) sélectionné(s). Une erreur serveur s\'est produite.';
-$labels['activated'] = 'Filtre(s) désactivé(s) avec succès';
-$labels['deactivated'] = 'Filtre(s) activé(s) avec succès';
-$labels['moved'] = 'Filtre déplacé avec succès.';
-$labels['moveerror'] = 'Déplacement du filtre sélectionné impossible. Le serveur a renvoyé une erreur.';
-$labels['nametoolong'] = 'Nom trop long.';
-$labels['namereserved'] = 'Nom réservé.';
-$labels['setexist'] = 'Ce groupe existe déjà.';
-$labels['nodata'] = 'Au moins un élément doit être selectionné !';
 
+$messages = array();
+$messages['filterunknownerror'] = 'Erreur du serveur inconnue';
+$messages['filterconnerror'] = 'Connexion au serveur Managesieve impossible';
+$messages['filterdeleteerror'] = 'Suppression du filtre impossible. Le serveur à produit une erreur';
+$messages['filterdeleted'] = 'Le filtre a bien été supprimé';
+$messages['filtersaved'] = 'Le filtre a bien été enregistré';
+$messages['filtersaveerror'] = 'Enregistrement du filtre impossibe. Le serveur à produit une erreur';
+$messages['filterdeleteconfirm'] = 'Voulez-vous vraiment supprimer le filtre sélectionné?';
+$messages['ruledeleteconfirm'] = 'Voulez-vous vraiment supprimer la règle sélectionnée?';
+$messages['actiondeleteconfirm'] = 'Voulez-vous vraiment supprimer l\'action sélectionnée?';
+$messages['forbiddenchars'] = 'Caractères interdits dans le champ';
+$messages['cannotbeempty'] = 'Le champ ne peut pas être vide';
+$messages['ruleexist'] = 'Un filtre existe déjà avec ce nom.';
+$messages['setactivateerror'] = 'Impossible d\'aactiver le groupe de filtres sélectionné. Le serveur a rencontré une erreur.';
+$messages['setdeactivateerror'] = 'Impossible de désactiver le groupe de filtres sélectionné. Le serveur a rencontré une erreur.';
+$messages['setdeleteerror'] = 'Impossible de supprimer le groupe de filtres sélectionné. Le serveur a rencontré une erreur.';
+$messages['setactivated'] = 'Le groupe de filtres a bien été activé.';
+$messages['setdeactivated'] = 'Le groupe de filtres a bien été désactivé.';
+$messages['setdeleted'] = 'Le groupe de filtres a bien été supprimé.';
+$messages['setdeleteconfirm'] = 'Voulez vous vraiment supprimer le groupe de filtres sélectionné ?';
+$messages['setcreateerror'] = 'Impossible de créer le groupe de filtres. Le serveur a rencontré une erreur.';
+$messages['setcreated'] = 'Le groupe de filtres a bien été créé.';
+$messages['activateerror'] = 'Impossible d\'activer le(s) filtre(s) sélectionné(s). Une erreur serveur s\'est produite.';
+$messages['deactivateerror'] = 'Impossible de désactiver le(s) filtre(s) sélectionné(s). Une erreur serveur s\'est produite.';
+$messages['deactivated'] = 'Filtre(s) activé(s) avec succès';
+$messages['activated'] = 'Filtre(s) désactivé(s) avec succès';
+$messages['moved'] = 'Filtre déplacé avec succès.';
+$messages['moveerror'] = 'Déplacement du filtre sélectionné impossible. Le serveur a renvoyé une erreur.';
+$messages['nametoolong'] = 'Nom trop long.';
+$messages['namereserved'] = 'Nom réservé.';
+$messages['setexist'] = 'Ce groupe existe déjà.';
+$messages['nodata'] = 'Au moins un élément doit être selectionné !';
+
+?>
diff --git a/plugins/managesieve/localization/gl_ES.inc b/plugins/managesieve/localization/gl_ES.inc
index 894f52cb9..185490a94 100644
--- a/plugins/managesieve/localization/gl_ES.inc
+++ b/plugins/managesieve/localization/gl_ES.inc
@@ -2,19 +2,21 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/gl_ES/labels.inc                                         |
+ | plugins/managesieve/localization/<lang>.inc                           |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Managesieve plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: ghas <Unknown>                                                |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-managesieve/
 */
 
-$labels = array();
+
 $labels['filters'] = 'Filtros';
 $labels['managefilters'] = 'Xestionar os filtros de correo entrante';
 $labels['filtername'] = 'Nome do filtro';
@@ -32,6 +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['filterunder'] = 'baixo';
 $labels['filterover'] = 'sobre';
 $labels['addrule'] = 'Engadir regra';
@@ -49,12 +55,17 @@ $labels['add'] = 'Engadir';
 $labels['del'] = 'Eliminar';
 $labels['sender'] = 'Remitente';
 $labels['recipient'] = 'Destinatario';
-$labels['vacationaddresses'] = 'Lista de enderezos de correo de destinatarios adicionais (separados por comas):';
+$labels['vacationaddr'] = 'Lista de enderezos de correo de destinatarios adicionais:';
 $labels['vacationdays'] = 'Cada canto enviar mensaxes (en días):';
+$labels['vacationinterval'] = 'How often send messages:';
+$labels['days'] = 'days';
+$labels['seconds'] = 'seconds';
 $labels['vacationreason'] = 'Corpo da mensaxe (razón de vacacións):';
+$labels['vacationsubject'] = 'Message subject:';
 $labels['rulestop'] = 'Parar de avaliar regras';
 $labels['enable'] = 'Activar/Desactivar';
 $labels['filterset'] = 'Conxunto de filtros';
+$labels['filtersets'] = 'Filter sets';
 $labels['filtersetadd'] = 'Engadir un conxunto de filtros';
 $labels['filtersetdel'] = 'Eliminar o conxunto de filtros actual';
 $labels['filtersetact'] = 'Activar o conxunto de filtros actual';
@@ -67,25 +78,100 @@ $labels['none'] = 'ningún';
 $labels['fromset'] = 'de conxunto';
 $labels['fromfile'] = 'de arquivo';
 $labels['filterdisabled'] = 'Filtro desactivado';
-$labels['filterunknownerror'] = 'Erro descoñecido servidor';
-$labels['filterconnerror'] = 'Imposible conectar co servidor managesieve';
-$labels['filterdeleteerror'] = 'Imposible eliminar filtro. Ocurriu un erro no servidor';
-$labels['filterdeleted'] = 'Filtro borrado con éxito';
-$labels['filtersaved'] = 'Filtro gardado con éxito';
-$labels['filtersaveerror'] = 'Imposible gardar o filtro. Ocurriu un erro no servidor';
-$labels['filterdeleteconfirm'] = 'Realmente desexa eliminar o filtro seleccionado?';
-$labels['ruledeleteconfirm'] = 'Está seguro de que desexa eliminar a regra seleccionada?';
-$labels['actiondeleteconfirm'] = 'Está seguro de que desexa eliminar a acción seleccionada?';
-$labels['forbiddenchars'] = 'Caracteres non permitidos no campo';
-$labels['cannotbeempty'] = 'O campo non pode estar baleiro';
-$labels['setactivateerror'] = 'Imposible activar o conxunto de filtros seleccionado. Ocurriu un erro no servidor';
-$labels['setdeactivateerror'] = 'Imposible desactivar o conxunto de filtros seleccionado. Ocurriu un error no servidor';
-$labels['setdeleteerror'] = 'Imposible eliminar o conxunto de filtros seleccionado. Ocurriu un error no servidor';
-$labels['setactivated'] = 'O conxunto de filtros activouse con éxito';
-$labels['setdeactivated'] = 'O conxunto de filtros desactivouse con éxito';
-$labels['setdeleted'] = 'O Conxunto de filtros borrouse con éxito';
-$labels['setdeleteconfirm'] = 'Está seguro de que desexa eliminar o conxunto de filtros seleccionado?';
-$labels['setcreateerror'] = 'Imposible crear o conxunto de filtros. Ocurriu un error no servidor';
-$labels['setcreated'] = 'Conxunto de filtros creado con éxito';
-$labels['nametoolong'] = 'Imposible crear o conxunto de filtros. O nome é longo de máis';
+$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['...'] = '...';
+$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)';
+
+$messages = array();
+$messages['filterunknownerror'] = 'Erro descoñecido servidor';
+$messages['filterconnerror'] = 'Imposible conectar co servidor managesieve';
+$messages['filterdeleteerror'] = 'Imposible eliminar filtro. Ocurriu un erro no servidor';
+$messages['filterdeleted'] = 'Filtro borrado con éxito';
+$messages['filtersaved'] = 'Filtro gardado con éxito';
+$messages['filtersaveerror'] = 'Imposible gardar o filtro. Ocurriu un erro no servidor';
+$messages['filterdeleteconfirm'] = 'Realmente desexa eliminar o filtro seleccionado?';
+$messages['ruledeleteconfirm'] = 'Está seguro de que desexa eliminar a regra seleccionada?';
+$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['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';
+$messages['setactivated'] = 'O conxunto de filtros activouse con éxito';
+$messages['setdeactivated'] = 'O conxunto de filtros desactivouse con éxito';
+$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['nametoolong'] = 'Imposible crear o conxunto de filtros. O nome é longo de máis';
+$messages['namereserved'] = 'Reserved name.';
+$messages['setexist'] = 'Set already exists.';
+$messages['nodata'] = 'At least one position must be selected!';
 
+?>
diff --git a/plugins/managesieve/localization/he_IL.inc b/plugins/managesieve/localization/he_IL.inc
index b44088bcb..932d4e5d6 100644
--- a/plugins/managesieve/localization/he_IL.inc
+++ b/plugins/managesieve/localization/he_IL.inc
@@ -2,18 +2,21 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/he_IL/labels.inc                                         |
+ | plugins/managesieve/localization/<lang>.inc                           |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Managesieve plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Moshe Leibovitch <moish@mln.co.il>                            |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-managesieve/
 */
 
-$labels = array();
+
 $labels['filters'] = 'מסננים';
 $labels['managefilters'] = 'ניהול מסננים לדואר נכנס';
 $labels['filtername'] = 'שם המסנן';
@@ -52,8 +55,10 @@ $labels['add'] = 'הוספה';
 $labels['del'] = 'מחיקה';
 $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'] = 'עצירה של בחינת הכללים';
@@ -92,6 +97,25 @@ $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'] = 'אל כתובת דו"אל:';
+$labels['notifybody'] = 'גוף ההתראה:';
+$labels['notifysubject'] = 'נושא ההתראה:';
+$labels['notifyfrom'] = 'שולח ההתראה:';
+$labels['notifyimportance'] = 'חשיובת:';
+$labels['notifyimportancelow'] = 'נמוכה';
+$labels['notifyimportancenormal'] = 'רגילה';
+$labels['notifyimportancehigh'] = 'גבוהה';
 $labels['filtercreate'] = 'יצירת מסנן';
 $labels['usedata'] = 'שימוש במידע שלהלן ליצירת המסנן:';
 $labels['nextstep'] = 'הצעד הבא';
@@ -115,35 +139,38 @@ $labels['default'] = 'ברירת מחדל';
 $labels['octet'] = 'strict (octet)';
 $labels['asciicasemap'] = 'case insensitive (ascii-casemap)';
 $labels['asciinumeric'] = 'numeric (ascii-numeric)';
-$labels['filterunknownerror'] = 'שגיאת שרת בלתי מוכרת.';
-$labels['filterconnerror'] = 'לא ניתן להתחבר לשרת.';
-$labels['filterdeleteerror'] = 'לא ניתן למחוק את המסנן. אירעה שגיאה בצד השרת.';
-$labels['filterdeleted'] = 'המסנן נמחק בהצלחה.';
-$labels['filtersaved'] = 'המסנן נשמר בהצלחה.';
-$labels['filtersaveerror'] = 'לא ניתן לשמור את המסנן. אירעה שגיאה בצד השרת.';
-$labels['filterdeleteconfirm'] = 'האם אכן ברצונך למחוק את המסנן הנבחר?';
-$labels['ruledeleteconfirm'] = 'האם אכן ברצונך למחוק את הכלל הנבחר?';
-$labels['actiondeleteconfirm'] = 'האם אכן ברצונך למחוק את הפעולה הנבחרת?';
-$labels['forbiddenchars'] = 'תווים אסורים בשדה.';
-$labels['cannotbeempty'] = 'השדה לא יכול להישאר ריק.';
-$labels['ruleexist'] = 'כבר קיים מסנן בשם כזה.';
-$labels['setactivateerror'] = 'לא ניתן להפעיל את ערכת המסננים הנבחרת. אירעה שגיאה בצד השרת.';
-$labels['setdeactivateerror'] = 'לא ניתן לנטרל את ערכת המסננים הנבחרת. אירעה שגיאה בצד השרת.';
-$labels['setdeleteerror'] = 'לא ניתן למחוק את ערכת המסננים הנבחרת. אירעה שגיאה בצד השרת.';
-$labels['setactivated'] = 'ערכת המסננים הופעלה בהצלחה.';
-$labels['setdeactivated'] = 'ערכת המסננים נוטרלה בהצלחה.';
-$labels['setdeleted'] = 'ערכת המסננים נמחקה בהצלחה.';
-$labels['setdeleteconfirm'] = 'האם אכן ברצונך למחוק את ערכת המסננים הנבחרת?';
-$labels['setcreateerror'] = 'לא ניתן ליצור ערכת מסננים. אירעה שגיאה בצד השרת.';
-$labels['setcreated'] = 'ערכת המסננים נוצרה בהצלחה.';
-$labels['activateerror'] = 'לא ניתן להפעיל את המסננים הנבחרים. אירעה שגיאה בצד השרת.';
-$labels['deactivateerror'] = 'לא ניתן לנטרל את המסננים הנבחרים. אירעה שגיאה בצד השרת.';
-$labels['activated'] = 'המסננים נוטרלו בהצלחה.';
-$labels['deactivated'] = 'המסננים הופעלו בהצלחה.';
-$labels['moved'] = 'המסנן הועבר בהצלחה.';
-$labels['moveerror'] = 'לא ניתן להעביר את המסנן הנבחר. אירעה שגיאה בצד השרת.';
-$labels['nametoolong'] = 'השם ארוך מדי.';
-$labels['namereserved'] = 'השם הזה שמור.';
-$labels['setexist'] = 'הערכה כבר קיימת.';
-$labels['nodata'] = 'חובה לבחור במיקום אחד לפחות!';
 
+$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['nametoolong'] = 'השם ארוך מדי.';
+$messages['namereserved'] = 'השם הזה שמור.';
+$messages['setexist'] = 'הערכה כבר קיימת.';
+$messages['nodata'] = 'חובה לבחור במיקום אחד לפחות!';
+
+?>
diff --git a/plugins/managesieve/localization/hr_HR.inc b/plugins/managesieve/localization/hr_HR.inc
index 4198903ed..64b9bef62 100644
--- a/plugins/managesieve/localization/hr_HR.inc
+++ b/plugins/managesieve/localization/hr_HR.inc
@@ -2,18 +2,21 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/hr_HR/labels.inc                                         |
+ | plugins/managesieve/localization/<lang>.inc                           |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Managesieve plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-managesieve/
 */
 
-$labels = array();
+
 $labels['filters'] = 'Filteri';
 $labels['managefilters'] = 'Uredi filtere za pristiglu poštu';
 $labels['filtername'] = 'Naziv filtera';
@@ -54,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';
@@ -92,6 +98,25 @@ $labels['flagdeleted'] = 'Obrisana';
 $labels['flaganswered'] = 'Odgovorena';
 $labels['flagflagged'] = 'Označena';
 $labels['flagdraft'] = 'Predložak';
+$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'] = 'Stvori filter';
 $labels['usedata'] = 'Koristi podatke za filter:';
 $labels['nextstep'] = 'Idući korak';
@@ -115,35 +140,38 @@ $labels['default'] = 'preddefinirano';
 $labels['octet'] = 'strogo (oktet)';
 $labels['asciicasemap'] = 'neosjetljivo na veličinu slova (ascii-casemap)';
 $labels['asciinumeric'] = 'numerički (ascii-numeric)';
-$labels['filterunknownerror'] = 'Nepoznata greška na poslužitelju';
-$labels['filterconnerror'] = 'Nemoguće spajanje na poslužitelj (managesieve)';
-$labels['filterdeleteerror'] = 'Nemoguće brisanje filtera. Greška na poslužitelju';
-$labels['filterdeleted'] = 'Filter je uspješno obrisan';
-$labels['filtersaved'] = 'Filter je uspješno spremljen';
-$labels['filtersaveerror'] = 'Nemoguće spremiti filter. Greška na poslužitelju';
-$labels['filterdeleteconfirm'] = 'Sigurno želite obrisati odabrani filter?';
-$labels['ruledeleteconfirm'] = 'Jeste li sigurni da želite obrisati odabrana pravila?';
-$labels['actiondeleteconfirm'] = 'Jeste li sigurni da želite obrisati odabrane akcije?';
-$labels['forbiddenchars'] = 'Nedozvoljeni znakovi u polju';
-$labels['cannotbeempty'] = 'Polje nesmije biti prazno';
-$labels['ruleexist'] = 'Filter sa zadanim imenom već postoji.';
-$labels['setactivateerror'] = 'Nemoguće aktivirati odabranu grupu filtera. Greška na poslužitelju';
-$labels['setdeactivateerror'] = 'Nemoguće deaktivirati odabranu grupu filtera. Greška na poslužitelju';
-$labels['setdeleteerror'] = 'Nemoguće obrisati odabranu grupu filtera. Greška na poslužitelju';
-$labels['setactivated'] = 'Grupa filtera je uspješno aktivirana';
-$labels['setdeactivated'] = 'Grupa filtera je uspješno deaktivirana';
-$labels['setdeleted'] = 'Grupa filtera je uspješno obrisana';
-$labels['setdeleteconfirm'] = 'Jeste li sigurni da želite obrisati odabranu grupu filtera?';
-$labels['setcreateerror'] = 'Nemoguće stvoriti grupu filtera. Greška na poslužitelju';
-$labels['setcreated'] = 'Grupa filtera je uspješno stvorena';
-$labels['activateerror'] = 'Nije moguće omogućiti odabrani filter(e). Greška poslužitelja.';
-$labels['deactivateerror'] = 'Nije moguće onemogučiti odabrane filter(e). Greška poslužitelja.';
-$labels['activated'] = 'Filter(i) onemogućen(i) uspješno.';
-$labels['deactivated'] = 'Filter(i) omogućen(i) uspješno.';
-$labels['moved'] = 'Filter uspješno premješten.';
-$labels['moveerror'] = 'Nije moguće premjestiti odabrani filter. Greška poslužitelja.';
-$labels['nametoolong'] = 'Nemoguće napraviti grupu filtera. Naziv je predugačak';
-$labels['namereserved'] = 'Rezervirano ime.';
-$labels['setexist'] = 'Skup već postoji.';
-$labels['nodata'] = 'Barem jedan pozicija mora biti odabrana!';
 
+$messages = array();
+$messages['filterunknownerror'] = 'Nepoznata greška na poslužitelju';
+$messages['filterconnerror'] = 'Nemoguće spajanje na poslužitelj (managesieve)';
+$messages['filterdeleteerror'] = 'Nemoguće brisanje filtera. Greška na poslužitelju';
+$messages['filterdeleted'] = 'Filter je uspješno obrisan';
+$messages['filtersaved'] = 'Filter je uspješno spremljen';
+$messages['filtersaveerror'] = 'Nemoguće spremiti filter. Greška na poslužitelju';
+$messages['filterdeleteconfirm'] = 'Sigurno želite obrisati odabrani filter?';
+$messages['ruledeleteconfirm'] = 'Jeste li sigurni da želite obrisati odabrana pravila?';
+$messages['actiondeleteconfirm'] = 'Jeste li sigurni da želite obrisati odabrane akcije?';
+$messages['forbiddenchars'] = 'Nedozvoljeni znakovi u polju';
+$messages['cannotbeempty'] = 'Polje nesmije biti prazno';
+$messages['ruleexist'] = 'Filter sa zadanim imenom već postoji.';
+$messages['setactivateerror'] = 'Nemoguće aktivirati odabranu grupu filtera. Greška na poslužitelju';
+$messages['setdeactivateerror'] = 'Nemoguće deaktivirati odabranu grupu filtera. Greška na poslužitelju';
+$messages['setdeleteerror'] = 'Nemoguće obrisati odabranu grupu filtera. Greška na poslužitelju';
+$messages['setactivated'] = 'Grupa filtera je uspješno aktivirana';
+$messages['setdeactivated'] = 'Grupa filtera je uspješno deaktivirana';
+$messages['setdeleted'] = 'Grupa filtera je uspješno obrisana';
+$messages['setdeleteconfirm'] = 'Jeste li sigurni da želite obrisati odabranu grupu filtera?';
+$messages['setcreateerror'] = 'Nemoguće stvoriti grupu filtera. Greška na poslužitelju';
+$messages['setcreated'] = 'Grupa filtera je uspješno stvorena';
+$messages['activateerror'] = 'Nije moguće omogućiti odabrani filter(e). Greška poslužitelja.';
+$messages['deactivateerror'] = 'Nije moguće onemogučiti odabrane filter(e). Greška poslužitelja.';
+$messages['deactivated'] = 'Filter(i) omogućen(i) uspješno.';
+$messages['activated'] = 'Filter(i) onemogućen(i) uspješno.';
+$messages['moved'] = 'Filter uspješno premješten.';
+$messages['moveerror'] = 'Nije moguće premjestiti odabrani filter. Greška poslužitelja.';
+$messages['nametoolong'] = 'Nemoguće napraviti grupu filtera. Naziv je predugačak';
+$messages['namereserved'] = 'Rezervirano ime.';
+$messages['setexist'] = 'Skup već postoji.';
+$messages['nodata'] = 'Barem jedan pozicija mora biti odabrana!';
+
+?>
diff --git a/plugins/managesieve/localization/hu_HU.inc b/plugins/managesieve/localization/hu_HU.inc
index cc30ee6fb..ea59fa717 100644
--- a/plugins/managesieve/localization/hu_HU.inc
+++ b/plugins/managesieve/localization/hu_HU.inc
@@ -2,18 +2,21 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/hu_HU/labels.inc                                         |
+ | plugins/managesieve/localization/<lang>.inc                           |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Managesieve plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-managesieve/
 */
 
-$labels = array();
+
 $labels['filters'] = 'Üzenetszűrők';
 $labels['managefilters'] = 'Bejövő üzenetek szűrői';
 $labels['filtername'] = 'Szűrő neve';
@@ -52,8 +55,11 @@ $labels['add'] = 'Hozzáadás';
 $labels['del'] = 'Törlés';
 $labels['sender'] = 'Feladó';
 $labels['recipient'] = 'Címzett';
-$labels['vacationaddresses'] = 'További címzettek (vesszővel elválasztva):';
+$labels['vacationaddr'] = 'További címzettek:';
 $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';
@@ -92,6 +98,25 @@ $labels['flagdeleted'] = 'Törölt';
 $labels['flaganswered'] = 'Megválaszolt';
 $labels['flagflagged'] = 'Megjelölt';
 $labels['flagdraft'] = 'Vázlat';
+$labels['setvariable'] = 'Változó beállítása';
+$labels['setvarname'] = 'Változó neve:';
+$labels['setvarvalue'] = 'Változó értéke:';
+$labels['setvarmodifiers'] = 'Módosítók';
+$labels['varlower'] = 'kisbetű';
+$labels['varupper'] = 'nagybetű';
+$labels['varlowerfirst'] = 'első karakter kisbetű';
+$labels['varupperfirst'] = 'első karakter nagybetű';
+$labels['varquotewildcard'] = 'speciális karakterek idézése';
+$labels['varlength'] = 'hossz';
+$labels['notify'] = 'Értesítés küldése';
+$labels['notifyaddress'] = 'Címzett e-mail címe:';
+$labels['notifybody'] = 'Értesítés levéltörzse:';
+$labels['notifysubject'] = 'Értesítés tárgya:';
+$labels['notifyfrom'] = 'Értesítés feladója:';
+$labels['notifyimportance'] = 'Fontosság:';
+$labels['notifyimportancelow'] = 'alacsony';
+$labels['notifyimportancenormal'] = 'normál';
+$labels['notifyimportancehigh'] = 'magas';
 $labels['filtercreate'] = 'Szűrő létrehozása';
 $labels['usedata'] = 'A következő adatok használata a szűrőben';
 $labels['nextstep'] = 'Következő lépés';
@@ -115,35 +140,38 @@ $labels['default'] = 'alapértelmezett';
 $labels['octet'] = 'strict (octet)';
 $labels['asciicasemap'] = 'kis-nagybetüre nem érzékeny (ascii-casemap)';
 $labels['asciinumeric'] = 'számszerü (ascii-numeric)';
-$labels['filterunknownerror'] = 'Ismeretlen szerverhiba';
-$labels['filterconnerror'] = 'Nem tudok a szűrőszerverhez kapcsolódni';
-$labels['filterdeleteerror'] = 'A szűrőt nem lehet törölni, szerverhiba történt';
-$labels['filterdeleted'] = 'A szűrő törlése sikeres';
-$labels['filtersaved'] = 'A szűrő mentése sikeres';
-$labels['filtersaveerror'] = 'A szűrő mentése sikertelen, szerverhiba történt';
-$labels['filterdeleteconfirm'] = 'Biztosan törli ezt a szűrőt?';
-$labels['ruledeleteconfirm'] = 'Biztosan törli ezt a szabályt?';
-$labels['actiondeleteconfirm'] = 'Biztosan törli ezt a műveletet?';
-$labels['forbiddenchars'] = 'Érvénytelen karakter a mezőben';
-$labels['cannotbeempty'] = 'A mező nem lehet üres';
-$labels['ruleexist'] = 'Már van ilyen névvel elmentett szűrő.';
-$labels['setactivateerror'] = 'A kiválasztott szűrő készletet nem sikerült engedélyezni. Szerver hiba történt.';
-$labels['setdeactivateerror'] = 'A kiválasztott szűrő készletet nem sikerült tiltani. Szerver hiba történt.';
-$labels['setdeleteerror'] = 'Nem sikerült a kiválasztott szűrő készletet törölni. Szerver hiba történt.';
-$labels['setactivated'] = 'A filter készlet engedélyezése sikeresen végrehajtódott.';
-$labels['setdeactivated'] = 'A filter készlet tiltása sikeresen végrehajtódott.';
-$labels['setdeleted'] = 'A filter készlet törlése sikeresen végrehajtódott.';
-$labels['setdeleteconfirm'] = 'Biztosan törölni szeretnéd a kiválasztott szűrő készleteket?';
-$labels['setcreateerror'] = 'Nem sikerült létrehozni a szűrő készletet. Szerver hiba történt.';
-$labels['setcreated'] = 'A szűrő készlet sikeresen létrejött.';
-$labels['activateerror'] = 'Nem sikerült engedélyezni a kiválasztott szűrö(k)et. Szerver hiba történt.';
-$labels['deactivateerror'] = 'Nem sikerült kikapcsolni a kiválasztott szűrő(ke)t. Szerver hiba történt.';
-$labels['activated'] = 'Szűrő(k) sikeresen kikapcsolva.';
-$labels['deactivated'] = 'Szűrő(k) sikeresen bekapcsolva.';
-$labels['moved'] = 'A szűrő sikeresen áthelyezve.';
-$labels['moveerror'] = 'Az áthelyezés nem sikerült. Szerver hiba történt.';
-$labels['nametoolong'] = 'Túll hosszu név';
-$labels['namereserved'] = 'Nem használható (foglalt) név-';
-$labels['setexist'] = 'A készlet már létezik.';
-$labels['nodata'] = 'Legalább egyet ki kell választani.';
 
+$messages = array();
+$messages['filterunknownerror'] = 'Ismeretlen szerverhiba';
+$messages['filterconnerror'] = 'Nem tudok a szűrőszerverhez kapcsolódni';
+$messages['filterdeleteerror'] = 'A szűrőt nem lehet törölni, szerverhiba történt';
+$messages['filterdeleted'] = 'A szűrő törlése sikeres';
+$messages['filtersaved'] = 'A szűrő mentése sikeres';
+$messages['filtersaveerror'] = 'A szűrő mentése sikertelen, szerverhiba történt';
+$messages['filterdeleteconfirm'] = 'Biztosan törli ezt a szűrőt?';
+$messages['ruledeleteconfirm'] = 'Biztosan törli ezt a szabályt?';
+$messages['actiondeleteconfirm'] = 'Biztosan törli ezt a műveletet?';
+$messages['forbiddenchars'] = 'Érvénytelen karakter a mezőben';
+$messages['cannotbeempty'] = 'A mező nem lehet üres';
+$messages['ruleexist'] = 'Már van ilyen névvel elmentett szűrő.';
+$messages['setactivateerror'] = 'A kiválasztott szűrő készletet nem sikerült engedélyezni. Szerver hiba történt.';
+$messages['setdeactivateerror'] = 'A kiválasztott szűrő készletet nem sikerült tiltani. Szerver hiba történt.';
+$messages['setdeleteerror'] = 'Nem sikerült a kiválasztott szűrő készletet törölni. Szerver hiba történt.';
+$messages['setactivated'] = 'A filter készlet engedélyezése sikeresen végrehajtódott.';
+$messages['setdeactivated'] = 'A filter készlet tiltása sikeresen végrehajtódott.';
+$messages['setdeleted'] = 'A filter készlet törlése sikeresen végrehajtódott.';
+$messages['setdeleteconfirm'] = 'Biztosan törölni szeretnéd a kiválasztott szűrő készleteket?';
+$messages['setcreateerror'] = 'Nem sikerült létrehozni a szűrő készletet. Szerver hiba történt.';
+$messages['setcreated'] = 'A szűrő készlet sikeresen létrejött.';
+$messages['activateerror'] = 'Nem sikerült engedélyezni a kiválasztott szűrö(k)et. Szerver hiba történt.';
+$messages['deactivateerror'] = 'Nem sikerült kikapcsolni a kiválasztott szűrő(ke)t. Szerver hiba történt.';
+$messages['deactivated'] = 'Szűrő(k) sikeresen bekapcsolva.';
+$messages['activated'] = 'Szűrő(k) sikeresen kikapcsolva.';
+$messages['moved'] = 'A szűrő sikeresen áthelyezve.';
+$messages['moveerror'] = 'Az áthelyezés nem sikerült. Szerver hiba történt.';
+$messages['nametoolong'] = 'Túll hosszu név';
+$messages['namereserved'] = 'Nem használható (foglalt) név-';
+$messages['setexist'] = 'A készlet már létezik.';
+$messages['nodata'] = 'Legalább egyet ki kell választani.';
+
+?>
diff --git a/plugins/managesieve/localization/hy_AM.inc b/plugins/managesieve/localization/hy_AM.inc
index ea4e982ea..68837b065 100644
--- a/plugins/managesieve/localization/hy_AM.inc
+++ b/plugins/managesieve/localization/hy_AM.inc
@@ -2,18 +2,21 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/hy_AM/labels.inc                                         |
+ | plugins/managesieve/localization/<lang>.inc                           |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Managesieve plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Vahan Yerkanian <vahan@yerkanian.com>                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-managesieve/
 */
 
-$labels = array();
+
 $labels['filters'] = 'Զտիչներ';
 $labels['managefilters'] = 'Կառավարել ստացվող նամակների զտիչները';
 $labels['filtername'] = 'Զտիչի անուն';
@@ -52,8 +55,11 @@ $labels['add'] = 'Ավելացնել';
 $labels['del'] = 'Ջնջել';
 $labels['sender'] = 'Ուղարկող';
 $labels['recipient'] = 'Ստացող';
-$labels['vacationaddresses'] = 'Իմ հավելյալ էլփոստի հասցեներ (բաժանված ստորակետներով).';
+$labels['vacationaddr'] = 'Իմ հավելյալ էլփոստի հասցեներ.';
 $labels['vacationdays'] = 'Ինչ հաճախությամբ ուղարկել հաղորդագրությունները (օրեր)`';
+$labels['vacationinterval'] = 'How often send messages:';
+$labels['days'] = 'days';
+$labels['seconds'] = 'seconds';
 $labels['vacationreason'] = 'Հաղորդագրության բովանդակություն (արձակուրդի պատճառ)`';
 $labels['vacationsubject'] = 'Հաղորդագրության վերնագիր`';
 $labels['rulestop'] = 'Դադարել պայմանների ստուգումը';
@@ -92,6 +98,25 @@ $labels['flagdeleted'] = 'Ջնջված';
 $labels['flaganswered'] = 'Պատասխանված';
 $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['filtercreate'] = 'Ստեղծել զտիչ';
 $labels['usedata'] = 'Զտիչում օգտագործել հետևյալ տեղեկությունը.';
 $labels['nextstep'] = 'Հաջորդ քայլ';
@@ -115,35 +140,38 @@ $labels['default'] = 'լռակյաց';
 $labels['octet'] = 'անփոփոխ (օկտետ)';
 $labels['asciicasemap'] = 'case insensitive (ascii-casemap)';
 $labels['asciinumeric'] = 'numeric (ascii-numeric)';
-$labels['filterunknownerror'] = 'Սերվերի անհայտ սխալ';
-$labels['filterconnerror'] = 'Սերվերի հետ կապի խնդիր։';
-$labels['filterdeleteerror'] = 'Սերվերի սխալ, զտիչի ջնջումն ձախողվեց։';
-$labels['filterdeleted'] = 'Զտիչը ջնջվեց։';
-$labels['filtersaved'] = 'Զտիչը պահպանվեց։';
-$labels['filtersaveerror'] = 'Սերվերի սխալ, զտիչի պահպանման սխալ։';
-$labels['filterdeleteconfirm'] = 'Դուք իսկապե՞ս ցանկանում եք ջնջել նշված զտիչը։';
-$labels['ruledeleteconfirm'] = 'Դուք իսկապե՞ս ցանկանում եք ջնջել նշված պայմանը։';
-$labels['actiondeleteconfirm'] = 'Դուք իսկապե՞ս ցանկանում եք ջնջել նշված գործողությունը։';
-$labels['forbiddenchars'] = 'Դաշտում առկա են արգելված նիշեր։';
-$labels['cannotbeempty'] = 'Դաշտը դատարկ չի կարող լինել։';
-$labels['ruleexist'] = 'Տրված անունով զտիչ արդեն գոյություն ունի։';
-$labels['setactivateerror'] = 'Սերվերի սխալ։ Նշված զտիչների համալիրի միացման ձախողում։';
-$labels['setdeactivateerror'] = 'Սերվերի սխալ։ Նշված զտիչների համալիրի անջատման ձախողում։';
-$labels['setdeleteerror'] = 'Սերվերի սխալ։ Նշված զտիչների համալիրի ջնջման ձախողում։';
-$labels['setactivated'] = 'Զտիչների համալիրը միացված է։';
-$labels['setdeactivated'] = 'Զտիչների համալիրը անջատված է։';
-$labels['setdeleted'] = 'Զտիչների համալիրը ջնջված է։';
-$labels['setdeleteconfirm'] = 'Դուք իսկապե՞ս ցանկանում եք ջնջել նշված զտիչների համալիրը։';
-$labels['setcreateerror'] = 'Սերվերի սխալ։ Զտիչների համալիրի ստեղծումը ձախողվեց։';
-$labels['setcreated'] = 'Զտիչների համալիրը ստեղծված է։';
-$labels['activateerror'] = 'Սերվերի սխալ։ Նշված զտիչի միացման ձախողում։';
-$labels['deactivateerror'] = 'Սերվերի սխալ։ Նշված զտիչի անջատման ձախողում։';
-$labels['activated'] = 'Զտիչի անջատված է։';
-$labels['deactivated'] = 'Զտիչի միացված է։';
-$labels['moved'] = 'Զտիչի տեղափոխված է։';
-$labels['moveerror'] = 'Սերվերի սխալ։ Նշված զտիչի տեղափոխման ձախողում։';
-$labels['nametoolong'] = 'Անունը չափազանց երկար է։';
-$labels['namereserved'] = 'Անթույլատրելի անուն։';
-$labels['setexist'] = 'Համալիրը արդեն գոյություն ունի։';
-$labels['nodata'] = 'Պահանջվում է նշել գոնե մեկ դիրք։';
 
+$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['nametoolong'] = 'Անունը չափազանց երկար է։';
+$messages['namereserved'] = 'Անթույլատրելի անուն։';
+$messages['setexist'] = 'Համալիրը արդեն գոյություն ունի։';
+$messages['nodata'] = 'Պահանջվում է նշել գոնե մեկ դիրք։';
+
+?>
diff --git a/plugins/managesieve/localization/ia.inc b/plugins/managesieve/localization/ia.inc
index f403f4d3d..945de27d8 100644
--- a/plugins/managesieve/localization/ia.inc
+++ b/plugins/managesieve/localization/ia.inc
@@ -2,19 +2,176 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ia/labels.inc                                         |
+ | plugins/managesieve/localization/<lang>.inc                           |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Managesieve plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Emilio Sepulveda <emilio@chilemoz.org>                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-managesieve/
 */
 
-$labels = array();
+
 $labels['filters'] = 'Filtros';
+$labels['managefilters'] = 'Manage incoming mail filters';
+$labels['filtername'] = 'Filter name';
+$labels['newfilter'] = 'New filter';
 $labels['filteradd'] = 'Adder filtro';
 $labels['filterdel'] = 'Deler filtro';
+$labels['moveup'] = 'Move up';
+$labels['movedown'] = 'Move down';
+$labels['filterallof'] = 'matching all of the following rules';
+$labels['filteranyof'] = 'matching any of the following rules';
+$labels['filterany'] = 'all messages';
+$labels['filtercontains'] = 'contains';
+$labels['filternotcontains'] = 'not contains';
+$labels['filteris'] = 'is equal to';
+$labels['filterisnot'] = 'is not equal to';
+$labels['filterexists'] = 'exists';
+$labels['filternotexists'] = 'not exists';
+$labels['filtermatches'] = 'matches expression';
+$labels['filternotmatches'] = 'not matches expression';
+$labels['filterregex'] = 'matches regular expression';
+$labels['filternotregex'] = 'not matches regular expression';
+$labels['filterunder'] = 'under';
+$labels['filterover'] = 'over';
+$labels['addrule'] = 'Add rule';
+$labels['delrule'] = 'Delete rule';
+$labels['messagemoveto'] = 'Move message to';
+$labels['messageredirect'] = 'Redirect message to';
+$labels['messagecopyto'] = 'Copy message to';
+$labels['messagesendcopy'] = 'Send message copy to';
+$labels['messagereply'] = 'Reply with message';
+$labels['messagedelete'] = 'Delete message';
+$labels['messagediscard'] = 'Discard with message';
+$labels['messagesrules'] = 'For incoming mail:';
+$labels['messagesactions'] = '...execute the following actions:';
+$labels['add'] = 'Add';
+$labels['del'] = 'Delete';
+$labels['sender'] = 'Sender';
+$labels['recipient'] = 'Recipient';
+$labels['vacationaddr'] = 'My additional e-mail addresse(s):';
+$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';
+$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['...'] = '...';
+$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)';
+
+$messages = array();
+$messages['filterunknownerror'] = 'Unknown server error.';
+$messages['filterconnerror'] = 'Unable to connect to server.';
+$messages['filterdeleteerror'] = 'Unable to delete filter. Server error occured.';
+$messages['filterdeleted'] = 'Filter deleted successfully.';
+$messages['filtersaved'] = 'Filter saved successfully.';
+$messages['filtersaveerror'] = 'Unable to save filter. Server error occured.';
+$messages['filterdeleteconfirm'] = 'Do you really want to delete selected filter?';
+$messages['ruledeleteconfirm'] = 'Are you sure, you want to delete selected rule?';
+$messages['actiondeleteconfirm'] = 'Are you sure, you want to delete selected action?';
+$messages['forbiddenchars'] = 'Forbidden characters in field.';
+$messages['cannotbeempty'] = 'Field cannot be empty.';
+$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!';
 
+?>
diff --git a/plugins/managesieve/localization/id_ID.inc b/plugins/managesieve/localization/id_ID.inc
index fe79f2765..d98a326c1 100644
--- a/plugins/managesieve/localization/id_ID.inc
+++ b/plugins/managesieve/localization/id_ID.inc
@@ -2,18 +2,21 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/id_ID/labels.inc                                         |
+ | plugins/managesieve/localization/<lang>.inc                           |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Managesieve plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Putu Arya Sabda Wijaya                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-managesieve/
 */
 
-$labels = array();
+
 $labels['filters'] = 'Filter';
 $labels['managefilters'] = 'Atur filter email masuk';
 $labels['filtername'] = 'Nama filter';
@@ -46,14 +49,18 @@ $labels['messagesendcopy'] = 'Kirim salinan pesan ke';
 $labels['messagereply'] = 'balas dengan pesan';
 $labels['messagedelete'] = 'Hapus pesan';
 $labels['messagediscard'] = 'Buang dengan pesan';
-$labels['messagesrules'] = 'Unutk email masuk:';
-$labels['messagesactions'] = '...mengeksekusi tindakan berikut';
+$labels['messagesrules'] = 'Untuk email masuk:';
+$labels['messagesactions'] = '...lakukan tindakan berikut';
 $labels['add'] = 'Tambah';
 $labels['del'] = 'Hapus';
 $labels['sender'] = 'Pengirim';
 $labels['recipient'] = 'Penerima';
+$labels['vacationaddr'] = 'Alamat email tambahan saya:';
 $labels['vacationdays'] = 'Seberapa sering mengirim pesan (dalam hari):';
-$labels['vacationreason'] = 'Badan pesan (alasan liburan):';
+$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';
 $labels['enable'] = 'Aktifkan/Non-Aktifkan';
@@ -83,14 +90,33 @@ $labels['valueislessthan'] = 'nilai lebih kecil dari';
 $labels['valueislessthanequal'] = 'nilai lebih kecil dari atau sama dengan';
 $labels['valueequals'] = 'nilai sama dengan';
 $labels['valuenotequals'] = 'nilai tidak sama dengan';
-$labels['setflags'] = 'Tandai pesan';
-$labels['addflags'] = 'Tambah tandai pada pesan';
+$labels['setflags'] = 'Atur tanda pada pesan';
+$labels['addflags'] = 'Berikan tanda pada pesan';
 $labels['removeflags'] = 'Cabut tanda dari pesan';
 $labels['flagread'] = 'Baca';
 $labels['flagdeleted'] = 'Terhapus';
 $labels['flaganswered'] = 'Terjawab';
 $labels['flagflagged'] = 'Ditandai';
 $labels['flagdraft'] = 'Konsep';
+$labels['setvariable'] = 'Set variabel';
+$labels['setvarname'] = 'Nama variabel:';
+$labels['setvarvalue'] = 'Nilai variabel';
+$labels['setvarmodifiers'] = 'Pengubah';
+$labels['varlower'] = 'huruf kecil';
+$labels['varupper'] = 'huruf besar';
+$labels['varlowerfirst'] = 'karakter pertama huruf kecil';
+$labels['varupperfirst'] = 'karakter pertama huruf besar';
+$labels['varquotewildcard'] = 'kutip karakter khusus';
+$labels['varlength'] = 'panjang';
+$labels['notify'] = 'Kirim pemberitahuan';
+$labels['notifyaddress'] = 'Ke alamat email:';
+$labels['notifybody'] = 'Isi pemberitahuan:';
+$labels['notifysubject'] = 'Judul pemberitahuan';
+$labels['notifyfrom'] = 'Pengirim pemberitahuan.';
+$labels['notifyimportance'] = 'Tingkat kepentingan:';
+$labels['notifyimportancelow'] = 'rendah';
+$labels['notifyimportancenormal'] = 'normal';
+$labels['notifyimportancehigh'] = 'tinggi';
 $labels['filtercreate'] = 'Buat filter';
 $labels['usedata'] = 'Gunakan data berikut dalam filter:';
 $labels['nextstep'] = 'Langkah Selanjutnya';
@@ -114,35 +140,38 @@ $labels['default'] = 'standar';
 $labels['octet'] = 'ketat (oktet)';
 $labels['asciicasemap'] = 'case insensitive (ascii-casemap)';
 $labels['asciinumeric'] = 'numeric (ascii-numeric)';
-$labels['filterunknownerror'] = 'Galat pada server tak dikenali.';
-$labels['filterconnerror'] = 'Tidak dapat menyambung ke server.';
-$labels['filterdeleteerror'] = 'Tidak bisa menghapus penyaringan. Terjadi galat pada server.';
-$labels['filterdeleted'] = 'Penyaringan berhasil dihapus.';
-$labels['filtersaved'] = 'Penyaringan berhasil disimpan.';
-$labels['filtersaveerror'] = 'Tidak bisa menyimpan penyaringan. Terjadi galat pada server.';
-$labels['filterdeleteconfirm'] = 'Yakin untuk menghapus penyaringan terpilih?';
-$labels['ruledeleteconfirm'] = 'Yakin untuk menghapus aturan terpilih?';
-$labels['actiondeleteconfirm'] = 'Yakin untuk menghapus tindakan terpilih?';
-$labels['forbiddenchars'] = 'Karakter terlarang pada isian.';
-$labels['cannotbeempty'] = 'Isian tidak bisa kosong.';
-$labels['ruleexist'] = 'Penyaringan dengan nama tersebut sudah ada.';
-$labels['setactivateerror'] = 'Tidak bisa menghidupkan kumpulan penyaringan terpilih. Terjadi galat pada server.';
-$labels['setdeactivateerror'] = 'Tidak bisa mematikan kumpulan penyaringan terpilih. Terjadi galat pada server.';
-$labels['setdeleteerror'] = 'Tidak bisa menghapus kumpulan penyaringan terpilih. Terjadi galat pada server.';
-$labels['setactivated'] = 'Kumpulan penyaringan berhasil dihidupkan.';
-$labels['setdeactivated'] = 'Kumpulan penyaringan berhasil dimatikan.';
-$labels['setdeleted'] = 'Kumpulan penyaringan berhasil dihapus.';
-$labels['setdeleteconfirm'] = 'Yakin ingin menghapus kumpulan penyaringan terpilih?';
-$labels['setcreateerror'] = 'Tidak bisa membuat kumpulan penyaringan. Terjadi galat pada server.';
-$labels['setcreated'] = 'Kumpulan penyaringan berhasul dibuat.';
-$labels['activateerror'] = 'Tidak bisa menghidupkan penyaringan terpilih. terjadi galat pada server.';
-$labels['deactivateerror'] = 'Tidak bisa mematikan penyaringan terpilih. Terjadi galat pada server.';
-$labels['activated'] = 'Berhasil mematikan penyaringan.';
-$labels['deactivated'] = 'Berhasil menghidupkan penyaringan.';
-$labels['moved'] = 'Berhasil memindahkan penyaringan.';
-$labels['moveerror'] = 'Tidak bisa memindahkan penyaringan terpilih. Terjadi galat pada server.';
-$labels['nametoolong'] = 'Kepanjangan nama.';
-$labels['namereserved'] = 'Nama sudah ada.';
-$labels['setexist'] = 'Kumpulan sudah ada.';
-$labels['nodata'] = 'Setidaknya satu posisi harus dipilih!';
 
+$messages = array();
+$messages['filterunknownerror'] = 'Error pada server tak dikenali.';
+$messages['filterconnerror'] = 'Tidak dapat menyambung ke server.';
+$messages['filterdeleteerror'] = 'Tidak bisa menghapus penyaringan. Terjadi error pada server.';
+$messages['filterdeleted'] = 'Penyaringan berhasil dihapus.';
+$messages['filtersaved'] = 'Penyaringan berhasil disimpan.';
+$messages['filtersaveerror'] = 'Tidak bisa menyimpan penyaringan. Terjadi error pada server.';
+$messages['filterdeleteconfirm'] = 'Yakin untuk menghapus penyaringan terpilih?';
+$messages['ruledeleteconfirm'] = 'Yakin untuk menghapus aturan terpilih?';
+$messages['actiondeleteconfirm'] = 'Yakin untuk menghapus tindakan terpilih?';
+$messages['forbiddenchars'] = 'Karakter terlarang pada isian.';
+$messages['cannotbeempty'] = 'Isian tidak bisa kosong.';
+$messages['ruleexist'] = 'Penyaringan dengan nama tersebut sudah ada.';
+$messages['setactivateerror'] = 'Tidak bisa menghidupkan kumpulan penyaringan terpilih. Terjadi error pada server.';
+$messages['setdeactivateerror'] = 'Tidak bisa mematikan kumpulan penyaringan terpilih. Terjadi error pada server.';
+$messages['setdeleteerror'] = 'Tidak bisa menghapus kumpulan penyaringan terpilih. Terjadi error pada server.';
+$messages['setactivated'] = 'Kumpulan penyaringan berhasil dihidupkan.';
+$messages['setdeactivated'] = 'Kumpulan penyaringan berhasil dimatikan.';
+$messages['setdeleted'] = 'Kumpulan penyaringan berhasil dihapus.';
+$messages['setdeleteconfirm'] = 'Yakin ingin menghapus kumpulan penyaringan terpilih?';
+$messages['setcreateerror'] = 'Tidak bisa membuat kumpulan penyaringan. Terjadi galat pada server.';
+$messages['setcreated'] = 'Kumpulan penyaringan berhasul dibuat.';
+$messages['activateerror'] = 'Tidak bisa menghidupkan penyaringan terpilih. terjadi galat pada server.';
+$messages['deactivateerror'] = 'Tidak bisa mematikan penyaringan terpilih. Terjadi galat pada server.';
+$messages['deactivated'] = 'Berhasil menghidupkan penyaringan.';
+$messages['activated'] = 'Berhasil mematikan penyaringan.';
+$messages['moved'] = 'Berhasil memindahkan penyaringan.';
+$messages['moveerror'] = 'Tidak bisa memindahkan penyaringan terpilih. Terjadi error pada server.';
+$messages['nametoolong'] = 'Nama terlalu panjang.';
+$messages['namereserved'] = 'Nama sudah terpesan.';
+$messages['setexist'] = 'Kumpulan sudah ada.';
+$messages['nodata'] = 'Setidaknya satu posisi harus dipilih!';
+
+?>
diff --git a/plugins/managesieve/localization/it_IT.inc b/plugins/managesieve/localization/it_IT.inc
index 972a19445..b54c46d9a 100644
--- a/plugins/managesieve/localization/it_IT.inc
+++ b/plugins/managesieve/localization/it_IT.inc
@@ -2,18 +2,21 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/it_IT/labels.inc                                         |
+ | plugins/managesieve/localization/<lang>.inc                           |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Managesieve plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-managesieve/
 */
 
-$labels = array();
+
 $labels['filters'] = 'Filtri';
 $labels['managefilters'] = 'Gestione dei filtri per la posta in arrivo';
 $labels['filtername'] = 'Nome del filtro';
@@ -52,8 +55,11 @@ $labels['add'] = 'Aggiungi';
 $labels['del'] = 'Elimina';
 $labels['sender'] = 'Mittente';
 $labels['recipient'] = 'Destinatario';
-$labels['vacationaddresses'] = 'Lista di indirizzi e-mail di destinatari addizionali (separati da virgola):';
+$labels['vacationaddr'] = 'Lista di indirizzi e-mail di destinatari addizionali:';
 $labels['vacationdays'] = 'Ogni quanti giorni ribadire il messaggio allo stesso mittente';
+$labels['vacationinterval'] = 'How often send messages:';
+$labels['days'] = 'days';
+$labels['seconds'] = 'seconds';
 $labels['vacationreason'] = 'Corpo del messaggio (dettagli relativi all\'assenza):';
 $labels['vacationsubject'] = 'Oggetto del messaggio';
 $labels['rulestop'] = 'Non valutare le regole successive';
@@ -92,6 +98,25 @@ $labels['flagdeleted'] = 'Cancellato';
 $labels['flaganswered'] = 'Risposto';
 $labels['flagflagged'] = 'Contrassegna';
 $labels['flagdraft'] = 'Bozza';
+$labels['setvariable'] = 'Imposta variabile';
+$labels['setvarname'] = 'Nome variabile:';
+$labels['setvarvalue'] = 'Valore variabile:';
+$labels['setvarmodifiers'] = 'Modificatori:';
+$labels['varlower'] = 'minuscole';
+$labels['varupper'] = 'maiuscole';
+$labels['varlowerfirst'] = 'primo carattere minuscolo';
+$labels['varupperfirst'] = 'primo carattere maiuscolo';
+$labels['varquotewildcard'] = 'caratteri speciali di quoting';
+$labels['varlength'] = 'lunghezza';
+$labels['notify'] = 'Invia notifica';
+$labels['notifyaddress'] = 'All\'indirizzo email:';
+$labels['notifybody'] = 'Corpo della notifica:';
+$labels['notifysubject'] = 'Oggetto della notifica:';
+$labels['notifyfrom'] = 'Mittente della notifica:';
+$labels['notifyimportance'] = 'Importanza:';
+$labels['notifyimportancelow'] = 'bassa';
+$labels['notifyimportancenormal'] = 'normale';
+$labels['notifyimportancehigh'] = 'alta';
 $labels['filtercreate'] = 'Crea filtro';
 $labels['usedata'] = 'utilizza i seguenti dati nel filtro';
 $labels['nextstep'] = 'passo successivo';
@@ -115,35 +140,38 @@ $labels['default'] = 'predefinito';
 $labels['octet'] = 'strict (octet)';
 $labels['asciicasemap'] = 'non differenziare maiuscole/minuscole (ascii-casemap)';
 $labels['asciinumeric'] = 'numerico';
-$labels['filterunknownerror'] = 'Errore sconosciuto del server';
-$labels['filterconnerror'] = 'Collegamento al server managesieve fallito';
-$labels['filterdeleteerror'] = 'Eliminazione del filtro fallita. Si è verificato un errore nel server';
-$labels['filterdeleted'] = 'Filtro eliminato con successo';
-$labels['filtersaved'] = 'Filtro salvato con successo';
-$labels['filtersaveerror'] = 'Salvataggio del filtro fallito. Si è verificato un errore nel server';
-$labels['filterdeleteconfirm'] = 'Vuoi veramente eliminare il filtro selezionato?';
-$labels['ruledeleteconfirm'] = 'Sei sicuro di voler eliminare la regola selezionata?';
-$labels['actiondeleteconfirm'] = 'Sei sicuro di voler eliminare l\'azione selezionata?';
-$labels['forbiddenchars'] = 'Caratteri non consentiti nel campo';
-$labels['cannotbeempty'] = 'Il campo non può essere vuoto';
-$labels['ruleexist'] = 'Esiste già un filtro con questo nome';
-$labels['setactivateerror'] = 'Impossibile attivare il filtro. Errore del server';
-$labels['setdeactivateerror'] = 'Impossibile disattivare il filtro. Errore del server';
-$labels['setdeleteerror'] = 'Impossibile cancellare il filtro. Errore del server';
-$labels['setactivated'] = 'Filtro attivato';
-$labels['setdeactivated'] = 'Filtro disattivato';
-$labels['setdeleted'] = 'Filtro cancellato';
-$labels['setdeleteconfirm'] = 'Sei sicuro di voler cancellare il gruppo di filtri';
-$labels['setcreateerror'] = 'Impossibile creare il gruppo. Errore del server';
-$labels['setcreated'] = 'Gruppo di filtri creato';
-$labels['activateerror'] = 'impossibile selezionare il filtro (server error)';
-$labels['deactivateerror'] = 'impossibile disabilitare il filtro (server error)';
-$labels['activated'] = 'filtro disabilitato';
-$labels['deactivated'] = 'filtro abilitato';
-$labels['moved'] = 'filtro spostato';
-$labels['moveerror'] = 'impossibile spostare il filtro (server error)';
-$labels['nametoolong'] = 'Impossibile creare il gruppo: Nome troppo lungo';
-$labels['namereserved'] = 'nome riservato';
-$labels['setexist'] = 'Il gruppo esiste già';
-$labels['nodata'] = 'selezionare almeno una posizione';
 
+$messages = array();
+$messages['filterunknownerror'] = 'Errore sconosciuto del server';
+$messages['filterconnerror'] = 'Collegamento al server managesieve fallito';
+$messages['filterdeleteerror'] = 'Eliminazione del filtro fallita. Si è verificato un errore nel server';
+$messages['filterdeleted'] = 'Filtro eliminato con successo';
+$messages['filtersaved'] = 'Filtro salvato con successo';
+$messages['filtersaveerror'] = 'Salvataggio del filtro fallito. Si è verificato un errore nel server';
+$messages['filterdeleteconfirm'] = 'Vuoi veramente eliminare il filtro selezionato?';
+$messages['ruledeleteconfirm'] = 'Sei sicuro di voler eliminare la regola selezionata?';
+$messages['actiondeleteconfirm'] = 'Sei sicuro di voler eliminare l\'azione selezionata?';
+$messages['forbiddenchars'] = 'Caratteri non consentiti nel campo';
+$messages['cannotbeempty'] = 'Il campo non può essere vuoto';
+$messages['ruleexist'] = 'Esiste già un filtro con questo nome';
+$messages['setactivateerror'] = 'Impossibile attivare il filtro. Errore del server';
+$messages['setdeactivateerror'] = 'Impossibile disattivare il filtro. Errore del server';
+$messages['setdeleteerror'] = 'Impossibile cancellare il filtro. Errore del server';
+$messages['setactivated'] = 'Filtro attivato';
+$messages['setdeactivated'] = 'Filtro disattivato';
+$messages['setdeleted'] = 'Filtro cancellato';
+$messages['setdeleteconfirm'] = 'Sei sicuro di voler cancellare il gruppo di filtri';
+$messages['setcreateerror'] = 'Impossibile creare il gruppo. Errore del server';
+$messages['setcreated'] = 'Gruppo di filtri creato';
+$messages['activateerror'] = 'impossibile selezionare il filtro (server error)';
+$messages['deactivateerror'] = 'impossibile disabilitare il filtro (server error)';
+$messages['deactivated'] = 'filtro abilitato';
+$messages['activated'] = 'filtro disabilitato';
+$messages['moved'] = 'filtro spostato';
+$messages['moveerror'] = 'impossibile spostare il filtro (server error)';
+$messages['nametoolong'] = 'Impossibile creare il gruppo: Nome troppo lungo';
+$messages['namereserved'] = 'nome riservato';
+$messages['setexist'] = 'Il gruppo esiste già';
+$messages['nodata'] = 'selezionare almeno una posizione';
+
+?>
diff --git a/plugins/managesieve/localization/ja_JP.inc b/plugins/managesieve/localization/ja_JP.inc
index f7b96b7d1..c8927d3f2 100644
--- a/plugins/managesieve/localization/ja_JP.inc
+++ b/plugins/managesieve/localization/ja_JP.inc
@@ -2,18 +2,21 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ja_JP/labels.inc                                         |
+ | plugins/managesieve/localization/<lang>.inc                           |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Managesieve plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Takahiro Kambe                                                |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-managesieve/
 */
 
-$labels = array();
+
 $labels['filters'] = 'フィルター';
 $labels['managefilters'] = '受信メールのフィルターを管理';
 $labels['filtername'] = 'フィルター名';
@@ -52,8 +55,11 @@ $labels['add'] = '追加';
 $labels['del'] = '削除';
 $labels['sender'] = '送信者';
 $labels['recipient'] = '宛先';
-$labels['vacationaddresses'] = '電子メールの宛先の(コンマ区切った)追加のリスト:';
+$labels['vacationaddr'] = '電子メールの宛先の追加のリスト:';
 $labels['vacationdays'] = 'メッセージを(1日に)送信する頻度:';
+$labels['vacationinterval'] = 'メッセージを送信する頻度:';
+$labels['days'] = '日';
+$labels['seconds'] = '秒';
 $labels['vacationreason'] = 'メッセージ本体(休暇の理由):';
 $labels['vacationsubject'] = 'メッセージの件名:';
 $labels['rulestop'] = 'ルールの評価を停止';
@@ -92,6 +98,25 @@ $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'] = '送信先の電子メールアドレス:';
+$labels['notifybody'] = '通知の本文:';
+$labels['notifysubject'] = '通知の件名:';
+$labels['notifyfrom'] = '通知の送信者:';
+$labels['notifyimportance'] = '重要度:';
+$labels['notifyimportancelow'] = '低';
+$labels['notifyimportancenormal'] = '通常';
+$labels['notifyimportancehigh'] = '高';
 $labels['filtercreate'] = 'フィルターを作成';
 $labels['usedata'] = 'フィルターで次のデータを使用';
 $labels['nextstep'] = '次のステップ';
@@ -115,35 +140,38 @@ $labels['default'] = '初期値';
 $labels['octet'] = '厳密(オクテット)';
 $labels['asciicasemap'] = '大文字小文字を区別しない(ascii-casemap)';
 $labels['asciinumeric'] = '数値(ascii-numeric)';
-$labels['filterunknownerror'] = '不明なサーバーのエラーです。';
-$labels['filterconnerror'] = 'サーバに接続できません。';
-$labels['filterdeleteerror'] = 'フィルターを削除できませんでした。サーバーでエラーが発生しました。';
-$labels['filterdeleted'] = 'フィルターを削除しました。';
-$labels['filtersaved'] = 'フィルターを保存しました。';
-$labels['filtersaveerror'] = 'フィルターの保存できませんでした。サーバーでエラーが発生しました。';
-$labels['filterdeleteconfirm'] = '本当に選択したフィルターを削除しますか?';
-$labels['ruledeleteconfirm'] = '本当に選択したルールを削除しますか?';
-$labels['actiondeleteconfirm'] = '本当に選択した操作を削除しますか?';
-$labels['forbiddenchars'] = '項目に禁止している文字が含まれています。';
-$labels['cannotbeempty'] = '項目は空欄にできません。';
-$labels['ruleexist'] = '指定した名前のフィルターが既に存在します。';
-$labels['setactivateerror'] = '選択したフィルターセットを有効にできませんでした。サーバーでエラーが発生しました。';
-$labels['setdeactivateerror'] = '選択したフィルターセットを無効にできませんでした。サーバーでエラーが発生しました。';
-$labels['setdeleteerror'] = '選択したフィルターセットを削除できませんでした。サーバーでエラーが発生しました。';
-$labels['setactivated'] = 'フィルターセットを有効にしました。';
-$labels['setdeactivated'] = 'フィルターセットを無効にしました。';
-$labels['setdeleted'] = 'フィルターセットを削除しました。';
-$labels['setdeleteconfirm'] = '本当に選択したフィルターセットを削除しますか?';
-$labels['setcreateerror'] = 'フィルターセットを作成できませんでした。サーバーでエラーが発生しました。';
-$labels['setcreated'] = 'フィルターセットを作成しました。';
-$labels['activateerror'] = '選択したフィルターを有効にできませんでした。サーバーでエラーが発生しました。';
-$labels['deactivateerror'] = '選択したフィルターを無効にできませんでした。サーバーでエラーが発生しました。';
-$labels['activated'] = 'フィルターを無効にしました。';
-$labels['deactivated'] = 'フィルターを有効にしました。';
-$labels['moved'] = 'フィルターを移動しました。';
-$labels['moveerror'] = '選択したフィルターを移動できませんでした。サーバーでエラーが発生しました。';
-$labels['nametoolong'] = '名前が長すぎます。';
-$labels['namereserved'] = '予約されている名前です。';
-$labels['setexist'] = 'フィルターセットが既に存在します。';
-$labels['nodata'] = '少なくとも1つの場所を選択しなければなりません!';
 
+$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['nametoolong'] = '名前が長すぎます。';
+$messages['namereserved'] = '予約されている名前です。';
+$messages['setexist'] = 'フィルターセットが既に存在します。';
+$messages['nodata'] = '少なくとも1つの場所を選択しなければなりません!';
+
+?>
diff --git a/plugins/managesieve/localization/ko_KR.inc b/plugins/managesieve/localization/ko_KR.inc
index c3fff4115..1085f624d 100644
--- a/plugins/managesieve/localization/ko_KR.inc
+++ b/plugins/managesieve/localization/ko_KR.inc
@@ -2,130 +2,176 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ko_KR/labels.inc                                         |
+ | plugins/managesieve/localization/<lang>.inc                           |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Managesieve plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Kim, Woohyun <woohyun.kim@gmail.com>                          |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-managesieve/
 */
 
-$labels = array();
+
 $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['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['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['sender'] = '발신인';
+$labels['recipient'] = '수신인';
+$labels['vacationaddr'] = '나의 추가 이메일 주소:';
+$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'] = '변수 설정';
+$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'] = '봉투';
+$labels['modifier'] = '수식자:';
 $labels['text'] = '텍스트';
+$labels['undecoded'] = '암호화되지 않음 (원상태)';
+$labels['contenttype'] = '내용 유형';
+$labels['modtype'] = '유형:';
+$labels['allparts'] = '모두';
 $labels['domain'] = '도메인';
+$labels['localpart'] = '로컬 부분';
 $labels['user'] = '사용자';
-$labels['default'] = '기본값';
-$labels['filterunknownerror'] = '알수 없는 서버 에러.';
-$labels['filterconnerror'] = '서버에 연결할 수 없습니다.';
-$labels['filterdeleteerror'] = '필터를 삭제할 수 없습니다. 서버 에러 발생 함.';
-$labels['filterdeleted'] = '필터를 성공적으로 삭제 함.';
-$labels['filtersaved'] = '필터를 성공적으로 저장 함.';
-$labels['filtersaveerror'] = '필터를 저장할 수 없음. 서버 에러 발생 함.';
-$labels['filterdeleteconfirm'] = '정말로 선택한 필터의 삭제를 원하십니까?';
-$labels['ruledeleteconfirm'] = '선택한 규칙을 삭제하고자 하는 것이 확실합니까?';
-$labels['actiondeleteconfirm'] = '선택한 동작을 삭제하고자 하는 것이 확실합니까?';
-$labels['forbiddenchars'] = '필드에 금지된 문자가 있음.';
-$labels['cannotbeempty'] = '필드는 비어있을 수 없음.';
-$labels['ruleexist'] = '지정한 이름의 필터가 이미 존재 함.';
-$labels['setactivateerror'] = '선택한 필터 묶음을 활성화 할 수 없음. 서버 에러 발생 함.';
-$labels['setdeactivateerror'] = '선택한 필터 묶음을 비활성화 할 수 없음. 서버 에러 발생 함.';
-$labels['setdeleteerror'] = '선택한 필터 묶음을 삭제할 수 없음. 서버 에러 발생 함.';
-$labels['setactivated'] = '필터 묶음을 성공적으로 활성화 하였음.';
-$labels['setdeactivated'] = '필터 묶음을 성공적으로 비활성화 하였음.';
-$labels['setdeleted'] = '필터 묶음을 성공적으로 삭제 함.';
-$labels['setdeleteconfirm'] = '선택한 필터 묶음을 지우고자 하는 것이 확실합니까?';
-$labels['setcreateerror'] = '필터 묶음을 생성할 수 없음. 서버 에러 발생 함.';
-$labels['setcreated'] = '필터 묶음을 성공적으로 생성 함.';
-$labels['activateerror'] = '선택한 필터(들)을 동작하게 할 수 없음. 서버 에러 발생 함.';
-$labels['deactivateerror'] = '선택한 필터(들)을 동작하지 않게 할 수 없음. 서버 에러 발생 함.';
-$labels['activated'] = '필터(들)을 동작하지 않게 하는데 성공하였음.';
-$labels['deactivated'] = '필터(들)을 동작하게 하는데 성공하였음.';
-$labels['moved'] = '필터를 이동하는 데 성공하였음.';
-$labels['moveerror'] = '선택한 필터를 이동할 수 없음. 서버 에러 발생 함.';
-$labels['nametoolong'] = '이름이 너무 김.';
-$labels['namereserved'] = '예약된 이름.';
-$labels['setexist'] = '묶음이 이미 존재 함.';
-$labels['nodata'] = '적어도 하나의 위치가 선택되어야 함!';
+$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['nametoolong'] = '이름이 너무 김.';
+$messages['namereserved'] = '예약된 이름.';
+$messages['setexist'] = '세트가 이미 존재함.';
+$messages['nodata'] = '최소 하나의 위치가 선택되어야 합니다!';
 
+?>
diff --git a/plugins/managesieve/localization/lt_LT.inc b/plugins/managesieve/localization/lt_LT.inc
index 5fe6dc064..3b6f4eec4 100644
--- a/plugins/managesieve/localization/lt_LT.inc
+++ b/plugins/managesieve/localization/lt_LT.inc
@@ -2,19 +2,21 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/lt_LT/labels.inc                                         |
+ | plugins/managesieve/localization/<lang>.inc                           |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Managesieve plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: tomas <tomas@saulessmugis.lt>                                 |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-managesieve/
 */
 
-$labels = array();
+
 $labels['filters'] = 'Filtrai';
 $labels['managefilters'] = 'Tvarkyti gaunamų laiškų filtrus';
 $labels['filtername'] = 'Filtro pavadinimas';
@@ -46,14 +48,18 @@ $labels['messagecopyto'] = 'Kopijuoti laišką į';
 $labels['messagesendcopy'] = 'Nusiųsti laiško kopiją';
 $labels['messagereply'] = 'Atsakyti laišku';
 $labels['messagedelete'] = 'Pašalinti laišką';
+$labels['messagediscard'] = 'Discard with message';
 $labels['messagesrules'] = 'Gaunamiems laiškams:';
 $labels['messagesactions'] = '…vykdyti šiuos veiksmus:';
 $labels['add'] = 'Pridėti';
 $labels['del'] = 'Pašalinti';
 $labels['sender'] = 'Siuntėjas';
 $labels['recipient'] = 'Gavėjas';
-$labels['vacationaddresses'] = 'Papildomas gavėjų adresų sąrašas (skirti kableliais):';
+$labels['vacationaddr'] = 'Papildomas gavėjų adresų sąrašas:';
 $labels['vacationdays'] = 'Kaip dažnai išsiųsti laiškus (dienomis):';
+$labels['vacationinterval'] = 'How often send messages:';
+$labels['days'] = 'days';
+$labels['seconds'] = 'seconds';
 $labels['vacationreason'] = 'Laiško tekstas';
 $labels['vacationsubject'] = 'Laiško tema:';
 $labels['rulestop'] = 'Nutraukti taisyklių vykdymą';
@@ -92,6 +98,25 @@ $labels['flagdeleted'] = 'Pašalintas';
 $labels['flaganswered'] = 'Atsakytas';
 $labels['flagflagged'] = 'Pažymėtas gairele';
 $labels['flagdraft'] = 'Juodraštis';
+$labels['setvariable'] = 'Nustatyti kintamąjį';
+$labels['setvarname'] = 'Kintamojo vardas:';
+$labels['setvarvalue'] = 'Kintamojo vertė:';
+$labels['setvarmodifiers'] = 'Modifikatoriai:';
+$labels['varlower'] = 'mažosios raidės';
+$labels['varupper'] = 'didžiosios raidės';
+$labels['varlowerfirst'] = 'pirmoji raidė mažoji';
+$labels['varupperfirst'] = 'pirmoji raidė didžioji';
+$labels['varquotewildcard'] = 'cituoti specialius simbolius';
+$labels['varlength'] = 'ilgis';
+$labels['notify'] = 'Siųsti priminimą';
+$labels['notifyaddress'] = 'Kam, el. pašto adresas:';
+$labels['notifybody'] = 'Priminimo tekstas';
+$labels['notifysubject'] = 'Priminimo pavadinimas';
+$labels['notifyfrom'] = 'Priminimo siuntėjas';
+$labels['notifyimportance'] = 'Svarbumas';
+$labels['notifyimportancelow'] = 'žemas';
+$labels['notifyimportancenormal'] = 'normalus';
+$labels['notifyimportancehigh'] = 'aukštas';
 $labels['filtercreate'] = 'Kurti filtrą';
 $labels['usedata'] = 'Filtrui naudoti šiuos duomenis:';
 $labels['nextstep'] = 'Kitas žingsnis';
@@ -116,3 +141,37 @@ $labels['octet'] = 'griežtas („octet“)';
 $labels['asciicasemap'] = 'nepaisantis raidžių registro („ascii-casemap“)';
 $labels['asciinumeric'] = 'skaitinis („ascii-numeric“)';
 
+$messages = array();
+$messages['filterunknownerror'] = 'Nežinoma serverio klaida.';
+$messages['filterconnerror'] = 'Neįmanoma užmegzti ryšio su serveriu.';
+$messages['filterdeleteerror'] = 'Filtro panaikinti neįmanoma. Įvyko serverio klaida.';
+$messages['filterdeleted'] = 'Filtras panaikintas sėkmingai.';
+$messages['filtersaved'] = 'Filtras sėkmingai išsaugotas';
+$messages['filtersaveerror'] = 'Filtro išsaugoti neįmanoma. Įvyko serverio klaida.';
+$messages['filterdeleteconfirm'] = 'Ar jūs esate įsitikinęs, jog norite panaikinti pasirinktus filtrus(-ą)?';
+$messages['ruledeleteconfirm'] = 'Ar jūs įsitikinęs, jog norite panaikinti pasirinktą taisyklę?';
+$messages['actiondeleteconfirm'] = 'Ar jūs įsitikinęs, jog norite panaikinti pasirinktą veiksmą?';
+$messages['forbiddenchars'] = 'Laukelyje yra draudžiamų simbolių.';
+$messages['cannotbeempty'] = 'Laukelis negali būti tuščias';
+$messages['ruleexist'] = 'Filtras tokiu vardu jau yra.';
+$messages['setactivateerror'] = 'Neįmanoma aktyvuoti pasirinkto filtrų rinkinio. Įvyko serverio klaida.';
+$messages['setdeactivateerror'] = 'Neįmanoma deaktyvuoti pasirinkto filtrų rinkinio. Įvyko serverio klaida.';
+$messages['setdeleteerror'] = 'Neįmanoma panaikinti pasirinkto filtrų rinkinio. Įvyko serverio klaida.';
+$messages['setactivated'] = 'Filtrų rinkinys sėkmingai aktyvuotas.';
+$messages['setdeactivated'] = 'Filtrų rinkinys sėkmingai deaktyvuotas.';
+$messages['setdeleted'] = 'Filtrų rinkinys sėkmingai panaikintas.';
+$messages['setdeleteconfirm'] = 'Ar jūs esate tikri, jog norite panaikinti pasirinktą filtrų rinkinį?';
+$messages['setcreateerror'] = 'Neįmanoma sukurti filtrų rinkinio. Įvyko serverio klaida.';
+$messages['setcreated'] = 'Filtrų rinkinys sėkmingai sukurtas.';
+$messages['activateerror'] = 'Neįmanoma įjungti pasirinktų filtrų(-o). Įvyko serverio klaida.';
+$messages['deactivateerror'] = 'Neįmanoma išjungti pasirinktų filtrų(-o). Įvyko serverio klaida.';
+$messages['deactivated'] = 'Filtras(-as) sėkmingai išjungti.';
+$messages['activated'] = 'Filtras(-as) sėkmingai įjungti.';
+$messages['moved'] = 'Filtrai perkelti sėkmingai.';
+$messages['moveerror'] = 'Pasirinkto filtro perkelti neįmanoma. Įvyko serverio klaida.';
+$messages['nametoolong'] = 'Vardas per ilgas.';
+$messages['namereserved'] = 'Rezervuotas vardas.';
+$messages['setexist'] = 'Rinkinys jau yra sukurtas.';
+$messages['nodata'] = 'At least one position must be selected!';
+
+?>
diff --git a/plugins/managesieve/localization/lv_LV.inc b/plugins/managesieve/localization/lv_LV.inc
index 98804d08e..0a008f8b8 100644
--- a/plugins/managesieve/localization/lv_LV.inc
+++ b/plugins/managesieve/localization/lv_LV.inc
@@ -2,19 +2,21 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/lv_LV/labels.inc                                         |
+ | plugins/managesieve/localization/<lang>.inc                           |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Managesieve plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Ivars Strazdiņš <Unknown>                                   |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-managesieve/
 */
 
-$labels = array();
+
 $labels['filters'] = 'Vēstuļu filtri';
 $labels['managefilters'] = 'Pārvaldīt ienākošo vēstuļu filtrus';
 $labels['filtername'] = 'Filtra nosaukums';
@@ -53,8 +55,11 @@ $labels['add'] = 'Pievienot';
 $labels['del'] = 'Dzēst';
 $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['vacationaddr'] = 'Ievadiet vienu vai vairākus e-pastu(s):';
 $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';
@@ -93,6 +98,25 @@ $labels['flagdeleted'] = 'Dzēstas';
 $labels['flaganswered'] = 'Atbildētas';
 $labels['flagflagged'] = 'Iezīmētās';
 $labels['flagdraft'] = 'Melnraksts';
+$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'] = 'Izveidot filtru';
 $labels['usedata'] = 'Filtrā izmantot sekojošus datus';
 $labels['nextstep'] = 'Nākamais solis';
@@ -116,25 +140,38 @@ $labels['default'] = 'noklusējums';
 $labels['octet'] = 'strikti (oktets)';
 $labels['asciicasemap'] = 'reģistrnejutīgs (ascii tabula)';
 $labels['asciinumeric'] = 'skaitļu (ascii skaitļu)';
-$labels['filterunknownerror'] = 'Nezināma servera kļūda';
-$labels['filterconnerror'] = 'Neizdevās pieslēgties ManageSieve serverim';
-$labels['filterdeleteerror'] = 'Neizdevās dzēst filtru. Servera iekšējā kļūda';
-$labels['filterdeleted'] = 'Filtrs veiksmīgi izdzēsts';
-$labels['filtersaved'] = 'Filtrs veiksmīgi saglabāts';
-$labels['filtersaveerror'] = 'Neizdevās saglabāt filtru. Servera iekšējā kļūda';
-$labels['filterdeleteconfirm'] = 'Vai tiešām vēlaties dzēst atzīmēto filtru?';
-$labels['ruledeleteconfirm'] = 'Vai tiešām vēlaties dzēst atzīmēto nosacījumu?';
-$labels['actiondeleteconfirm'] = 'Vai tiešām vēlaties dzēst atzīmēto darbību?';
-$labels['forbiddenchars'] = 'Lauks satur aizliegtus simbolus';
-$labels['cannotbeempty'] = 'Lauks nedrīkst būt tukšs';
-$labels['setactivateerror'] = 'Neizdevās aktivizēt atzīmēto filtru kopu. Servera iekšējā kļūda';
-$labels['setdeactivateerror'] = 'Neizdevās deaktivizēt atzīmēto filtru kopu. Servera iekšējā kļūda';
-$labels['setdeleteerror'] = 'Neizdevās izdzēst atzīmēto filtru kopu. Servera iekšējā kļūda';
-$labels['setactivated'] = 'Filtru kopa veiksmīgi aktivizēta';
-$labels['setdeactivated'] = 'Filtru kopa veiksmīgi deaktivizēta';
-$labels['setdeleted'] = 'Filtru kopa veiksmīgi izdzēsta';
-$labels['setdeleteconfirm'] = 'Vai tiešām vēlaties dzēst atzīmēto filtru kopu?';
-$labels['setcreateerror'] = 'Neizdevās izveidot filtru kopu. Servera iekšējā kļūda';
-$labels['setcreated'] = 'Filtru kopa veiksmīgi izveidota';
-$labels['nametoolong'] = 'Neizdevās izveidot filtru kopu. Pārāk garš kopas nosaukums';
 
+$messages = array();
+$messages['filterunknownerror'] = 'Nezināma servera kļūda';
+$messages['filterconnerror'] = 'Neizdevās pieslēgties ManageSieve serverim';
+$messages['filterdeleteerror'] = 'Neizdevās dzēst filtru. Servera iekšējā kļūda';
+$messages['filterdeleted'] = 'Filtrs veiksmīgi izdzēsts';
+$messages['filtersaved'] = 'Filtrs veiksmīgi saglabāts';
+$messages['filtersaveerror'] = 'Neizdevās saglabāt filtru. Servera iekšējā kļūda';
+$messages['filterdeleteconfirm'] = 'Vai tiešām vēlaties dzēst atzīmēto filtru?';
+$messages['ruledeleteconfirm'] = 'Vai tiešām vēlaties dzēst atzīmēto nosacījumu?';
+$messages['actiondeleteconfirm'] = 'Vai tiešām vēlaties dzēst atzīmēto darbību?';
+$messages['forbiddenchars'] = 'Lauks satur aizliegtus simbolus';
+$messages['cannotbeempty'] = 'Lauks nedrīkst būt tukšs';
+$messages['ruleexist'] = 'Filter with specified name already exists.';
+$messages['setactivateerror'] = 'Neizdevās aktivizēt atzīmēto filtru kopu. Servera iekšējā kļūda';
+$messages['setdeactivateerror'] = 'Neizdevās deaktivizēt atzīmēto filtru kopu. Servera iekšējā kļūda';
+$messages['setdeleteerror'] = 'Neizdevās izdzēst atzīmēto filtru kopu. Servera iekšējā kļūda';
+$messages['setactivated'] = 'Filtru kopa veiksmīgi aktivizēta';
+$messages['setdeactivated'] = 'Filtru kopa veiksmīgi deaktivizēta';
+$messages['setdeleted'] = 'Filtru kopa veiksmīgi izdzēsta';
+$messages['setdeleteconfirm'] = 'Vai tiešām vēlaties dzēst atzīmēto filtru kopu?';
+$messages['setcreateerror'] = 'Neizdevās izveidot filtru kopu. Servera iekšējā kļūda';
+$messages['setcreated'] = 'Filtru kopa veiksmīgi izveidota';
+$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'] = 'Neizdevās izveidot filtru kopu. Pārāk garš kopas nosaukums';
+$messages['namereserved'] = 'Reserved name.';
+$messages['setexist'] = 'Set already exists.';
+$messages['nodata'] = 'At least one position must be selected!';
+
+?>
diff --git a/plugins/managesieve/localization/ml_IN.inc b/plugins/managesieve/localization/ml_IN.inc
index ed3d7675c..761b4305b 100644
--- a/plugins/managesieve/localization/ml_IN.inc
+++ b/plugins/managesieve/localization/ml_IN.inc
@@ -2,18 +2,21 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ml_IN/labels.inc                                         |
+ | plugins/managesieve/localization/<lang>.inc                           |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Managesieve plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-managesieve/
 */
 
-$labels = array();
+
 $labels['filters'] = 'അരിപ്പകള്‍';
 $labels['managefilters'] = 'അകത്തോട്ടുള്ള ഇമെയില്‍ അരിപ്പകള്‍ ക്രമീകരിക്കുക';
 $labels['filtername'] = 'അരിപ്പയുടെ പേര്';
@@ -52,8 +55,10 @@ $labels['add'] = 'ചേര്‍ക്കു';
 $labels['del'] = 'നീക്കം ചെയ്യുക';
 $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'] = 'നിയമങ്ങള്‍ വിലയിരുത്തുന്നത് നിര്‍ത്തുക';
@@ -92,6 +97,25 @@ $labels['flagdeleted'] = 'നീക്കം ചെയ്തവ';
 $labels['flaganswered'] = 'മറുപടി നല്‍കിയവ';
 $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['filtercreate'] = 'അരിപ്പ ഉണ്ടാക്കുക';
 $labels['usedata'] = 'ഈ വിവരങ്ങള്‍ അരിപ്പയില്‍ ഉപയോഗിക്കുക:';
 $labels['nextstep'] = 'അടുത്ത പടി';
@@ -115,35 +139,38 @@ $labels['default'] = 'സഹജമായ';
 $labels['octet'] = 'കര്‍ശനം (octet)';
 $labels['asciicasemap'] = 'വലിയ-ചെറിയക്ഷരങ്ങള്‍ തമ്മില്‍ വ്യത്യാസമില്ലാത്ത (ascii-casemap)';
 $labels['asciinumeric'] = 'സംഖ്യകള്‍ (ascii-numeric)';
-$labels['filterunknownerror'] = 'അജ്ഞാതമായ സെര്‍വ്വര്‍ പിശക്.';
-$labels['filterconnerror'] = 'സെര്‍വ്വറുമായി ബന്ധപ്പെടാന്‍ സാധിക്കുന്നില്ല.';
-$labels['filterdeleteerror'] = 'അരിപ്പ മായ്ക്കാന്‍ സാധിച്ചില്ല. സേവകനില്‍ കുഴപ്പം.';
-$labels['filterdeleted'] = 'അരിപ്പ വിജകരമായി മായ്ച്ചു.';
-$labels['filtersaved'] = 'അരിപ്പ വിജകരമായി സൂക്ഷിച്ചു.';
-$labels['filtersaveerror'] = 'അരിപ്പ സൂക്ഷിക്കാന്‍ സാധിച്ചില്ല. സേവകനില്‍ കുഴപ്പം.';
-$labels['filterdeleteconfirm'] = 'തെരഞ്ഞെടുത്ത അരിപ്പ നീക്കം ചെയ്യണമെന്ന് ഉറപ്പാണോ?';
-$labels['ruledeleteconfirm'] = 'തെരഞ്ഞെടുത്ത നിയമം നീക്കം ചെയ്യണമെന്ന് ഉറപ്പാണോ?';
-$labels['actiondeleteconfirm'] = 'തെരഞ്ഞെടുത്ത പ്രവര്‍ത്തി നീക്കം ചെയ്യണമെന്ന് ഉറപ്പാണോ?';
-$labels['forbiddenchars'] = 'ഫില്‍ഡില്‍ സാധുവല്ലാത്ത അക്ഷരങ്ങള്‍.';
-$labels['cannotbeempty'] = 'ഫീല്‍ഡ് ശൂന്യമാകാന്‍ പാടില്ല.';
-$labels['ruleexist'] = 'ഈ പേരിലുള്ള അരിപ്പ ഇപ്പോള്‍ തന്നെ ഉണ്ട്.';
-$labels['setactivateerror'] = 'അരിപ്പയുടെ കൂട്ടത്തെ പ്രവര്‍ത്തനസജ്ജമാക്കാന്‍ സാധിച്ചില്ല. സേവകനില്‍ കുഴപ്പം.';
-$labels['setdeactivateerror'] = 'അരിപ്പയുടെ കൂട്ടത്തെ പ്രവര്‍ത്തനരഹിതമാക്കാന്‍ സാധിച്ചില്ല. സേവകനില്‍ കുഴപ്പം.';
-$labels['setdeleteerror'] = 'തെരഞ്ഞെടുത്ത അരിപ്പയുടെ കൂട്ടത്തെ മായ്ക്കാന്‍ സാധിച്ചില്ല. സേവകനില്‍ കുഴപ്പം.';
-$labels['setactivated'] = 'അരിപ്പകളുടെ കൂട്ടത്തെ വിജയകരമായി പ്രവര്‍ത്തനസജ്ജമാക്കി.';
-$labels['setdeactivated'] = 'അരിപ്പകളുടെ കൂട്ടത്തെ വിജയകരമായി പ്രവര്‍ത്തനരഹിതമാക്കി.';
-$labels['setdeleted'] = 'അരിപ്പകളുടെ കൂട്ടത്തെ വിജയകരമായി മായ്ച്ചു.';
-$labels['setdeleteconfirm'] = 'തെരഞ്ഞെടുത്ത അരിപ്പകളുടെ കൂട്ടത്തെ നീക്കം ചെയ്യണമെന്ന് ഉറപ്പാണോ?';
-$labels['setcreateerror'] = 'അരിപ്പയുടെ കൂട്ടത്തെ നിര്‍മ്മിക്കാന്‍ സാധിച്ചില്ല. സേവകനില്‍ കുഴപ്പം.';
-$labels['setcreated'] = 'അരിപ്പകളുടെ കൂട്ടത്തെ വിജയകരമായി നിര്‍മ്മിച്ചു.';
-$labels['activateerror'] = 'അരിപ്പ (കള്‍) പ്രവര്‍ത്തനസജ്ജം ആക്കാന്‍ സാധിച്ചില്ല. സേവകനില്‍ കുഴപ്പം!';
-$labels['deactivateerror'] = 'അരിപ്പ (കള്‍) നിര്‍വീര്യം ആക്കാന്‍ സാധിച്ചില്ല. സേവകനില്‍ കുഴപ്പം!';
-$labels['activated'] = 'അരിപ്പകള്‍ നിര്‍വീര്യം ആക്കപ്പെട്ടിരിക്കുന്നു';
-$labels['deactivated'] = 'അരിപ്പ വിജകരമായി പ്രവര്‍ത്തനസജ്ജമാക്കി.';
-$labels['moved'] = 'അരിപ്പ വിജകരമായി മാറ്റി.';
-$labels['moveerror'] = 'തെരഞ്ഞെടുത്ത അരിപ്പ മാറ്റാന്‍ സാധിച്ചില്ല. സേവകനില്‍ കുഴപ്പം.';
-$labels['nametoolong'] = 'പേരിന് നീളം കൂടുതല്‍.';
-$labels['namereserved'] = 'നീക്കിവെച്ച വാക്ക്.';
-$labels['setexist'] = 'കൂട്ടം നേരത്തെ തന്നെ ഉണ്ട്.';
-$labels['nodata'] = 'ഒരു സ്ഥാനമെങ്കിലും തെരഞ്ഞെടുക്കണം!';
 
+$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['nametoolong'] = 'പേരിന് നീളം കൂടുതല്‍.';
+$messages['namereserved'] = 'നീക്കിവെച്ച വാക്ക്.';
+$messages['setexist'] = 'കൂട്ടം നേരത്തെ തന്നെ ഉണ്ട്.';
+$messages['nodata'] = 'ഒരു സ്ഥാനമെങ്കിലും തെരഞ്ഞെടുക്കണം!';
+
+?>
diff --git a/plugins/managesieve/localization/mr_IN.inc b/plugins/managesieve/localization/mr_IN.inc
index 6578dd96b..082ea9bc6 100644
--- a/plugins/managesieve/localization/mr_IN.inc
+++ b/plugins/managesieve/localization/mr_IN.inc
@@ -2,33 +2,176 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/mr_IN/labels.inc                                         |
+ | plugins/managesieve/localization/<lang>.inc                           |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Managesieve plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Devendra Buddhikot <devendradb@rediffmail.com>                |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-managesieve/
 */
 
-$labels = array();
+
 $labels['filters'] = 'चाळण्या';
+$labels['managefilters'] = 'Manage incoming mail filters';
+$labels['filtername'] = 'Filter name';
+$labels['newfilter'] = 'New filter';
+$labels['filteradd'] = 'Add filter';
+$labels['filterdel'] = 'Delete filter';
 $labels['moveup'] = 'वर हलवा';
 $labels['movedown'] = 'खाली हलवा';
 $labels['filterallof'] = 'खालील सर्व नियम जुळत आहेत';
+$labels['filteranyof'] = 'matching any of the following rules';
 $labels['filterany'] = 'सर्व संदेश';
+$labels['filtercontains'] = 'contains';
+$labels['filternotcontains'] = 'not contains';
 $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['filterunder'] = 'खाली';
 $labels['filterover'] = 'वरती';
+$labels['addrule'] = 'Add rule';
+$labels['delrule'] = 'Delete rule';
+$labels['messagemoveto'] = 'Move message to';
+$labels['messageredirect'] = 'Redirect message to';
+$labels['messagecopyto'] = 'Copy message to';
+$labels['messagesendcopy'] = 'Send message copy to';
+$labels['messagereply'] = 'Reply with message';
 $labels['messagedelete'] = 'संदेश काढून टाका';
+$labels['messagediscard'] = 'Discard with message';
+$labels['messagesrules'] = 'For incoming mail:';
 $labels['messagesactions'] = 'खालील कृती आमलात आणा :';
 $labels['add'] = 'समावेश करा';
 $labels['del'] = 'नष्ट करा';
 $labels['sender'] = 'प्रेषक';
+$labels['recipient'] = 'Recipient';
+$labels['vacationaddr'] = 'My additional e-mail addresse(s):';
+$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';
+$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['...'] = '...';
+$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)';
+
+$messages = array();
+$messages['filterunknownerror'] = 'Unknown server error.';
+$messages['filterconnerror'] = 'Unable to connect to server.';
+$messages['filterdeleteerror'] = 'Unable to delete filter. Server error occured.';
+$messages['filterdeleted'] = 'Filter deleted successfully.';
+$messages['filtersaved'] = 'Filter saved successfully.';
+$messages['filtersaveerror'] = 'Unable to save filter. Server error occured.';
+$messages['filterdeleteconfirm'] = 'Do you really want to delete selected filter?';
+$messages['ruledeleteconfirm'] = 'Are you sure, you want to delete selected rule?';
+$messages['actiondeleteconfirm'] = 'Are you sure, you want to delete selected action?';
+$messages['forbiddenchars'] = 'Forbidden characters in field.';
+$messages['cannotbeempty'] = 'Field cannot be empty.';
+$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!';
 
+?>
diff --git a/plugins/managesieve/localization/nb_NO.inc b/plugins/managesieve/localization/nb_NO.inc
index 32cde4aa2..c3bf98f8b 100644
--- a/plugins/managesieve/localization/nb_NO.inc
+++ b/plugins/managesieve/localization/nb_NO.inc
@@ -2,18 +2,21 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/nb_NO/labels.inc                                         |
+ | plugins/managesieve/localization/<lang>.inc                           |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Managesieve plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Fredrik Larsen <fredrik.h.larsen@gmail.com>                   |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-managesieve/
 */
 
-$labels = array();
+
 $labels['filters'] = 'Filtre';
 $labels['managefilters'] = 'Rediger filter for innkommende e-post';
 $labels['filtername'] = 'Filternavn';
@@ -52,8 +55,11 @@ $labels['add'] = 'Legg til';
 $labels['del'] = 'Slett';
 $labels['sender'] = 'Avsender';
 $labels['recipient'] = 'Mottaker';
-$labels['vacationaddresses'] = 'Liste med mottakeradresser (adskilt med komma):';
+$labels['vacationaddr'] = 'Liste med mottakeradresser:';
 $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';
@@ -92,6 +98,25 @@ $labels['flagdeleted'] = 'Slettet';
 $labels['flaganswered'] = 'Besvart';
 $labels['flagflagged'] = 'Flagget';
 $labels['flagdraft'] = 'Utkast';
+$labels['setvariable'] = 'Set variabel';
+$labels['setvarname'] = 'Variabelnavn:';
+$labels['setvarvalue'] = 'Variabel verdi:';
+$labels['setvarmodifiers'] = 'Modifikator:';
+$labels['varlower'] = 'med små bokstaver';
+$labels['varupper'] = 'med store bokstaver';
+$labels['varlowerfirst'] = 'første tegn liten bokstav';
+$labels['varupperfirst'] = 'første tegn stor bokstav';
+$labels['varquotewildcard'] = 'sitér spesialtegn';
+$labels['varlength'] = 'lengde';
+$labels['notify'] = 'Send melding';
+$labels['notifyaddress'] = 'Til e-postadresse:';
+$labels['notifybody'] = 'Varseltekst:';
+$labels['notifysubject'] = 'Varselemne:';
+$labels['notifyfrom'] = 'Varselavsender:';
+$labels['notifyimportance'] = 'Viktighet:';
+$labels['notifyimportancelow'] = 'lav';
+$labels['notifyimportancenormal'] = 'normal';
+$labels['notifyimportancehigh'] = 'høy';
 $labels['filtercreate'] = 'Opprett filter';
 $labels['usedata'] = 'Bruk følgende data i filteret:';
 $labels['nextstep'] = 'Neste steg';
@@ -115,35 +140,38 @@ $labels['default'] = 'standard';
 $labels['octet'] = 'streng (oktett)';
 $labels['asciicasemap'] = 'ikke skill store og små bokstaver (ascii-casemap)';
 $labels['asciinumeric'] = 'numerisk (ascii-numeric)';
-$labels['filterunknownerror'] = 'Ukjent problem med tjener.';
-$labels['filterconnerror'] = 'Kunne ikke koble til tjeneren.';
-$labels['filterdeleteerror'] = 'Kunne ikke slette filter. Det dukket opp en feil på tjeneren.';
-$labels['filterdeleted'] = 'Filteret er blitt slettet.';
-$labels['filtersaved'] = 'Filteret er blitt lagret.';
-$labels['filtersaveerror'] = 'Kunne ikke lagre filteret. Det dukket opp en feil på tjeneren.';
-$labels['filterdeleteconfirm'] = 'Vil du virkelig slette det valgte filteret?';
-$labels['ruledeleteconfirm'] = 'Er du sikker på at du vil slette valgte regel?';
-$labels['actiondeleteconfirm'] = 'Er du sikker på at du vil slette valgte hendelse?';
-$labels['forbiddenchars'] = 'Ugyldige tegn i felt.';
-$labels['cannotbeempty'] = 'Feltet kan ikke stå tomt.';
-$labels['ruleexist'] = 'Det finnes allerede et filter med dette navnet.';
-$labels['setactivateerror'] = 'Kunne ikke aktivere det valgte filtersettet. Det oppsto en tjenerfeil.';
-$labels['setdeactivateerror'] = 'Kunne ikke deaktivere det valgte filtersettet. Det oppsto en tjenerfeil.';
-$labels['setdeleteerror'] = 'Kunne ikke slette det valgte filtersettet. Det oppsto en tjenerfeil.';
-$labels['setactivated'] = 'Filtersett aktivert.';
-$labels['setdeactivated'] = 'Filtersett deaktivert.';
-$labels['setdeleted'] = 'Filtersett slettet.';
-$labels['setdeleteconfirm'] = 'Er du sikker på at du vil slette det valgte filtersettet?';
-$labels['setcreateerror'] = 'Kunne ikke opprette filtersettet. Det oppsto en tjenerfeil.';
-$labels['setcreated'] = 'Filtersett opprettet.';
-$labels['activateerror'] = 'Kunne ikke skru på valgte filter. Det oppsto en tjenerfeil.';
-$labels['deactivateerror'] = 'Kunne ikke skru av valgte filter. Det oppsto en tjenerfeil.';
-$labels['activated'] = 'Filter skrudd av.';
-$labels['deactivated'] = 'Filter skrudd på.';
-$labels['moved'] = 'Filter ble flyttet.';
-$labels['moveerror'] = 'Kunne ikke flytte valgte filter. Det oppsto en tjenerfeil.';
-$labels['nametoolong'] = 'Navnet er for langt.';
-$labels['namereserved'] = 'Navnet er reservert.';
-$labels['setexist'] = 'Settet eksisterer allerede.';
-$labels['nodata'] = 'Du må velge minst én posisjon!';
 
+$messages = array();
+$messages['filterunknownerror'] = 'Ukjent problem med tjener.';
+$messages['filterconnerror'] = 'Kunne ikke koble til tjeneren.';
+$messages['filterdeleteerror'] = 'Kunne ikke slette filter. Det dukket opp en feil på tjeneren.';
+$messages['filterdeleted'] = 'Filteret er blitt slettet.';
+$messages['filtersaved'] = 'Filteret er blitt lagret.';
+$messages['filtersaveerror'] = 'Kunne ikke lagre filteret. Det dukket opp en feil på tjeneren.';
+$messages['filterdeleteconfirm'] = 'Vil du virkelig slette det valgte filteret?';
+$messages['ruledeleteconfirm'] = 'Er du sikker på at du vil slette valgte regel?';
+$messages['actiondeleteconfirm'] = 'Er du sikker på at du vil slette valgte hendelse?';
+$messages['forbiddenchars'] = 'Ugyldige tegn i felt.';
+$messages['cannotbeempty'] = 'Feltet kan ikke stå tomt.';
+$messages['ruleexist'] = 'Det finnes allerede et filter med dette navnet.';
+$messages['setactivateerror'] = 'Kunne ikke aktivere det valgte filtersettet. Det oppsto en tjenerfeil.';
+$messages['setdeactivateerror'] = 'Kunne ikke deaktivere det valgte filtersettet. Det oppsto en tjenerfeil.';
+$messages['setdeleteerror'] = 'Kunne ikke slette det valgte filtersettet. Det oppsto en tjenerfeil.';
+$messages['setactivated'] = 'Filtersett aktivert.';
+$messages['setdeactivated'] = 'Filtersett deaktivert.';
+$messages['setdeleted'] = 'Filtersett slettet.';
+$messages['setdeleteconfirm'] = 'Er du sikker på at du vil slette det valgte filtersettet?';
+$messages['setcreateerror'] = 'Kunne ikke opprette filtersettet. Det oppsto en tjenerfeil.';
+$messages['setcreated'] = 'Filtersett opprettet.';
+$messages['activateerror'] = 'Kunne ikke skru på valgte filter. Det oppsto en tjenerfeil.';
+$messages['deactivateerror'] = 'Kunne ikke skru av valgte filter. Det oppsto en tjenerfeil.';
+$messages['deactivated'] = 'Filter skrudd på.';
+$messages['activated'] = 'Filter skrudd av.';
+$messages['moved'] = 'Filter ble flyttet.';
+$messages['moveerror'] = 'Kunne ikke flytte valgte filter. Det oppsto en tjenerfeil.';
+$messages['nametoolong'] = 'Navnet er for langt.';
+$messages['namereserved'] = 'Navnet er reservert.';
+$messages['setexist'] = 'Settet eksisterer allerede.';
+$messages['nodata'] = 'Du må velge minst én posisjon!';
+
+?>
diff --git a/plugins/managesieve/localization/nl_NL.inc b/plugins/managesieve/localization/nl_NL.inc
index d5226e0bb..80c2274b1 100644
--- a/plugins/managesieve/localization/nl_NL.inc
+++ b/plugins/managesieve/localization/nl_NL.inc
@@ -2,20 +2,23 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/nl_NL/labels.inc                                         |
+ | plugins/managesieve/localization/<lang>.inc                           |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Managesieve plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-managesieve/
 */
 
-$labels = array();
+
 $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';
@@ -40,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';
@@ -52,8 +55,11 @@ $labels['add'] = 'Toevoegen';
 $labels['del'] = 'Verwijderen';
 $labels['sender'] = 'Afzender';
 $labels['recipient'] = 'Ontvanger';
-$labels['vacationaddresses'] = 'Aanvullende lijst van geadresseerden (gescheiden met komma\'s):';
+$labels['vacationaddr'] = 'Aanvullende lijst van geadresseerden:';
 $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';
@@ -92,6 +98,25 @@ $labels['flagdeleted'] = 'Verwijderd';
 $labels['flaganswered'] = 'Beantwoord';
 $labels['flagflagged'] = 'Gemarkeerd';
 $labels['flagdraft'] = 'Concept';
+$labels['setvariable'] = 'Variabele instellen';
+$labels['setvarname'] = 'Naam variabele:';
+$labels['setvarvalue'] = 'Waarde:';
+$labels['setvarmodifiers'] = 'Waarde wijzigen:';
+$labels['varlower'] = 'kleine letters';
+$labels['varupper'] = 'hoofdletters';
+$labels['varlowerfirst'] = 'eerste karakter als kleine letter';
+$labels['varupperfirst'] = 'eerste karakter als hoofdletter';
+$labels['varquotewildcard'] = 'speciale karakters quoten';
+$labels['varlength'] = 'lengte';
+$labels['notify'] = 'Stuur melding';
+$labels['notifyaddress'] = 'Naar e-mailadres:';
+$labels['notifybody'] = 'Meldingsbericht:';
+$labels['notifysubject'] = 'Onderwerp van melding:';
+$labels['notifyfrom'] = 'Afzender:';
+$labels['notifyimportance'] = 'Prioriteit:';
+$labels['notifyimportancelow'] = 'laag';
+$labels['notifyimportancenormal'] = 'normaal';
+$labels['notifyimportancehigh'] = 'hoog';
 $labels['filtercreate'] = 'Filter aanmaken';
 $labels['usedata'] = 'Gebruik de volgende gegevens in het filter:';
 $labels['nextstep'] = 'Volgende stap';
@@ -115,35 +140,38 @@ $labels['default'] = 'standaard';
 $labels['octet'] = 'strikt (octet)';
 $labels['asciicasemap'] = 'hoofdletterongevoelig (ascii-casemap)';
 $labels['asciinumeric'] = 'numeriek (ascii-numeriek)';
-$labels['filterunknownerror'] = 'Onbekende fout';
-$labels['filterconnerror'] = 'Kan geen verbinding maken met de managesieve server';
-$labels['filterdeleteerror'] = 'Kan filter niet verwijderen. Er is een fout opgetreden';
-$labels['filterdeleted'] = 'Filter succesvol verwijderd';
-$labels['filtersaved'] = 'Filter succesvol opgeslagen';
-$labels['filtersaveerror'] = 'Kan filter niet opslaan. Er is een fout opgetreden.';
-$labels['filterdeleteconfirm'] = 'Weet je zeker dat je het geselecteerde filter wilt verwijderen?';
-$labels['ruledeleteconfirm'] = 'Weet je zeker dat je de geselecteerde regel wilt verwijderen?';
-$labels['actiondeleteconfirm'] = 'Weet je zeker dat je de geselecteerde actie wilt verwijderen?';
-$labels['forbiddenchars'] = 'Verboden karakters in het veld';
-$labels['cannotbeempty'] = 'Veld mag niet leeg zijn';
-$labels['ruleexist'] = 'Er bestaat al een filter met deze naam.';
-$labels['setactivateerror'] = 'Filterverzameling kon niet geactiveerd worden. Er trad een serverfout op.';
-$labels['setdeactivateerror'] = 'Filterverzameling kon niet gedeactiveerd worden. Er trad een serverfout op.';
-$labels['setdeleteerror'] = 'Filterverzameling kon niet verwijderd worden. Er trad een serverfout op.';
-$labels['setactivated'] = 'Filterset succesvol geactiveerd.';
-$labels['setdeactivated'] = 'Filterverzameling succesvol gedeactiveerd.';
-$labels['setdeleted'] = 'Filterverzameling succesvol verwijderd.';
-$labels['setdeleteconfirm'] = 'Weet u zeker dat u de geselecteerde filterset wilt verwijderen?';
-$labels['setcreateerror'] = 'Filterverzameling kon niet aangemaakt worden. Er trad een serverfout op.';
-$labels['setcreated'] = 'Filterverzameling succesvol aangemaakt.';
-$labels['activateerror'] = 'Geselecteerde filter(s) konden niet ingeschakeld worden. Er trad een serverfout op.';
-$labels['deactivateerror'] = 'Geselecteerde filter(s) konden niet uitgeschakeld worden. Er trad een serverfout op.';
-$labels['activated'] = 'Filter(s) succesvol uitgeschakeld.';
-$labels['deactivated'] = 'Filter(s) succesvol ingeschakeld.';
-$labels['moved'] = 'Filter succesvol verplaatst.';
-$labels['moveerror'] = 'Geselecteerde filter(s) konden niet verplaatst worden. Er trad een serverfout op.';
-$labels['nametoolong'] = 'Naam is te lang.';
-$labels['namereserved'] = 'Gereserveerde naam.';
-$labels['setexist'] = 'Set bestaat al.';
-$labels['nodata'] = 'Tenminste één positie moet geselecteerd worden!';
 
+$messages = array();
+$messages['filterunknownerror'] = 'Onbekende fout';
+$messages['filterconnerror'] = 'Kan geen verbinding maken met de managesieve server';
+$messages['filterdeleteerror'] = 'Kan filter niet verwijderen. Er is een fout opgetreden';
+$messages['filterdeleted'] = 'Filter succesvol verwijderd';
+$messages['filtersaved'] = 'Filter succesvol opgeslagen';
+$messages['filtersaveerror'] = 'Kan filter niet opslaan. Er is een fout opgetreden.';
+$messages['filterdeleteconfirm'] = 'Weet je zeker dat je het geselecteerde filter wilt verwijderen?';
+$messages['ruledeleteconfirm'] = 'Weet je zeker dat je de geselecteerde regel wilt verwijderen?';
+$messages['actiondeleteconfirm'] = 'Weet je zeker dat je de geselecteerde actie wilt verwijderen?';
+$messages['forbiddenchars'] = 'Verboden karakters in het veld';
+$messages['cannotbeempty'] = 'Veld mag niet leeg zijn';
+$messages['ruleexist'] = 'Er bestaat al een filter met deze naam.';
+$messages['setactivateerror'] = 'Filterverzameling kon niet geactiveerd worden. Er trad een serverfout op.';
+$messages['setdeactivateerror'] = 'Filterverzameling kon niet gedeactiveerd worden. Er trad een serverfout op.';
+$messages['setdeleteerror'] = 'Filterverzameling kon niet verwijderd worden. Er trad een serverfout op.';
+$messages['setactivated'] = 'Filterset succesvol geactiveerd.';
+$messages['setdeactivated'] = 'Filterverzameling succesvol gedeactiveerd.';
+$messages['setdeleted'] = 'Filterverzameling succesvol verwijderd.';
+$messages['setdeleteconfirm'] = 'Weet u zeker dat u de geselecteerde filterset wilt verwijderen?';
+$messages['setcreateerror'] = 'Filterverzameling kon niet aangemaakt worden. Er trad een serverfout op.';
+$messages['setcreated'] = 'Filterverzameling succesvol aangemaakt.';
+$messages['activateerror'] = 'Geselecteerde filter(s) konden niet ingeschakeld worden. Er trad een serverfout op.';
+$messages['deactivateerror'] = 'Geselecteerde filter(s) konden niet uitgeschakeld worden. Er trad een serverfout op.';
+$messages['deactivated'] = 'Filter(s) succesvol ingeschakeld.';
+$messages['activated'] = 'Filter(s) succesvol uitgeschakeld.';
+$messages['moved'] = 'Filter succesvol verplaatst.';
+$messages['moveerror'] = 'Geselecteerde filter(s) konden niet verplaatst worden. Er trad een serverfout op.';
+$messages['nametoolong'] = 'Naam is te lang.';
+$messages['namereserved'] = 'Gereserveerde naam.';
+$messages['setexist'] = 'Set bestaat al.';
+$messages['nodata'] = 'Tenminste één positie moet geselecteerd worden!';
+
+?>
diff --git a/plugins/managesieve/localization/nn_NO.inc b/plugins/managesieve/localization/nn_NO.inc
index 2ba3405d9..03563a72b 100644
--- a/plugins/managesieve/localization/nn_NO.inc
+++ b/plugins/managesieve/localization/nn_NO.inc
@@ -2,18 +2,21 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/nn_NN/labels.inc                                         |
+ | plugins/managesieve/localization/<lang>.inc                           |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Managesieve plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Fredrik Larsen <fredrik.h.larsen@gmail.com>                   |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-managesieve/
 */
 
-$labels = array();
+
 $labels['filters'] = 'Filter';
 $labels['managefilters'] = 'Rediger filter for innkommande e-post';
 $labels['filtername'] = 'Filternamn';
@@ -52,7 +55,7 @@ $labels['add'] = 'Legg til';
 $labels['del'] = 'Slett';
 $labels['sender'] = 'Avsendar';
 $labels['recipient'] = 'Mottakar';
-$labels['vacationaddresses'] = 'Liste med mottakaradresser (komma-separert):';
+$labels['vacationaddr'] = 'Liste med mottakaradresser:';
 $labels['vacationdays'] = 'Periode mellom meldingar (i dagar):';
 $labels['vacationreason'] = 'Innhald (grunngjeving for fråvær)';
 $labels['vacationsubject'] = 'Meldingsemne:';
@@ -92,6 +95,25 @@ $labels['flagdeleted'] = 'Sletta';
 $labels['flaganswered'] = 'Svart på';
 $labels['flagflagged'] = 'Flagga';
 $labels['flagdraft'] = 'Skisse';
+$labels['setvariable'] = 'Sett variabel:';
+$labels['setvarname'] = 'Variabelnamn:';
+$labels['setvarvalue'] = 'Variabelverdi:';
+$labels['setvarmodifiers'] = 'Modifiers:';
+$labels['varlower'] = 'med små bokstavar';
+$labels['varupper'] = 'med store bokstavar';
+$labels['varlowerfirst'] = 'med liten forbokstav';
+$labels['varupperfirst'] = 'med stor forbokstav';
+$labels['varquotewildcard'] = 'quote special characters';
+$labels['varlength'] = 'lengde';
+$labels['notify'] = 'Send varsel';
+$labels['notifyaddress'] = 'Til e-postadresse:';
+$labels['notifybody'] = 'Notification body:';
+$labels['notifysubject'] = 'Notification subject:';
+$labels['notifyfrom'] = 'Notification sender:';
+$labels['notifyimportance'] = 'Betyding:';
+$labels['notifyimportancelow'] = 'låg';
+$labels['notifyimportancenormal'] = 'normal';
+$labels['notifyimportancehigh'] = 'høg';
 $labels['filtercreate'] = 'Opprett filter';
 $labels['usedata'] = 'Bruk følgande data i filteret:';
 $labels['nextstep'] = 'Neste steg';
@@ -115,35 +137,38 @@ $labels['default'] = 'standard';
 $labels['octet'] = 'streng (oktett)';
 $labels['asciicasemap'] = 'ikkje skil mellom store og små bokstavar (ascii-casemap)';
 $labels['asciinumeric'] = 'numerisk (ascii-numeric)';
-$labels['filterunknownerror'] = 'Ukjent problem med tenar.';
-$labels['filterconnerror'] = 'Kunne ikkje kople til tenaren.';
-$labels['filterdeleteerror'] = 'Kunne ikkje slette filter. Det oppstod ein feil på tenaren.';
-$labels['filterdeleted'] = 'Filteret er blitt sletta.';
-$labels['filtersaved'] = 'Filteret er blitt lagra.';
-$labels['filtersaveerror'] = 'Kunne ikkje lagre filteret. Det oppstod ein feil på tenaren.';
-$labels['filterdeleteconfirm'] = 'Vil du verkeleg slette det valde filteret?';
-$labels['ruledeleteconfirm'] = 'Er du sikker på at du vil slette vald regel?';
-$labels['actiondeleteconfirm'] = 'Er du sikker på at du vil slette vald hending?';
-$labels['forbiddenchars'] = 'Ugyldige teikn i felt.';
-$labels['cannotbeempty'] = 'Feltet kan ikkje stå tomt.';
-$labels['ruleexist'] = 'Det finst alt eit filter med dette namnet.';
-$labels['setactivateerror'] = 'Kunne ikkje aktivere det valde filtersettet. Det oppsto ein tenarfeil.';
-$labels['setdeactivateerror'] = 'Kunne ikkje deaktivere det valde filtersettet. Det oppsto ein tenarfeil.';
-$labels['setdeleteerror'] = 'Kunne ikkje slette det valde filtersettet. Det oppsto ein tenarfeil.';
-$labels['setactivated'] = 'Filtersett aktivert.';
-$labels['setdeactivated'] = 'Filtersett deaktivert.';
-$labels['setdeleted'] = 'Filtersett sletta.';
-$labels['setdeleteconfirm'] = 'Er du sikker på at du vil slette det valde filtersettet?';
-$labels['setcreateerror'] = 'Kunne ikkje opprette filtersettet. Det oppstod ein tenarfeil.';
-$labels['setcreated'] = 'Filtersett oppretta.';
-$labels['activateerror'] = 'Kunne ikkje skru på valde filter. Det oppstod ein tenarfeil.';
-$labels['deactivateerror'] = 'Kunne ikkje skru av valde filter. Det oppstod ein tenarfeil.';
-$labels['activated'] = 'Filter skrudd av.';
-$labels['deactivated'] = 'Filter skrudd på.';
-$labels['moved'] = 'Filter vart flytta.';
-$labels['moveerror'] = 'Kunne ikkje flytte valde filter. Det oppstod ein tenarfeil.';
-$labels['nametoolong'] = 'Namnet er for langt.';
-$labels['namereserved'] = 'Namnet er reservert.';
-$labels['setexist'] = 'Settet eksisterer alt.';
-$labels['nodata'] = 'Du må velje minst éin posisjon!';
 
+$messages = array();
+$messages['filterunknownerror'] = 'Ukjent problem med tenar.';
+$messages['filterconnerror'] = 'Kunne ikkje kople til tenaren.';
+$messages['filterdeleteerror'] = 'Kunne ikkje slette filter. Det oppstod ein feil på tenaren.';
+$messages['filterdeleted'] = 'Filteret er blitt sletta.';
+$messages['filtersaved'] = 'Filteret er blitt lagra.';
+$messages['filtersaveerror'] = 'Kunne ikkje lagre filteret. Det oppstod ein feil på tenaren.';
+$messages['filterdeleteconfirm'] = 'Vil du verkeleg slette det valde filteret?';
+$messages['ruledeleteconfirm'] = 'Er du sikker på at du vil slette vald regel?';
+$messages['actiondeleteconfirm'] = 'Er du sikker på at du vil slette vald hending?';
+$messages['forbiddenchars'] = 'Ugyldige teikn i felt.';
+$messages['cannotbeempty'] = 'Feltet kan ikkje stå tomt.';
+$messages['ruleexist'] = 'Det finst alt eit filter med dette namnet.';
+$messages['setactivateerror'] = 'Kunne ikkje aktivere det valde filtersettet. Det oppsto ein tenarfeil.';
+$messages['setdeactivateerror'] = 'Kunne ikkje deaktivere det valde filtersettet. Det oppsto ein tenarfeil.';
+$messages['setdeleteerror'] = 'Kunne ikkje slette det valde filtersettet. Det oppsto ein tenarfeil.';
+$messages['setactivated'] = 'Filtersett aktivert.';
+$messages['setdeactivated'] = 'Filtersett deaktivert.';
+$messages['setdeleted'] = 'Filtersett sletta.';
+$messages['setdeleteconfirm'] = 'Er du sikker på at du vil slette det valde filtersettet?';
+$messages['setcreateerror'] = 'Kunne ikkje opprette filtersettet. Det oppstod ein tenarfeil.';
+$messages['setcreated'] = 'Filtersett oppretta.';
+$messages['activateerror'] = 'Kunne ikkje skru på valde filter. Det oppstod ein tenarfeil.';
+$messages['deactivateerror'] = 'Kunne ikkje skru av valde filter. Det oppstod ein tenarfeil.';
+$messages['deactivated'] = 'Filter skrudd på.';
+$messages['activated'] = 'Filter skrudd av.';
+$messages['moved'] = 'Filter vart flytta.';
+$messages['moveerror'] = 'Kunne ikkje flytte valde filter. Det oppstod ein tenarfeil.';
+$messages['nametoolong'] = 'Namnet er for langt.';
+$messages['namereserved'] = 'Namnet er reservert.';
+$messages['setexist'] = 'Settet eksisterer alt.';
+$messages['nodata'] = 'Du må velje minst éin posisjon!';
+
+?>
diff --git a/plugins/managesieve/localization/pl_PL.inc b/plugins/managesieve/localization/pl_PL.inc
index c7d90a6f1..287633727 100644
--- a/plugins/managesieve/localization/pl_PL.inc
+++ b/plugins/managesieve/localization/pl_PL.inc
@@ -2,18 +2,21 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/pl_PL/labels.inc                                         |
+ | plugins/managesieve/localization/<lang>.inc                           |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Managesieve plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-managesieve/
 */
 
-$labels = array();
+
 $labels['filters'] = 'Filtry';
 $labels['managefilters'] = 'Zarządzaj filtrami wiadomości przychodzących';
 $labels['filtername'] = 'Nazwa filtru';
@@ -52,8 +55,11 @@ $labels['add'] = 'Dodaj';
 $labels['del'] = 'Usuń';
 $labels['sender'] = 'Nadawca';
 $labels['recipient'] = 'Odbiorca';
-$labels['vacationaddresses'] = 'Lista dodatkowych adresów odbiorców (oddzielonych przecinkami):';
+$labels['vacationaddr'] = 'Lista dodatkowych adresów odbiorców:';
 $labels['vacationdays'] = 'Częstotliwość wysyłania wiadomości (w dniach):';
+$labels['vacationinterval'] = 'How often send messages:';
+$labels['days'] = 'days';
+$labels['seconds'] = 'seconds';
 $labels['vacationreason'] = 'Treść (przyczyna nieobecności):';
 $labels['vacationsubject'] = 'Temat wiadomości:';
 $labels['rulestop'] = 'Przerwij przetwarzanie reguł';
@@ -92,6 +98,25 @@ $labels['flagdeleted'] = 'Usunięta';
 $labels['flaganswered'] = 'Z odpowiedzią';
 $labels['flagflagged'] = 'Oflagowana';
 $labels['flagdraft'] = 'Szkic';
+$labels['setvariable'] = 'Ustaw zmienną';
+$labels['setvarname'] = 'Nazwa zmiennej:';
+$labels['setvarvalue'] = 'Wartość zmiennej:';
+$labels['setvarmodifiers'] = 'Modyfikatory:';
+$labels['varlower'] = 'małe litery';
+$labels['varupper'] = 'wielkie litery';
+$labels['varlowerfirst'] = 'pierwsza mała litera';
+$labels['varupperfirst'] = 'pierwsza wielka litera';
+$labels['varquotewildcard'] = 'zamień znaki specjalne';
+$labels['varlength'] = 'długość';
+$labels['notify'] = 'Wyślij powiadomienie';
+$labels['notifyaddress'] = 'Na adres e-mail:';
+$labels['notifybody'] = 'Treść powiadomienia:';
+$labels['notifysubject'] = 'Tytuł powiadomienia:';
+$labels['notifyfrom'] = 'Nadawca powiadomienia:';
+$labels['notifyimportance'] = 'Priorytet:';
+$labels['notifyimportancelow'] = 'niski';
+$labels['notifyimportancenormal'] = 'ormalny';
+$labels['notifyimportancehigh'] = 'wysoki';
 $labels['filtercreate'] = 'Utwórz filtr';
 $labels['usedata'] = 'Użyj następujących danych do utworzenia filtra:';
 $labels['nextstep'] = 'Następny krok';
@@ -115,35 +140,38 @@ $labels['default'] = 'domyślny';
 $labels['octet'] = 'dokładny (octet)';
 $labels['asciicasemap'] = 'nierozróżniający wielkości liter (ascii-casemap)';
 $labels['asciinumeric'] = 'numeryczny (ascii-numeric)';
-$labels['filterunknownerror'] = 'Nieznany błąd serwera.';
-$labels['filterconnerror'] = 'Nie można nawiązać połączenia z serwerem.';
-$labels['filterdeleteerror'] = 'Nie można usunąć filtra. Błąd serwera.';
-$labels['filterdeleted'] = 'Filtr został usunięty pomyślnie.';
-$labels['filtersaved'] = 'Filtr został zapisany pomyślnie.';
-$labels['filtersaveerror'] = 'Nie można zapisać filtra. Wystąpił błąd serwera.';
-$labels['filterdeleteconfirm'] = 'Czy na pewno chcesz usunąć wybrany filtr?';
-$labels['ruledeleteconfirm'] = 'Czy na pewno chcesz usunąć wybraną regułę?';
-$labels['actiondeleteconfirm'] = 'Czy na pewno usunąć wybraną akcję?';
-$labels['forbiddenchars'] = 'Pole zawiera niedozwolone znaki.';
-$labels['cannotbeempty'] = 'Pole nie może być puste.';
-$labels['ruleexist'] = 'Filtr o podanej nazwie już istnieje.';
-$labels['setactivateerror'] = 'Nie można aktywować wybranego zbioru filtrów. Błąd serwera.';
-$labels['setdeactivateerror'] = 'Nie można deaktywować wybranego zbioru filtrów. Błąd serwera.';
-$labels['setdeleteerror'] = 'Nie można usunąć wybranego zbioru filtrów. Błąd serwera.';
-$labels['setactivated'] = 'Zbiór filtrów został aktywowany pomyślnie.';
-$labels['setdeactivated'] = 'Zbiór filtrów został deaktywowany pomyślnie.';
-$labels['setdeleted'] = 'Zbiór filtrów został usunięty pomyślnie.';
-$labels['setdeleteconfirm'] = 'Czy na pewno chcesz usunąć wybrany zbiór filtrów?';
-$labels['setcreateerror'] = 'Nie można utworzyć zbioru filtrów. Błąd serwera.';
-$labels['setcreated'] = 'Zbiór filtrów został utworzony pomyślnie.';
-$labels['activateerror'] = 'Nie można włączyć wybranych filtrów. Błąd serwera.';
-$labels['deactivateerror'] = 'Nie można wyłączyć wybranych filtrów. Błąd serwera.';
-$labels['activated'] = 'Filtr(y) wyłączono pomyślnie.';
-$labels['deactivated'] = 'Filtr(y) włączono pomyślnie.';
-$labels['moved'] = 'Filter został przeniesiony pomyślnie.';
-$labels['moveerror'] = 'Nie można przenieść wybranego filtra. Błąd serwera.';
-$labels['nametoolong'] = 'Zbyt długa nazwa.';
-$labels['namereserved'] = 'Nazwa zarezerwowana.';
-$labels['setexist'] = 'Zbiór już istnieje.';
-$labels['nodata'] = 'Należy wybrać co najmniej jedną pozycję!';
 
+$messages = array();
+$messages['filterunknownerror'] = 'Nieznany błąd serwera.';
+$messages['filterconnerror'] = 'Nie można nawiązać połączenia z serwerem.';
+$messages['filterdeleteerror'] = 'Nie można usunąć filtra. Błąd serwera.';
+$messages['filterdeleted'] = 'Filtr został usunięty pomyślnie.';
+$messages['filtersaved'] = 'Filtr został zapisany pomyślnie.';
+$messages['filtersaveerror'] = 'Nie można zapisać filtra. Wystąpił błąd serwera.';
+$messages['filterdeleteconfirm'] = 'Czy na pewno chcesz usunąć wybrany filtr?';
+$messages['ruledeleteconfirm'] = 'Czy na pewno chcesz usunąć wybraną regułę?';
+$messages['actiondeleteconfirm'] = 'Czy na pewno usunąć wybraną akcję?';
+$messages['forbiddenchars'] = 'Pole zawiera niedozwolone znaki.';
+$messages['cannotbeempty'] = 'Pole nie może być puste.';
+$messages['ruleexist'] = 'Filtr o podanej nazwie już istnieje.';
+$messages['setactivateerror'] = 'Nie można aktywować wybranego zbioru filtrów. Błąd serwera.';
+$messages['setdeactivateerror'] = 'Nie można deaktywować wybranego zbioru filtrów. Błąd serwera.';
+$messages['setdeleteerror'] = 'Nie można usunąć wybranego zbioru filtrów. Błąd serwera.';
+$messages['setactivated'] = 'Zbiór filtrów został aktywowany pomyślnie.';
+$messages['setdeactivated'] = 'Zbiór filtrów został deaktywowany pomyślnie.';
+$messages['setdeleted'] = 'Zbiór filtrów został usunięty pomyślnie.';
+$messages['setdeleteconfirm'] = 'Czy na pewno chcesz usunąć wybrany zbiór filtrów?';
+$messages['setcreateerror'] = 'Nie można utworzyć zbioru filtrów. Błąd serwera.';
+$messages['setcreated'] = 'Zbiór filtrów został utworzony pomyślnie.';
+$messages['activateerror'] = 'Nie można włączyć wybranych filtrów. Błąd serwera.';
+$messages['deactivateerror'] = 'Nie można wyłączyć wybranych filtrów. Błąd serwera.';
+$messages['deactivated'] = 'Filtr(y) włączono pomyślnie.';
+$messages['activated'] = 'Filtr(y) wyłączono pomyślnie.';
+$messages['moved'] = 'Filter został przeniesiony pomyślnie.';
+$messages['moveerror'] = 'Nie można przenieść wybranego filtra. Błąd serwera.';
+$messages['nametoolong'] = 'Zbyt długa nazwa.';
+$messages['namereserved'] = 'Nazwa zarezerwowana.';
+$messages['setexist'] = 'Zbiór już istnieje.';
+$messages['nodata'] = 'Należy wybrać co najmniej jedną pozycję!';
+
+?>
diff --git a/plugins/managesieve/localization/pt_BR.inc b/plugins/managesieve/localization/pt_BR.inc
index 59058f25a..92c1e6ae6 100644
--- a/plugins/managesieve/localization/pt_BR.inc
+++ b/plugins/managesieve/localization/pt_BR.inc
@@ -2,18 +2,21 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/pt_BR/labels.inc                                         |
+ | plugins/managesieve/localization/<lang>.inc                           |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Managesieve plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-managesieve/
 */
 
-$labels = array();
+
 $labels['filters'] = 'Filtros';
 $labels['managefilters'] = 'Gerenciar filtros de entrada de e-mail';
 $labels['filtername'] = 'Nome do filtro';
@@ -52,8 +55,11 @@ $labels['add'] = 'Adicionar';
 $labels['del'] = 'Excluir';
 $labels['sender'] = 'Remetente';
 $labels['recipient'] = 'Destinatário';
-$labels['vacationaddresses'] = 'Lista adicional de e-mails destinatários (separado por vírgula):';
+$labels['vacationaddr'] = 'Lista adicional de e-mails destinatários:';
 $labels['vacationdays'] = 'Enviar mensagens com que frequência (em dias):';
+$labels['vacationinterval'] = 'How often send messages:';
+$labels['days'] = 'days';
+$labels['seconds'] = 'seconds';
 $labels['vacationreason'] = 'Corpo da mensagem (motivo de férias):';
 $labels['vacationsubject'] = 'Título da mensagem:';
 $labels['rulestop'] = 'Parar de avaliar regras';
@@ -92,6 +98,25 @@ $labels['flagdeleted'] = 'Excluída';
 $labels['flaganswered'] = 'Respondida';
 $labels['flagflagged'] = 'Marcada';
 $labels['flagdraft'] = 'Rascunho';
+$labels['setvariable'] = 'Definir variável';
+$labels['setvarname'] = 'Nome da variável:';
+$labels['setvarvalue'] = 'Valor da variável:';
+$labels['setvarmodifiers'] = 'Modificadores:';
+$labels['varlower'] = 'minúsculas';
+$labels['varupper'] = 'maiúsculas';
+$labels['varlowerfirst'] = 'primeiro caractere minúsculo';
+$labels['varupperfirst'] = 'primeiro caractere maiúsculo';
+$labels['varquotewildcard'] = 'caracteres especiais de citação';
+$labels['varlength'] = 'tamanho';
+$labels['notify'] = 'Enviar notificação';
+$labels['notifyaddress'] = 'Para endereço de e-mail:';
+$labels['notifybody'] = 'Corpo da notificação:';
+$labels['notifysubject'] = 'Título da notificação:';
+$labels['notifyfrom'] = 'Remetente da notificação:';
+$labels['notifyimportance'] = 'Importância';
+$labels['notifyimportancelow'] = 'baixa';
+$labels['notifyimportancenormal'] = 'normal';
+$labels['notifyimportancehigh'] = 'alta';
 $labels['filtercreate'] = 'Criar filtro';
 $labels['usedata'] = 'Usar os seguintes dados no filtro:';
 $labels['nextstep'] = 'Próximo Passo';
@@ -115,35 +140,38 @@ $labels['default'] = 'padrão';
 $labels['octet'] = 'estrito (octeto)';
 $labels['asciicasemap'] = 'caso insensível (mapa de caracteres ascii)';
 $labels['asciinumeric'] = 'numérico (ascii-numeric)';
-$labels['filterunknownerror'] = 'Erro desconhecido de servidor';
-$labels['filterconnerror'] = 'Não foi possível conectar ao servidor managesieve';
-$labels['filterdeleteerror'] = 'Não foi possível excluir filtro. Occorreu um erro de servidor';
-$labels['filterdeleted'] = 'Filtro excluído com sucesso';
-$labels['filtersaved'] = 'Filtro gravado com sucesso';
-$labels['filtersaveerror'] = 'Não foi possível gravar filtro. Occoreu um erro de servidor.';
-$labels['filterdeleteconfirm'] = 'Deseja realmente excluir o filtro selecionado?';
-$labels['ruledeleteconfirm'] = 'Deseja realmente excluir a regra selecionada?';
-$labels['actiondeleteconfirm'] = 'Deseja realmente excluir a ação selecionada?';
-$labels['forbiddenchars'] = 'Caracteres não permitidos no campo';
-$labels['cannotbeempty'] = 'Campo não pode ficar em branco';
-$labels['ruleexist'] = 'O filtro com o nome especificado já existe.';
-$labels['setactivateerror'] = 'Não foi possível ativar o conjunto de filtros selecionados. Ocorreu um erro no servidor.';
-$labels['setdeactivateerror'] = 'Não foi possível desativar o conjunto de filtros selecionados. Ocorreu um erro no servidor.';
-$labels['setdeleteerror'] = 'Não foi possível excluir o conjunto de filtros selecionados. Ocorreu um erro no servidor.';
-$labels['setactivated'] = 'Conjunto de filtros ativados com sucesso.';
-$labels['setdeactivated'] = 'Conjunto de filtros desativados com sucesso.';
-$labels['setdeleted'] = 'Conjunto de filtros excluídos com sucesso.';
-$labels['setdeleteconfirm'] = 'Você está certo que deseja excluir o conjunto de filtros selecionados?';
-$labels['setcreateerror'] = 'Não foi possível criar o conjunto de filtros. Ocorreu um erro no servidor.';
-$labels['setcreated'] = 'Conjunto de filtros criado com sucesso.';
-$labels['activateerror'] = 'Não foi possível habilitar o(s) filtro(s) selecionado(s). Ocorreu um erro no servidor.';
-$labels['deactivateerror'] = 'Não foi possível desabilitar o(s) filtro(s) selecionado(s). Ocorreu um erro no servidor.';
-$labels['activated'] = 'Filtro(s) desabilitado(s) com sucesso.';
-$labels['deactivated'] = 'Filtro(s) habilitado(s) com sucesso.';
-$labels['moved'] = 'Filtro movido com sucesso.';
-$labels['moveerror'] = 'Não foi possível mover o filtro selecionado. Ocorreu um erro no servidor.';
-$labels['nametoolong'] = 'Nome muito longo.';
-$labels['namereserved'] = 'Nome reservado.';
-$labels['setexist'] = 'Conjunto já existe.';
-$labels['nodata'] = 'Pelo menos uma posição precisa ser selecionada!';
 
+$messages = array();
+$messages['filterunknownerror'] = 'Erro desconhecido de servidor';
+$messages['filterconnerror'] = 'Não foi possível conectar ao servidor managesieve';
+$messages['filterdeleteerror'] = 'Não foi possível excluir filtro. Occorreu um erro de servidor';
+$messages['filterdeleted'] = 'Filtro excluído com sucesso';
+$messages['filtersaved'] = 'Filtro gravado com sucesso';
+$messages['filtersaveerror'] = 'Não foi possível gravar filtro. Occoreu um erro de servidor.';
+$messages['filterdeleteconfirm'] = 'Deseja realmente excluir o filtro selecionado?';
+$messages['ruledeleteconfirm'] = 'Deseja realmente excluir a regra selecionada?';
+$messages['actiondeleteconfirm'] = 'Deseja realmente excluir a ação selecionada?';
+$messages['forbiddenchars'] = 'Caracteres não permitidos no campo';
+$messages['cannotbeempty'] = 'Campo não pode ficar em branco';
+$messages['ruleexist'] = 'O filtro com o nome especificado já existe.';
+$messages['setactivateerror'] = 'Não foi possível ativar o conjunto de filtros selecionados. Ocorreu um erro no servidor.';
+$messages['setdeactivateerror'] = 'Não foi possível desativar o conjunto de filtros selecionados. Ocorreu um erro no servidor.';
+$messages['setdeleteerror'] = 'Não foi possível excluir o conjunto de filtros selecionados. Ocorreu um erro no servidor.';
+$messages['setactivated'] = 'Conjunto de filtros ativados com sucesso.';
+$messages['setdeactivated'] = 'Conjunto de filtros desativados com sucesso.';
+$messages['setdeleted'] = 'Conjunto de filtros excluídos com sucesso.';
+$messages['setdeleteconfirm'] = 'Você está certo que deseja excluir o conjunto de filtros selecionados?';
+$messages['setcreateerror'] = 'Não foi possível criar o conjunto de filtros. Ocorreu um erro no servidor.';
+$messages['setcreated'] = 'Conjunto de filtros criado com sucesso.';
+$messages['activateerror'] = 'Não foi possível habilitar o(s) filtro(s) selecionado(s). Ocorreu um erro no servidor.';
+$messages['deactivateerror'] = 'Não foi possível desabilitar o(s) filtro(s) selecionado(s). Ocorreu um erro no servidor.';
+$messages['deactivated'] = 'Filtro(s) habilitado(s) com sucesso.';
+$messages['activated'] = 'Filtro(s) desabilitado(s) com sucesso.';
+$messages['moved'] = 'Filtro movido com sucesso.';
+$messages['moveerror'] = 'Não foi possível mover o filtro selecionado. Ocorreu um erro no servidor.';
+$messages['nametoolong'] = 'Nome muito longo.';
+$messages['namereserved'] = 'Nome reservado.';
+$messages['setexist'] = 'Conjunto já existe.';
+$messages['nodata'] = 'Pelo menos uma posição precisa ser selecionada!';
+
+?>
diff --git a/plugins/managesieve/localization/pt_PT.inc b/plugins/managesieve/localization/pt_PT.inc
index 038c887dc..f51e8bf5e 100644
--- a/plugins/managesieve/localization/pt_PT.inc
+++ b/plugins/managesieve/localization/pt_PT.inc
@@ -2,18 +2,21 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/pt_PT/labels.inc                                         |
+ | plugins/managesieve/localization/<lang>.inc                           |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Managesieve plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-managesieve/
 */
 
-$labels = array();
+
 $labels['filters'] = 'Filtros';
 $labels['managefilters'] = 'Gerir filtros';
 $labels['filtername'] = 'Nome do filtro';
@@ -52,8 +55,11 @@ $labels['add'] = 'Adicionar';
 $labels['del'] = 'Eliminar';
 $labels['sender'] = 'Remetente';
 $labels['recipient'] = 'Destinatário';
-$labels['vacationaddresses'] = 'Lista adicional de destinatários de e-mails (separados por vírgula):';
+$labels['vacationaddr'] = 'Lista adicional de destinatários de e-mails:';
 $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';
@@ -92,6 +98,25 @@ $labels['flagdeleted'] = 'Eliminada';
 $labels['flaganswered'] = 'Respondida';
 $labels['flagflagged'] = 'Marcada';
 $labels['flagdraft'] = 'Rascunho';
+$labels['setvariable'] = 'Definir variável';
+$labels['setvarname'] = 'Nome da Variável:';
+$labels['setvarvalue'] = 'Valor da Variável:';
+$labels['setvarmodifiers'] = 'Modificadores:';
+$labels['varlower'] = 'minúscula';
+$labels['varupper'] = 'maiúscula';
+$labels['varlowerfirst'] = 'primeira letra em minúscula';
+$labels['varupperfirst'] = 'primeira letra em maiúscula';
+$labels['varquotewildcard'] = 'citar caracteres especiais';
+$labels['varlength'] = 'tamanho';
+$labels['notify'] = 'Enviar notificação';
+$labels['notifyaddress'] = 'Endereço de E-mail to:';
+$labels['notifybody'] = 'Corpo de Notificação:';
+$labels['notifysubject'] = 'Assunto Notificação:';
+$labels['notifyfrom'] = 'Remetente Notificação:';
+$labels['notifyimportance'] = 'Importância:';
+$labels['notifyimportancelow'] = 'baixa';
+$labels['notifyimportancenormal'] = 'normal';
+$labels['notifyimportancehigh'] = 'alta';
 $labels['filtercreate'] = 'Criar filtro';
 $labels['usedata'] = 'Usar os seguintes dados no filtro:';
 $labels['nextstep'] = 'Próximo passo';
@@ -115,35 +140,38 @@ $labels['default'] = 'predefinido';
 $labels['octet'] = 'estrito (octeto)';
 $labels['asciicasemap'] = 'não sensível a maiúsculas/minúsculas (caracteres ascii)';
 $labels['asciinumeric'] = 'numérico (numérico ascii)';
-$labels['filterunknownerror'] = 'Erro de servidor desconhecido';
-$labels['filterconnerror'] = 'Não é possível ligar ao servidor Sieve';
-$labels['filterdeleteerror'] = 'Não foi possível eliminar o filtro. Erro no servidor';
-$labels['filterdeleted'] = 'Filtro eliminado com sucesso';
-$labels['filtersaved'] = 'Filtro guardado com sucesso';
-$labels['filtersaveerror'] = 'Não foi possível guardar o filtro. Erro no servidor';
-$labels['filterdeleteconfirm'] = 'Tem a certeza que pretende eliminar este filtro?';
-$labels['ruledeleteconfirm'] = 'Tem a certeza que pretende eliminar esta regra?';
-$labels['actiondeleteconfirm'] = 'Tem a certeza que pretende eliminar esta acção?';
-$labels['forbiddenchars'] = 'Caracteres inválidos no campo.';
-$labels['cannotbeempty'] = 'Este campo não pode estar vazio.';
-$labels['ruleexist'] = 'Já existe um Filtro com o nome especificado.';
-$labels['setactivateerror'] = 'Não foi possível ativar os filtros selecionados.  Ocorreu um erro no servidor.';
-$labels['setdeactivateerror'] = 'Não foi possível desativar os filtros selecionados.  Ocorreu um erro no servidor.';
-$labels['setdeleteerror'] = 'Não foi possível eliminar os filtros selecionados.  Ocorreu um erro no servidor.';
-$labels['setactivated'] = 'Filtros ativados com sucesso.';
-$labels['setdeactivated'] = 'Filtros desativados com sucesso.';
-$labels['setdeleted'] = 'Filtros eliminados com sucesso.';
-$labels['setdeleteconfirm'] = 'Tem a certeza que pretende eliminar os filtros selecionados?';
-$labels['setcreateerror'] = 'Não foi possível criar o conjunto de filtros. Ocorreu um erro no servidor.';
-$labels['setcreated'] = 'Conjunto de filtros criado com sucesso.';
-$labels['activateerror'] = 'Não foi possível ativar os filtros selecionados. Ocorreu um erro no servidor.';
-$labels['deactivateerror'] = 'Não foi possível desativar os filtros selecionados. Ocorreu um erro no servidor.';
-$labels['activated'] = 'Filtro(s) desativado(s) com sucesso.';
-$labels['deactivated'] = 'Filtro(s) ativado(s) com sucesso.';
-$labels['moved'] = 'Filtro movido com sucesso.';
-$labels['moveerror'] = 'Não foi possível mover o filtro selecionado. Ocorreu um erro no servidor.';
-$labels['nametoolong'] = 'Nome demasiado longo.';
-$labels['namereserved'] = 'Nome invertido.';
-$labels['setexist'] = 'O conjunto já existe.';
-$labels['nodata'] = 'Deve selecionar pelo menos uma posição.';
 
+$messages = array();
+$messages['filterunknownerror'] = 'Erro de servidor desconhecido';
+$messages['filterconnerror'] = 'Não é possível ligar ao servidor Sieve';
+$messages['filterdeleteerror'] = 'Não foi possível eliminar o filtro. Erro no servidor';
+$messages['filterdeleted'] = 'Filtro eliminado com sucesso';
+$messages['filtersaved'] = 'Filtro guardado com sucesso';
+$messages['filtersaveerror'] = 'Não foi possível guardar o filtro. Erro no servidor';
+$messages['filterdeleteconfirm'] = 'Tem a certeza que pretende eliminar este filtro?';
+$messages['ruledeleteconfirm'] = 'Tem a certeza que pretende eliminar esta regra?';
+$messages['actiondeleteconfirm'] = 'Tem a certeza que pretende eliminar esta acção?';
+$messages['forbiddenchars'] = 'Caracteres inválidos no campo.';
+$messages['cannotbeempty'] = 'Este campo não pode estar vazio.';
+$messages['ruleexist'] = 'Já existe um Filtro com o nome especificado.';
+$messages['setactivateerror'] = 'Não foi possível ativar os filtros selecionados.  Ocorreu um erro no servidor.';
+$messages['setdeactivateerror'] = 'Não foi possível desativar os filtros selecionados.  Ocorreu um erro no servidor.';
+$messages['setdeleteerror'] = 'Não foi possível eliminar os filtros selecionados.  Ocorreu um erro no servidor.';
+$messages['setactivated'] = 'Filtros ativados com sucesso.';
+$messages['setdeactivated'] = 'Filtros desativados com sucesso.';
+$messages['setdeleted'] = 'Filtros eliminados com sucesso.';
+$messages['setdeleteconfirm'] = 'Tem a certeza que pretende eliminar os filtros selecionados?';
+$messages['setcreateerror'] = 'Não foi possível criar o conjunto de filtros. Ocorreu um erro no servidor.';
+$messages['setcreated'] = 'Conjunto de filtros criado com sucesso.';
+$messages['activateerror'] = 'Não foi possível ativar os filtros selecionados. Ocorreu um erro no servidor.';
+$messages['deactivateerror'] = 'Não foi possível desativar os filtros selecionados. Ocorreu um erro no servidor.';
+$messages['deactivated'] = 'Filtro(s) ativado(s) com sucesso.';
+$messages['activated'] = 'Filtro(s) desativado(s) com sucesso.';
+$messages['moved'] = 'Filtro movido com sucesso.';
+$messages['moveerror'] = 'Não foi possível mover o filtro selecionado. Ocorreu um erro no servidor.';
+$messages['nametoolong'] = 'Nome demasiado longo.';
+$messages['namereserved'] = 'Nome invertido.';
+$messages['setexist'] = 'O conjunto já existe.';
+$messages['nodata'] = 'Deve selecionar pelo menos uma posição.';
+
+?>
diff --git a/plugins/managesieve/localization/ro_RO.inc b/plugins/managesieve/localization/ro_RO.inc
index 5b8baeaf4..8d6e9c96f 100644
--- a/plugins/managesieve/localization/ro_RO.inc
+++ b/plugins/managesieve/localization/ro_RO.inc
@@ -2,18 +2,21 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ro_RO/labels.inc                                         |
+ | plugins/managesieve/localization/<lang>.inc                           |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Managesieve plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: tudor <tudor@starnet-alba.ro>                                 |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-managesieve/
 */
 
-$labels = array();
+
 $labels['filters'] = 'Filtre';
 $labels['managefilters'] = 'Administrează filtrele pentru mesaje primite.';
 $labels['filtername'] = 'Nume filtru';
@@ -52,7 +55,11 @@ $labels['add'] = 'Adaugă';
 $labels['del'] = 'Șterge';
 $labels['sender'] = 'Expeditor';
 $labels['recipient'] = 'Destinatar';
+$labels['vacationaddr'] = 'Adresele mele de e-mail adiționale:';
 $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';
@@ -91,6 +98,25 @@ $labels['flagdeleted'] = 'Șters';
 $labels['flaganswered'] = 'Răspuns';
 $labels['flagflagged'] = 'Marcat';
 $labels['flagdraft'] = 'Schiță';
+$labels['setvariable'] = 'Setare variabilă';
+$labels['setvarname'] = 'Nume variabilă:';
+$labels['setvarvalue'] = 'Valoare variabilă:';
+$labels['setvarmodifiers'] = 'Modificatori:';
+$labels['varlower'] = 'cu litere mici';
+$labels['varupper'] = 'cu litere mari';
+$labels['varlowerfirst'] = 'primul caracter cu litre mici';
+$labels['varupperfirst'] = 'primul caracter cu litre mari';
+$labels['varquotewildcard'] = 'caracterele speciale în citat';
+$labels['varlength'] = 'lungime';
+$labels['notify'] = 'Notificare trimitere';
+$labels['notifyaddress'] = 'La adresa de e-mail';
+$labels['notifybody'] = 'Mesajul de notificare:';
+$labels['notifysubject'] = 'Subiectul notificării:';
+$labels['notifyfrom'] = 'Expeditorul notificării:';
+$labels['notifyimportance'] = 'Importanța:';
+$labels['notifyimportancelow'] = 'mică';
+$labels['notifyimportancenormal'] = 'normală';
+$labels['notifyimportancehigh'] = 'mare';
 $labels['filtercreate'] = 'Crează filtru';
 $labels['usedata'] = 'Foloseşte următoarele date în filtru:';
 $labels['nextstep'] = 'Următorul Pas';
@@ -114,35 +140,38 @@ $labels['default'] = 'implicit';
 $labels['octet'] = 'strict (octet)';
 $labels['asciicasemap'] = 'ignoră majusculele (ascii-casemap)';
 $labels['asciinumeric'] = 'numeric (ascii-numeric)';
-$labels['filterunknownerror'] = 'Eroare necunoscută la server:';
-$labels['filterconnerror'] = 'Nu mă pot conecta la server.';
-$labels['filterdeleteerror'] = 'Nu pot şterge filtrul. S-a produs o eroare la server.';
-$labels['filterdeleted'] = 'Filtrul a fost şters cu succes.';
-$labels['filtersaved'] = 'Filtrul a fost salvat cu succes.';
-$labels['filtersaveerror'] = 'Nu am putut salva filtrul. S-a produs o eroare la server.';
-$labels['filterdeleteconfirm'] = 'Chiar vrei să ştergi filtrul selectat?';
-$labels['ruledeleteconfirm'] = 'Eşti sigur că vrei să ştergi regula selectată?';
-$labels['actiondeleteconfirm'] = 'Eşti sigur că vrei să ştergi acţiunea selectată?';
-$labels['forbiddenchars'] = 'Caractere nepermise în câmp.';
-$labels['cannotbeempty'] = 'Câmpul nu poate fi gol.';
-$labels['ruleexist'] = 'Filtrul cu numele specificat există deja.';
-$labels['setactivateerror'] = 'Nu pot activa setul de filtre selectat. S-a produs o eroare la server.';
-$labels['setdeactivateerror'] = 'Nu pot dezactiva setul de filtre selectat. S-a produs o eroare la server.';
-$labels['setdeleteerror'] = 'Nu pot şterge setul de filtre selectat. S-a produs o eroare la server.';
-$labels['setactivated'] = 'Setul de filtre activat cu succes.';
-$labels['setdeactivated'] = 'Setul de filtre dezactivat cu succes.';
-$labels['setdeleted'] = 'Setul de filtre şters cu succes.';
-$labels['setdeleteconfirm'] = 'Eşti sigur(ă) că vrei să ştergi setul de filtre selectat?';
-$labels['setcreateerror'] = 'Nu am putut crea setul de filtre. S-a produs o eroare la server.';
-$labels['setcreated'] = 'Setul de filtre creat cu succes.';
-$labels['activateerror'] = 'Nu am putut activa filtrele selectate. S-a produs o eroare la server.';
-$labels['deactivateerror'] = 'Nu am putut dezactiva filtrele selectate. S-a produs o eroare la server.';
-$labels['activated'] = 'Filtrele au fost dezactivate cu succes.';
-$labels['deactivated'] = 'Filtrele au fost activate cu succes.';
-$labels['moved'] = 'Filtrele au fost mutate cu succes.';
-$labels['moveerror'] = 'Nu am putut muta filtreele selectate. S-a produs o eroare la server.';
-$labels['nametoolong'] = 'Numele este prea lung.';
-$labels['namereserved'] = 'Nume rezervat.';
-$labels['setexist'] = 'Setul există deja.';
-$labels['nodata'] = 'Trebuie selectată cel putin o poziţie!';
 
+$messages = array();
+$messages['filterunknownerror'] = 'Eroare necunoscută la server:';
+$messages['filterconnerror'] = 'Nu mă pot conecta la server.';
+$messages['filterdeleteerror'] = 'Nu pot şterge filtrul. S-a produs o eroare la server.';
+$messages['filterdeleted'] = 'Filtrul a fost şters cu succes.';
+$messages['filtersaved'] = 'Filtrul a fost salvat cu succes.';
+$messages['filtersaveerror'] = 'Nu am putut salva filtrul. S-a produs o eroare la server.';
+$messages['filterdeleteconfirm'] = 'Chiar vrei să ştergi filtrul selectat?';
+$messages['ruledeleteconfirm'] = 'Eşti sigur că vrei să ştergi regula selectată?';
+$messages['actiondeleteconfirm'] = 'Eşti sigur că vrei să ştergi acţiunea selectată?';
+$messages['forbiddenchars'] = 'Caractere nepermise în câmp.';
+$messages['cannotbeempty'] = 'Câmpul nu poate fi gol.';
+$messages['ruleexist'] = 'Filtrul cu numele specificat există deja.';
+$messages['setactivateerror'] = 'Nu pot activa setul de filtre selectat. S-a produs o eroare la server.';
+$messages['setdeactivateerror'] = 'Nu pot dezactiva setul de filtre selectat. S-a produs o eroare la server.';
+$messages['setdeleteerror'] = 'Nu pot şterge setul de filtre selectat. S-a produs o eroare la server.';
+$messages['setactivated'] = 'Setul de filtre activat cu succes.';
+$messages['setdeactivated'] = 'Setul de filtre dezactivat cu succes.';
+$messages['setdeleted'] = 'Setul de filtre şters cu succes.';
+$messages['setdeleteconfirm'] = 'Eşti sigur(ă) că vrei să ştergi setul de filtre selectat?';
+$messages['setcreateerror'] = 'Nu am putut crea setul de filtre. S-a produs o eroare la server.';
+$messages['setcreated'] = 'Setul de filtre creat cu succes.';
+$messages['activateerror'] = 'Nu am putut activa filtrele selectate. S-a produs o eroare la server.';
+$messages['deactivateerror'] = 'Nu am putut dezactiva filtrele selectate. S-a produs o eroare la server.';
+$messages['deactivated'] = 'Filtrele au fost activate cu succes.';
+$messages['activated'] = 'Filtrele au fost dezactivate cu succes.';
+$messages['moved'] = 'Filtrele au fost mutate cu succes.';
+$messages['moveerror'] = 'Nu am putut muta filtreele selectate. S-a produs o eroare la server.';
+$messages['nametoolong'] = 'Numele este prea lung.';
+$messages['namereserved'] = 'Nume rezervat.';
+$messages['setexist'] = 'Setul există deja.';
+$messages['nodata'] = 'Trebuie selectată cel putin o poziţie!';
+
+?>
diff --git a/plugins/managesieve/localization/ru_RU.inc b/plugins/managesieve/localization/ru_RU.inc
index cfc2ac1e4..6aab60da6 100644
--- a/plugins/managesieve/localization/ru_RU.inc
+++ b/plugins/managesieve/localization/ru_RU.inc
@@ -2,18 +2,21 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ru_RU/labels.inc                                         |
+ | plugins/managesieve/localization/<lang>.inc                           |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Managesieve plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Vyacheslav Sharmanov                                          |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-managesieve/
 */
 
-$labels = array();
+
 $labels['filters'] = 'Фильтры';
 $labels['managefilters'] = 'Управление фильтрами для входящей почты';
 $labels['filtername'] = 'Название фильтра';
@@ -52,8 +55,11 @@ $labels['add'] = 'Добавить';
 $labels['del'] = 'Удалить';
 $labels['sender'] = 'Отправитель';
 $labels['recipient'] = 'Получатель';
-$labels['vacationaddresses'] = 'Список моих дополнительных адресов (разделённых запятыми):';
+$labels['vacationaddr'] = 'Список моих дополнительных адресов:';
 $labels['vacationdays'] = 'Как часто отправлять сообщения (в днях):';
+$labels['vacationinterval'] = 'How often send messages:';
+$labels['days'] = 'days';
+$labels['seconds'] = 'seconds';
 $labels['vacationreason'] = 'Текст сообщения (причина отсутствия):';
 $labels['vacationsubject'] = 'Тема сообщения:';
 $labels['rulestop'] = 'Закончить выполнение';
@@ -92,6 +98,25 @@ $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'] = 'На адрес электронной почты:';
+$labels['notifybody'] = 'Текст уведомления:';
+$labels['notifysubject'] = 'Тема уведомления:';
+$labels['notifyfrom'] = 'Отправитель уведомления:';
+$labels['notifyimportance'] = 'Важность:';
+$labels['notifyimportancelow'] = 'низкая';
+$labels['notifyimportancenormal'] = 'нормальная';
+$labels['notifyimportancehigh'] = 'высокая';
 $labels['filtercreate'] = 'Создать фильтр';
 $labels['usedata'] = 'Использовать следующие данные в фильтре:';
 $labels['nextstep'] = 'Далее';
@@ -115,35 +140,38 @@ $labels['default'] = 'по умолчанию';
 $labels['octet'] = 'Строгий (octet)';
 $labels['asciicasemap'] = 'Регистронезависимый (ascii-casemap)';
 $labels['asciinumeric'] = 'Числовой (ascii-numeric)';
-$labels['filterunknownerror'] = 'Неизвестная ошибка сервера';
-$labels['filterconnerror'] = 'Невозможно подсоединится к серверу фильтров';
-$labels['filterdeleteerror'] = 'Невозможно удалить фильтр. Ошибка сервера.';
-$labels['filterdeleted'] = 'Фильтр успешно удалён.';
-$labels['filtersaved'] = 'Фильтр успешно сохранён.';
-$labels['filtersaveerror'] = 'Невозможно сохранить фильтр. Ошибка сервера.';
-$labels['filterdeleteconfirm'] = 'Вы действительно хотите удалить фильтр?';
-$labels['ruledeleteconfirm'] = 'Вы уверенны, что хотите удалить это правило?';
-$labels['actiondeleteconfirm'] = 'Вы уверенны, что хотите удалить это действие?';
-$labels['forbiddenchars'] = 'Недопустимые символы в поле.';
-$labels['cannotbeempty'] = 'Поле не может быть пустым.';
-$labels['ruleexist'] = 'Фильтр с таким именем уже существует.';
-$labels['setactivateerror'] = 'Невозможно включить выбранный набор фильтров. Ошибка сервера.';
-$labels['setdeactivateerror'] = 'Невозможно отключить выбранный набор фильтров. Ошибка сервера.';
-$labels['setdeleteerror'] = 'Невозможно удалить выбранный набор фильтров. Ошибка сервера.';
-$labels['setactivated'] = 'Набор фильтров успешно включён.';
-$labels['setdeactivated'] = 'Набор фильтров успешно отключён.';
-$labels['setdeleted'] = 'Набор фильтров успешно удалён.';
-$labels['setdeleteconfirm'] = 'Вы уверены в том, что хотите удалить выбранный набор фильтров?';
-$labels['setcreateerror'] = 'Невозможно создать набор фильтров. Ошибка сервера.';
-$labels['setcreated'] = 'Набор фильтров успешно создан.';
-$labels['activateerror'] = 'Невозможно включить выбранный(е) фильтр(ы). Ошибка сервера.';
-$labels['deactivateerror'] = 'Невозможно выключить выбранный(е) фильтр(ы). Ошибка сервера.';
-$labels['activated'] = 'Фильтр(ы) успешно отключен(ы).';
-$labels['deactivated'] = 'Фильтр(ы) успешно включен(ы).';
-$labels['moved'] = 'Фильтр успешно перемещён.';
-$labels['moveerror'] = 'Невозможно переместить фильтр. Ошибка сервера.';
-$labels['nametoolong'] = 'Невозможно создать набор фильтров. Название слишком длинное.';
-$labels['namereserved'] = 'Зарезервированное имя.';
-$labels['setexist'] = 'Набор уже существует.';
-$labels['nodata'] = 'Нужно выбрать хотя бы одну позицию!';
 
+$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['nametoolong'] = 'Невозможно создать набор фильтров. Название слишком длинное.';
+$messages['namereserved'] = 'Зарезервированное имя.';
+$messages['setexist'] = 'Набор уже существует.';
+$messages['nodata'] = 'Нужно выбрать хотя бы одну позицию!';
+
+?>
diff --git a/plugins/managesieve/localization/si_LK.inc b/plugins/managesieve/localization/si_LK.inc
index f0b586ff1..378fcf15d 100644
--- a/plugins/managesieve/localization/si_LK.inc
+++ b/plugins/managesieve/localization/si_LK.inc
@@ -2,41 +2,175 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/si_LK/labels.inc                                         |
+ | plugins/managesieve/localization/<lang>.inc                           |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Managesieve plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Mohamed Rizmi <Unknown>                                       |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-managesieve/
 */
 
-$labels = array();
+
 $labels['filters'] = 'පෙරහණ';
+$labels['managefilters'] = 'Manage incoming mail filters';
+$labels['filtername'] = 'Filter name';
+$labels['newfilter'] = 'New filter';
+$labels['filteradd'] = 'Add filter';
+$labels['filterdel'] = 'Delete filter';
 $labels['moveup'] = 'ඉහළට ගෙනයන්න';
 $labels['movedown'] = 'පහළට ගෙනයන්න';
+$labels['filterallof'] = 'matching all of the following rules';
+$labels['filteranyof'] = 'matching any of the following rules';
 $labels['filterany'] = 'සියලු පණිවිඩ';
 $labels['filtercontains'] = 'අඩංගු';
+$labels['filternotcontains'] = 'not contains';
+$labels['filteris'] = 'is equal to';
+$labels['filterisnot'] = 'is not equal to';
+$labels['filterexists'] = 'exists';
+$labels['filternotexists'] = 'not exists';
+$labels['filtermatches'] = 'matches expression';
+$labels['filternotmatches'] = 'not matches expression';
+$labels['filterregex'] = 'matches regular expression';
+$labels['filternotregex'] = 'not matches regular expression';
+$labels['filterunder'] = 'under';
+$labels['filterover'] = 'over';
+$labels['addrule'] = 'Add rule';
+$labels['delrule'] = 'Delete rule';
+$labels['messagemoveto'] = 'Move message to';
+$labels['messageredirect'] = 'Redirect message to';
+$labels['messagecopyto'] = 'Copy message to';
+$labels['messagesendcopy'] = 'Send message copy to';
+$labels['messagereply'] = 'Reply with message';
 $labels['messagedelete'] = 'පණිවිඩය මකන්න';
+$labels['messagediscard'] = 'Discard with message';
+$labels['messagesrules'] = 'For incoming mail:';
+$labels['messagesactions'] = '...execute the following actions:';
 $labels['add'] = 'එක් කරන්න';
 $labels['del'] = 'මකන්න';
 $labels['sender'] = 'යවන්නා';
 $labels['recipient'] = 'ලබන්නා';
+$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';
 $labels['enable'] = 'සක්‍රීය කරන්න/අක්‍රීය කරන්න';
+$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'] = 'සක්‍රීය';
 $labels['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'] = 'කියවන්න';
 $labels['flagdeleted'] = 'මකන ලදී';
+$labels['flaganswered'] = 'Answered';
+$labels['flagflagged'] = 'Flagged';
 $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['filtercreate'] = 'Create filter';
+$labels['usedata'] = 'Use following data in the filter:';
 $labels['nextstep'] = 'මීලග පියවර';
 $labels['...'] = '...';
+$labels['advancedopts'] = 'Advanced options';
+$labels['body'] = 'Body';
 $labels['address'] = 'ලිපිනය';
 $labels['envelope'] = 'ලියුම් කවරය';
+$labels['modifier'] = 'modifier:';
+$labels['text'] = 'text';
+$labels['undecoded'] = 'undecoded (raw)';
+$labels['contenttype'] = 'content type';
 $labels['modtype'] = 'වර්ගය:';
 $labels['allparts'] = 'සියල්ල';
-$labels['nametoolong'] = 'නම දිග වැඩිය.';
+$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)';
+
+$messages = array();
+$messages['filterunknownerror'] = 'Unknown server error.';
+$messages['filterconnerror'] = 'Unable to connect to server.';
+$messages['filterdeleteerror'] = 'Unable to delete filter. Server error occured.';
+$messages['filterdeleted'] = 'Filter deleted successfully.';
+$messages['filtersaved'] = 'Filter saved successfully.';
+$messages['filtersaveerror'] = 'Unable to save filter. Server error occured.';
+$messages['filterdeleteconfirm'] = 'Do you really want to delete selected filter?';
+$messages['ruledeleteconfirm'] = 'Are you sure, you want to delete selected rule?';
+$messages['actiondeleteconfirm'] = 'Are you sure, you want to delete selected action?';
+$messages['forbiddenchars'] = 'Forbidden characters in field.';
+$messages['cannotbeempty'] = 'Field cannot be empty.';
+$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'] = 'නම දිග වැඩිය.';
+$messages['namereserved'] = 'Reserved name.';
+$messages['setexist'] = 'Set already exists.';
+$messages['nodata'] = 'At least one position must be selected!';
 
+?>
diff --git a/plugins/managesieve/localization/sk_SK.inc b/plugins/managesieve/localization/sk_SK.inc
index f0dd6d729..9bfb2ef8f 100644
--- a/plugins/managesieve/localization/sk_SK.inc
+++ b/plugins/managesieve/localization/sk_SK.inc
@@ -2,18 +2,21 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/sk_SK/labels.inc                                         |
+ | plugins/managesieve/localization/<lang>.inc                           |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Managesieve plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-managesieve/
 */
 
-$labels = array();
+
 $labels['filters'] = 'Filtre';
 $labels['managefilters'] = 'Správa filtrov príchádzajúcej pošty';
 $labels['filtername'] = 'Názov filtra';
@@ -52,8 +55,11 @@ $labels['add'] = 'Pridaj';
 $labels['del'] = 'Zmaž';
 $labels['sender'] = 'Odosielateľ';
 $labels['recipient'] = 'Adresát';
-$labels['vacationaddresses'] = 'Dodatoční príjemcovia správy (oddelení čiarkami):';
+$labels['vacationaddr'] = 'Dodatoční príjemcovia správy:';
 $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';
@@ -92,6 +98,25 @@ $labels['flagdeleted'] = 'Zmazané';
 $labels['flaganswered'] = 'Odpovedané';
 $labels['flagflagged'] = 'Označené';
 $labels['flagdraft'] = 'Koncept';
+$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'] = 'Vytvoriť filter';
 $labels['usedata'] = 'Použiť tieto údaje vo filtri:';
 $labels['nextstep'] = 'Ďalší krok';
@@ -115,35 +140,38 @@ $labels['default'] = 'predvolené';
 $labels['octet'] = 'striktný (osmičkovo)';
 $labels['asciicasemap'] = 'nerozlišuje veľké a malé písmená (ascii tabuľka znakov)';
 $labels['asciinumeric'] = 'numerické (ascii čísla)';
-$labels['filterunknownerror'] = 'Neznáma chyba serveru';
-$labels['filterconnerror'] = 'Nepodarilo sa pripojiť k managesieve serveru';
-$labels['filterdeleteerror'] = 'Nepodarilo sa zmazať filter, server ohlásil chybu';
-$labels['filterdeleted'] = 'Filter bol zmazaný';
-$labels['filtersaved'] = 'Filter bol uložený';
-$labels['filtersaveerror'] = 'Nepodarilo sa uložiť filter, server ohlásil chybu';
-$labels['filterdeleteconfirm'] = 'Naozaj si prajete zmazať tento filter?';
-$labels['ruledeleteconfirm'] = 'Naozaj si prajete zamzať toto pravidlo?';
-$labels['actiondeleteconfirm'] = 'Naozaj si prajete zmazať túto akciu?';
-$labels['forbiddenchars'] = 'Pole obsahuje nepovolené znaky';
-$labels['cannotbeempty'] = 'Pole nemôže byť prázdne';
-$labels['ruleexist'] = 'Filter so zadaným menom už existuje.';
-$labels['setactivateerror'] = 'Nepodarilo sa aktivovať zvolenú sadu filtrov, server ohlásil chybu';
-$labels['setdeactivateerror'] = 'Nepodarilo sa deaktivovať zvolenú sadu filtrov, server ohlásil chybu';
-$labels['setdeleteerror'] = 'Nepodarilo sa zmazať zvolenú sadu filtrov, server ohlásil chybu';
-$labels['setactivated'] = 'Sada filtrov bola aktivovaná';
-$labels['setdeactivated'] = 'Sada filtrov bola deaktivovaná';
-$labels['setdeleted'] = 'Sada filtrov bola zmazaná';
-$labels['setdeleteconfirm'] = 'Naozaj si prajete zmazať túto sadu filtrov?';
-$labels['setcreateerror'] = 'Nepodarilo sa vytvoriť sadu filtrov, server ohlásil chybu';
-$labels['setcreated'] = 'Sada filtrov bola vytvorená';
-$labels['activateerror'] = 'Nepodarilo sa povoliť vybraný filter(e). Chyba servera.';
-$labels['deactivateerror'] = 'Nepodarilo sa vypnúť vybraný filter(e). Chyba servera.';
-$labels['activated'] = 'Filter(e) úspešne vypnutý.';
-$labels['deactivated'] = 'Filter(e) povolený.';
-$labels['moved'] = 'Filter presunutý.';
-$labels['moveerror'] = 'Nemôžem presunúť zvolený filter. Chyba servera.';
-$labels['nametoolong'] = 'Názov sady filtrov je príliš dlhý';
-$labels['namereserved'] = 'Rezervovaný názov.';
-$labels['setexist'] = 'Množina už existuje.';
-$labels['nodata'] = 'Aspoň jedna pozícia musí byť zvolená.';
 
+$messages = array();
+$messages['filterunknownerror'] = 'Neznáma chyba serveru';
+$messages['filterconnerror'] = 'Nepodarilo sa pripojiť k managesieve serveru';
+$messages['filterdeleteerror'] = 'Nepodarilo sa zmazať filter, server ohlásil chybu';
+$messages['filterdeleted'] = 'Filter bol zmazaný';
+$messages['filtersaved'] = 'Filter bol uložený';
+$messages['filtersaveerror'] = 'Nepodarilo sa uložiť filter, server ohlásil chybu';
+$messages['filterdeleteconfirm'] = 'Naozaj si prajete zmazať tento filter?';
+$messages['ruledeleteconfirm'] = 'Naozaj si prajete zamzať toto pravidlo?';
+$messages['actiondeleteconfirm'] = 'Naozaj si prajete zmazať túto akciu?';
+$messages['forbiddenchars'] = 'Pole obsahuje nepovolené znaky';
+$messages['cannotbeempty'] = 'Pole nemôže byť prázdne';
+$messages['ruleexist'] = 'Filter so zadaným menom už existuje.';
+$messages['setactivateerror'] = 'Nepodarilo sa aktivovať zvolenú sadu filtrov, server ohlásil chybu';
+$messages['setdeactivateerror'] = 'Nepodarilo sa deaktivovať zvolenú sadu filtrov, server ohlásil chybu';
+$messages['setdeleteerror'] = 'Nepodarilo sa zmazať zvolenú sadu filtrov, server ohlásil chybu';
+$messages['setactivated'] = 'Sada filtrov bola aktivovaná';
+$messages['setdeactivated'] = 'Sada filtrov bola deaktivovaná';
+$messages['setdeleted'] = 'Sada filtrov bola zmazaná';
+$messages['setdeleteconfirm'] = 'Naozaj si prajete zmazať túto sadu filtrov?';
+$messages['setcreateerror'] = 'Nepodarilo sa vytvoriť sadu filtrov, server ohlásil chybu';
+$messages['setcreated'] = 'Sada filtrov bola vytvorená';
+$messages['activateerror'] = 'Nepodarilo sa povoliť vybraný filter(e). Chyba servera.';
+$messages['deactivateerror'] = 'Nepodarilo sa vypnúť vybraný filter(e). Chyba servera.';
+$messages['deactivated'] = 'Filter(e) povolený.';
+$messages['activated'] = 'Filter(e) úspešne vypnutý.';
+$messages['moved'] = 'Filter presunutý.';
+$messages['moveerror'] = 'Nemôžem presunúť zvolený filter. Chyba servera.';
+$messages['nametoolong'] = 'Názov sady filtrov je príliš dlhý';
+$messages['namereserved'] = 'Rezervovaný názov.';
+$messages['setexist'] = 'Množina už existuje.';
+$messages['nodata'] = 'Aspoň jedna pozícia musí byť zvolená.';
+
+?>
diff --git a/plugins/managesieve/localization/sl_SI.inc b/plugins/managesieve/localization/sl_SI.inc
index a0b61e70e..0a30a3a87 100644
--- a/plugins/managesieve/localization/sl_SI.inc
+++ b/plugins/managesieve/localization/sl_SI.inc
@@ -2,18 +2,21 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/sl_SI/labels.inc                                         |
+ | plugins/managesieve/localization/<lang>.inc                           |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Managesieve plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Teja Cetinski <teja.cetinski@gmail.com>                       |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-managesieve/
 */
 
-$labels = array();
+
 $labels['filters'] = 'Filtri';
 $labels['managefilters'] = 'Uredi filtre za dohodno pošto';
 $labels['filtername'] = 'Ime filtra';
@@ -52,8 +55,11 @@ $labels['add'] = 'Dodaj';
 $labels['del'] = 'Izbriši';
 $labels['sender'] = 'Pošiljatelj';
 $labels['recipient'] = 'Prejemnik';
-$labels['vacationaddresses'] = 'Dodaten seznam naslovov prejemnikov (ločenih z vejico):';
+$labels['vacationaddr'] = 'Dodaten seznam naslovov prejemnikov:';
 $labels['vacationdays'] = 'Kako pogosto naj bodo sporočila poslana (v dnevih):';
+$labels['vacationinterval'] = 'How often send messages:';
+$labels['days'] = 'days';
+$labels['seconds'] = 'seconds';
 $labels['vacationreason'] = 'Vsebina sporočila (vzrok za odsotnost):';
 $labels['vacationsubject'] = 'Zadeva sporočila';
 $labels['rulestop'] = 'Prekini z izvajanjem pravil';
@@ -92,6 +98,25 @@ $labels['flagdeleted'] = 'Izbrisano';
 $labels['flaganswered'] = 'Odgovorjeno';
 $labels['flagflagged'] = 'Označeno';
 $labels['flagdraft'] = 'Osnutek';
+$labels['setvariable'] = 'Nastavi spremenljivko';
+$labels['setvarname'] = 'Ime spremenljivke:';
+$labels['setvarvalue'] = 'Vrednost spremenljivke:';
+$labels['setvarmodifiers'] = 'Modifikator:';
+$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'] = 'Na elektronski naslov:';
+$labels['notifybody'] = 'Telo obvestila:';
+$labels['notifysubject'] = 'Zadeva obvestila:';
+$labels['notifyfrom'] = 'Pošiljatelj obvestila:';
+$labels['notifyimportance'] = 'Pomembnost:';
+$labels['notifyimportancelow'] = 'nizko';
+$labels['notifyimportancenormal'] = 'običajno';
+$labels['notifyimportancehigh'] = 'visoko';
 $labels['filtercreate'] = 'Ustvari filter';
 $labels['usedata'] = 'Pri stvarjanju filtra uporabi naslednje podatke';
 $labels['nextstep'] = 'Naslednji korak';
@@ -115,35 +140,38 @@ $labels['default'] = 'privzeto';
 $labels['octet'] = 'strict (octet)';
 $labels['asciicasemap'] = 'ni občutljiv na velike/male črke (ascii-casemap)';
 $labels['asciinumeric'] = 'numerično (ascii-numeric)';
-$labels['filterunknownerror'] = 'Prišlo je do neznane napake.';
-$labels['filterconnerror'] = 'Povezave s strežnikom (managesieve) ni bilo mogoče vzpostaviti';
-$labels['filterdeleteerror'] = 'Pravila ni bilo mogoče izbrisati. Prišlo je do napake.';
-$labels['filterdeleted'] = 'Pravilo je bilo uspešno izbrisano.';
-$labels['filtersaved'] = 'Pravilo je bilo uspešno shranjeno';
-$labels['filtersaveerror'] = 'Pravilo ni bilo shranjeno. Prišlo je do napake.';
-$labels['filterdeleteconfirm'] = 'Ste prepričani, da želite izbrisati izbrano pravilo?';
-$labels['ruledeleteconfirm'] = 'Ste prepričani, da želite izbrisati izbrano pravilo?';
-$labels['actiondeleteconfirm'] = 'Ste prepričani, da želite izbrisati izbrano dejanje?';
-$labels['forbiddenchars'] = 'V polju so neveljavni znaki';
-$labels['cannotbeempty'] = 'Polje ne sme biti prazno';
-$labels['ruleexist'] = 'Filer s tem imenom že obstaja';
-$labels['setactivateerror'] = 'Izbranega filtra ni bilo mogoče vključiti. Prišlo je do napake na strežniku.';
-$labels['setdeactivateerror'] = 'Izbranega filtra ni bilo mogoče izključiti. Prišlo je do napake na strežniku.';
-$labels['setdeleteerror'] = 'Izbranega filtra ni bilo mogoče izbrisati. Prišlo je do napake na strežniku.';
-$labels['setactivated'] = 'Filter je bil uspešno vključen.';
-$labels['setdeactivated'] = 'Filter je bil uspešno onemogočen.';
-$labels['setdeleted'] = 'Filter je bil uspešno izbrisan.';
-$labels['setdeleteconfirm'] = 'Ste prepričani, da želite izbrisati ta filter?';
-$labels['setcreateerror'] = 'Filtra ni bilo mogoče ustvariti. Prišlo je do napake na strežniku.';
-$labels['setcreated'] = 'Filter je bil uspešno ustvarjen.';
-$labels['activateerror'] = 'Izbranega/ih filtra/ov ni bilo mogoče vključiti. Prišlo je do napake na strežniku.';
-$labels['deactivateerror'] = 'Izbranega/ih fitra/ov ni bilo mogoče izključiti. Prišlo je do napake na strežniku.';
-$labels['activated'] = 'Filtri so bili uspešno onemogočeni.';
-$labels['deactivated'] = 'Filtri so bili uspešno omogočeni.';
-$labels['moved'] = 'Filter je bil uspešno premaknjen.';
-$labels['moveerror'] = 'Izbranega filtra ni bilo mogoče premakniti. Prišlo je do napake na strežniku.';
-$labels['nametoolong'] = 'Ime je predolgo.';
-$labels['namereserved'] = 'Rezervirano ime.';
-$labels['setexist'] = 'Nastavitev filtra že obstaja.';
-$labels['nodata'] = 'Izbrana mora biti vsaj ena nastavitev!';
 
+$messages = array();
+$messages['filterunknownerror'] = 'Prišlo je do neznane napake.';
+$messages['filterconnerror'] = 'Povezave s strežnikom (managesieve) ni bilo mogoče vzpostaviti';
+$messages['filterdeleteerror'] = 'Pravila ni bilo mogoče izbrisati. Prišlo je do napake.';
+$messages['filterdeleted'] = 'Pravilo je bilo uspešno izbrisano.';
+$messages['filtersaved'] = 'Pravilo je bilo uspešno shranjeno';
+$messages['filtersaveerror'] = 'Pravilo ni bilo shranjeno. Prišlo je do napake.';
+$messages['filterdeleteconfirm'] = 'Ste prepričani, da želite izbrisati izbrano pravilo?';
+$messages['ruledeleteconfirm'] = 'Ste prepričani, da želite izbrisati izbrano pravilo?';
+$messages['actiondeleteconfirm'] = 'Ste prepričani, da želite izbrisati izbrano dejanje?';
+$messages['forbiddenchars'] = 'V polju so neveljavni znaki';
+$messages['cannotbeempty'] = 'Polje ne sme biti prazno';
+$messages['ruleexist'] = 'Filer s tem imenom že obstaja';
+$messages['setactivateerror'] = 'Izbranega filtra ni bilo mogoče vključiti. Prišlo je do napake na strežniku.';
+$messages['setdeactivateerror'] = 'Izbranega filtra ni bilo mogoče izključiti. Prišlo je do napake na strežniku.';
+$messages['setdeleteerror'] = 'Izbranega filtra ni bilo mogoče izbrisati. Prišlo je do napake na strežniku.';
+$messages['setactivated'] = 'Filter je bil uspešno vključen.';
+$messages['setdeactivated'] = 'Filter je bil uspešno onemogočen.';
+$messages['setdeleted'] = 'Filter je bil uspešno izbrisan.';
+$messages['setdeleteconfirm'] = 'Ste prepričani, da želite izbrisati ta filter?';
+$messages['setcreateerror'] = 'Filtra ni bilo mogoče ustvariti. Prišlo je do napake na strežniku.';
+$messages['setcreated'] = 'Filter je bil uspešno ustvarjen.';
+$messages['activateerror'] = 'Izbranega/ih filtra/ov ni bilo mogoče vključiti. Prišlo je do napake na strežniku.';
+$messages['deactivateerror'] = 'Izbranega/ih fitra/ov ni bilo mogoče izključiti. Prišlo je do napake na strežniku.';
+$messages['deactivated'] = 'Filtri so bili uspešno omogočeni.';
+$messages['activated'] = 'Filtri so bili uspešno onemogočeni.';
+$messages['moved'] = 'Filter je bil uspešno premaknjen.';
+$messages['moveerror'] = 'Izbranega filtra ni bilo mogoče premakniti. Prišlo je do napake na strežniku.';
+$messages['nametoolong'] = 'Ime je predolgo.';
+$messages['namereserved'] = 'Rezervirano ime.';
+$messages['setexist'] = 'Nastavitev filtra že obstaja.';
+$messages['nodata'] = 'Izbrana mora biti vsaj ena nastavitev!';
+
+?>
diff --git a/plugins/managesieve/localization/sv_SE.inc b/plugins/managesieve/localization/sv_SE.inc
index 98087c2dc..f2aeddd9f 100644
--- a/plugins/managesieve/localization/sv_SE.inc
+++ b/plugins/managesieve/localization/sv_SE.inc
@@ -2,18 +2,21 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/sv_SE/labels.inc                                         |
+ | plugins/managesieve/localization/<lang>.inc                           |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Managesieve plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-managesieve/
 */
 
-$labels = array();
+
 $labels['filters'] = 'Filter';
 $labels['managefilters'] = 'Administrera filter';
 $labels['filtername'] = 'Filternamn';
@@ -52,8 +55,11 @@ $labels['add'] = 'Lägg till';
 $labels['del'] = 'Ta bort';
 $labels['sender'] = 'Avsändare';
 $labels['recipient'] = 'Mottagare';
-$labels['vacationaddresses'] = 'Ytterligare mottagaradresser (avdelade med kommatecken)';
+$labels['vacationaddr'] = 'Ytterligare mottagaradresser:';
 $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';
@@ -92,6 +98,25 @@ $labels['flagdeleted'] = 'Borttaget';
 $labels['flaganswered'] = 'Besvarat';
 $labels['flagflagged'] = 'Flaggat';
 $labels['flagdraft'] = 'Utkast';
+$labels['setvariable'] = 'Sätt variabel';
+$labels['setvarname'] = 'Variabelnamn:';
+$labels['setvarvalue'] = 'Variabelvärde:';
+$labels['setvarmodifiers'] = 'Modifierare:';
+$labels['varlower'] = 'Gemener';
+$labels['varupper'] = 'Versaler';
+$labels['varlowerfirst'] = 'Första tecken gement';
+$labels['varupperfirst'] = 'Första tecken versalt';
+$labels['varquotewildcard'] = 'Koda specialtecken';
+$labels['varlength'] = 'Längd';
+$labels['notify'] = 'Skicka avisering';
+$labels['notifyaddress'] = 'Mottagaradress:';
+$labels['notifybody'] = 'Aviseringsmeddelande:';
+$labels['notifysubject'] = 'Aviseringsämne:';
+$labels['notifyfrom'] = 'Aviseringsavsändare:';
+$labels['notifyimportance'] = 'Prioritet:';
+$labels['notifyimportancelow'] = 'Låg';
+$labels['notifyimportancenormal'] = 'Normal';
+$labels['notifyimportancehigh'] = 'Hög';
 $labels['filtercreate'] = 'Skapa filter';
 $labels['usedata'] = 'Använd följande information i filtret:';
 $labels['nextstep'] = 'Nästa steg';
@@ -115,35 +140,38 @@ $labels['default'] = 'standard';
 $labels['octet'] = 'strikt (oktalt)';
 $labels['asciicasemap'] = 'teckenlägesokänslig (ascii-casemap)';
 $labels['asciinumeric'] = 'numerisk (ascii-numeric)';
-$labels['filterunknownerror'] = 'Okänt serverfel';
-$labels['filterconnerror'] = 'Anslutning till serverns filtertjänst misslyckades';
-$labels['filterdeleteerror'] = 'Filtret kunde inte tas bort på grund av serverfel';
-$labels['filterdeleted'] = 'Filtret är borttaget';
-$labels['filtersaved'] = 'Filtret har sparats';
-$labels['filtersaveerror'] = 'Filtret kunde inte sparas på grund av serverfel';
-$labels['filterdeleteconfirm'] = 'Vill du ta bort det markerade filtret?';
-$labels['ruledeleteconfirm'] = 'Vill du ta bort filterregeln?';
-$labels['actiondeleteconfirm'] = 'Vill du ta bort filteråtgärden?';
-$labels['forbiddenchars'] = 'Otillåtet tecken i fältet';
-$labels['cannotbeempty'] = 'Fältet kan inte lämnas tomt';
-$labels['ruleexist'] = 'Ett filter med angivet namn finns redan.';
-$labels['setactivateerror'] = 'Filtergruppen kunde inte aktiveras på grund av serverfel';
-$labels['setdeactivateerror'] = 'Filtergruppen kunde inte deaktiveras på grund av serverfel';
-$labels['setdeleteerror'] = 'Filtergruppen kunde inte tas bort på grund av serverfel';
-$labels['setactivated'] = 'Filtergruppen är aktiverad';
-$labels['setdeactivated'] = 'Filtergruppen är deaktiverad';
-$labels['setdeleted'] = 'Filtergruppen är borttagen';
-$labels['setdeleteconfirm'] = 'Vill du ta bort filtergruppen?';
-$labels['setcreateerror'] = 'Filtergruppen kunde inte läggas till på grund av serverfel';
-$labels['setcreated'] = 'Filtergruppen har lagts till';
-$labels['activateerror'] = 'Kunde inte aktivera filter på grund av serverfel.';
-$labels['deactivateerror'] = 'Kunde inte deaktivera filter på grund av serverfel.';
-$labels['activated'] = 'Filter deaktiverat.';
-$labels['deactivated'] = 'Filter aktiverat.';
-$labels['moved'] = 'Filter flyttat.';
-$labels['moveerror'] = 'Kunde inte flytta filter på grund av serverfel.';
-$labels['nametoolong'] = 'Filtergruppen kan inte läggas till med för långt namn';
-$labels['namereserved'] = 'Reserverat namn.';
-$labels['setexist'] = 'Filtergrupp finns redan.';
-$labels['nodata'] = 'Minst en position måste väljas!';
 
+$messages = array();
+$messages['filterunknownerror'] = 'Okänt serverfel';
+$messages['filterconnerror'] = 'Anslutning till serverns filtertjänst misslyckades';
+$messages['filterdeleteerror'] = 'Filtret kunde inte tas bort på grund av serverfel';
+$messages['filterdeleted'] = 'Filtret är borttaget';
+$messages['filtersaved'] = 'Filtret har sparats';
+$messages['filtersaveerror'] = 'Filtret kunde inte sparas på grund av serverfel';
+$messages['filterdeleteconfirm'] = 'Vill du ta bort det markerade filtret?';
+$messages['ruledeleteconfirm'] = 'Vill du ta bort filterregeln?';
+$messages['actiondeleteconfirm'] = 'Vill du ta bort filteråtgärden?';
+$messages['forbiddenchars'] = 'Otillåtet tecken i fältet';
+$messages['cannotbeempty'] = 'Fältet kan inte lämnas tomt';
+$messages['ruleexist'] = 'Ett filter med angivet namn finns redan.';
+$messages['setactivateerror'] = 'Filtergruppen kunde inte aktiveras på grund av serverfel';
+$messages['setdeactivateerror'] = 'Filtergruppen kunde inte deaktiveras på grund av serverfel';
+$messages['setdeleteerror'] = 'Filtergruppen kunde inte tas bort på grund av serverfel';
+$messages['setactivated'] = 'Filtergruppen är aktiverad';
+$messages['setdeactivated'] = 'Filtergruppen är deaktiverad';
+$messages['setdeleted'] = 'Filtergruppen är borttagen';
+$messages['setdeleteconfirm'] = 'Vill du ta bort filtergruppen?';
+$messages['setcreateerror'] = 'Filtergruppen kunde inte läggas till på grund av serverfel';
+$messages['setcreated'] = 'Filtergruppen har lagts till';
+$messages['activateerror'] = 'Kunde inte aktivera filter på grund av serverfel.';
+$messages['deactivateerror'] = 'Kunde inte deaktivera filter på grund av serverfel.';
+$messages['deactivated'] = 'Filter aktiverat.';
+$messages['activated'] = 'Filter deaktiverat.';
+$messages['moved'] = 'Filter flyttat.';
+$messages['moveerror'] = 'Kunde inte flytta filter på grund av serverfel.';
+$messages['nametoolong'] = 'Filtergruppen kan inte läggas till med för långt namn';
+$messages['namereserved'] = 'Reserverat namn.';
+$messages['setexist'] = 'Filtergrupp finns redan.';
+$messages['nodata'] = 'Minst en position måste väljas!';
+
+?>
diff --git a/plugins/managesieve/localization/tr_TR.inc b/plugins/managesieve/localization/tr_TR.inc
index 14dd44b19..19bbb2e8e 100644
--- a/plugins/managesieve/localization/tr_TR.inc
+++ b/plugins/managesieve/localization/tr_TR.inc
@@ -2,18 +2,21 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/tr_TR/labels.inc                                         |
+ | plugins/managesieve/localization/<lang>.inc                           |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Managesieve plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: ismail yenigul                                                |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-managesieve/
 */
 
-$labels = array();
+
 $labels['filters'] = 'Filtreler';
 $labels['managefilters'] = 'Gelen e-posta filtrelerini yönet';
 $labels['filtername'] = 'Filtre adı';
@@ -52,8 +55,11 @@ $labels['add'] = 'Ekle';
 $labels['del'] = 'Sil';
 $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['vacationaddr'] = 'İlave e-posta adreslerim:';
+$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';
@@ -92,6 +98,25 @@ $labels['flagdeleted'] = 'Silindi';
 $labels['flaganswered'] = 'Cevaplanmış';
 $labels['flagflagged'] = 'İşaretli';
 $labels['flagdraft'] = 'Taslak';
+$labels['setvariable'] = 'Değişken tanımla';
+$labels['setvarname'] = 'Değişken adı';
+$labels['setvarvalue'] = 'Değişken değeri:';
+$labels['setvarmodifiers'] = 'Değiştiriciler:';
+$labels['varlower'] = 'küçük harf';
+$labels['varupper'] = 'büyük harf';
+$labels['varlowerfirst'] = 'İlk karakter küçük harf';
+$labels['varupperfirst'] = 'İlk karakter büyük harf';
+$labels['varquotewildcard'] = 'özel karakterleri tırnak içine al';
+$labels['varlength'] = 'uzunluk';
+$labels['notify'] = 'Bildirim gönder';
+$labels['notifyaddress'] = 'Alıcı e-posta adresi';
+$labels['notifybody'] = 'Bildirim gövdesi:';
+$labels['notifysubject'] = 'Bildirim konusu:';
+$labels['notifyfrom'] = 'Bildirim göndericisi:';
+$labels['notifyimportance'] = 'Önem derecesi';
+$labels['notifyimportancelow'] = 'düşük';
+$labels['notifyimportancenormal'] = 'normal';
+$labels['notifyimportancehigh'] = 'yüksek';
 $labels['filtercreate'] = 'Süzgeç oluştur';
 $labels['usedata'] = 'Aşağıdaki verileri süzgeçte kullan';
 $labels['nextstep'] = 'Sonraki adım';
@@ -115,35 +140,38 @@ $labels['default'] = 'öntanımlı';
 $labels['octet'] = 'sıkı(oktet)';
 $labels['asciicasemap'] = 'büyük küçük harf duyarsız(ascii-casemap)';
 $labels['asciinumeric'] = 'sayı (ascii-numeric)';
-$labels['filterunknownerror'] = 'Bilinmeyen sunucu hatası.';
-$labels['filterconnerror'] = 'Sunucuya bağlanamıyor.';
-$labels['filterdeleteerror'] = 'Filtre silinemedi. Sunucuda hata oluştu.';
-$labels['filterdeleted'] = 'Filtre başarıyla silindi.';
-$labels['filtersaved'] = 'Filter başarıyla kaydedildi.';
-$labels['filtersaveerror'] = 'Filtre kaydedilemedi. Sunucuda hata oluştu.';
-$labels['filterdeleteconfirm'] = 'Seçilen filtreleri  gerçekten silmek istiyor musun?';
-$labels['ruledeleteconfirm'] = 'Seçili kuralları silmek istediğinizden emin misiniz?';
-$labels['actiondeleteconfirm'] = 'Seçili aksiyonları silmek istediğinizden emin misiniz?';
-$labels['forbiddenchars'] = 'Alanda izin verilmeyen karakterler var.';
-$labels['cannotbeempty'] = 'Alan boş olmaz';
-$labels['ruleexist'] = 'Belirtilen isimde bir filtre zaten var.';
-$labels['setactivateerror'] = 'Seçilen filtreler etkinleştirilemedi. Sunucuda hata oluştu.';
-$labels['setdeactivateerror'] = 'Seçilen filtreler pasifleştirilemedi. Sunucuda hata oluştu.';
-$labels['setdeleteerror'] = 'Seçilen filtreler silinemedi. Sunucuda hata oluştu.';
-$labels['setactivated'] = 'Filtreler başarıyla etkinleştirilemedi.';
-$labels['setdeactivated'] = 'Filtreler başarıyla pasifleştirildi.';
-$labels['setdeleted'] = 'Filtre seti başarıyla silindi.';
-$labels['setdeleteconfirm'] = 'Seçilen filtre setlerini silmek istediğinizden emin misiniz?';
-$labels['setcreateerror'] = 'Filtre setleri oluşturulamadı. Sunucuda hata oluştu.';
-$labels['setcreated'] = 'Filtre setleri başarıyla oluşturuldu.';
-$labels['activateerror'] = 'Seçilen filtre(ler) etkinleştirilemedi. Sunucuda hata oluştu.';
-$labels['deactivateerror'] = 'Seçilen filtre(ler) pasifleştirilemedi. Sunucuda hata oluştu.';
-$labels['activated'] = 'Filtre(ler) başarıyla iptal edildi.';
-$labels['deactivated'] = 'Filtre(ler) başarıyla etkinleştirildi.';
-$labels['moved'] = 'Filtre başarıyla taşındı.';
-$labels['moveerror'] = 'Seçilen filtre(ler) taşınamadı. Sunucuda hata oluştu.';
-$labels['nametoolong'] = 'İsim çok uzun.';
-$labels['namereserved'] = 'rezerve edilmiş isim.';
-$labels['setexist'] = 'Set zaten var.';
-$labels['nodata'] = 'En az bir pozisyon seçilmelidir.';
 
+$messages = array();
+$messages['filterunknownerror'] = 'Bilinmeyen sunucu hatası.';
+$messages['filterconnerror'] = 'Sunucuya bağlanamıyor.';
+$messages['filterdeleteerror'] = 'Filtre silinemedi. Sunucuda hata oluştu.';
+$messages['filterdeleted'] = 'Filtre başarıyla silindi.';
+$messages['filtersaved'] = 'Filter başarıyla kaydedildi.';
+$messages['filtersaveerror'] = 'Filtre kaydedilemedi. Sunucuda hata oluştu.';
+$messages['filterdeleteconfirm'] = 'Seçilen filtreleri  gerçekten silmek istiyor musun?';
+$messages['ruledeleteconfirm'] = 'Seçili kuralları silmek istediğinizden emin misiniz?';
+$messages['actiondeleteconfirm'] = 'Seçili aksiyonları silmek istediğinizden emin misiniz?';
+$messages['forbiddenchars'] = 'Alanda izin verilmeyen karakterler var.';
+$messages['cannotbeempty'] = 'Alan boş olmaz';
+$messages['ruleexist'] = 'Belirtilen isimde bir filtre zaten var.';
+$messages['setactivateerror'] = 'Seçilen filtreler etkinleştirilemedi. Sunucuda hata oluştu.';
+$messages['setdeactivateerror'] = 'Seçilen filtreler pasifleştirilemedi. Sunucuda hata oluştu.';
+$messages['setdeleteerror'] = 'Seçilen filtreler silinemedi. Sunucuda hata oluştu.';
+$messages['setactivated'] = 'Filtreler başarıyla etkinleştirilemedi.';
+$messages['setdeactivated'] = 'Filtreler başarıyla pasifleştirildi.';
+$messages['setdeleted'] = 'Filtre seti başarıyla silindi.';
+$messages['setdeleteconfirm'] = 'Seçilen filtre setlerini silmek istediğinizden emin misiniz?';
+$messages['setcreateerror'] = 'Filtre setleri oluşturulamadı. Sunucuda hata oluştu.';
+$messages['setcreated'] = 'Filtre setleri başarıyla oluşturuldu.';
+$messages['activateerror'] = 'Seçilen filtre(ler) etkinleştirilemedi. Sunucuda hata oluştu.';
+$messages['deactivateerror'] = 'Seçilen filtre(ler) pasifleştirilemedi. Sunucuda hata oluştu.';
+$messages['deactivated'] = 'Filtre(ler) başarıyla iptal edildi.';
+$messages['activated'] = 'Filtre(ler) başarıyla etkinleştirildi.';
+$messages['moved'] = 'Filtre başarıyla taşındı.';
+$messages['moveerror'] = 'Seçilen filtre(ler) taşınamadı. Sunucuda hata oluştu.';
+$messages['nametoolong'] = 'İsim çok uzun.';
+$messages['namereserved'] = 'rezerve edilmiş isim.';
+$messages['setexist'] = 'Set zaten var.';
+$messages['nodata'] = 'En az bir pozisyon seçilmelidir.';
+
+?>
diff --git a/plugins/managesieve/localization/uk_UA.inc b/plugins/managesieve/localization/uk_UA.inc
index 76ee7f96b..57cab9ea5 100644
--- a/plugins/managesieve/localization/uk_UA.inc
+++ b/plugins/managesieve/localization/uk_UA.inc
@@ -2,19 +2,21 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/uk_UA/labels.inc                                         |
+ | plugins/managesieve/localization/<lang>.inc                           |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Managesieve plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-managesieve/
 */
 
-$labels = array();
+
 $labels['filters'] = 'Фільтри';
 $labels['managefilters'] = 'Керування фільтрами вхідної пошти';
 $labels['filtername'] = 'Назва фільтру';
@@ -32,12 +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['filterunder'] = 'менше, ніж';
 $labels['filterover'] = 'більше, ніж';
 $labels['addrule'] = 'Додати правило';
 $labels['delrule'] = 'Видалити правило';
 $labels['messagemoveto'] = 'Пересунути повідомлення до';
 $labels['messageredirect'] = 'Перенаправити повідомлення до';
+$labels['messagecopyto'] = 'Copy message to';
+$labels['messagesendcopy'] = 'Send message copy to';
 $labels['messagereply'] = 'Автовідповідач';
 $labels['messagedelete'] = 'Видалити повідомлення';
 $labels['messagediscard'] = 'Відхилити з повідомленням';
@@ -47,14 +55,21 @@ $labels['add'] = 'Додати';
 $labels['del'] = 'Видалити';
 $labels['sender'] = 'Відправник';
 $labels['recipient'] = 'Отримувач';
-$labels['vacationaddresses'] = 'Додатковий список адрес отримувачів (розділених комою)';
+$labels['vacationaddr'] = 'Додатковий список адрес отримувачів:';
 $labels['vacationdays'] = 'Як часто повторювати (у днях):';
+$labels['vacationinterval'] = 'How often send messages:';
+$labels['days'] = 'days';
+$labels['seconds'] = 'seconds';
 $labels['vacationreason'] = 'Текст повідомлення:';
+$labels['vacationsubject'] = 'Message subject:';
 $labels['rulestop'] = 'Зупинити перевірку правил';
+$labels['enable'] = 'Enable/Disable';
 $labels['filterset'] = 'Набір фільтрів';
+$labels['filtersets'] = 'Filter sets';
 $labels['filtersetadd'] = 'Додати набір фільтрів';
 $labels['filtersetdel'] = 'Видалити поточний набір';
 $labels['filtersetact'] = 'Активувати поточний набір';
+$labels['filtersetdeact'] = 'Deactivate current filters set';
 $labels['filterdef'] = 'Параметри фільтру';
 $labels['filtersetname'] = 'Назва набору фільтрів';
 $labels['newfilterset'] = 'Новий набір фільтрів';
@@ -63,23 +78,100 @@ $labels['none'] = 'нічого';
 $labels['fromset'] = 'з набору';
 $labels['fromfile'] = 'з файлу';
 $labels['filterdisabled'] = 'Фільтр вимкнено';
-$labels['filterunknownerror'] = 'Невідома помилка сервера';
-$labels['filterconnerror'] = 'Неможливо з\'єднатися з сервером';
-$labels['filterdeleteerror'] = 'Неможливо видалити фільтр. Помилка сервера';
-$labels['filterdeleted'] = 'Фільтр успішно видалено';
-$labels['filtersaved'] = 'Фільтр успішно збережено';
-$labels['filtersaveerror'] = 'Неможливо зберегти фільтр. Помилка сервера';
-$labels['filterdeleteconfirm'] = 'Ви дійсно хочете видалити обраний фільтр?';
-$labels['ruledeleteconfirm'] = 'Ви дійсно хочете видалити обране правило?';
-$labels['actiondeleteconfirm'] = 'Ви дійсно хочете видалити обрану дію?';
-$labels['forbiddenchars'] = 'Введено заборонений символ';
-$labels['cannotbeempty'] = 'Поле не може бути пустим';
-$labels['setactivateerror'] = 'Неможливо активувати обраний набір. Помилка сервера';
-$labels['setdeleteerror'] = 'Неможливо видалити обраний набір. Помилка сервера';
-$labels['setactivated'] = 'Набір фільтрів активовано успішно';
-$labels['setdeleted'] = 'Набір фільтрів видалено успішно';
-$labels['setdeleteconfirm'] = 'Ви впевнені, що хочете видалити обраний набір?';
-$labels['setcreateerror'] = 'Не вдалося створити набір. Помилка сервера';
-$labels['setcreated'] = 'Набір фільтрів створено успішно';
-$labels['nametoolong'] = 'Не вдалося створити набір. Занадто довга назва';
+$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['...'] = '...';
+$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)';
+
+$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'] = 'Filter with specified name already exists.';
+$messages['setactivateerror'] = 'Неможливо активувати обраний набір. Помилка сервера';
+$messages['setdeactivateerror'] = 'Unable to deactivate selected filters set. Server error occured.';
+$messages['setdeleteerror'] = 'Неможливо видалити обраний набір. Помилка сервера';
+$messages['setactivated'] = 'Набір фільтрів активовано успішно';
+$messages['setdeactivated'] = 'Filters set deactivated successfully.';
+$messages['setdeleted'] = 'Набір фільтрів видалено успішно';
+$messages['setdeleteconfirm'] = 'Ви впевнені, що хочете видалити обраний набір?';
+$messages['setcreateerror'] = 'Не вдалося створити набір. Помилка сервера';
+$messages['setcreated'] = 'Набір фільтрів створено успішно';
+$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'] = 'Не вдалося створити набір. Занадто довга назва';
+$messages['namereserved'] = 'Reserved name.';
+$messages['setexist'] = 'Set already exists.';
+$messages['nodata'] = 'At least one position must be selected!';
 
+?>
diff --git a/plugins/managesieve/localization/vi_VN.inc b/plugins/managesieve/localization/vi_VN.inc
index d358960ad..6e65cccf5 100644
--- a/plugins/managesieve/localization/vi_VN.inc
+++ b/plugins/managesieve/localization/vi_VN.inc
@@ -2,18 +2,21 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/vi_VN/labels.inc                                         |
+ | plugins/managesieve/localization/<lang>.inc                           |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Managesieve plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Kenny Tran <kennethanh@gmail.com>                             |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-managesieve/
 */
 
-$labels = array();
+
 $labels['filters'] = 'Bộ lọc';
 $labels['managefilters'] = 'Quản lý bộ lọc thư đến';
 $labels['filtername'] = 'Lọc tên';
@@ -52,7 +55,7 @@ $labels['add'] = 'Thêm';
 $labels['del'] = 'Xoá';
 $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['vacationaddr'] = 'Địa chỉ email bổ sung của tôi';
 $labels['vacationdays'] = 'Số lần gửi thư (trong ngày)';
 $labels['vacationreason'] = 'Nội dung chính';
 $labels['vacationsubject'] = 'Tiêu đề thư';
@@ -92,6 +95,25 @@ $labels['flagdeleted'] = 'Đã được xóa';
 $labels['flaganswered'] = 'Đã trả lời';
 $labels['flagflagged'] = 'Đã đánh dấu';
 $labels['flagdraft'] = 'Nháp';
+$labels['setvariable'] = 'Set variable';
+$labels['setvarname'] = 'Variable name:';
+$labels['setvarvalue'] = 'Variable value:';
+$labels['setvarmodifiers'] = 'Modifiers:';
+$labels['varlower'] = 'viết thường';
+$labels['varupper'] = 'viết hoa';
+$labels['varlowerfirst'] = 'chữ cái đầu viết thường';
+$labels['varupperfirst'] = 'chữ cái đầu viết hoa';
+$labels['varquotewildcard'] = 'quote special characters';
+$labels['varlength'] = 'độ dài';
+$labels['notify'] = 'Send notification';
+$labels['notifyaddress'] = 'Gửi đến địa chỉ email:';
+$labels['notifybody'] = 'Notification body:';
+$labels['notifysubject'] = 'Notification subject:';
+$labels['notifyfrom'] = 'Notification sender:';
+$labels['notifyimportance'] = 'Mức độ quan trọng:';
+$labels['notifyimportancelow'] = 'thấp';
+$labels['notifyimportancenormal'] = 'vừa phải';
+$labels['notifyimportancehigh'] = 'cao';
 $labels['filtercreate'] = 'Tạo bộ lọc';
 $labels['usedata'] = 'Dùng dữ liệu trong bộ lọc sau:';
 $labels['nextstep'] = 'Bước tiếp theo';
@@ -115,35 +137,38 @@ $labels['default'] = 'Mặc định';
 $labels['octet'] = 'Khắt khe';
 $labels['asciicasemap'] = 'Không phân biệt chữ hoa chữ thường';
 $labels['asciinumeric'] = 'Bảng mã ASCII';
-$labels['filterunknownerror'] = 'Không tìm được lỗi máy chủ';
-$labels['filterconnerror'] = 'Không kết nối được với máy chủ.';
-$labels['filterdeleteerror'] = 'Không thể xóa bộ lọc. Xuất hiện lỗi ở máy chủ';
-$labels['filterdeleted'] = 'Xóa bộ lọc thành công';
-$labels['filtersaved'] = 'Lưu bộ lọc thành công';
-$labels['filtersaveerror'] = 'Không thể lưu bộ lọc. Xuất hiện lỗi ở máy chủ';
-$labels['filterdeleteconfirm'] = 'Bạn có thực sự muốn xóa bộ lọc được chọn?';
-$labels['ruledeleteconfirm'] = 'Bạn có chắc chắn muốn xóa qui luật được chọn?';
-$labels['actiondeleteconfirm'] = 'Bạn có chắc chắn muốn xóa hành động được chọn?';
-$labels['forbiddenchars'] = 'Ký tự bị cấm trong ô';
-$labels['cannotbeempty'] = 'Ô không thể bị bỏ trống';
-$labels['ruleexist'] = 'Đã tồn tại bộ lọc với tên cụ thế';
-$labels['setactivateerror'] = 'Không thể kích hoạt bộ lọc được lựa chọn. Xuất hiện lỗi ở máy chủ';
-$labels['setdeactivateerror'] = 'Không thể không kích hoạt bộ lọc được lựa chọn. Xuất hiện lỗi ở máy chủ';
-$labels['setdeleteerror'] = 'Không thể xóa bộ lọc được lựa chọn. Forbidden characters in field.';
-$labels['setactivated'] = 'Bộ lọc được khởi động thành công';
-$labels['setdeactivated'] = 'Ngừng kích hoạt bộ lọc thành công';
-$labels['setdeleted'] = 'Xóa bộ lọc thành công';
-$labels['setdeleteconfirm'] = 'Bạn có chắc bạn muốn xóa thiết lập bộ lọc được chọn?';
-$labels['setcreateerror'] = 'Không thể tạo thiết lập bộ lọc. Có lỗi xuất hiện ở máy chủ';
-$labels['setcreated'] = 'Thiết lập bộ lọc được tạo thành công';
-$labels['activateerror'] = 'Không thể khởi động bộ lọc được chọn. Có lỗi xuất hiện ở máy chủ';
-$labels['deactivateerror'] = 'Không thể tắt bộ lọc đã chọn. Có lỗi xuất hiện ở máy chủ';
-$labels['activated'] = 'Bộ lọc được tắt thành công';
-$labels['deactivated'] = 'Bộ lọc được khởi động thành công';
-$labels['moved'] = 'Bộ lọc được chuyển đi thành công';
-$labels['moveerror'] = 'Không thể chuyển bộc lọc đã chọn. Có lỗi xuất hiện ở máy chủ';
-$labels['nametoolong'] = 'Tên quá dài';
-$labels['namereserved'] = 'Tên đã được bảo vệ';
-$labels['setexist'] = 'Thiết lập đã tồn tại';
-$labels['nodata'] = 'Ít nhất một vị trí phải được chọn';
 
+$messages = array();
+$messages['filterunknownerror'] = 'Không tìm được lỗi máy chủ';
+$messages['filterconnerror'] = 'Không kết nối được với máy chủ.';
+$messages['filterdeleteerror'] = 'Không thể xóa bộ lọc. Xuất hiện lỗi ở máy chủ';
+$messages['filterdeleted'] = 'Xóa bộ lọc thành công';
+$messages['filtersaved'] = 'Lưu bộ lọc thành công';
+$messages['filtersaveerror'] = 'Không thể lưu bộ lọc. Xuất hiện lỗi ở máy chủ';
+$messages['filterdeleteconfirm'] = 'Bạn có thực sự muốn xóa bộ lọc được chọn?';
+$messages['ruledeleteconfirm'] = 'Bạn có chắc chắn muốn xóa qui luật được chọn?';
+$messages['actiondeleteconfirm'] = 'Bạn có chắc chắn muốn xóa hành động được chọn?';
+$messages['forbiddenchars'] = 'Ký tự bị cấm trong ô';
+$messages['cannotbeempty'] = 'Ô không thể bị bỏ trống';
+$messages['ruleexist'] = 'Đã tồn tại bộ lọc với tên cụ thế';
+$messages['setactivateerror'] = 'Không thể kích hoạt bộ lọc được lựa chọn. Xuất hiện lỗi ở máy chủ';
+$messages['setdeactivateerror'] = 'Không thể không kích hoạt bộ lọc được lựa chọn. Xuất hiện lỗi ở máy chủ';
+$messages['setdeleteerror'] = 'Không thể xóa bộ lọc được lựa chọn. Forbidden characters in field.';
+$messages['setactivated'] = 'Bộ lọc được khởi động thành công';
+$messages['setdeactivated'] = 'Ngừng kích hoạt bộ lọc thành công';
+$messages['setdeleted'] = 'Xóa bộ lọc thành công';
+$messages['setdeleteconfirm'] = 'Bạn có chắc bạn muốn xóa thiết lập bộ lọc được chọn?';
+$messages['setcreateerror'] = 'Không thể tạo thiết lập bộ lọc. Có lỗi xuất hiện ở máy chủ';
+$messages['setcreated'] = 'Thiết lập bộ lọc được tạo thành công';
+$messages['activateerror'] = 'Không thể khởi động bộ lọc được chọn. Có lỗi xuất hiện ở máy chủ';
+$messages['deactivateerror'] = 'Không thể tắt bộ lọc đã chọn. Có lỗi xuất hiện ở máy chủ';
+$messages['deactivated'] = 'Bộ lọc được khởi động thành công';
+$messages['activated'] = 'Bộ lọc được tắt thành công';
+$messages['moved'] = 'Bộ lọc được chuyển đi thành công';
+$messages['moveerror'] = 'Không thể chuyển bộc lọc đã chọn. Có lỗi xuất hiện ở máy chủ';
+$messages['nametoolong'] = 'Tên quá dài';
+$messages['namereserved'] = 'Tên đã được bảo vệ';
+$messages['setexist'] = 'Thiết lập đã tồn tại';
+$messages['nodata'] = 'Ít nhất một vị trí phải được chọn';
+
+?>
diff --git a/plugins/managesieve/localization/zh_CN.inc b/plugins/managesieve/localization/zh_CN.inc
index 8cbe48778..106fb40fc 100644
--- a/plugins/managesieve/localization/zh_CN.inc
+++ b/plugins/managesieve/localization/zh_CN.inc
@@ -2,18 +2,21 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/zh_CN/labels.inc                                         |
+ | plugins/managesieve/localization/<lang>.inc                           |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Managesieve plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Christopher Meng <cickumqt@gmail.com>                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-managesieve/
 */
 
-$labels = array();
+
 $labels['filters'] = '过滤器';
 $labels['managefilters'] = '管理邮件过滤规则';
 $labels['filtername'] = '过滤规则名称';
@@ -32,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['vacationaddr'] = '收件人地址的附加名单';
+$labels['vacationdays'] = '发送邮件频率(单位：天):';
+$labels['vacationinterval'] = 'How often send messages:';
+$labels['days'] = 'days';
+$labels['seconds'] = 'seconds';
+$labels['vacationreason'] = '邮件正文(假期原因)';
 $labels['vacationsubject'] = '邮件主题';
 $labels['rulestop'] = '停止评价规则';
 $labels['enable'] = '启用/禁用';
@@ -67,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'] = '计数小于';
@@ -87,15 +93,34 @@ $labels['valuenotequals'] = '值不等于';
 $labels['setflags'] = '设定邮件的标识';
 $labels['addflags'] = '增加邮件的标识';
 $labels['removeflags'] = '删除邮件的标识';
-$labels['flagread'] = '阅读';
+$labels['flagread'] = '读取';
 $labels['flagdeleted'] = '删除';
 $labels['flaganswered'] = '已答复';
 $labels['flagflagged'] = '已标记';
 $labels['flagdraft'] = '草稿';
-$labels['filtercreate'] = '创建过滤器';
-$labels['usedata'] = '在过滤器中使用以下数据';
+$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['nextstep'] = '下一步';
-$labels['...'] = '……';
+$labels['...'] = '...';
 $labels['advancedopts'] = '高级选项';
 $labels['body'] = '正文';
 $labels['address'] = '地址';
@@ -112,36 +137,41 @@ $labels['user'] = '用户';
 $labels['detail'] = '细节';
 $labels['comparator'] = '比较：';
 $labels['default'] = '默认';
-$labels['octet'] = '严格的（字节）';
-$labels['asciicasemap'] = '不区分大小写（ascii字符）';
-$labels['asciinumeric'] = '数字（ascii数字）';
-$labels['filterunknownerror'] = '未知的服务器错误';
-$labels['filterconnerror'] = '无法连接到 managesieve 服务器';
-$labels['filterdeleteerror'] = '无法删除过滤器。服务器错误';
-$labels['filterdeleted'] = '过滤器已成功删除';
-$labels['filtersaved'] = '过滤器已成功保存。';
-$labels['filtersaveerror'] = '无法保存过滤器。服务器错误';
-$labels['filterdeleteconfirm'] = '您确定要删除所选择的过滤器吗？';
-$labels['ruledeleteconfirm'] = '您确定要删除所选择的规则吗？';
-$labels['actiondeleteconfirm'] = '您确定要删除所选择的动作吗？';
-$labels['forbiddenchars'] = '内容中包含禁用的字符';
-$labels['cannotbeempty'] = '内容不能为空';
-$labels['ruleexist'] = '指定过滤器名称已存在。';
-$labels['setactivateerror'] = '无法启用指定过滤器，服务器错误。';
-$labels['setdeactivateerror'] = '无法停用指定过滤器，服务器错误。';
-$labels['setdeleteerror'] = '无法删除指定过滤器，服务器错误。';
-$labels['setactivated'] = '过滤器成功启用。';
-$labels['setdeactivated'] = '过滤器成功停用。';
-$labels['setdeleted'] = '过滤器成功删除。';
-$labels['setdeleteconfirm'] = '你确定要删除指定过滤器？';
-$labels['setcreateerror'] = '无法创建过滤器，服务器错误。';
-$labels['setcreated'] = '过滤器成功创建。';
-$labels['activateerror'] = '无法启用选中的过滤器，因为服务器发生错误。';
-$labels['deactivateerror'] = '无法禁用选中的过滤器，因为服务器发生错误。';
-$labels['activated'] = '禁用过滤器成功。';
-$labels['deactivated'] = '启用过滤器成功。';
-$labels['moved'] = '过滤器移动成功。';
-$labels['moveerror'] = '无法移动选中的过滤器，因为服务器发生错误。';
-$labels['nametoolong'] = '名称太长。';
-$labels['setexist'] = '设置已存在。';
+$labels['octet'] = '严格模式(字节)';
+$labels['asciicasemap'] = '不区分大小写(ascii 字符)';
+$labels['asciinumeric'] = '数字类型(ascii 数字)';
+
+$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['nametoolong'] = '无法创建过滤器集，名称太长。';
+$messages['namereserved'] = '保留名称。';
+$messages['setexist'] = '设置已存在。';
+$messages['nodata'] = '至少选择一个位置！';
 
+?>
diff --git a/plugins/managesieve/localization/zh_TW.inc b/plugins/managesieve/localization/zh_TW.inc
index db2292b9a..047ebcccc 100644
--- a/plugins/managesieve/localization/zh_TW.inc
+++ b/plugins/managesieve/localization/zh_TW.inc
@@ -2,18 +2,21 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/zh_TW/labels.inc                                         |
+ | plugins/managesieve/localization/<lang>.inc                           |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Managesieve plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Nansen                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-managesieve/
 */
 
-$labels = array();
+
 $labels['filters'] = '篩選器';
 $labels['managefilters'] = '設定篩選器';
 $labels['filtername'] = '篩選器名稱';
@@ -52,13 +55,17 @@ $labels['add'] = '新增';
 $labels['del'] = '刪除';
 $labels['sender'] = '寄件者';
 $labels['recipient'] = '收件者';
-$labels['vacationaddresses'] = '其他收件者（用半形逗號隔開）：';
+$labels['vacationaddr'] = '其他收件者：';
 $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['filtersetact'] = '啟用目前的篩選器集合';
@@ -71,6 +78,9 @@ $labels['none'] = '無';
 $labels['fromset'] = '從集合';
 $labels['fromfile'] = '重檔案';
 $labels['filterdisabled'] = '篩選器已停用';
+$labels['countisgreaterthan'] = '計數大於';
+$labels['countisgreaterthanequal'] = '計數大於或等於';
+$labels['countislessthan'] = '計數小於';
 $labels['countislessthanequal'] = '數量小於或等於';
 $labels['countequals'] = '數量等於';
 $labels['countnotequals'] = '數量不等於';
@@ -85,8 +95,28 @@ $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'] = '寄到電子郵件位址:';
+$labels['notifybody'] = '通知內容:';
+$labels['notifysubject'] = '通知主旨:';
+$labels['notifyfrom'] = '通知寄件者:';
+$labels['notifyimportance'] = '重要性:';
+$labels['notifyimportancelow'] = '低';
+$labels['notifyimportancenormal'] = '一般';
+$labels['notifyimportancehigh'] = '高';
 $labels['filtercreate'] = '建立郵件規則';
 $labels['usedata'] = '於規則中使用轉寄時間';
 $labels['nextstep'] = '下一步';
@@ -94,41 +124,54 @@ $labels['...'] = '…';
 $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['filterunknownerror'] = '未知的伺服器錯誤';
-$labels['filterconnerror'] = '無法與伺服器連線';
-$labels['filterdeleteerror'] = '無法刪除篩選器。發生伺服器錯誤';
-$labels['filterdeleted'] = '成功刪除篩選器';
-$labels['filtersaved'] = '成功儲存篩選器。';
-$labels['filtersaveerror'] = '無法儲存篩選器。發生伺服器錯誤';
-$labels['filterdeleteconfirm'] = '您確定要刪除選擇的郵件規則嗎?';
-$labels['ruledeleteconfirm'] = '您確定要刪除選的規則嗎？';
-$labels['actiondeleteconfirm'] = '您確定要刪除選擇的動作嗎？';
-$labels['forbiddenchars'] = '內容包含禁用字元';
-$labels['cannotbeempty'] = '內容不能為空白';
-$labels['ruleexist'] = '規則名稱重複';
-$labels['setactivateerror'] = '無法啟用選擇的篩選器集合。 伺服器發生錯誤';
-$labels['setdeactivateerror'] = '無法停用選擇的篩選器集合。 伺服器發生錯誤';
-$labels['setdeleteerror'] = '無法刪除選擇的篩選器集合。 伺服器發生錯誤';
-$labels['setactivated'] = '篩選器集合成功啟用';
-$labels['setdeactivated'] = '篩選器集合成功停用';
-$labels['setdeleted'] = '篩選器集合成功刪除';
-$labels['setdeleteconfirm'] = '你確定要刪除選擇的篩選器集合嗎？';
-$labels['setcreateerror'] = '無法建立篩選器集合。 伺服器發生錯誤';
-$labels['setcreated'] = '篩選器集合成功建立';
-$labels['activateerror'] = '無法啟用選擇的篩選器。伺服器錯誤';
-$labels['deactivateerror'] = '無法停用選擇的篩選器。伺服器錯誤';
-$labels['activated'] = '篩選器已停用';
-$labels['deactivated'] = '篩選器已啟用';
-$labels['moved'] = '篩選器已移動';
-$labels['moveerror'] = '無法移動選擇的篩選器。伺服器錯誤';
-$labels['nametoolong'] = '無法建立篩選器集合。 名稱太長';
+$labels['octet'] = '嚴謹模式(八位元組)';
+$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['nametoolong'] = '無法建立篩選器集合。 名稱太長';
+$messages['namereserved'] = '保留名稱.';
+$messages['setexist'] = '設定已存在';
+$messages['nodata'] = '至少要選擇一個位置';
 
+?>
diff --git a/plugins/managesieve/managesieve.js b/plugins/managesieve/managesieve.js
index 04b9a76af..f6bf4b47c 100644
--- a/plugins/managesieve/managesieve.js
+++ b/plugins/managesieve/managesieve.js
@@ -55,6 +55,11 @@ if (window.rcmail) {
         }
 
         $('input[type="text"]:first', rcmail.gui_objects.sieveform).focus();
+
+        // initialize smart list inputs
+        $('textarea[data-type="list"]', rcmail.gui_objects.sieveform).each(function() {
+          smart_field_init(this);
+        });
       }
       else {
         rcmail.enable_command('plugin.managesieve-add', 'plugin.managesieve-setadd', !rcmail.env.sieveconnerror);
@@ -469,6 +474,11 @@ rcube_webmail.prototype.managesieve_rulefill = function(content, id, after)
     row.className = 'rulerow';
     row.innerHTML = content;
 
+    // initialize smart list inputs
+    $('textarea[data-type="list"]', row).each(function() {
+      smart_field_init(this);
+    });
+
     this.managesieve_formbuttons(div);
   }
 };
@@ -565,40 +575,45 @@ function rule_header_select(id)
   var obj = document.getElementById('header' + id),
     size = document.getElementById('rule_size' + id),
     op = document.getElementById('rule_op' + id),
-    target = document.getElementById('rule_target' + id),
-    header = document.getElementById('custom_header' + id),
+    header = document.getElementById('custom_header' + id + '_list'),
     mod = document.getElementById('rule_mod' + id),
     trans = document.getElementById('rule_trans' + id),
-    comp = document.getElementById('rule_comp' + id);
+    comp = document.getElementById('rule_comp' + id),
+    datepart = document.getElementById('rule_date_part' + id),
+    dateheader = document.getElementById('rule_date_header_div' + id),
+    h = obj.value;
 
-  if (obj.value == 'size') {
+  if (h == 'size') {
     size.style.display = 'inline';
-    op.style.display = 'none';
-    target.style.display = 'none';
-    header.style.display = 'none';
-    mod.style.display = 'none';
-    trans.style.display = 'none';
-    comp.style.display = 'none';
+    $.each([op, header, mod, trans, comp], function() { this.style.display = 'none'; });
   }
   else {
-    header.style.display = obj.value != '...' ? 'none' : 'inline';
+    header.style.display = h != '...' ? 'none' : 'inline-block';
     size.style.display = 'none';
     op.style.display = 'inline';
     comp.style.display = '';
-    rule_op_select(id);
-    mod.style.display = obj.value == 'body' ? 'none' : 'block';
-    trans.style.display = obj.value == 'body' ? 'block' : 'none';
+    mod.style.display = h == 'body' || h == 'currentdate' || h == 'date' ? 'none' : 'block';
+    trans.style.display = h == 'body' ? 'block' : 'none';
   }
 
-  obj.style.width = obj.value == '...' ? '40px' : '';
+  if (datepart)
+    datepart.style.display = h == 'currentdate' || h == 'date' ? 'inline' : 'none';
+  if (dateheader)
+    dateheader.style.display = h == 'date' ? '' : 'none';
+
+  rule_op_select(op, id, h);
+  rule_mod_select(id, h);
+  obj.style.width = h == '...' ? '40px' : '';
 };
 
-function rule_op_select(id)
+function rule_op_select(obj, id, header)
 {
-  var obj = document.getElementById('rule_op' + id),
-    target = document.getElementById('rule_target' + id);
+  var target = document.getElementById('rule_target' + id + '_list');
 
-  target.style.display = obj.value == 'exists' || obj.value == 'notexists' ? 'none' : 'inline';
+  if (!header)
+    header = document.getElementById('header' + id).value;
+
+  target.style.display = obj.value == 'exists' || obj.value == 'notexists' || header == 'size' ? 'none' : 'inline-block';
 };
 
 function rule_trans_select(id)
@@ -609,12 +624,19 @@ function rule_trans_select(id)
   target.style.display = obj.value != 'content' ? 'none' : 'inline';
 };
 
-function rule_mod_select(id)
+function rule_mod_select(id, header)
 {
   var obj = document.getElementById('rule_mod_op' + id),
-    target = document.getElementById('rule_mod_type' + id);
+    target = document.getElementById('rule_mod_type' + id),
+    index = document.getElementById('rule_index_div' + id);
+
+  if (!header)
+    header = document.getElementById('header' + id).value;
 
   target.style.display = obj.value != 'address' && obj.value != 'envelope' ? 'none' : 'inline';
+
+  if (index)
+    index.style.display = header != 'body' && header != 'currentdate' && header != 'size' && obj.value != 'envelope'  ? '' : 'none';
 };
 
 function rule_join_radio(value)
@@ -639,7 +661,7 @@ function rule_adv_switch(id, elem)
 function action_type_select(id)
 {
   var obj = document.getElementById('action_type' + id),
-    enabled = {},
+    v = obj.value(), enabled = {},
     elems = {
       mailbox: document.getElementById('action_mailbox' + id),
       target: document.getElementById('action_target' + id),
@@ -650,25 +672,25 @@ function action_type_select(id)
       notify: document.getElementById('action_notify' + id)
     };
 
-  if (obj.value == 'fileinto' || obj.value == 'fileinto_copy') {
+  if (v == 'fileinto' || v == 'fileinto_copy') {
     enabled.mailbox = 1;
   }
-  else if (obj.value == 'redirect' || obj.value == 'redirect_copy') {
+  else if (v == 'redirect' || v == 'redirect_copy') {
     enabled.target = 1;
   }
-  else if (obj.value.match(/^reject|ereject$/)) {
+  else if (v.match(/^reject|ereject$/)) {
     enabled.target_area = 1;
   }
-  else if (obj.value.match(/^(add|set|remove)flag$/)) {
+  else if (v.match(/^(add|set|remove)flag$/)) {
     enabled.flags = 1;
   }
-  else if (obj.value == 'vacation') {
+  else if (v == 'vacation') {
     enabled.vacation = 1;
   }
-  else if (obj.value == 'set') {
+  else if (v == 'set') {
     enabled.set = 1;
   }
-  else if (obj.value == 'notify') {
+  else if (v == 'notify') {
     enabled.notify = 1;
   }
 
@@ -677,6 +699,72 @@ function action_type_select(id)
   }
 };
 
+// Inititalizes smart list input
+function smart_field_init(field)
+{
+  var id = field.id + '_list',
+    area = $('<span class="listarea"></span>'),
+    list = field.value ? field.value.split("\n") : [''];
+
+  if ($('#'+id).length)
+    return;
+
+  // add input rows
+  $.each(list, function(i, v) {
+    area.append(smart_field_row(v, field.name, i, $(field).data('size')));
+  });
+
+  area.attr('id', id);
+  field = $(field);
+
+  if (field.attr('disabled'))
+    area.hide();
+
+  field.after(area);
+
+  if (field.hasClass('error')) {
+    area.addClass('error');
+    rcmail.managesieve_tip_register([[id, field.data('tip')]]);
+  }
+};
+
+function smart_field_row(value, name, idx, size)
+{
+  // build row element content
+  var input, content = '<span class="listelement">'
+      + '<span class="reset"></span><input type="text"></span>',
+    elem = $(content),
+    attrs = {value: value, name: name + '[]'};
+
+  if (size)
+    attrs.size = size;
+
+  input = $('input', elem).attr(attrs).keydown(function(e) {
+    var input = $(this);
+    // element creation event (on Enter)
+    if (e.which == 13) {
+      var name = input.attr('name').replace(/\[\]$/, ''),
+        dt = (new Date()).getTime(),
+        elem = smart_field_row('', name, dt, size);
+
+      input.parent().after(elem);
+      $('input', elem).focus();
+    }
+  });
+
+  // element deletion event
+  $('span[class="reset"]', elem).click(function() {
+    var span = $(this.parentNode);
+
+    if (span.parent().children().length > 1)
+      span.remove();
+    else
+      $('input', span).val('').focus();
+  });
+
+  return elem;
+}
+
 // Register onmouse(leave/enter) events for tips on specified form element
 rcube_webmail.prototype.managesieve_tip_register = function(tips)
 {
@@ -685,25 +773,26 @@ rcube_webmail.prototype.managesieve_tip_register = function(tips)
 
   for (var n in tips) {
     $('#'+tips[n][0])
-      .bind('mouseenter', {str: tips[n][1]},
-        function(e) {
-          var offset = $(this).offset(),
-            left = offset.left,
-            top = offset.top - 12,
-            minwidth = $(this).width();
-
-          if (framed) {
-            offset = $((rcmail.env.task == 'mail'  ? '#sievefilterform > iframe' : '#filter-box'), parent.document).offset();
-            top  += offset.top;
-            left += offset.left;
-          }
-
-          tip.html(e.data.str)
-          top -= tip.height();
-
-          tip.css({left: left, top: top, minWidth: (minwidth-2) + 'px'}).show();
-        })
-      .bind('mouseleave', function(e) { tip.hide(); });
+      .data('tip', tips[n][1])
+      .bind('mouseenter', function(e) {
+        var elem = $(this),
+          offset = elem.offset(),
+          left = offset.left,
+          top = offset.top - 12,
+          minwidth = elem.width();
+
+        if (framed) {
+          offset = $((rcmail.env.task == 'mail'  ? '#sievefilterform > iframe' : '#filter-box'), parent.document).offset();
+          top  += offset.top;
+          left += offset.left;
+        }
+
+        tip.html(elem.data('tip'));
+        top -= tip.height();
+
+        tip.css({left: left, top: top, minWidth: (minwidth-2) + 'px'}).show();
+      })
+    .bind('mouseleave', function(e) { tip.hide(); });
   }
 };
 
diff --git a/plugins/managesieve/managesieve.php b/plugins/managesieve/managesieve.php
index 8f50cd5a2..f99a3b866 100644
--- a/plugins/managesieve/managesieve.php
+++ b/plugins/managesieve/managesieve.php
@@ -12,8 +12,8 @@
  *
  * Configuration (see config.inc.php.dist)
  *
- * Copyright (C) 2008-2012, The Roundcube Dev Team
- * Copyright (C) 2011-2012, Kolab Systems AG
+ * Copyright (C) 2008-2013, The Roundcube Dev Team
+ * Copyright (C) 2011-2013, Kolab Systems AG
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2
@@ -32,40 +32,8 @@
 class managesieve extends rcube_plugin
 {
     public $task = 'mail|settings';
-
     private $rc;
-    private $sieve;
-    private $errors;
-    private $form;
-    private $tips = array();
-    private $script = array();
-    private $exts = array();
-    private $list;
-    private $active = array();
-    private $headers = array(
-        'subject' => 'Subject',
-        'from'    => 'From',
-        'to'      => 'To',
-    );
-    private $addr_headers = array(
-        // Required
-        "from", "to", "cc", "bcc", "sender", "resent-from", "resent-to",
-        // Additional (RFC 822 / RFC 2822)
-        "reply-to", "resent-reply-to", "resent-sender", "resent-cc", "resent-bcc",
-        // Non-standard (RFC 2076, draft-palme-mailext-headers-08.txt)
-        "for-approval", "for-handling", "for-comment", "apparently-to", "errors-to",
-        "delivered-to", "return-receipt-to", "x-admin", "read-receipt-to",
-        "x-confirm-reading-to", "return-receipt-requested",
-        "registered-mail-reply-requested-by", "mail-followup-to", "mail-reply-to",
-        "abuse-reports-to", "x-complaints-to", "x-report-abuse-to",
-        // Undocumented
-        "x-beenthere",
-    );
-
-    const VERSION  = '6.1';
-    const PROGNAME = 'Roundcube (Managesieve)';
-    const PORT     = 4190;
-
+    private $engine;
 
     function init()
     {
@@ -92,10 +60,11 @@ class managesieve extends rcube_plugin
     /**
      * Initializes plugin's UI (localization, js script)
      */
-    private function init_ui()
+    function init_ui()
     {
-        if ($this->ui_initialized)
+        if ($this->ui_initialized) {
             return;
+        }
 
         // load localization
         $this->add_texts('localization/', array('filters','managefilters'));
@@ -109,6 +78,11 @@ class managesieve extends rcube_plugin
      */
     function mail_task_handler()
     {
+        // make sure we're not in ajax request
+        if ($this->rc->output->type != 'html') {
+            return;
+        }
+
         // use jQuery for popup window
         $this->require_plugin('jqueryui');
 
@@ -180,352 +154,18 @@ class managesieve extends rcube_plugin
     }
 
     /**
-     * Loads configuration, initializes plugin (including sieve connection)
+     * Plugin action handler
      */
-    function managesieve_start()
-    {
-        $this->load_config();
-
-        // register UI objects
-        $this->rc->output->add_handlers(array(
-            'filterslist'    => array($this, 'filters_list'),
-            'filtersetslist' => array($this, 'filtersets_list'),
-            'filterframe'    => array($this, 'filter_frame'),
-            'filterform'     => array($this, 'filter_form'),
-            'filtersetform'  => array($this, 'filterset_form'),
-        ));
-
-        // Add include path for internal classes
-        $include_path = $this->home . '/lib' . PATH_SEPARATOR;
-        $include_path .= ini_get('include_path');
-        set_include_path($include_path);
-
-        // Get connection parameters
-        $host = $this->rc->config->get('managesieve_host', 'localhost');
-        $port = $this->rc->config->get('managesieve_port');
-        $tls  = $this->rc->config->get('managesieve_usetls', false);
-
-        $host = rcube_utils::parse_host($host);
-        $host = rcube_utils::idn_to_ascii($host);
-
-        // remove tls:// prefix, set TLS flag
-        if (($host = preg_replace('|^tls://|i', '', $host, 1, $cnt)) && $cnt) {
-            $tls = true;
-        }
-
-        if (empty($port)) {
-            $port = getservbyname('sieve', 'tcp');
-            if (empty($port)) {
-                $port = self::PORT;
-            }
-        }
-
-        $plugin = $this->rc->plugins->exec_hook('managesieve_connect', array(
-            'user'      => $_SESSION['username'],
-            'password'  => $this->rc->decrypt($_SESSION['password']),
-            'host'      => $host,
-            'port'      => $port,
-            'usetls'    => $tls,
-            'auth_type' => $this->rc->config->get('managesieve_auth_type'),
-            'disabled'  => $this->rc->config->get('managesieve_disabled_extensions'),
-            'debug'     => $this->rc->config->get('managesieve_debug', false),
-            'auth_cid'  => $this->rc->config->get('managesieve_auth_cid'),
-            'auth_pw'   => $this->rc->config->get('managesieve_auth_pw'),
-        ));
-
-        // try to connect to managesieve server and to fetch the script
-        $this->sieve = new rcube_sieve(
-            $plugin['user'],
-            $plugin['password'],
-            $plugin['host'],
-            $plugin['port'],
-            $plugin['auth_type'],
-            $plugin['usetls'],
-            $plugin['disabled'],
-            $plugin['debug'],
-            $plugin['auth_cid'],
-            $plugin['auth_pw']
-        );
-
-        if (!($error = $this->sieve->error())) {
-            // Get list of scripts
-            $list = $this->list_scripts();
-
-            if (!empty($_GET['_set']) || !empty($_POST['_set'])) {
-                $script_name = rcube_utils::get_input_value('_set', rcube_utils::INPUT_GPC, true);
-            }
-            else if (!empty($_SESSION['managesieve_current'])) {
-                $script_name = $_SESSION['managesieve_current'];
-            }
-            else {
-                // get (first) active script
-                if (!empty($this->active[0])) {
-                    $script_name = $this->active[0];
-                }
-                else if ($list) {
-                    $script_name = $list[0];
-                }
-                // create a new (initial) script
-                else {
-                    // if script not exists build default script contents
-                    $script_file = $this->rc->config->get('managesieve_default');
-                    $script_name = $this->rc->config->get('managesieve_script_name');
-
-                    if (empty($script_name))
-                        $script_name = 'roundcube';
-
-                    if ($script_file && is_readable($script_file))
-                        $content = file_get_contents($script_file);
-
-                    // add script and set it active
-                    if ($this->sieve->save_script($script_name, $content)) {
-                        $this->activate_script($script_name);
-                        $this->list[] = $script_name;
-                    }
-                }
-            }
-
-            if ($script_name) {
-                $this->sieve->load($script_name);
-            }
-
-            $error = $this->sieve->error();
-        }
-
-        // finally set script objects
-        if ($error) {
-            switch ($error) {
-                case SIEVE_ERROR_CONNECTION:
-                case SIEVE_ERROR_LOGIN:
-                    $this->rc->output->show_message('managesieve.filterconnerror', 'error');
-                    break;
-                default:
-                    $this->rc->output->show_message('managesieve.filterunknownerror', 'error');
-                    break;
-            }
-
-            rcube::raise_error(array('code' => 403, 'type' => 'php',
-                'file' => __FILE__, 'line' => __LINE__,
-                'message' => "Unable to connect to managesieve on $host:$port"), true, false);
-
-            // to disable 'Add filter' button set env variable
-            $this->rc->output->set_env('filterconnerror', true);
-            $this->script = array();
-        }
-        else {
-            $this->exts = $this->sieve->get_extensions();
-            $this->script = $this->sieve->script->as_array();
-            $this->rc->output->set_env('currentset', $this->sieve->current);
-            $_SESSION['managesieve_current'] = $this->sieve->current;
-        }
-
-        return $error;
-    }
-
     function managesieve_actions()
     {
         $this->init_ui();
-
-        $error = $this->managesieve_start();
-
-        // Handle user requests
-        if ($action = rcube_utils::get_input_value('_act', rcube_utils::INPUT_GPC)) {
-            $fid = (int) rcube_utils::get_input_value('_fid', rcube_utils::INPUT_POST);
-
-            if ($action == 'delete' && !$error) {
-                if (isset($this->script[$fid])) {
-                    if ($this->sieve->script->delete_rule($fid))
-                        $result = $this->save_script();
-
-                    if ($result === true) {
-                        $this->rc->output->show_message('managesieve.filterdeleted', 'confirmation');
-                        $this->rc->output->command('managesieve_updatelist', 'del', array('id' => $fid));
-                    } else {
-                        $this->rc->output->show_message('managesieve.filterdeleteerror', 'error');
-                    }
-                }
-            }
-            else if ($action == 'move' && !$error) {
-                if (isset($this->script[$fid])) {
-                    $to   = (int) rcube_utils::get_input_value('_to', rcube_utils::INPUT_POST);
-                    $rule = $this->script[$fid];
-
-                    // remove rule
-                    unset($this->script[$fid]);
-                    $this->script = array_values($this->script);
-
-                    // add at target position
-                    if ($to >= count($this->script)) {
-                        $this->script[] = $rule;
-                    }
-                    else {
-                        $script = array();
-                        foreach ($this->script as $idx => $r) {
-                            if ($idx == $to)
-                                $script[] = $rule;
-                            $script[] = $r;
-                        }
-                        $this->script = $script;
-                    }
-
-                    $this->sieve->script->content = $this->script;
-                    $result = $this->save_script();
-
-                    if ($result === true) {
-                        $result = $this->list_rules();
-
-                        $this->rc->output->show_message('managesieve.moved', 'confirmation');
-                        $this->rc->output->command('managesieve_updatelist', 'list',
-                            array('list' => $result, 'clear' => true, 'set' => $to));
-                    } else {
-                        $this->rc->output->show_message('managesieve.moveerror', 'error');
-                    }
-                }
-            }
-            else if ($action == 'act' && !$error) {
-                if (isset($this->script[$fid])) {
-                    $rule     = $this->script[$fid];
-                    $disabled = $rule['disabled'] ? true : false;
-                    $rule['disabled'] = !$disabled;
-                    $result = $this->sieve->script->update_rule($fid, $rule);
-
-                    if ($result !== false)
-                        $result = $this->save_script();
-
-                    if ($result === true) {
-                        if ($rule['disabled'])
-                            $this->rc->output->show_message('managesieve.deactivated', 'confirmation');
-                        else
-                            $this->rc->output->show_message('managesieve.activated', 'confirmation');
-                        $this->rc->output->command('managesieve_updatelist', 'update',
-                            array('id' => $fid, 'disabled' => $rule['disabled']));
-                    } else {
-                        if ($rule['disabled'])
-                            $this->rc->output->show_message('managesieve.deactivateerror', 'error');
-                        else
-                            $this->rc->output->show_message('managesieve.activateerror', 'error');
-                    }
-                }
-            }
-            else if ($action == 'setact' && !$error) {
-                $script_name = rcube_utils::get_input_value('_set', rcube_utils::INPUT_GPC, true);
-                $result = $this->activate_script($script_name);
-                $kep14  = $this->rc->config->get('managesieve_kolab_master');
-
-                if ($result === true) {
-                    $this->rc->output->set_env('active_sets', $this->active);
-                    $this->rc->output->show_message('managesieve.setactivated', 'confirmation');
-                    $this->rc->output->command('managesieve_updatelist', 'setact',
-                        array('name' => $script_name, 'active' => true, 'all' => !$kep14));
-                } else {
-                    $this->rc->output->show_message('managesieve.setactivateerror', 'error');
-                }
-            }
-            else if ($action == 'deact' && !$error) {
-                $script_name = rcube_utils::get_input_value('_set', rcube_utils::INPUT_GPC, true);
-                $result = $this->deactivate_script($script_name);
-
-                if ($result === true) {
-                    $this->rc->output->set_env('active_sets', $this->active);
-                    $this->rc->output->show_message('managesieve.setdeactivated', 'confirmation');
-                    $this->rc->output->command('managesieve_updatelist', 'setact',
-                        array('name' => $script_name, 'active' => false));
-                } else {
-                    $this->rc->output->show_message('managesieve.setdeactivateerror', 'error');
-                }
-            }
-            else if ($action == 'setdel' && !$error) {
-                $script_name = rcube_utils::get_input_value('_set', rcube_utils::INPUT_GPC, true);
-                $result = $this->remove_script($script_name);
-
-                if ($result === true) {
-                    $this->rc->output->show_message('managesieve.setdeleted', 'confirmation');
-                    $this->rc->output->command('managesieve_updatelist', 'setdel',
-                        array('name' => $script_name));
-                    $this->rc->session->remove('managesieve_current');
-                } else {
-                    $this->rc->output->show_message('managesieve.setdeleteerror', 'error');
-                }
-            }
-            else if ($action == 'setget') {
-                $script_name = rcube_utils::get_input_value('_set', rcube_utils::INPUT_GPC, true);
-                $script = $this->sieve->get_script($script_name);
-
-                if (PEAR::isError($script))
-                    exit;
-
-                $browser = new rcube_browser;
-
-                // send download headers
-                header("Content-Type: application/octet-stream");
-                header("Content-Length: ".strlen($script));
-
-                if ($browser->ie)
-                    header("Content-Type: application/force-download");
-                if ($browser->ie && $browser->ver < 7)
-                    $filename = rawurlencode(abbreviate_string($script_name, 55));
-                else if ($browser->ie)
-                    $filename = rawurlencode($script_name);
-                else
-                    $filename = addcslashes($script_name, '\\"');
-
-                header("Content-Disposition: attachment; filename=\"$filename.txt\"");
-                echo $script;
-                exit;
-            }
-            else if ($action == 'list') {
-                $result = $this->list_rules();
-
-                $this->rc->output->command('managesieve_updatelist', 'list', array('list' => $result));
-            }
-            else if ($action == 'ruleadd') {
-                $rid = rcube_utils::get_input_value('_rid', rcube_utils::INPUT_GPC);
-                $id = $this->genid();
-                $content = $this->rule_div($fid, $id, false);
-
-                $this->rc->output->command('managesieve_rulefill', $content, $id, $rid);
-            }
-            else if ($action == 'actionadd') {
-                $aid = rcube_utils::get_input_value('_aid', rcube_utils::INPUT_GPC);
-                $id = $this->genid();
-                $content = $this->action_div($fid, $id, false);
-
-                $this->rc->output->command('managesieve_actionfill', $content, $id, $aid);
-            }
-
-            $this->rc->output->send();
-        }
-        else if ($this->rc->task == 'mail') {
-            // Initialize the form
-            $rules = rcube_utils::get_input_value('r', rcube_utils::INPUT_GET);
-            if (!empty($rules)) {
-                $i = 0;
-                foreach ($rules as $rule) {
-                    list($header, $value) = explode(':', $rule, 2);
-                    $tests[$i] = array(
-                        'type' => 'contains',
-                        'test' => 'header',
-                        'arg1' => $header,
-                        'arg2' => $value,
-                    );
-                    $i++;
-                }
-
-                $this->form = array(
-                    'join'  => count($tests) > 1 ? 'allof' : 'anyof',
-                    'name'  => '',
-                    'tests' => $tests,
-                    'actions' => array(
-                        0 => array('type' => 'fileinto'),
-                        1 => array('type' => 'stop'),
-                    ),
-                );
-            }
-        }
-
-        $this->managesieve_send();
+        $engine = $this->get_engine();
+        $engine->actions();
     }
 
+    /**
+     * Forms save action handler
+     */
     function managesieve_save()
     {
         // load localization
@@ -536,1515 +176,26 @@ class managesieve extends rcube_plugin
             $this->include_script('managesieve.js');
         }
 
-        // Init plugin and handle managesieve connection
-        $error = $this->managesieve_start();
-
-        // get request size limits (#1488648)
-        $max_post = max(array(
-            ini_get('max_input_vars'),
-            ini_get('suhosin.request.max_vars'),
-            ini_get('suhosin.post.max_vars'),
-        ));
-        $max_depth = max(array(
-            ini_get('suhosin.request.max_array_depth'),
-            ini_get('suhosin.post.max_array_depth'),
-        ));
-
-        // check request size limit
-        if ($max_post && count($_POST, COUNT_RECURSIVE) >= $max_post) {
-            rcube::raise_error(array(
-                'code' => 500, 'type' => 'php',
-                'file' => __FILE__, 'line' => __LINE__,
-                'message' => "Request size limit exceeded (one of max_input_vars/suhosin.request.max_vars/suhosin.post.max_vars)"
-                ), true, false);
-            $this->rc->output->show_message('managesieve.filtersaveerror', 'error');
-        }
-        // check request depth limits
-        else if ($max_depth && count($_POST['_header']) > $max_depth) {
-            rcube::raise_error(array(
-                'code' => 500, 'type' => 'php',
-                'file' => __FILE__, 'line' => __LINE__,
-                'message' => "Request size limit exceeded (one of suhosin.request.max_array_depth/suhosin.post.max_array_depth)"
-                ), true, false);
-            $this->rc->output->show_message('managesieve.filtersaveerror', 'error');
-        }
-        // filters set add action
-        else if (!empty($_POST['_newset'])) {
-            $name       = rcube_utils::get_input_value('_name', rcube_utils::INPUT_POST, true);
-            $copy       = rcube_utils::get_input_value('_copy', rcube_utils::INPUT_POST, true);
-            $from       = rcube_utils::get_input_value('_from', rcube_utils::INPUT_POST);
-            $exceptions = $this->rc->config->get('managesieve_filename_exceptions');
-            $kolab      = $this->rc->config->get('managesieve_kolab_master');
-            $name_uc    = mb_strtolower($name);
-            $list       = $this->list_scripts();
-
-            if (!$name) {
-                $this->errors['name'] = $this->gettext('cannotbeempty');
-            }
-            else if (mb_strlen($name) > 128) {
-                $this->errors['name'] = $this->gettext('nametoolong');
-            }
-            else if (!empty($exceptions) && in_array($name, (array)$exceptions)) {
-                $this->errors['name'] = $this->gettext('namereserved');
-            }
-            else if (!empty($kolab) && in_array($name_uc, array('MASTER', 'USER', 'MANAGEMENT'))) {
-                $this->errors['name'] = $this->gettext('namereserved');
-            }
-            else if (in_array($name, $list)) {
-                $this->errors['name'] = $this->gettext('setexist');
-            }
-            else if ($from == 'file') {
-                // from file
-                if (is_uploaded_file($_FILES['_file']['tmp_name'])) {
-                    $file = file_get_contents($_FILES['_file']['tmp_name']);
-                    $file = preg_replace('/\r/', '', $file);
-                    // for security don't save script directly
-                    // check syntax before, like this...
-                    $this->sieve->load_script($file);
-                    if (!$this->save_script($name)) {
-                        $this->errors['file'] = $this->gettext('setcreateerror');
-                    }
-                }
-                else {  // upload failed
-                    $err = $_FILES['_file']['error'];
-
-                    if ($err == UPLOAD_ERR_INI_SIZE || $err == UPLOAD_ERR_FORM_SIZE) {
-                        $msg = $this->rc->gettext(array('name' => 'filesizeerror',
-                            'vars' => array('size' =>
-                                $this->rc->show_bytes(parse_bytes(ini_get('upload_max_filesize'))))));
-                    }
-                    else {
-                        $this->errors['file'] = $this->gettext('fileuploaderror');
-                    }
-                }
-            }
-            else if (!$this->sieve->copy($name, $from == 'set' ? $copy : '')) {
-                $error = 'managesieve.setcreateerror';
-            }
-
-            if (!$error && empty($this->errors)) {
-                // Find position of the new script on the list
-                $list[] = $name;
-                asort($list, SORT_LOCALE_STRING);
-                $list  = array_values($list);
-                $index = array_search($name, $list);
-
-                $this->rc->output->show_message('managesieve.setcreated', 'confirmation');
-                $this->rc->output->command('parent.managesieve_updatelist', 'setadd',
-                    array('name' => $name, 'index' => $index));
-            } else if ($msg) {
-                $this->rc->output->command('display_message', $msg, 'error');
-            } else if ($error) {
-                $this->rc->output->show_message($error, 'error');
-            }
-        }
-        // filter add/edit action
-        else if (isset($_POST['_name'])) {
-            $name = trim(rcube_utils::get_input_value('_name', rcube_utils::INPUT_POST, true));
-            $fid  = trim(rcube_utils::get_input_value('_fid', rcube_utils::INPUT_POST));
-            $join = trim(rcube_utils::get_input_value('_join', rcube_utils::INPUT_POST));
-
-            // and arrays
-            $headers        = rcube_utils::get_input_value('_header', rcube_utils::INPUT_POST);
-            $cust_headers   = rcube_utils::get_input_value('_custom_header', rcube_utils::INPUT_POST);
-            $ops            = rcube_utils::get_input_value('_rule_op', rcube_utils::INPUT_POST);
-            $sizeops        = rcube_utils::get_input_value('_rule_size_op', rcube_utils::INPUT_POST);
-            $sizeitems      = rcube_utils::get_input_value('_rule_size_item', rcube_utils::INPUT_POST);
-            $sizetargets    = rcube_utils::get_input_value('_rule_size_target', rcube_utils::INPUT_POST);
-            $targets        = rcube_utils::get_input_value('_rule_target', rcube_utils::INPUT_POST, true);
-            $mods           = rcube_utils::get_input_value('_rule_mod', rcube_utils::INPUT_POST);
-            $mod_types      = rcube_utils::get_input_value('_rule_mod_type', rcube_utils::INPUT_POST);
-            $body_trans     = rcube_utils::get_input_value('_rule_trans', rcube_utils::INPUT_POST);
-            $body_types     = rcube_utils::get_input_value('_rule_trans_type', rcube_utils::INPUT_POST, true);
-            $comparators    = rcube_utils::get_input_value('_rule_comp', rcube_utils::INPUT_POST);
-            $act_types      = rcube_utils::get_input_value('_action_type', rcube_utils::INPUT_POST, true);
-            $mailboxes      = rcube_utils::get_input_value('_action_mailbox', rcube_utils::INPUT_POST, true);
-            $act_targets    = rcube_utils::get_input_value('_action_target', rcube_utils::INPUT_POST, true);
-            $area_targets   = rcube_utils::get_input_value('_action_target_area', rcube_utils::INPUT_POST, true);
-            $reasons        = rcube_utils::get_input_value('_action_reason', rcube_utils::INPUT_POST, true);
-            $addresses      = rcube_utils::get_input_value('_action_addresses', rcube_utils::INPUT_POST, true);
-            $days           = rcube_utils::get_input_value('_action_days', rcube_utils::INPUT_POST);
-            $subject        = rcube_utils::get_input_value('_action_subject', rcube_utils::INPUT_POST, true);
-            $flags          = rcube_utils::get_input_value('_action_flags', rcube_utils::INPUT_POST);
-            $varnames       = rcube_utils::get_input_value('_action_varname', rcube_utils::INPUT_POST);
-            $varvalues      = rcube_utils::get_input_value('_action_varvalue', rcube_utils::INPUT_POST);
-            $varmods        = rcube_utils::get_input_value('_action_varmods', rcube_utils::INPUT_POST);
-            $notifyaddrs    = rcube_utils::get_input_value('_action_notifyaddress', rcube_utils::INPUT_POST);
-            $notifybodies   = rcube_utils::get_input_value('_action_notifybody', rcube_utils::INPUT_POST);
-            $notifymessages = rcube_utils::get_input_value('_action_notifymessage', rcube_utils::INPUT_POST);
-            $notifyfrom     = rcube_utils::get_input_value('_action_notifyfrom', rcube_utils::INPUT_POST);
-            $notifyimp      = rcube_utils::get_input_value('_action_notifyimportance', rcube_utils::INPUT_POST);
-
-            // we need a "hack" for radiobuttons
-            foreach ($sizeitems as $item)
-                $items[] = $item;
-
-            $this->form['disabled'] = $_POST['_disabled'] ? true : false;
-            $this->form['join']     = $join=='allof' ? true : false;
-            $this->form['name']     = $name;
-            $this->form['tests']    = array();
-            $this->form['actions']  = array();
-
-            if ($name == '')
-                $this->errors['name'] = $this->gettext('cannotbeempty');
-            else {
-                foreach($this->script as $idx => $rule)
-                    if($rule['name'] == $name && $idx != $fid) {
-                        $this->errors['name'] = $this->gettext('ruleexist');
-                        break;
-                    }
-            }
-
-            $i = 0;
-            // rules
-            if ($join == 'any') {
-                $this->form['tests'][0]['test'] = 'true';
-            }
-            else {
-                foreach ($headers as $idx => $header) {
-                    $header     = $this->strip_value($header);
-                    $target     = $this->strip_value($targets[$idx], true);
-                    $operator   = $this->strip_value($ops[$idx]);
-                    $comparator = $this->strip_value($comparators[$idx]);
-
-                    if ($header == 'size') {
-                        $sizeop     = $this->strip_value($sizeops[$idx]);
-                        $sizeitem   = $this->strip_value($items[$idx]);
-                        $sizetarget = $this->strip_value($sizetargets[$idx]);
-
-                        $this->form['tests'][$i]['test'] = 'size';
-                        $this->form['tests'][$i]['type'] = $sizeop;
-                        $this->form['tests'][$i]['arg']  = $sizetarget;
-
-                        if ($sizetarget == '')
-                            $this->errors['tests'][$i]['sizetarget'] = $this->gettext('cannotbeempty');
-                        else if (!preg_match('/^[0-9]+(K|M|G)?$/i', $sizetarget.$sizeitem, $m)) {
-                            $this->errors['tests'][$i]['sizetarget'] = $this->gettext('forbiddenchars');
-                            $this->form['tests'][$i]['item'] = $sizeitem;
-                        }
-                        else
-                            $this->form['tests'][$i]['arg'] .= $m[1];
-                    }
-                    else if ($header == 'body') {
-                        $trans      = $this->strip_value($body_trans[$idx]);
-                        $trans_type = $this->strip_value($body_types[$idx], true);
-
-                        if (preg_match('/^not/', $operator))
-                            $this->form['tests'][$i]['not'] = true;
-                        $type = preg_replace('/^not/', '', $operator);
-
-                        if ($type == 'exists') {
-                            $this->errors['tests'][$i]['op'] = true;
-                        }
-
-                        $this->form['tests'][$i]['test'] = 'body';
-                        $this->form['tests'][$i]['type'] = $type;
-                        $this->form['tests'][$i]['arg']  = $target;
-
-                        if ($target == '' && $type != 'exists')
-                            $this->errors['tests'][$i]['target'] = $this->gettext('cannotbeempty');
-                        else if (preg_match('/^(value|count)-/', $type) && !preg_match('/[0-9]+/', $target))
-                            $this->errors['tests'][$i]['target'] = $this->gettext('forbiddenchars');
-
-                        $this->form['tests'][$i]['part'] = $trans;
-                        if ($trans == 'content') {
-                            $this->form['tests'][$i]['content'] = $trans_type;
-                        }
-                    }
-                    else {
-                        $cust_header = $headers = $this->strip_value($cust_headers[$idx]);
-                        $mod      = $this->strip_value($mods[$idx]);
-                        $mod_type = $this->strip_value($mod_types[$idx]);
-
-                        if (preg_match('/^not/', $operator))
-                            $this->form['tests'][$i]['not'] = true;
-                        $type = preg_replace('/^not/', '', $operator);
-
-                        if ($header == '...') {
-                            $headers = preg_split('/[\s,]+/', $cust_header, -1, PREG_SPLIT_NO_EMPTY);
-
-                            if (!count($headers))
-                                $this->errors['tests'][$i]['header'] = $this->gettext('cannotbeempty');
-                            else {
-                                foreach ($headers as $hr) {
-                                    // RFC2822: printable ASCII except colon
-                                    if (!preg_match('/^[\x21-\x39\x41-\x7E]+$/i', $hr)) {
-                                        $this->errors['tests'][$i]['header'] = $this->gettext('forbiddenchars');
-                                    }
-                                }
-                            }
-
-                            if (empty($this->errors['tests'][$i]['header']))
-                                $cust_header = (is_array($headers) && count($headers) == 1) ? $headers[0] : $headers;
-                        }
-
-                        if ($type == 'exists') {
-                            $this->form['tests'][$i]['test'] = 'exists';
-                            $this->form['tests'][$i]['arg'] = $header == '...' ? $cust_header : $header;
-                        }
-                        else {
-                            $test   = 'header';
-                            $header = $header == '...' ? $cust_header : $header;
-
-                            if ($mod == 'address' || $mod == 'envelope') {
-                                $found = false;
-                                if (empty($this->errors['tests'][$i]['header'])) {
-                                    foreach ((array)$header as $hdr) {
-                                        if (!in_array(strtolower(trim($hdr)), $this->addr_headers))
-                                            $found = true;
-                                    }
-                                }
-                                if (!$found)
-                                    $test = $mod;
-                            }
-
-                            $this->form['tests'][$i]['type'] = $type;
-                            $this->form['tests'][$i]['test'] = $test;
-                            $this->form['tests'][$i]['arg1'] = $header;
-                            $this->form['tests'][$i]['arg2'] = $target;
-
-                            if ($target == '')
-                                $this->errors['tests'][$i]['target'] = $this->gettext('cannotbeempty');
-                            else if (preg_match('/^(value|count)-/', $type) && !preg_match('/[0-9]+/', $target))
-                                $this->errors['tests'][$i]['target'] = $this->gettext('forbiddenchars');
-
-                            if ($mod) {
-                                $this->form['tests'][$i]['part'] = $mod_type;
-                            }
-                        }
-                    }
-
-                    if ($header != 'size' && $comparator) {
-                        if (preg_match('/^(value|count)/', $this->form['tests'][$i]['type']))
-                            $comparator = 'i;ascii-numeric';
-
-                        $this->form['tests'][$i]['comparator'] = $comparator;
-                    }
-
-                    $i++;
-                }
-            }
-
-            $i = 0;
-            // actions
-            foreach($act_types as $idx => $type) {
-                $type   = $this->strip_value($type);
-                $target = $this->strip_value($act_targets[$idx]);
-
-                switch ($type) {
-
-                case 'fileinto':
-                case 'fileinto_copy':
-                    $mailbox = $this->strip_value($mailboxes[$idx]);
-                    $this->form['actions'][$i]['target'] = $this->mod_mailbox($mailbox, 'in');
-                    if ($type == 'fileinto_copy') {
-                        $type = 'fileinto';
-                        $this->form['actions'][$i]['copy'] = true;
-                    }
-                    break;
-
-                case 'reject':
-                case 'ereject':
-                    $target = $this->strip_value($area_targets[$idx]);
-                    $this->form['actions'][$i]['target'] = str_replace("\r\n", "\n", $target);
-
- //                 if ($target == '')
-//                      $this->errors['actions'][$i]['targetarea'] = $this->gettext('cannotbeempty');
-                    break;
-
-                case 'redirect':
-                case 'redirect_copy':
-                    $this->form['actions'][$i]['target'] = $target;
-
-                    if ($this->form['actions'][$i]['target'] == '')
-                        $this->errors['actions'][$i]['target'] = $this->gettext('cannotbeempty');
-                    else if (!rcube_utils::check_email($this->form['actions'][$i]['target']))
-                        $this->errors['actions'][$i]['target'] = $this->gettext('noemailwarning');
-
-                    if ($type == 'redirect_copy') {
-                        $type = 'redirect';
-                        $this->form['actions'][$i]['copy'] = true;
-                    }
-                    break;
-
-                case 'addflag':
-                case 'setflag':
-                case 'removeflag':
-                    $_target = array();
-                    if (empty($flags[$idx])) {
-                        $this->errors['actions'][$i]['target'] = $this->gettext('noflagset');
-                    }
-                    else {
-                        foreach ($flags[$idx] as $flag) {
-                            $_target[] = $this->strip_value($flag);
-                        }
-                    }
-                    $this->form['actions'][$i]['target'] = $_target;
-                    break;
-
-                case 'vacation':
-                    $reason = $this->strip_value($reasons[$idx]);
-                    $this->form['actions'][$i]['reason']    = str_replace("\r\n", "\n", $reason);
-                    $this->form['actions'][$i]['days']      = $days[$idx];
-                    $this->form['actions'][$i]['subject']   = $subject[$idx];
-                    $this->form['actions'][$i]['addresses'] = explode(',', $addresses[$idx]);
-// @TODO: vacation :mime, :from, :handle
-
-                    if ($this->form['actions'][$i]['addresses']) {
-                        foreach($this->form['actions'][$i]['addresses'] as $aidx => $address) {
-                            $address = trim($address);
-                            if (!$address)
-                                unset($this->form['actions'][$i]['addresses'][$aidx]);
-                            else if(!rcube_utils::check_email($address)) {
-                                $this->errors['actions'][$i]['addresses'] = $this->gettext('noemailwarning');
-                                break;
-                            } else
-                                $this->form['actions'][$i]['addresses'][$aidx] = $address;
-                        }
-                    }
-
-                    if ($this->form['actions'][$i]['reason'] == '')
-                        $this->errors['actions'][$i]['reason'] = $this->gettext('cannotbeempty');
-                    if ($this->form['actions'][$i]['days'] && !preg_match('/^[0-9]+$/', $this->form['actions'][$i]['days']))
-                        $this->errors['actions'][$i]['days'] = $this->gettext('forbiddenchars');
-                    break;
-
-                case 'set':
-                    $this->form['actions'][$i]['name'] = $varnames[$idx];
-                    $this->form['actions'][$i]['value'] = $varvalues[$idx];
-                    foreach ((array)$varmods[$idx] as $v_m) {
-                        $this->form['actions'][$i][$v_m] = true;
-                    }
-
-                    if (empty($varnames[$idx])) {
-                        $this->errors['actions'][$i]['name'] = $this->gettext('cannotbeempty');
-                    }
-                    else if (!preg_match('/^[0-9a-z_]+$/i', $varnames[$idx])) {
-                        $this->errors['actions'][$i]['name'] = $this->gettext('forbiddenchars');
-                    }
-
-                    if (!isset($varvalues[$idx]) || $varvalues[$idx] === '') {
-                        $this->errors['actions'][$i]['value'] = $this->gettext('cannotbeempty');
-                    }
-                    break;
-
-                case 'notify':
-                    if (empty($notifyaddrs[$idx])) {
-                        $this->errors['actions'][$i]['address'] = $this->gettext('cannotbeempty');
-                    }
-                    else if (!rcube_utils::check_email($notifyaddrs[$idx])) {
-                        $this->errors['actions'][$i]['address'] = $this->gettext('noemailwarning');
-                    }
-                    if (!empty($notifyfrom[$idx]) && !rcube_utils::check_email($notifyfrom[$idx])) {
-                        $this->errors['actions'][$i]['from'] = $this->gettext('noemailwarning');
-                    }
-                    $this->form['actions'][$i]['address'] = $notifyaddrs[$idx];
-                    $this->form['actions'][$i]['body'] = $notifybodies[$idx];
-                    $this->form['actions'][$i]['message'] = $notifymessages[$idx];
-                    $this->form['actions'][$i]['from'] = $notifyfrom[$idx];
-                    $this->form['actions'][$i]['importance'] = $notifyimp[$idx];
-                    break;
-                }
-
-                $this->form['actions'][$i]['type'] = $type;
-                $i++;
-            }
-
-            if (!$this->errors && !$error) {
-                // zapis skryptu
-                if (!isset($this->script[$fid])) {
-                    $fid = $this->sieve->script->add_rule($this->form);
-                    $new = true;
-                } else
-                    $fid = $this->sieve->script->update_rule($fid, $this->form);
-
-                if ($fid !== false)
-                    $save = $this->save_script();
-
-                if ($save && $fid !== false) {
-                    $this->rc->output->show_message('managesieve.filtersaved', 'confirmation');
-                    if ($this->rc->task != 'mail') {
-                        $this->rc->output->command('parent.managesieve_updatelist',
-                            isset($new) ? 'add' : 'update',
-                            array(
-                                'name' => rcube::Q($this->form['name']),
-                                'id' => $fid,
-                                'disabled' => $this->form['disabled']
-                        ));
-                    }
-                    else {
-                        $this->rc->output->command('managesieve_dialog_close');
-                        $this->rc->output->send('iframe');
-                    }
-                }
-                else {
-                    $this->rc->output->show_message('managesieve.filtersaveerror', 'error');
-//                  $this->rc->output->send();
-                }
-            }
-        }
-
-        $this->managesieve_send();
-    }
-
-    private function managesieve_send()
-    {
-        // Handle form action
-        if (isset($_GET['_framed']) || isset($_POST['_framed'])) {
-            if (isset($_GET['_newset']) || isset($_POST['_newset'])) {
-                $this->rc->output->send('managesieve.setedit');
-            }
-            else {
-                $this->rc->output->send('managesieve.filteredit');
-            }
-        } else {
-            $this->rc->output->set_pagetitle($this->gettext('filters'));
-            $this->rc->output->send('managesieve.managesieve');
-        }
-    }
-
-    // return the filters list as HTML table
-    function filters_list($attrib)
-    {
-        // add id to message list table if not specified
-        if (!strlen($attrib['id']))
-            $attrib['id'] = 'rcmfilterslist';
-
-        // define list of cols to be displayed
-        $a_show_cols = array('name');
-
-        $result = $this->list_rules();
-
-        // create XHTML table
-        $out = $this->rc->table_output($attrib, $result, $a_show_cols, 'id');
-
-        // set client env
-        $this->rc->output->add_gui_object('filterslist', $attrib['id']);
-        $this->rc->output->include_script('list.js');
-
-        // add some labels to client
-        $this->rc->output->add_label('managesieve.filterdeleteconfirm');
-
-        return $out;
-    }
-
-    // return the filters list as <SELECT>
-    function filtersets_list($attrib, $no_env = false)
-    {
-        // add id to message list table if not specified
-        if (!strlen($attrib['id']))
-            $attrib['id'] = 'rcmfiltersetslist';
-
-        $list = $this->list_scripts();
-
-        if ($list) {
-            asort($list, SORT_LOCALE_STRING);
-        }
-
-        if (!empty($attrib['type']) && $attrib['type'] == 'list') {
-            // define list of cols to be displayed
-            $a_show_cols = array('name');
-
-            if ($list) {
-                foreach ($list as $idx => $set) {
-                    $scripts['S'.$idx] = $set;
-                    $result[] = array(
-                        'name' => rcube::Q($set),
-                        'id' => 'S'.$idx,
-                        'class' => !in_array($set, $this->active) ? 'disabled' : '',
-                    );
-                }
-            }
-
-            // create XHTML table
-            $out = $this->rc->table_output($attrib, $result, $a_show_cols, 'id');
-
-            $this->rc->output->set_env('filtersets', $scripts);
-            $this->rc->output->include_script('list.js');
-        }
-        else {
-            $select = new html_select(array('name' => '_set', 'id' => $attrib['id'],
-                'onchange' => $this->rc->task != 'mail' ? 'rcmail.managesieve_set()' : ''));
-
-            if ($list) {
-                foreach ($list as $set)
-                    $select->add($set, $set);
-            }
-
-            $out = $select->show($this->sieve->current);
-        }
-
-        // set client env
-        if (!$no_env) {
-            $this->rc->output->add_gui_object('filtersetslist', $attrib['id']);
-            $this->rc->output->add_label('managesieve.setdeleteconfirm');
-        }
-
-        return $out;
-    }
-
-    function filter_frame($attrib)
-    {
-        if (!$attrib['id'])
-            $attrib['id'] = 'rcmfilterframe';
-
-        $attrib['name'] = $attrib['id'];
-
-        $this->rc->output->set_env('contentframe', $attrib['name']);
-        $this->rc->output->set_env('blankpage', $attrib['src'] ?
-        $this->rc->output->abs_url($attrib['src']) : 'program/resources/blank.gif');
-
-        return $this->rc->output->frame($attrib);
-    }
-
-    function filterset_form($attrib)
-    {
-        if (!$attrib['id'])
-            $attrib['id'] = 'rcmfiltersetform';
-
-        $out = '<form name="filtersetform" action="./" method="post" enctype="multipart/form-data">'."\n";
-
-        $hiddenfields = new html_hiddenfield(array('name' => '_task', 'value' => $this->rc->task));
-        $hiddenfields->add(array('name' => '_action', 'value' => 'plugin.managesieve-save'));
-        $hiddenfields->add(array('name' => '_framed', 'value' => ($_POST['_framed'] || $_GET['_framed'] ? 1 : 0)));
-        $hiddenfields->add(array('name' => '_newset', 'value' => 1));
-
-        $out .= $hiddenfields->show();
-
-        $name     = rcube_utils::get_input_value('_name', rcube_utils::INPUT_POST);
-        $copy     = rcube_utils::get_input_value('_copy', rcube_utils::INPUT_POST);
-        $selected = rcube_utils::get_input_value('_from', rcube_utils::INPUT_POST);
-
-        // filter set name input
-        $input_name = new html_inputfield(array('name' => '_name', 'id' => '_name', 'size' => 30,
-            'class' => ($this->errors['name'] ? 'error' : '')));
-
-        $out .= sprintf('<label for="%s"><b>%s:</b></label> %s<br /><br />',
-            '_name', rcube::Q($this->gettext('filtersetname')), $input_name->show($name));
-
-        $out .="\n<fieldset class=\"itemlist\"><legend>" . $this->gettext('filters') . ":</legend>\n";
-        $out .= '<input type="radio" id="from_none" name="_from" value="none"'
-            .(!$selected || $selected=='none' ? ' checked="checked"' : '').'></input>';
-        $out .= sprintf('<label for="%s">%s</label> ', 'from_none', rcube::Q($this->gettext('none')));
-
-        // filters set list
-        $list   = $this->list_scripts();
-        $select = new html_select(array('name' => '_copy', 'id' => '_copy'));
-
-        if (is_array($list)) {
-            asort($list, SORT_LOCALE_STRING);
-
-            if (!$copy)
-                $copy = $_SESSION['managesieve_current'];
-
-            foreach ($list as $set) {
-                $select->add($set, $set);
-            }
-
-            $out .= '<br /><input type="radio" id="from_set" name="_from" value="set"'
-                .($selected=='set' ? ' checked="checked"' : '').'></input>';
-            $out .= sprintf('<label for="%s">%s:</label> ', 'from_set', rcube::Q($this->gettext('fromset')));
-            $out .= $select->show($copy);
-        }
-
-        // script upload box
-        $upload = new html_inputfield(array('name' => '_file', 'id' => '_file', 'size' => 30,
-            'type' => 'file', 'class' => ($this->errors['file'] ? 'error' : '')));
-
-        $out .= '<br /><input type="radio" id="from_file" name="_from" value="file"'
-            .($selected=='file' ? ' checked="checked"' : '').'></input>';
-        $out .= sprintf('<label for="%s">%s:</label> ', 'from_file', rcube::Q($this->gettext('fromfile')));
-        $out .= $upload->show();
-        $out .= '</fieldset>';
-
-        $this->rc->output->add_gui_object('sieveform', 'filtersetform');
-
-        if ($this->errors['name'])
-            $this->add_tip('_name', $this->errors['name'], true);
-        if ($this->errors['file'])
-            $this->add_tip('_file', $this->errors['file'], true);
-
-        $this->print_tips();
-
-        return $out;
-    }
-
-
-    function filter_form($attrib)
-    {
-        if (!$attrib['id'])
-            $attrib['id'] = 'rcmfilterform';
-
-        $fid = rcube_utils::get_input_value('_fid', rcube_utils::INPUT_GPC);
-        $scr = isset($this->form) ? $this->form : $this->script[$fid];
-
-        $hiddenfields = new html_hiddenfield(array('name' => '_task', 'value' => $this->rc->task));
-        $hiddenfields->add(array('name' => '_action', 'value' => 'plugin.managesieve-save'));
-        $hiddenfields->add(array('name' => '_framed', 'value' => ($_POST['_framed'] || $_GET['_framed'] ? 1 : 0)));
-        $hiddenfields->add(array('name' => '_fid', 'value' => $fid));
-
-        $out = '<form name="filterform" action="./" method="post">'."\n";
-        $out .= $hiddenfields->show();
-
-        // 'any' flag
-        if (sizeof($scr['tests']) == 1 && $scr['tests'][0]['test'] == 'true' && !$scr['tests'][0]['not'])
-            $any = true;
-
-        // filter name input
-        $field_id = '_name';
-        $input_name = new html_inputfield(array('name' => '_name', 'id' => $field_id, 'size' => 30,
-            'class' => ($this->errors['name'] ? 'error' : '')));
-
-        if ($this->errors['name'])
-            $this->add_tip($field_id, $this->errors['name'], true);
-
-        if (isset($scr))
-            $input_name = $input_name->show($scr['name']);
-        else
-            $input_name = $input_name->show();
-
-        $out .= sprintf("\n<label for=\"%s\"><b>%s:</b></label> %s\n",
-            $field_id, rcube::Q($this->gettext('filtername')), $input_name);
-
-        // filter set selector
-        if ($this->rc->task == 'mail') {
-            $out .= sprintf("\n&nbsp;<label for=\"%s\"><b>%s:</b></label> %s\n",
-                $field_id, rcube::Q($this->gettext('filterset')),
-                $this->filtersets_list(array('id' => 'sievescriptname'), true));
-        }
-
-        $out .= '<br /><br /><fieldset><legend>' . rcube::Q($this->gettext('messagesrules')) . "</legend>\n";
-
-        // any, allof, anyof radio buttons
-        $field_id = '_allof';
-        $input_join = new html_radiobutton(array('name' => '_join', 'id' => $field_id, 'value' => 'allof',
-            'onclick' => 'rule_join_radio(\'allof\')', 'class' => 'radio'));
-
-        if (isset($scr) && !$any)
-            $input_join = $input_join->show($scr['join'] ? 'allof' : '');
-        else
-            $input_join = $input_join->show();
-
-        $out .= sprintf("%s<label for=\"%s\">%s</label>&nbsp;\n",
-            $input_join, $field_id, rcube::Q($this->gettext('filterallof')));
-
-        $field_id = '_anyof';
-        $input_join = new html_radiobutton(array('name' => '_join', 'id' => $field_id, 'value' => 'anyof',
-            'onclick' => 'rule_join_radio(\'anyof\')', 'class' => 'radio'));
-
-        if (isset($scr) && !$any)
-            $input_join = $input_join->show($scr['join'] ? '' : 'anyof');
-        else
-            $input_join = $input_join->show('anyof'); // default
-
-        $out .= sprintf("%s<label for=\"%s\">%s</label>\n",
-            $input_join, $field_id, rcube::Q($this->gettext('filteranyof')));
-
-        $field_id = '_any';
-        $input_join = new html_radiobutton(array('name' => '_join', 'id' => $field_id, 'value' => 'any',
-            'onclick' => 'rule_join_radio(\'any\')', 'class' => 'radio'));
-
-        $input_join = $input_join->show($any ? 'any' : '');
-
-        $out .= sprintf("%s<label for=\"%s\">%s</label>\n",
-            $input_join, $field_id, rcube::Q($this->gettext('filterany')));
-
-        $rows_num = isset($scr) ? sizeof($scr['tests']) : 1;
-
-        $out .= '<div id="rules"'.($any ? ' style="display: none"' : '').'>';
-        for ($x=0; $x<$rows_num; $x++)
-            $out .= $this->rule_div($fid, $x);
-        $out .= "</div>\n";
-
-        $out .= "</fieldset>\n";
-
-        // actions
-        $out .= '<fieldset><legend>' . rcube::Q($this->gettext('messagesactions')) . "</legend>\n";
-
-        $rows_num = isset($scr) ? sizeof($scr['actions']) : 1;
-
-        $out .= '<div id="actions">';
-        for ($x=0; $x<$rows_num; $x++)
-            $out .= $this->action_div($fid, $x);
-        $out .= "</div>\n";
-
-        $out .= "</fieldset>\n";
-
-        $this->print_tips();
-
-        if ($scr['disabled']) {
-            $this->rc->output->set_env('rule_disabled', true);
-        }
-        $this->rc->output->add_label(
-            'managesieve.ruledeleteconfirm',
-            'managesieve.actiondeleteconfirm'
-        );
-        $this->rc->output->add_gui_object('sieveform', 'filterform');
-
-        return $out;
-    }
-
-    function rule_div($fid, $id, $div=true)
-    {
-        $rule     = isset($this->form) ? $this->form['tests'][$id] : $this->script[$fid]['tests'][$id];
-        $rows_num = isset($this->form) ? sizeof($this->form['tests']) : sizeof($this->script[$fid]['tests']);
-
-        // headers select
-        $select_header = new html_select(array('name' => "_header[]", 'id' => 'header'.$id,
-            'onchange' => 'rule_header_select(' .$id .')'));
-        foreach($this->headers as $name => $val)
-            $select_header->add(rcube::Q($this->gettext($name)), Q($val));
-        if (in_array('body', $this->exts))
-            $select_header->add(rcube::Q($this->gettext('body')), 'body');
-        $select_header->add(rcube::Q($this->gettext('size')), 'size');
-        $select_header->add(rcube::Q($this->gettext('...')), '...');
-
-        // TODO: list arguments
-        $aout = '';
-
-        if ((isset($rule['test']) && in_array($rule['test'], array('header', 'address', 'envelope')))
-            && !is_array($rule['arg1']) && in_array($rule['arg1'], $this->headers)
-        ) {
-            $aout .= $select_header->show($rule['arg1']);
-        }
-        else if ((isset($rule['test']) && $rule['test'] == 'exists')
-            && !is_array($rule['arg']) && in_array($rule['arg'], $this->headers)
-        ) {
-            $aout .= $select_header->show($rule['arg']);
-        }
-        else if (isset($rule['test']) && $rule['test'] == 'size')
-            $aout .= $select_header->show('size');
-        else if (isset($rule['test']) && $rule['test'] == 'body')
-            $aout .= $select_header->show('body');
-        else if (isset($rule['test']) && $rule['test'] != 'true')
-            $aout .= $select_header->show('...');
-        else
-            $aout .= $select_header->show();
-
-        if (isset($rule['test']) && in_array($rule['test'], array('header', 'address', 'envelope'))) {
-            if (is_array($rule['arg1']))
-                $custom = implode(', ', $rule['arg1']);
-            else if (!in_array($rule['arg1'], $this->headers))
-                $custom = $rule['arg1'];
-        }
-        else if (isset($rule['test']) && $rule['test'] == 'exists') {
-            if (is_array($rule['arg']))
-                $custom = implode(', ', $rule['arg']);
-            else if (!in_array($rule['arg'], $this->headers))
-                $custom = $rule['arg'];
-        }
-
-        $tout = '<div id="custom_header' .$id. '" style="display:' .(isset($custom) ? 'inline' : 'none'). '">
-            <input type="text" name="_custom_header[]" id="custom_header_i'.$id.'" '
-            . $this->error_class($id, 'test', 'header', 'custom_header_i')
-            .' value="' .rcube::Q($custom). '" size="15" />&nbsp;</div>' . "\n";
-
-        // matching type select (operator)
-        $select_op = new html_select(array('name' => "_rule_op[]", 'id' => 'rule_op'.$id,
-            'style' => 'display:' .($rule['test']!='size' ? 'inline' : 'none'),
-            'class' => 'operator_selector',
-            'onchange' => 'rule_op_select('.$id.')'));
-        $select_op->add(rcube::Q($this->gettext('filtercontains')), 'contains');
-        $select_op->add(rcube::Q($this->gettext('filternotcontains')), 'notcontains');
-        $select_op->add(rcube::Q($this->gettext('filteris')), 'is');
-        $select_op->add(rcube::Q($this->gettext('filterisnot')), 'notis');
-        $select_op->add(rcube::Q($this->gettext('filterexists')), 'exists');
-        $select_op->add(rcube::Q($this->gettext('filternotexists')), 'notexists');
-        $select_op->add(rcube::Q($this->gettext('filtermatches')), 'matches');
-        $select_op->add(rcube::Q($this->gettext('filternotmatches')), 'notmatches');
-        if (in_array('regex', $this->exts)) {
-            $select_op->add(rcube::Q($this->gettext('filterregex')), 'regex');
-            $select_op->add(rcube::Q($this->gettext('filternotregex')), 'notregex');
-        }
-        if (in_array('relational', $this->exts)) {
-            $select_op->add(rcube::Q($this->gettext('countisgreaterthan')), 'count-gt');
-            $select_op->add(rcube::Q($this->gettext('countisgreaterthanequal')), 'count-ge');
-            $select_op->add(rcube::Q($this->gettext('countislessthan')), 'count-lt');
-            $select_op->add(rcube::Q($this->gettext('countislessthanequal')), 'count-le');
-            $select_op->add(rcube::Q($this->gettext('countequals')), 'count-eq');
-            $select_op->add(rcube::Q($this->gettext('countnotequals')), 'count-ne');
-            $select_op->add(rcube::Q($this->gettext('valueisgreaterthan')), 'value-gt');
-            $select_op->add(rcube::Q($this->gettext('valueisgreaterthanequal')), 'value-ge');
-            $select_op->add(rcube::Q($this->gettext('valueislessthan')), 'value-lt');
-            $select_op->add(rcube::Q($this->gettext('valueislessthanequal')), 'value-le');
-            $select_op->add(rcube::Q($this->gettext('valueequals')), 'value-eq');
-            $select_op->add(rcube::Q($this->gettext('valuenotequals')), 'value-ne');
-        }
-
-        // target input (TODO: lists)
-
-        if (in_array($rule['test'], array('header', 'address', 'envelope'))) {
-            $test   = ($rule['not'] ? 'not' : '').($rule['type'] ? $rule['type'] : 'is');
-            $target = $rule['arg2'];
-        }
-        else if ($rule['test'] == 'body') {
-            $test   = ($rule['not'] ? 'not' : '').($rule['type'] ? $rule['type'] : 'is');
-            $target = $rule['arg'];
-        }
-        else if ($rule['test'] == 'size') {
-            $test   = '';
-            $target = '';
-            if (preg_match('/^([0-9]+)(K|M|G)?$/', $rule['arg'], $matches)) {
-                $sizetarget = $matches[1];
-                $sizeitem = $matches[2];
-            }
-            else {
-                $sizetarget = $rule['arg'];
-                $sizeitem = $rule['item'];
-            }
-        }
-        else {
-            $test   = ($rule['not'] ? 'not' : '').$rule['test'];
-            $target =  '';
-        }
-
-        $tout .= $select_op->show($test);
-        $tout .= '<input type="text" name="_rule_target[]" id="rule_target' .$id. '"
-            value="' .rcube::Q($target). '" size="20" ' . $this->error_class($id, 'test', 'target', 'rule_target')
-            . ' style="display:' . ($rule['test']!='size' && $rule['test'] != 'exists' ? 'inline' : 'none') . '" />'."\n";
-
-        $select_size_op = new html_select(array('name' => "_rule_size_op[]", 'id' => 'rule_size_op'.$id));
-        $select_size_op->add(rcube::Q($this->gettext('filterover')), 'over');
-        $select_size_op->add(rcube::Q($this->gettext('filterunder')), 'under');
-
-        $tout .= '<div id="rule_size' .$id. '" style="display:' . ($rule['test']=='size' ? 'inline' : 'none') .'">';
-        $tout .= $select_size_op->show($rule['test']=='size' ? $rule['type'] : '');
-        $tout .= '<input type="text" name="_rule_size_target[]" id="rule_size_i'.$id.'" value="'.$sizetarget.'" size="10" ' 
-            . $this->error_class($id, 'test', 'sizetarget', 'rule_size_i') .' />
-            <input type="radio" name="_rule_size_item['.$id.']" value=""'
-                . (!$sizeitem ? ' checked="checked"' : '') .' class="radio" />'.$this->rc->gettext('B').'
-            <input type="radio" name="_rule_size_item['.$id.']" value="K"'
-                . ($sizeitem=='K' ? ' checked="checked"' : '') .' class="radio" />'.$this->rc->gettext('KB').'
-            <input type="radio" name="_rule_size_item['.$id.']" value="M"'
-                . ($sizeitem=='M' ? ' checked="checked"' : '') .' class="radio" />'.$this->rc->gettext('MB').'
-            <input type="radio" name="_rule_size_item['.$id.']" value="G"'
-                . ($sizeitem=='G' ? ' checked="checked"' : '') .' class="radio" />'.$this->rc->gettext('GB');
-        $tout .= '</div>';
-
-        // Advanced modifiers (address, envelope)
-        $select_mod = new html_select(array('name' => "_rule_mod[]", 'id' => 'rule_mod_op'.$id,
-            'onchange' => 'rule_mod_select(' .$id .')'));
-        $select_mod->add(rcube::Q($this->gettext('none')), '');
-        $select_mod->add(rcube::Q($this->gettext('address')), 'address');
-        if (in_array('envelope', $this->exts))
-            $select_mod->add(rcube::Q($this->gettext('envelope')), 'envelope');
-
-        $select_type = new html_select(array('name' => "_rule_mod_type[]", 'id' => 'rule_mod_type'.$id));
-        $select_type->add(rcube::Q($this->gettext('allparts')), 'all');
-        $select_type->add(rcube::Q($this->gettext('domain')), 'domain');
-        $select_type->add(rcube::Q($this->gettext('localpart')), 'localpart');
-        if (in_array('subaddress', $this->exts)) {
-            $select_type->add(rcube::Q($this->gettext('user')), 'user');
-            $select_type->add(rcube::Q($this->gettext('detail')), 'detail');
-        }
-
-        $need_mod = $rule['test'] != 'size' && $rule['test'] != 'body';
-        $mout = '<div id="rule_mod' .$id. '" class="adv" style="display:' . ($need_mod ? 'block' : 'none') .'">';
-        $mout .= ' <span>';
-        $mout .= rcube::Q($this->gettext('modifier')) . ' ';
-        $mout .= $select_mod->show($rule['test']);
-        $mout .= '</span>';
-        $mout .= ' <span id="rule_mod_type' . $id . '"';
-        $mout .= ' style="display:' . (in_array($rule['test'], array('address', 'envelope')) ? 'inline' : 'none') .'">';
-        $mout .= rcube::Q($this->gettext('modtype')) . ' ';
-        $mout .= $select_type->show($rule['part']);
-        $mout .= '</span>';
-        $mout .= '</div>';
-
-        // Advanced modifiers (body transformations)
-        $select_mod = new html_select(array('name' => "_rule_trans[]", 'id' => 'rule_trans_op'.$id,
-            'onchange' => 'rule_trans_select(' .$id .')'));
-        $select_mod->add(rcube::Q($this->gettext('text')), 'text');
-        $select_mod->add(rcube::Q($this->gettext('undecoded')), 'raw');
-        $select_mod->add(rcube::Q($this->gettext('contenttype')), 'content');
-
-        $mout .= '<div id="rule_trans' .$id. '" class="adv" style="display:' . ($rule['test'] == 'body' ? 'block' : 'none') .'">';
-        $mout .= ' <span>';
-        $mout .= rcube::Q($this->gettext('modifier')) . ' ';
-        $mout .= $select_mod->show($rule['part']);
-        $mout .= '<input type="text" name="_rule_trans_type[]" id="rule_trans_type'.$id
-            . '" value="'.(is_array($rule['content']) ? implode(',', $rule['content']) : $rule['content'])
-            .'" size="20" style="display:' . ($rule['part'] == 'content' ? 'inline' : 'none') .'"'
-            . $this->error_class($id, 'test', 'part', 'rule_trans_type') .' />';
-        $mout .= '</span>';
-        $mout .= '</div>';
-
-        // Advanced modifiers (body transformations)
-        $select_comp = new html_select(array('name' => "_rule_comp[]", 'id' => 'rule_comp_op'.$id));
-        $select_comp->add(rcube::Q($this->gettext('default')), '');
-        $select_comp->add(rcube::Q($this->gettext('octet')), 'i;octet');
-        $select_comp->add(rcube::Q($this->gettext('asciicasemap')), 'i;ascii-casemap');
-        if (in_array('comparator-i;ascii-numeric', $this->exts)) {
-            $select_comp->add(rcube::Q($this->gettext('asciinumeric')), 'i;ascii-numeric');
-        }
-
-        $mout .= '<div id="rule_comp' .$id. '" class="adv" style="display:' . ($rule['test'] != 'size' ? 'block' : 'none') .'">';
-        $mout .= ' <span>';
-        $mout .= rcube::Q($this->gettext('comparator')) . ' ';
-        $mout .= $select_comp->show($rule['comparator']);
-        $mout .= '</span>';
-        $mout .= '</div>';
-
-        // Build output table
-        $out = $div ? '<div class="rulerow" id="rulerow' .$id .'">'."\n" : '';
-        $out .= '<table><tr>';
-        $out .= '<td class="advbutton">';
-        $out .= '<a href="#" id="ruleadv' . $id .'" title="'. rcube::Q($this->gettext('advancedopts')). '"
-            onclick="rule_adv_switch(' . $id .', this)" class="show">&nbsp;&nbsp;</a>';
-        $out .= '</td>';
-        $out .= '<td class="rowactions">' . $aout . '</td>';
-        $out .= '<td class="rowtargets">' . $tout . "\n";
-        $out .= '<div id="rule_advanced' .$id. '" style="display:none">' . $mout . '</div>';
-        $out .= '</td>';
-
-        // add/del buttons
-        $out .= '<td class="rowbuttons">';
-        $out .= '<a href="#" id="ruleadd' . $id .'" title="'. rcube::Q($this->gettext('add')). '"
-            onclick="rcmail.managesieve_ruleadd(' . $id .')" class="button add"></a>';
-        $out .= '<a href="#" id="ruledel' . $id .'" title="'. rcube::Q($this->gettext('del')). '"
-            onclick="rcmail.managesieve_ruledel(' . $id .')" class="button del' . ($rows_num<2 ? ' disabled' : '') .'"></a>';
-        $out .= '</td>';
-        $out .= '</tr></table>';
-
-        $out .= $div ? "</div>\n" : '';
-
-        return $out;
-    }
-
-    function action_div($fid, $id, $div=true)
-    {
-        $action   = isset($this->form) ? $this->form['actions'][$id] : $this->script[$fid]['actions'][$id];
-        $rows_num = isset($this->form) ? sizeof($this->form['actions']) : sizeof($this->script[$fid]['actions']);
-
-        $out = $div ? '<div class="actionrow" id="actionrow' .$id .'">'."\n" : '';
-
-        $out .= '<table><tr><td class="rowactions">';
-
-        // action select
-        $select_action = new html_select(array('name' => "_action_type[$id]", 'id' => 'action_type'.$id,
-            'onchange' => 'action_type_select(' .$id .')'));
-        if (in_array('fileinto', $this->exts))
-            $select_action->add(rcube::Q($this->gettext('messagemoveto')), 'fileinto');
-        if (in_array('fileinto', $this->exts) && in_array('copy', $this->exts))
-            $select_action->add(rcube::Q($this->gettext('messagecopyto')), 'fileinto_copy');
-        $select_action->add(rcube::Q($this->gettext('messageredirect')), 'redirect');
-        if (in_array('copy', $this->exts))
-            $select_action->add(rcube::Q($this->gettext('messagesendcopy')), 'redirect_copy');
-        if (in_array('reject', $this->exts))
-            $select_action->add(rcube::Q($this->gettext('messagediscard')), 'reject');
-        else if (in_array('ereject', $this->exts))
-            $select_action->add(rcube::Q($this->gettext('messagediscard')), 'ereject');
-        if (in_array('vacation', $this->exts))
-            $select_action->add(rcube::Q($this->gettext('messagereply')), 'vacation');
-        $select_action->add(rcube::Q($this->gettext('messagedelete')), 'discard');
-        if (in_array('imapflags', $this->exts) || in_array('imap4flags', $this->exts)) {
-            $select_action->add(rcube::Q($this->gettext('setflags')), 'setflag');
-            $select_action->add(rcube::Q($this->gettext('addflags')), 'addflag');
-            $select_action->add(rcube::Q($this->gettext('removeflags')), 'removeflag');
-        }
-        if (in_array('variables', $this->exts)) {
-            $select_action->add(rcube::Q($this->gettext('setvariable')), 'set');
-        }
-        if (in_array('enotify', $this->exts) || in_array('notify', $this->exts)) {
-            $select_action->add(rcube::Q($this->gettext('notify')), 'notify');
-        }
-        $select_action->add(rcube::Q($this->gettext('rulestop')), 'stop');
-
-        $select_type = $action['type'];
-        if (in_array($action['type'], array('fileinto', 'redirect')) && $action['copy']) {
-            $select_type .= '_copy';
-        }
-
-        $out .= $select_action->show($select_type);
-        $out .= '</td>';
-
-        // actions target inputs
-        $out .= '<td class="rowtargets">';
-        // shared targets
-        $out .= '<input type="text" name="_action_target['.$id.']" id="action_target' .$id. '" '
-            .'value="' .($action['type']=='redirect' ? rcube::Q($action['target'], 'strict', false) : ''). '" size="35" '
-            .'style="display:' .($action['type']=='redirect' ? 'inline' : 'none') .'" '
-            . $this->error_class($id, 'action', 'target', 'action_target') .' />';
-        $out .= '<textarea name="_action_target_area['.$id.']" id="action_target_area' .$id. '" '
-            .'rows="3" cols="35" '. $this->error_class($id, 'action', 'targetarea', 'action_target_area')
-            .'style="display:' .(in_array($action['type'], array('reject', 'ereject')) ? 'inline' : 'none') .'">'
-            . (in_array($action['type'], array('reject', 'ereject')) ? rcube::Q($action['target'], 'strict', false) : '')
-            . "</textarea>\n";
-
-        // vacation
-        $out .= '<div id="action_vacation' .$id.'" style="display:' .($action['type']=='vacation' ? 'inline' : 'none') .'">';
-        $out .= '<span class="label">'. rcube::Q($this->gettext('vacationreason')) .'</span><br />'
-            .'<textarea name="_action_reason['.$id.']" id="action_reason' .$id. '" '
-            .'rows="3" cols="35" '. $this->error_class($id, 'action', 'reason', 'action_reason') . '>'
-            . Q($action['reason'], 'strict', false) . "</textarea>\n";
-        $out .= '<br /><span class="label">' .rcube::Q($this->gettext('vacationsubject')) . '</span><br />'
-            .'<input type="text" name="_action_subject['.$id.']" id="action_subject'.$id.'" '
-            .'value="' . (is_array($action['subject']) ? rcube::Q(implode(', ', $action['subject']), 'strict', false) : $action['subject']) . '" size="35" '
-            . $this->error_class($id, 'action', 'subject', 'action_subject') .' />';
-        $out .= '<br /><span class="label">' .rcube::Q($this->gettext('vacationaddresses')) . '</span><br />'
-            .'<input type="text" name="_action_addresses['.$id.']" id="action_addr'.$id.'" '
-            .'value="' . (is_array($action['addresses']) ? rcube::Q(implode(', ', $action['addresses']), 'strict', false) : $action['addresses']) . '" size="35" '
-            . $this->error_class($id, 'action', 'addresses', 'action_addr') .' />';
-        $out .= '<br /><span class="label">' . rcube::Q($this->gettext('vacationdays')) . '</span><br />'
-            .'<input type="text" name="_action_days['.$id.']" id="action_days'.$id.'" '
-            .'value="' .rcube::Q($action['days'], 'strict', false) . '" size="2" '
-            . $this->error_class($id, 'action', 'days', 'action_days') .' />';
-        $out .= '</div>';
-
-        // flags
-        $flags = array(
-            'read'      => '\\Seen',
-            'answered'  => '\\Answered',
-            'flagged'   => '\\Flagged',
-            'deleted'   => '\\Deleted',
-            'draft'     => '\\Draft',
-        );
-        $flags_target = (array)$action['target'];
-
-        $out .= '<div id="action_flags' .$id.'" style="display:' 
-            . (preg_match('/^(set|add|remove)flag$/', $action['type']) ? 'inline' : 'none') . '"'
-            . $this->error_class($id, 'action', 'flags', 'action_flags') . '>';
-        foreach ($flags as $fidx => $flag) {
-            $out .= '<input type="checkbox" name="_action_flags[' .$id .'][]" value="' . $flag . '"'
-                . (in_array_nocase($flag, $flags_target) ? 'checked="checked"' : '') . ' />'
-                . rcube::Q($this->gettext('flag'.$fidx)) .'<br>';
-        }
-        $out .= '</div>';
-
-        // set variable
-        $set_modifiers = array(
-            'lower',
-            'upper',
-            'lowerfirst',
-            'upperfirst',
-            'quotewildcard',
-            'length'
-        );
-
-        $out .= '<div id="action_set' .$id.'" style="display:' .($action['type']=='set' ? 'inline' : 'none') .'">';
-        $out .= '<span class="label">' .rcube::Q($this->gettext('setvarname')) . '</span><br />'
-            .'<input type="text" name="_action_varname['.$id.']" id="action_varname'.$id.'" '
-            .'value="' . rcube::Q($action['name']) . '" size="35" '
-            . $this->error_class($id, 'action', 'name', 'action_varname') .' />';
-        $out .= '<br /><span class="label">' .rcube::Q($this->gettext('setvarvalue')) . '</span><br />'
-            .'<input type="text" name="_action_varvalue['.$id.']" id="action_varvalue'.$id.'" '
-            .'value="' . rcube::Q($action['value']) . '" size="35" '
-            . $this->error_class($id, 'action', 'value', 'action_varvalue') .' />';
-        $out .= '<br /><span class="label">' .rcube::Q($this->gettext('setvarmodifiers')) . '</span><br />';
-        foreach ($set_modifiers as $j => $s_m) {
-            $s_m_id = 'action_varmods' . $id . $s_m;
-            $out .= sprintf('<input type="checkbox" name="_action_varmods[%s][]" value="%s" id="%s"%s />%s<br>',
-                $id, $s_m, $s_m_id,
-                (array_key_exists($s_m, (array)$action) && $action[$s_m] ? ' checked="checked"' : ''),
-                rcube::Q($this->gettext('var' . $s_m)));
-        }
-        $out .= '</div>';
-
-        // notify
-        // skip :options tag - not used by the mailto method
-        $out .= '<div id="action_notify' .$id.'" style="display:' .($action['type']=='notify' ? 'inline' : 'none') .'">';
-        $out .= '<span class="label">' .rcube::Q($this->gettext('notifyaddress')) . '</span><br />'
-            .'<input type="text" name="_action_notifyaddress['.$id.']" id="action_notifyaddress'.$id.'" '
-            .'value="' . rcube::Q($action['address']) . '" size="35" '
-            . $this->error_class($id, 'action', 'address', 'action_notifyaddress') .' />';
-        $out .= '<br /><span class="label">'. rcube::Q($this->gettext('notifybody')) .'</span><br />'
-            .'<textarea name="_action_notifybody['.$id.']" id="action_notifybody' .$id. '" '
-            .'rows="3" cols="35" '. $this->error_class($id, 'action', 'method', 'action_notifybody') . '>'
-            . rcube::Q($action['body'], 'strict', false) . "</textarea>\n";
-        $out .= '<br /><span class="label">' .rcube::Q($this->gettext('notifysubject')) . '</span><br />'
-            .'<input type="text" name="_action_notifymessage['.$id.']" id="action_notifymessage'.$id.'" '
-            .'value="' . rcube::Q($action['message']) . '" size="35" '
-            . $this->error_class($id, 'action', 'message', 'action_notifymessage') .' />';
-        $out .= '<br /><span class="label">' .rcube::Q($this->gettext('notifyfrom')) . '</span><br />'
-            .'<input type="text" name="_action_notifyfrom['.$id.']" id="action_notifyfrom'.$id.'" '
-            .'value="' . rcube::Q($action['from']) . '" size="35" '
-            . $this->error_class($id, 'action', 'from', 'action_notifyfrom') .' />';
-        $importance_options = array(
-            3 => 'notifyimportancelow',
-            2 => 'notifyimportancenormal',
-            1 => 'notifyimportancehigh'
-        );
-        $select_importance = new html_select(array(
-            'name' => '_action_notifyimportance[' . $id . ']',
-            'id' => '_action_notifyimportance' . $id,
-            'class' => $this->error_class($id, 'action', 'importance', 'action_notifyimportance')));
-        foreach ($importance_options as $io_v => $io_n) {
-            $select_importance->add(rcube::Q($this->gettext($io_n)), $io_v);
-        }
-        $out .= '<br /><span class="label">' . rcube::Q($this->gettext('notifyimportance')) . '</span><br />';
-        $out .= $select_importance->show($action['importance'] ? $action['importance'] : 2);
-        $out .= '</div>';
-
-        // mailbox select
-        if ($action['type'] == 'fileinto')
-            $mailbox = $this->mod_mailbox($action['target'], 'out');
-        else
-            $mailbox = '';
-
-        $select = $this->rc->folder_selector(array(
-            'realnames' => false,
-            'maxlength' => 100,
-            'id' => 'action_mailbox' . $id,
-            'name' => "_action_mailbox[$id]",
-            'style' => 'display:'.(!isset($action) || $action['type']=='fileinto' ? 'inline' : 'none')
-        ));
-        $out .= $select->show($mailbox);
-        $out .= '</td>';
-
-        // add/del buttons
-        $out .= '<td class="rowbuttons">';
-        $out .= '<a href="#" id="actionadd' . $id .'" title="'. rcube::Q($this->gettext('add')). '"
-            onclick="rcmail.managesieve_actionadd(' . $id .')" class="button add"></a>';
-        $out .= '<a href="#" id="actiondel' . $id .'" title="'. rcube::Q($this->gettext('del')). '"
-            onclick="rcmail.managesieve_actiondel(' . $id .')" class="button del' . ($rows_num<2 ? ' disabled' : '') .'"></a>';
-        $out .= '</td>';
-
-        $out .= '</tr></table>';
-
-        $out .= $div ? "</div>\n" : '';
-
-        return $out;
-    }
-
-    private function genid()
-    {
-        $result = preg_replace('/[^0-9]/', '', microtime(true));
-        return $result;
-    }
-
-    private function strip_value($str, $allow_html=false)
-    {
-        if (!$allow_html)
-            $str = strip_tags($str);
-
-        return trim($str);
-    }
-
-    private function error_class($id, $type, $target, $elem_prefix='')
-    {
-        // TODO: tooltips
-        if (($type == 'test' && ($str = $this->errors['tests'][$id][$target])) ||
-            ($type == 'action' && ($str = $this->errors['actions'][$id][$target]))
-        ) {
-            $this->add_tip($elem_prefix.$id, $str, true);
-            return ' class="error"';
-        }
-
-        return '';
-    }
-
-    private function add_tip($id, $str, $error=false)
-    {
-        if ($error)
-            $str = html::span('sieve error', $str);
-
-        $this->tips[] = array($id, $str);
-    }
-
-    private function print_tips()
-    {
-        if (empty($this->tips))
-            return;
-
-        $script = rcmail_output::JS_OBJECT_NAME.'.managesieve_tip_register('.json_encode($this->tips).');';
-        $this->rc->output->add_script($script, 'foot');
+        $engine = $this->get_engine();
+        $engine->save();
     }
 
     /**
-     * Converts mailbox name from/to UTF7-IMAP from/to internal Sieve encoding
-     * with delimiter replacement.
-     *
-     * @param string $mailbox Mailbox name
-     * @param string $mode    Conversion direction ('in'|'out')
-     *
-     * @return string Mailbox name
+     * Initializes engine object
      */
-    private function mod_mailbox($mailbox, $mode = 'out')
+    private function get_engine()
     {
-        $delimiter         = $_SESSION['imap_delimiter'];
-        $replace_delimiter = $this->rc->config->get('managesieve_replace_delimiter');
-        $mbox_encoding     = $this->rc->config->get('managesieve_mbox_encoding', 'UTF7-IMAP');
-
-        if ($mode == 'out') {
-            $mailbox = rcube_charset::convert($mailbox, $mbox_encoding, 'UTF7-IMAP');
-            if ($replace_delimiter && $replace_delimiter != $delimiter)
-                $mailbox = str_replace($replace_delimiter, $delimiter, $mailbox);
-        }
-        else {
-            $mailbox = rcube_charset::convert($mailbox, 'UTF7-IMAP', $mbox_encoding);
-            if ($replace_delimiter && $replace_delimiter != $delimiter)
-                $mailbox = str_replace($delimiter, $replace_delimiter, $mailbox);
-        }
-
-        return $mailbox;
-    }
-
-    /**
-     * List sieve scripts
-     *
-     * @return array Scripts list
-     */
-    public function list_scripts()
-    {
-        if ($this->list !== null) {
-            return $this->list;
-        }
-
-        $this->list = $this->sieve->get_scripts();
-
-        // Handle active script(s) and list of scripts according to Kolab's KEP:14
-        if ($this->rc->config->get('managesieve_kolab_master')) {
+        if (!$this->engine) {
+            $this->load_config();
 
-            // Skip protected names
-            foreach ((array)$this->list as $idx => $name) {
-                $_name = strtoupper($name);
-                if ($_name == 'MASTER')
-                    $master_script = $name;
-                else if ($_name == 'MANAGEMENT')
-                    $management_script = $name;
-                else if($_name == 'USER')
-                    $user_script = $name;
-                else
-                    continue;
+            // Add include path for internal classes
+            $include_path = $this->home . '/lib' . PATH_SEPARATOR;
+            $include_path .= ini_get('include_path');
+            set_include_path($include_path);
 
-                unset($this->list[$idx]);
-            }
-
-            // get active script(s), read USER script
-            if ($user_script) {
-                $extension = $this->rc->config->get('managesieve_filename_extension', '.sieve');
-                $filename_regex = '/'.preg_quote($extension, '/').'$/';
-                $_SESSION['managesieve_user_script'] = $user_script;
-
-                $this->sieve->load($user_script);
-
-                foreach ($this->sieve->script->as_array() as $rules) {
-                    foreach ($rules['actions'] as $action) {
-                        if ($action['type'] == 'include' && empty($action['global'])) {
-                            $name = preg_replace($filename_regex, '', $action['target']);
-                            $this->active[] = $name;
-                        }
-                    }
-                }
-            }
-            // create USER script if it doesn't exist
-            else {
-                $content = "# USER Management Script\n"
-                    ."#\n"
-                    ."# This script includes the various active sieve scripts\n"
-                    ."# it is AUTOMATICALLY GENERATED. DO NOT EDIT MANUALLY!\n"
-                    ."#\n"
-                    ."# For more information, see http://wiki.kolab.org/KEP:14#USER\n"
-                    ."#\n";
-                if ($this->sieve->save_script('USER', $content)) {
-                    $_SESSION['managesieve_user_script'] = 'USER';
-                    if (empty($this->master_file))
-                        $this->sieve->activate('USER');
-                }
-            }
-        }
-        else if (!empty($this->list)) {
-            // Get active script name
-            if ($active = $this->sieve->get_active()) {
-                $this->active = array($active);
-            }
-
-            // Hide scripts from config
-            $exceptions = $this->rc->config->get('managesieve_filename_exceptions');
-            if (!empty($exceptions)) {
-                $this->list = array_diff($this->list, (array)$exceptions);
-            }
-        }
-
-        return $this->list;
-    }
-
-    /**
-     * Removes sieve script
-     *
-     * @param string $name Script name
-     *
-     * @return bool True on success, False on failure
-     */
-    public function remove_script($name)
-    {
-        $result = $this->sieve->remove($name);
-
-        // Kolab's KEP:14
-        if ($result && $this->rc->config->get('managesieve_kolab_master')) {
-            $this->deactivate_script($name);
-        }
-
-        return $result;
-    }
-
-    /**
-     * Activates sieve script
-     *
-     * @param string $name Script name
-     *
-     * @return bool True on success, False on failure
-     */
-    public function activate_script($name)
-    {
-        // Kolab's KEP:14
-        if ($this->rc->config->get('managesieve_kolab_master')) {
-            $extension   = $this->rc->config->get('managesieve_filename_extension', '.sieve');
-            $user_script = $_SESSION['managesieve_user_script'];
-
-            // if the script is not active...
-            if ($user_script && ($key = array_search($name, $this->active)) === false) {
-                // ...rewrite USER file adding appropriate include command
-                if ($this->sieve->load($user_script)) {
-                    $script = $this->sieve->script->as_array();
-                    $list   = array();
-                    $regexp = '/' . preg_quote($extension, '/') . '$/';
-
-                    // Create new include entry
-                    $rule = array(
-                        'actions' => array(
-                            0 => array(
-                                'target'   => $name.$extension,
-                                'type'     => 'include',
-                                'personal' => true,
-                    )));
-
-                    // get all active scripts for sorting
-                    foreach ($script as $rid => $rules) {
-                        foreach ($rules['actions'] as $aid => $action) {
-                            if ($action['type'] == 'include' && empty($action['global'])) {
-                                $target = $extension ? preg_replace($regexp, '', $action['target']) : $action['target'];
-                                $list[] = $target;
-                            }
-                        }
-                    }
-                    $list[] = $name;
-
-                    // Sort and find current script position
-                    asort($list, SORT_LOCALE_STRING);
-                    $list = array_values($list);
-                    $index = array_search($name, $list);
-
-                    // add rule at the end of the script
-                    if ($index === false || $index == count($list)-1) {
-                        $this->sieve->script->add_rule($rule);
-                    }
-                    // add rule at index position
-                    else {
-                        $script2 = array();
-                        foreach ($script as $rid => $rules) {
-                            if ($rid == $index) {
-                                $script2[] = $rule;
-                            }
-                            $script2[] = $rules;
-                        }
-                        $this->sieve->script->content = $script2;
-                    }
-
-                    $result = $this->sieve->save();
-                    if ($result) {
-                        $this->active[] = $name;
-                    }
-                }
-            }
-        }
-        else {
-            $result = $this->sieve->activate($name);
-            if ($result)
-                $this->active = array($name);
-        }
-
-        return $result;
-    }
-
-    /**
-     * Deactivates sieve script
-     *
-     * @param string $name Script name
-     *
-     * @return bool True on success, False on failure
-     */
-    public function deactivate_script($name)
-    {
-        // Kolab's KEP:14
-        if ($this->rc->config->get('managesieve_kolab_master')) {
-            $extension   = $this->rc->config->get('managesieve_filename_extension', '.sieve');
-            $user_script = $_SESSION['managesieve_user_script'];
-
-            // if the script is active...
-            if ($user_script && ($key = array_search($name, $this->active)) !== false) {
-                // ...rewrite USER file removing appropriate include command
-                if ($this->sieve->load($user_script)) {
-                    $script = $this->sieve->script->as_array();
-                    $name   = $name.$extension;
-
-                    foreach ($script as $rid => $rules) {
-                        foreach ($rules['actions'] as $aid => $action) {
-                            if ($action['type'] == 'include' && empty($action['global'])
-                                && $action['target'] == $name
-                            ) {
-                                break 2;
-                            }
-                        }
-                    }
-
-                    // Entry found
-                    if ($rid < count($script)) {
-                        $this->sieve->script->delete_rule($rid);
-                        $result = $this->sieve->save();
-                        if ($result) {
-                            unset($this->active[$key]);
-                        }
-                    }
-                }
-            }
-        }
-        else {
-            $result = $this->sieve->deactivate();
-            if ($result)
-                $this->active = array();
-        }
-
-        return $result;
-    }
-
-    /**
-     * Saves current script (adding some variables)
-     */
-    public function save_script($name = null)
-    {
-        // Kolab's KEP:14
-        if ($this->rc->config->get('managesieve_kolab_master')) {
-            $this->sieve->script->set_var('EDITOR', self::PROGNAME);
-            $this->sieve->script->set_var('EDITOR_VERSION', self::VERSION);
-        }
-
-        return $this->sieve->save($name);
-    }
-
-    /**
-     * Returns list of rules from the current script
-     *
-     * @return array List of rules
-     */
-    public function list_rules()
-    {
-        $result = array();
-        $i      = 1;
-
-        foreach ($this->script as $idx => $filter) {
-            if ($filter['type'] != 'if') {
-                continue;
-            }
-            $fname = $filter['name'] ? $filter['name'] : "#$i";
-            $result[] = array(
-                'id'    => $idx,
-                'name'  => rcube::Q($fname),
-                'class' => $filter['disabled'] ? 'disabled' : '',
-            );
-            $i++;
+            $this->engine = new rcube_sieve_engine($this);
         }
 
-        return $result;
+        return $this->engine;
     }
 }
diff --git a/plugins/managesieve/package.xml b/plugins/managesieve/package.xml
index d4a7af6b8..c0c21c9a0 100644
--- a/plugins/managesieve/package.xml
+++ b/plugins/managesieve/package.xml
@@ -17,9 +17,9 @@
 		<email>alec@alec.pl</email>
 		<active>yes</active>
 	</lead>
-	<date>2012-12-21</date>
+	<date>2013-02-17</date>
 	<version>
-		<release>6.1</release>
+		<release>6.2</release>
 		<api>6.0</api>
 	</version>
 	<stability>
@@ -93,6 +93,7 @@
 			<file name="skins/classic/images/add.png" role="data"></file>
 			<file name="skins/classic/images/del.png" role="data"></file>
 			<file name="skins/classic/images/down_small.gif" role="data"></file>
+			<file name="skins/classic/images/erase.png" role="data"></file>
 			<file name="skins/classic/images/filter.png" role="data"></file>
 			<file name="skins/classic/images/up_small.gif" role="data"></file>
 			<file name="skins/larry/managesieve.css" role="data"></file>
@@ -103,10 +104,11 @@
 			<file name="skins/larry/images/add.png" role="data"></file>
 			<file name="skins/larry/images/del.png" role="data"></file>
 			<file name="skins/larry/images/down_small.gif" role="data"></file>
+			<file name="skins/larry/images/erase.png" role="data"></file>
 			<file name="skins/larry/images/up_small.gif" role="data"></file>
-			<file name="managesieve.php" role="php"></file>
-			<file name="lib/rcube_sieve.php" role="php"></file>
-			<file name="lib/rcube_sieve_script.php" role="php"></file>
+			<file name="lib/Roundcube/rcube_sieve.php" role="php"></file>
+			<file name="lib/Roundcube/rcube_sieve_engine.php" role="php"></file>
+			<file name="lib/Roundcube/rcube_sieve_script.php" role="php"></file>
 			<file name="lib/Net/Sieve.php" role="php"></file>
 			<file name="config.inc.php.dist" role="data"></file>
 		</dir>
diff --git a/plugins/managesieve/skins/classic/images/erase.png b/plugins/managesieve/skins/classic/images/erase.png
new file mode 100644
index 000000000..ddd3a9782
--- /dev/null
+++ b/plugins/managesieve/skins/classic/images/erase.png
diff --git a/plugins/managesieve/skins/classic/managesieve.css b/plugins/managesieve/skins/classic/managesieve.css
index 9527b44e9..59d88cb46 100644
--- a/plugins/managesieve/skins/classic/managesieve.css
+++ b/plugins/managesieve/skins/classic/managesieve.css
@@ -201,11 +201,30 @@ td.rowtargets
   padding-top: 2px;
 }
 
+td.rowtargets > div
+{
+  vertical-align: top;
+  margin-top: 2px;
+}
+
 td.rowtargets div.adv
 {
   padding-top: 3px;
 }
 
+td.rowtargets div.adv span.label
+{
+  display: inline-block;
+  padding-right: 10px;
+  min-width: 65px;
+}
+
+html.mozilla #filter-form select
+{
+  padding-top: 3px;
+  padding-bottom: 3px;
+}
+
 input.disabled, input.disabled:hover
 {
   color: #999999;
@@ -226,6 +245,7 @@ input.radio
 select.operator_selector
 {
   width: 200px;
+  vertical-align: top;
 }
 
 td.rowtargets span,
@@ -236,6 +256,11 @@ span.label
   white-space: nowrap;
 }
 
+td.rowtargets label
+{
+  color: black;
+}
+
 #footer
 {
   padding-top: 5px;
@@ -301,8 +326,78 @@ a.button.disabled
 #filter-form textarea
 {
   font-size: 11px;
+  vertical-align: middle;
 }
 
+/* smart multi-row input field */
+.listarea
+{
+  border: 1px solid #666;
+  margin: 0;
+  padding: 1px;
+  display: inline-block;
+  max-height: 67px;
+  overflow-y: auto;
+}
+
+td.rowtargets > span.listarea
+{
+  vertical-align: top;
+  margin-top: 2px;
+}
+
+.listelement
+{
+  display: block;
+  white-space: nowrap;
+  background-color: #fff;
+  border-top: 1px solid #e2e2e2;
+  height: 16px;
+  padding: 0;
+  margin: 0;
+  overflow: hidden;
+  line-height: 16px;
+}
+
+.listarea.error .listelement
+{
+  background-color: #FFFFC4;
+}
+
+.listelement:first-child
+{
+  border-top: none;
+}
+
+#filter-form .listelement input
+{
+  border: none;
+  border-radius: 0;
+  box-shadow: none;
+  outline: none;
+  vertical-align: top;
+  height: 16px;
+  padding-top: 0;
+  padding-bottom: 0;
+  line-height: 16px;
+  background-color: transparent;
+}
+
+.listelement input:focus
+{
+  box-shadow: none;
+}
+
+.listelement .reset
+{
+  display: inline-block;
+  width: 16px;
+  height: 16px;
+  background: url(images/erase.png) -1px 0 no-repeat #eee;
+  cursor: pointer;
+}
+
+
 /* fixes for popup window */
 
 body.iframe.mail
diff --git a/plugins/managesieve/skins/larry/images/erase.png b/plugins/managesieve/skins/larry/images/erase.png
new file mode 100644
index 000000000..ddd3a9782
--- /dev/null
+++ b/plugins/managesieve/skins/larry/images/erase.png
diff --git a/plugins/managesieve/skins/larry/managesieve.css b/plugins/managesieve/skins/larry/managesieve.css
index 49ebe007f..2144fe13f 100644
--- a/plugins/managesieve/skins/larry/managesieve.css
+++ b/plugins/managesieve/skins/larry/managesieve.css
@@ -43,7 +43,7 @@
 #filtersetslist
 {
   width: 100%;
-  table-layout: fixed; 
+  table-layout: fixed;
 }
 
 #filterslist tbody td,
@@ -175,9 +175,23 @@ td.rowtargets
   padding-top: 2px;
 }
 
+td.rowtargets > div
+{
+  vertical-align: top;
+  margin-top: 2px;
+}
+
 td.rowtargets div.adv
 {
   padding-top: 3px;
+  font-size: 10px;
+}
+
+td.rowtargets div.adv span.label
+{
+  display: inline-block;
+  padding-right: 5px;
+  min-width: 70px;
 }
 
 input.disabled, input.disabled:hover
@@ -197,9 +211,15 @@ input.radio
   margin-top: 0;
 }
 
+input.radio
+{
+  vertical-align: middle;
+}
+
 select.operator_selector
 {
   width: 200px;
+  vertical-align: top;
 }
 
 td.rowtargets span,
@@ -210,6 +230,11 @@ span.label
   white-space: nowrap;
 }
 
+td.rowtargets label
+{
+  color: black;
+}
+
 #footer
 {
   padding-top: 5px;
@@ -280,6 +305,13 @@ a.button.disabled
 {
   font-size: 11px;
   padding: 1px;
+  vertical-align: middle;
+}
+
+html.mozilla #filter-form select
+{
+  padding-top: 3px;
+  padding-bottom: 3px;
 }
 
 /* revert larry style button */
@@ -296,6 +328,80 @@ fieldset
   border-radius: 4px;
 }
 
+/* smart multi-row input field */
+.listarea
+{
+  border: 1px solid #B2B2B2;
+  border-radius: 4px;
+  box-shadow: inset 0 0 2px 1px rgba(0,0,0, 0.1);
+  -moz-box-shadow: inset 0 0 2px 1px rgba(0,0,0, 0.1);
+  -webkit-box-shadow: inset 0 0 2px 1px rgba(0,0,0, 0.1);
+  -o-box-shadow: inset 0 0 2px 1px rgba(0,0,0, 0.1);
+  margin: 0;
+  padding: 2px;
+  display: inline-block;
+  max-height: 59px;
+  overflow-y: auto;
+}
+
+td.rowtargets > span.listarea
+{
+  vertical-align: top;
+  margin-top: 2px;
+}
+
+.listelement
+{
+  display: block;
+  white-space: nowrap;
+  background-color: #fff;
+  border-top: 1px solid #e2e2e2;
+  height: 14px;
+  padding: 0;
+  margin: 0;
+  overflow: hidden;
+  line-height: 14px;
+}
+
+.listarea.error .listelement
+{
+  background-color: #FFFFC4;
+}
+
+.listelement:first-child
+{
+  border-top: none;
+}
+
+#filter-form .listelement input
+{
+  border: none;
+  border-radius: 0;
+  box-shadow: none;
+  outline: none;
+  vertical-align: top;
+  height: 14px;
+  padding-top: 0;
+  padding-bottom: 0;
+  line-height: 14px;
+  background-color: transparent;
+}
+
+.listelement input:focus
+{
+  box-shadow: none;
+}
+
+.listelement .reset
+{
+  display: inline-block;
+  width: 16px;
+  height: 16px;
+  background: url(images/erase.png) -1px -1px no-repeat #eee;
+  cursor: pointer;
+}
+
+
 /* fixes for popup window */
 
 body.iframe.mail
diff --git a/plugins/managesieve/tests/src/parser.out b/plugins/managesieve/tests/src/parser.out
index 385c8890d..366515b06 100644
--- a/plugins/managesieve/tests/src/parser.out
+++ b/plugins/managesieve/tests/src/parser.out
@@ -1,4 +1,4 @@
-require ["fileinto","reject","envelope"];
+require ["envelope","fileinto","reject"];
 # rule:[spam]
 if header :contains "X-DSPAM-Result" "Spam"
 {
diff --git a/plugins/managesieve/tests/src/parser_date b/plugins/managesieve/tests/src/parser_date
new file mode 100644
index 000000000..06b00333f
--- /dev/null
+++ b/plugins/managesieve/tests/src/parser_date
@@ -0,0 +1,21 @@
+require ["comparator-i;ascii-numeric","date","fileinto","relational"];
+# rule:[date]
+if allof (date :originalzone :value "ge" :comparator "i;ascii-numeric" "date" "hour" "09")
+{
+	fileinto "urgent";
+}
+# rule:[date-weekday]
+if date :is "received" "weekday" "0"
+{
+	fileinto "weekend";
+}
+# rule:[date-zone]
+if date :zone "-0500" :value "gt" :comparator "i;ascii-numeric" "received" "iso8601" "2007-02-26T09:00:00-05:00"
+{
+	stop;
+}
+# rule:[currentdate]
+if anyof (currentdate :is "weekday" "0", currentdate :value "lt" :comparator "i;ascii-numeric" "hour" "09", currentdate :value "ge" :comparator "i;ascii-numeric" "date" "2007-06-30")
+{
+	stop;
+}
diff --git a/plugins/managesieve/tests/src/parser_enotify_b b/plugins/managesieve/tests/src/parser_enotify_b
index 8854658f4..9a17eaf0c 100644
--- a/plugins/managesieve/tests/src/parser_enotify_b
+++ b/plugins/managesieve/tests/src/parser_enotify_b
@@ -1,4 +1,4 @@
-require ["envelope","variables","enotify"];
+require ["enotify","envelope","variables"];
 # rule:[from]
 if envelope :all :matches "from" "*"
 {
diff --git a/plugins/managesieve/tests/src/parser_index b/plugins/managesieve/tests/src/parser_index
new file mode 100644
index 000000000..78aba9a55
--- /dev/null
+++ b/plugins/managesieve/tests/src/parser_index
@@ -0,0 +1,24 @@
+require ["comparator-i;ascii-numeric","date","fileinto","index","relational"];
+# rule:[index-header1]
+if header :index 1 :last :contains "X-DSPAM-Result" "Spam"
+{
+	fileinto "Spam";
+	stop;
+}
+# rule:[index-header2]
+if header :index 2 :contains ["From","To"] "test@domain.tld"
+{
+	discard;
+	stop;
+}
+# rule:[index-address]
+if address :index 1 :all :is "From" "nagios@domain.tld"
+{
+	fileinto "domain.tld";
+	stop;
+}
+# rule:[index-date]
+if date :index 1 :last :zone "-0500" :value "gt" :comparator "i;ascii-numeric" "received" "iso8601" "2007-02-26T09:00:00-05:00"
+{
+	stop;
+}
diff --git a/plugins/managesieve/tests/src/parser_notify_b b/plugins/managesieve/tests/src/parser_notify_b
index cf80a9701..9a3ca803c 100644
--- a/plugins/managesieve/tests/src/parser_notify_b
+++ b/plugins/managesieve/tests/src/parser_notify_b
@@ -1,4 +1,4 @@
-require ["envelope","variables","notify"];
+require ["envelope","notify","variables"];
 # rule:[from]
 if envelope :all :matches "from" "*"
 {
diff --git a/plugins/managesieve/tests/src/parser_relational b/plugins/managesieve/tests/src/parser_relational
index 0a92fde54..92c5e1a8e 100644
--- a/plugins/managesieve/tests/src/parser_relational
+++ b/plugins/managesieve/tests/src/parser_relational
@@ -1,4 +1,4 @@
-require ["relational","comparator-i;ascii-numeric"];
+require ["comparator-i;ascii-numeric","relational"];
 # rule:[redirect]
 if header :value "ge" :comparator "i;ascii-numeric" "X-Spam-score" "14"
 {
diff --git a/plugins/managesieve/tests/src/parser_subaddress b/plugins/managesieve/tests/src/parser_subaddress
index f106b796e..e44555096 100644
--- a/plugins/managesieve/tests/src/parser_subaddress
+++ b/plugins/managesieve/tests/src/parser_subaddress
@@ -1,4 +1,4 @@
-require ["envelope","subaddress","fileinto"];
+require ["envelope","fileinto","subaddress"];
 if envelope :user "To" "postmaster"
 {
 	fileinto "postmaster";
diff --git a/plugins/managesieve/tests/src/parser_vacation_seconds b/plugins/managesieve/tests/src/parser_vacation_seconds
new file mode 100644
index 000000000..75cbcae46
--- /dev/null
+++ b/plugins/managesieve/tests/src/parser_vacation_seconds
@@ -0,0 +1,12 @@
+require ["vacation-seconds"];
+# rule:[test-vacation]
+if header :contains "Subject" "vacation"
+{
+	vacation :seconds 0 text:
+# test
+test test /* test */
+test
+.
+;
+	stop;
+}
diff --git a/plugins/markasjunk/localization/az_AZ.inc b/plugins/markasjunk/localization/az_AZ.inc
index 77da3f76b..420cd036a 100644
--- a/plugins/markasjunk/localization/az_AZ.inc
+++ b/plugins/markasjunk/localization/az_AZ.inc
@@ -2,10 +2,10 @@
 
 /*
  +-----------------------------------------------------------------------+
- | plugins/markasjunk/localization/<lang>.inc                             |
+ | plugins/markasjunk/localization/<lang>.inc                            |
  |                                                                       |
  | Localization file of the Roundcube Webmail Mark-As-Junk plugin        |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
diff --git a/plugins/markasjunk/localization/be_BE.inc b/plugins/markasjunk/localization/be_BE.inc
index 5553f6475..d11e34bdd 100644
--- a/plugins/markasjunk/localization/be_BE.inc
+++ b/plugins/markasjunk/localization/be_BE.inc
@@ -2,10 +2,10 @@
 
 /*
  +-----------------------------------------------------------------------+
- | plugins/markasjunk/localization/<lang>.inc                             |
+ | plugins/markasjunk/localization/<lang>.inc                            |
  |                                                                       |
  | Localization file of the Roundcube Webmail Mark-As-Junk plugin        |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
diff --git a/plugins/markasjunk/localization/br.inc b/plugins/markasjunk/localization/br.inc
index 6dd835d3e..4ae4190be 100644
--- a/plugins/markasjunk/localization/br.inc
+++ b/plugins/markasjunk/localization/br.inc
@@ -2,10 +2,10 @@
 
 /*
  +-----------------------------------------------------------------------+
- | plugins/markasjunk/localization/<lang>.inc                             |
+ | plugins/markasjunk/localization/<lang>.inc                            |
  |                                                                       |
  | Localization file of the Roundcube Webmail Mark-As-Junk plugin        |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
diff --git a/plugins/markasjunk/localization/bs_BA.inc b/plugins/markasjunk/localization/bs_BA.inc
index ffcf861e5..aaa093300 100644
--- a/plugins/markasjunk/localization/bs_BA.inc
+++ b/plugins/markasjunk/localization/bs_BA.inc
@@ -2,10 +2,10 @@
 
 /*
  +-----------------------------------------------------------------------+
- | plugins/markasjunk/localization/<lang>.inc                             |
+ | plugins/markasjunk/localization/<lang>.inc                            |
  |                                                                       |
  | Localization file of the Roundcube Webmail Mark-As-Junk plugin        |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
diff --git a/plugins/markasjunk/localization/ca_ES.inc b/plugins/markasjunk/localization/ca_ES.inc
index c798a3adc..4b05d9248 100644
--- a/plugins/markasjunk/localization/ca_ES.inc
+++ b/plugins/markasjunk/localization/ca_ES.inc
@@ -2,10 +2,10 @@
 
 /*
  +-----------------------------------------------------------------------+
- | plugins/markasjunk/localization/<lang>.inc                             |
+ | plugins/markasjunk/localization/<lang>.inc                            |
  |                                                                       |
  | Localization file of the Roundcube Webmail Mark-As-Junk plugin        |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
diff --git a/plugins/markasjunk/localization/cs_CZ.inc b/plugins/markasjunk/localization/cs_CZ.inc
index a6aec56be..b56cb5c88 100644
--- a/plugins/markasjunk/localization/cs_CZ.inc
+++ b/plugins/markasjunk/localization/cs_CZ.inc
@@ -2,10 +2,10 @@
 
 /*
  +-----------------------------------------------------------------------+
- | plugins/markasjunk/localization/<lang>.inc                             |
+ | plugins/markasjunk/localization/<lang>.inc                            |
  |                                                                       |
  | Localization file of the Roundcube Webmail Mark-As-Junk plugin        |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
diff --git a/plugins/markasjunk/localization/cy_GB.inc b/plugins/markasjunk/localization/cy_GB.inc
index 8d31383bc..7b1b6e6d3 100644
--- a/plugins/markasjunk/localization/cy_GB.inc
+++ b/plugins/markasjunk/localization/cy_GB.inc
@@ -2,10 +2,10 @@
 
 /*
  +-----------------------------------------------------------------------+
- | plugins/markasjunk/localization/<lang>.inc                             |
+ | plugins/markasjunk/localization/<lang>.inc                            |
  |                                                                       |
  | Localization file of the Roundcube Webmail Mark-As-Junk plugin        |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
diff --git a/plugins/markasjunk/localization/da_DK.inc b/plugins/markasjunk/localization/da_DK.inc
index 1e1ca4d66..bd76b6ba7 100644
--- a/plugins/markasjunk/localization/da_DK.inc
+++ b/plugins/markasjunk/localization/da_DK.inc
@@ -2,10 +2,10 @@
 
 /*
  +-----------------------------------------------------------------------+
- | plugins/markasjunk/localization/<lang>.inc                             |
+ | plugins/markasjunk/localization/<lang>.inc                            |
  |                                                                       |
  | Localization file of the Roundcube Webmail Mark-As-Junk plugin        |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
diff --git a/plugins/markasjunk/localization/de_CH.inc b/plugins/markasjunk/localization/de_CH.inc
index 0c22e1ad0..89b22b7b4 100644
--- a/plugins/markasjunk/localization/de_CH.inc
+++ b/plugins/markasjunk/localization/de_CH.inc
@@ -2,10 +2,10 @@
 
 /*
  +-----------------------------------------------------------------------+
- | plugins/markasjunk/localization/<lang>.inc                             |
+ | plugins/markasjunk/localization/<lang>.inc                            |
  |                                                                       |
  | Localization file of the Roundcube Webmail Mark-As-Junk plugin        |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
diff --git a/plugins/markasjunk/localization/de_DE.inc b/plugins/markasjunk/localization/de_DE.inc
index fe2706bc6..f158d78ac 100644
--- a/plugins/markasjunk/localization/de_DE.inc
+++ b/plugins/markasjunk/localization/de_DE.inc
@@ -2,10 +2,10 @@
 
 /*
  +-----------------------------------------------------------------------+
- | plugins/markasjunk/localization/<lang>.inc                             |
+ | plugins/markasjunk/localization/<lang>.inc                            |
  |                                                                       |
  | Localization file of the Roundcube Webmail Mark-As-Junk plugin        |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
diff --git a/plugins/markasjunk/localization/el_GR.inc b/plugins/markasjunk/localization/el_GR.inc
index 044b453ff..fb16a29ce 100644
--- a/plugins/markasjunk/localization/el_GR.inc
+++ b/plugins/markasjunk/localization/el_GR.inc
@@ -2,10 +2,10 @@
 
 /*
  +-----------------------------------------------------------------------+
- | plugins/markasjunk/localization/<lang>.inc                             |
+ | plugins/markasjunk/localization/<lang>.inc                            |
  |                                                                       |
  | Localization file of the Roundcube Webmail Mark-As-Junk plugin        |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -17,7 +17,7 @@
 */
 
 $labels = array();
-$labels['buttontext'] = 'Junk';
+$labels['buttontext'] = 'Ανεπιθύμητα';
 $labels['buttontitle'] = 'Σήμανση ως Ανεπιθύμητου';
 $labels['reportedasjunk'] = 'Αναφέρθηκε ως Ανεπιθήμητο';
 
diff --git a/plugins/markasjunk/localization/en_GB.inc b/plugins/markasjunk/localization/en_GB.inc
index 0cc212f22..aaa3c91ac 100644
--- a/plugins/markasjunk/localization/en_GB.inc
+++ b/plugins/markasjunk/localization/en_GB.inc
@@ -2,10 +2,10 @@
 
 /*
  +-----------------------------------------------------------------------+
- | plugins/markasjunk/localization/<lang>.inc                             |
+ | plugins/markasjunk/localization/<lang>.inc                            |
  |                                                                       |
  | Localization file of the Roundcube Webmail Mark-As-Junk plugin        |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
diff --git a/plugins/markasjunk/localization/en_US.inc b/plugins/markasjunk/localization/en_US.inc
index 0cc212f22..aaa3c91ac 100644
--- a/plugins/markasjunk/localization/en_US.inc
+++ b/plugins/markasjunk/localization/en_US.inc
@@ -2,10 +2,10 @@
 
 /*
  +-----------------------------------------------------------------------+
- | plugins/markasjunk/localization/<lang>.inc                             |
+ | plugins/markasjunk/localization/<lang>.inc                            |
  |                                                                       |
  | Localization file of the Roundcube Webmail Mark-As-Junk plugin        |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
diff --git a/plugins/markasjunk/localization/eo.inc b/plugins/markasjunk/localization/eo.inc
index 0610e00fd..220750a20 100644
--- a/plugins/markasjunk/localization/eo.inc
+++ b/plugins/markasjunk/localization/eo.inc
@@ -2,10 +2,10 @@
 
 /*
  +-----------------------------------------------------------------------+
- | plugins/markasjunk/localization/<lang>.inc                             |
+ | plugins/markasjunk/localization/<lang>.inc                            |
  |                                                                       |
  | Localization file of the Roundcube Webmail Mark-As-Junk plugin        |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
diff --git a/plugins/markasjunk/localization/es_AR.inc b/plugins/markasjunk/localization/es_AR.inc
index 9c293f750..58e1f25b4 100644
--- a/plugins/markasjunk/localization/es_AR.inc
+++ b/plugins/markasjunk/localization/es_AR.inc
@@ -2,10 +2,10 @@
 
 /*
  +-----------------------------------------------------------------------+
- | plugins/markasjunk/localization/<lang>.inc                             |
+ | plugins/markasjunk/localization/<lang>.inc                            |
  |                                                                       |
  | Localization file of the Roundcube Webmail Mark-As-Junk plugin        |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
diff --git a/plugins/markasjunk/localization/es_ES.inc b/plugins/markasjunk/localization/es_ES.inc
index 23eb5e523..5bb75548b 100644
--- a/plugins/markasjunk/localization/es_ES.inc
+++ b/plugins/markasjunk/localization/es_ES.inc
@@ -2,10 +2,10 @@
 
 /*
  +-----------------------------------------------------------------------+
- | plugins/markasjunk/localization/<lang>.inc                             |
+ | plugins/markasjunk/localization/<lang>.inc                            |
  |                                                                       |
  | Localization file of the Roundcube Webmail Mark-As-Junk plugin        |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
diff --git a/plugins/markasjunk/localization/et_EE.inc b/plugins/markasjunk/localization/et_EE.inc
index 92c9d53b7..2d90a4a8c 100644
--- a/plugins/markasjunk/localization/et_EE.inc
+++ b/plugins/markasjunk/localization/et_EE.inc
@@ -2,10 +2,10 @@
 
 /*
  +-----------------------------------------------------------------------+
- | plugins/markasjunk/localization/<lang>.inc                             |
+ | plugins/markasjunk/localization/<lang>.inc                            |
  |                                                                       |
  | Localization file of the Roundcube Webmail Mark-As-Junk plugin        |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
diff --git a/plugins/markasjunk/localization/fa_IR.inc b/plugins/markasjunk/localization/fa_IR.inc
index 9d5ee06b2..2dc051890 100644
--- a/plugins/markasjunk/localization/fa_IR.inc
+++ b/plugins/markasjunk/localization/fa_IR.inc
@@ -2,10 +2,10 @@
 
 /*
  +-----------------------------------------------------------------------+
- | plugins/markasjunk/localization/<lang>.inc                             |
+ | plugins/markasjunk/localization/<lang>.inc                            |
  |                                                                       |
  | Localization file of the Roundcube Webmail Mark-As-Junk plugin        |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
diff --git a/plugins/markasjunk/localization/fi_FI.inc b/plugins/markasjunk/localization/fi_FI.inc
index 653c9abbf..4af075f33 100644
--- a/plugins/markasjunk/localization/fi_FI.inc
+++ b/plugins/markasjunk/localization/fi_FI.inc
@@ -2,10 +2,10 @@
 
 /*
  +-----------------------------------------------------------------------+
- | plugins/markasjunk/localization/<lang>.inc                             |
+ | plugins/markasjunk/localization/<lang>.inc                            |
  |                                                                       |
  | Localization file of the Roundcube Webmail Mark-As-Junk plugin        |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
diff --git a/plugins/markasjunk/localization/fr_FR.inc b/plugins/markasjunk/localization/fr_FR.inc
index 0691099c4..ff96e6a1e 100644
--- a/plugins/markasjunk/localization/fr_FR.inc
+++ b/plugins/markasjunk/localization/fr_FR.inc
@@ -2,10 +2,10 @@
 
 /*
  +-----------------------------------------------------------------------+
- | plugins/markasjunk/localization/<lang>.inc                             |
+ | plugins/markasjunk/localization/<lang>.inc                            |
  |                                                                       |
  | Localization file of the Roundcube Webmail Mark-As-Junk plugin        |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
diff --git a/plugins/markasjunk/localization/gl_ES.inc b/plugins/markasjunk/localization/gl_ES.inc
index 2d1c4ac13..d2a9e98b7 100644
--- a/plugins/markasjunk/localization/gl_ES.inc
+++ b/plugins/markasjunk/localization/gl_ES.inc
@@ -2,10 +2,10 @@
 
 /*
  +-----------------------------------------------------------------------+
- | plugins/markasjunk/localization/<lang>.inc                             |
+ | plugins/markasjunk/localization/<lang>.inc                            |
  |                                                                       |
  | Localization file of the Roundcube Webmail Mark-As-Junk plugin        |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -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/markasjunk/localization/he_IL.inc b/plugins/markasjunk/localization/he_IL.inc
index a3d503a37..bb2cc266b 100644
--- a/plugins/markasjunk/localization/he_IL.inc
+++ b/plugins/markasjunk/localization/he_IL.inc
@@ -2,10 +2,10 @@
 
 /*
  +-----------------------------------------------------------------------+
- | plugins/markasjunk/localization/<lang>.inc                             |
+ | plugins/markasjunk/localization/<lang>.inc                            |
  |                                                                       |
  | Localization file of the Roundcube Webmail Mark-As-Junk plugin        |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
diff --git a/plugins/markasjunk/localization/hr_HR.inc b/plugins/markasjunk/localization/hr_HR.inc
index e007a6738..b1da8b128 100644
--- a/plugins/markasjunk/localization/hr_HR.inc
+++ b/plugins/markasjunk/localization/hr_HR.inc
@@ -2,10 +2,10 @@
 
 /*
  +-----------------------------------------------------------------------+
- | plugins/markasjunk/localization/<lang>.inc                             |
+ | plugins/markasjunk/localization/<lang>.inc                            |
  |                                                                       |
  | Localization file of the Roundcube Webmail Mark-As-Junk plugin        |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
diff --git a/plugins/markasjunk/localization/hu_HU.inc b/plugins/markasjunk/localization/hu_HU.inc
index 41af99a0f..b5529f024 100644
--- a/plugins/markasjunk/localization/hu_HU.inc
+++ b/plugins/markasjunk/localization/hu_HU.inc
@@ -2,10 +2,10 @@
 
 /*
  +-----------------------------------------------------------------------+
- | plugins/markasjunk/localization/<lang>.inc                             |
+ | plugins/markasjunk/localization/<lang>.inc                            |
  |                                                                       |
  | Localization file of the Roundcube Webmail Mark-As-Junk plugin        |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
diff --git a/plugins/markasjunk/localization/hy_AM.inc b/plugins/markasjunk/localization/hy_AM.inc
index e2b625f11..f614b5814 100644
--- a/plugins/markasjunk/localization/hy_AM.inc
+++ b/plugins/markasjunk/localization/hy_AM.inc
@@ -2,10 +2,10 @@
 
 /*
  +-----------------------------------------------------------------------+
- | plugins/markasjunk/localization/<lang>.inc                             |
+ | plugins/markasjunk/localization/<lang>.inc                            |
  |                                                                       |
  | Localization file of the Roundcube Webmail Mark-As-Junk plugin        |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
diff --git a/plugins/markasjunk/localization/id_ID.inc b/plugins/markasjunk/localization/id_ID.inc
index 2f4dc3664..b5cf0e9de 100644
--- a/plugins/markasjunk/localization/id_ID.inc
+++ b/plugins/markasjunk/localization/id_ID.inc
@@ -2,10 +2,10 @@
 
 /*
  +-----------------------------------------------------------------------+
- | plugins/markasjunk/localization/<lang>.inc                             |
+ | plugins/markasjunk/localization/<lang>.inc                            |
  |                                                                       |
  | Localization file of the Roundcube Webmail Mark-As-Junk plugin        |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -17,7 +17,7 @@
 */
 
 $labels = array();
-$labels['buttontext'] = 'Junk';
+$labels['buttontext'] = 'Sampah';
 $labels['buttontitle'] = 'Tandai sebagai sampah';
 $labels['reportedasjunk'] = 'Berhasil dilaporkan sebagai sampah';
 
diff --git a/plugins/markasjunk/localization/it_IT.inc b/plugins/markasjunk/localization/it_IT.inc
index a7eb367e6..8ffa1eb23 100644
--- a/plugins/markasjunk/localization/it_IT.inc
+++ b/plugins/markasjunk/localization/it_IT.inc
@@ -2,10 +2,10 @@
 
 /*
  +-----------------------------------------------------------------------+
- | plugins/markasjunk/localization/<lang>.inc                             |
+ | plugins/markasjunk/localization/<lang>.inc                            |
  |                                                                       |
  | Localization file of the Roundcube Webmail Mark-As-Junk plugin        |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
diff --git a/plugins/markasjunk/localization/ja_JP.inc b/plugins/markasjunk/localization/ja_JP.inc
index c0e1a5050..52811505e 100644
--- a/plugins/markasjunk/localization/ja_JP.inc
+++ b/plugins/markasjunk/localization/ja_JP.inc
@@ -2,10 +2,10 @@
 
 /*
  +-----------------------------------------------------------------------+
- | plugins/markasjunk/localization/<lang>.inc                             |
+ | plugins/markasjunk/localization/<lang>.inc                            |
  |                                                                       |
  | Localization file of the Roundcube Webmail Mark-As-Junk plugin        |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
diff --git a/plugins/markasjunk/localization/km_KH.inc b/plugins/markasjunk/localization/km_KH.inc
index 5ee7bf59b..655af9cb8 100644
--- a/plugins/markasjunk/localization/km_KH.inc
+++ b/plugins/markasjunk/localization/km_KH.inc
@@ -2,10 +2,10 @@
 
 /*
  +-----------------------------------------------------------------------+
- | plugins/markasjunk/localization/<lang>.inc                             |
+ | plugins/markasjunk/localization/<lang>.inc                            |
  |                                                                       |
  | Localization file of the Roundcube Webmail Mark-As-Junk plugin        |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
diff --git a/plugins/markasjunk/localization/ko_KR.inc b/plugins/markasjunk/localization/ko_KR.inc
index 979ac6aa9..dd2d1e798 100644
--- a/plugins/markasjunk/localization/ko_KR.inc
+++ b/plugins/markasjunk/localization/ko_KR.inc
@@ -2,10 +2,10 @@
 
 /*
  +-----------------------------------------------------------------------+
- | plugins/markasjunk/localization/<lang>.inc                             |
+ | plugins/markasjunk/localization/<lang>.inc                            |
  |                                                                       |
  | Localization file of the Roundcube Webmail Mark-As-Junk plugin        |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
diff --git a/plugins/markasjunk/localization/ku.inc b/plugins/markasjunk/localization/ku.inc
index f355cc4c1..da3dda775 100644
--- a/plugins/markasjunk/localization/ku.inc
+++ b/plugins/markasjunk/localization/ku.inc
@@ -2,10 +2,10 @@
 
 /*
  +-----------------------------------------------------------------------+
- | plugins/markasjunk/localization/<lang>.inc                             |
+ | plugins/markasjunk/localization/<lang>.inc                            |
  |                                                                       |
  | Localization file of the Roundcube Webmail Mark-As-Junk plugin        |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
diff --git a/plugins/markasjunk/localization/lt_LT.inc b/plugins/markasjunk/localization/lt_LT.inc
index 01030e332..b1973dee0 100644
--- a/plugins/markasjunk/localization/lt_LT.inc
+++ b/plugins/markasjunk/localization/lt_LT.inc
@@ -2,10 +2,10 @@
 
 /*
  +-----------------------------------------------------------------------+
- | plugins/markasjunk/localization/<lang>.inc                             |
+ | plugins/markasjunk/localization/<lang>.inc                            |
  |                                                                       |
  | Localization file of the Roundcube Webmail Mark-As-Junk plugin        |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
diff --git a/plugins/markasjunk/localization/lv_LV.inc b/plugins/markasjunk/localization/lv_LV.inc
index 46a6cffbf..f0ea921ba 100644
--- a/plugins/markasjunk/localization/lv_LV.inc
+++ b/plugins/markasjunk/localization/lv_LV.inc
@@ -2,10 +2,10 @@
 
 /*
  +-----------------------------------------------------------------------+
- | plugins/markasjunk/localization/<lang>.inc                             |
+ | plugins/markasjunk/localization/<lang>.inc                            |
  |                                                                       |
  | Localization file of the Roundcube Webmail Mark-As-Junk plugin        |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
diff --git a/plugins/markasjunk/localization/ml_IN.inc b/plugins/markasjunk/localization/ml_IN.inc
index d367f97fe..faeea49ed 100644
--- a/plugins/markasjunk/localization/ml_IN.inc
+++ b/plugins/markasjunk/localization/ml_IN.inc
@@ -2,10 +2,10 @@
 
 /*
  +-----------------------------------------------------------------------+
- | plugins/markasjunk/localization/<lang>.inc                             |
+ | plugins/markasjunk/localization/<lang>.inc                            |
  |                                                                       |
  | Localization file of the Roundcube Webmail Mark-As-Junk plugin        |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
diff --git a/plugins/markasjunk/localization/mr_IN.inc b/plugins/markasjunk/localization/mr_IN.inc
index 2239fe6ff..e5d4e89d3 100644
--- a/plugins/markasjunk/localization/mr_IN.inc
+++ b/plugins/markasjunk/localization/mr_IN.inc
@@ -2,10 +2,10 @@
 
 /*
  +-----------------------------------------------------------------------+
- | plugins/markasjunk/localization/<lang>.inc                             |
+ | plugins/markasjunk/localization/<lang>.inc                            |
  |                                                                       |
  | Localization file of the Roundcube Webmail Mark-As-Junk plugin        |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
diff --git a/plugins/markasjunk/localization/nb_NO.inc b/plugins/markasjunk/localization/nb_NO.inc
index 57249e826..1c8058b23 100644
--- a/plugins/markasjunk/localization/nb_NO.inc
+++ b/plugins/markasjunk/localization/nb_NO.inc
@@ -2,10 +2,10 @@
 
 /*
  +-----------------------------------------------------------------------+
- | plugins/markasjunk/localization/<lang>.inc                             |
+ | plugins/markasjunk/localization/<lang>.inc                            |
  |                                                                       |
  | Localization file of the Roundcube Webmail Mark-As-Junk plugin        |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
diff --git a/plugins/markasjunk/localization/nl_NL.inc b/plugins/markasjunk/localization/nl_NL.inc
index 702bd03f6..235ad8e0f 100644
--- a/plugins/markasjunk/localization/nl_NL.inc
+++ b/plugins/markasjunk/localization/nl_NL.inc
@@ -2,10 +2,10 @@
 
 /*
  +-----------------------------------------------------------------------+
- | plugins/markasjunk/localization/<lang>.inc                             |
+ | plugins/markasjunk/localization/<lang>.inc                            |
  |                                                                       |
  | Localization file of the Roundcube Webmail Mark-As-Junk plugin        |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
diff --git a/plugins/markasjunk/localization/nn_NO.inc b/plugins/markasjunk/localization/nn_NO.inc
index 05401e48c..977f4bd01 100644
--- a/plugins/markasjunk/localization/nn_NO.inc
+++ b/plugins/markasjunk/localization/nn_NO.inc
@@ -2,10 +2,10 @@
 
 /*
  +-----------------------------------------------------------------------+
- | plugins/markasjunk/localization/<lang>.inc                             |
+ | plugins/markasjunk/localization/<lang>.inc                            |
  |                                                                       |
  | Localization file of the Roundcube Webmail Mark-As-Junk plugin        |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
diff --git a/plugins/markasjunk/localization/pl_PL.inc b/plugins/markasjunk/localization/pl_PL.inc
index d2e644836..3078967cc 100644
--- a/plugins/markasjunk/localization/pl_PL.inc
+++ b/plugins/markasjunk/localization/pl_PL.inc
@@ -2,10 +2,10 @@
 
 /*
  +-----------------------------------------------------------------------+
- | plugins/markasjunk/localization/<lang>.inc                             |
+ | plugins/markasjunk/localization/<lang>.inc                            |
  |                                                                       |
  | Localization file of the Roundcube Webmail Mark-As-Junk plugin        |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
diff --git a/plugins/markasjunk/localization/pt_BR.inc b/plugins/markasjunk/localization/pt_BR.inc
index 49677e379..578d1de1c 100644
--- a/plugins/markasjunk/localization/pt_BR.inc
+++ b/plugins/markasjunk/localization/pt_BR.inc
@@ -2,10 +2,10 @@
 
 /*
  +-----------------------------------------------------------------------+
- | plugins/markasjunk/localization/<lang>.inc                             |
+ | plugins/markasjunk/localization/<lang>.inc                            |
  |                                                                       |
  | Localization file of the Roundcube Webmail Mark-As-Junk plugin        |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
diff --git a/plugins/markasjunk/localization/pt_PT.inc b/plugins/markasjunk/localization/pt_PT.inc
index 57be7f2c4..20cb00356 100644
--- a/plugins/markasjunk/localization/pt_PT.inc
+++ b/plugins/markasjunk/localization/pt_PT.inc
@@ -2,10 +2,10 @@
 
 /*
  +-----------------------------------------------------------------------+
- | plugins/markasjunk/localization/<lang>.inc                             |
+ | plugins/markasjunk/localization/<lang>.inc                            |
  |                                                                       |
  | Localization file of the Roundcube Webmail Mark-As-Junk plugin        |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
diff --git a/plugins/markasjunk/localization/ro_RO.inc b/plugins/markasjunk/localization/ro_RO.inc
index 9bd9c4193..03e5824c2 100644
--- a/plugins/markasjunk/localization/ro_RO.inc
+++ b/plugins/markasjunk/localization/ro_RO.inc
@@ -2,10 +2,10 @@
 
 /*
  +-----------------------------------------------------------------------+
- | plugins/markasjunk/localization/<lang>.inc                             |
+ | plugins/markasjunk/localization/<lang>.inc                            |
  |                                                                       |
  | Localization file of the Roundcube Webmail Mark-As-Junk plugin        |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
diff --git a/plugins/markasjunk/localization/ru_RU.inc b/plugins/markasjunk/localization/ru_RU.inc
index 2f121ec4c..cbf99d253 100644
--- a/plugins/markasjunk/localization/ru_RU.inc
+++ b/plugins/markasjunk/localization/ru_RU.inc
@@ -2,10 +2,10 @@
 
 /*
  +-----------------------------------------------------------------------+
- | plugins/markasjunk/localization/<lang>.inc                             |
+ | plugins/markasjunk/localization/<lang>.inc                            |
  |                                                                       |
  | Localization file of the Roundcube Webmail Mark-As-Junk plugin        |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
diff --git a/plugins/markasjunk/localization/si_LK.inc b/plugins/markasjunk/localization/si_LK.inc
index 2e2aa6225..2a60675af 100644
--- a/plugins/markasjunk/localization/si_LK.inc
+++ b/plugins/markasjunk/localization/si_LK.inc
@@ -2,10 +2,10 @@
 
 /*
  +-----------------------------------------------------------------------+
- | plugins/markasjunk/localization/<lang>.inc                             |
+ | plugins/markasjunk/localization/<lang>.inc                            |
  |                                                                       |
  | Localization file of the Roundcube Webmail Mark-As-Junk plugin        |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
diff --git a/plugins/markasjunk/localization/sk_SK.inc b/plugins/markasjunk/localization/sk_SK.inc
index 54424e9cf..51b45b835 100644
--- a/plugins/markasjunk/localization/sk_SK.inc
+++ b/plugins/markasjunk/localization/sk_SK.inc
@@ -2,10 +2,10 @@
 
 /*
  +-----------------------------------------------------------------------+
- | plugins/markasjunk/localization/<lang>.inc                             |
+ | plugins/markasjunk/localization/<lang>.inc                            |
  |                                                                       |
  | Localization file of the Roundcube Webmail Mark-As-Junk plugin        |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
diff --git a/plugins/markasjunk/localization/sl_SI.inc b/plugins/markasjunk/localization/sl_SI.inc
index 063e85e3f..c9f585143 100644
--- a/plugins/markasjunk/localization/sl_SI.inc
+++ b/plugins/markasjunk/localization/sl_SI.inc
@@ -2,10 +2,10 @@
 
 /*
  +-----------------------------------------------------------------------+
- | plugins/markasjunk/localization/<lang>.inc                             |
+ | plugins/markasjunk/localization/<lang>.inc                            |
  |                                                                       |
  | Localization file of the Roundcube Webmail Mark-As-Junk plugin        |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
diff --git a/plugins/markasjunk/localization/sr_CS.inc b/plugins/markasjunk/localization/sr_CS.inc
index 866466b41..d1d67c3d7 100644
--- a/plugins/markasjunk/localization/sr_CS.inc
+++ b/plugins/markasjunk/localization/sr_CS.inc
@@ -2,10 +2,10 @@
 
 /*
  +-----------------------------------------------------------------------+
- | plugins/markasjunk/localization/<lang>.inc                             |
+ | plugins/markasjunk/localization/<lang>.inc                            |
  |                                                                       |
  | Localization file of the Roundcube Webmail Mark-As-Junk plugin        |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
diff --git a/plugins/markasjunk/localization/sv_SE.inc b/plugins/markasjunk/localization/sv_SE.inc
index 130d6a522..5b8ddf559 100644
--- a/plugins/markasjunk/localization/sv_SE.inc
+++ b/plugins/markasjunk/localization/sv_SE.inc
@@ -2,10 +2,10 @@
 
 /*
  +-----------------------------------------------------------------------+
- | plugins/markasjunk/localization/<lang>.inc                             |
+ | plugins/markasjunk/localization/<lang>.inc                            |
  |                                                                       |
  | Localization file of the Roundcube Webmail Mark-As-Junk plugin        |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
diff --git a/plugins/markasjunk/localization/tr_TR.inc b/plugins/markasjunk/localization/tr_TR.inc
index ad97e2a6d..2b07e4dbc 100644
--- a/plugins/markasjunk/localization/tr_TR.inc
+++ b/plugins/markasjunk/localization/tr_TR.inc
@@ -2,10 +2,10 @@
 
 /*
  +-----------------------------------------------------------------------+
- | plugins/markasjunk/localization/<lang>.inc                             |
+ | plugins/markasjunk/localization/<lang>.inc                            |
  |                                                                       |
  | Localization file of the Roundcube Webmail Mark-As-Junk plugin        |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
diff --git a/plugins/markasjunk/localization/uk_UA.inc b/plugins/markasjunk/localization/uk_UA.inc
index e853120dd..17e90447c 100644
--- a/plugins/markasjunk/localization/uk_UA.inc
+++ b/plugins/markasjunk/localization/uk_UA.inc
@@ -2,10 +2,10 @@
 
 /*
  +-----------------------------------------------------------------------+
- | plugins/markasjunk/localization/<lang>.inc                             |
+ | plugins/markasjunk/localization/<lang>.inc                            |
  |                                                                       |
  | Localization file of the Roundcube Webmail Mark-As-Junk plugin        |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
diff --git a/plugins/markasjunk/localization/vi_VN.inc b/plugins/markasjunk/localization/vi_VN.inc
index 6c9fe17d0..5a97db7bc 100644
--- a/plugins/markasjunk/localization/vi_VN.inc
+++ b/plugins/markasjunk/localization/vi_VN.inc
@@ -2,10 +2,10 @@
 
 /*
  +-----------------------------------------------------------------------+
- | plugins/markasjunk/localization/<lang>.inc                             |
+ | plugins/markasjunk/localization/<lang>.inc                            |
  |                                                                       |
  | Localization file of the Roundcube Webmail Mark-As-Junk plugin        |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
diff --git a/plugins/markasjunk/localization/zh_CN.inc b/plugins/markasjunk/localization/zh_CN.inc
index 6f3ffc195..118e3a956 100644
--- a/plugins/markasjunk/localization/zh_CN.inc
+++ b/plugins/markasjunk/localization/zh_CN.inc
@@ -2,10 +2,10 @@
 
 /*
  +-----------------------------------------------------------------------+
- | plugins/markasjunk/localization/<lang>.inc                             |
+ | plugins/markasjunk/localization/<lang>.inc                            |
  |                                                                       |
  | Localization file of the Roundcube Webmail Mark-As-Junk plugin        |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
diff --git a/plugins/markasjunk/localization/zh_TW.inc b/plugins/markasjunk/localization/zh_TW.inc
index e627efc44..3deb85caa 100644
--- a/plugins/markasjunk/localization/zh_TW.inc
+++ b/plugins/markasjunk/localization/zh_TW.inc
@@ -2,10 +2,10 @@
 
 /*
  +-----------------------------------------------------------------------+
- | plugins/markasjunk/localization/<lang>.inc                             |
+ | plugins/markasjunk/localization/<lang>.inc                            |
  |                                                                       |
  | Localization file of the Roundcube Webmail Mark-As-Junk plugin        |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
diff --git a/plugins/new_user_dialog/localization/az_AZ.inc b/plugins/new_user_dialog/localization/az_AZ.inc
index e4b95bf1f..df576c6f6 100644
--- a/plugins/new_user_dialog/localization/az_AZ.inc
+++ b/plugins/new_user_dialog/localization/az_AZ.inc
@@ -2,18 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/az_AZ/labels.inc                                         |
+ | plugins/new_user_dialog/localization/<lang>.inc                       |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail New User Dialog plugin     |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Orkhan Guliyev <proger@box.az>                                |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-new_user_dialog/
 */
 
 $labels = array();
 $labels['identitydialogtitle'] = 'Lütfən, adınızı yazın.';
 $labels['identitydialoghint'] = 'Bu məlumat yalnız ilk girişdə göstərilir.';
 
+?>
\ No newline at end of file
diff --git a/plugins/new_user_dialog/localization/be_BE.inc b/plugins/new_user_dialog/localization/be_BE.inc
index e12ebc8c0..08881d8e6 100644
--- a/plugins/new_user_dialog/localization/be_BE.inc
+++ b/plugins/new_user_dialog/localization/be_BE.inc
@@ -2,19 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/be_BE/labels.inc                                         |
+ | plugins/new_user_dialog/localization/<lang>.inc                       |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail New User Dialog plugin     |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Alex Nehaichik <nab@mail.by>                                  |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-new_user_dialog/
 */
 
 $labels = array();
 $labels['identitydialogtitle'] = 'Калі ласка, запоўніце асабістыя звесткі';
 $labels['identitydialoghint'] = 'Гэтае вакно з\'яўляецца толькі аднойчы, у час першага ўваходу.';
 
+?>
\ No newline at end of file
diff --git a/plugins/new_user_dialog/localization/bg_BG.inc b/plugins/new_user_dialog/localization/bg_BG.inc
index 9575daa49..3201c6104 100644
--- a/plugins/new_user_dialog/localization/bg_BG.inc
+++ b/plugins/new_user_dialog/localization/bg_BG.inc
@@ -2,19 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/bg_BG/labels.inc                                         |
+ | plugins/new_user_dialog/localization/<lang>.inc                       |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail New User Dialog plugin     |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-new_user_dialog/
 */
 
 $labels = array();
 $labels['identitydialogtitle'] = 'Моля попълнете Вашите данни.';
 $labels['identitydialoghint'] = 'Това съобщение се появява само при първото влизане.';
 
+?>
\ No newline at end of file
diff --git a/plugins/new_user_dialog/localization/bs_BA.inc b/plugins/new_user_dialog/localization/bs_BA.inc
index 3fd961ab3..6b07e7cd5 100644
--- a/plugins/new_user_dialog/localization/bs_BA.inc
+++ b/plugins/new_user_dialog/localization/bs_BA.inc
@@ -2,19 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/bs_BA/labels.inc                                         |
+ | plugins/new_user_dialog/localization/<lang>.inc                       |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail New User Dialog plugin     |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Kenan Dervišević <kenan3008@gmail.com>                      |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-new_user_dialog/
 */
 
 $labels = array();
 $labels['identitydialogtitle'] = 'Molimo vas da kompletirate vaš identitet pošiljaoca';
 $labels['identitydialoghint'] = 'Ovaj okvir se pojavljuje samo jednom prilikom prve prijave.';
 
+?>
\ No newline at end of file
diff --git a/plugins/new_user_dialog/localization/ca_ES.inc b/plugins/new_user_dialog/localization/ca_ES.inc
index 970d1c3b7..047042293 100644
--- a/plugins/new_user_dialog/localization/ca_ES.inc
+++ b/plugins/new_user_dialog/localization/ca_ES.inc
@@ -2,18 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ca_ES/labels.inc                                         |
+ | plugins/new_user_dialog/localization/<lang>.inc                       |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail New User Dialog plugin     |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Jordi Sanfeliu <jordi@fibranet.cat>                           |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-new_user_dialog/
 */
 
 $labels = array();
 $labels['identitydialogtitle'] = 'Si us plau, completeu la identitat del vostre remitent';
 $labels['identitydialoghint'] = 'Aquest quadre només apareix un cop a la primera entrada.';
 
+?>
\ No newline at end of file
diff --git a/plugins/new_user_dialog/localization/cs_CZ.inc b/plugins/new_user_dialog/localization/cs_CZ.inc
index d112d08c5..90f84d0a1 100644
--- a/plugins/new_user_dialog/localization/cs_CZ.inc
+++ b/plugins/new_user_dialog/localization/cs_CZ.inc
@@ -2,19 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/cs_CZ/labels.inc                                         |
+ | plugins/new_user_dialog/localization/<lang>.inc                       |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail New User Dialog plugin     |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-new_user_dialog/
 */
 
 $labels = array();
 $labels['identitydialogtitle'] = 'Prosím doplňte své jméno a e-mail';
 $labels['identitydialoghint'] = 'Tento dialog se objeví pouze při prvním přihlášení.';
 
+?>
\ No newline at end of file
diff --git a/plugins/new_user_dialog/localization/cy_GB.inc b/plugins/new_user_dialog/localization/cy_GB.inc
index 0c89e2488..e9e42d166 100644
--- a/plugins/new_user_dialog/localization/cy_GB.inc
+++ b/plugins/new_user_dialog/localization/cy_GB.inc
@@ -2,19 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/cy_GB/labels.inc                                         |
+ | plugins/new_user_dialog/localization/<lang>.inc                       |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail New User Dialog plugin     |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Dafydd Tomos <Unknown>                                        |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-new_user_dialog/
 */
 
 $labels = array();
 $labels['identitydialogtitle'] = 'Cwblhewch eich enw danfonwr';
 $labels['identitydialoghint'] = 'Mae\'r bocs hwn yn ymddangos unwaith ar eich mewngofnodiad cyntaf.';
 
+?>
\ No newline at end of file
diff --git a/plugins/new_user_dialog/localization/da_DK.inc b/plugins/new_user_dialog/localization/da_DK.inc
index e500dad87..c08c108ed 100644
--- a/plugins/new_user_dialog/localization/da_DK.inc
+++ b/plugins/new_user_dialog/localization/da_DK.inc
@@ -2,19 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/da_DK/labels.inc                                         |
+ | plugins/new_user_dialog/localization/<lang>.inc                       |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail New User Dialog plugin     |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: John Loft Christiansen <Unknown>                              |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-new_user_dialog/
 */
 
 $labels = array();
 $labels['identitydialogtitle'] = 'Udfyld din afsender identitet';
 $labels['identitydialoghint'] = 'Denne boks vises kun én gang ved første login';
 
+?>
\ No newline at end of file
diff --git a/plugins/new_user_dialog/localization/de_CH.inc b/plugins/new_user_dialog/localization/de_CH.inc
index 18dec59b1..23a897d47 100644
--- a/plugins/new_user_dialog/localization/de_CH.inc
+++ b/plugins/new_user_dialog/localization/de_CH.inc
@@ -2,10 +2,10 @@
 
 /*
  +-----------------------------------------------------------------------+
- | plugins/new_user_dialog/localization/<lang>.inc                        |
+ | plugins/new_user_dialog/localization/<lang>.inc                       |
  |                                                                       |
  | Localization file of the Roundcube Webmail New User Dialog plugin     |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
diff --git a/plugins/new_user_dialog/localization/de_DE.inc b/plugins/new_user_dialog/localization/de_DE.inc
index df7f2f3e3..23a897d47 100644
--- a/plugins/new_user_dialog/localization/de_DE.inc
+++ b/plugins/new_user_dialog/localization/de_DE.inc
@@ -2,19 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/de_DE/labels.inc                                         |
+ | plugins/new_user_dialog/localization/<lang>.inc                       |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail New User Dialog plugin     |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-new_user_dialog/
 */
 
 $labels = array();
 $labels['identitydialogtitle'] = 'Bitte vervollständigen Sie Ihre Absender-Informationen';
 $labels['identitydialoghint'] = 'Dieser Dialog erscheint nur einmal beim ersten Login.';
 
+?>
\ No newline at end of file
diff --git a/plugins/new_user_dialog/localization/el_GR.inc b/plugins/new_user_dialog/localization/el_GR.inc
index 5bd26e139..b03d43c61 100644
--- a/plugins/new_user_dialog/localization/el_GR.inc
+++ b/plugins/new_user_dialog/localization/el_GR.inc
@@ -2,19 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/el_GR/labels.inc                                         |
+ | plugins/new_user_dialog/localization/<lang>.inc                       |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail New User Dialog plugin     |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Nikos Keramidis <info@torus.gr>                               |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-new_user_dialog/
 */
 
 $labels = array();
 $labels['identitydialogtitle'] = 'Παρακαλώ συμπληρώστε την ταυτότητα του αποστολέα';
 $labels['identitydialoghint'] = 'Αυτό το πλαίσιο εμφανίζεται μια φορά κατά την πρώτη σύνδεση';
 
+?>
\ No newline at end of file
diff --git a/plugins/new_user_dialog/localization/en_GB.inc b/plugins/new_user_dialog/localization/en_GB.inc
index 946ccd874..ead515db8 100644
--- a/plugins/new_user_dialog/localization/en_GB.inc
+++ b/plugins/new_user_dialog/localization/en_GB.inc
@@ -2,19 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/en_GB/labels.inc                                         |
+ | plugins/new_user_dialog/localization/<lang>.inc                       |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail New User Dialog plugin     |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Tony Whitmore <Unknown>                                       |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-new_user_dialog/
 */
 
 $labels = array();
 $labels['identitydialogtitle'] = 'Please complete your sender identity.';
 $labels['identitydialoghint'] = 'This box only appears once at the first login.';
 
+?>
\ No newline at end of file
diff --git a/plugins/new_user_dialog/localization/en_US.inc b/plugins/new_user_dialog/localization/en_US.inc
index a9e66bd23..d508cfc9c 100644
--- a/plugins/new_user_dialog/localization/en_US.inc
+++ b/plugins/new_user_dialog/localization/en_US.inc
@@ -2,10 +2,10 @@
 
 /*
  +-----------------------------------------------------------------------+
- | plugins/new_user_dialog/localization/<lang>.inc                        |
+ | plugins/new_user_dialog/localization/<lang>.inc                       |
  |                                                                       |
  | Localization file of the Roundcube Webmail New User Dialog plugin     |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
diff --git a/plugins/new_user_dialog/localization/eo.inc b/plugins/new_user_dialog/localization/eo.inc
index b66fec67c..e8fd2e987 100644
--- a/plugins/new_user_dialog/localization/eo.inc
+++ b/plugins/new_user_dialog/localization/eo.inc
@@ -2,18 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/eo/labels.inc                                         |
+ | plugins/new_user_dialog/localization/<lang>.inc                       |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail New User Dialog plugin     |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Michael Moroni <michael.moroni@mailoo.org>                    |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-new_user_dialog/
 */
 
 $labels = array();
 $labels['identitydialogtitle'] = 'Bonvole plenumu vian identon pri sendanto';
 $labels['identitydialoghint'] = 'Ĉi tiu kesto aperas nur unufoje je la unua ensaluto.';
 
+?>
\ No newline at end of file
diff --git a/plugins/new_user_dialog/localization/es_ES.inc b/plugins/new_user_dialog/localization/es_ES.inc
index f9f9b7260..c44e3bbae 100644
--- a/plugins/new_user_dialog/localization/es_ES.inc
+++ b/plugins/new_user_dialog/localization/es_ES.inc
@@ -2,19 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/es_ES/labels.inc                                         |
+ | plugins/new_user_dialog/localization/<lang>.inc                       |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail New User Dialog plugin     |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-new_user_dialog/
 */
 
 $labels = array();
 $labels['identitydialogtitle'] = 'Por favor, complete sus datos personales';
 $labels['identitydialoghint'] = 'Este diálogo sólo aparecerá la primera vez que se conecte al correo.';
 
+?>
\ No newline at end of file
diff --git a/plugins/new_user_dialog/localization/et_EE.inc b/plugins/new_user_dialog/localization/et_EE.inc
index 6c836b1b7..610d496e5 100644
--- a/plugins/new_user_dialog/localization/et_EE.inc
+++ b/plugins/new_user_dialog/localization/et_EE.inc
@@ -2,19 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/et_EE/labels.inc                                         |
+ | plugins/new_user_dialog/localization/<lang>.inc                       |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail New User Dialog plugin     |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-new_user_dialog/
 */
 
 $labels = array();
 $labels['identitydialogtitle'] = 'Palun täida oma saatja identiteet';
 $labels['identitydialoghint'] = 'See kast ilmub ainult esimesel sisselogimisel.';
 
+?>
\ No newline at end of file
diff --git a/plugins/new_user_dialog/localization/fa_IR.inc b/plugins/new_user_dialog/localization/fa_IR.inc
index b4d6f910d..473ac7267 100644
--- a/plugins/new_user_dialog/localization/fa_IR.inc
+++ b/plugins/new_user_dialog/localization/fa_IR.inc
@@ -2,19 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/fa_IR/labels.inc                                         |
+ | plugins/new_user_dialog/localization/<lang>.inc                       |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail New User Dialog plugin     |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Hamid <abbaszadeh.h@gmail.com>                                |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-new_user_dialog/
 */
 
 $labels = array();
 $labels['identitydialogtitle'] = 'لطفا شناسنه ارسالی‌تان را کامل کنید';
 $labels['identitydialoghint'] = 'این جعبه فقط یک بار در اولین ورود ظاهر می‌شود.';
 
+?>
\ No newline at end of file
diff --git a/plugins/new_user_dialog/localization/fi_FI.inc b/plugins/new_user_dialog/localization/fi_FI.inc
index f36a50a1e..22ca93c4e 100644
--- a/plugins/new_user_dialog/localization/fi_FI.inc
+++ b/plugins/new_user_dialog/localization/fi_FI.inc
@@ -2,19 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/fi_FI/labels.inc                                         |
+ | plugins/new_user_dialog/localization/<lang>.inc                       |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail New User Dialog plugin     |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Jiri Grönroos <Unknown>                                      |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-new_user_dialog/
 */
 
 $labels = array();
 $labels['identitydialogtitle'] = 'Täydennä lähettäjätietosi';
-$labels['identitydialoghint'] = 'Tämä viesti näytetään vain ensimmäisellä kirjautumiskerralla.';
+$labels['identitydialoghint'] = 'Tämä kohta näkyy vain ensimmäisellä kirjautumiskerralla.';
 
+?>
\ No newline at end of file
diff --git a/plugins/new_user_dialog/localization/fr_FR.inc b/plugins/new_user_dialog/localization/fr_FR.inc
index 1cad93c35..58bc5f86c 100644
--- a/plugins/new_user_dialog/localization/fr_FR.inc
+++ b/plugins/new_user_dialog/localization/fr_FR.inc
@@ -2,19 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/fr_FR/labels.inc                                         |
+ | plugins/new_user_dialog/localization/<lang>.inc                       |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail New User Dialog plugin     |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Edouard Moreau <Unknown>                                      |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-new_user_dialog/
 */
 
 $labels = array();
 $labels['identitydialogtitle'] = 'Veuillez saisir votre identité d\'expéditeur';
 $labels['identitydialoghint'] = 'Cette fenêtre de dialogue ne s\'affiche qu\'une seule fois à la première connexion.';
 
+?>
\ No newline at end of file
diff --git a/plugins/new_user_dialog/localization/gl_ES.inc b/plugins/new_user_dialog/localization/gl_ES.inc
index 3257e9062..c61299757 100644
--- a/plugins/new_user_dialog/localization/gl_ES.inc
+++ b/plugins/new_user_dialog/localization/gl_ES.inc
@@ -2,19 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/gl_ES/labels.inc                                         |
+ | plugins/new_user_dialog/localization/<lang>.inc                       |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail New User Dialog plugin     |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-new_user_dialog/
 */
 
 $labels = array();
 $labels['identitydialogtitle'] = 'Por favor, complete os seus datos persoais';
 $labels['identitydialoghint'] = 'Este diálogo só aparecerá a primera vez que se conecte ao correo.';
 
+?>
\ No newline at end of file
diff --git a/plugins/new_user_dialog/localization/he_IL.inc b/plugins/new_user_dialog/localization/he_IL.inc
index ae1a17277..97991dfa4 100644
--- a/plugins/new_user_dialog/localization/he_IL.inc
+++ b/plugins/new_user_dialog/localization/he_IL.inc
@@ -2,19 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/he_IL/labels.inc                                         |
+ | plugins/new_user_dialog/localization/<lang>.inc                       |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail New User Dialog plugin     |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Moshe Leibovitch <moish@mln.co.il>                            |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-new_user_dialog/
 */
 
 $labels = array();
 $labels['identitydialogtitle'] = 'נא להשלים את פרטי זהותך';
 $labels['identitydialoghint'] = 'תיבה זו מופיעה פעם אחת בזמן הכניסה הראשונה למערכת';
 
+?>
\ No newline at end of file
diff --git a/plugins/new_user_dialog/localization/hr_HR.inc b/plugins/new_user_dialog/localization/hr_HR.inc
index 35a340823..33b11c339 100644
--- a/plugins/new_user_dialog/localization/hr_HR.inc
+++ b/plugins/new_user_dialog/localization/hr_HR.inc
@@ -2,19 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/hr_HR/labels.inc                                         |
+ | plugins/new_user_dialog/localization/<lang>.inc                       |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail New User Dialog plugin     |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Svebor Prstačić <svebor.prstacic@gmail.com>                 |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-new_user_dialog/
 */
 
 $labels = array();
 $labels['identitydialogtitle'] = 'Molim dovršite vaš identitet za slanje poruka';
 $labels['identitydialoghint'] = 'Ova poruka će se pojaviti samo kod prve prijave.';
 
+?>
\ No newline at end of file
diff --git a/plugins/new_user_dialog/localization/hu_HU.inc b/plugins/new_user_dialog/localization/hu_HU.inc
index a405f1504..7a636d97e 100644
--- a/plugins/new_user_dialog/localization/hu_HU.inc
+++ b/plugins/new_user_dialog/localization/hu_HU.inc
@@ -2,19 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/hu_HU/labels.inc                                         |
+ | plugins/new_user_dialog/localization/<lang>.inc                       |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail New User Dialog plugin     |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Droszler Gabor <droszler@datatrans.hu>                        |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-new_user_dialog/
 */
 
 $labels = array();
 $labels['identitydialogtitle'] = 'Kérem töltse ki a küldő azonosítóját';
 $labels['identitydialoghint'] = 'Ez az ablak csak az első belépéskor jelenik meg.';
 
+?>
\ No newline at end of file
diff --git a/plugins/new_user_dialog/localization/hy_AM.inc b/plugins/new_user_dialog/localization/hy_AM.inc
index 46c7c0853..8d96de0da 100644
--- a/plugins/new_user_dialog/localization/hy_AM.inc
+++ b/plugins/new_user_dialog/localization/hy_AM.inc
@@ -2,18 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/hy_AM/labels.inc                                         |
+ | plugins/new_user_dialog/localization/<lang>.inc                       |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail New User Dialog plugin     |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Vahan Yerkanian <vahan@yerkanian.com>                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-new_user_dialog/
 */
 
 $labels = array();
 $labels['identitydialogtitle'] = 'Լրացրեք Ձեր ինքնությունը';
 $labels['identitydialoghint'] = 'Այս նշումը երևում է միայն առաջին մուտքի ժամանակ մեկ անգամ';
 
+?>
\ No newline at end of file
diff --git a/plugins/new_user_dialog/localization/id_ID.inc b/plugins/new_user_dialog/localization/id_ID.inc
index 31de6b7e1..b2f7ace4b 100644
--- a/plugins/new_user_dialog/localization/id_ID.inc
+++ b/plugins/new_user_dialog/localization/id_ID.inc
@@ -2,19 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/id_ID/labels.inc                                         |
+ | plugins/new_user_dialog/localization/<lang>.inc                       |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail New User Dialog plugin     |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Putu Arya Sabda Wijaya <Unknown>                              |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-new_user_dialog/
 */
 
 $labels = array();
 $labels['identitydialogtitle'] = 'Tolong lengkapi identitas pengirim Anda';
 $labels['identitydialoghint'] = 'Kotak ini hanya muncul sekali saat masuk pertama kali.';
 
+?>
\ No newline at end of file
diff --git a/plugins/new_user_dialog/localization/it_IT.inc b/plugins/new_user_dialog/localization/it_IT.inc
index 93de388cd..0d1032d6c 100644
--- a/plugins/new_user_dialog/localization/it_IT.inc
+++ b/plugins/new_user_dialog/localization/it_IT.inc
@@ -2,19 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/it_IT/labels.inc                                         |
+ | plugins/new_user_dialog/localization/<lang>.inc                       |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail New User Dialog plugin     |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-new_user_dialog/
 */
 
 $labels = array();
 $labels['identitydialogtitle'] = 'Per favore completa le informazioni riguardo la tua identità';
 $labels['identitydialoghint'] = 'Questa finestra comparirà una volta sola al primo accesso';
 
+?>
\ No newline at end of file
diff --git a/plugins/new_user_dialog/localization/ja_JP.inc b/plugins/new_user_dialog/localization/ja_JP.inc
index 79b07c059..fbf5b5b4c 100644
--- a/plugins/new_user_dialog/localization/ja_JP.inc
+++ b/plugins/new_user_dialog/localization/ja_JP.inc
@@ -2,19 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ja_JP/labels.inc                                         |
+ | plugins/new_user_dialog/localization/<lang>.inc                       |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail New User Dialog plugin     |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Takahiro Kambe <Unknown>                                      |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-new_user_dialog/
 */
 
 $labels = array();
 $labels['identitydialogtitle'] = '送信者情報の入力を完了してください。';
 $labels['identitydialoghint'] = 'このボックスは最初のログイン時に一度だけ表示されます。';
 
+?>
\ No newline at end of file
diff --git a/plugins/new_user_dialog/localization/km_KH.inc b/plugins/new_user_dialog/localization/km_KH.inc
index ef42c0fcd..1752a10e7 100644
--- a/plugins/new_user_dialog/localization/km_KH.inc
+++ b/plugins/new_user_dialog/localization/km_KH.inc
@@ -2,18 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/km_KH/labels.inc                                         |
+ | plugins/new_user_dialog/localization/<lang>.inc                       |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail New User Dialog plugin     |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: samdyk                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-new_user_dialog/
 */
 
 $labels = array();
 $labels['identitydialogtitle'] = 'សូមបំពេញអ្តសញ្ញាណអ្នកផ្ញើ';
 $labels['identitydialoghint'] = 'ប្រអប់នេះបង្ហាញតែម្តងទេ ពេលចូលលើកទីមួយ';
 
+?>
\ No newline at end of file
diff --git a/plugins/new_user_dialog/localization/ko_KR.inc b/plugins/new_user_dialog/localization/ko_KR.inc
index 99483819c..d9b519475 100644
--- a/plugins/new_user_dialog/localization/ko_KR.inc
+++ b/plugins/new_user_dialog/localization/ko_KR.inc
@@ -2,18 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ko_KR/labels.inc                                         |
+ | plugins/new_user_dialog/localization/<lang>.inc                       |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail New User Dialog plugin     |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Kim, Woohyun <woohyun.kim@gmail.com>                          |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-new_user_dialog/
 */
 
 $labels = array();
-$labels['identitydialogtitle'] = '수신자의 신원을 채우기 바랍니다.';
-$labels['identitydialoghint'] = '이 박스는 최초로 로그인할 때만 나타납니다.';
+$labels['identitydialogtitle'] = '수신인의 신원을 완성하시기 바랍니다.';
+$labels['identitydialoghint'] = '이 상자는 최초로 로그인할 때만 나타납니다.';
 
+?>
\ No newline at end of file
diff --git a/plugins/new_user_dialog/localization/ku.inc b/plugins/new_user_dialog/localization/ku.inc
index c0969f5fe..fe0f8e55c 100644
--- a/plugins/new_user_dialog/localization/ku.inc
+++ b/plugins/new_user_dialog/localization/ku.inc
@@ -2,19 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ku/labels.inc                                         |
+ | plugins/new_user_dialog/localization/<lang>.inc                       |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail New User Dialog plugin     |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: david absalan <absalan@live.com>                              |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-new_user_dialog/
 */
 
 $labels = array();
 $labels['identitydialogtitle'] = 'tkaya nawnişani nenar ba tawawi bnwsa';
 $labels['identitydialoghint'] = 'am qtwia wadiara yak jar la sarata krawatawa';
 
+?>
\ No newline at end of file
diff --git a/plugins/new_user_dialog/localization/lt_LT.inc b/plugins/new_user_dialog/localization/lt_LT.inc
index 0f03c6d75..f134bc486 100644
--- a/plugins/new_user_dialog/localization/lt_LT.inc
+++ b/plugins/new_user_dialog/localization/lt_LT.inc
@@ -2,19 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/lt_LT/labels.inc                                         |
+ | plugins/new_user_dialog/localization/<lang>.inc                       |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail New User Dialog plugin     |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Rimas Kudelis <rq@akl.lt>                                     |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-new_user_dialog/
 */
 
 $labels = array();
 $labels['identitydialogtitle'] = 'Prašom užpildyti trūkstamą informaciją apie save';
 $labels['identitydialoghint'] = 'Šis langas rodomas tik prisijungus pirmąjį kartą.';
 
+?>
\ No newline at end of file
diff --git a/plugins/new_user_dialog/localization/lv_LV.inc b/plugins/new_user_dialog/localization/lv_LV.inc
index 3303270c7..2e3642330 100644
--- a/plugins/new_user_dialog/localization/lv_LV.inc
+++ b/plugins/new_user_dialog/localization/lv_LV.inc
@@ -2,19 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/lv_LV/labels.inc                                         |
+ | plugins/new_user_dialog/localization/<lang>.inc                       |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail New User Dialog plugin     |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Ivars Strazdiņš <Unknown>                                   |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-new_user_dialog/
 */
 
 $labels = array();
 $labels['identitydialogtitle'] = 'Lūdzu, aizpildiet nosūtītāja identifikācijas informāciju';
 $labels['identitydialoghint'] = 'Šis logs parādīsies tikai pirmajā pieteikšanās reizē';
 
+?>
\ No newline at end of file
diff --git a/plugins/new_user_dialog/localization/ml_IN.inc b/plugins/new_user_dialog/localization/ml_IN.inc
index 4009da4f4..74ce4285a 100644
--- a/plugins/new_user_dialog/localization/ml_IN.inc
+++ b/plugins/new_user_dialog/localization/ml_IN.inc
@@ -2,18 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ml_IN/labels.inc                                         |
+ | plugins/new_user_dialog/localization/<lang>.inc                       |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail New User Dialog plugin     |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Anish A <aneesh.nl@gmail.com>                                 |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-new_user_dialog/
 */
 
 $labels = array();
 $labels['identitydialogtitle'] = 'സ്വീകര്‍ത്താവിന്റെ വ്യക്തിത്വം പൂര്‍ത്തീകരിക്കുക';
 $labels['identitydialoghint'] = 'ആദ്യത്തെ പ്രവേശനത്തില്‍ മാത്രമേ ഈ പെട്ടി വരികയുള്ളു';
 
+?>
\ No newline at end of file
diff --git a/plugins/new_user_dialog/localization/mr_IN.inc b/plugins/new_user_dialog/localization/mr_IN.inc
index ebf0d919f..2e684aaa9 100644
--- a/plugins/new_user_dialog/localization/mr_IN.inc
+++ b/plugins/new_user_dialog/localization/mr_IN.inc
@@ -2,19 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/mr_IN/labels.inc                                         |
+ | plugins/new_user_dialog/localization/<lang>.inc                       |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail New User Dialog plugin     |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Devendra Buddhikot <devendradb@rediffmail.com>                |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-new_user_dialog/
 */
 
 $labels = array();
 $labels['identitydialogtitle'] = 'कृपया पाठवणा-याची ओळख पूर्ण करा';
 $labels['identitydialoghint'] = 'हा चौकोन पहिल्यांदा लॉगिन करताना एकदाच दिसेल.';
 
+?>
\ No newline at end of file
diff --git a/plugins/new_user_dialog/localization/nb_NO.inc b/plugins/new_user_dialog/localization/nb_NO.inc
index f4594378c..18ddd9ce7 100644
--- a/plugins/new_user_dialog/localization/nb_NO.inc
+++ b/plugins/new_user_dialog/localization/nb_NO.inc
@@ -2,18 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/nb_NB/labels.inc                                         |
+ | plugins/new_user_dialog/localization/<lang>.inc                       |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail New User Dialog plugin     |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Peter Grindem <peter@grindem.no>                              |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-new_user_dialog/
 */
 
 $labels = array();
 $labels['identitydialogtitle'] = 'Vennligst fullfør din avvsender identitet.';
 $labels['identitydialoghint'] = 'Denne boksen kommer kun ved første pålogging.';
 
+?>
\ 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 747133514..c5d392f98 100644
--- a/plugins/new_user_dialog/localization/nl_NL.inc
+++ b/plugins/new_user_dialog/localization/nl_NL.inc
@@ -2,19 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/nl_NL/labels.inc                                         |
+ | plugins/new_user_dialog/localization/<lang>.inc                       |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail New User Dialog plugin     |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-new_user_dialog/
 */
 
 $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/nn_NO.inc b/plugins/new_user_dialog/localization/nn_NO.inc
index 4f03b47da..a7fd7d650 100644
--- a/plugins/new_user_dialog/localization/nn_NO.inc
+++ b/plugins/new_user_dialog/localization/nn_NO.inc
@@ -2,18 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/nn_NN/labels.inc                                         |
+ | plugins/new_user_dialog/localization/<lang>.inc                       |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail New User Dialog plugin     |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Åsmund Skjæveland <aasmunds@ulrik.uio.no>                   |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-new_user_dialog/
 */
 
 $labels = array();
 $labels['identitydialogtitle'] = 'Fullfør avsendaridentiteten din.';
 $labels['identitydialoghint'] = 'Denne boksen kjem berre fram ved første pålogging.';
 
+?>
\ No newline at end of file
diff --git a/plugins/new_user_dialog/localization/pl_PL.inc b/plugins/new_user_dialog/localization/pl_PL.inc
index 3bdcfd5f6..034893b35 100644
--- a/plugins/new_user_dialog/localization/pl_PL.inc
+++ b/plugins/new_user_dialog/localization/pl_PL.inc
@@ -2,19 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/pl_PL/labels.inc                                         |
+ | plugins/new_user_dialog/localization/<lang>.inc                       |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail New User Dialog plugin     |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-new_user_dialog/
 */
 
 $labels = array();
 $labels['identitydialogtitle'] = 'Uzupełnij tożsamość nadawcy';
 $labels['identitydialoghint'] = 'To okno pojawia się tylko przy pierwszym logowaniu.';
 
+?>
\ No newline at end of file
diff --git a/plugins/new_user_dialog/localization/pt_BR.inc b/plugins/new_user_dialog/localization/pt_BR.inc
index f53fa44ac..7556b4d1a 100644
--- a/plugins/new_user_dialog/localization/pt_BR.inc
+++ b/plugins/new_user_dialog/localization/pt_BR.inc
@@ -2,18 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/pt_BR/labels.inc                                         |
+ | plugins/new_user_dialog/localization/<lang>.inc                       |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail New User Dialog plugin     |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Victor Benincasa <vbenincasa@gmail.com>                       |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-new_user_dialog/
 */
 
 $labels = array();
 $labels['identitydialogtitle'] = 'Por favor complete a sua identidade';
 $labels['identitydialoghint'] = 'Esta tela aparece somente no primeiro acesso.';
 
+?>
\ No newline at end of file
diff --git a/plugins/new_user_dialog/localization/pt_PT.inc b/plugins/new_user_dialog/localization/pt_PT.inc
index 7b920a485..3e3922fca 100644
--- a/plugins/new_user_dialog/localization/pt_PT.inc
+++ b/plugins/new_user_dialog/localization/pt_PT.inc
@@ -2,19 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/pt_PT/labels.inc                                         |
+ | plugins/new_user_dialog/localization/<lang>.inc                       |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail New User Dialog plugin     |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: David <Unknown>                                               |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-new_user_dialog/
 */
 
 $labels = array();
 $labels['identitydialogtitle'] = 'Por favor, complete a sua identidade';
 $labels['identitydialoghint'] = 'Esta caixa aparece apenas uma vez no primeiro acesso.';
 
+?>
\ No newline at end of file
diff --git a/plugins/new_user_dialog/localization/ro_RO.inc b/plugins/new_user_dialog/localization/ro_RO.inc
index 148c56f8f..caa8f3257 100644
--- a/plugins/new_user_dialog/localization/ro_RO.inc
+++ b/plugins/new_user_dialog/localization/ro_RO.inc
@@ -2,19 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ro_RO/labels.inc                                         |
+ | plugins/new_user_dialog/localization/<lang>.inc                       |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail New User Dialog plugin     |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: tudor <tudor@starnet-alba.ro>                                 |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-new_user_dialog/
 */
 
 $labels = array();
 $labels['identitydialogtitle'] = 'Te rog completează identitatea de expeditor.';
 $labels['identitydialoghint'] = 'Această căsuţă apare o data la prima autentificare.';
 
+?>
\ No newline at end of file
diff --git a/plugins/new_user_dialog/localization/ru_RU.inc b/plugins/new_user_dialog/localization/ru_RU.inc
index 723899602..2c948781e 100644
--- a/plugins/new_user_dialog/localization/ru_RU.inc
+++ b/plugins/new_user_dialog/localization/ru_RU.inc
@@ -2,19 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ru_RU/labels.inc                                         |
+ | plugins/new_user_dialog/localization/<lang>.inc                       |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail New User Dialog plugin     |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-new_user_dialog/
 */
 
 $labels = array();
 $labels['identitydialogtitle'] = 'Пожалуйста, укажите Ваше имя.';
 $labels['identitydialoghint'] = 'Данное сообщение отображается только при первом входе.';
 
+?>
\ No newline at end of file
diff --git a/plugins/new_user_dialog/localization/sk_SK.inc b/plugins/new_user_dialog/localization/sk_SK.inc
index 5e1fd9944..ca57463df 100644
--- a/plugins/new_user_dialog/localization/sk_SK.inc
+++ b/plugins/new_user_dialog/localization/sk_SK.inc
@@ -2,19 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/sk_SK/labels.inc                                         |
+ | plugins/new_user_dialog/localization/<lang>.inc                       |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail New User Dialog plugin     |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-new_user_dialog/
 */
 
 $labels = array();
 $labels['identitydialogtitle'] = 'Doplňte prosím Vašu identifikáciu odosielateľa';
 $labels['identitydialoghint'] = 'Toto okno sa objaví len pri prvom prihlásení.';
 
+?>
\ No newline at end of file
diff --git a/plugins/new_user_dialog/localization/sl_SI.inc b/plugins/new_user_dialog/localization/sl_SI.inc
index 431d93331..7d26b44bd 100644
--- a/plugins/new_user_dialog/localization/sl_SI.inc
+++ b/plugins/new_user_dialog/localization/sl_SI.inc
@@ -2,19 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/sl_SI/labels.inc                                         |
+ | plugins/new_user_dialog/localization/<lang>.inc                       |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail New User Dialog plugin     |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-new_user_dialog/
 */
 
 $labels = array();
 $labels['identitydialogtitle'] = 'Izberite identiteto za pošiljanje';
 $labels['identitydialoghint'] = 'To okno se prikaže le ob prvi prijavi v spletno pošto.';
 
+?>
\ No newline at end of file
diff --git a/plugins/new_user_dialog/localization/sr_CS.inc b/plugins/new_user_dialog/localization/sr_CS.inc
index 9042b5795..ee2999bab 100644
--- a/plugins/new_user_dialog/localization/sr_CS.inc
+++ b/plugins/new_user_dialog/localization/sr_CS.inc
@@ -2,18 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/sr_CS/labels.inc                                         |
+ | plugins/new_user_dialog/localization/<lang>.inc                       |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail New User Dialog plugin     |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Saša Zejnilović <zejnils@gmail.com>                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-new_user_dialog/
 */
 
 $labels = array();
 $labels['identitydialogtitle'] = 'Молимо вас да попуните свој идентитет пошиљаоца';
 $labels['identitydialoghint'] = 'Ово поље се појављује само једном у првом логовању';
 
+?>
\ No newline at end of file
diff --git a/plugins/new_user_dialog/localization/sv_SE.inc b/plugins/new_user_dialog/localization/sv_SE.inc
index 2dda5d879..71ecfc7fe 100644
--- a/plugins/new_user_dialog/localization/sv_SE.inc
+++ b/plugins/new_user_dialog/localization/sv_SE.inc
@@ -2,18 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/sv_SE/labels.inc                                         |
+ | plugins/new_user_dialog/localization/<lang>.inc                       |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail New User Dialog plugin     |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Jonas Nasholm                                                 |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-new_user_dialog/
 */
 
 $labels = array();
 $labels['identitydialogtitle'] = 'Fyll i namn och avsändaradress under personliga inställningar';
 $labels['identitydialoghint'] = 'Informationen visas endast vid första inloggningen.';
 
+?>
\ No newline at end of file
diff --git a/plugins/new_user_dialog/localization/tr_TR.inc b/plugins/new_user_dialog/localization/tr_TR.inc
index 52a2894f2..4d6c6d16e 100644
--- a/plugins/new_user_dialog/localization/tr_TR.inc
+++ b/plugins/new_user_dialog/localization/tr_TR.inc
@@ -2,19 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/tr_TR/labels.inc                                         |
+ | plugins/new_user_dialog/localization/<lang>.inc                       |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail New User Dialog plugin     |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: ismail yenigul <Unknown>                                      |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-new_user_dialog/
 */
 
 $labels = array();
 $labels['identitydialogtitle'] = 'Lütfen gönderici kimliğinizi tamamlayın';
 $labels['identitydialoghint'] = 'Bu ekran ilk girişte bir kereliğine gözükür';
 
+?>
\ No newline at end of file
diff --git a/plugins/new_user_dialog/localization/uk_UA.inc b/plugins/new_user_dialog/localization/uk_UA.inc
index 0b77817ec..0c4111d85 100644
--- a/plugins/new_user_dialog/localization/uk_UA.inc
+++ b/plugins/new_user_dialog/localization/uk_UA.inc
@@ -2,19 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/uk_UA/labels.inc                                         |
+ | plugins/new_user_dialog/localization/<lang>.inc                       |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail New User Dialog plugin     |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Anton Gladky <Unknown>                                        |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-new_user_dialog/
 */
 
 $labels = array();
 $labels['identitydialogtitle'] = 'Будь ласка, вкажіть Ваше ім’я';
 $labels['identitydialoghint'] = 'Це повідомлення відображається тільки під час першого заходу';
 
+?>
\ No newline at end of file
diff --git a/plugins/new_user_dialog/localization/vi_VN.inc b/plugins/new_user_dialog/localization/vi_VN.inc
index fe617e597..86d164124 100644
--- a/plugins/new_user_dialog/localization/vi_VN.inc
+++ b/plugins/new_user_dialog/localization/vi_VN.inc
@@ -2,18 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/vi_VN/labels.inc                                         |
+ | plugins/new_user_dialog/localization/<lang>.inc                       |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail New User Dialog plugin     |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Kenny Tran <kennethanh@gmail.com>                             |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-new_user_dialog/
 */
 
 $labels = array();
 $labels['identitydialogtitle'] = 'Xin điền nhận diện người gửi của bạn';
 $labels['identitydialoghint'] = 'Hộp này chỉ xuất hiện 1 lần khi đăng nhập lần đầu tiên';
 
+?>
\ 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 1a757c6d6..ca40173af 100644
--- a/plugins/new_user_dialog/localization/zh_CN.inc
+++ b/plugins/new_user_dialog/localization/zh_CN.inc
@@ -2,18 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/zh_CN/labels.inc                                         |
+ | plugins/new_user_dialog/localization/<lang>.inc                       |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail New User Dialog plugin     |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Christopher Meng <cickumqt@gmail.com>                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-new_user_dialog/
 */
 
 $labels = array();
-$labels['identitydialogtitle'] = '请填写发送者标识';
+$labels['identitydialogtitle'] = '请填写发送人身份';
 $labels['identitydialoghint'] = '本提示仅在第一次登录时显示。';
 
+?>
\ No newline at end of file
diff --git a/plugins/new_user_dialog/localization/zh_TW.inc b/plugins/new_user_dialog/localization/zh_TW.inc
index 6a36f1a4a..d9309fc12 100644
--- a/plugins/new_user_dialog/localization/zh_TW.inc
+++ b/plugins/new_user_dialog/localization/zh_TW.inc
@@ -2,19 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/zh_TW/labels.inc                                         |
+ | plugins/new_user_dialog/localization/<lang>.inc                       |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail New User Dialog plugin     |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-new_user_dialog/
 */
 
 $labels = array();
 $labels['identitydialogtitle'] = '請完成您的身份資訊';
 $labels['identitydialoghint'] = '此視窗只會於第一次登入時出現。';
 
+?>
\ No newline at end of file
diff --git a/plugins/new_user_dialog/new_user_dialog.php b/plugins/new_user_dialog/new_user_dialog.php
index 871384e47..39a707638 100644
--- a/plugins/new_user_dialog/new_user_dialog.php
+++ b/plugins/new_user_dialog/new_user_dialog.php
@@ -10,10 +10,12 @@
  * @version @package_version@
  * @license GNU GPLv3+
  * @author Thomas Bruederli
+ * @author Aleksander Machniak
  */
 class new_user_dialog extends rcube_plugin
 {
   public $task = 'login|mail';
+  public $noframe = true;
 
   function init()
   {
@@ -32,8 +34,9 @@ class new_user_dialog extends rcube_plugin
   function create_identity($p)
   {
     // set session flag when a new user was created and the default identity seems to be incomplete
-    if ($p['login'] && !$p['complete'])
+    if ($p['login'] && !$p['complete']) {
       $_SESSION['plugin.newuserdialog'] = true;
+    }
   }
 
   /**
@@ -86,7 +89,6 @@ class new_user_dialog extends rcube_plugin
             'id' => 'newuserdialog',
             'action' => $rcmail->url('plugin.newusersave'),
             'method' => 'post'),
-          html::tag('h3', null, rcube::Q($this->gettext('identitydialogtitle'))) .
           html::p('hint', rcube::Q($this->gettext('identitydialoghint'))) .
           $table->show() .
           html::p(array('class' => 'formbuttons'),
@@ -94,12 +96,23 @@ class new_user_dialog extends rcube_plugin
               'class' => 'button mainaction', 'value' => $this->gettext('save'))))
         ));
 
+      $title = rcube::JQ($this->gettext('identitydialogtitle'));
+
       // disable keyboard events for messages list (#1486726)
-      $rcmail->output->add_script(
-        "rcmail.message_list.key_press = function(){};
-         rcmail.message_list.key_down = function(){};
-         $('#newuserdialog').show().dialog({ modal:true, resizable:false, closeOnEscape:false, width:420 });
-         $('input[name=_name]').focus();
+      $rcmail->output->add_script("
+        $('#newuserdialog').show()
+          .dialog({modal:true, resizable:false, closeOnEscape:false, width:450, title:'$title'})
+          .submit(function() {
+            var i, request = {}, form = $(this).serializeArray();
+
+            for (i in form)
+              request[form[i].name] = form[i].value;
+
+            rcmail.http_post('plugin.newusersave', request, true);
+            return false;
+          });
+        $('input[name=_name]').focus();
+        rcube_webmail.prototype.new_user_dialog_close = function() { $('#newuserdialog').dialog('close'); }
         ", 'docready');
 
       $this->include_stylesheet('newuserdialog.css');
@@ -107,16 +120,16 @@ class new_user_dialog extends rcube_plugin
   }
 
   /**
-   * Handler for submitted form
+   * Handler for submitted form (ajax request)
    *
    * Check fields and save to default identity if valid.
    * Afterwards the session flag is removed and we're done.
    */
   function save_data()
   {
-    $rcmail = rcmail::get_instance();
-    $identity = $rcmail->user->get_identity();
-    $identities_level = intval($rcmail->config->get('identities_level', 0));
+    $rcmail      = rcmail::get_instance();
+    $identity    = $rcmail->user->get_identity();
+    $ident_level = intval($rcmail->config->get('identities_level', 0));
 
     $save_data = array(
       'name'         => rcube_utils::get_input_value('_name', rcube_utils::INPUT_POST),
@@ -126,20 +139,26 @@ class new_user_dialog extends rcube_plugin
     );
 
     // don't let the user alter the e-mail address if disabled by config
-    if ($identities_level == 1 || $identities_level == 3)
+    if (in_array($ident_level, array(1,3,4))) {
       $save_data['email'] = $identity['email'];
-    else
-      $save_data['email'] = rcube_utils::idn_to_ascii($save_data['email']);
+    }
 
-    // save data if not empty
-    if (!empty($save_data['name']) && !empty($save_data['email'])) {
+    if (empty($save_data['name']) || empty($save_data['email'])) {
+      $rcmail->output->show_message('formincomplete', 'error');
+    }
+    else if (!rcube_utils::check_email($save_data['email'] = rcube_utils::idn_to_ascii($save_data['email']))) {
+      $rcmail->output->show_message('emailformaterror', 'error', array('email' => $save_data['email']));
+    }
+    else {
+      // save data
       $rcmail->user->update_identity($identity['identity_id'], $save_data);
       $rcmail->session->remove('plugin.newuserdialog');
+      // hide dialog
+      $rcmail->output->command('new_user_dialog_close');
+      $rcmail->output->show_message('successfullysaved', 'confirmation');
     }
 
-    $rcmail->output->redirect('');
+    $rcmail->output->send();
   }
 
 }
-
-?>
diff --git a/plugins/new_user_dialog/package.xml b/plugins/new_user_dialog/package.xml
index 0bca1d9d4..68a929931 100644
--- a/plugins/new_user_dialog/package.xml
+++ b/plugins/new_user_dialog/package.xml
@@ -13,21 +13,16 @@
 		<email>roundcube@gmail.com</email>
 		<active>yes</active>
 	</lead>
-	<date>2012-01-16</date>
-	<time>17:00</time>
+	<date>2013-05-09</date>
 	<version>
-		<release>1.5</release>
-		<api>1.0</api>
+		<release>2.0</release>
+		<api>2.0</api>
 	</version>
 	<stability>
 		<release>stable</release>
 		<api>stable</api>
 	</stability>
 	<license uri="http://www.gnu.org/licenses/gpl.html">GNU GPLv3+</license>
-	<notes>
-- Use jquery UI to render the dialog
-- Fixed IDNA encoding/decoding of e-mail addresses (#1487909)
-	</notes>
 	<contents>
 		<dir baseinstalldir="/" name="/">
 			<file name="new_user_dialog.php" role="php">
@@ -71,84 +66,4 @@
 		</required>
 	</dependencies>
 	<phprelease/>
-	<changelog>
-		<release>
-			<date>2010-03-29</date>
-			<time>13:20:00</time>
-			<version>
-				<release>1.0</release>
-				<api>1.0</api>
-			</version>
-			<stability>
-				<release>stable</release>
-				<api>stable</api>
-			</stability>
-			<license uri="http://www.gnu.org/licenses/gpl-2.0.html">GNU GPLv2</license>
-			<notes></notes>
-		</release>
-		<release>
-			<date>2010-05-13</date>
-			<time>19:35:00</time>
-			<version>
-				<release>1.1</release>
-				<api>1.0</api>
-			</version>
-			<stability>
-				<release>stable</release>
-				<api>stable</api>
-			</stability>
-			<license uri="http://www.gnu.org/licenses/gpl-2.0.html">GNU GPLv2</license>
-			<notes>
-- Fix space bar and backspace buttons not working (#1486726)
-			</notes>
-		</release>
-		<release>
-			<date>2010-05-27</date>
-			<time>12:00:00</time>
-			<version>
-				<release>1.2</release>
-				<api>1.0</api>
-			</version>
-			<stability>
-				<release>stable</release>
-				<api>stable</api>
-			</stability>
-			<license uri="http://www.gnu.org/licenses/gpl-2.0.html">GNU GPLv2</license>
-			<notes>
-- Add overlay box only to mail task main template
-- Fix possible error on form submission (#1486103)
-			</notes>
-		</release>
-		<release>
-			<date>2010-12-02</date>
-			<time>12:00:00</time>
-			<version>
-				<release>1.3</release>
-				<api>1.0</api>
-			</version>
-			<stability>
-				<release>stable</release>
-				<api>stable</api>
-			</stability>
-			<license uri="http://www.gnu.org/licenses/gpl-2.0.html">GNU GPLv2</license>
-			<notes>
-- Added setting of focus on name input
-- Added gl_ES translation
-			</notes>
-		</release>
-		<release>
-			<date>2012-01-16</date>
-			<time>17:00:00</time>
-			<version>
-				<release>1.5</release>
-				<api>1.0</api>
-			</version>
-			<stability>
-				<release>stable</release>
-				<api>stable</api>
-			</stability>
-			<license uri="http://www.gnu.org/licenses/gpl-2.0.html">GNU GPLv2</license>
-			<notes>- Use jquery UI to render the dialog</notes>
-		</release>
-	</changelog>
 </package>
diff --git a/plugins/new_user_identity/new_user_identity.php b/plugins/new_user_identity/new_user_identity.php
index f98145b6c..d32051e00 100644
--- a/plugins/new_user_identity/new_user_identity.php
+++ b/plugins/new_user_identity/new_user_identity.php
@@ -33,8 +33,6 @@ class new_user_identity extends rcube_plugin
 
     function lookup_user_name($args)
     {
-        $rcmail = rcmail::get_instance();
-
         if ($this->init_ldap($args['host'])) {
             $results = $this->ldap->search('*', $args['user'], true);
             if (count($results->records) == 1) {
diff --git a/plugins/newmail_notifier/localization/ar_SA.inc b/plugins/newmail_notifier/localization/ar_SA.inc
index 2273c1d99..9ed56632b 100644
--- a/plugins/newmail_notifier/localization/ar_SA.inc
+++ b/plugins/newmail_notifier/localization/ar_SA.inc
@@ -2,18 +2,20 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ar_SA/labels.inc                                         |
+ | plugins/newmail_notifier/localization/<lang>.inc                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail New Mail Notifier plugin   |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Fifawe <hany.samir@gmail.com>                                 |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-newmail_notifier/
 */
 
-$labels = array();
 $labels['basic'] = 'إظهار رسالة تنبيه فى المتصفح عند وصول رسالة جديدة';
 $labels['desktop'] = 'إظهار رسالة تنبيه على سطح المكتب عند وصول رسالة جديدة';
 $labels['sound'] = 'التنبيه الصوتى عند وصول رسالة جديدة';
@@ -24,3 +26,4 @@ $labels['testbody'] = 'هذه رسالة تجربية';
 $labels['desktopdisabled'] = 'رسائل التنبيه على سطح المكتب غير مفعلة فى متصفح الانترنت الخاص بك';
 $labels['desktopunsupported'] = 'المتصفح الخاص بك لا يدعم رسائل سطح المكتب';
 
+?>
diff --git a/plugins/newmail_notifier/localization/az_AZ.inc b/plugins/newmail_notifier/localization/az_AZ.inc
index ad776be03..b1b9114ae 100644
--- a/plugins/newmail_notifier/localization/az_AZ.inc
+++ b/plugins/newmail_notifier/localization/az_AZ.inc
@@ -2,18 +2,20 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/az_AZ/labels.inc                                         |
+ | plugins/newmail_notifier/localization/<lang>.inc                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail New Mail Notifier plugin   |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Orkhan Guliyev <proger@box.az>                                |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-newmail_notifier/
 */
 
-$labels = array();
 $labels['basic'] = 'Yeni məktubun gəlməsi haqda brauzerdə xəbər ver';
 $labels['desktop'] = 'Yeni məktubun gəlməsi haqda iş masasında xəbər ver';
 $labels['sound'] = 'Yeni məktubun gəlməsi haqda səs siqnalı ver';
@@ -24,3 +26,4 @@ $labels['testbody'] = 'Bu sınaq bildirişidir';
 $labels['desktopdisabled'] = 'Sizin brauzerdə iş masasında bildiriş söndürülüb';
 $labels['desktopunsupported'] = 'Sizin brauzer iş masasında bildiriş funksiyasını dəstəkləmir';
 
+?>
diff --git a/plugins/newmail_notifier/localization/be_BE.inc b/plugins/newmail_notifier/localization/be_BE.inc
index ef5e4b699..4d17d5785 100644
--- a/plugins/newmail_notifier/localization/be_BE.inc
+++ b/plugins/newmail_notifier/localization/be_BE.inc
@@ -2,19 +2,20 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/be_BE/labels.inc                                         |
+ | plugins/newmail_notifier/localization/<lang>.inc                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail New Mail Notifier plugin   |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Alex Nehaichik <nab@mail.by>                                  |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-newmail_notifier/
 */
 
-$labels = array();
 $labels['basic'] = 'Адлюстроўваць інфармаванні азіральніка ў час атрымання новых павдеамленняў';
 $labels['desktop'] = 'Адлюстроўваць інфармаванні працоўнага стала ў час атрымання новых павдеамленняў';
 $labels['sound'] = 'Агучваць атрыманне новых паведамленняў';
@@ -25,3 +26,4 @@ $labels['testbody'] = 'Гэта тэставае інфармаванне.';
 $labels['desktopdisabled'] = 'Інфармаванне працоўнага стала адлкючана ў вашым азіральніку';
 $labels['desktopunsupported'] = 'Ваш азіральнік не падтрымлівае інфармаванне працоўнага стала.';
 
+?>
diff --git a/plugins/newmail_notifier/localization/br.inc b/plugins/newmail_notifier/localization/br.inc
index ffa36ecf7..540876eb3 100644
--- a/plugins/newmail_notifier/localization/br.inc
+++ b/plugins/newmail_notifier/localization/br.inc
@@ -2,18 +2,28 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/br/labels.inc                                         |
+ | plugins/newmail_notifier/localization/<lang>.inc                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail New Mail Notifier plugin   |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Denis                                                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-newmail_notifier/
 */
 
-$labels = array();
+$labels['basic'] = 'Display browser notifications on new message';
+$labels['desktop'] = 'Display desktop notifications on new message';
 $labels['sound'] = 'Seniñ ar son pa kemennadenn nevez';
+$labels['test'] = 'Test';
 $labels['title'] = 'Kemennadenn nevez !';
+$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['desktopunsupported'] = 'Your browser does not support desktop notifications.';
 
+?>
diff --git a/plugins/newmail_notifier/localization/bs_BA.inc b/plugins/newmail_notifier/localization/bs_BA.inc
index b9fe2ef0b..267b542fc 100644
--- a/plugins/newmail_notifier/localization/bs_BA.inc
+++ b/plugins/newmail_notifier/localization/bs_BA.inc
@@ -2,19 +2,20 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/bs_BA/labels.inc                                         |
+ | plugins/newmail_notifier/localization/<lang>.inc                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail New Mail Notifier plugin   |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Kenan Dervišević <kenan3008@gmail.com>                      |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-newmail_notifier/
 */
 
-$labels = array();
 $labels['basic'] = 'Prikaži obavijesti za nove poruke u pregledniku';
 $labels['desktop'] = 'Prikaži obavijesti za nove poruke na desktopu';
 $labels['sound'] = 'Zvučni signal za novu poruku';
@@ -25,3 +26,4 @@ $labels['testbody'] = 'Ovo je testna obavijest.';
 $labels['desktopdisabled'] = 'Desktop obavijesti su onemogućene u vašem pregledniku.';
 $labels['desktopunsupported'] = 'Vaš preglednik ne podržava desktop obavijesti.';
 
+?>
diff --git a/plugins/newmail_notifier/localization/ca_ES.inc b/plugins/newmail_notifier/localization/ca_ES.inc
index da9078daa..8e0a8b443 100644
--- a/plugins/newmail_notifier/localization/ca_ES.inc
+++ b/plugins/newmail_notifier/localization/ca_ES.inc
@@ -2,18 +2,20 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ca_ES/labels.inc                                         |
+ | plugins/newmail_notifier/localization/<lang>.inc                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail New Mail Notifier plugin   |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Jordi Sanfeliu <jordi@fibranet.cat>                           |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-newmail_notifier/
 */
 
-$labels = array();
 $labels['basic'] = 'Mostra notificacions del navegador quan hi hagi un missatge nou';
 $labels['desktop'] = 'Mostra notificacions de l\'escriptori quan hi hagi un missatge nou';
 $labels['sound'] = 'Reprodueix el so quan hi hagi un missatge nou';
@@ -24,3 +26,4 @@ $labels['testbody'] = 'Això és una notificació de prova.';
 $labels['desktopdisabled'] = 'Les notificacions d\'escriptori estan deshabilitades al vostre navegador.';
 $labels['desktopunsupported'] = 'El vostre navegador no permet les notificacions d\'escriptori.';
 
+?>
diff --git a/plugins/newmail_notifier/localization/cs_CZ.inc b/plugins/newmail_notifier/localization/cs_CZ.inc
index df5396f5a..55899aeb0 100644
--- a/plugins/newmail_notifier/localization/cs_CZ.inc
+++ b/plugins/newmail_notifier/localization/cs_CZ.inc
@@ -2,19 +2,20 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/cs_CZ/labels.inc                                         |
+ | plugins/newmail_notifier/localization/<lang>.inc                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail New Mail Notifier plugin   |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Tomáš Kyzlink <Unknown>                                     |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-newmail_notifier/
 */
 
-$labels = array();
 $labels['basic'] = 'Zobrazit upozornění v prohlížeči při příchozí zprávě';
 $labels['desktop'] = 'Zobrazit upozornění na ploše při příchozí zprávě';
 $labels['sound'] = 'Přehrát zvuk při příchozí zprávě';
@@ -25,3 +26,4 @@ $labels['testbody'] = 'Toto je zkouška upozornění.';
 $labels['desktopdisabled'] = 'Upozornění na ploše jsou ve vašem prohlížeči vypnuté.';
 $labels['desktopunsupported'] = 'Váš prohlížeč nepodporuje upozornění na ploše.';
 
+?>
diff --git a/plugins/newmail_notifier/localization/cy_GB.inc b/plugins/newmail_notifier/localization/cy_GB.inc
index 35c552c3a..38af4da49 100644
--- a/plugins/newmail_notifier/localization/cy_GB.inc
+++ b/plugins/newmail_notifier/localization/cy_GB.inc
@@ -2,19 +2,20 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/cy_GB/labels.inc                                         |
+ | plugins/newmail_notifier/localization/<lang>.inc                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail New Mail Notifier plugin   |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Dafydd Tomos <Unknown>                                        |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-newmail_notifier/
 */
 
-$labels = array();
 $labels['basic'] = 'Dangos hysbysiadau porwr ar neges newydd';
 $labels['desktop'] = 'Dangos hysbysiadau penbwrdd ar neges newydd';
 $labels['sound'] = 'Chwarae sŵn ar neges newydd';
@@ -25,3 +26,4 @@ $labels['testbody'] = 'Hysbysiad prawf yw hwn.';
 $labels['desktopdisabled'] = 'Mae hysbysiadau penbwrdd wedi ei analluogi yn eich porwr';
 $labels['desktopunsupported'] = 'Nid yw eich porwr yn cefnogi hysbysiadau penbwrdd.';
 
+?>
diff --git a/plugins/newmail_notifier/localization/da_DK.inc b/plugins/newmail_notifier/localization/da_DK.inc
index b3ace8d17..f06b80f6b 100644
--- a/plugins/newmail_notifier/localization/da_DK.inc
+++ b/plugins/newmail_notifier/localization/da_DK.inc
@@ -2,19 +2,20 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/da_DK/labels.inc                                         |
+ | plugins/newmail_notifier/localization/<lang>.inc                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail New Mail Notifier plugin   |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Johannes Hessellund <osos@openeyes.dk>                        |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-newmail_notifier/
 */
 
-$labels = array();
 $labels['basic'] = 'Vis browserbesked ved ny besked';
 $labels['desktop'] = 'Vis skrivebordsbesked ved ny besked';
 $labels['sound'] = 'Afspil en lyd ved ny besked';
@@ -25,3 +26,4 @@ $labels['testbody'] = 'Dette er en test meddelelse.';
 $labels['desktopdisabled'] = 'Skrivebordsbeskeder er deaktiveret i din browser.';
 $labels['desktopunsupported'] = 'Din browser understøtter ikke skrivebordsbeskeder.';
 
+?>
diff --git a/plugins/newmail_notifier/localization/de_CH.inc b/plugins/newmail_notifier/localization/de_CH.inc
index c7beacee6..03a3957c9 100644
--- a/plugins/newmail_notifier/localization/de_CH.inc
+++ b/plugins/newmail_notifier/localization/de_CH.inc
@@ -5,7 +5,7 @@
  | plugins/newmail_notifier/localization/<lang>.inc                      |
  |                                                                       |
  | Localization file of the Roundcube Webmail New Mail Notifier plugin   |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
diff --git a/plugins/newmail_notifier/localization/de_DE.inc b/plugins/newmail_notifier/localization/de_DE.inc
index f49eb4929..3974fe897 100644
--- a/plugins/newmail_notifier/localization/de_DE.inc
+++ b/plugins/newmail_notifier/localization/de_DE.inc
@@ -2,19 +2,20 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/de_DE/labels.inc                                         |
+ | plugins/newmail_notifier/localization/<lang>.inc                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail New Mail Notifier plugin   |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-newmail_notifier/
 */
 
-$labels = array();
 $labels['basic'] = 'Benachrichtigung im Browser bei neuer Nachricht';
 $labels['desktop'] = 'Desktop-Benachrichtigung bei neuer Nachricht';
 $labels['sound'] = 'Akustische Meldung bei neuer Nachricht';
@@ -25,3 +26,4 @@ $labels['testbody'] = 'Dies ist eine Testbenachrichtigung';
 $labels['desktopdisabled'] = 'Desktop-Benachrichtigungen sind deaktiviert.';
 $labels['desktopunsupported'] = 'Ihr Browser unterstützt keine Desktop-Benachrichtigungen.';
 
+?>
diff --git a/plugins/newmail_notifier/localization/en_GB.inc b/plugins/newmail_notifier/localization/en_GB.inc
index 10cfdec7b..3ea6c8c74 100644
--- a/plugins/newmail_notifier/localization/en_GB.inc
+++ b/plugins/newmail_notifier/localization/en_GB.inc
@@ -2,19 +2,20 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/en_GB/labels.inc                                         |
+ | plugins/newmail_notifier/localization/<lang>.inc                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail New Mail Notifier plugin   |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Tony Whitmore <Unknown>                                       |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-newmail_notifier/
 */
 
-$labels = array();
 $labels['basic'] = 'Display browser notifications on new message';
 $labels['desktop'] = 'Display desktop notifications on new message';
 $labels['sound'] = 'Play sound on new message';
@@ -25,3 +26,4 @@ $labels['testbody'] = 'This is a test notification.';
 $labels['desktopdisabled'] = 'Desktop notifications are disabled in your browser.';
 $labels['desktopunsupported'] = 'Your browser does not support desktop notifications.';
 
+?>
diff --git a/plugins/newmail_notifier/localization/en_US.inc b/plugins/newmail_notifier/localization/en_US.inc
index da8340b80..7c1c5cf3f 100644
--- a/plugins/newmail_notifier/localization/en_US.inc
+++ b/plugins/newmail_notifier/localization/en_US.inc
@@ -5,7 +5,7 @@
  | plugins/newmail_notifier/localization/<lang>.inc                      |
  |                                                                       |
  | Localization file of the Roundcube Webmail New Mail Notifier plugin   |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
diff --git a/plugins/newmail_notifier/localization/eo.inc b/plugins/newmail_notifier/localization/eo.inc
index b8058e48a..da3f18e6b 100644
--- a/plugins/newmail_notifier/localization/eo.inc
+++ b/plugins/newmail_notifier/localization/eo.inc
@@ -2,18 +2,20 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/eo/labels.inc                                         |
+ | plugins/newmail_notifier/localization/<lang>.inc                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail New Mail Notifier plugin   |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Michael Moroni <michael.moroni@mailoo.org>                    |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-newmail_notifier/
 */
 
-$labels = array();
 $labels['basic'] = 'Montri atentigojn de retumilo pri nova mesaĝo';
 $labels['desktop'] = 'Montri atentigojn de komputilo pri nova mesaĝo';
 $labels['sound'] = 'Ludi sonon por nova mesaĝo';
@@ -24,3 +26,4 @@ $labels['testbody'] = 'Tio estas testo pri atentigo.';
 $labels['desktopdisabled'] = 'Atentigoj de komputilo estas malŝaltitaj en via retumilo.';
 $labels['desktopunsupported'] = 'Via retumilo ne subtenas atentigojn de komputilo.';
 
+?>
diff --git a/plugins/newmail_notifier/localization/es_ES.inc b/plugins/newmail_notifier/localization/es_ES.inc
index ff15e0247..410d9356e 100644
--- a/plugins/newmail_notifier/localization/es_ES.inc
+++ b/plugins/newmail_notifier/localization/es_ES.inc
@@ -2,26 +2,28 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/es_ES/labels.inc                                         |
+ | plugins/newmail_notifier/localization/<lang>.inc                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail New Mail Notifier plugin   |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Emi Bcn <Unknown>                                             |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-newmail_notifier/
 */
 
-$labels = array();
 $labels['basic'] = 'Mostrar notificaciones del navegador cuando llegue un nuevo mensaje';
 $labels['desktop'] = 'Mostrar notificaciones del escritorio cuando llegue un nuevo mensaje';
 $labels['sound'] = 'Reproducir sonido cuando llegue un nuevo mensaje';
 $labels['test'] = 'Prueba';
-$labels['title'] = 'Mensaje nuevo!';
+$labels['title'] = '¡Mensaje nuevo!';
 $labels['body'] = 'Has recibido un mensaje nuevo.';
 $labels['testbody'] = 'Esta es una notificación de pruebas.';
 $labels['desktopdisabled'] = 'Las notificaciones de escritorio están deshabilitadas en tu navegador.';
 $labels['desktopunsupported'] = 'Tu navegador no soporta notificaciones de escritorio.';
 
+?>
diff --git a/plugins/newmail_notifier/localization/et_EE.inc b/plugins/newmail_notifier/localization/et_EE.inc
index 9cc5b16d4..30971d79a 100644
--- a/plugins/newmail_notifier/localization/et_EE.inc
+++ b/plugins/newmail_notifier/localization/et_EE.inc
@@ -2,19 +2,20 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/et_EE/labels.inc                                         |
+ | plugins/newmail_notifier/localization/<lang>.inc                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail New Mail Notifier plugin   |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: yllar <Unknown>                                               |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-newmail_notifier/
 */
 
-$labels = array();
 $labels['basic'] = 'Uue kirja saabumisel näita lehitsejas teavitust';
 $labels['desktop'] = 'Uue kirja saabumisel näita töölaua teavitust';
 $labels['sound'] = 'Uue kirja saabumisel mängi heli';
@@ -25,3 +26,4 @@ $labels['testbody'] = 'See on teavituse proov.';
 $labels['desktopdisabled'] = 'Töölaua märguanded on su veebilehitsejas keelatud.';
 $labels['desktopunsupported'] = 'Sinu veebilehitseja ei toeta töölaua märguandeid.';
 
+?>
diff --git a/plugins/newmail_notifier/localization/fa_IR.inc b/plugins/newmail_notifier/localization/fa_IR.inc
index d24fc5a20..71155fe4b 100644
--- a/plugins/newmail_notifier/localization/fa_IR.inc
+++ b/plugins/newmail_notifier/localization/fa_IR.inc
@@ -2,19 +2,20 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/fa_IR/labels.inc                                         |
+ | plugins/newmail_notifier/localization/<lang>.inc                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail New Mail Notifier plugin   |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Hamid <abbaszadeh.h@gmail.com>                                |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-newmail_notifier/
 */
 
-$labels = array();
 $labels['basic'] = 'نمایش تذکرهای مرورگر برای پیغام جدید';
 $labels['desktop'] = 'نمایش تذکرهای رومیزی برای پیغام جدید';
 $labels['sound'] = 'پخش صدا برای پیغام جدید';
@@ -25,3 +26,4 @@ $labels['testbody'] = 'این یک تذکر آزمایشی است.';
 $labels['desktopdisabled'] = 'تذکرهای رومیزی در مرورگر شما غیرفعال شده‌اند.';
 $labels['desktopunsupported'] = 'مرورگر شما تذکرهای رومیزی را پشتیبانی نمی‌کند.';
 
+?>
diff --git a/plugins/newmail_notifier/localization/fi_FI.inc b/plugins/newmail_notifier/localization/fi_FI.inc
index e4f12d01d..206ae8a1e 100644
--- a/plugins/newmail_notifier/localization/fi_FI.inc
+++ b/plugins/newmail_notifier/localization/fi_FI.inc
@@ -2,26 +2,28 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/fi_FI/labels.inc                                         |
+ | plugins/newmail_notifier/localization/<lang>.inc                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail New Mail Notifier plugin   |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Jiri Grönroos <Unknown>                                      |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-newmail_notifier/
 */
 
-$labels = array();
 $labels['basic'] = 'Näytä selainilmoitus uuden viestin saapuessa';
 $labels['desktop'] = 'Näytä työpöytäilmoitus uuden viestin saapuessa';
-$labels['sound'] = 'Soita ääni uuden viestin saapuessa';
+$labels['sound'] = 'Toista ääni uuden viestin saapuessa';
 $labels['test'] = 'Testaa';
 $labels['title'] = 'Uutta sähköpostia!';
-$labels['body'] = 'Sait uuden sähköpostiviestin.';
+$labels['body'] = 'Sait uuden viestin.';
 $labels['testbody'] = 'Tämä on testi-ilmoitus.';
-$labels['desktopdisabled'] = 'Työpöytäilmoitukset on poistettu käytöstä selaimesi asetuksista.';
+$labels['desktopdisabled'] = 'Työpöytäilmoitukset on estetty selaimessa.';
 $labels['desktopunsupported'] = 'Selaimesi ei tue työpöytäilmoituksia.';
 
+?>
diff --git a/plugins/newmail_notifier/localization/fr_FR.inc b/plugins/newmail_notifier/localization/fr_FR.inc
index d1c71d352..3568b13cc 100644
--- a/plugins/newmail_notifier/localization/fr_FR.inc
+++ b/plugins/newmail_notifier/localization/fr_FR.inc
@@ -2,19 +2,20 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/fr_FR/labels.inc                                         |
+ | plugins/newmail_notifier/localization/<lang>.inc                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail New Mail Notifier plugin   |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Edouard Moreau <Unknown>                                      |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-newmail_notifier/
 */
 
-$labels = array();
 $labels['basic'] = 'Afficher une notification dans le navigateur à réception d\'un nouveau message';
 $labels['desktop'] = 'Afficher une notification sur le bureau à réception d\'un nouveau message';
 $labels['sound'] = 'Jouer un son à réception d\'un nouveau message';
@@ -25,3 +26,4 @@ $labels['testbody'] = 'Test de notification';
 $labels['desktopdisabled'] = 'Les notifications sur le bureau sont désactivées dans votre navigateur';
 $labels['desktopunsupported'] = 'Votre navigateur ne supporte pas les notifications sur le bureau';
 
+?>
diff --git a/plugins/newmail_notifier/localization/gl_ES.inc b/plugins/newmail_notifier/localization/gl_ES.inc
index 06ff08f36..8d105531e 100644
--- a/plugins/newmail_notifier/localization/gl_ES.inc
+++ b/plugins/newmail_notifier/localization/gl_ES.inc
@@ -2,20 +2,28 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/gl_ES/labels.inc                                         |
+ | plugins/newmail_notifier/localization/<lang>.inc                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail New Mail Notifier plugin   |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: ghas <Unknown>                                                |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-newmail_notifier/
 */
 
-$labels = array();
+$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'] = '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/he_IL.inc b/plugins/newmail_notifier/localization/he_IL.inc
index 207b70c61..4241fcfcc 100644
--- a/plugins/newmail_notifier/localization/he_IL.inc
+++ b/plugins/newmail_notifier/localization/he_IL.inc
@@ -2,19 +2,20 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/he_IL/labels.inc                                         |
+ | plugins/newmail_notifier/localization/<lang>.inc                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail New Mail Notifier plugin   |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Moshe Leibovitch <moish@mln.co.il>                            |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-newmail_notifier/
 */
 
-$labels = array();
 $labels['basic'] = 'איתות מהדפדפן על הגעת הודעות חדשות';
 $labels['desktop'] = 'איתות משולחן העבודה על הגעת הודעות חדשות';
 $labels['sound'] = 'השמעת איתות קולי בעת הגעה של הודעה חדשה';
@@ -25,3 +26,4 @@ $labels['testbody'] = 'זה איתות לנסיון';
 $labels['desktopdisabled'] = 'איתותים משולחן העבודה אינם פעילים בדפדפן שלך';
 $labels['desktopunsupported'] = 'הדפדפן שלך אינו תומך באיתותים משולחן העבודה';
 
+?>
diff --git a/plugins/newmail_notifier/localization/hr_HR.inc b/plugins/newmail_notifier/localization/hr_HR.inc
index ef07a3092..6800c6b04 100644
--- a/plugins/newmail_notifier/localization/hr_HR.inc
+++ b/plugins/newmail_notifier/localization/hr_HR.inc
@@ -2,19 +2,20 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/hr_HR/labels.inc                                         |
+ | plugins/newmail_notifier/localization/<lang>.inc                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail New Mail Notifier plugin   |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Svebor Prstačić <svebor.prstacic@gmail.com>                 |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-newmail_notifier/
 */
 
-$labels = array();
 $labels['basic'] = 'Prikaži dojave preglednika kada dođe nova poruka';
 $labels['desktop'] = 'Prikaži dojave na desktopu kada dođe nova poruka';
 $labels['sound'] = 'Pusti zvuk kada dođe nova poruka';
@@ -25,3 +26,4 @@ $labels['testbody'] = 'Ovo je probna dojava.';
 $labels['desktopdisabled'] = 'Dojave na desktopu su onemogućene u vašem pregledniku.';
 $labels['desktopunsupported'] = 'Vaš preglednik ne podržava dojave na desktopu.';
 
+?>
diff --git a/plugins/newmail_notifier/localization/hu_HU.inc b/plugins/newmail_notifier/localization/hu_HU.inc
index 9dd8609e7..46fa78fc9 100644
--- a/plugins/newmail_notifier/localization/hu_HU.inc
+++ b/plugins/newmail_notifier/localization/hu_HU.inc
@@ -2,19 +2,20 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/hu_HU/labels.inc                                         |
+ | plugins/newmail_notifier/localization/<lang>.inc                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail New Mail Notifier plugin   |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: bela <Unknown>                                                |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-newmail_notifier/
 */
 
-$labels = array();
 $labels['basic'] = 'Értesítés megjelenítése böngészőben amikor új üzenet érkezik';
 $labels['desktop'] = 'Asztali értesítés megjelenítése új üzenet érkezésekor';
 $labels['sound'] = 'Hang lejátszása új üzenet érkezésekor';
@@ -25,3 +26,4 @@ $labels['testbody'] = 'Ez egy teszt értesítés.';
 $labels['desktopdisabled'] = 'Az asztali értesítés ki van kapcsolva a böngésződben.';
 $labels['desktopunsupported'] = 'A böngésződ nem támogatja az asztali értesítéseket.';
 
+?>
diff --git a/plugins/newmail_notifier/localization/hy_AM.inc b/plugins/newmail_notifier/localization/hy_AM.inc
index 0cbf4122f..a932d0e0e 100644
--- a/plugins/newmail_notifier/localization/hy_AM.inc
+++ b/plugins/newmail_notifier/localization/hy_AM.inc
@@ -2,18 +2,20 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/hy_AM/labels.inc                                         |
+ | plugins/newmail_notifier/localization/<lang>.inc                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail New Mail Notifier plugin   |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Vahan Yerkanian <vahan@yerkanian.com>                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-newmail_notifier/
 */
 
-$labels = array();
 $labels['basic'] = 'Ցուցադրել զննարկչի ծանուցում նոր հաղորդագրություն ստանալիս';
 $labels['desktop'] = 'Ցուցադրել սեղանադրի ծանուցում նոր հաղորդագրություն ստանալիս';
 $labels['sound'] = 'Ձայն հանել նոր հաղորդագրություն ստանալիս';
@@ -24,3 +26,4 @@ $labels['testbody'] = 'Սա փորձնական ծանուցում է';
 $labels['desktopdisabled'] = 'Սեղանադրի ծանուցումները Ձեր զննարկչում անջատված են';
 $labels['desktopunsupported'] = 'Ձեր զննարկիչը չունի սեղանադրի ծանուցումների հնարավորություն։';
 
+?>
diff --git a/plugins/newmail_notifier/localization/ia.inc b/plugins/newmail_notifier/localization/ia.inc
index df92b95c3..32187347f 100644
--- a/plugins/newmail_notifier/localization/ia.inc
+++ b/plugins/newmail_notifier/localization/ia.inc
@@ -2,20 +2,28 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ia/labels.inc                                         |
+ | plugins/newmail_notifier/localization/<lang>.inc                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail New Mail Notifier plugin   |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Emilio Sepulveda <emilio@chilemoz.org>                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-newmail_notifier/
 */
 
-$labels = array();
 $labels['basic'] = 'Monstrar notificationes de navigator in cata nove message';
+$labels['desktop'] = 'Display desktop notifications on new message';
+$labels['sound'] = 'Play the sound on new message';
 $labels['test'] = 'Prova';
 $labels['title'] = 'Nove message!';
+$labels['body'] = 'You\'ve received a new message.';
 $labels['testbody'] = 'Iste es un notification de prova.';
+$labels['desktopdisabled'] = 'Desktop notifications are disabled in your browser.';
+$labels['desktopunsupported'] = 'Your browser does not support desktop notifications.';
 
+?>
diff --git a/plugins/newmail_notifier/localization/id_ID.inc b/plugins/newmail_notifier/localization/id_ID.inc
index cea5a6c92..87886a9d5 100644
--- a/plugins/newmail_notifier/localization/id_ID.inc
+++ b/plugins/newmail_notifier/localization/id_ID.inc
@@ -2,26 +2,28 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/id_ID/labels.inc                                         |
+ | plugins/newmail_notifier/localization/<lang>.inc                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail New Mail Notifier plugin   |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Putu Arya Sabda Wijaya <Unknown>                              |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-newmail_notifier/
 */
 
-$labels = array();
-$labels['basic'] = 'Perlihatkan pemberitahuan pada peramban saat ada pesan baru';
-$labels['desktop'] = 'Perlihatkan pemberitahuan pada desktop saat ada pesan baru';
+$labels['basic'] = 'Tampilkan pemberitahuan pada peramban saat ada pesan baru';
+$labels['desktop'] = 'Tampilkan pemberitahuan pada desktop saat ada pesan baru';
 $labels['sound'] = 'Mainkan suara saat ada pesan baru';
 $labels['test'] = 'Uji';
 $labels['title'] = 'Email Baru!';
 $labels['body'] = 'Anda telah menerima sebuah pesan baru.';
-$labels['testbody'] = 'Uji pemberitahuan.';
+$labels['testbody'] = 'Ini adalah percobaan pemberitahuan.';
 $labels['desktopdisabled'] = 'Pemberitahuan di desktop dimatikan pada peramban Anda.';
 $labels['desktopunsupported'] = 'Peramban Anda tidak mendukung pemberitahuan pada desktop';
 
+?>
diff --git a/plugins/newmail_notifier/localization/it_IT.inc b/plugins/newmail_notifier/localization/it_IT.inc
index 14f8c59df..8b894ee2f 100644
--- a/plugins/newmail_notifier/localization/it_IT.inc
+++ b/plugins/newmail_notifier/localization/it_IT.inc
@@ -2,19 +2,20 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/it_IT/labels.inc                                         |
+ | plugins/newmail_notifier/localization/<lang>.inc                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail New Mail Notifier plugin   |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: emilio brambilla <Unknown>                                    |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-newmail_notifier/
 */
 
-$labels = array();
 $labels['basic'] = 'visualizza notifica nel browser per nuovi messaggi';
 $labels['desktop'] = 'visualizza notifiche sul desktop per nuovi messaggi';
 $labels['sound'] = 'riproduci il suono per nuovi messaggi';
@@ -25,3 +26,4 @@ $labels['testbody'] = 'notifica di prova';
 $labels['desktopdisabled'] = 'le notifiche sul desktop sono disabilitate nel tuo browser';
 $labels['desktopunsupported'] = 'il tuo browser non supporta le notifiche sul desktop';
 
+?>
diff --git a/plugins/newmail_notifier/localization/ja_JP.inc b/plugins/newmail_notifier/localization/ja_JP.inc
index 4937dc13a..aa5fd7774 100644
--- a/plugins/newmail_notifier/localization/ja_JP.inc
+++ b/plugins/newmail_notifier/localization/ja_JP.inc
@@ -2,19 +2,20 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ja_JP/labels.inc                                         |
+ | plugins/newmail_notifier/localization/<lang>.inc                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail New Mail Notifier plugin   |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Takahiro Kambe <Unknown>                                      |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-newmail_notifier/
 */
 
-$labels = array();
 $labels['basic'] = '新しいメッセージの通知をブラウザーに表示';
 $labels['desktop'] = '新しいメッセージの通知をデスクトップに表示';
 $labels['sound'] = '新しいメッセージが届くと音を再生';
@@ -25,3 +26,4 @@ $labels['testbody'] = 'これはテストの通知です。';
 $labels['desktopdisabled'] = 'ブラウザーでデスクトップ通知が無効になっています。';
 $labels['desktopunsupported'] = 'ブラウザーがデスクトップ通知をサポートしていません。';
 
+?>
diff --git a/plugins/newmail_notifier/localization/km_KH.inc b/plugins/newmail_notifier/localization/km_KH.inc
index 89d513293..e200ce820 100644
--- a/plugins/newmail_notifier/localization/km_KH.inc
+++ b/plugins/newmail_notifier/localization/km_KH.inc
@@ -2,21 +2,28 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/km_KH/labels.inc                                         |
+ | plugins/newmail_notifier/localization/<lang>.inc                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail New Mail Notifier plugin   |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: samdyk                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-newmail_notifier/
 */
 
-$labels = array();
+$labels['basic'] = 'Display browser notifications on new message';
+$labels['desktop'] = 'Display desktop notifications on new message';
 $labels['sound'] = 'បន្លឹសម្កេងពេលមានសារថ្មី';
 $labels['test'] = 'សាកល្បង';
 $labels['title'] = 'មានសារថ្មី';
 $labels['body'] = 'អ្នកបានទទួលសារថ្មី';
 $labels['testbody'] = 'នេះជាការសាក្បងដំណឹង';
+$labels['desktopdisabled'] = 'Desktop notifications are disabled in your browser.';
+$labels['desktopunsupported'] = 'Your browser does not support desktop notifications.';
 
+?>
diff --git a/plugins/newmail_notifier/localization/ko_KR.inc b/plugins/newmail_notifier/localization/ko_KR.inc
index c9641fbf1..2176e4508 100644
--- a/plugins/newmail_notifier/localization/ko_KR.inc
+++ b/plugins/newmail_notifier/localization/ko_KR.inc
@@ -2,18 +2,20 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ko_KR/labels.inc                                         |
+ | plugins/newmail_notifier/localization/<lang>.inc                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail New Mail Notifier plugin   |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Kim, Woohyun <woohyun.kim@gmail.com>                          |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-newmail_notifier/
 */
 
-$labels = array();
 $labels['basic'] = '새로운 메시지가 도착 시에 브라우저의 알림에 표시';
 $labels['desktop'] = '새로운 메시지가 도착 시에 데스크탑의 알림에 표시';
 $labels['sound'] = '새로운 메시지가 도착 시에 소리 재생';
@@ -24,3 +26,4 @@ $labels['testbody'] = '이 것은 시험용 알림입니다.';
 $labels['desktopdisabled'] = '당신의 브라우져에서는 데스크탑의 알림이 불가능하도록 되어있습니다.';
 $labels['desktopunsupported'] = '당신의 브라우져에서는 데스크탑의 알림을 지원하지 않습니다.';
 
+?>
diff --git a/plugins/newmail_notifier/localization/lt_LT.inc b/plugins/newmail_notifier/localization/lt_LT.inc
index 99a44443e..956dca0d1 100644
--- a/plugins/newmail_notifier/localization/lt_LT.inc
+++ b/plugins/newmail_notifier/localization/lt_LT.inc
@@ -2,19 +2,20 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/lt_LT/labels.inc                                         |
+ | plugins/newmail_notifier/localization/<lang>.inc                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail New Mail Notifier plugin   |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Rimas Kudelis <rq@akl.lt>                                     |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-newmail_notifier/
 */
 
-$labels = array();
 $labels['basic'] = 'Pranešti apie naujus laiškus naršyklėje';
 $labels['desktop'] = 'Pranešti apie naujus laiškus sistemos pranešimu';
 $labels['sound'] = 'Pranešti apie naujus laiškus garsu';
@@ -25,3 +26,4 @@ $labels['testbody'] = 'Tai – bandomasis pranešimas.';
 $labels['desktopdisabled'] = 'Jūsų naršyklėje sistemos pranešimai išjungti.';
 $labels['desktopunsupported'] = 'Jūsų naršyklėje sistemos pranešimai nepalaikomi.';
 
+?>
diff --git a/plugins/newmail_notifier/localization/lv_LV.inc b/plugins/newmail_notifier/localization/lv_LV.inc
index 0459d723b..9df738b25 100644
--- a/plugins/newmail_notifier/localization/lv_LV.inc
+++ b/plugins/newmail_notifier/localization/lv_LV.inc
@@ -2,19 +2,20 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/lv_LV/labels.inc                                         |
+ | plugins/newmail_notifier/localization/<lang>.inc                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail New Mail Notifier plugin   |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-newmail_notifier/
 */
 
-$labels = array();
 $labels['basic'] = 'Attēlot paziņojumu pie jaunas vēstules saņemšanas';
 $labels['desktop'] = 'Attēlot darbvirsmas paziņojumu pie jaunas vēstules saņemšanas';
 $labels['sound'] = 'Atskaņot skaņas signālu pie jaunas vēstules saņemšanas';
@@ -25,3 +26,4 @@ $labels['testbody'] = 'Šis ir testa paziņojums.';
 $labels['desktopdisabled'] = 'Darbvirsmas paziņojumi ir atslēgti Jūsu pārlūkprogrammā.';
 $labels['desktopunsupported'] = 'Jūsu pārlūkprogramma neatbalsta darbvirsmas paziņojumus.';
 
+?>
diff --git a/plugins/newmail_notifier/localization/ml_IN.inc b/plugins/newmail_notifier/localization/ml_IN.inc
index 25dbb3ebc..7ef16775a 100644
--- a/plugins/newmail_notifier/localization/ml_IN.inc
+++ b/plugins/newmail_notifier/localization/ml_IN.inc
@@ -2,18 +2,20 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ml_IN/labels.inc                                         |
+ | plugins/newmail_notifier/localization/<lang>.inc                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail New Mail Notifier plugin   |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Anish A <aneesh.nl@gmail.com>                                 |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-newmail_notifier/
 */
 
-$labels = array();
 $labels['basic'] = 'ബ്രൌസര്‍ അറിയിപ്പുകള്‍ പുതിയ സന്ദേശത്തില്‍ കാണിക്കുക';
 $labels['desktop'] = 'ഡെസ്ക്ക്ടോപ്പ് അറിയിപ്പുകള്‍ പുതിയ സന്ദേശത്തില്‍ കാണിക്കുക';
 $labels['sound'] = 'പുതിയ സന്ദേശത്തില്‍ സബ്ദം കേള്‍പ്പിക്കുക';
@@ -24,3 +26,4 @@ $labels['testbody'] = 'ഇത് ഒരു പരീക്ഷണ അറിയി
 $labels['desktopdisabled'] = 'താങ്കളുടെ ബ്രൌസറില്‍ ഡെസ്ക്ക്ടോപ്പ് നോട്ടിഫിക്കേഷന്‍ പ്രവര്‍ത്തനരഹിതമാണ്.';
 $labels['desktopunsupported'] = 'താങ്കളുടെ ബ്രൌസ്സര്‍ ഡെസ്ക്ടോപ്പ് അറിയിപ്പുകള്‍ പിന്‍തുണയ്ക്കുന്നില്ല.';
 
+?>
diff --git a/plugins/newmail_notifier/localization/mr_IN.inc b/plugins/newmail_notifier/localization/mr_IN.inc
index ccba50d1d..8d3cf592d 100644
--- a/plugins/newmail_notifier/localization/mr_IN.inc
+++ b/plugins/newmail_notifier/localization/mr_IN.inc
@@ -2,22 +2,28 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/mr_IN/labels.inc                                         |
+ | plugins/newmail_notifier/localization/<lang>.inc                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail New Mail Notifier plugin   |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Devendra Buddhikot <devendradb@rediffmail.com>                |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-newmail_notifier/
 */
 
-$labels = array();
+$labels['basic'] = 'Display browser notifications on new message';
+$labels['desktop'] = 'Display desktop notifications on new message';
 $labels['sound'] = 'नवीन संदेश आल्यास नाद करा';
 $labels['test'] = 'चाचणी';
 $labels['title'] = 'नवीन ईमेल';
 $labels['body'] = 'तुमच्यासाठी नवीन संदेश आला आहे';
 $labels['testbody'] = 'हा एक चाचणी निर्देश आहे';
+$labels['desktopdisabled'] = 'Desktop notifications are disabled in your browser.';
+$labels['desktopunsupported'] = 'Your browser does not support desktop notifications.';
 
+?>
diff --git a/plugins/newmail_notifier/localization/nb_NO.inc b/plugins/newmail_notifier/localization/nb_NO.inc
index 112325f0d..83adf6e86 100644
--- a/plugins/newmail_notifier/localization/nb_NO.inc
+++ b/plugins/newmail_notifier/localization/nb_NO.inc
@@ -2,18 +2,20 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/nb_NB/labels.inc                                         |
+ | plugins/newmail_notifier/localization/<lang>.inc                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail New Mail Notifier plugin   |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Fredrik Larsen <fredrik.h.larsen@gmail.com>                   |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-newmail_notifier/
 */
 
-$labels = array();
 $labels['basic'] = 'Vis varsel i nettleseren ved ny melding';
 $labels['desktop'] = 'Vis varsel på skrivebordet ved ny melding';
 $labels['sound'] = 'Spill av lyd ved ny melding';
@@ -24,3 +26,4 @@ $labels['testbody'] = 'Dette er et testvarsel.';
 $labels['desktopdisabled'] = 'Skrivebordsvarsel er slått av i din nettleser.';
 $labels['desktopunsupported'] = 'Din nettleser støtter ikke visning av varsel på skrivebordet.';
 
+?>
diff --git a/plugins/newmail_notifier/localization/nl_NL.inc b/plugins/newmail_notifier/localization/nl_NL.inc
index 3d52ca772..01f97e4ce 100644
--- a/plugins/newmail_notifier/localization/nl_NL.inc
+++ b/plugins/newmail_notifier/localization/nl_NL.inc
@@ -2,26 +2,28 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/nl_NL/labels.inc                                         |
+ | plugins/newmail_notifier/localization/<lang>.inc                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail New Mail Notifier plugin   |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Geert Wirken <Unknown>                                        |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-newmail_notifier/
 */
 
-$labels = array();
-$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/newmail_notifier/localization/nn_NO.inc b/plugins/newmail_notifier/localization/nn_NO.inc
index a9d7547af..24ba91d18 100644
--- a/plugins/newmail_notifier/localization/nn_NO.inc
+++ b/plugins/newmail_notifier/localization/nn_NO.inc
@@ -2,18 +2,20 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/nn_NN/labels.inc                                         |
+ | plugins/newmail_notifier/localization/<lang>.inc                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail New Mail Notifier plugin   |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Fredrik Larsen <fredrik.h.larsen@gmail.com>                   |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-newmail_notifier/
 */
 
-$labels = array();
 $labels['basic'] = 'Vis varsel i nettlesaren ved ny melding';
 $labels['desktop'] = 'Vis varsel på skrivebordet ved ny melding';
 $labels['sound'] = 'Spill av lyd ved ny melding';
@@ -24,3 +26,4 @@ $labels['testbody'] = 'Dette er eit testvarsel.';
 $labels['desktopdisabled'] = 'Skrivebordsvarsel er slått av i din nettlesar.';
 $labels['desktopunsupported'] = 'Din nettlesar støttar ikkje vising av varsel på skrivebordet.';
 
+?>
diff --git a/plugins/newmail_notifier/localization/pl_PL.inc b/plugins/newmail_notifier/localization/pl_PL.inc
index 711dcc550..b94204c45 100644
--- a/plugins/newmail_notifier/localization/pl_PL.inc
+++ b/plugins/newmail_notifier/localization/pl_PL.inc
@@ -2,19 +2,20 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/pl_PL/labels.inc                                         |
+ | plugins/newmail_notifier/localization/<lang>.inc                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail New Mail Notifier plugin   |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-newmail_notifier/
 */
 
-$labels = array();
 $labels['basic'] = 'Wyświetlaj powiadomienia o nadejściu nowej wiadomości w przeglądarce';
 $labels['desktop'] = 'Wyświetlaj powiadomienia o nadejściu nowej wiadomości na pulpicie';
 $labels['sound'] = 'Odtwarzaj dźwięk o nadejściu nowej wiadomości';
@@ -25,3 +26,4 @@ $labels['testbody'] = 'To jest testowe powiadomienie.';
 $labels['desktopdisabled'] = 'Powiadomienia na pulpicie zostały zablokowane w twojej przeglądarce.';
 $labels['desktopunsupported'] = 'Twoja przeglądarka nie obsługuje powiadomień na pulpicie.';
 
+?>
diff --git a/plugins/newmail_notifier/localization/pt_BR.inc b/plugins/newmail_notifier/localization/pt_BR.inc
index 600a3ff1a..5b772f464 100644
--- a/plugins/newmail_notifier/localization/pt_BR.inc
+++ b/plugins/newmail_notifier/localization/pt_BR.inc
@@ -2,19 +2,20 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/pt_BR/labels.inc                                         |
+ | plugins/newmail_notifier/localization/<lang>.inc                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail New Mail Notifier plugin   |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-newmail_notifier/
 */
 
-$labels = array();
 $labels['basic'] = 'Exibir notificação quando uma nova mensagem chegar';
 $labels['desktop'] = 'Exibir notificação no desktop quando uma nova mensagem chegar';
 $labels['sound'] = 'Alerta sonoro quando uma nova mensagem chegar';
@@ -25,3 +26,4 @@ $labels['testbody'] = 'Essa é uma notificação de teste.';
 $labels['desktopdisabled'] = 'As notificações no desktop estão desabilitadas no seu navegador.';
 $labels['desktopunsupported'] = 'Seu navegador não suporta notificações no desktop';
 
+?>
diff --git a/plugins/newmail_notifier/localization/pt_PT.inc b/plugins/newmail_notifier/localization/pt_PT.inc
index 4a19d5041..28a414be4 100644
--- a/plugins/newmail_notifier/localization/pt_PT.inc
+++ b/plugins/newmail_notifier/localization/pt_PT.inc
@@ -2,19 +2,20 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/pt_PT/labels.inc                                         |
+ | plugins/newmail_notifier/localization/<lang>.inc                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail New Mail Notifier plugin   |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: David <Unknown>                                               |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-newmail_notifier/
 */
 
-$labels = array();
 $labels['basic'] = 'Mostrar notificação quando uma nova mensagem chegar';
 $labels['desktop'] = 'Mostrar alerta no ambiente de trabalho de nova mensagem';
 $labels['sound'] = 'Alerta sonoro para nova mensagem';
@@ -25,3 +26,4 @@ $labels['testbody'] = 'Isto é uma notificação de teste.';
 $labels['desktopdisabled'] = 'As notificações no ambiente de trabalho estão desactivadas no seu navegador.';
 $labels['desktopunsupported'] = 'O seu navegador não suporta notificações no ambiente de trabalho';
 
+?>
diff --git a/plugins/newmail_notifier/localization/ro_RO.inc b/plugins/newmail_notifier/localization/ro_RO.inc
index 181fb996f..c78c7e081 100644
--- a/plugins/newmail_notifier/localization/ro_RO.inc
+++ b/plugins/newmail_notifier/localization/ro_RO.inc
@@ -2,19 +2,20 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ro_RO/labels.inc                                         |
+ | plugins/newmail_notifier/localization/<lang>.inc                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail New Mail Notifier plugin   |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: tudor <tudor@starnet-alba.ro>                                 |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-newmail_notifier/
 */
 
-$labels = array();
 $labels['basic'] = 'Afişează notificări în browser la mesaj nou.';
 $labels['desktop'] = 'Afişează notificări desktop la mesaj nou.';
 $labels['sound'] = 'Redă un sunet la mesaj nou.';
@@ -25,3 +26,4 @@ $labels['testbody'] = 'Aceasta este o notificare de test.';
 $labels['desktopdisabled'] = 'Notificările desktop sunt dezactivate în browser.';
 $labels['desktopunsupported'] = 'Browser-ul nu suportă notificări desktop.';
 
+?>
diff --git a/plugins/newmail_notifier/localization/ru_RU.inc b/plugins/newmail_notifier/localization/ru_RU.inc
index b95a60bf7..a3da38b09 100644
--- a/plugins/newmail_notifier/localization/ru_RU.inc
+++ b/plugins/newmail_notifier/localization/ru_RU.inc
@@ -2,19 +2,20 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ru_RU/labels.inc                                         |
+ | plugins/newmail_notifier/localization/<lang>.inc                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail New Mail Notifier plugin   |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-newmail_notifier/
 */
 
-$labels = array();
 $labels['basic'] = 'Показывать в браузере уведомление о приходе нового сообщения';
 $labels['desktop'] = 'Показывать на рабочем столе уведомление о приходе нового сообщения';
 $labels['sound'] = 'Подавать звуковой сигнал о приходе нового сообщения';
@@ -25,3 +26,4 @@ $labels['testbody'] = 'Это тестовое уведомление.';
 $labels['desktopdisabled'] = 'В Вашем браузере отключены уведомления на рабочем столе.';
 $labels['desktopunsupported'] = 'Ваш браузер не поддерживает уведомления на рабочем столе.';
 
+?>
diff --git a/plugins/newmail_notifier/localization/si_LK.inc b/plugins/newmail_notifier/localization/si_LK.inc
index 13884c796..2de2d810f 100644
--- a/plugins/newmail_notifier/localization/si_LK.inc
+++ b/plugins/newmail_notifier/localization/si_LK.inc
@@ -2,18 +2,28 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/si_LK/labels.inc                                         |
+ | plugins/newmail_notifier/localization/<lang>.inc                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail New Mail Notifier plugin   |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Mohamed Rizmi <Unknown>                                       |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-newmail_notifier/
 */
 
-$labels = array();
+$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['test'] = 'පිරික්සන්න';
+$labels['title'] = 'New Email!';
+$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['desktopunsupported'] = 'Your browser does not support desktop notifications.';
 
+?>
diff --git a/plugins/newmail_notifier/localization/sk_SK.inc b/plugins/newmail_notifier/localization/sk_SK.inc
index 5d26d1281..cda6cf197 100644
--- a/plugins/newmail_notifier/localization/sk_SK.inc
+++ b/plugins/newmail_notifier/localization/sk_SK.inc
@@ -2,19 +2,20 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/sk_SK/labels.inc                                         |
+ | plugins/newmail_notifier/localization/<lang>.inc                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail New Mail Notifier plugin   |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: panda <Unknown>                                               |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-newmail_notifier/
 */
 
-$labels = array();
 $labels['basic'] = 'Zobraziť upozornenie v prehliadači pri novej správe';
 $labels['desktop'] = 'Zobraziť upozornenie na ploche pri novej správe';
 $labels['sound'] = 'Prehrať zvuk pri novej správe';
@@ -25,3 +26,4 @@ $labels['testbody'] = 'Toto je skúšobné upozornenie.';
 $labels['desktopdisabled'] = 'Upozornenia na ploche sú vo vašom prehliadači vypnuté.';
 $labels['desktopunsupported'] = 'Váč prehliadač nepodporuje upozornenia na ploche.';
 
+?>
diff --git a/plugins/newmail_notifier/localization/sl_SI.inc b/plugins/newmail_notifier/localization/sl_SI.inc
index a5d2e0bf4..49ae62048 100644
--- a/plugins/newmail_notifier/localization/sl_SI.inc
+++ b/plugins/newmail_notifier/localization/sl_SI.inc
@@ -2,19 +2,20 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/sl_SI/labels.inc                                         |
+ | plugins/newmail_notifier/localization/<lang>.inc                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail New Mail Notifier plugin   |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Barbara Krasovec <barbarak@arnes.si>                          |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-newmail_notifier/
 */
 
-$labels = array();
 $labels['basic'] = 'Prikaži obvestilo za nova sporočila';
 $labels['desktop'] = 'Prikaži obvestila na namizju za vsa nova sporočila';
 $labels['sound'] = 'Ob novem sporočilu predvajaj zvok';
@@ -25,3 +26,4 @@ $labels['testbody'] = 'To je testno obvestilo.';
 $labels['desktopdisabled'] = 'Obvestila na namizju so v vašem brskalniku onemogočena.';
 $labels['desktopunsupported'] = 'Vaš brskalnik ne podpira izpis obvestil na namizju.';
 
+?>
diff --git a/plugins/newmail_notifier/localization/sr_CS.inc b/plugins/newmail_notifier/localization/sr_CS.inc
index 529b89666..55e342a27 100644
--- a/plugins/newmail_notifier/localization/sr_CS.inc
+++ b/plugins/newmail_notifier/localization/sr_CS.inc
@@ -2,18 +2,20 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/sr_CS/labels.inc                                         |
+ | plugins/newmail_notifier/localization/<lang>.inc                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail New Mail Notifier plugin   |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Данило Шеган                                       |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-newmail_notifier/
 */
 
-$labels = array();
 $labels['basic'] = 'Прикажи обавештења о новим порукама у прегледачу';
 $labels['desktop'] = 'Прикажи обавештења о новим порукама у систему';
 $labels['sound'] = 'Пусти звук по пријему поруке';
@@ -24,3 +26,4 @@ $labels['testbody'] = 'Ово је пробно обавештење.';
 $labels['desktopdisabled'] = 'Обавештења у систему су искључена у вашем прегледачу';
 $labels['desktopunsupported'] = 'Ваш прегледач не подржава обавештења у систему.';
 
+?>
diff --git a/plugins/newmail_notifier/localization/sv_SE.inc b/plugins/newmail_notifier/localization/sv_SE.inc
index b1c92ed79..76ce72313 100644
--- a/plugins/newmail_notifier/localization/sv_SE.inc
+++ b/plugins/newmail_notifier/localization/sv_SE.inc
@@ -2,19 +2,20 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/sv_SE/labels.inc                                         |
+ | plugins/newmail_notifier/localization/<lang>.inc                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail New Mail Notifier plugin   |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Jonas Nasholm <Unknown>                                       |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-newmail_notifier/
 */
 
-$labels = array();
 $labels['basic'] = 'Avisera nytt meddelande i webbläsaren';
 $labels['desktop'] = 'Avisera nytt meddelande på skrivbordet';
 $labels['sound'] = 'Avisera nytt meddelande med ljudsignal';
@@ -25,3 +26,4 @@ $labels['testbody'] = 'Denna avisering är ett prov.';
 $labels['desktopdisabled'] = 'Avisering på skrivbordet är avstängt i webbläsaren.';
 $labels['desktopunsupported'] = 'Avisering på skrivbordet stöds inte av webbläsaren.';
 
+?>
diff --git a/plugins/newmail_notifier/localization/tr_TR.inc b/plugins/newmail_notifier/localization/tr_TR.inc
index 89e6e36e2..77217b9b1 100644
--- a/plugins/newmail_notifier/localization/tr_TR.inc
+++ b/plugins/newmail_notifier/localization/tr_TR.inc
@@ -2,19 +2,20 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/tr_TR/labels.inc                                         |
+ | plugins/newmail_notifier/localization/<lang>.inc                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail New Mail Notifier plugin   |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: ismail yenigul <Unknown>                                      |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-newmail_notifier/
 */
 
-$labels = array();
 $labels['basic'] = 'Yeni mesajlarda web tarayıcı bildirimlerini göster';
 $labels['desktop'] = 'Yeni mesajlarda masa üstü bildirimlerini göster';
 $labels['sound'] = 'Yeni mesajlarda muzik çal';
@@ -25,3 +26,4 @@ $labels['testbody'] = 'Bu bir test bildirimidir.';
 $labels['desktopdisabled'] = 'Web tarayıcınızda masa üstü bildirimi iptal edildi';
 $labels['desktopunsupported'] = 'Web tarayıcınız masa üstü bildidrimleri desteklemiyor';
 
+?>
diff --git a/plugins/newmail_notifier/localization/uk_UA.inc b/plugins/newmail_notifier/localization/uk_UA.inc
index 1c65bb7e6..68722c006 100644
--- a/plugins/newmail_notifier/localization/uk_UA.inc
+++ b/plugins/newmail_notifier/localization/uk_UA.inc
@@ -2,19 +2,20 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/uk_UA/labels.inc                                         |
+ | plugins/newmail_notifier/localization/<lang>.inc                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail New Mail Notifier plugin   |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Anton Gladky <Unknown>                                        |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-newmail_notifier/
 */
 
-$labels = array();
 $labels['basic'] = 'Показувати у браузері сповіщення про нові повідомлення';
 $labels['desktop'] = 'Показувати на робочому столі сповіщення про нові повідомлення';
 $labels['sound'] = 'Програвати звук при появленні нового повідомлення';
@@ -25,3 +26,4 @@ $labels['testbody'] = 'Це тестове сповіщення';
 $labels['desktopdisabled'] = 'Повідомлення на робочому столі відключені у вашому браузері.';
 $labels['desktopunsupported'] = 'Ваш браузер не підтримує повідомлення на робочому столі.';
 
+?>
diff --git a/plugins/newmail_notifier/localization/vi_VN.inc b/plugins/newmail_notifier/localization/vi_VN.inc
index b05726e3d..9aa93a27a 100644
--- a/plugins/newmail_notifier/localization/vi_VN.inc
+++ b/plugins/newmail_notifier/localization/vi_VN.inc
@@ -2,18 +2,20 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/vi_VN/labels.inc                                         |
+ | plugins/newmail_notifier/localization/<lang>.inc                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail New Mail Notifier plugin   |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Kenny Tran <kennethanh@gmail.com>                             |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-newmail_notifier/
 */
 
-$labels = array();
 $labels['basic'] = 'Hiển thị thông báo trên trình duyệt là có thư mới';
 $labels['desktop'] = 'Hiển thị thông báo trên màn hình là có thư mới';
 $labels['sound'] = 'Mở tính năng âm thanh trên thư mới';
@@ -24,3 +26,4 @@ $labels['testbody'] = 'Đây là thông báo kiểm tra';
 $labels['desktopdisabled'] = 'Thông báo máy tính bị tắt trên trình duyệt của bạn';
 $labels['desktopunsupported'] = 'Trình duyệt của bạn không hỗ trợ thông báo trên máy tính';
 
+?>
diff --git a/plugins/newmail_notifier/localization/zh_CN.inc b/plugins/newmail_notifier/localization/zh_CN.inc
index b131a6c56..5bb9e846b 100644
--- a/plugins/newmail_notifier/localization/zh_CN.inc
+++ b/plugins/newmail_notifier/localization/zh_CN.inc
@@ -2,18 +2,20 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/zh_CN/labels.inc                                         |
+ | plugins/newmail_notifier/localization/<lang>.inc                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail New Mail Notifier plugin   |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Christopher Meng <cickumqt@gmail.com>                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-newmail_notifier/
 */
 
-$labels = array();
 $labels['basic'] = '在浏览器中显示新邮件提醒';
 $labels['desktop'] = '在桌面显示新邮件提醒';
 $labels['sound'] = '有新的邮件时播放声音';
@@ -24,3 +26,4 @@ $labels['testbody'] = '这是一个提醒测试。';
 $labels['desktopdisabled'] = '您的浏览器已禁止桌面提醒功能。';
 $labels['desktopunsupported'] = '您的浏览器不支持桌面提醒功能。';
 
+?>
diff --git a/plugins/newmail_notifier/localization/zh_TW.inc b/plugins/newmail_notifier/localization/zh_TW.inc
index dcb026893..902eccd14 100644
--- a/plugins/newmail_notifier/localization/zh_TW.inc
+++ b/plugins/newmail_notifier/localization/zh_TW.inc
@@ -2,19 +2,20 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/zh_TW/labels.inc                                         |
+ | plugins/newmail_notifier/localization/<lang>.inc                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail New Mail Notifier plugin   |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Denny Lin <dennylin93@hs.ntnu.edu.tw>                         |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-newmail_notifier/
 */
 
-$labels = array();
 $labels['basic'] = '當有新郵件顯示瀏覽器通知';
 $labels['desktop'] = '當有新郵件顯示桌面通知';
 $labels['sound'] = '當有新郵件播放音效';
@@ -25,3 +26,4 @@ $labels['testbody'] = '這是測試通知';
 $labels['desktopdisabled'] = '您的瀏覽器已停用桌面通知';
 $labels['desktopunsupported'] = '您的瀏覽器不支援桌面通知功能';
 
+?>
diff --git a/plugins/newmail_notifier/newmail_notifier.php b/plugins/newmail_notifier/newmail_notifier.php
index a45eeaedb..61f7bdbaa 100644
--- a/plugins/newmail_notifier/newmail_notifier.php
+++ b/plugins/newmail_notifier/newmail_notifier.php
@@ -35,6 +35,9 @@ class newmail_notifier extends rcube_plugin
 
     private $rc;
     private $notified;
+    private $opt = array();
+    private $exceptions = array();
+
 
     /**
      * Plugin initialization
@@ -49,13 +52,34 @@ class newmail_notifier extends rcube_plugin
             $this->add_hook('preferences_save', array($this, 'prefs_save'));
         }
         else { // if ($this->rc->task == 'mail') {
-            $this->add_hook('new_messages', array($this, 'notify'));
             // add script when not in ajax and not in frame
-            if (is_a($this->rc->output, 'rcube_output_html') && empty($_REQUEST['_framed'])) {
+            if ($this->rc->output->type == 'html' && empty($_REQUEST['_framed'])) {
                 $this->add_texts('localization/');
                 $this->rc->output->add_label('newmail_notifier.title', 'newmail_notifier.body');
                 $this->include_script('newmail_notifier.js');
             }
+
+            if ($this->rc->action == 'refresh') {
+                // Load configuration
+                $this->load_config();
+
+                $this->opt['basic']   = $this->rc->config->get('newmail_notifier_basic');
+                $this->opt['sound']   = $this->rc->config->get('newmail_notifier_sound');
+                $this->opt['desktop'] = $this->rc->config->get('newmail_notifier_desktop');
+
+                if (!empty($this->opt)) {
+                    // Get folders to skip checking for
+                    $exceptions = array('drafts_mbox', 'sent_mbox', 'trash_mbox');
+                    foreach ($exceptions as $folder) {
+                        $folder = $this->rc->config->get($folder);
+                        if (strlen($folder) && $folder != 'INBOX') {
+                            $this->exceptions[] = $folder;
+                        }
+                    }
+
+                    $this->add_hook('new_messages', array($this, 'notify'));
+                }
+             }
         }
     }
 
@@ -132,45 +156,36 @@ class newmail_notifier extends rcube_plugin
      */
     function notify($args)
     {
-        // Already notified or non-automatic check
-        if ($this->notified || !empty($_GET['_refresh'])) {
+        // Already notified or unexpected input
+        if ($this->notified || empty($args['diff']['new'])) {
             return $args;
         }
 
-        // Get folders to skip checking for
-        if (empty($this->exceptions)) {
-            $this->delimiter = $this->rc->storage->get_hierarchy_delimiter();
-
-            $exceptions = array('drafts_mbox', 'sent_mbox', 'trash_mbox');
-            foreach ($exceptions as $folder) {
-                $folder = $this->rc->config->get($folder);
-                if (strlen($folder) && $folder != 'INBOX') {
-                    $this->exceptions[] = $folder;
-                }
-            }
-        }
-
-        $mbox = $args['mailbox'];
+        $mbox      = $args['mailbox'];
+        $storage   = $this->rc->get_storage();
+        $delimiter = $storage->get_hierarchy_delimiter();
 
         // Skip exception (sent/drafts) folders (and their subfolders)
         foreach ($this->exceptions as $folder) {
-            if (strpos($mbox.$this->delimiter, $folder.$this->delimiter) === 0) {
+            if (strpos($mbox.$delimiter, $folder.$delimiter) === 0) {
                 return $args;
             }
         }
 
-        $this->notified = true;
-
-        // Load configuration
-        $this->load_config();
+        // Check if any of new messages is UNSEEN
+        $deleted = $this->rc->config->get('skip_deleted') ? 'UNDELETED ' : '';
+        $search  = $deleted . 'UNSEEN UID ' . $args['diff']['new'];
+        $unseen  = $storage->search_once($mbox, $search);
 
-        $basic   = $this->rc->config->get('newmail_notifier_basic');
-        $sound   = $this->rc->config->get('newmail_notifier_sound');
-        $desktop = $this->rc->config->get('newmail_notifier_desktop');
+        if ($unseen->count()) {
+            $this->notified = true;
 
-        if ($basic || $sound || $desktop) {
             $this->rc->output->command('plugin.newmail_notifier',
-                array('basic' => $basic, 'sound' => $sound, 'desktop' => $desktop));
+                array(
+                    'basic'   => $this->opt['basic'],
+                    'sound'   => $this->opt['sound'],
+                    'desktop' => $this->opt['desktop'],
+                ));
         }
 
         return $args;
diff --git a/plugins/newmail_notifier/package.xml b/plugins/newmail_notifier/package.xml
index d3de25fb3..ea0fcd9c1 100644
--- a/plugins/newmail_notifier/package.xml
+++ b/plugins/newmail_notifier/package.xml
@@ -19,10 +19,10 @@
 		<email>alec@alec.pl</email>
 		<active>yes</active>
 	</lead>
-	<date>2012-02-07</date>
+	<date>2013-03-16</date>
 	<version>
-		<release>0.4</release>
-		<api>0.3</api>
+		<release>0.5</release>
+		<api>0.5</api>
 	</version>
 	<stability>
 		<release>stable</release>
diff --git a/plugins/password/README b/plugins/password/README
index 25af8cbcd..0ccc8ad23 100644
--- a/plugins/password/README
+++ b/plugins/password/README
@@ -24,8 +24,8 @@
  @author <see driver files for driver authors>
  -----------------------------------------------------------------------
 
- 1. 	Configuration
- 2.	Drivers
+ 1. Configuration
+ 2. Drivers
  2.1.  Database (sql)
  2.2.  Cyrus/SASL (sasl)
  2.3.  Poppassd/Courierpassd (poppassd)
@@ -44,7 +44,7 @@
  2.16. DBMail (dbmail)
  2.17. Expect (expect)
  2.18. Samba (smb)
- 3.	Driver API
+ 3. Driver API
 
 
  1. Configuration
@@ -72,33 +72,33 @@
 
  - This is for use with LMS (http://lms.org.pl) database and postgres:
 
-	CREATE OR REPLACE FUNCTION update_passwd(hash text, account text) RETURNS integer AS $$
-	DECLARE
-    	    res integer;
-	BEGIN
-    	    UPDATE passwd SET password = hash
-	    WHERE login = split_part(account, '@', 1)
-		AND domainid = (SELECT id FROM domains WHERE name = split_part(account, '@', 2))
-	    RETURNING id INTO res;
-	    RETURN res;
-	END;
-	$$ LANGUAGE plpgsql SECURITY DEFINER;
+    CREATE OR REPLACE FUNCTION update_passwd(hash text, account text) RETURNS integer AS $$
+    DECLARE
+            res integer;
+    BEGIN
+        UPDATE passwd SET password = hash
+        WHERE login = split_part(account, '@', 1)
+            AND domainid = (SELECT id FROM domains WHERE name = split_part(account, '@', 2))
+        RETURNING id INTO res;
+        RETURN res;
+    END;
+    $$ LANGUAGE plpgsql SECURITY DEFINER;
 
  - This is for use with a SELECT update_passwd(%o,%c,%u) query
-	Updates the password only when the old password matches the MD5 password
-	in the database
-
-	CREATE FUNCTION update_password (oldpass text, cryptpass text, user text) RETURNS text
-    	    MODIFIES SQL DATA
-	BEGIN
-	    DECLARE currentsalt varchar(20);
-	    DECLARE error text;
-	    SET error = 'incorrect current password';
-	    SELECT substring_index(substr(user.password,4),_latin1'$',1) INTO currentsalt FROM users WHERE username=user;
-	    SELECT '' INTO error FROM users WHERE username=user AND password=ENCRYPT(oldpass,currentsalt);
-	    UPDATE users SET password=cryptpass WHERE username=user AND password=ENCRYPT(oldpass,currentsalt);
-	    RETURN error;
-	END
+   Updates the password only when the old password matches the MD5 password
+   in the database
+
+    CREATE FUNCTION update_password (oldpass text, cryptpass text, user text) RETURNS text
+        MODIFIES SQL DATA
+    BEGIN
+        DECLARE currentsalt varchar(20);
+        DECLARE error text;
+        SET error = 'incorrect current password';
+        SELECT substring_index(substr(user.password,4),_latin1'$',1) INTO currentsalt FROM users WHERE username=user;
+        SELECT '' INTO error FROM users WHERE username=user AND password=ENCRYPT(oldpass,currentsalt);
+        UPDATE users SET password=cryptpass WHERE username=user AND password=ENCRYPT(oldpass,currentsalt);
+        RETURN error;
+    END
 
  Example SQL UPDATEs:
 
@@ -142,7 +142,7 @@
  documented within it.
 
  Compile the wrapper program:
-	gcc -o chgsaslpasswd chgsaslpasswd.c
+    gcc -o chgsaslpasswd chgsaslpasswd.c
 
  Chown the compiled chgsaslpasswd binary to the cyrus user and group
  that your browser runs as, then chmod them to 4550.
@@ -150,13 +150,13 @@
  For example, if your cyrus user is 'cyrus' and the apache server group is
  'nobody' (I've been told Redhat runs Apache as user 'apache'):
 
-	chown cyrus:nobody chgsaslpasswd
-	chmod 4550 chgsaslpasswd
+    chown cyrus:nobody chgsaslpasswd
+    chmod 4550 chgsaslpasswd
 
  Stephen Carr has suggested users should try to run the scripts on a test
  account as the cyrus user eg;
 
-	su cyrus -c "./chgsaslpasswd -p test_account"
+    su cyrus -c "./chgsaslpasswd -p test_account"
 
  This will allow you to make sure that the script will work for your setup.
  Should the script not work, make sure that:
@@ -192,8 +192,12 @@
  2.6. cPanel (cpanel)
  --------------------
 
- You can specify parameters for HTTP connection to cPanel's admin
- interface. See config.inc.php.dist file for more info.
+ Install cPanel XMLAPI Client Class into Roundcube program/lib directory
+ or any other place in PHP include path. You can get the class from
+ https://raw.github.com/CpanelInc/xmlapi-php/master/xmlapi.php
+
+ You can configure parameters for connection to cPanel's API interface.
+ See config.inc.php.dist file for more info.
 
 
  2.7. XIMSS/Communigate (ximms)
diff --git a/plugins/password/config.inc.php.dist b/plugins/password/config.inc.php.dist
index e960bbe00..9256829aa 100644
--- a/plugins/password/config.inc.php.dist
+++ b/plugins/password/config.inc.php.dist
@@ -31,6 +31,10 @@ $rcmail_config['password_login_exceptions'] = null;
 //$rcmail_config['password_hosts'] = array('mail.example.com', 'mail2.example.org');
 $rcmail_config['password_hosts'] = null;
 
+// Enables saving the new password even if it matches the old password. Useful
+// for upgrading the stored passwords after the encryption scheme has changed.
+$rcmail_config['password_force_save'] = false;
+
 
 // SQL Driver options
 // ------------------
@@ -265,13 +269,7 @@ $rcmail_config['password_cpanel_username'] = 'username';
 $rcmail_config['password_cpanel_password'] = 'password';
 
 // The cPanel port to use
-$rcmail_config['password_cpanel_port'] = 2082;
-
-// Using ssl for cPanel connections?
-$rcmail_config['password_cpanel_ssl'] = true;
-
-// The cPanel theme in use
-$rcmail_config['password_cpanel_theme'] = 'x';
+$rcmail_config['password_cpanel_port'] = 2087;
 
 
 // XIMSS (Communigate server) Driver options
@@ -357,6 +355,10 @@ $rcmail_config['password_expect_params'] = '';
 // smb Driver options
 // ---------------------
 // Samba host (default: localhost)
+// Supported replacement variables:
+// %n - hostname ($_SERVER['SERVER_NAME'])
+// %t - hostname without the first part
+// %d - domain (http hostname $_SERVER['HTTP_HOST'] without the first part)
 $rcmail_config['password_smb_host'] = 'localhost';
 // Location of smbpasswd binary
 $rcmail_config['password_smb_cmd'] = '/usr/bin/smbpasswd';
diff --git a/plugins/password/drivers/cpanel.php b/plugins/password/drivers/cpanel.php
index 79887109b..b71c33ec1 100644
--- a/plugins/password/drivers/cpanel.php
+++ b/plugins/password/drivers/cpanel.php
@@ -4,95 +4,43 @@
  * cPanel Password Driver
  *
  * Driver that adds functionality to change the users cPanel password.
- * The cPanel PHP API code has been taken from: http://www.phpclasses.org/browse/package/3534.html
+ * Originally written by Fulvio Venturelli <fulvio@venturelli.org>
  *
- * This driver has been tested with Hostmonster hosting and seems to work fine.
+ * Completely rewritten using the cPanel API2 call Email::passwdpop
+ * as opposed to the original coding against the UI, which is a fragile method that
+ * makes the driver to always return a failure message for any language other than English
+ * see http://trac.roundcube.net/ticket/1487015
  *
- * @version 2.0
- * @author Fulvio Venturelli <fulvio@venturelli.org>
+ * This driver has been tested with o2switch hosting and seems to work fine.
+ *
+ * @version 3.0
+ * @author Christian Chech <christian@chech.fr>
  */
 
 class rcube_cpanel_password
 {
     public function save($curpas, $newpass)
     {
+        require_once 'xmlapi.php';
+
         $rcmail = rcmail::get_instance();
 
-        // Create a cPanel email object
-        $cPanel = new emailAccount($rcmail->config->get('password_cpanel_host'),
-        $rcmail->config->get('password_cpanel_username'),
-        $rcmail->config->get('password_cpanel_password'),
-        $rcmail->config->get('password_cpanel_port'),
-        $rcmail->config->get('password_cpanel_ssl'),
-        $rcmail->config->get('password_cpanel_theme'),
-        $_SESSION['username'] );
+        $this->cuser = $rcmail->config->get('password_cpanel_username');
+
+        // Setup the xmlapi connection
+        $this->xmlapi = new xmlapi($rcmail->config->get('password_cpanel_host'));
+        $this->xmlapi->set_port($rcmail->config->get('password_cpanel_port'));
+        $this->xmlapi->password_auth($this->cuser, $rcmail->config->get('password_cpanel_password'));
+        $this->xmlapi->set_output('json');
+        $this->xmlapi->set_debug(0);
 
-        if ($cPanel->setPassword($newpass)) {
+        if ($this->setPassword($_SESSION['username'], $newpass)) {
             return PASSWORD_SUCCESS;
         }
         else {
             return PASSWORD_ERROR;
         }
     }
-}
-
-
-class HTTP
-{
-    function HTTP($host, $username, $password, $port, $ssl, $theme)
-    {
-        $this->ssl = $ssl ? 'ssl://' : '';
-        $this->username = $username;
-        $this->password = $password;
-        $this->theme = $theme;
-        $this->auth = base64_encode($username . ':' . $password);
-        $this->port = $port;
-        $this->host = $host;
-        $this->path = '/frontend/' . $theme . '/';
-    }
-
-    function getData($url, $data = '')
-    {
-        $url = $this->path . $url;
-        if (is_array($data)) {
-            $url = $url . '?';
-            foreach ($data as $key => $value) {
-                $url .= urlencode($key) . '=' . urlencode($value) . '&';
-            }
-            $url = substr($url, 0, -1);
-        }
-
-        $response = '';
-        $fp = fsockopen($this->ssl . $this->host, $this->port);
-        if (!$fp) {
-            return false;
-        }
-
-        $out = 'GET ' . $url . ' HTTP/1.0' . "\r\n";
-        $out .= 'Authorization: Basic ' . $this->auth . "\r\n";
-        $out .= 'Connection: Close' . "\r\n\r\n";
-        fwrite($fp, $out);
-        while (!feof($fp)) {
-            $response .= @fgets($fp);
-        }
-        fclose($fp);
-        return $response;
-    }
-}
-
-
-class emailAccount
-{
-    function emailAccount($host, $username, $password, $port, $ssl, $theme, $address)
-    {
-        $this->HTTP = new HTTP($host, $username, $password, $port, $ssl, $theme);
-        if (strpos($address, '@')) {
-            list($this->email, $this->domain) = explode('@', $address);
-        }
-        else {
-            list($this->email, $this->domain) = array($address, '');
-        }
-    }
 
     /**
      * Change email account password
@@ -101,16 +49,24 @@ class emailAccount
      * @param string $password email account password
      * @return bool
      */
-    function setPassword($password)
+    function setPassword($address, $password)
     {
-        $data['email'] = $this->email;
-        $data['domain'] = $this->domain;
+        if (strpos($address, '@')) {
+            list($data['email'], $data['domain']) = explode('@', $address);
+        }
+        else {
+            list($data['email'], $data['domain']) = array($address, '');
+        }
+
         $data['password'] = $password;
-        $response = $this->HTTP->getData('mail/dopasswdpop.html', $data);
 
-        if (strpos($response, 'success') && !strpos($response, 'failure')) {
+        $query = $this->xmlapi->api2_query($this->cuser, 'Email', 'passwdpop', $data);
+        $query = json_decode($query, true);
+
+        if ($query['cpanelresult']['data'][0]['result'] == 1) {
             return true;
         }
+
         return false;
     }
 }
diff --git a/plugins/password/drivers/directadmin.php b/plugins/password/drivers/directadmin.php
index 8bf0dc613..44ecea406 100644
--- a/plugins/password/drivers/directadmin.php
+++ b/plugins/password/drivers/directadmin.php
@@ -297,7 +297,6 @@ class HTTPSocket {
             $status = socket_get_status($socket);
             $startTime = time();
             $length = 0;
-            $prevSecond = 0;
             while ( !feof($socket) && !$status['timed_out'] )
             {
                 $chunk = fgets($socket,1024);
diff --git a/plugins/password/drivers/pam.php b/plugins/password/drivers/pam.php
index 8cd94c737..4d0ba1656 100644
--- a/plugins/password/drivers/pam.php
+++ b/plugins/password/drivers/pam.php
@@ -11,7 +11,8 @@ class rcube_pam_password
 {
     function save($currpass, $newpass)
     {
-        $user = $_SESSION['username'];
+        $user  = $_SESSION['username'];
+        $error = '';
 
         if (extension_loaded('pam') || extension_loaded('pam_auth')) {
             if (pam_auth($user, $currpass, $error, false)) {
diff --git a/plugins/password/drivers/smb.php b/plugins/password/drivers/smb.php
index d56924eee..9f2b96afa 100644
--- a/plugins/password/drivers/smb.php
+++ b/plugins/password/drivers/smb.php
@@ -26,13 +26,15 @@ class rcube_smb_password
 
     public function save($currpass, $newpass)
     {
-        $host = rcmail::get_instance()->config->get('password_smb_host','localhost');
-        $bin = rcmail::get_instance()->config->get('password_smb_cmd','/usr/bin/smbpasswd');
+        $host     = rcmail::get_instance()->config->get('password_smb_host','localhost');
+        $bin      = rcmail::get_instance()->config->get('password_smb_cmd','/usr/bin/smbpasswd');
         $username = $_SESSION['username'];
 
-        $tmpfile = tempnam(sys_get_temp_dir(),'smb');
-        $cmd = $bin . ' -r ' . $host . ' -s -U "' . $username . '" > ' . $tmpfile . ' 2>&1';
-        $handle = @popen($cmd, 'w');
+        $host     = rcube_utils::parse_host($host);
+        $tmpfile  = tempnam(sys_get_temp_dir(),'smb');
+        $cmd      = $bin . ' -r ' . $host . ' -s -U "' . $username . '" > ' . $tmpfile . ' 2>&1';
+        $handle   = @popen($cmd, 'w');
+
         fputs($handle, $currpass."\n");
         fputs($handle, $newpass."\n");
         fputs($handle, $newpass."\n");
diff --git a/plugins/password/drivers/sql.php b/plugins/password/drivers/sql.php
index e02bff146..7a51dfe44 100644
--- a/plugins/password/drivers/sql.php
+++ b/plugins/password/drivers/sql.php
@@ -34,8 +34,9 @@ class rcube_sql_password
             $db = $rcmail->get_dbh();
         }
 
-        if ($err = $db->is_error())
+        if ($db->is_error()) {
             return PASSWORD_ERROR;
+        }
 
         // crypted password
         if (strpos($sql, '%c') !== FALSE) {
@@ -183,8 +184,8 @@ class rcube_sql_password
         $res = $db->query($sql, $sql_vars);
 
         if (!$db->is_error()) {
-            if (strtolower(substr(trim($query),0,6))=='select') {
-                if ($result = $db->fetch_array($res))
+            if (strtolower(substr(trim($sql),0,6)) == 'select') {
+                if ($db->fetch_array($res))
                     return PASSWORD_SUCCESS;
             } else {
                 // This is the good case: 1 row updated
diff --git a/plugins/password/drivers/xmail.php b/plugins/password/drivers/xmail.php
index 37abc3001..59e467c5b 100644
--- a/plugins/password/drivers/xmail.php
+++ b/plugins/password/drivers/xmail.php
@@ -67,7 +67,7 @@ class XMail {
     function send($msg)
     {
         socket_write($this->socket,$msg);
-        if (substr($in = socket_read($this->socket, 512, PHP_BINARY_READ),0,1) != "+") {
+        if (substr(socket_read($this->socket, 512, PHP_BINARY_READ),0,1) != "+") {
             return false;
         }
         return true;
@@ -85,7 +85,7 @@ class XMail {
             return false;
         }
 
-        if (substr($in = socket_read($this->socket, 512, PHP_BINARY_READ),0,1) != "+") {
+        if (substr(socket_read($this->socket, 512, PHP_BINARY_READ),0,1) != "+") {
             socket_close($this->socket);
             return false;
         }
diff --git a/plugins/password/localization/az_AZ.inc b/plugins/password/localization/az_AZ.inc
index 4d0760da8..c99ab2ab3 100644
--- a/plugins/password/localization/az_AZ.inc
+++ b/plugins/password/localization/az_AZ.inc
@@ -2,30 +2,36 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/az_AZ/labels.inc                                         |
+ | plugins/password/localization/<lang>.inc                              |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Password plugin            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
 
 $labels = array();
-$labels['changepasswd'] = 'Şifrəni dəyiş';
-$labels['curpasswd'] = 'Hal-hazırki şifrə:';
-$labels['newpasswd'] = 'Yeni şifrə:';
-$labels['confpasswd'] = 'Yeni şifrə: (təkrar)';
-$labels['nopassword'] = 'Yeni şifrəni daxil edin.';
-$labels['nocurpassword'] = 'Hal-hazırda istifadə etdiyiniz şifrəni daxil edin.';
-$labels['passwordincorrect'] = 'Yalnış şifrə daxil etdiniz.';
-$labels['passwordinconsistency'] = 'Yeni daxil etdiyiniz şifrələr bir-birinə uyğun deyildir.';
-$labels['crypterror'] = 'Yeni şifrənin saxlanılması mümkün olmadı. Şifrələmə metodu tapılmadı.';
-$labels['connecterror'] = 'Yeni şifrənin saxlanılması mümkün olmadı. Qoşulma səhvi.';
-$labels['internalerror'] = 'Yeni şifrənin saxlanılması mümkün olmadı.';
-$labels['passwordshort'] = 'Yeni şifrə $length simvoldan uzun olmalıdır.';
-$labels['passwordweak'] = 'Şifrədə heç olmasa minimum bir rəqəm və simvol olmalıdır.';
-$labels['passwordforbidden'] = 'Şifrədə icazə verilməyən simvollar vardır.';
+$labels['changepasswd']  = 'Şifrəni dəyiş';
+$labels['curpasswd']  = 'Hal-hazırki şifrə:';
+$labels['newpasswd']  = 'Yeni şifrə:';
+$labels['confpasswd']  = 'Yeni şifrə: (təkrar)';
+
+$messages = array();
+$messages['nopassword'] = 'Yeni şifrəni daxil edin.';
+$messages['nocurpassword'] = 'Hal-hazırda istifadə etdiyiniz şifrəni daxil edin.';
+$messages['passwordincorrect'] = 'Yalnış şifrə daxil etdiniz.';
+$messages['passwordinconsistency'] = 'Yeni daxil etdiyiniz şifrələr bir-birinə uyğun deyildir.';
+$messages['crypterror'] = 'Yeni şifrənin saxlanılması mümkün olmadı. Şifrələmə metodu tapılmadı.';
+$messages['connecterror'] = 'Yeni şifrənin saxlanılması mümkün olmadı. Qoşulma səhvi.';
+$messages['internalerror'] = 'Yeni şifrənin saxlanılması mümkün olmadı.';
+$messages['passwordshort'] = 'Yeni şifrə $length simvoldan uzun olmalıdır.';
+$messages['passwordweak'] = 'Şifrədə heç olmasa minimum bir rəqəm və simvol olmalıdır.';
+$messages['passwordforbidden'] = 'Şifrədə icazə verilməyən simvollar vardır.';
 
+?>
diff --git a/plugins/password/localization/bg_BG.inc b/plugins/password/localization/bg_BG.inc
index 884cb9ec6..9bd8a4a17 100644
--- a/plugins/password/localization/bg_BG.inc
+++ b/plugins/password/localization/bg_BG.inc
@@ -2,27 +2,36 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/bg_BG/labels.inc                                         |
+ | plugins/password/localization/<lang>.inc                              |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Password plugin            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
 
 $labels = array();
-$labels['changepasswd'] = 'Смяна на парола';
-$labels['curpasswd'] = 'Текуща парола:';
-$labels['newpasswd'] = 'Нова парола:';
-$labels['confpasswd'] = 'Повторете:';
-$labels['nopassword'] = 'Моля въведете нова парола.';
-$labels['nocurpassword'] = 'Моля въведете текущата .';
-$labels['passwordincorrect'] = 'Невалидна текуща парола.';
-$labels['passwordinconsistency'] = 'Паролите не съвпадат, опитайте пак.';
-$labels['crypterror'] = 'Паролата не може да бъде сменена. Грешка в криптирането.';
-$labels['connecterror'] = 'Паролата не може да бъде сменена. Грешка в свързването.';
-$labels['internalerror'] = 'Паролата не може да бъде сменена.';
+$labels['changepasswd']  = 'Промяна на парола';
+$labels['curpasswd']  = 'Текуща парола:';
+$labels['newpasswd']  = 'Нова парола:';
+$labels['confpasswd']  = 'Повторете:';
+
+$messages = array();
+$messages['nopassword'] = 'Моля въведете нова парола.';
+$messages['nocurpassword'] = 'Моля въведете текущата.';
+$messages['passwordincorrect'] = 'Невалидна текуща парола.';
+$messages['passwordinconsistency'] = 'Паролите не съвпадат, опитайте пак.';
+$messages['crypterror'] = 'Паролата не може да бъде сменена. Грешка в криптирането.';
+$messages['connecterror'] = 'Паролата не може да бъде сменена. Грешка в свързването.';
+$messages['internalerror'] = 'Паролата не може да бъде сменена.';
+$messages['passwordshort'] = 'Паролата трябва да е дълга поне $length знака.';
+$messages['passwordweak'] = 'Паролата трябва да включва поне един азбучен символ и една пунктуация.';
+$messages['passwordforbidden'] = 'Паролата съдържа невалидни знаци.';
 
+?>
diff --git a/plugins/password/localization/br.inc b/plugins/password/localization/br.inc
index c4573884c..f07786b39 100644
--- a/plugins/password/localization/br.inc
+++ b/plugins/password/localization/br.inc
@@ -2,29 +2,36 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/br/labels.inc                                         |
+ | plugins/password/localization/<lang>.inc                              |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Password plugin            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Denis                                                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
 
 $labels = array();
-$labels['changepasswd'] = 'Kemmañ ar ger-tremen';
-$labels['curpasswd'] = 'Ger-tremen red :';
-$labels['newpasswd'] = 'Ger-tremen nevez :';
-$labels['confpasswd'] = 'Kadarnaat ar ger-tremen :';
-$labels['nopassword'] = 'Roit ur ger-tremen nevez, mar plij.';
-$labels['nocurpassword'] = 'Roit ar ger-tremen red, mar plij.';
-$labels['passwordincorrect'] = 'Direizh eo ar ger-tremen red.';
-$labels['passwordinconsistency'] = 'Ar gerioù-tremen ne glotont ket an eil gant eben, roit anezhe en-dro.';
-$labels['crypterror'] = 'N\'haller ket enrollañ ar ger-tremen nevez. Arc\'hwel enrinegañ o vank.';
-$labels['connecterror'] = 'N\'haller ket enrollañ ar ger-tremen nevez. Fazi gant ar c\'hennask.';
-$labels['internalerror'] = 'N\'haller ket enrollañ ar ger-tremen nevez.';
-$labels['passwordshort'] = 'Ret eo d\'ar ger-tremen bezañ hiroc\'h eget $length arouezenn.';
-$labels['passwordforbidden'] = 'Arouezennoù difennet zo er ger-tremen.';
+$labels['changepasswd']  = 'Kemmañ ar ger-tremen';
+$labels['curpasswd']  = 'Ger-tremen red :';
+$labels['newpasswd']  = 'Ger-tremen nevez :';
+$labels['confpasswd']  = 'Kadarnaat ar ger-tremen :';
+
+$messages = array();
+$messages['nopassword'] = 'Roit ur ger-tremen nevez, mar plij.';
+$messages['nocurpassword'] = 'Roit ar ger-tremen red, mar plij.';
+$messages['passwordincorrect'] = 'Direizh eo ar ger-tremen red.';
+$messages['passwordinconsistency'] = 'Ar gerioù-tremen ne glotont ket an eil gant eben, roit anezhe en-dro.';
+$messages['crypterror'] = 'N\'haller ket enrollañ ar ger-tremen nevez. Arc\'hwel enrinegañ o vank.';
+$messages['connecterror'] = 'N\'haller ket enrollañ ar ger-tremen nevez. Fazi gant ar c\'hennask.';
+$messages['internalerror'] = 'N\'haller ket enrollañ ar ger-tremen nevez.';
+$messages['passwordshort'] = 'Ret eo d\'ar ger-tremen bezañ hiroc\'h eget $length arouezenn.';
+$messages['passwordweak'] = 'Password must include at least one number and one punctuation character.';
+$messages['passwordforbidden'] = 'Arouezennoù difennet zo er ger-tremen.';
 
+?>
diff --git a/plugins/password/localization/bs_BA.inc b/plugins/password/localization/bs_BA.inc
index 3ec0d552a..c98a49d97 100644
--- a/plugins/password/localization/bs_BA.inc
+++ b/plugins/password/localization/bs_BA.inc
@@ -2,30 +2,36 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/bs_BA/labels.inc                                         |
+ | plugins/password/localization/<lang>.inc                              |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Password plugin            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Kenan Dervišević <kenan3008@gmail.com>                      |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
 
 $labels = array();
-$labels['changepasswd'] = 'Promijeni šifru';
-$labels['curpasswd'] = 'Trenutna šifra:';
-$labels['newpasswd'] = 'Nova šifra:';
-$labels['confpasswd'] = 'Potvrdite novu šifru:';
-$labels['nopassword'] = 'Molimo vas da upišete novu šifru.';
-$labels['nocurpassword'] = 'Molimo vas da upišete trenutnu šifru.';
-$labels['passwordincorrect'] = 'Trenutna šifra je netačna.';
-$labels['passwordinconsistency'] = 'Šifre se ne podudaraju, molimo vas da pokušate ponovo.';
-$labels['crypterror'] = 'Nije moguće sačuvati šifre. Nedostaje funkcija za enkripciju.';
-$labels['connecterror'] = 'Nije moguće sačuvati šifre. Greška u povezivanju.';
-$labels['internalerror'] = 'Nije moguće sačuvati novu šifru.';
-$labels['passwordshort'] = 'Šifra mora sadržavati barem $length znakova.';
-$labels['passwordweak'] = 'Šifra mora imati barem jedan broj i jedan interpunkcijski znak.';
-$labels['passwordforbidden'] = 'Šifra sadrži nedozvoljene znakove.';
+$labels['changepasswd']  = 'Promijeni šifru';
+$labels['curpasswd']  = 'Trenutna šifra:';
+$labels['newpasswd']  = 'Nova šifra:';
+$labels['confpasswd']  = 'Potvrdite novu šifru:';
+
+$messages = array();
+$messages['nopassword'] = 'Molimo vas da upišete novu šifru.';
+$messages['nocurpassword'] = 'Molimo vas da upišete trenutnu šifru.';
+$messages['passwordincorrect'] = 'Trenutna šifra je netačna.';
+$messages['passwordinconsistency'] = 'Šifre se ne podudaraju, molimo vas da pokušate ponovo.';
+$messages['crypterror'] = 'Nije moguće sačuvati šifre. Nedostaje funkcija za enkripciju.';
+$messages['connecterror'] = 'Nije moguće sačuvati šifre. Greška u povezivanju.';
+$messages['internalerror'] = 'Nije moguće sačuvati novu šifru.';
+$messages['passwordshort'] = 'Šifra mora sadržavati barem $length znakova.';
+$messages['passwordweak'] = 'Šifra mora imati barem jedan broj i jedan interpunkcijski znak.';
+$messages['passwordforbidden'] = 'Šifra sadrži nedozvoljene znakove.';
 
+?>
diff --git a/plugins/password/localization/ca_ES.inc b/plugins/password/localization/ca_ES.inc
index 8832f3f6d..95f5df833 100644
--- a/plugins/password/localization/ca_ES.inc
+++ b/plugins/password/localization/ca_ES.inc
@@ -2,30 +2,36 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ca_ES/labels.inc                                         |
+ | plugins/password/localization/<lang>.inc                              |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Password plugin            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Jordi Sanfeliu <jordi@fibranet.cat>                           |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
 
 $labels = array();
-$labels['changepasswd'] = 'Canvia la contrasenya';
-$labels['curpasswd'] = 'Contrasenya actual:';
-$labels['newpasswd'] = 'Nova contrasenya:';
-$labels['confpasswd'] = 'Confirmeu la nova contrasenya:';
-$labels['nopassword'] = 'Si us plau, introduïu la nova contrasenya.';
-$labels['nocurpassword'] = 'Si us plau, introduïu la contrasenya actual.';
-$labels['passwordincorrect'] = 'Contrasenya actual incorrecta.';
-$labels['passwordinconsistency'] = 'La contrasenya nova no coincideix, torneu-ho a provar.';
-$labels['crypterror'] = 'No es pot desar la nova contrasenya. No existeix la funció d\'encriptació.';
-$labels['connecterror'] = 'No es pot desar la nova contrasenya. Error de connexió.';
-$labels['internalerror'] = 'No es pot desar la nova contrasenya.';
-$labels['passwordshort'] = 'La nova contrasenya ha de tenir com a mínim $length caràcters de llarg.';
-$labels['passwordweak'] = 'La nova contrasenya ha d\'incloure com a mínim un nombre i un caràcter de puntuació.';
-$labels['passwordforbidden'] = 'La contrasenya conté caràcters no permesos.';
+$labels['changepasswd']  = 'Canvia la contrasenya';
+$labels['curpasswd']  = 'Contrasenya actual:';
+$labels['newpasswd']  = 'Nova contrasenya:';
+$labels['confpasswd']  = 'Confirmeu la nova contrasenya:';
+
+$messages = array();
+$messages['nopassword'] = 'Si us plau, introduïu la nova contrasenya.';
+$messages['nocurpassword'] = 'Si us plau, introduïu la contrasenya actual.';
+$messages['passwordincorrect'] = 'Contrasenya actual incorrecta.';
+$messages['passwordinconsistency'] = 'La contrasenya nova no coincideix, torneu-ho a provar.';
+$messages['crypterror'] = 'No es pot desar la nova contrasenya. No existeix la funció d\'encriptació.';
+$messages['connecterror'] = 'No es pot desar la nova contrasenya. Error de connexió.';
+$messages['internalerror'] = 'No es pot desar la nova contrasenya.';
+$messages['passwordshort'] = 'La nova contrasenya ha de tenir com a mínim $length caràcters de llarg.';
+$messages['passwordweak'] = 'La nova contrasenya ha d\'incloure com a mínim un nombre i un caràcter de puntuació.';
+$messages['passwordforbidden'] = 'La contrasenya conté caràcters no permesos.';
 
+?>
diff --git a/plugins/password/localization/cs_CZ.inc b/plugins/password/localization/cs_CZ.inc
index 2ed792376..857961c61 100644
--- a/plugins/password/localization/cs_CZ.inc
+++ b/plugins/password/localization/cs_CZ.inc
@@ -2,30 +2,36 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/cs_CZ/labels.inc                                         |
+ | plugins/password/localization/<lang>.inc                              |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Password plugin            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
 
 $labels = array();
-$labels['changepasswd'] = 'Změna hesla';
-$labels['curpasswd'] = 'Aktuální heslo:';
-$labels['newpasswd'] = 'Nové heslo:';
-$labels['confpasswd'] = 'Nové heslo (pro kontrolu):';
-$labels['nopassword'] = 'Prosím zadejte nové heslo.';
-$labels['nocurpassword'] = 'Prosím zadejte aktuální heslo.';
-$labels['passwordincorrect'] = 'Zadané aktuální heslo není správné.';
-$labels['passwordinconsistency'] = 'Zadaná hesla se neshodují. Prosím zkuste to znovu.';
-$labels['crypterror'] = 'Heslo se nepodařilo uložit. Chybí šifrovací funkce.';
-$labels['connecterror'] = 'Heslo se nepodařilo uložit. Problém s připojením.';
-$labels['internalerror'] = 'Heslo se nepodařilo uložit.';
-$labels['passwordshort'] = 'Heslo musí mít alespoň $length znaků.';
-$labels['passwordweak'] = 'Heslo musí obsahovat alespoň jedno číslo a jedno interpuknční znaménko.';
-$labels['passwordforbidden'] = 'Heslo obsahuje nepovolené znaky.';
+$labels['changepasswd']  = 'Změna hesla';
+$labels['curpasswd']  = 'Aktuální heslo:';
+$labels['newpasswd']  = 'Nové heslo:';
+$labels['confpasswd']  = 'Nové heslo (pro kontrolu):';
+
+$messages = array();
+$messages['nopassword'] = 'Prosím zadejte nové heslo.';
+$messages['nocurpassword'] = 'Prosím zadejte aktuální heslo.';
+$messages['passwordincorrect'] = 'Zadané aktuální heslo není správné.';
+$messages['passwordinconsistency'] = 'Zadaná hesla se neshodují. Prosím zkuste to znovu.';
+$messages['crypterror'] = 'Heslo se nepodařilo uložit. Chybí šifrovací funkce.';
+$messages['connecterror'] = 'Heslo se nepodařilo uložit. Problém s připojením.';
+$messages['internalerror'] = 'Heslo se nepodařilo uložit.';
+$messages['passwordshort'] = 'Heslo musí mít alespoň $length znaků.';
+$messages['passwordweak'] = 'Heslo musí obsahovat alespoň jedno číslo a jedno interpuknční znaménko.';
+$messages['passwordforbidden'] = 'Heslo obsahuje nepovolené znaky.';
 
+?>
diff --git a/plugins/password/localization/cy_GB.inc b/plugins/password/localization/cy_GB.inc
index 0cdad07d5..c43b7473b 100644
--- a/plugins/password/localization/cy_GB.inc
+++ b/plugins/password/localization/cy_GB.inc
@@ -2,30 +2,36 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/cy_GB/labels.inc                                         |
+ | plugins/password/localization/<lang>.inc                              |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Password plugin            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Dafydd Tomos                                                  |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
 
 $labels = array();
-$labels['changepasswd'] = 'Newid Cyfrinair';
-$labels['curpasswd'] = 'Cyfrinair Presennol:';
-$labels['newpasswd'] = 'Cyfrinair Newydd:';
-$labels['confpasswd'] = 'Cadarnhau Cyfrinair Newydd:';
-$labels['nopassword'] = 'Rhowch eich cyfrinair newydd.';
-$labels['nocurpassword'] = 'Rhowch eich cyfrinair presennol.';
-$labels['passwordincorrect'] = 'Roedd y cyfrinair presennol yn anghywir.';
-$labels['passwordinconsistency'] = 'Nid yw\'r cyfrineiriau yn cymharu, ceisiwch eto.';
-$labels['crypterror'] = 'Methwyd cadw\'r cyfrinair newydd. Ffwythiant amgodi ar goll.';
-$labels['connecterror'] = 'Methwyd cadw\'r cyfrinair newydd. Gwall cysylltiad.';
-$labels['internalerror'] = 'Methwyd cadw\'r cyfrinair newydd.';
-$labels['passwordshort'] = 'Rhaid i\'r cyfrinair fod o leia $length llythyren o hyd.';
-$labels['passwordweak'] = 'Rhaid i\'r cyfrinair gynnwys o leia un rhif a un cymeriad atalnodi.';
-$labels['passwordforbidden'] = 'Mae\'r cyfrinair yn cynnwys llythrennau wedi gwahardd.';
+$labels['changepasswd']  = 'Newid Cyfrinair';
+$labels['curpasswd']  = 'Cyfrinair Presennol:';
+$labels['newpasswd']  = 'Cyfrinair Newydd:';
+$labels['confpasswd']  = 'Cadarnhau Cyfrinair Newydd:';
+
+$messages = array();
+$messages['nopassword'] = 'Rhowch eich cyfrinair newydd.';
+$messages['nocurpassword'] = 'Rhowch eich cyfrinair presennol.';
+$messages['passwordincorrect'] = 'Roedd y cyfrinair presennol yn anghywir.';
+$messages['passwordinconsistency'] = 'Nid yw\'r cyfrineiriau yn cymharu, ceisiwch eto.';
+$messages['crypterror'] = 'Methwyd cadw\'r cyfrinair newydd. Ffwythiant amgodi ar goll.';
+$messages['connecterror'] = 'Methwyd cadw\'r cyfrinair newydd. Gwall cysylltiad.';
+$messages['internalerror'] = 'Methwyd cadw\'r cyfrinair newydd.';
+$messages['passwordshort'] = 'Rhaid i\'r cyfrinair fod o leia $length llythyren o hyd.';
+$messages['passwordweak'] = 'Rhaid i\'r cyfrinair gynnwys o leia un rhif a un cymeriad atalnodi.';
+$messages['passwordforbidden'] = 'Mae\'r cyfrinair yn cynnwys llythrennau wedi gwahardd.';
 
+?>
diff --git a/plugins/password/localization/da_DK.inc b/plugins/password/localization/da_DK.inc
index 8c411265d..bc8fb26df 100644
--- a/plugins/password/localization/da_DK.inc
+++ b/plugins/password/localization/da_DK.inc
@@ -2,30 +2,36 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/da_DK/labels.inc                                         |
+ | plugins/password/localization/<lang>.inc                              |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Password plugin            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Johannes Hessellund <osos@openeyes.dk>                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
 
 $labels = array();
-$labels['changepasswd'] = 'Skift adgangskode';
-$labels['curpasswd'] = 'Nuværende adgangskode:';
-$labels['newpasswd'] = 'Ny adgangskode:';
-$labels['confpasswd'] = 'Bekræft ny adgangskode:';
-$labels['nopassword'] = 'Indtast venligst en ny adgangskode.';
-$labels['nocurpassword'] = 'Indtast venligst nuværende adgangskode.';
-$labels['passwordincorrect'] = 'Nuværende adgangskode er forkert.';
-$labels['passwordinconsistency'] = 'Adgangskoderne er ikke ens, prøv igen.';
-$labels['crypterror'] = 'Kunne ikke gemme den nye adgangskode. Krypteringsfunktion mangler.';
-$labels['connecterror'] = 'Kunne ikke gemme den nye adgangskode. Fejl ved forbindelsen.';
-$labels['internalerror'] = 'Kunne ikke gemme den nye adgangskode.';
-$labels['passwordshort'] = 'Adgangskoden skal være mindst $length tegn lang.';
-$labels['passwordweak'] = 'Adgangskoden skal indeholde mindst et tal og et tegnsætningstegn (-.,)';
-$labels['passwordforbidden'] = 'Adgangskoden indeholder forbudte tegn.';
+$labels['changepasswd']  = 'Skift adgangskode';
+$labels['curpasswd']  = 'Nuværende adgangskode:';
+$labels['newpasswd']  = 'Ny adgangskode:';
+$labels['confpasswd']  = 'Bekræft ny adgangskode:';
+
+$messages = array();
+$messages['nopassword'] = 'Indtast venligst en ny adgangskode.';
+$messages['nocurpassword'] = 'Indtast venligst nuværende adgangskode.';
+$messages['passwordincorrect'] = 'Nuværende adgangskode er forkert.';
+$messages['passwordinconsistency'] = 'Adgangskoderne er ikke ens, prøv igen.';
+$messages['crypterror'] = 'Kunne ikke gemme den nye adgangskode. Krypteringsfunktion mangler.';
+$messages['connecterror'] = 'Kunne ikke gemme den nye adgangskode. Fejl ved forbindelsen.';
+$messages['internalerror'] = 'Kunne ikke gemme den nye adgangskode.';
+$messages['passwordshort'] = 'Adgangskoden skal være mindst $length tegn lang.';
+$messages['passwordweak'] = 'Adgangskoden skal indeholde mindst et tal og et tegnsætningstegn (-.,)';
+$messages['passwordforbidden'] = 'Adgangskoden indeholder forbudte tegn.';
 
+?>
diff --git a/plugins/password/localization/de_CH.inc b/plugins/password/localization/de_CH.inc
index 30a8be257..6016ffeac 100644
--- a/plugins/password/localization/de_CH.inc
+++ b/plugins/password/localization/de_CH.inc
@@ -5,7 +5,7 @@
  | plugins/password/localization/<lang>.inc                              |
  |                                                                       |
  | Localization file of the Roundcube Webmail Password plugin            |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
diff --git a/plugins/password/localization/de_DE.inc b/plugins/password/localization/de_DE.inc
index 6a188e175..2190fd39a 100644
--- a/plugins/password/localization/de_DE.inc
+++ b/plugins/password/localization/de_DE.inc
@@ -2,30 +2,36 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/de_DE/labels.inc                                         |
+ | plugins/password/localization/<lang>.inc                              |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Password plugin            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Moritz Höwer <moritzhoewermail@gmx.de>                       |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
 
 $labels = array();
-$labels['changepasswd'] = 'Kennwort ändern';
-$labels['curpasswd'] = 'Aktuelles Kennwort:';
-$labels['newpasswd'] = 'Neues Kennwort:';
-$labels['confpasswd'] = 'Neues Kennwort bestätigen:';
-$labels['nopassword'] = 'Bitte geben Sie ein neues Kennwort ein.';
-$labels['nocurpassword'] = 'Bitte geben Sie ihr aktuelles Kennwort ein.';
-$labels['passwordincorrect'] = 'Das aktuelle Kennwort ist falsch.';
-$labels['passwordinconsistency'] = 'Das neue Passwort und dessen Wiederholung stimmen nicht überein';
-$labels['crypterror'] = 'Neues Passwort nicht gespeichert: Verschlüsselungsfunktion fehlt';
-$labels['connecterror'] = 'Neues Passwort nicht gespeichert: Verbindungsfehler';
-$labels['internalerror'] = 'Neues Passwort nicht gespeichert';
-$labels['passwordshort'] = 'Passwort muss mindestens $length Zeichen lang sein.';
-$labels['passwordweak'] = 'Passwort muss mindestens eine Zahl und ein Sonderzeichen enthalten.';
-$labels['passwordforbidden'] = 'Passwort enthält unzulässige Zeichen.';
+$labels['changepasswd']  = 'Kennwort ändern';
+$labels['curpasswd']  = 'Aktuelles Kennwort:';
+$labels['newpasswd']  = 'Neues Kennwort:';
+$labels['confpasswd']  = 'Neues Kennwort bestätigen:';
+
+$messages = array();
+$messages['nopassword'] = 'Bitte geben Sie ein neues Kennwort ein.';
+$messages['nocurpassword'] = 'Bitte geben Sie ihr aktuelles Kennwort ein.';
+$messages['passwordincorrect'] = 'Das aktuelle Kennwort ist falsch.';
+$messages['passwordinconsistency'] = 'Das neue Passwort und dessen Wiederholung stimmen nicht überein';
+$messages['crypterror'] = 'Neues Passwort nicht gespeichert: Verschlüsselungsfunktion fehlt';
+$messages['connecterror'] = 'Neues Passwort nicht gespeichert: Verbindungsfehler';
+$messages['internalerror'] = 'Neues Passwort nicht gespeichert';
+$messages['passwordshort'] = 'Passwort muss mindestens $length Zeichen lang sein.';
+$messages['passwordweak'] = 'Passwort muss mindestens eine Zahl und ein Sonderzeichen enthalten.';
+$messages['passwordforbidden'] = 'Passwort enthält unzulässige Zeichen.';
 
+?>
diff --git a/plugins/password/localization/en_GB.inc b/plugins/password/localization/en_GB.inc
index 57f0d83e9..d7d192280 100644
--- a/plugins/password/localization/en_GB.inc
+++ b/plugins/password/localization/en_GB.inc
@@ -2,30 +2,36 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/en_GB/labels.inc                                         |
+ | plugins/password/localization/<lang>.inc                              |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Password plugin            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Kevin Beynon                                                  |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
 
 $labels = array();
-$labels['changepasswd'] = 'Change Password';
-$labels['curpasswd'] = 'Current Password:';
-$labels['newpasswd'] = 'New Password:';
-$labels['confpasswd'] = 'Confirm New Password:';
-$labels['nopassword'] = 'Please enter a new password.';
-$labels['nocurpassword'] = 'Please enter the current password.';
-$labels['passwordincorrect'] = 'Current password is incorrect.';
-$labels['passwordinconsistency'] = 'Passwords do not match.  Please try again.';
-$labels['crypterror'] = 'New password could not be saved.  The encryption function is missing.';
-$labels['connecterror'] = 'New password could not be saved.  There is a connection error.';
-$labels['internalerror'] = 'New password could not be saved.';
-$labels['passwordshort'] = 'Password must be at least $length characters long.';
-$labels['passwordweak'] = 'Password must include at least one number and one symbol.';
-$labels['passwordforbidden'] = 'Password contains forbidden characters.';
+$labels['changepasswd']  = 'Change Password';
+$labels['curpasswd']  = 'Current Password:';
+$labels['newpasswd']  = 'New Password:';
+$labels['confpasswd']  = 'Confirm New Password:';
+
+$messages = array();
+$messages['nopassword'] = 'Please enter a new password.';
+$messages['nocurpassword'] = 'Please enter the current password.';
+$messages['passwordincorrect'] = 'Current password is incorrect.';
+$messages['passwordinconsistency'] = 'Passwords do not match.  Please try again.';
+$messages['crypterror'] = 'New password could not be saved.  The encryption function is missing.';
+$messages['connecterror'] = 'New password could not be saved.  There is a connection error.';
+$messages['internalerror'] = 'New password could not be saved.';
+$messages['passwordshort'] = 'Password must be at least $length characters long.';
+$messages['passwordweak'] = 'Password must include at least one number and one symbol.';
+$messages['passwordforbidden'] = 'Password contains forbidden characters.';
 
+?>
diff --git a/plugins/password/localization/en_US.inc b/plugins/password/localization/en_US.inc
index dd57c1318..a4c077fe5 100644
--- a/plugins/password/localization/en_US.inc
+++ b/plugins/password/localization/en_US.inc
@@ -5,7 +5,7 @@
  | plugins/password/localization/<lang>.inc                              |
  |                                                                       |
  | Localization file of the Roundcube Webmail Password plugin            |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
diff --git a/plugins/password/localization/eo.inc b/plugins/password/localization/eo.inc
index 4c218bb13..f99004c63 100644
--- a/plugins/password/localization/eo.inc
+++ b/plugins/password/localization/eo.inc
@@ -2,30 +2,36 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/eo/labels.inc                                         |
+ | plugins/password/localization/<lang>.inc                              |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Password plugin            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Michael Moroni <michael.moroni@mailoo.org>                    |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
 
 $labels = array();
-$labels['changepasswd'] = 'Ŝanĝi pasvorton';
-$labels['curpasswd'] = 'Nuna pasvorto:';
-$labels['newpasswd'] = 'Nova pasvorto:';
-$labels['confpasswd'] = 'Konfirmi novan pasvorton:';
-$labels['nopassword'] = 'Bonvole tajpu novan pasvorton.';
-$labels['nocurpassword'] = 'Bonvole tajpu nunan pasvorton.';
-$labels['passwordincorrect'] = 'Nuna pasvorto nekorekta.';
-$labels['passwordinconsistency'] = 'Pasvortoj ne kongruas, bonvole provu denove.';
-$labels['crypterror'] = 'Pasvorto ne konserveblas: funkcio de ĉifrado mankas.';
-$labels['connecterror'] = 'Pasvorto ne konserveblas: eraro de konekto.';
-$labels['internalerror'] = 'Nova pasvorto ne konserveblas.';
-$labels['passwordshort'] = 'Pasvorto longu almenaŭ $length signojn.';
-$labels['passwordweak'] = 'La pasvorto enhavu almenaŭ unu ciferon kaj unu interpunktan signon.';
-$labels['passwordforbidden'] = 'La pasvorto enhavas malpermesitajn signojn.';
+$labels['changepasswd']  = 'Ŝanĝi pasvorton';
+$labels['curpasswd']  = 'Nuna pasvorto:';
+$labels['newpasswd']  = 'Nova pasvorto:';
+$labels['confpasswd']  = 'Konfirmi novan pasvorton:';
+
+$messages = array();
+$messages['nopassword'] = 'Bonvole tajpu novan pasvorton.';
+$messages['nocurpassword'] = 'Bonvole tajpu nunan pasvorton.';
+$messages['passwordincorrect'] = 'Nuna pasvorto nekorekta.';
+$messages['passwordinconsistency'] = 'Pasvortoj ne kongruas, bonvole provu denove.';
+$messages['crypterror'] = 'Pasvorto ne konserveblas: funkcio de ĉifrado mankas.';
+$messages['connecterror'] = 'Pasvorto ne konserveblas: eraro de konekto.';
+$messages['internalerror'] = 'Nova pasvorto ne konserveblas.';
+$messages['passwordshort'] = 'Pasvorto longu almenaŭ $length signojn.';
+$messages['passwordweak'] = 'La pasvorto enhavu almenaŭ unu ciferon kaj unu interpunktan signon.';
+$messages['passwordforbidden'] = 'La pasvorto enhavas malpermesitajn signojn.';
 
+?>
diff --git a/plugins/password/localization/es_AR.inc b/plugins/password/localization/es_AR.inc
index d8c5ad336..8edc8feae 100644
--- a/plugins/password/localization/es_AR.inc
+++ b/plugins/password/localization/es_AR.inc
@@ -2,30 +2,36 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/es_AR/labels.inc                                         |
+ | plugins/password/localization/<lang>.inc                              |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Password plugin            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
 
 $labels = array();
-$labels['changepasswd'] = 'Cambiar Contraseña';
-$labels['curpasswd'] = 'Contraseña Actual:';
-$labels['newpasswd'] = 'Contraseña Nueva:';
-$labels['confpasswd'] = 'Confirmar Contraseña:';
-$labels['nopassword'] = 'Por favor introduce una nueva contraseña.';
-$labels['nocurpassword'] = 'Por favor introduce la contraseña actual.';
-$labels['passwordincorrect'] = 'Contraseña actual incorrecta.';
-$labels['passwordinconsistency'] = 'Las contraseñas no coinciden, por favor inténtalo de nuevo.';
-$labels['crypterror'] = 'No se pudo guardar la contraseña nueva. Falta la función de cifrado.';
-$labels['connecterror'] = 'No se pudo guardar la contraseña nueva. Error de conexión';
-$labels['internalerror'] = 'No se pudo guardar la contraseña nueva.';
-$labels['passwordshort'] = 'Tu contraseña debe tener una longitud mínima de $length.';
-$labels['passwordweak'] = 'Tu nueva contraseña debe incluir al menos un número y un signo de puntuación.';
-$labels['passwordforbidden'] = 'La contraseña contiene caracteres inválidos.';
+$labels['changepasswd']  = 'Cambiar Contraseña';
+$labels['curpasswd']  = 'Contraseña Actual:';
+$labels['newpasswd']  = 'Contraseña Nueva:';
+$labels['confpasswd']  = 'Confirmar Contraseña:';
+
+$messages = array();
+$messages['nopassword'] = 'Por favor introduce una nueva contraseña.';
+$messages['nocurpassword'] = 'Por favor introduce la contraseña actual.';
+$messages['passwordincorrect'] = 'Contraseña actual incorrecta.';
+$messages['passwordinconsistency'] = 'Las contraseñas no coinciden, por favor inténtalo de nuevo.';
+$messages['crypterror'] = 'No se pudo guardar la contraseña nueva. Falta la función de cifrado.';
+$messages['connecterror'] = 'No se pudo guardar la contraseña nueva. Error de conexión';
+$messages['internalerror'] = 'No se pudo guardar la contraseña nueva.';
+$messages['passwordshort'] = 'Tu contraseña debe tener una longitud mínima de $length.';
+$messages['passwordweak'] = 'Tu nueva contraseña debe incluir al menos un número y un signo de puntuación.';
+$messages['passwordforbidden'] = 'La contraseña contiene caracteres inválidos.';
 
+?>
diff --git a/plugins/password/localization/es_ES.inc b/plugins/password/localization/es_ES.inc
index f61e25e99..336666eb5 100644
--- a/plugins/password/localization/es_ES.inc
+++ b/plugins/password/localization/es_ES.inc
@@ -2,30 +2,36 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/es_ES/labels.inc                                         |
+ | plugins/password/localization/<lang>.inc                              |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Password plugin            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
 
 $labels = array();
-$labels['changepasswd'] = 'Cambiar contraseña';
-$labels['curpasswd'] = 'Contraseña actual:';
-$labels['newpasswd'] = 'Contraseña nueva:';
-$labels['confpasswd'] = 'Confirmar contraseña:';
-$labels['nopassword'] = 'Por favor introduzca una contraseña nueva.';
-$labels['nocurpassword'] = 'Por favor introduzca la contraseña actual.';
-$labels['passwordincorrect'] = 'La contraseña actual es incorrecta.';
-$labels['passwordinconsistency'] = 'Las contraseñas no coinciden. Por favor, inténtelo de nuevo.';
-$labels['crypterror'] = 'No se pudo guardar la contraseña nueva. Falta la función de cifrado.';
-$labels['connecterror'] = 'No se pudo guardar la contraseña nueva. Error de conexión';
-$labels['internalerror'] = 'No se pudo guardar la contraseña nueva.';
-$labels['passwordshort'] = 'La contraseña debe tener por lo menos $length caracteres.';
-$labels['passwordweak'] = 'La contraseña debe incluir al menos un número y un signo de puntuación.';
-$labels['passwordforbidden'] = 'La contraseña introducida contiene caracteres no permitidos.';
+$labels['changepasswd']  = 'Cambiar contraseña';
+$labels['curpasswd']  = 'Contraseña actual:';
+$labels['newpasswd']  = 'Contraseña nueva:';
+$labels['confpasswd']  = 'Confirmar contraseña:';
+
+$messages = array();
+$messages['nopassword'] = 'Por favor introduzca una contraseña nueva.';
+$messages['nocurpassword'] = 'Por favor introduzca la contraseña actual.';
+$messages['passwordincorrect'] = 'La contraseña actual es incorrecta.';
+$messages['passwordinconsistency'] = 'Las contraseñas no coinciden. Por favor, inténtelo de nuevo.';
+$messages['crypterror'] = 'No se pudo guardar la contraseña nueva. Falta la función de cifrado.';
+$messages['connecterror'] = 'No se pudo guardar la contraseña nueva. Error de conexión.';
+$messages['internalerror'] = 'No se pudo guardar la contraseña nueva.';
+$messages['passwordshort'] = 'La contraseña debe tener por lo menos $length caracteres.';
+$messages['passwordweak'] = 'La contraseña debe incluir al menos un número y un signo de puntuación.';
+$messages['passwordforbidden'] = 'La contraseña introducida contiene caracteres no permitidos.';
 
+?>
diff --git a/plugins/password/localization/et_EE.inc b/plugins/password/localization/et_EE.inc
index 2d71b94d6..b93d32540 100644
--- a/plugins/password/localization/et_EE.inc
+++ b/plugins/password/localization/et_EE.inc
@@ -2,30 +2,36 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/et_EE/labels.inc                                         |
+ | plugins/password/localization/<lang>.inc                              |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Password plugin            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: yllar                                                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
 
 $labels = array();
-$labels['changepasswd'] = 'Muuda parooli';
-$labels['curpasswd'] = 'Vana parool:';
-$labels['newpasswd'] = 'Uus parool:';
-$labels['confpasswd'] = 'Uus parool uuesti:';
-$labels['nopassword'] = 'Palun sisesta uus parool.';
-$labels['nocurpassword'] = 'Palun sisesta vana parool.';
-$labels['passwordincorrect'] = 'Vana parool on vale.';
-$labels['passwordinconsistency'] = 'Paroolid ei kattu, palun proovi uuesti.';
-$labels['crypterror'] = 'Serveris ei ole parooli krüpteerimiseks vajalikku funktsiooni.';
-$labels['connecterror'] = 'Parooli salvestamine nurjus. Ühenduse tõrge.';
-$labels['internalerror'] = 'Uue parooli andmebaasi salvestamine nurjus.';
-$labels['passwordshort'] = 'Parool peab olema vähemalt $length märki pikk.';
-$labels['passwordweak'] = 'Parool peab sisaldama vähemalt üht numbrit ja märki.';
-$labels['passwordforbidden'] = 'Parool sisaldab keelatud märki.';
+$labels['changepasswd']  = 'Muuda parooli';
+$labels['curpasswd']  = 'Vana parool:';
+$labels['newpasswd']  = 'Uus parool:';
+$labels['confpasswd']  = 'Uus parool uuesti:';
+
+$messages = array();
+$messages['nopassword'] = 'Palun sisesta uus parool.';
+$messages['nocurpassword'] = 'Palun sisesta vana parool.';
+$messages['passwordincorrect'] = 'Vana parool on vale.';
+$messages['passwordinconsistency'] = 'Paroolid ei kattu, palun proovi uuesti.';
+$messages['crypterror'] = 'Serveris ei ole parooli krüpteerimiseks vajalikku funktsiooni.';
+$messages['connecterror'] = 'Parooli salvestamine nurjus. Ühenduse tõrge.';
+$messages['internalerror'] = 'Uue parooli andmebaasi salvestamine nurjus.';
+$messages['passwordshort'] = 'Parool peab olema vähemalt $length märki pikk.';
+$messages['passwordweak'] = 'Parool peab sisaldama vähemalt üht numbrit ja märki.';
+$messages['passwordforbidden'] = 'Parool sisaldab keelatud märki.';
 
+?>
diff --git a/plugins/password/localization/fa_IR.inc b/plugins/password/localization/fa_IR.inc
index 185ac83c5..2cf126689 100644
--- a/plugins/password/localization/fa_IR.inc
+++ b/plugins/password/localization/fa_IR.inc
@@ -2,30 +2,36 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/fa_IR/labels.inc                                         |
+ | plugins/password/localization/<lang>.inc                              |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Password plugin            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Hamid <abbaszadeh.h@gmail.com>                                |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
 
 $labels = array();
-$labels['changepasswd'] = 'تغییر رمزعبور';
-$labels['curpasswd'] = 'رمزعبور فعلی';
-$labels['newpasswd'] = 'رمزعبور جدید';
-$labels['confpasswd'] = 'تایید رمزعبور جدید';
-$labels['nopassword'] = 'رمزعبور جدید را وارد نمایید';
-$labels['nocurpassword'] = 'رمزعبور فعلی را وارد نمایید';
-$labels['passwordincorrect'] = 'رمزعبور فعلی اشتباه است';
-$labels['passwordinconsistency'] = 'رمزعبورها با هم مطابقت ندارند، دوباره سعی نمایید.';
-$labels['crypterror'] = 'رمزعبور جدید نمی‌توانست ذخیره شود. نبودن تابع رمزگذاری.';
-$labels['connecterror'] = 'رمزعبور جدید نمی‌توانست ذخیره شود. خطای ارتباط.';
-$labels['internalerror'] = 'رمزعبور جدید ذخیره نشد';
-$labels['passwordshort'] = 'رمزعبور باید حداقل $length کاراکتر طول داشته باشد.';
-$labels['passwordweak'] = 'رمزعبور باید شامل حداقل یک عدد و یک کاراکتر نشانه‌ای باشد.';
-$labels['passwordforbidden'] = 'رمزعبور شما کاراکترهای غیرمجاز است.';
+$labels['changepasswd']  = 'تغییر گذرواژه';
+$labels['curpasswd']  = 'گذرواژه فعلی';
+$labels['newpasswd']  = 'گذرواژه جدید';
+$labels['confpasswd']  = 'تایید گذرواژه جدید';
+
+$messages = array();
+$messages['nopassword'] = 'گذرواژه جدید را وارد نمایید';
+$messages['nocurpassword'] = 'گذرواژه فعلی را وارد نمایید';
+$messages['passwordincorrect'] = 'گذرواژه فعلی اشتباه است';
+$messages['passwordinconsistency'] = 'گذرواژه‌ها با هم مطابقت ندارند، دوباره سعی نمایید.';
+$messages['crypterror'] = 'گذرواژه جدید نمی‌توانست ذخیره شود. نبودن تابع رمزگذاری.';
+$messages['connecterror'] = 'گذرواژه جدید نمی‌توانست ذخیره شود. خطای ارتباط.';
+$messages['internalerror'] = 'گذرواژه جدید ذخیره نشد';
+$messages['passwordshort'] = 'گذرواژه باید حداقل $length کاراکتر طول داشته باشد.';
+$messages['passwordweak'] = 'گذرواژه باید شامل حداقل یک عدد و یک کاراکتر نشانه‌ای باشد.';
+$messages['passwordforbidden'] = 'گذرواژه شما کاراکترهای غیرمجاز است.';
 
+?>
diff --git a/plugins/password/localization/fi_FI.inc b/plugins/password/localization/fi_FI.inc
index 5e4608017..2098cf6c3 100644
--- a/plugins/password/localization/fi_FI.inc
+++ b/plugins/password/localization/fi_FI.inc
@@ -2,30 +2,36 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/fi_FI/labels.inc                                         |
+ | plugins/password/localization/<lang>.inc                              |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Password plugin            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Jiri Grönroos                                                |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
 
 $labels = array();
-$labels['changepasswd'] = 'Vaihda salasana';
-$labels['curpasswd'] = 'Nykyinen salasana:';
-$labels['newpasswd'] = 'Uusi salasana:';
-$labels['confpasswd'] = 'Uusi salasana uudestaan:';
-$labels['nopassword'] = 'Syötä uusi salasana.';
-$labels['nocurpassword'] = 'Syötä nykyinen salasana.';
-$labels['passwordincorrect'] = 'Syöttämäsi nykyinen salasana on väärin.';
-$labels['passwordinconsistency'] = 'Syöttämäsi salasanat eivät täsmää, yritä uudelleen.';
-$labels['crypterror'] = 'Salasanaa ei voitu vaihtaa. Kryptausfunktio puuttuu.';
-$labels['connecterror'] = 'Salasanaa ei voitu vaihtaa. Yhteysongelma.';
-$labels['internalerror'] = 'Salasanaa ei voitu vaihtaa.';
-$labels['passwordshort'] = 'Salasanan täytyy olla vähintään $length merkkiä pitkä.';
-$labels['passwordweak'] = 'Salasanan täytyy sisältää vähintään yksi numero ja yksi välimerkki.';
-$labels['passwordforbidden'] = 'Salasana sisältää kiellettyjä merkkejä.';
+$labels['changepasswd']  = 'Vaihda salasana';
+$labels['curpasswd']  = 'Nykyinen salasana:';
+$labels['newpasswd']  = 'Uusi salasana:';
+$labels['confpasswd']  = 'Vahvista uusi salasana:';
+
+$messages = array();
+$messages['nopassword'] = 'Syötä uusi salasana.';
+$messages['nocurpassword'] = 'Syötä nykyinen salasana.';
+$messages['passwordincorrect'] = 'Nykyinen salasana on väärin.';
+$messages['passwordinconsistency'] = 'Salasanat eivät täsmää, yritä uudelleen.';
+$messages['crypterror'] = 'Uuden salasanan tallennus epäonnistui. Kryptausfunktio puuttuu.';
+$messages['connecterror'] = 'Uuden salasanan tallennus epäonnistui. Yhteysongelma.';
+$messages['internalerror'] = 'Uuden salasanan tallennus epäonnistui.';
+$messages['passwordshort'] = 'Salasanassa täytyy olla vähintään $length merkkiä.';
+$messages['passwordweak'] = 'Salasanan täytyy sisältää vähintään yksi numero ja yksi välimerkki.';
+$messages['passwordforbidden'] = 'Salasana sisältää virheellisiä merkkejä.';
 
+?>
diff --git a/plugins/password/localization/fr_FR.inc b/plugins/password/localization/fr_FR.inc
index f90c32b3c..66b43784e 100644
--- a/plugins/password/localization/fr_FR.inc
+++ b/plugins/password/localization/fr_FR.inc
@@ -2,30 +2,36 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/fr_FR/labels.inc                                         |
+ | plugins/password/localization/<lang>.inc                              |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Password plugin            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Nicolas Delvaux                                               |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
 
 $labels = array();
-$labels['changepasswd'] = 'Changer le mot de passe';
-$labels['curpasswd'] = 'Mot de passe actuel:';
-$labels['newpasswd'] = 'Nouveau mot de passe:';
-$labels['confpasswd'] = 'Confirmez le nouveau mot de passe:';
-$labels['nopassword'] = 'Veuillez saisir le nouveau mot de passe.';
-$labels['nocurpassword'] = 'Veuillez saisir le mot de passe actuel.';
-$labels['passwordincorrect'] = 'Mot de passe actuel incorrect.';
-$labels['passwordinconsistency'] = 'Les nouveaux mots de passe ne correspondent pas, veuillez réessayer.';
-$labels['crypterror'] = 'Impossible d\'enregistrer le nouveau mot de passe. Fonction de cryptage manquante.';
-$labels['connecterror'] = 'Impossible d\'enregistrer le nouveau mot de passe. Erreur de connexion au serveur.';
-$labels['internalerror'] = 'Impossible d\'enregistrer le nouveau mot de passe.';
-$labels['passwordshort'] = 'Le mot de passe doit être composé d\'au moins $length caractères.';
-$labels['passwordweak'] = 'Le mot de passe doit contenir au moins un chiffre et un signe de ponctuation.';
-$labels['passwordforbidden'] = 'Le mot de passe contient des caractères interdits.';
+$labels['changepasswd']  = 'Changer le mot de passe';
+$labels['curpasswd']  = 'Mot de passe actuel:';
+$labels['newpasswd']  = 'Nouveau mot de passe:';
+$labels['confpasswd']  = 'Confirmez le nouveau mot de passe:';
+
+$messages = array();
+$messages['nopassword'] = 'Veuillez saisir le nouveau mot de passe.';
+$messages['nocurpassword'] = 'Veuillez saisir le mot de passe actuel.';
+$messages['passwordincorrect'] = 'Mot de passe actuel incorrect.';
+$messages['passwordinconsistency'] = 'Les nouveaux mots de passe ne correspondent pas, veuillez réessayer.';
+$messages['crypterror'] = 'Impossible d\'enregistrer le nouveau mot de passe. Fonction de cryptage manquante.';
+$messages['connecterror'] = 'Impossible d\'enregistrer le nouveau mot de passe. Erreur de connexion au serveur.';
+$messages['internalerror'] = 'Impossible d\'enregistrer le nouveau mot de passe.';
+$messages['passwordshort'] = 'Le mot de passe doit être composé d\'au moins $length caractères.';
+$messages['passwordweak'] = 'Le mot de passe doit contenir au moins un chiffre et un signe de ponctuation.';
+$messages['passwordforbidden'] = 'Le mot de passe contient des caractères interdits.';
 
+?>
diff --git a/plugins/password/localization/gl_ES.inc b/plugins/password/localization/gl_ES.inc
index 90c940e59..245d1c634 100644
--- a/plugins/password/localization/gl_ES.inc
+++ b/plugins/password/localization/gl_ES.inc
@@ -2,30 +2,36 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/gl_ES/labels.inc                                         |
+ | plugins/password/localization/<lang>.inc                              |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Password plugin            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
 
 $labels = array();
-$labels['changepasswd'] = 'Cambiar contrasinal';
-$labels['curpasswd'] = 'Contrasinal actual:';
-$labels['newpasswd'] = 'Contrasinal novo:';
-$labels['confpasswd'] = 'Confirmar contrasinal:';
-$labels['nopassword'] = 'Por favor, introduza un contrasinal novo.';
-$labels['nocurpassword'] = 'Por favor, introduza o contrasinal actual.';
-$labels['passwordincorrect'] = 'O contrasinal actual é incorrecto.';
-$labels['passwordinconsistency'] = 'Os contrasinals non coinciden. Por favor, inténteo de novo.';
-$labels['crypterror'] = 'Non foi posible gardar o contrasinal novo. Falta a función de cifrado.';
-$labels['connecterror'] = 'Non foi posible gardar o contrasinal novo. Erro de conexión';
-$labels['internalerror'] = 'Non foi posible gardar o contrasinal novo.';
-$labels['passwordshort'] = 'O contrasinal debe ter polo menos $length caracteres.';
-$labels['passwordweak'] = 'O contrasinal debe incluir polo menos un número e un signo de puntuación.';
-$labels['passwordforbidden'] = 'O contrasinal contén caracteres non permitidos.';
+$labels['changepasswd']  = 'Cambiar contrasinal';
+$labels['curpasswd']  = 'Contrasinal actual:';
+$labels['newpasswd']  = 'Contrasinal novo:';
+$labels['confpasswd']  = 'Confirmar contrasinal:';
+
+$messages = array();
+$messages['nopassword'] = 'Por favor, introduza un contrasinal novo.';
+$messages['nocurpassword'] = 'Por favor, introduza o contrasinal actual.';
+$messages['passwordincorrect'] = 'O contrasinal actual é incorrecto.';
+$messages['passwordinconsistency'] = 'Os contrasinals non coinciden. Por favor, inténteo de novo.';
+$messages['crypterror'] = 'Non foi posible gardar o contrasinal novo. Falta a función de cifrado.';
+$messages['connecterror'] = 'Non foi posible gardar o contrasinal novo. Erro de conexión';
+$messages['internalerror'] = 'Non foi posible gardar o contrasinal novo.';
+$messages['passwordshort'] = 'O contrasinal debe ter polo menos $length caracteres.';
+$messages['passwordweak'] = 'O contrasinal debe incluir polo menos un número e un signo de puntuación.';
+$messages['passwordforbidden'] = 'O contrasinal contén caracteres non permitidos.';
 
+?>
diff --git a/plugins/password/localization/he_IL.inc b/plugins/password/localization/he_IL.inc
index 143e2c5af..005a8e9d8 100644
--- a/plugins/password/localization/he_IL.inc
+++ b/plugins/password/localization/he_IL.inc
@@ -2,30 +2,36 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/he_IL/labels.inc                                         |
+ | plugins/password/localization/<lang>.inc                              |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Password plugin            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Moshe Leibovitch <moish@mln.co.il>                            |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
 
 $labels = array();
-$labels['changepasswd'] = 'שינוי סיסמה';
-$labels['curpasswd'] = 'סיסמה נוכחית:';
-$labels['newpasswd'] = 'סיסמה חדשה:';
-$labels['confpasswd'] = 'אימות הסיסמה החדשה:';
-$labels['nopassword'] = 'נא להקליד סיסמה חדשה';
-$labels['nocurpassword'] = 'נא להקיש הסיסמה הנוכחית';
-$labels['passwordincorrect'] = 'הוקשה סיסמה נוכחית שגויה';
-$labels['passwordinconsistency'] = 'הסיסמאות שהוקשו אינן תואמות, נא לנסות שנית.';
-$labels['crypterror'] = 'לא נשמרה הסיסמה החדשה. חסר מנגנון הצפנה.';
-$labels['connecterror'] = 'לא נשמרה הסיסמה החדשה. שגיאת תקשורת.';
-$labels['internalerror'] = 'לא ניתן לשמור על הסיסמה החדשה.';
-$labels['passwordshort'] = 'הסיסמה צריכה להיות לפחות בעלת $length תווים';
-$labels['passwordweak'] = 'הסיסמה חייבת לכלול לפחות סיפרה אחת ולפחות סימן פיסוק אחד.';
-$labels['passwordforbidden'] = 'הסיסמה מכילה תווים אסורים.';
+$labels['changepasswd']  = 'שינוי סיסמה';
+$labels['curpasswd']  = 'סיסמה נוכחית:';
+$labels['newpasswd']  = 'סיסמה חדשה:';
+$labels['confpasswd']  = 'אימות הסיסמה החדשה:';
+
+$messages = array();
+$messages['nopassword'] = 'נא להקליד סיסמה חדשה';
+$messages['nocurpassword'] = 'נא להקיש הסיסמה הנוכחית';
+$messages['passwordincorrect'] = 'הוקשה סיסמה נוכחית שגויה';
+$messages['passwordinconsistency'] = 'הסיסמאות שהוקשו אינן תואמות, נא לנסות שנית.';
+$messages['crypterror'] = 'לא נשמרה הסיסמה החדשה. חסר מנגנון הצפנה.';
+$messages['connecterror'] = 'לא נשמרה הסיסמה החדשה. שגיאת תקשורת.';
+$messages['internalerror'] = 'לא ניתן לשמור על הסיסמה החדשה.';
+$messages['passwordshort'] = 'הסיסמה צריכה להיות לפחות בעלת $length תווים';
+$messages['passwordweak'] = 'הסיסמה חייבת לכלול לפחות סיפרה אחת ולפחות סימן פיסוק אחד.';
+$messages['passwordforbidden'] = 'הסיסמה מכילה תווים אסורים.';
 
+?>
diff --git a/plugins/password/localization/hr_HR.inc b/plugins/password/localization/hr_HR.inc
index ece203d3c..f97f5a44c 100644
--- a/plugins/password/localization/hr_HR.inc
+++ b/plugins/password/localization/hr_HR.inc
@@ -2,30 +2,36 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/hr_HR/labels.inc                                         |
+ | plugins/password/localization/<lang>.inc                              |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Password plugin            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
 
 $labels = array();
-$labels['changepasswd'] = 'Promijeni zaporku';
-$labels['curpasswd'] = 'Važeća zaporka:';
-$labels['newpasswd'] = 'Nova zaporka:';
-$labels['confpasswd'] = 'Potvrda nove zaporke:';
-$labels['nopassword'] = 'Molimo unesite novu zaporku.';
-$labels['nocurpassword'] = 'Molimo unesite trenutnu zaporku.';
-$labels['passwordincorrect'] = 'Trenutna zaporka je nevažeća.';
-$labels['passwordinconsistency'] = 'Zaporke su različite, pokušajte ponovo.';
-$labels['crypterror'] = 'Nemoguće promijeniti zaporku. Nedostaje enkripcijska funkcija.';
-$labels['connecterror'] = 'Nemoguće promijeniti zaporku. Greška prilikom spajanja.';
-$labels['internalerror'] = 'Nemoguće promijeniti zaporku.';
-$labels['passwordshort'] = 'Zaporka mora sadržavati barem $length znakova.';
-$labels['passwordweak'] = 'Zaporka mora sadržavati barem jedanu znamenku i jedan interpunkcijski znak.';
-$labels['passwordforbidden'] = 'Zaporka sadrži nedozvoljene znakove.';
+$labels['changepasswd']  = 'Promijeni zaporku';
+$labels['curpasswd']  = 'Važeća zaporka:';
+$labels['newpasswd']  = 'Nova zaporka:';
+$labels['confpasswd']  = 'Potvrda nove zaporke:';
+
+$messages = array();
+$messages['nopassword'] = 'Molimo unesite novu zaporku.';
+$messages['nocurpassword'] = 'Molimo unesite trenutnu zaporku.';
+$messages['passwordincorrect'] = 'Trenutna zaporka je nevažeća.';
+$messages['passwordinconsistency'] = 'Zaporke su različite, pokušajte ponovo.';
+$messages['crypterror'] = 'Nemoguće promijeniti zaporku. Nedostaje enkripcijska funkcija.';
+$messages['connecterror'] = 'Nemoguće promijeniti zaporku. Greška prilikom spajanja.';
+$messages['internalerror'] = 'Nemoguće promijeniti zaporku.';
+$messages['passwordshort'] = 'Zaporka mora sadržavati barem $length znakova.';
+$messages['passwordweak'] = 'Zaporka mora sadržavati barem jedanu znamenku i jedan interpunkcijski znak.';
+$messages['passwordforbidden'] = 'Zaporka sadrži nedozvoljene znakove.';
 
+?>
diff --git a/plugins/password/localization/hu_HU.inc b/plugins/password/localization/hu_HU.inc
index 3fb9a93d6..6b6077115 100644
--- a/plugins/password/localization/hu_HU.inc
+++ b/plugins/password/localization/hu_HU.inc
@@ -2,30 +2,36 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/hu_HU/labels.inc                                         |
+ | plugins/password/localization/<lang>.inc                              |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Password plugin            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: bela                                                          |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
 
 $labels = array();
-$labels['changepasswd'] = 'Jelszó módosítás';
-$labels['curpasswd'] = 'Jelenlegi jelszó:';
-$labels['newpasswd'] = 'Új jelszó:';
-$labels['confpasswd'] = 'Új jelszó mégegyszer:';
-$labels['nopassword'] = 'Kérjük adja meg az új jelszót.';
-$labels['nocurpassword'] = 'Kérjük adja meg a jelenlegi jelszót.';
-$labels['passwordincorrect'] = 'Érvénytelen a jelenlegi jelszó.';
-$labels['passwordinconsistency'] = 'A beírt jelszavak nem azonosak. Próbálja újra.';
-$labels['crypterror'] = 'Hiba történt a kérés feldolgozása során.';
-$labels['connecterror'] = 'Az új jelszó mentése nem sikerült. Hiba a kapcsolatban';
-$labels['internalerror'] = 'Hiba történt a kérés feldolgozása során.';
-$labels['passwordshort'] = 'A jelszónak legalább $length karakter hosszunak kell lennie.';
-$labels['passwordweak'] = 'A jelszónak mindenképpen kell tartalmaznia egy számot és egy írásjelet.';
-$labels['passwordforbidden'] = 'A jelszó tiltott karaktert is tartalmaz.';
+$labels['changepasswd']  = 'Jelszó módosítás';
+$labels['curpasswd']  = 'Jelenlegi jelszó:';
+$labels['newpasswd']  = 'Új jelszó:';
+$labels['confpasswd']  = 'Új jelszó mégegyszer:';
+
+$messages = array();
+$messages['nopassword'] = 'Kérjük adja meg az új jelszót.';
+$messages['nocurpassword'] = 'Kérjük adja meg a jelenlegi jelszót.';
+$messages['passwordincorrect'] = 'Érvénytelen a jelenlegi jelszó.';
+$messages['passwordinconsistency'] = 'A beírt jelszavak nem azonosak. Próbálja újra.';
+$messages['crypterror'] = 'Hiba történt a kérés feldolgozása során.';
+$messages['connecterror'] = 'Az új jelszó mentése nem sikerült. Hiba a kapcsolatban';
+$messages['internalerror'] = 'Hiba történt a kérés feldolgozása során.';
+$messages['passwordshort'] = 'A jelszónak legalább $length karakter hosszunak kell lennie.';
+$messages['passwordweak'] = 'A jelszónak mindenképpen kell tartalmaznia egy számot és egy írásjelet.';
+$messages['passwordforbidden'] = 'A jelszó tiltott karaktert is tartalmaz.';
 
+?>
diff --git a/plugins/password/localization/hy_AM.inc b/plugins/password/localization/hy_AM.inc
index 7d6ea3df7..b30f31894 100644
--- a/plugins/password/localization/hy_AM.inc
+++ b/plugins/password/localization/hy_AM.inc
@@ -2,30 +2,36 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/hy_AM/labels.inc                                         |
+ | plugins/password/localization/<lang>.inc                              |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Password plugin            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Vahan Yerkanian <vahan@yerkanian.com>                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
 
 $labels = array();
-$labels['changepasswd'] = 'Գաղտնաբառի փոփոխում';
-$labels['curpasswd'] = 'Առկա գաղտնաբառը`';
-$labels['newpasswd'] = 'Նոր գաղտնաբառը`';
-$labels['confpasswd'] = 'Կրկնեք նոր գաղտնաբառը`';
-$labels['nopassword'] = 'Ներմուցեք նոր գաղտնաբառը։';
-$labels['nocurpassword'] = 'Ներմուցեք առկա գաղտնաբառը։';
-$labels['passwordincorrect'] = 'Առկա գաղտնաբառը սխալ է։';
-$labels['passwordinconsistency'] = 'Նոր գաղտնաբառերը չեն համընկնում, կրկին փորձեք։';
-$labels['crypterror'] = 'Նոր գաղտնաբառի պահպանումը ձախողվեց։ Բացակայում է գաղտնագրման ֆունկցիան։';
-$labels['connecterror'] = 'Նոր գաղտնաբառի պահպանումը ձախողվեց։ Կապի սխալ։';
-$labels['internalerror'] = 'Նոր գաղտնաբառի պահպանումը ձախողվեց։';
-$labels['passwordshort'] = 'Գաղտնաբառերը պետք է լինեն առնվազն $length նիշ երկարությամբ։';
-$labels['passwordweak'] = 'Գաղտնաբառերը պետք է պարունակեն առնվազն մեկ թիվ և մեկ կետադրական նիշ։';
-$labels['passwordforbidden'] = 'Գաղտնաբառը պարունակում է արգելված նիշ։';
+$labels['changepasswd']  = 'Գաղտնաբառի փոփոխում';
+$labels['curpasswd']  = 'Առկա գաղտնաբառը`';
+$labels['newpasswd']  = 'Նոր գաղտնաբառը`';
+$labels['confpasswd']  = 'Կրկնեք նոր գաղտնաբառը`';
+
+$messages = array();
+$messages['nopassword'] = 'Ներմուցեք նոր գաղտնաբառը։';
+$messages['nocurpassword'] = 'Ներմուցեք առկա գաղտնաբառը։';
+$messages['passwordincorrect'] = 'Առկա գաղտնաբառը սխալ է։';
+$messages['passwordinconsistency'] = 'Նոր գաղտնաբառերը չեն համընկնում, կրկին փորձեք։';
+$messages['crypterror'] = 'Նոր գաղտնաբառի պահպանումը ձախողվեց։ Բացակայում է գաղտնագրման ֆունկցիան։';
+$messages['connecterror'] = 'Նոր գաղտնաբառի պահպանումը ձախողվեց։ Կապի սխալ։';
+$messages['internalerror'] = 'Նոր գաղտնաբառի պահպանումը ձախողվեց։';
+$messages['passwordshort'] = 'Գաղտնաբառերը պետք է լինեն առնվազն $length նիշ երկարությամբ։';
+$messages['passwordweak'] = 'Գաղտնաբառերը պետք է պարունակեն առնվազն մեկ թիվ և մեկ կետադրական նիշ։';
+$messages['passwordforbidden'] = 'Գաղտնաբառը պարունակում է արգելված նիշ։';
 
+?>
diff --git a/plugins/password/localization/id_ID.inc b/plugins/password/localization/id_ID.inc
index f5e8a5c30..5026de259 100644
--- a/plugins/password/localization/id_ID.inc
+++ b/plugins/password/localization/id_ID.inc
@@ -2,19 +2,36 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/id_ID/labels.inc                                         |
+ | plugins/password/localization/<lang>.inc                              |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Password plugin            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Lazlo                                                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
 
 $labels = array();
-$labels['changepasswd'] = 'Ubah Sandi';
-$labels['curpasswd'] = 'Sandi:';
-$labels['newpasswd'] = 'Sandi Baru:';
+$labels['changepasswd']  = 'Ubah Sandi';
+$labels['curpasswd']  = 'Sandi saat ini:';
+$labels['newpasswd']  = 'Sandi Baru:';
+$labels['confpasswd']  = 'Konfirmasi Sandi Baru:';
+
+$messages = array();
+$messages['nopassword'] = 'Masukkan sandi baru.';
+$messages['nocurpassword'] = 'Masukkan sandi saat ini.';
+$messages['passwordincorrect'] = 'Sandi saat ini salah.';
+$messages['passwordinconsistency'] = 'Sandi tidak cocok, harap coba lagi.';
+$messages['crypterror'] = 'Tidak dapat menyimpan sandi baru. Fungsi enkripsi tidak ditemukan.';
+$messages['connecterror'] = 'Tidak dapat menyimpan sandi baru. Koneksi error.';
+$messages['internalerror'] = 'Tidak dapat menyimpan sandi baru.';
+$messages['passwordshort'] = 'Panjang password minimal $length karakter';
+$messages['passwordweak'] = 'Sandi harus menyertakan setidaknya satu angka dan satu tanda baca.';
+$messages['passwordforbidden'] = 'Sandi mengandung karakter terlarang.';
 
+?>
diff --git a/plugins/password/localization/it_IT.inc b/plugins/password/localization/it_IT.inc
index 5b2f98ad3..6ce2f7499 100644
--- a/plugins/password/localization/it_IT.inc
+++ b/plugins/password/localization/it_IT.inc
@@ -2,30 +2,36 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/it_IT/labels.inc                                         |
+ | plugins/password/localization/<lang>.inc                              |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Password plugin            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Andrea Bernini <andrea.bernini@gmail.com>                     |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
 
 $labels = array();
-$labels['changepasswd'] = 'Modifica la Password';
-$labels['curpasswd'] = 'Password corrente:';
-$labels['newpasswd'] = 'Nuova password:';
-$labels['confpasswd'] = 'Conferma la nuova Password:';
-$labels['nopassword'] = 'Per favore inserire la nuova password.';
-$labels['nocurpassword'] = 'Per favore inserire la password corrente.';
-$labels['passwordincorrect'] = 'La password corrente non è corretta.';
-$labels['passwordinconsistency'] = 'Le password non coincidono, per favore reinserire.';
-$labels['crypterror'] = 'Impossibile salvare la nuova password. Funzione di crittografia mancante.';
-$labels['connecterror'] = 'Imposibile salvare la nuova password. Errore di connessione.';
-$labels['internalerror'] = 'Impossibile salvare la nuova password.';
-$labels['passwordshort'] = 'La password deve essere lunga almeno $length caratteri.';
-$labels['passwordweak'] = 'La password deve includere almeno una cifra decimale e un simbolo di punteggiatura.';
-$labels['passwordforbidden'] = 'La password contiene caratteri proibiti.';
+$labels['changepasswd']  = 'Modifica la Password';
+$labels['curpasswd']  = 'Password corrente:';
+$labels['newpasswd']  = 'Nuova password:';
+$labels['confpasswd']  = 'Conferma la nuova Password:';
+
+$messages = array();
+$messages['nopassword'] = 'Per favore inserire la nuova password.';
+$messages['nocurpassword'] = 'Per favore inserire la password corrente.';
+$messages['passwordincorrect'] = 'La password corrente non è corretta.';
+$messages['passwordinconsistency'] = 'Le password non coincidono, per favore reinserire.';
+$messages['crypterror'] = 'Impossibile salvare la nuova password. Funzione di crittografia mancante.';
+$messages['connecterror'] = 'Imposibile salvare la nuova password. Errore di connessione.';
+$messages['internalerror'] = 'Impossibile salvare la nuova password.';
+$messages['passwordshort'] = 'La password deve essere lunga almeno $length caratteri.';
+$messages['passwordweak'] = 'La password deve includere almeno una cifra decimale e un simbolo di punteggiatura.';
+$messages['passwordforbidden'] = 'La password contiene caratteri proibiti.';
 
+?>
diff --git a/plugins/password/localization/ja_JP.inc b/plugins/password/localization/ja_JP.inc
index 32377f01f..6abea5348 100644
--- a/plugins/password/localization/ja_JP.inc
+++ b/plugins/password/localization/ja_JP.inc
@@ -2,30 +2,36 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ja_JP/labels.inc                                         |
+ | plugins/password/localization/<lang>.inc                              |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Password plugin            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Takahiro Kambe                                                |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
 
 $labels = array();
-$labels['changepasswd'] = 'パスワードの変更';
-$labels['curpasswd'] = '現在のパスワード:';
-$labels['newpasswd'] = '新しいパスワード:';
-$labels['confpasswd'] = '新しいパスワード (確認):';
-$labels['nopassword'] = '新しいパスワードを入力してください。';
-$labels['nocurpassword'] = '現在のパスワードを入力してください。';
-$labels['passwordincorrect'] = '現在のパスワードが間違っています。';
-$labels['passwordinconsistency'] = 'パスワードが一致しません。もう一度やり直してください。';
-$labels['crypterror'] = 'パスワードを保存できませんでした。暗号化関数がみあたりません。';
-$labels['connecterror'] = '新しいパスワードを保存できませんでした。接続エラーです。';
-$labels['internalerror'] = '新しいパスワードを保存できませんでした。';
-$labels['passwordshort'] = 'パスワードは少なくとも $length 文字の長さが必要です。';
-$labels['passwordweak'] = 'パスワードは少なくとも数字の 1 文字と記号の 1 文字を含んでいなければなりません。';
-$labels['passwordforbidden'] = 'パスワードに禁止された文字が含まれています。';
+$labels['changepasswd']  = 'パスワードの変更';
+$labels['curpasswd']  = '現在のパスワード:';
+$labels['newpasswd']  = '新しいパスワード:';
+$labels['confpasswd']  = '新しいパスワード (確認):';
+
+$messages = array();
+$messages['nopassword'] = '新しいパスワードを入力してください。';
+$messages['nocurpassword'] = '現在のパスワードを入力してください。';
+$messages['passwordincorrect'] = '現在のパスワードが間違っています。';
+$messages['passwordinconsistency'] = 'パスワードが一致しません。もう一度やり直してください。';
+$messages['crypterror'] = 'パスワードを保存できませんでした。暗号化関数がみあたりません。';
+$messages['connecterror'] = '新しいパスワードを保存できませんでした。接続エラーです。';
+$messages['internalerror'] = '新しいパスワードを保存できませんでした。';
+$messages['passwordshort'] = 'パスワードは少なくとも $length 文字の長さが必要です。';
+$messages['passwordweak'] = 'パスワードは少なくとも数字の 1 文字と記号の 1 文字を含んでいなければなりません。';
+$messages['passwordforbidden'] = 'パスワードに禁止された文字が含まれています。';
 
+?>
diff --git a/plugins/password/localization/ko_KR.inc b/plugins/password/localization/ko_KR.inc
index 9bbe4cc79..ec346ee00 100644
--- a/plugins/password/localization/ko_KR.inc
+++ b/plugins/password/localization/ko_KR.inc
@@ -2,30 +2,36 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ko_KR/labels.inc                                         |
+ | plugins/password/localization/<lang>.inc                              |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Password plugin            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Kim, Woohyun <woohyun.kim@gmail.com>                          |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
 
 $labels = array();
-$labels['changepasswd'] = '암호 변경';
-$labels['curpasswd'] = '현재 암호:';
-$labels['newpasswd'] = '새 암호:';
-$labels['confpasswd'] = '새로운 비밀번호 확인 :';
-$labels['nopassword'] = '새 암호를 입력하시오.';
-$labels['nocurpassword'] = '현재 사용중인 암호를 입력하세요.';
-$labels['passwordincorrect'] = '현재 사용중인 암호가 올바르지 않습니다.';
-$labels['passwordinconsistency'] = '암호가 일치하지 않습니다. 다시 시도하기 바랍니다.';
-$labels['crypterror'] = '새로운 암호를 저장할 수 없습니다. 암호화 실패.';
-$labels['connecterror'] = '새로운 암호를 저장할 수 없습니다. 연결 오류.';
-$labels['internalerror'] = '새로운 암호를 저장할 수 없습니다.';
-$labels['passwordshort'] = '암호는 적어도 $length 글자 이상이어야 합니다.';
-$labels['passwordweak'] = '암호는 적어도 숫자 하나와 특수 문자 하나를 포함하여야 합니다.';
-$labels['passwordforbidden'] = '암호가 허락되지 않은 문자들을 포함하고 있습니다.';
+$labels['changepasswd']  = '암호 변경';
+$labels['curpasswd']  = '현재 암호:';
+$labels['newpasswd']  = '새 암호:';
+$labels['confpasswd']  = '새로운 비밀번호 확인 :';
+
+$messages = array();
+$messages['nopassword'] = '새 암호를 입력하시오.';
+$messages['nocurpassword'] = '현재 사용중인 암호를 입력하세요.';
+$messages['passwordincorrect'] = '현재 사용중인 암호가 올바르지 않습니다.';
+$messages['passwordinconsistency'] = '암호가 일치하지 않습니다. 다시 시도하기 바랍니다.';
+$messages['crypterror'] = '새로운 암호를 저장할 수 없습니다. 암호화 실패.';
+$messages['connecterror'] = '새로운 암호를 저장할 수 없습니다. 연결 오류.';
+$messages['internalerror'] = '새로운 암호를 저장할 수 없습니다.';
+$messages['passwordshort'] = '암호는 적어도 $length 글자 이상이어야 합니다.';
+$messages['passwordweak'] = '암호는 적어도 숫자 하나와 특수 문자 하나를 포함하여야 합니다.';
+$messages['passwordforbidden'] = '암호가 허락되지 않은 문자들을 포함하고 있습니다.';
 
+?>
diff --git a/plugins/password/localization/ku.inc b/plugins/password/localization/ku.inc
index 8163df8e8..3bee221b6 100644
--- a/plugins/password/localization/ku.inc
+++ b/plugins/password/localization/ku.inc
@@ -2,17 +2,36 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ku/labels.inc                                         |
+ | plugins/password/localization/<lang>.inc                              |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Password plugin            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: ZirYaN <ziryan.net@gmail.com>                                 |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
 
 $labels = array();
-$labels['changepasswd'] = 'گۆڕینی ووشەی نهێنی';
+$labels['changepasswd']  = 'گۆڕینی ووشەی نهێنی';
+$labels['curpasswd']  = 'Current Password:';
+$labels['newpasswd']  = 'New Password:';
+$labels['confpasswd']  = 'Confirm New Password:';
+
+$messages = array();
+$messages['nopassword'] = 'Please input new password.';
+$messages['nocurpassword'] = 'Please input current password.';
+$messages['passwordincorrect'] = 'Current password incorrect.';
+$messages['passwordinconsistency'] = 'Passwords do not match, please try again.';
+$messages['crypterror'] = 'Could not save new password. Encryption function missing.';
+$messages['connecterror'] = 'Could not save new password. Connection error.';
+$messages['internalerror'] = 'Could not save new password.';
+$messages['passwordshort'] = 'Password must be at least $length characters long.';
+$messages['passwordweak'] = 'Password must include at least one number and one punctuation character.';
+$messages['passwordforbidden'] = 'Password contains forbidden characters.';
 
+?>
diff --git a/plugins/password/localization/lt_LT.inc b/plugins/password/localization/lt_LT.inc
index 86e7a3db0..fe512960a 100644
--- a/plugins/password/localization/lt_LT.inc
+++ b/plugins/password/localization/lt_LT.inc
@@ -2,30 +2,36 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/lt_LT/labels.inc                                         |
+ | plugins/password/localization/<lang>.inc                              |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Password plugin            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Rimas Kudelis <rq@akl.lt>                                     |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
 
 $labels = array();
-$labels['changepasswd'] = 'Slaptažodžio keitimas';
-$labels['curpasswd'] = 'Dabartinis slaptažodis:';
-$labels['newpasswd'] = 'Naujasis slaptažodis:';
-$labels['confpasswd'] = 'Pakartokite naująjį slaptažodį:';
-$labels['nopassword'] = 'Prašom įvesti naująjį slaptažodį.';
-$labels['nocurpassword'] = 'Prašom įvesti dabartinį slaptažodį.';
-$labels['passwordincorrect'] = 'Dabartinis slaptažodis neteisingas.';
-$labels['passwordinconsistency'] = 'Slaptažodžiai nesutapo. Bandykite dar kartą.';
-$labels['crypterror'] = 'Nepavyko įrašyti naujojo slaptažodžio. Trūksta šifravimo funkcijos.';
-$labels['connecterror'] = 'Nepavyko įrašyti naujojo slaptažodžio. Ryšio klaida.';
-$labels['internalerror'] = 'Nepavyko įrašyti naujojo slaptažodžio.';
-$labels['passwordshort'] = 'Slaptažodis turi būti sudarytas bent iš $length simbolių.';
-$labels['passwordweak'] = 'Slaptažodyje turi būti bent vienas skaitmuo ir vienas skyrybos ženklas.';
-$labels['passwordforbidden'] = 'Slaptažodyje rasta neleistinų simbolių.';
+$labels['changepasswd']  = 'Slaptažodžio keitimas';
+$labels['curpasswd']  = 'Dabartinis slaptažodis:';
+$labels['newpasswd']  = 'Naujasis slaptažodis:';
+$labels['confpasswd']  = 'Pakartokite naująjį slaptažodį:';
+
+$messages = array();
+$messages['nopassword'] = 'Prašom įvesti naująjį slaptažodį.';
+$messages['nocurpassword'] = 'Prašom įvesti dabartinį slaptažodį.';
+$messages['passwordincorrect'] = 'Dabartinis slaptažodis neteisingas.';
+$messages['passwordinconsistency'] = 'Slaptažodžiai nesutapo. Bandykite dar kartą.';
+$messages['crypterror'] = 'Nepavyko įrašyti naujojo slaptažodžio. Trūksta šifravimo funkcijos.';
+$messages['connecterror'] = 'Nepavyko įrašyti naujojo slaptažodžio. Ryšio klaida.';
+$messages['internalerror'] = 'Nepavyko įrašyti naujojo slaptažodžio.';
+$messages['passwordshort'] = 'Slaptažodis turi būti sudarytas bent iš $length simbolių.';
+$messages['passwordweak'] = 'Slaptažodyje turi būti bent vienas skaitmuo ir vienas skyrybos ženklas.';
+$messages['passwordforbidden'] = 'Slaptažodyje rasta neleistinų simbolių.';
 
+?>
diff --git a/plugins/password/localization/lv_LV.inc b/plugins/password/localization/lv_LV.inc
index 0dbbdba28..650d31b2c 100644
--- a/plugins/password/localization/lv_LV.inc
+++ b/plugins/password/localization/lv_LV.inc
@@ -2,29 +2,36 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/lv_LV/labels.inc                                         |
+ | plugins/password/localization/<lang>.inc                              |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Password plugin            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
 
 $labels = array();
-$labels['changepasswd'] = 'Nomainīt paroli';
-$labels['curpasswd'] = 'Pašreizējā parole:';
-$labels['newpasswd'] = 'Jaunā parole:';
-$labels['confpasswd'] = 'Vēlreiz jauno paroli:';
-$labels['nopassword'] = 'Lūdzu, ievadiet jauno paroli.';
-$labels['nocurpassword'] = 'Lūdzu, ievadiet pašreizējo paroli.';
-$labels['passwordincorrect'] = 'Pašreizējā parole nepareiza.';
-$labels['passwordinconsistency'] = 'Paroles nesakrīt. Lūdzu, ievadiet vēlreiz.';
-$labels['crypterror'] = 'Nevarēja saglabāt jauno paroli. Trūkst kriptēšanas funkcija.';
-$labels['connecterror'] = 'Nevarēja saglabāt jauno paroli. Savienojuma kļūda.';
-$labels['internalerror'] = 'Nevarēja saglabāt jauno paroli.';
-$labels['passwordshort'] = 'Jaunajai parolei jābūt vismaz $length simbola garai.';
-$labels['passwordweak'] = 'Jaunajai parolei jāsatur vismaz viens cipars un punktuācijas simbols.';
+$labels['changepasswd']  = 'Nomainīt paroli';
+$labels['curpasswd']  = 'Pašreizējā parole:';
+$labels['newpasswd']  = 'Jaunā parole:';
+$labels['confpasswd']  = 'Vēlreiz jauno paroli:';
+
+$messages = array();
+$messages['nopassword'] = 'Lūdzu, ievadiet jauno paroli.';
+$messages['nocurpassword'] = 'Lūdzu, ievadiet pašreizējo paroli.';
+$messages['passwordincorrect'] = 'Pašreizējā parole nepareiza.';
+$messages['passwordinconsistency'] = 'Paroles nesakrīt. Lūdzu, ievadiet vēlreiz.';
+$messages['crypterror'] = 'Nevarēja saglabāt jauno paroli. Trūkst kriptēšanas funkcija.';
+$messages['connecterror'] = 'Nevarēja saglabāt jauno paroli. Savienojuma kļūda.';
+$messages['internalerror'] = 'Nevarēja saglabāt jauno paroli.';
+$messages['passwordshort'] = 'Jaunajai parolei jābūt vismaz $length simbola garai.';
+$messages['passwordweak'] = 'Jaunajai parolei jāsatur vismaz viens cipars un punktuācijas simbols.';
+$messages['passwordforbidden'] = 'Password contains forbidden characters.';
 
+?>
diff --git a/plugins/password/localization/nb_NO.inc b/plugins/password/localization/nb_NO.inc
index ff148b4ed..6d8440bf3 100644
--- a/plugins/password/localization/nb_NO.inc
+++ b/plugins/password/localization/nb_NO.inc
@@ -2,30 +2,36 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/nb_NB/labels.inc                                         |
+ | plugins/password/localization/<lang>.inc                              |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Password plugin            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Fredrik Larsen <fredrik.h.larsen@gmail.com>                   |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
 
 $labels = array();
-$labels['changepasswd'] = 'Bytt passord';
-$labels['curpasswd'] = 'Nåværende passord:';
-$labels['newpasswd'] = 'Nytt passord:';
-$labels['confpasswd'] = 'Bekreft nytt passord';
-$labels['nopassword'] = 'Vennligst skriv inn nytt passord';
-$labels['nocurpassword'] = 'Vennligst skriv inn nåværende passord';
-$labels['passwordincorrect'] = 'Nåværende passord er feil.';
-$labels['passwordinconsistency'] = 'Passordene er ikke like, vennligst prøv igjen.';
-$labels['crypterror'] = 'Kunne ikke lagre nytt passord. Krypteringsfunksjonen mangler.';
-$labels['connecterror'] = 'Kunne ikke lagre nytt passord. Tilkoblingsfeil.';
-$labels['internalerror'] = 'Kunne ikke lagre nytt passord';
-$labels['passwordshort'] = 'Passordet må minimum inneholde $length tegn.';
-$labels['passwordweak'] = 'Passordet må inneholde minst ett tall og ett tegnsettingssymbol.';
-$labels['passwordforbidden'] = 'Passordet inneholder forbudte tegn.';
+$labels['changepasswd']  = 'Bytt passord';
+$labels['curpasswd']  = 'Nåværende passord:';
+$labels['newpasswd']  = 'Nytt passord:';
+$labels['confpasswd']  = 'Bekreft nytt passord';
+
+$messages = array();
+$messages['nopassword'] = 'Vennligst skriv inn nytt passord';
+$messages['nocurpassword'] = 'Vennligst skriv inn nåværende passord';
+$messages['passwordincorrect'] = 'Nåværende passord er feil.';
+$messages['passwordinconsistency'] = 'Passordene er ikke like, vennligst prøv igjen.';
+$messages['crypterror'] = 'Kunne ikke lagre nytt passord. Krypteringsfunksjonen mangler.';
+$messages['connecterror'] = 'Kunne ikke lagre nytt passord. Tilkoblingsfeil.';
+$messages['internalerror'] = 'Kunne ikke lagre nytt passord';
+$messages['passwordshort'] = 'Passordet må minimum inneholde $length tegn.';
+$messages['passwordweak'] = 'Passordet må inneholde minst ett tall og ett tegnsettingssymbol.';
+$messages['passwordforbidden'] = 'Passordet inneholder forbudte tegn.';
 
+?>
diff --git a/plugins/password/localization/nl_NL.inc b/plugins/password/localization/nl_NL.inc
index 5429cb52e..e5b634602 100644
--- a/plugins/password/localization/nl_NL.inc
+++ b/plugins/password/localization/nl_NL.inc
@@ -2,30 +2,36 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/nl_NL/labels.inc                                         |
+ | plugins/password/localization/<lang>.inc                              |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Password plugin            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Geert Wirken                                                  |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
 
 $labels = array();
-$labels['changepasswd'] = 'Wijzig Wachtwoord';
-$labels['curpasswd'] = 'Huidig Wachtwoord:';
-$labels['newpasswd'] = 'Nieuw Wachtwoord:';
-$labels['confpasswd'] = 'Bevestig Nieuw Wachtwoord:';
-$labels['nopassword'] = 'Vul een wachtwoord in.';
-$labels['nocurpassword'] = 'vul het huidige wachtwoord in.';
-$labels['passwordincorrect'] = 'Huidig wachtwoord is onjuist.';
-$labels['passwordinconsistency'] = 'Wachtwoorden komen niet overeen, probeer het opnieuw.';
-$labels['crypterror'] = 'De server mist een functie om uw wachtwoord et beveiligen.';
-$labels['connecterror'] = 'Kan het nieuwe wachtwoord niet opslaan. Verbindingsfout.';
-$labels['internalerror'] = 'Uw wachtwoord kan niet worden opgeslagen.';
-$labels['passwordshort'] = 'Het wachtwoord moet minimaal $length tekens lang zijn.';
-$labels['passwordweak'] = 'Het wachtwoord moet minimaal één nummer en één leesteken bevatten.';
-$labels['passwordforbidden'] = 'Het wachtwoord bevat tekens die niet toegestaan zijn.';
+$labels['changepasswd']  = 'Wachtwoord wijzigen';
+$labels['curpasswd']  = 'Huidig wachtwoord:';
+$labels['newpasswd']  = 'Nieuw wachtwoord:';
+$labels['confpasswd']  = 'Bevestig nieuw wachtwoord:';
+
+$messages = array();
+$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'] = '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 cijfer en één leesteken bevatten.';
+$messages['passwordforbidden'] = 'Het wachtwoord bevat tekens die niet toegestaan zijn.';
 
+?>
diff --git a/plugins/password/localization/nn_NO.inc b/plugins/password/localization/nn_NO.inc
index 13d396833..dc7c8f390 100644
--- a/plugins/password/localization/nn_NO.inc
+++ b/plugins/password/localization/nn_NO.inc
@@ -2,30 +2,36 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/nn_NN/labels.inc                                         |
+ | plugins/password/localization/<lang>.inc                              |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Password plugin            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Fredrik Larsen <fredrik.h.larsen@gmail.com>                   |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
 
 $labels = array();
-$labels['changepasswd'] = 'Bytt passord';
-$labels['curpasswd'] = 'Noverande passord:';
-$labels['newpasswd'] = 'Nytt passord:';
-$labels['confpasswd'] = 'Bekreft nytt passord';
-$labels['nopassword'] = 'Venlegast skriv inn nytt passord.';
-$labels['nocurpassword'] = 'Venlegast skriv inn noverande passord.';
-$labels['passwordincorrect'] = 'Noverande passord er feil.';
-$labels['passwordinconsistency'] = 'Passorda er ikkje like, venlegast prøv igjen.';
-$labels['crypterror'] = 'Kunne ikkje lagre nytt passord. Krypteringsfunksjonen manglar.';
-$labels['connecterror'] = 'Kunne ikkje lagre nytt passord. Tilkoblingsfeil.';
-$labels['internalerror'] = 'Kunne ikkje lagre nytt passord.';
-$labels['passwordshort'] = 'Passordet må minimum innehalde $length teikn.';
-$labels['passwordweak'] = 'Passordet må innehalde minst eitt tal og eitt skilleteikn.';
-$labels['passwordforbidden'] = 'Passordet inneheld forbodne teikn.';
+$labels['changepasswd']  = 'Bytt passord';
+$labels['curpasswd']  = 'Noverande passord:';
+$labels['newpasswd']  = 'Nytt passord:';
+$labels['confpasswd']  = 'Bekreft nytt passord';
+
+$messages = array();
+$messages['nopassword'] = 'Venlegast skriv inn nytt passord.';
+$messages['nocurpassword'] = 'Venlegast skriv inn noverande passord.';
+$messages['passwordincorrect'] = 'Noverande passord er feil.';
+$messages['passwordinconsistency'] = 'Passorda er ikkje like, venlegast prøv igjen.';
+$messages['crypterror'] = 'Kunne ikkje lagre nytt passord. Krypteringsfunksjonen manglar.';
+$messages['connecterror'] = 'Kunne ikkje lagre nytt passord. Tilkoblingsfeil.';
+$messages['internalerror'] = 'Kunne ikkje lagre nytt passord.';
+$messages['passwordshort'] = 'Passordet må minimum innehalde $length teikn.';
+$messages['passwordweak'] = 'Passordet må innehalde minst eitt tal og eitt skilleteikn.';
+$messages['passwordforbidden'] = 'Passordet inneheld forbodne teikn.';
 
+?>
diff --git a/plugins/password/localization/pl_PL.inc b/plugins/password/localization/pl_PL.inc
index 6edbf3fb1..f4bce1792 100644
--- a/plugins/password/localization/pl_PL.inc
+++ b/plugins/password/localization/pl_PL.inc
@@ -2,30 +2,36 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/pl_PL/labels.inc                                         |
+ | plugins/password/localization/<lang>.inc                              |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Password plugin            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
 
 $labels = array();
-$labels['changepasswd'] = 'Zmiana hasła';
-$labels['curpasswd'] = 'Aktualne hasło:';
-$labels['newpasswd'] = 'Nowe hasło:';
-$labels['confpasswd'] = 'Potwierdź hasło:';
-$labels['nopassword'] = 'Wprowadź nowe hasło.';
-$labels['nocurpassword'] = 'Wprowadź aktualne hasło.';
-$labels['passwordincorrect'] = 'Błędne aktualne hasło, spróbuj ponownie.';
-$labels['passwordinconsistency'] = 'Hasła nie pasują, spróbuj ponownie.';
-$labels['crypterror'] = 'Nie udało się zapisać nowego hasła. Brak funkcji kodującej.';
-$labels['connecterror'] = 'Nie udało się zapisać nowego hasła. Błąd połączenia.';
-$labels['internalerror'] = 'Nie udało się zapisać nowego hasła.';
-$labels['passwordshort'] = 'Hasło musi posiadać co najmniej $length znaków.';
-$labels['passwordweak'] = 'Hasło musi zawierać co najmniej jedną cyfrę i znak interpunkcyjny.';
-$labels['passwordforbidden'] = 'Hasło zawiera niedozwolone znaki.';
+$labels['changepasswd']  = 'Zmiana hasła';
+$labels['curpasswd']  = 'Aktualne hasło:';
+$labels['newpasswd']  = 'Nowe hasło:';
+$labels['confpasswd']  = 'Potwierdź hasło:';
+
+$messages = array();
+$messages['nopassword'] = 'Wprowadź nowe hasło.';
+$messages['nocurpassword'] = 'Wprowadź aktualne hasło.';
+$messages['passwordincorrect'] = 'Błędne aktualne hasło, spróbuj ponownie.';
+$messages['passwordinconsistency'] = 'Hasła nie pasują, spróbuj ponownie.';
+$messages['crypterror'] = 'Nie udało się zapisać nowego hasła. Brak funkcji kodującej.';
+$messages['connecterror'] = 'Nie udało się zapisać nowego hasła. Błąd połączenia.';
+$messages['internalerror'] = 'Nie udało się zapisać nowego hasła.';
+$messages['passwordshort'] = 'Hasło musi posiadać co najmniej $length znaków.';
+$messages['passwordweak'] = 'Hasło musi zawierać co najmniej jedną cyfrę i znak interpunkcyjny.';
+$messages['passwordforbidden'] = 'Hasło zawiera niedozwolone znaki.';
 
+?>
diff --git a/plugins/password/localization/pt_BR.inc b/plugins/password/localization/pt_BR.inc
index cd6b19902..f6f6ced01 100644
--- a/plugins/password/localization/pt_BR.inc
+++ b/plugins/password/localization/pt_BR.inc
@@ -2,30 +2,36 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/pt_BR/labels.inc                                         |
+ | plugins/password/localization/<lang>.inc                              |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Password plugin            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
 
 $labels = array();
-$labels['changepasswd'] = 'Alterar senha';
-$labels['curpasswd'] = 'Senha atual:';
-$labels['newpasswd'] = 'Nova senha:';
-$labels['confpasswd'] = 'Confirmar nova senha:';
-$labels['nopassword'] = 'Por favor, informe a nova senha.';
-$labels['nocurpassword'] = 'Por favor, informe a senha atual.';
-$labels['passwordincorrect'] = 'Senha atual incorreta.';
-$labels['passwordinconsistency'] = 'Senhas não combinam, por favor tente novamente.';
-$labels['crypterror'] = 'Não foi possível gravar a nova senha. Função de criptografia ausente.';
-$labels['connecterror'] = 'Não foi possível gravar a nova senha. Erro de conexão.';
-$labels['internalerror'] = 'Não foi possível gravar a nova senha.';
-$labels['passwordshort'] = 'A senha precisa ter ao menos $length caracteres.';
-$labels['passwordweak'] = 'A senha precisa conter ao menos um número e um caractere de pontuação.';
-$labels['passwordforbidden'] = 'A senha contém caracteres proibidos.';
+$labels['changepasswd']  = 'Alterar senha';
+$labels['curpasswd']  = 'Senha atual:';
+$labels['newpasswd']  = 'Nova senha:';
+$labels['confpasswd']  = 'Confirmar nova senha:';
+
+$messages = array();
+$messages['nopassword'] = 'Por favor, informe a nova senha.';
+$messages['nocurpassword'] = 'Por favor, informe a senha atual.';
+$messages['passwordincorrect'] = 'Senha atual incorreta.';
+$messages['passwordinconsistency'] = 'Senhas não combinam, por favor tente novamente.';
+$messages['crypterror'] = 'Não foi possível gravar a nova senha. Função de criptografia ausente.';
+$messages['connecterror'] = 'Não foi possível gravar a nova senha. Erro de conexão.';
+$messages['internalerror'] = 'Não foi possível gravar a nova senha.';
+$messages['passwordshort'] = 'A senha precisa ter ao menos $length caracteres.';
+$messages['passwordweak'] = 'A senha precisa conter ao menos um número e um caractere de pontuação.';
+$messages['passwordforbidden'] = 'A senha contém caracteres proibidos.';
 
+?>
diff --git a/plugins/password/localization/pt_PT.inc b/plugins/password/localization/pt_PT.inc
index 004e9b207..faad112ea 100644
--- a/plugins/password/localization/pt_PT.inc
+++ b/plugins/password/localization/pt_PT.inc
@@ -2,30 +2,36 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/pt_PT/labels.inc                                         |
+ | plugins/password/localization/<lang>.inc                              |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Password plugin            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: David                                                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
 
 $labels = array();
-$labels['changepasswd'] = 'Alterar password';
-$labels['curpasswd'] = 'Password atual:';
-$labels['newpasswd'] = 'Nova password:';
-$labels['confpasswd'] = 'Confirmar password:';
-$labels['nopassword'] = 'Introduza a nova password.';
-$labels['nocurpassword'] = 'Introduza a password actual.';
-$labels['passwordincorrect'] = 'Password actual errada.';
-$labels['passwordinconsistency'] = 'Password\'s não combinam, tente novamente..';
-$labels['crypterror'] = 'Não foi possível gravar a nova password. Função de criptografica inexistente.';
-$labels['connecterror'] = 'Não foi possível gravar a nova password. Erro de ligação.';
-$labels['internalerror'] = 'Não foi possível gravar a nova password.';
-$labels['passwordshort'] = 'A palavra-passe deve ter pelo menos $length caracteres';
-$labels['passwordweak'] = 'A palavra-passe deve incluir pelo menos um numero e um sinal de pontuação.';
-$labels['passwordforbidden'] = 'A palavra-passe contém caracteres não suportados.';
+$labels['changepasswd']  = 'Alterar password';
+$labels['curpasswd']  = 'Password atual:';
+$labels['newpasswd']  = 'Nova password:';
+$labels['confpasswd']  = 'Confirmar password:';
+
+$messages = array();
+$messages['nopassword'] = 'Introduza a nova password.';
+$messages['nocurpassword'] = 'Introduza a password actual.';
+$messages['passwordincorrect'] = 'Password actual errada.';
+$messages['passwordinconsistency'] = 'Password\'s não combinam, tente novamente..';
+$messages['crypterror'] = 'Não foi possível gravar a nova password. Função de criptografica inexistente.';
+$messages['connecterror'] = 'Não foi possível gravar a nova password. Erro de ligação.';
+$messages['internalerror'] = 'Não foi possível gravar a nova password.';
+$messages['passwordshort'] = 'A palavra-passe deve ter pelo menos $length caracteres';
+$messages['passwordweak'] = 'A palavra-passe deve incluir pelo menos um numero e um sinal de pontuação.';
+$messages['passwordforbidden'] = 'A palavra-passe contém caracteres não suportados.';
 
+?>
diff --git a/plugins/password/localization/ro_RO.inc b/plugins/password/localization/ro_RO.inc
index 61aa0aacb..7406efb9a 100644
--- a/plugins/password/localization/ro_RO.inc
+++ b/plugins/password/localization/ro_RO.inc
@@ -2,30 +2,36 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ro_RO/labels.inc                                         |
+ | plugins/password/localization/<lang>.inc                              |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Password plugin            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Raduta Alex <raduta.alex@gmail.com>                           |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
 
 $labels = array();
-$labels['changepasswd'] = 'Schimbați parola';
-$labels['curpasswd'] = 'Parola curentă:';
-$labels['newpasswd'] = 'Parola nouă:';
-$labels['confpasswd'] = 'Confirmați parola nouă:';
-$labels['nopassword'] = 'Te rog să introduci noua parolă.';
-$labels['nocurpassword'] = 'Te rog să introduci parola curentă';
-$labels['passwordincorrect'] = 'Parola curentă este incorectă.';
-$labels['passwordinconsistency'] = 'Parolele nu se potrivesc, vă rugăm să mai încercați';
-$labels['crypterror'] = 'Nu am reușit să salvez noua parolă. Lipsa funcției de criptare.';
-$labels['connecterror'] = 'Nu am reușit să salvez noua parolă. Eroare connexiune.';
-$labels['internalerror'] = 'Nu am reușit să salvez noua parolă.';
-$labels['passwordshort'] = 'Parola trebuie să aibă $length caractere.';
-$labels['passwordweak'] = 'Parola trebuie să conțina cel puțin un număr si un semn de punctuație';
-$labels['passwordforbidden'] = 'Parola conține caractere nepermise.';
+$labels['changepasswd']  = 'Schimbați parola';
+$labels['curpasswd']  = 'Parola curentă:';
+$labels['newpasswd']  = 'Parola nouă:';
+$labels['confpasswd']  = 'Confirmați parola nouă:';
+
+$messages = array();
+$messages['nopassword'] = 'Te rog să introduci noua parolă.';
+$messages['nocurpassword'] = 'Te rog să introduci parola curentă';
+$messages['passwordincorrect'] = 'Parola curentă este incorectă.';
+$messages['passwordinconsistency'] = 'Parolele nu se potrivesc, vă rugăm să mai încercați';
+$messages['crypterror'] = 'Nu am reușit să salvez noua parolă. Lipsa funcției de criptare.';
+$messages['connecterror'] = 'Nu am reușit să salvez noua parolă. Eroare connexiune.';
+$messages['internalerror'] = 'Nu am reușit să salvez noua parolă.';
+$messages['passwordshort'] = 'Parola trebuie să aibă $length caractere.';
+$messages['passwordweak'] = 'Parola trebuie să conțina cel puțin un număr si un semn de punctuație';
+$messages['passwordforbidden'] = 'Parola conține caractere nepermise.';
 
+?>
diff --git a/plugins/password/localization/ru_RU.inc b/plugins/password/localization/ru_RU.inc
index e21f82020..79fbfedf6 100644
--- a/plugins/password/localization/ru_RU.inc
+++ b/plugins/password/localization/ru_RU.inc
@@ -2,30 +2,36 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ru_RU/labels.inc                                         |
+ | plugins/password/localization/<lang>.inc                              |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Password plugin            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
 
 $labels = array();
-$labels['changepasswd'] = 'Изменить пароль';
-$labels['curpasswd'] = 'Текущий пароль:';
-$labels['newpasswd'] = 'Новый пароль:';
-$labels['confpasswd'] = 'Подтвердите новый пароль:';
-$labels['nopassword'] = 'Пожалуйста, введите новый пароль.';
-$labels['nocurpassword'] = 'Пожалуйста, введите текущий пароль.';
-$labels['passwordincorrect'] = 'Текущий пароль неверен.';
-$labels['passwordinconsistency'] = 'Пароли не совпадают, попробуйте, пожалуйста, ещё.';
-$labels['crypterror'] = 'Не могу сохранить новый пароль. Отсутствует криптографическая функция.';
-$labels['connecterror'] = 'Не могу сохранить новый пароль. Ошибка соединения.';
-$labels['internalerror'] = 'Не могу сохранить новый пароль.';
-$labels['passwordshort'] = 'Пароль должен быть длиной как минимум $length символов.';
-$labels['passwordweak'] = 'Пароль должен включать в себя как минимум одну цифру и один знак пунктуации.';
-$labels['passwordforbidden'] = 'Пароль содержит недопустимые символы.';
+$labels['changepasswd']  = 'Изменить пароль';
+$labels['curpasswd']  = 'Текущий пароль:';
+$labels['newpasswd']  = 'Новый пароль:';
+$labels['confpasswd']  = 'Подтвердите новый пароль:';
+
+$messages = array();
+$messages['nopassword'] = 'Пожалуйста, введите новый пароль.';
+$messages['nocurpassword'] = 'Пожалуйста, введите текущий пароль.';
+$messages['passwordincorrect'] = 'Текущий пароль неверен.';
+$messages['passwordinconsistency'] = 'Пароли не совпадают, попробуйте, пожалуйста, ещё.';
+$messages['crypterror'] = 'Не могу сохранить новый пароль. Отсутствует криптографическая функция.';
+$messages['connecterror'] = 'Не могу сохранить новый пароль. Ошибка соединения.';
+$messages['internalerror'] = 'Не могу сохранить новый пароль.';
+$messages['passwordshort'] = 'Пароль должен быть длиной как минимум $length символов.';
+$messages['passwordweak'] = 'Пароль должен включать в себя как минимум одну цифру и один знак пунктуации.';
+$messages['passwordforbidden'] = 'Пароль содержит недопустимые символы.';
 
+?>
diff --git a/plugins/password/localization/sk_SK.inc b/plugins/password/localization/sk_SK.inc
index 9767cb443..4098cb685 100644
--- a/plugins/password/localization/sk_SK.inc
+++ b/plugins/password/localization/sk_SK.inc
@@ -2,30 +2,36 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/sk_SK/labels.inc                                         |
+ | plugins/password/localization/<lang>.inc                              |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Password plugin            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
 
 $labels = array();
-$labels['changepasswd'] = 'Zmeniť heslo';
-$labels['curpasswd'] = 'Súčasné heslo:';
-$labels['newpasswd'] = 'Nové heslo:';
-$labels['confpasswd'] = 'Potvrď nové heslo:';
-$labels['nopassword'] = 'Prosím zadaj nové heslo.';
-$labels['nocurpassword'] = 'Prosím zadaj súčasné heslo.';
-$labels['passwordincorrect'] = 'Súčasné heslo je nesprávne.';
-$labels['passwordinconsistency'] = 'Heslá nie sú rovnaké, skús znova.';
-$labels['crypterror'] = 'Nemôžem uložiť nové heslo. Chýba šifrovacia funkcia.';
-$labels['connecterror'] = 'Nemôžem uložiť nové heslo. Chyba spojenia.';
-$labels['internalerror'] = 'Nemôžem uložiť nové heslo.';
-$labels['passwordshort'] = 'Heslo musí mať najmenej $length znakov.';
-$labels['passwordweak'] = 'Heslo musí obsahovať aspoň jedno číslo a jedno interpunkčné znamienko.';
-$labels['passwordforbidden'] = 'Heslo obsahuje nepovolené znaky.';
+$labels['changepasswd']  = 'Zmeniť heslo';
+$labels['curpasswd']  = 'Súčasné heslo:';
+$labels['newpasswd']  = 'Nové heslo:';
+$labels['confpasswd']  = 'Potvrď nové heslo:';
+
+$messages = array();
+$messages['nopassword'] = 'Prosím zadaj nové heslo.';
+$messages['nocurpassword'] = 'Prosím zadaj súčasné heslo.';
+$messages['passwordincorrect'] = 'Súčasné heslo je nesprávne.';
+$messages['passwordinconsistency'] = 'Heslá nie sú rovnaké, skús znova.';
+$messages['crypterror'] = 'Nemôžem uložiť nové heslo. Chýba šifrovacia funkcia.';
+$messages['connecterror'] = 'Nemôžem uložiť nové heslo. Chyba spojenia.';
+$messages['internalerror'] = 'Nemôžem uložiť nové heslo.';
+$messages['passwordshort'] = 'Heslo musí mať najmenej $length znakov.';
+$messages['passwordweak'] = 'Heslo musí obsahovať aspoň jedno číslo a jedno interpunkčné znamienko.';
+$messages['passwordforbidden'] = 'Heslo obsahuje nepovolené znaky.';
 
+?>
diff --git a/plugins/password/localization/sl_SI.inc b/plugins/password/localization/sl_SI.inc
index 30525415f..27a094219 100644
--- a/plugins/password/localization/sl_SI.inc
+++ b/plugins/password/localization/sl_SI.inc
@@ -2,30 +2,36 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/sl_SI/labels.inc                                         |
+ | plugins/password/localization/<lang>.inc                              |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Password plugin            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Barbara Krasovec <barbarak@arnes.si>                          |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
 
 $labels = array();
-$labels['changepasswd'] = 'Spremeni geslo';
-$labels['curpasswd'] = 'Obstoječe geslo:';
-$labels['newpasswd'] = 'Novo geslo:';
-$labels['confpasswd'] = 'Potrdi novo geslo:';
-$labels['nopassword'] = 'Vnesite novo geslo.';
-$labels['nocurpassword'] = 'Vnesite obstoječe geslo.';
-$labels['passwordincorrect'] = 'Obstoječe geslo ni veljavno.';
-$labels['passwordinconsistency'] = 'Gesli se ne ujemata, poskusite znova.';
-$labels['crypterror'] = 'Novega gesla ni bilo mogoče shraniti. Prišlo je do napake pri šifriranju.';
-$labels['connecterror'] = 'Novega gesla ni bilo mogoče shraniti. Prišlo je do napake v povezavi.';
-$labels['internalerror'] = 'Novega gesla ni bilo mogoče shraniti.';
-$labels['passwordshort'] = 'Geslo mora vsebovati vsaj $length znakov';
-$labels['passwordweak'] = 'Geslo mora vključevati vsaj eno številko in ločilo.';
-$labels['passwordforbidden'] = 'Geslo vsebuje neveljavne znake.';
+$labels['changepasswd']  = 'Spremeni geslo';
+$labels['curpasswd']  = 'Obstoječe geslo:';
+$labels['newpasswd']  = 'Novo geslo:';
+$labels['confpasswd']  = 'Potrdi novo geslo:';
+
+$messages = array();
+$messages['nopassword'] = 'Vnesite novo geslo.';
+$messages['nocurpassword'] = 'Vnesite obstoječe geslo.';
+$messages['passwordincorrect'] = 'Obstoječe geslo ni veljavno.';
+$messages['passwordinconsistency'] = 'Gesli se ne ujemata, poskusite znova.';
+$messages['crypterror'] = 'Novega gesla ni bilo mogoče shraniti. Prišlo je do napake pri šifriranju.';
+$messages['connecterror'] = 'Novega gesla ni bilo mogoče shraniti. Prišlo je do napake v povezavi.';
+$messages['internalerror'] = 'Novega gesla ni bilo mogoče shraniti.';
+$messages['passwordshort'] = 'Geslo mora vsebovati vsaj $length znakov';
+$messages['passwordweak'] = 'Geslo mora vključevati vsaj eno številko in ločilo.';
+$messages['passwordforbidden'] = 'Geslo vsebuje neveljavne znake.';
 
+?>
diff --git a/plugins/password/localization/sr_CS.inc b/plugins/password/localization/sr_CS.inc
index 4224f492f..18361032d 100644
--- a/plugins/password/localization/sr_CS.inc
+++ b/plugins/password/localization/sr_CS.inc
@@ -2,30 +2,36 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/sr_CS/labels.inc                                         |
+ | plugins/password/localization/<lang>.inc                              |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Password plugin            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Saša Zejnilović <zejnils@gmail.com>                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
 
 $labels = array();
-$labels['changepasswd'] = 'Промијени лозинку';
-$labels['curpasswd'] = 'Тренутна лозинка:';
-$labels['newpasswd'] = 'Нова лозинка:';
-$labels['confpasswd'] = 'Поновите лозинку:';
-$labels['nopassword'] = 'Молимо унесите нову лозинку.';
-$labels['nocurpassword'] = 'Молимо унесите тренутну лозинку.';
-$labels['passwordincorrect'] = 'Тренутна лозинка је нетачна.';
-$labels['passwordinconsistency'] = 'Лозинке се не поклапају, молимо покушајте поново.';
-$labels['crypterror'] = 'Није могуће сачувати нову лозинку. Недостаје функција за кодирање.';
-$labels['connecterror'] = 'Није могуће сачувати нову лозинку. Грешка у Вези.';
-$labels['internalerror'] = 'Није могуће сачувати нову лозинку.';
-$labels['passwordshort'] = 'Лозинка мора имати најмање $lenght знакова.';
-$labels['passwordweak'] = 'Лозинка мора да садржи најмање један број и један интерпункцијски знак.';
-$labels['passwordforbidden'] = 'Лозинка садржи недозвољене знакове.';
+$labels['changepasswd']  = 'Промијени лозинку';
+$labels['curpasswd']  = 'Тренутна лозинка:';
+$labels['newpasswd']  = 'Нова лозинка:';
+$labels['confpasswd']  = 'Поновите лозинку:';
+
+$messages = array();
+$messages['nopassword'] = 'Молимо унесите нову лозинку.';
+$messages['nocurpassword'] = 'Молимо унесите тренутну лозинку.';
+$messages['passwordincorrect'] = 'Тренутна лозинка је нетачна.';
+$messages['passwordinconsistency'] = 'Лозинке се не поклапају, молимо покушајте поново.';
+$messages['crypterror'] = 'Није могуће сачувати нову лозинку. Недостаје функција за кодирање.';
+$messages['connecterror'] = 'Није могуће сачувати нову лозинку. Грешка у Вези.';
+$messages['internalerror'] = 'Није могуће сачувати нову лозинку.';
+$messages['passwordshort'] = 'Лозинка мора имати најмање $lenght знакова.';
+$messages['passwordweak'] = 'Лозинка мора да садржи најмање један број и један интерпункцијски знак.';
+$messages['passwordforbidden'] = 'Лозинка садржи недозвољене знакове.';
 
+?>
diff --git a/plugins/password/localization/sv_SE.inc b/plugins/password/localization/sv_SE.inc
index 250dc2f08..90f7b9f58 100644
--- a/plugins/password/localization/sv_SE.inc
+++ b/plugins/password/localization/sv_SE.inc
@@ -2,30 +2,36 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/sv_SE/labels.inc                                         |
+ | plugins/password/localization/<lang>.inc                              |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Password plugin            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Jonas Nasholm                                                 |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
 
 $labels = array();
-$labels['changepasswd'] = 'Ändra lösenord';
-$labels['curpasswd'] = 'Nuvarande lösenord:';
-$labels['newpasswd'] = 'Nytt lösenord:';
-$labels['confpasswd'] = 'Bekräfta nytt lösenord:';
-$labels['nopassword'] = 'Ange nytt lösenord.';
-$labels['nocurpassword'] = 'Ange nuvarande lösenord.';
-$labels['passwordincorrect'] = 'Felaktigt nuvarande lösenord.';
-$labels['passwordinconsistency'] = 'Bekräftelsen av lösenordet stämmer inte, försök igen.';
-$labels['crypterror'] = 'Lösenordet kunde inte ändras. Krypteringsfunktionen saknas.';
-$labels['connecterror'] = 'Lösenordet kunde inte ändras. Anslutningen misslyckades.';
-$labels['internalerror'] = 'Lösenordet kunde inte ändras.';
-$labels['passwordshort'] = 'Lösenordet måste vara minst $length tecken långt.';
-$labels['passwordweak'] = 'Lösenordet måste innehålla minst en siffra och ett specialtecken.';
-$labels['passwordforbidden'] = 'Lösenordet innehåller otillåtna tecken.';
+$labels['changepasswd']  = 'Ändra lösenord';
+$labels['curpasswd']  = 'Nuvarande lösenord:';
+$labels['newpasswd']  = 'Nytt lösenord:';
+$labels['confpasswd']  = 'Bekräfta nytt lösenord:';
+
+$messages = array();
+$messages['nopassword'] = 'Ange nytt lösenord.';
+$messages['nocurpassword'] = 'Ange nuvarande lösenord.';
+$messages['passwordincorrect'] = 'Felaktigt nuvarande lösenord.';
+$messages['passwordinconsistency'] = 'Bekräftelsen av lösenordet stämmer inte, försök igen.';
+$messages['crypterror'] = 'Lösenordet kunde inte ändras. Krypteringsfunktionen saknas.';
+$messages['connecterror'] = 'Lösenordet kunde inte ändras. Anslutningen misslyckades.';
+$messages['internalerror'] = 'Lösenordet kunde inte ändras.';
+$messages['passwordshort'] = 'Lösenordet måste vara minst $length tecken långt.';
+$messages['passwordweak'] = 'Lösenordet måste innehålla minst en siffra och ett specialtecken.';
+$messages['passwordforbidden'] = 'Lösenordet innehåller otillåtna tecken.';
 
+?>
diff --git a/plugins/password/localization/tr_TR.inc b/plugins/password/localization/tr_TR.inc
index a2c94c102..99133a158 100644
--- a/plugins/password/localization/tr_TR.inc
+++ b/plugins/password/localization/tr_TR.inc
@@ -2,30 +2,36 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/tr_TR/labels.inc                                         |
+ | plugins/password/localization/<lang>.inc                              |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Password plugin            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Gökdeniz Karadağ                                            |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
 
 $labels = array();
-$labels['changepasswd'] = 'Parolayı Değiştir';
-$labels['curpasswd'] = 'Şimdiki Parola:';
-$labels['newpasswd'] = 'Yeni Parola:';
-$labels['confpasswd'] = 'Yeni Parolayı Onaylayın:';
-$labels['nopassword'] = 'Lütfen yeni parolayı girin.';
-$labels['nocurpassword'] = 'Lütfen şimdiki parolayı girin.';
-$labels['passwordincorrect'] = 'Şimdiki parolayı yanlış girdiniz.';
-$labels['passwordinconsistency'] = 'Girdiğiniz parolalar uyuşmuyor. Lütfen tekrar deneyin.';
-$labels['crypterror'] = 'Yeni parola kaydedilemedi. Şifreleme fonksiyonu mevcut değil.';
-$labels['connecterror'] = 'Yeni parola kaydedilemedi. Bağlantı hatası.';
-$labels['internalerror'] = 'Yeni parola kaydedilemedi.';
-$labels['passwordshort'] = 'Parola en az $length karakterden oluşmalı.';
-$labels['passwordweak'] = 'Parola en az bir sayı ve bir noktalama işareti içermeli.';
-$labels['passwordforbidden'] = 'Parola uygunsuz karakter(ler) içeriyor.';
+$labels['changepasswd']  = 'Parolayı Değiştir';
+$labels['curpasswd']  = 'Şimdiki Parola:';
+$labels['newpasswd']  = 'Yeni Parola:';
+$labels['confpasswd']  = 'Yeni Parolayı Onaylayın:';
+
+$messages = array();
+$messages['nopassword'] = 'Lütfen yeni parolayı girin.';
+$messages['nocurpassword'] = 'Lütfen şimdiki parolayı girin.';
+$messages['passwordincorrect'] = 'Şimdiki parolayı yanlış girdiniz.';
+$messages['passwordinconsistency'] = 'Girdiğiniz parolalar uyuşmuyor. Lütfen tekrar deneyin.';
+$messages['crypterror'] = 'Yeni parola kaydedilemedi. Şifreleme fonksiyonu mevcut değil.';
+$messages['connecterror'] = 'Yeni parola kaydedilemedi. Bağlantı hatası.';
+$messages['internalerror'] = 'Yeni parola kaydedilemedi.';
+$messages['passwordshort'] = 'Parola en az $length karakterden oluşmalı.';
+$messages['passwordweak'] = 'Parola en az bir sayı ve bir noktalama işareti içermeli.';
+$messages['passwordforbidden'] = 'Parola uygunsuz karakter(ler) içeriyor.';
 
+?>
diff --git a/plugins/password/localization/vi_VN.inc b/plugins/password/localization/vi_VN.inc
index 729749316..f21d65156 100644
--- a/plugins/password/localization/vi_VN.inc
+++ b/plugins/password/localization/vi_VN.inc
@@ -2,30 +2,36 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/vi_VN/labels.inc                                         |
+ | plugins/password/localization/<lang>.inc                              |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Password plugin            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Kenny Tran <kennethanh@gmail.com>                             |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
 
 $labels = array();
-$labels['changepasswd'] = 'Thay đổi mật khẩu';
-$labels['curpasswd'] = 'Mật khẩu hiện tại';
-$labels['newpasswd'] = 'Mật khẩu mới:';
-$labels['confpasswd'] = 'Xác nhận mật khẩu mới';
-$labels['nopassword'] = 'Mời nhập mật khẩu mới';
-$labels['nocurpassword'] = 'Mời nhập mật khẩu hiện tại';
-$labels['passwordincorrect'] = 'Mật khẩu hiện thời không đúng';
-$labels['passwordinconsistency'] = 'Mật khẩu không khớp, hãy thử lại';
-$labels['crypterror'] = 'Không thể lưu mật khẩu mới. Thiếu chức năng mã hóa';
-$labels['connecterror'] = 'Không thể lưu mật mã mới. Lổi kết nối';
-$labels['internalerror'] = 'Không thể lưu mật khẩu mới';
-$labels['passwordshort'] = 'Mật khẩu phải dài ít nhất $ ký tự';
-$labels['passwordweak'] = 'Mật khẩu phải bao gồm ít nhất 1 con số và 1 ký tự dấu câu';
-$labels['passwordforbidden'] = 'Mật khẩu bao gồm ký tự không hợp lệ';
+$labels['changepasswd']  = 'Thay đổi mật khẩu';
+$labels['curpasswd']  = 'Mật khẩu hiện tại';
+$labels['newpasswd']  = 'Mật khẩu mới:';
+$labels['confpasswd']  = 'Xác nhận mật khẩu mới';
+
+$messages = array();
+$messages['nopassword'] = 'Mời nhập mật khẩu mới';
+$messages['nocurpassword'] = 'Mời nhập mật khẩu hiện tại';
+$messages['passwordincorrect'] = 'Mật khẩu hiện thời không đúng';
+$messages['passwordinconsistency'] = 'Mật khẩu không khớp, hãy thử lại';
+$messages['crypterror'] = 'Không thể lưu mật khẩu mới. Thiếu chức năng mã hóa';
+$messages['connecterror'] = 'Không thể lưu mật mã mới. Lổi kết nối';
+$messages['internalerror'] = 'Không thể lưu mật khẩu mới';
+$messages['passwordshort'] = 'Mật khẩu phải dài ít nhất $ ký tự';
+$messages['passwordweak'] = 'Mật khẩu phải bao gồm ít nhất 1 con số và 1 ký tự dấu câu';
+$messages['passwordforbidden'] = 'Mật khẩu bao gồm ký tự không hợp lệ';
 
+?>
diff --git a/plugins/password/localization/zh_CN.inc b/plugins/password/localization/zh_CN.inc
index 5e0af7cd5..5d14926f2 100644
--- a/plugins/password/localization/zh_CN.inc
+++ b/plugins/password/localization/zh_CN.inc
@@ -2,30 +2,36 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/zh_CN/labels.inc                                         |
+ | plugins/password/localization/<lang>.inc                              |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Password plugin            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Christopher Meng <cickumqt@gmail.com>                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
 
 $labels = array();
-$labels['changepasswd'] = '修改密码';
-$labels['curpasswd'] = '当前密码：';
-$labels['newpasswd'] = '新密码：';
-$labels['confpasswd'] = '确认新密码：';
-$labels['nopassword'] = '请输入新密码。';
-$labels['nocurpassword'] = '请输入正确的密码。';
-$labels['passwordincorrect'] = '当前密码不正确。';
-$labels['passwordinconsistency'] = '两次输入的密码不一致，请重试。';
-$labels['crypterror'] = '无法保存新密码，因为加密功能不可用。';
-$labels['connecterror'] = '无法保存新密码，因为连接出错。';
-$labels['internalerror'] = '无法保存新密码。';
-$labels['passwordshort'] = '密码必须至少为 $length 位。';
-$labels['passwordweak'] = '密码必须至少包含一个数字和一个标点符号。';
-$labels['passwordforbidden'] = '密码包含禁止使用的字符。';
+$labels['changepasswd']  = '修改密码';
+$labels['curpasswd']  = '当前密码：';
+$labels['newpasswd']  = '新密码：';
+$labels['confpasswd']  = '确认新密码：';
+
+$messages = array();
+$messages['nopassword'] = '请输入新密码。';
+$messages['nocurpassword'] = '请输入当前的密码。';
+$messages['passwordincorrect'] = '当前密码不正确。';
+$messages['passwordinconsistency'] = '两次输入的密码不一致，请重试。';
+$messages['crypterror'] = '无法保存新密码，缺少加密功能。';
+$messages['connecterror'] = '无法保存新密码，连接出错。';
+$messages['internalerror'] = '无法保存新密码。';
+$messages['passwordshort'] = '密码至少为 $length 位。';
+$messages['passwordweak'] = '密码必须至少包含一个数字和一个标点符号。';
+$messages['passwordforbidden'] = '密码包含禁止使用的字符。';
 
+?>
diff --git a/plugins/password/localization/zh_TW.inc b/plugins/password/localization/zh_TW.inc
index 49fa48e7f..b61e113c8 100644
--- a/plugins/password/localization/zh_TW.inc
+++ b/plugins/password/localization/zh_TW.inc
@@ -2,30 +2,36 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/zh_TW/labels.inc                                         |
+ | plugins/password/localization/<lang>.inc                              |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Password plugin            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
 */
 
 $labels = array();
-$labels['changepasswd'] = '更改密碼';
-$labels['curpasswd'] = '目前的密碼';
-$labels['newpasswd'] = '新密碼';
-$labels['confpasswd'] = '確認新密碼';
-$labels['nopassword'] = '請輸入新密碼';
-$labels['nocurpassword'] = '請輸入目前的密碼';
-$labels['passwordincorrect'] = '目前的密碼錯誤';
-$labels['passwordinconsistency'] = '密碼不相符，請重新輸入';
-$labels['crypterror'] = '無法更新密碼：無加密機制';
-$labels['connecterror'] = '無法更新密碼：連線失敗';
-$labels['internalerror'] = '無法更新密碼';
-$labels['passwordshort'] = '您的密碼至少需 $length 個字元長';
-$labels['passwordweak'] = '您的新密碼至少需含有一個數字與一個標點符號';
-$labels['passwordforbidden'] = '您的密碼含有禁用字元';
+$labels['changepasswd']  = '更改密碼';
+$labels['curpasswd']  = '目前的密碼';
+$labels['newpasswd']  = '新密碼';
+$labels['confpasswd']  = '確認新密碼';
+
+$messages = array();
+$messages['nopassword'] = '請輸入新密碼';
+$messages['nocurpassword'] = '請輸入目前的密碼';
+$messages['passwordincorrect'] = '目前的密碼錯誤';
+$messages['passwordinconsistency'] = '密碼不相符，請重新輸入';
+$messages['crypterror'] = '無法更新密碼：無加密機制';
+$messages['connecterror'] = '無法更新密碼：連線失敗';
+$messages['internalerror'] = '無法更新密碼';
+$messages['passwordshort'] = '您的密碼至少需 $length 個字元長';
+$messages['passwordweak'] = '您的新密碼至少需含有一個數字與一個標點符號';
+$messages['passwordforbidden'] = '您的密碼含有禁用字元';
 
+?>
diff --git a/plugins/password/package.xml b/plugins/password/package.xml
index 9a056dec6..81427a986 100644
--- a/plugins/password/package.xml
+++ b/plugins/password/package.xml
@@ -15,9 +15,9 @@
 		<email>alec@alec.pl</email>
 		<active>yes</active>
 	</lead>
-	<date>2012-11-15</date>
+	<date>2013-04-28</date>
 	<version>
-		<release>3.2</release>
+		<release>3.4</release>
 		<api>2.0</api>
 	</version>
 	<stability>
@@ -26,8 +26,7 @@
 	</stability>
 	<license uri="http://www.gnu.org/licenses/gpl-2.0.html">GNU GPLv2</license>
 	<notes>
-- Fix wrong (non-specific) error message on crypt or connection error (#1488808)
-- Added option to define IMAP hosts that support password changes - password_hosts
+Added password_force_save option
     </notes>
 	<contents>
 		<dir baseinstalldir="/" name="/">
@@ -347,5 +346,36 @@
 - Added Samba password (#1488364)
             </notes>
         </release>
+        <release>
+            <date>2012-11-15</date>
+            <version>
+                <release>3.2</release>
+                <api>2.0</api>
+            </version>
+            <stability>
+                <release>stable</release>
+                <api>stable</api>
+            </stability>
+            <license uri="http://www.gnu.org/licenses/gpl-2.0.html">GNU GPLv2</license>
+            <notes>
+- Fix wrong (non-specific) error message on crypt or connection error (#1488808)
+- Added option to define IMAP hosts that support password changes - password_hosts
+            </notes>
+        </release>
+        <release>
+            <date>2013-03-30</date>
+            <version>
+                <release>3.3</release>
+                <api>2.0</api>
+            </version>
+            <stability>
+                <release>stable</release>
+                <api>stable</api>
+            </stability>
+            <license uri="http://www.gnu.org/licenses/gpl-2.0.html">GNU GPLv2</license>
+            <notes>
+Added new cPanel driver - fixes localization related issues (#1487015)
+            </notes>
+        </release>
     </changelog>
 </package>
diff --git a/plugins/password/password.php b/plugins/password/password.php
index 39020a0bf..e16b4d0b9 100644
--- a/plugins/password/password.php
+++ b/plugins/password/password.php
@@ -147,7 +147,7 @@ class password extends rcube_plugin
                 $rcmail->output->command('display_message', $this->gettext('passwordweak'), 'error');
             }
             // password is the same as the old one, do nothing, return success
-            else if ($sespwd == $newpwd) {
+            else if ($sespwd == $newpwd && !$rcmail->config->get('password_force_save')) {
                 $rcmail->output->command('display_message', $this->gettext('successfullysaved'), 'confirmation');
             }
             // try to save the password
diff --git a/plugins/redundant_attachments/config.inc.php.dist b/plugins/redundant_attachments/config.inc.php.dist
index 6c317ead1..a0be3755e 100644
--- a/plugins/redundant_attachments/config.inc.php.dist
+++ b/plugins/redundant_attachments/config.inc.php.dist
@@ -6,8 +6,8 @@
 // to use memcache as a fallback when write-master is unavailable.
 $rcmail_config['redundant_attachments_memcache'] = false;
 
-// When memcache is used, attachment data expires after
-// specied TTL time in seconds (max.2592000). Default is 12 hours.
-$rcmail_config['redundant_attachments_memcache_ttl'] = 12 * 60 * 60;
+// Attachment data expires after specied TTL time in seconds (max.2592000).
+// Default is 12 hours.
+$rcmail_config['redundant_attachments_cache_ttl'] = 12 * 60 * 60;
 
 ?>
diff --git a/plugins/redundant_attachments/redundant_attachments.php b/plugins/redundant_attachments/redundant_attachments.php
index 4ebc8dad7..c0affad3c 100644
--- a/plugins/redundant_attachments/redundant_attachments.php
+++ b/plugins/redundant_attachments/redundant_attachments.php
@@ -68,13 +68,14 @@ class redundant_attachments extends filesystem_attachments
         // load configuration
         $this->load_config();
 
+        $ttl = 12 * 60 * 60; // 12 hours
+        $ttl = $rcmail->config->get('redundant_attachments_cache_ttl', $ttl);
+
         // Init SQL cache (disable cache data serialization)
-        $this->cache = $rcmail->get_cache($this->prefix, 'db', 0, false);
+        $this->cache = $rcmail->get_cache($this->prefix, 'db', $ttl, false);
 
         // Init memcache (fallback) cache
         if ($rcmail->config->get('redundant_attachments_memcache')) {
-            $ttl = 12 * 60 * 60; // 12 hours
-            $ttl = (int) $rcmail->config->get('redundant_attachments_memcache_ttl', $ttl);
             $this->mem_cache = $rcmail->get_cache($this->prefix, 'memcache', $ttl, false);
         }
 
diff --git a/plugins/squirrelmail_usercopy/squirrelmail_usercopy.php b/plugins/squirrelmail_usercopy/squirrelmail_usercopy.php
index d5d0d47ec..e882a2f37 100644
--- a/plugins/squirrelmail_usercopy/squirrelmail_usercopy.php
+++ b/plugins/squirrelmail_usercopy/squirrelmail_usercopy.php
@@ -63,7 +63,7 @@ class squirrelmail_usercopy extends rcube_plugin
 					if ($this->prefs['___sig'.$i.'___'])
 						$ident_data['signature'] = $this->prefs['___sig'.$i.'___'];
 					// insert identity
-					$identid = $rcmail->user->insert_identity($ident_data);
+					$rcmail->user->insert_identity($ident_data);
 				}
 			}
 
diff --git a/plugins/subscriptions_option/localization/bs_BA.inc b/plugins/subscriptions_option/localization/bs_BA.inc
index 3da2eaa95..404dd1dd2 100644
--- a/plugins/subscriptions_option/localization/bs_BA.inc
+++ b/plugins/subscriptions_option/localization/bs_BA.inc
@@ -2,17 +2,21 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/bs_BA/labels.inc                                         |
+ | plugins/subscriptions_option/localization/<lang>.inc                  |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Subscriptions plugin       |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Kenan Dervišević <kenan3008@gmail.com>                      |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-subscriptions_option/
 */
 
 $labels = array();
-$labels['useimapsubscriptions'] = 'Koristi IMAP pretplate';
+$labels['useimapsubscriptions']  = 'Koristi IMAP pretplate';
 
+?>
diff --git a/plugins/subscriptions_option/localization/ca_ES.inc b/plugins/subscriptions_option/localization/ca_ES.inc
index 28e67e844..959134270 100644
--- a/plugins/subscriptions_option/localization/ca_ES.inc
+++ b/plugins/subscriptions_option/localization/ca_ES.inc
@@ -2,17 +2,21 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ca_ES/labels.inc                                         |
+ | plugins/subscriptions_option/localization/<lang>.inc                  |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Subscriptions plugin       |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Jordi Sanfeliu <jordi@fibranet.cat>                           |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-subscriptions_option/
 */
 
 $labels = array();
-$labels['useimapsubscriptions'] = 'Fes servir subscripcions IMAP';
+$labels['useimapsubscriptions']  = 'Fes servir subscripcions IMAP';
 
+?>
diff --git a/plugins/subscriptions_option/localization/cs_CZ.inc b/plugins/subscriptions_option/localization/cs_CZ.inc
index 0c4142523..052255fef 100644
--- a/plugins/subscriptions_option/localization/cs_CZ.inc
+++ b/plugins/subscriptions_option/localization/cs_CZ.inc
@@ -2,17 +2,21 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/cs_CZ/labels.inc                                         |
+ | plugins/subscriptions_option/localization/<lang>.inc                  |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Subscriptions plugin       |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-subscriptions_option/
 */
 
 $labels = array();
-$labels['useimapsubscriptions'] = 'Používat odebírání IMAP složek';
+$labels['useimapsubscriptions']  = 'Používat odebírání IMAP složek';
 
+?>
diff --git a/plugins/subscriptions_option/localization/cy_GB.inc b/plugins/subscriptions_option/localization/cy_GB.inc
index 54cc72b8b..2c317de96 100644
--- a/plugins/subscriptions_option/localization/cy_GB.inc
+++ b/plugins/subscriptions_option/localization/cy_GB.inc
@@ -2,17 +2,21 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/cy_GB/labels.inc                                         |
+ | plugins/subscriptions_option/localization/<lang>.inc                  |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Subscriptions plugin       |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Dafydd Tomos                                                  |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-subscriptions_option/
 */
 
 $labels = array();
-$labels['useimapsubscriptions'] = 'Defnyddio tanysgrifiadau IMAP';
+$labels['useimapsubscriptions']  = 'Defnyddio tanysgrifiadau IMAP';
 
+?>
diff --git a/plugins/subscriptions_option/localization/da_DK.inc b/plugins/subscriptions_option/localization/da_DK.inc
index bcefdcc23..08cfdf45d 100644
--- a/plugins/subscriptions_option/localization/da_DK.inc
+++ b/plugins/subscriptions_option/localization/da_DK.inc
@@ -2,17 +2,21 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/da_DK/labels.inc                                         |
+ | plugins/subscriptions_option/localization/<lang>.inc                  |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Subscriptions plugin       |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Johannes Hessellund <osos@openeyes.dk>                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-subscriptions_option/
 */
 
 $labels = array();
-$labels['useimapsubscriptions'] = 'Brug IMAP abonnementer';
+$labels['useimapsubscriptions']  = 'Brug IMAP abonnementer';
 
+?>
diff --git a/plugins/subscriptions_option/localization/de_CH.inc b/plugins/subscriptions_option/localization/de_CH.inc
index d3a1aaca7..8d48bb4c8 100644
--- a/plugins/subscriptions_option/localization/de_CH.inc
+++ b/plugins/subscriptions_option/localization/de_CH.inc
@@ -5,7 +5,7 @@
  | plugins/subscriptions_option/localization/<lang>.inc                  |
  |                                                                       |
  | Localization file of the Roundcube Webmail Subscriptions plugin       |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
diff --git a/plugins/subscriptions_option/localization/de_DE.inc b/plugins/subscriptions_option/localization/de_DE.inc
index 25a8d4bde..8d48bb4c8 100644
--- a/plugins/subscriptions_option/localization/de_DE.inc
+++ b/plugins/subscriptions_option/localization/de_DE.inc
@@ -2,17 +2,21 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/de_DE/labels.inc                                         |
+ | plugins/subscriptions_option/localization/<lang>.inc                  |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Subscriptions plugin       |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-subscriptions_option/
 */
 
 $labels = array();
-$labels['useimapsubscriptions'] = 'Nur abonnierte Ordner anzeigen';
+$labels['useimapsubscriptions']  = 'Nur abonnierte Ordner anzeigen';
 
+?>
diff --git a/plugins/subscriptions_option/localization/en_GB.inc b/plugins/subscriptions_option/localization/en_GB.inc
index 3c88be72c..3eb18fc1d 100644
--- a/plugins/subscriptions_option/localization/en_GB.inc
+++ b/plugins/subscriptions_option/localization/en_GB.inc
@@ -2,17 +2,21 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/en_GB/labels.inc                                         |
+ | plugins/subscriptions_option/localization/<lang>.inc                  |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Subscriptions plugin       |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Aleksander Machniak <alec@alec.pl>                            |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-subscriptions_option/
 */
 
 $labels = array();
-$labels['useimapsubscriptions'] = 'Use IMAP Subscriptions';
+$labels['useimapsubscriptions']  = 'Use IMAP Subscriptions';
 
+?>
diff --git a/plugins/subscriptions_option/localization/en_US.inc b/plugins/subscriptions_option/localization/en_US.inc
index 19e1b26c7..3eb18fc1d 100644
--- a/plugins/subscriptions_option/localization/en_US.inc
+++ b/plugins/subscriptions_option/localization/en_US.inc
@@ -5,7 +5,7 @@
  | plugins/subscriptions_option/localization/<lang>.inc                  |
  |                                                                       |
  | Localization file of the Roundcube Webmail Subscriptions plugin       |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
diff --git a/plugins/subscriptions_option/localization/eo.inc b/plugins/subscriptions_option/localization/eo.inc
index 4e0a88136..9cba39b9e 100644
--- a/plugins/subscriptions_option/localization/eo.inc
+++ b/plugins/subscriptions_option/localization/eo.inc
@@ -2,17 +2,21 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/eo/labels.inc                                         |
+ | plugins/subscriptions_option/localization/<lang>.inc                  |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Subscriptions plugin       |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Michael Moroni <michael.moroni@mailoo.org>                    |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-subscriptions_option/
 */
 
 $labels = array();
-$labels['useimapsubscriptions'] = 'Uzi IMAP-abonojn';
+$labels['useimapsubscriptions']  = 'Uzi IMAP-abonojn';
 
+?>
diff --git a/plugins/subscriptions_option/localization/es_ES.inc b/plugins/subscriptions_option/localization/es_ES.inc
index dfc4c2f0a..699a60ab5 100644
--- a/plugins/subscriptions_option/localization/es_ES.inc
+++ b/plugins/subscriptions_option/localization/es_ES.inc
@@ -2,17 +2,21 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/es_ES/labels.inc                                         |
+ | plugins/subscriptions_option/localization/<lang>.inc                  |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Subscriptions plugin       |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-subscriptions_option/
 */
 
 $labels = array();
-$labels['useimapsubscriptions'] = 'Usar suscripciones IMAP';
+$labels['useimapsubscriptions']  = 'Usar suscripciones IMAP';
 
+?>
diff --git a/plugins/subscriptions_option/localization/et_EE.inc b/plugins/subscriptions_option/localization/et_EE.inc
index 11ebacc39..916911bd6 100644
--- a/plugins/subscriptions_option/localization/et_EE.inc
+++ b/plugins/subscriptions_option/localization/et_EE.inc
@@ -2,17 +2,21 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/et_EE/labels.inc                                         |
+ | plugins/subscriptions_option/localization/<lang>.inc                  |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Subscriptions plugin       |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-subscriptions_option/
 */
 
 $labels = array();
-$labels['useimapsubscriptions'] = 'Kasuta IMAP tellimusi';
+$labels['useimapsubscriptions']  = 'Kasuta IMAP tellimusi';
 
+?>
diff --git a/plugins/subscriptions_option/localization/fa_IR.inc b/plugins/subscriptions_option/localization/fa_IR.inc
index a2cdec71d..5c7cbe401 100644
--- a/plugins/subscriptions_option/localization/fa_IR.inc
+++ b/plugins/subscriptions_option/localization/fa_IR.inc
@@ -2,17 +2,21 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/fa_IR/labels.inc                                         |
+ | plugins/subscriptions_option/localization/<lang>.inc                  |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Subscriptions plugin       |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Hamid <abbaszadeh.h@gmail.com>                                |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-subscriptions_option/
 */
 
 $labels = array();
-$labels['useimapsubscriptions'] = 'استفاده از عضویت IMAP';
+$labels['useimapsubscriptions']  = 'استفاده از عضویت IMAP';
 
+?>
diff --git a/plugins/subscriptions_option/localization/fi_FI.inc b/plugins/subscriptions_option/localization/fi_FI.inc
index 196804228..54128fbcb 100644
--- a/plugins/subscriptions_option/localization/fi_FI.inc
+++ b/plugins/subscriptions_option/localization/fi_FI.inc
@@ -2,17 +2,21 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/fi_FI/labels.inc                                         |
+ | plugins/subscriptions_option/localization/<lang>.inc                  |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Subscriptions plugin       |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Jiri Grönroos                                                |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-subscriptions_option/
 */
 
 $labels = array();
-$labels['useimapsubscriptions'] = 'Käytä IMAP-tilauksia';
+$labels['useimapsubscriptions']  = 'Käytä IMAP-tilauksia';
 
+?>
diff --git a/plugins/subscriptions_option/localization/fr_FR.inc b/plugins/subscriptions_option/localization/fr_FR.inc
index fc928d8ed..2290ccfd8 100644
--- a/plugins/subscriptions_option/localization/fr_FR.inc
+++ b/plugins/subscriptions_option/localization/fr_FR.inc
@@ -2,17 +2,21 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/fr_FR/labels.inc                                         |
+ | plugins/subscriptions_option/localization/<lang>.inc                  |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Subscriptions plugin       |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Nicolas Delvaux                                               |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-subscriptions_option/
 */
 
 $labels = array();
-$labels['useimapsubscriptions'] = 'Utiliser les abonnements IMAP';
+$labels['useimapsubscriptions']  = 'Utiliser les abonnements IMAP';
 
+?>
diff --git a/plugins/subscriptions_option/localization/gl_ES.inc b/plugins/subscriptions_option/localization/gl_ES.inc
index c085c263a..bbff10c3b 100644
--- a/plugins/subscriptions_option/localization/gl_ES.inc
+++ b/plugins/subscriptions_option/localization/gl_ES.inc
@@ -2,17 +2,21 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/gl_ES/labels.inc                                         |
+ | plugins/subscriptions_option/localization/<lang>.inc                  |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Subscriptions plugin       |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-subscriptions_option/
 */
 
 $labels = array();
-$labels['useimapsubscriptions'] = 'Usar suscripcións IMAP';
+$labels['useimapsubscriptions']  = 'Usar suscripcións IMAP';
 
+?>
diff --git a/plugins/subscriptions_option/localization/he_IL.inc b/plugins/subscriptions_option/localization/he_IL.inc
index e91960a7e..3149bb759 100644
--- a/plugins/subscriptions_option/localization/he_IL.inc
+++ b/plugins/subscriptions_option/localization/he_IL.inc
@@ -2,17 +2,21 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/he_IL/labels.inc                                         |
+ | plugins/subscriptions_option/localization/<lang>.inc                  |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Subscriptions plugin       |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Moshe Leibovitch <moish@mln.co.il>                            |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-subscriptions_option/
 */
 
 $labels = array();
-$labels['useimapsubscriptions'] = 'שימוש ברישום לתיקיות IMAP';
+$labels['useimapsubscriptions']  = 'שימוש ברישום לתיקיות IMAP';
 
+?>
diff --git a/plugins/subscriptions_option/localization/hu_HU.inc b/plugins/subscriptions_option/localization/hu_HU.inc
index 767364870..9efa24559 100644
--- a/plugins/subscriptions_option/localization/hu_HU.inc
+++ b/plugins/subscriptions_option/localization/hu_HU.inc
@@ -2,17 +2,21 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/hu_HU/labels.inc                                         |
+ | plugins/subscriptions_option/localization/<lang>.inc                  |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Subscriptions plugin       |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: bela                                                          |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-subscriptions_option/
 */
 
 $labels = array();
-$labels['useimapsubscriptions'] = 'IMAP előfizetések használata.';
+$labels['useimapsubscriptions']  = 'IMAP előfizetések használata.';
 
+?>
diff --git a/plugins/subscriptions_option/localization/hy_AM.inc b/plugins/subscriptions_option/localization/hy_AM.inc
index 0769fe0a4..2c3fb5d63 100644
--- a/plugins/subscriptions_option/localization/hy_AM.inc
+++ b/plugins/subscriptions_option/localization/hy_AM.inc
@@ -2,17 +2,21 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/hy_AM/labels.inc                                         |
+ | plugins/subscriptions_option/localization/<lang>.inc                  |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Subscriptions plugin       |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Vahan Yerkanian <vahan@yerkanian.com>                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-subscriptions_option/
 */
 
 $labels = array();
-$labels['useimapsubscriptions'] = 'Օգտագործել IMAP-ի բաժանորդագրությունները';
+$labels['useimapsubscriptions']  = 'Օգտագործել IMAP-ի բաժանորդագրությունները';
 
+?>
diff --git a/plugins/subscriptions_option/localization/it_IT.inc b/plugins/subscriptions_option/localization/it_IT.inc
index f4e73c8d5..38aa6fb5d 100644
--- a/plugins/subscriptions_option/localization/it_IT.inc
+++ b/plugins/subscriptions_option/localization/it_IT.inc
@@ -2,17 +2,21 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/it_IT/labels.inc                                         |
+ | plugins/subscriptions_option/localization/<lang>.inc                  |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Subscriptions plugin       |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Andrea Bernini <andrea.bernini@gmail.com>                     |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-subscriptions_option/
 */
 
 $labels = array();
-$labels['useimapsubscriptions'] = 'Usa sottoscrizioni IMAP';
+$labels['useimapsubscriptions']  = 'Usa sottoscrizioni IMAP';
 
+?>
diff --git a/plugins/subscriptions_option/localization/ja_JP.inc b/plugins/subscriptions_option/localization/ja_JP.inc
index 206bf92a3..7daf1c473 100644
--- a/plugins/subscriptions_option/localization/ja_JP.inc
+++ b/plugins/subscriptions_option/localization/ja_JP.inc
@@ -2,17 +2,21 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ja_JP/labels.inc                                         |
+ | plugins/subscriptions_option/localization/<lang>.inc                  |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Subscriptions plugin       |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-subscriptions_option/
 */
 
 $labels = array();
-$labels['useimapsubscriptions'] = 'IMAP 購読リストを使う';
+$labels['useimapsubscriptions']  = 'IMAP 購読リストを使う';
 
+?>
diff --git a/plugins/subscriptions_option/localization/ko_KR.inc b/plugins/subscriptions_option/localization/ko_KR.inc
index c391b2f73..d399915c2 100644
--- a/plugins/subscriptions_option/localization/ko_KR.inc
+++ b/plugins/subscriptions_option/localization/ko_KR.inc
@@ -2,17 +2,21 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ko_KR/labels.inc                                         |
+ | plugins/subscriptions_option/localization/<lang>.inc                  |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Subscriptions plugin       |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Kim, Woohyun <woohyun.kim@gmail.com>                          |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-subscriptions_option/
 */
 
 $labels = array();
-$labels['useimapsubscriptions'] = 'IMAP 구독 사용';
+$labels['useimapsubscriptions']  = 'IMAP 구독 사용';
 
+?>
diff --git a/plugins/subscriptions_option/localization/lt_LT.inc b/plugins/subscriptions_option/localization/lt_LT.inc
index 30d73b8da..0612e4d63 100644
--- a/plugins/subscriptions_option/localization/lt_LT.inc
+++ b/plugins/subscriptions_option/localization/lt_LT.inc
@@ -2,17 +2,21 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/lt_LT/labels.inc                                         |
+ | plugins/subscriptions_option/localization/<lang>.inc                  |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Subscriptions plugin       |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Rimas Kudelis <rq@akl.lt>                                     |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-subscriptions_option/
 */
 
 $labels = array();
-$labels['useimapsubscriptions'] = 'Naudoti IMAP prenumeratas';
+$labels['useimapsubscriptions']  = 'Naudoti IMAP prenumeratas';
 
+?>
diff --git a/plugins/subscriptions_option/localization/nb_NO.inc b/plugins/subscriptions_option/localization/nb_NO.inc
index 1024b1a8f..c65b5cad7 100644
--- a/plugins/subscriptions_option/localization/nb_NO.inc
+++ b/plugins/subscriptions_option/localization/nb_NO.inc
@@ -2,17 +2,21 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/nb_NB/labels.inc                                         |
+ | plugins/subscriptions_option/localization/<lang>.inc                  |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Subscriptions plugin       |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Tobias V. Langhoff <spug@thespug.net>                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-subscriptions_option/
 */
 
 $labels = array();
-$labels['useimapsubscriptions'] = 'Bruk IMAP-abonnementer';
+$labels['useimapsubscriptions']  = 'Bruk IMAP-abonnementer';
 
+?>
diff --git a/plugins/subscriptions_option/localization/nl_NL.inc b/plugins/subscriptions_option/localization/nl_NL.inc
index 3664f5c18..415d55531 100644
--- a/plugins/subscriptions_option/localization/nl_NL.inc
+++ b/plugins/subscriptions_option/localization/nl_NL.inc
@@ -2,17 +2,21 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/nl_NL/labels.inc                                         |
+ | plugins/subscriptions_option/localization/<lang>.inc                  |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Subscriptions plugin       |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Geert Wirken                                                  |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-subscriptions_option/
 */
 
 $labels = array();
-$labels['useimapsubscriptions'] = 'Gebruik IMAP-abonneringen';
+$labels['useimapsubscriptions']  = 'Gebruik IMAP-abonneringen';
 
+?>
diff --git a/plugins/subscriptions_option/localization/pl_PL.inc b/plugins/subscriptions_option/localization/pl_PL.inc
index 15513d559..01f377f5b 100644
--- a/plugins/subscriptions_option/localization/pl_PL.inc
+++ b/plugins/subscriptions_option/localization/pl_PL.inc
@@ -2,17 +2,21 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/pl_PL/labels.inc                                         |
+ | plugins/subscriptions_option/localization/<lang>.inc                  |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Subscriptions plugin       |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-subscriptions_option/
 */
 
 $labels = array();
-$labels['useimapsubscriptions'] = 'Używaj subskrypcji IMAP';
+$labels['useimapsubscriptions']  = 'Używaj subskrypcji IMAP';
 
+?>
diff --git a/plugins/subscriptions_option/localization/pt_BR.inc b/plugins/subscriptions_option/localization/pt_BR.inc
index b7480db6a..aa148a7fd 100644
--- a/plugins/subscriptions_option/localization/pt_BR.inc
+++ b/plugins/subscriptions_option/localization/pt_BR.inc
@@ -2,17 +2,21 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/pt_BR/labels.inc                                         |
+ | plugins/subscriptions_option/localization/<lang>.inc                  |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Subscriptions plugin       |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Victor Benincasa <vbenincasa@gmail.com>                       |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-subscriptions_option/
 */
 
 $labels = array();
-$labels['useimapsubscriptions'] = 'Usar função de inscrição em pastas IMAP';
+$labels['useimapsubscriptions']  = 'Usar função de inscrição em pastas IMAP';
 
+?>
diff --git a/plugins/subscriptions_option/localization/pt_PT.inc b/plugins/subscriptions_option/localization/pt_PT.inc
index 13ea3a4ad..d8035200f 100644
--- a/plugins/subscriptions_option/localization/pt_PT.inc
+++ b/plugins/subscriptions_option/localization/pt_PT.inc
@@ -2,17 +2,21 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/pt_PT/labels.inc                                         |
+ | plugins/subscriptions_option/localization/<lang>.inc                  |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Subscriptions plugin       |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: David                                                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-subscriptions_option/
 */
 
 $labels = array();
-$labels['useimapsubscriptions'] = 'Use subscrições IMAP';
+$labels['useimapsubscriptions']  = 'Use subscrições IMAP';
 
+?>
diff --git a/plugins/subscriptions_option/localization/ru_RU.inc b/plugins/subscriptions_option/localization/ru_RU.inc
index 0d6b1d274..2b25783f3 100644
--- a/plugins/subscriptions_option/localization/ru_RU.inc
+++ b/plugins/subscriptions_option/localization/ru_RU.inc
@@ -2,17 +2,21 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ru_RU/labels.inc                                         |
+ | plugins/subscriptions_option/localization/<lang>.inc                  |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Subscriptions plugin       |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-subscriptions_option/
 */
 
 $labels = array();
-$labels['useimapsubscriptions'] = 'Использовать IMAP подписку';
+$labels['useimapsubscriptions']  = 'Использовать IMAP подписку';
 
+?>
diff --git a/plugins/subscriptions_option/localization/sk_SK.inc b/plugins/subscriptions_option/localization/sk_SK.inc
index 667264af2..4507e26e8 100644
--- a/plugins/subscriptions_option/localization/sk_SK.inc
+++ b/plugins/subscriptions_option/localization/sk_SK.inc
@@ -2,17 +2,21 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/sk_SK/labels.inc                                         |
+ | plugins/subscriptions_option/localization/<lang>.inc                  |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Subscriptions plugin       |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: panda                                                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-subscriptions_option/
 */
 
 $labels = array();
-$labels['useimapsubscriptions'] = 'Použi IMAP nastavenia';
+$labels['useimapsubscriptions']  = 'Použi IMAP nastavenia';
 
+?>
diff --git a/plugins/subscriptions_option/localization/sl_SI.inc b/plugins/subscriptions_option/localization/sl_SI.inc
index 3c3943482..8ef5f21e0 100644
--- a/plugins/subscriptions_option/localization/sl_SI.inc
+++ b/plugins/subscriptions_option/localization/sl_SI.inc
@@ -2,17 +2,21 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/sl_SI/labels.inc                                         |
+ | plugins/subscriptions_option/localization/<lang>.inc                  |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Subscriptions plugin       |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Barbara Krasovec <barbarak@arnes.si>                          |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-subscriptions_option/
 */
 
 $labels = array();
-$labels['useimapsubscriptions'] = 'Uporabi IMAP-naročnino';
+$labels['useimapsubscriptions']  = 'Uporabi IMAP-naročnino';
 
+?>
diff --git a/plugins/subscriptions_option/localization/sr_CS.inc b/plugins/subscriptions_option/localization/sr_CS.inc
index c582eccd5..ad84ed0e1 100644
--- a/plugins/subscriptions_option/localization/sr_CS.inc
+++ b/plugins/subscriptions_option/localization/sr_CS.inc
@@ -2,17 +2,21 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/sr_CS/labels.inc                                         |
+ | plugins/subscriptions_option/localization/<lang>.inc                  |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Subscriptions plugin       |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Saša Zejnilović <zejnils@gmail.com>                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-subscriptions_option/
 */
 
 $labels = array();
-$labels['useimapsubscriptions'] = 'Користите ИМАП Уписивање';
+$labels['useimapsubscriptions']  = 'Користите ИМАП Уписивање';
 
+?>
diff --git a/plugins/subscriptions_option/localization/sv_SE.inc b/plugins/subscriptions_option/localization/sv_SE.inc
index bf0ee581a..1a8eae123 100644
--- a/plugins/subscriptions_option/localization/sv_SE.inc
+++ b/plugins/subscriptions_option/localization/sv_SE.inc
@@ -2,17 +2,21 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/sv_SE/labels.inc                                         |
+ | plugins/subscriptions_option/localization/<lang>.inc                  |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Subscriptions plugin       |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-subscriptions_option/
 */
 
 $labels = array();
-$labels['useimapsubscriptions'] = 'Använd IMAP-prenumerationer';
+$labels['useimapsubscriptions']  = 'Använd IMAP-prenumerationer';
 
+?>
diff --git a/plugins/subscriptions_option/localization/tr_TR.inc b/plugins/subscriptions_option/localization/tr_TR.inc
index 0ebd48db3..7d69e9c0c 100644
--- a/plugins/subscriptions_option/localization/tr_TR.inc
+++ b/plugins/subscriptions_option/localization/tr_TR.inc
@@ -2,17 +2,21 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/tr_TR/labels.inc                                         |
+ | plugins/subscriptions_option/localization/<lang>.inc                  |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Subscriptions plugin       |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: ismail yenigul                                                |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-subscriptions_option/
 */
 
 $labels = array();
-$labels['useimapsubscriptions'] = 'IMAP  Aboneliklerini kullan';
+$labels['useimapsubscriptions']  = 'IMAP  Aboneliklerini kullan';
 
+?>
diff --git a/plugins/subscriptions_option/localization/vi_VN.inc b/plugins/subscriptions_option/localization/vi_VN.inc
index 31b8531ed..52e4bd676 100644
--- a/plugins/subscriptions_option/localization/vi_VN.inc
+++ b/plugins/subscriptions_option/localization/vi_VN.inc
@@ -2,17 +2,21 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/vi_VN/labels.inc                                         |
+ | plugins/subscriptions_option/localization/<lang>.inc                  |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Subscriptions plugin       |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Kenny Tran <kennethanh@gmail.com>                             |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-subscriptions_option/
 */
 
 $labels = array();
-$labels['useimapsubscriptions'] = 'Đăng ký dùng cách thức IMAP';
+$labels['useimapsubscriptions']  = 'Đăng ký dùng cách thức IMAP';
 
+?>
diff --git a/plugins/subscriptions_option/localization/zh_CN.inc b/plugins/subscriptions_option/localization/zh_CN.inc
index 817985704..3b146d7b1 100644
--- a/plugins/subscriptions_option/localization/zh_CN.inc
+++ b/plugins/subscriptions_option/localization/zh_CN.inc
@@ -2,17 +2,21 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/zh_CN/labels.inc                                         |
+ | plugins/subscriptions_option/localization/<lang>.inc                  |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Subscriptions plugin       |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Christopher Meng <cickumqt@gmail.com>                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-subscriptions_option/
 */
 
 $labels = array();
-$labels['useimapsubscriptions'] = '使用 IMAP 订阅';
+$labels['useimapsubscriptions']  = '使用 IMAP 订阅';
 
+?>
diff --git a/plugins/subscriptions_option/localization/zh_TW.inc b/plugins/subscriptions_option/localization/zh_TW.inc
index 18b4bf2b1..226be8e07 100644
--- a/plugins/subscriptions_option/localization/zh_TW.inc
+++ b/plugins/subscriptions_option/localization/zh_TW.inc
@@ -2,17 +2,21 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/zh_TW/labels.inc                                         |
+ | plugins/subscriptions_option/localization/<lang>.inc                  |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Subscriptions plugin       |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-subscriptions_option/
 */
 
 $labels = array();
-$labels['useimapsubscriptions'] = '使用IMAP訂閱';
+$labels['useimapsubscriptions']  = '使用IMAP訂閱';
 
+?>
diff --git a/plugins/userinfo/localization/ar_SA.inc b/plugins/userinfo/localization/ar_SA.inc
index 5c8cd3c96..adfa9a9a6 100644
--- a/plugins/userinfo/localization/ar_SA.inc
+++ b/plugins/userinfo/localization/ar_SA.inc
@@ -2,16 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ar_SA/labels.inc                                         |
+ | plugins/userinfo/localization/<lang>.inc                              |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Userinfo plugin            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Ossama M. Khayat <okhayat@yahoo.com>                          |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-userinfo/
 */
 
 $labels = array();
@@ -20,3 +22,4 @@ $labels['created'] = 'أُنشئ في';
 $labels['lastlogin'] = 'آخر دخول';
 $labels['defaultidentity'] = 'الهوية الافتراضية';
 
+?>
\ No newline at end of file
diff --git a/plugins/userinfo/localization/az_AZ.inc b/plugins/userinfo/localization/az_AZ.inc
index 8430a2085..bd70cd128 100644
--- a/plugins/userinfo/localization/az_AZ.inc
+++ b/plugins/userinfo/localization/az_AZ.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/az_AZ/labels.inc                                         |
+ | plugins/userinfo/localization/<lang>.inc                              |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Userinfo plugin            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Orkhan Guliyev <proger@box.az>                                |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-userinfo/
 */
 
 $labels = array();
@@ -19,3 +22,4 @@ $labels['created'] = 'Yaradılma tarixi';
 $labels['lastlogin'] = 'Sonuncu giriş';
 $labels['defaultidentity'] = 'Default profil';
 
+?>
\ No newline at end of file
diff --git a/plugins/userinfo/localization/be_BE.inc b/plugins/userinfo/localization/be_BE.inc
index 312778513..b4b8a5cba 100644
--- a/plugins/userinfo/localization/be_BE.inc
+++ b/plugins/userinfo/localization/be_BE.inc
@@ -2,16 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/be_BE/labels.inc                                         |
+ | plugins/userinfo/localization/<lang>.inc                              |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Userinfo plugin            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Alex Nehaichik <nab@mail.by>                                  |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-userinfo/
 */
 
 $labels = array();
@@ -20,3 +22,4 @@ $labels['created'] = 'Створаны';
 $labels['lastlogin'] = 'Апошні ўваход';
 $labels['defaultidentity'] = 'Стандартнае ўвасабленне';
 
+?>
\ No newline at end of file
diff --git a/plugins/userinfo/localization/br.inc b/plugins/userinfo/localization/br.inc
index 678e4f708..560e61788 100644
--- a/plugins/userinfo/localization/br.inc
+++ b/plugins/userinfo/localization/br.inc
@@ -2,19 +2,24 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/br/labels.inc                                         |
+ | plugins/userinfo/localization/<lang>.inc                              |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Userinfo plugin            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Denis                                                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-userinfo/
 */
 
 $labels = array();
 $labels['userinfo'] = 'Titouroù an arveriad';
 $labels['created'] = 'Krouet';
 $labels['lastlogin'] = 'Kennask diwezhañ';
+$labels['defaultidentity'] = 'Default Identity';
 
+?>
\ No newline at end of file
diff --git a/plugins/userinfo/localization/bs_BA.inc b/plugins/userinfo/localization/bs_BA.inc
index 3232eee15..e7aff175f 100644
--- a/plugins/userinfo/localization/bs_BA.inc
+++ b/plugins/userinfo/localization/bs_BA.inc
@@ -2,16 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/bs_BA/labels.inc                                         |
+ | plugins/userinfo/localization/<lang>.inc                              |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Userinfo plugin            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Kenan Dervišević <kenan3008@gmail.com>                      |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-userinfo/
 */
 
 $labels = array();
@@ -20,3 +22,4 @@ $labels['created'] = 'Kreirano';
 $labels['lastlogin'] = 'Zadnja prijava';
 $labels['defaultidentity'] = 'Glavni identitet';
 
+?>
\ No newline at end of file
diff --git a/plugins/userinfo/localization/ca_ES.inc b/plugins/userinfo/localization/ca_ES.inc
index 84f765ac4..8a4837ec3 100644
--- a/plugins/userinfo/localization/ca_ES.inc
+++ b/plugins/userinfo/localization/ca_ES.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ca_ES/labels.inc                                         |
+ | plugins/userinfo/localization/<lang>.inc                              |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Userinfo plugin            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Jordi Sanfeliu <jordi@fibranet.cat>                           |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-userinfo/
 */
 
 $labels = array();
@@ -19,3 +22,4 @@ $labels['created'] = 'Creat';
 $labels['lastlogin'] = 'Última connexió';
 $labels['defaultidentity'] = 'Identitat per defecte';
 
+?>
\ No newline at end of file
diff --git a/plugins/userinfo/localization/cs_CZ.inc b/plugins/userinfo/localization/cs_CZ.inc
index 864a37a38..ef8d5b02f 100644
--- a/plugins/userinfo/localization/cs_CZ.inc
+++ b/plugins/userinfo/localization/cs_CZ.inc
@@ -2,16 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/cs_CZ/labels.inc                                         |
+ | plugins/userinfo/localization/<lang>.inc                              |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Userinfo plugin            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-userinfo/
 */
 
 $labels = array();
@@ -20,3 +22,4 @@ $labels['created'] = 'Vytvořen';
 $labels['lastlogin'] = 'Naspoledy přihlášen';
 $labels['defaultidentity'] = 'Výchozí identita';
 
+?>
\ No newline at end of file
diff --git a/plugins/userinfo/localization/cy_GB.inc b/plugins/userinfo/localization/cy_GB.inc
index 9521c700e..032e63462 100644
--- a/plugins/userinfo/localization/cy_GB.inc
+++ b/plugins/userinfo/localization/cy_GB.inc
@@ -2,16 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/cy_GB/labels.inc                                         |
+ | plugins/userinfo/localization/<lang>.inc                              |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Userinfo plugin            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Dafydd Tomos <Unknown>                                        |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-userinfo/
 */
 
 $labels = array();
@@ -20,3 +22,4 @@ $labels['created'] = 'Crëwyd';
 $labels['lastlogin'] = 'Mewngofnodiad diwethaf';
 $labels['defaultidentity'] = 'Personoliaeth arferol';
 
+?>
\ No newline at end of file
diff --git a/plugins/userinfo/localization/da_DK.inc b/plugins/userinfo/localization/da_DK.inc
index fd6f2ad6d..7bcfebc3d 100644
--- a/plugins/userinfo/localization/da_DK.inc
+++ b/plugins/userinfo/localization/da_DK.inc
@@ -2,16 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/da_DK/labels.inc                                         |
+ | plugins/userinfo/localization/<lang>.inc                              |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Userinfo plugin            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Johannes Hessellund <osos@openeyes.dk>                        |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-userinfo/
 */
 
 $labels = array();
@@ -20,3 +22,4 @@ $labels['created'] = 'Oprettet';
 $labels['lastlogin'] = 'Sidste login';
 $labels['defaultidentity'] = 'Standardidentitet';
 
+?>
\ No newline at end of file
diff --git a/plugins/userinfo/localization/de_CH.inc b/plugins/userinfo/localization/de_CH.inc
index 3db867f83..7c20f52df 100644
--- a/plugins/userinfo/localization/de_CH.inc
+++ b/plugins/userinfo/localization/de_CH.inc
@@ -5,7 +5,7 @@
  | plugins/userinfo/localization/<lang>.inc                              |
  |                                                                       |
  | Localization file of the Roundcube Webmail Userinfo plugin            |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
diff --git a/plugins/userinfo/localization/de_DE.inc b/plugins/userinfo/localization/de_DE.inc
index e770f3db6..542fe49b0 100644
--- a/plugins/userinfo/localization/de_DE.inc
+++ b/plugins/userinfo/localization/de_DE.inc
@@ -2,16 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/de_DE/labels.inc                                         |
+ | plugins/userinfo/localization/<lang>.inc                              |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Userinfo plugin            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: akn <Unknown>                                                 |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-userinfo/
 */
 
 $labels = array();
@@ -20,3 +22,4 @@ $labels['created'] = 'angelegt';
 $labels['lastlogin'] = 'letzte Anmeldung';
 $labels['defaultidentity'] = 'Standard-Identität';
 
+?>
\ No newline at end of file
diff --git a/plugins/userinfo/localization/en_GB.inc b/plugins/userinfo/localization/en_GB.inc
index 3a06ef9e0..01230de85 100644
--- a/plugins/userinfo/localization/en_GB.inc
+++ b/plugins/userinfo/localization/en_GB.inc
@@ -2,16 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/en_GB/labels.inc                                         |
+ | plugins/userinfo/localization/<lang>.inc                              |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Userinfo plugin            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Tony Whitmore <Unknown>                                       |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-userinfo/
 */
 
 $labels = array();
@@ -20,3 +22,4 @@ $labels['created'] = 'Created';
 $labels['lastlogin'] = 'Last Login';
 $labels['defaultidentity'] = 'Default Identity';
 
+?>
\ No newline at end of file
diff --git a/plugins/userinfo/localization/en_US.inc b/plugins/userinfo/localization/en_US.inc
index b269dd560..01230de85 100644
--- a/plugins/userinfo/localization/en_US.inc
+++ b/plugins/userinfo/localization/en_US.inc
@@ -5,7 +5,7 @@
  | plugins/userinfo/localization/<lang>.inc                              |
  |                                                                       |
  | Localization file of the Roundcube Webmail Userinfo plugin            |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
diff --git a/plugins/userinfo/localization/eo.inc b/plugins/userinfo/localization/eo.inc
index 8f95ce7c7..db0ac37d3 100644
--- a/plugins/userinfo/localization/eo.inc
+++ b/plugins/userinfo/localization/eo.inc
@@ -2,16 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/eo/labels.inc                                         |
+ | plugins/userinfo/localization/<lang>.inc                              |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Userinfo plugin            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Michael Moroni <michael.moroni@mailoo.org>                    |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-userinfo/
 */
 
 $labels = array();
@@ -20,3 +22,4 @@ $labels['created'] = 'Kreita';
 $labels['lastlogin'] = 'Lasta ensaluto';
 $labels['defaultidentity'] = 'Apriora idento';
 
+?>
\ No newline at end of file
diff --git a/plugins/userinfo/localization/es_ES.inc b/plugins/userinfo/localization/es_ES.inc
index 4fc3fd867..a17c23a52 100644
--- a/plugins/userinfo/localization/es_ES.inc
+++ b/plugins/userinfo/localization/es_ES.inc
@@ -2,16 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/es_ES/labels.inc                                         |
+ | plugins/userinfo/localization/<lang>.inc                              |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Userinfo plugin            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-userinfo/
 */
 
 $labels = array();
@@ -20,3 +22,4 @@ $labels['created'] = 'Creado';
 $labels['lastlogin'] = 'Última conexión';
 $labels['defaultidentity'] = 'Identidad predeterminada';
 
+?>
\ No newline at end of file
diff --git a/plugins/userinfo/localization/et_EE.inc b/plugins/userinfo/localization/et_EE.inc
index 662c61831..878395857 100644
--- a/plugins/userinfo/localization/et_EE.inc
+++ b/plugins/userinfo/localization/et_EE.inc
@@ -2,16 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/et_EE/labels.inc                                         |
+ | plugins/userinfo/localization/<lang>.inc                              |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Userinfo plugin            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-userinfo/
 */
 
 $labels = array();
@@ -20,3 +22,4 @@ $labels['created'] = 'Loodud';
 $labels['lastlogin'] = 'Viimane logimine';
 $labels['defaultidentity'] = 'Vaikeidentiteet';
 
+?>
\ No newline at end of file
diff --git a/plugins/userinfo/localization/fa_IR.inc b/plugins/userinfo/localization/fa_IR.inc
index b695ca428..6efc285e5 100644
--- a/plugins/userinfo/localization/fa_IR.inc
+++ b/plugins/userinfo/localization/fa_IR.inc
@@ -2,16 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/fa_IR/labels.inc                                         |
+ | plugins/userinfo/localization/<lang>.inc                              |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Userinfo plugin            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Hamid <abbaszadeh.h@gmail.com>                                |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-userinfo/
 */
 
 $labels = array();
@@ -20,3 +22,4 @@ $labels['created'] = 'ایجاد شده';
 $labels['lastlogin'] = 'آخرین ورود';
 $labels['defaultidentity'] = 'شناسه پیش‌فرض';
 
+?>
\ No newline at end of file
diff --git a/plugins/userinfo/localization/fi_FI.inc b/plugins/userinfo/localization/fi_FI.inc
index 00a5004fb..f5f538f91 100644
--- a/plugins/userinfo/localization/fi_FI.inc
+++ b/plugins/userinfo/localization/fi_FI.inc
@@ -2,21 +2,24 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/fi_FI/labels.inc                                         |
+ | plugins/userinfo/localization/<lang>.inc                              |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Userinfo plugin            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Jiri Grönroos <Unknown>                                      |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-userinfo/
 */
 
 $labels = array();
 $labels['userinfo'] = 'Käyttäjätiedot';
 $labels['created'] = 'Luotu';
 $labels['lastlogin'] = 'Viimeisin kirjautuminen';
-$labels['defaultidentity'] = 'Oletushenkilöllisyys';
+$labels['defaultidentity'] = 'Oletushenkilöys';
 
+?>
\ No newline at end of file
diff --git a/plugins/userinfo/localization/fr_FR.inc b/plugins/userinfo/localization/fr_FR.inc
index ccb181378..c830c587d 100755
--- a/plugins/userinfo/localization/fr_FR.inc
+++ b/plugins/userinfo/localization/fr_FR.inc
@@ -2,16 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/fr_FR/labels.inc                                         |
+ | plugins/userinfo/localization/<lang>.inc                              |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Userinfo plugin            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-userinfo/
 */
 
 $labels = array();
@@ -20,3 +22,4 @@ $labels['created'] = 'Date de création';
 $labels['lastlogin'] = 'Dernière connexion';
 $labels['defaultidentity'] = 'Identité principale';
 
+?>
\ No newline at end of file
diff --git a/plugins/userinfo/localization/gl_ES.inc b/plugins/userinfo/localization/gl_ES.inc
index 5e4307730..ba44e689f 100644
--- a/plugins/userinfo/localization/gl_ES.inc
+++ b/plugins/userinfo/localization/gl_ES.inc
@@ -2,16 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/gl_ES/labels.inc                                         |
+ | plugins/userinfo/localization/<lang>.inc                              |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Userinfo plugin            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-userinfo/
 */
 
 $labels = array();
@@ -20,3 +22,4 @@ $labels['created'] = 'Creado';
 $labels['lastlogin'] = 'Última conexión';
 $labels['defaultidentity'] = 'Identidade predeterminada';
 
+?>
\ No newline at end of file
diff --git a/plugins/userinfo/localization/he_IL.inc b/plugins/userinfo/localization/he_IL.inc
index d027c14bb..e5b40c65e 100644
--- a/plugins/userinfo/localization/he_IL.inc
+++ b/plugins/userinfo/localization/he_IL.inc
@@ -2,16 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/he_IL/labels.inc                                         |
+ | plugins/userinfo/localization/<lang>.inc                              |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Userinfo plugin            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Moshe Leibovitch <moish@mln.co.il>                            |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-userinfo/
 */
 
 $labels = array();
@@ -20,3 +22,4 @@ $labels['created'] = 'נוצר';
 $labels['lastlogin'] = 'הכמיסה האחרונה למערכת';
 $labels['defaultidentity'] = 'זהות ברירת מחדל';
 
+?>
\ No newline at end of file
diff --git a/plugins/userinfo/localization/hr_HR.inc b/plugins/userinfo/localization/hr_HR.inc
index 4df604e36..8f3eb2030 100644
--- a/plugins/userinfo/localization/hr_HR.inc
+++ b/plugins/userinfo/localization/hr_HR.inc
@@ -2,16 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/hr_HR/labels.inc                                         |
+ | plugins/userinfo/localization/<lang>.inc                              |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Userinfo plugin            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Svebor Prstačić <svebor.prstacic@gmail.com>                 |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-userinfo/
 */
 
 $labels = array();
@@ -20,3 +22,4 @@ $labels['created'] = 'Stvoreno';
 $labels['lastlogin'] = 'Zadnja prijava (login)';
 $labels['defaultidentity'] = 'Preddefinirani identitet';
 
+?>
\ No newline at end of file
diff --git a/plugins/userinfo/localization/hu_HU.inc b/plugins/userinfo/localization/hu_HU.inc
index a3497c7dd..f09f42eff 100644
--- a/plugins/userinfo/localization/hu_HU.inc
+++ b/plugins/userinfo/localization/hu_HU.inc
@@ -2,16 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/hu_HU/labels.inc                                         |
+ | plugins/userinfo/localization/<lang>.inc                              |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Userinfo plugin            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Droszler Gabor <droszler@datatrans.hu>                        |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-userinfo/
 */
 
 $labels = array();
@@ -20,3 +22,4 @@ $labels['created'] = 'Létrehozva';
 $labels['lastlogin'] = 'Utolsó bejelentkezés';
 $labels['defaultidentity'] = 'Alapértelmezett azonosító';
 
+?>
\ No newline at end of file
diff --git a/plugins/userinfo/localization/hy_AM.inc b/plugins/userinfo/localization/hy_AM.inc
index 76146bec3..2293329d8 100644
--- a/plugins/userinfo/localization/hy_AM.inc
+++ b/plugins/userinfo/localization/hy_AM.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/hy_AM/labels.inc                                         |
+ | plugins/userinfo/localization/<lang>.inc                              |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Userinfo plugin            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Vahan Yerkanian <vahan@yerkanian.com>                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-userinfo/
 */
 
 $labels = array();
@@ -19,3 +22,4 @@ $labels['created'] = 'Ստեղծված';
 $labels['lastlogin'] = 'Վերջին մուտքը`';
 $labels['defaultidentity'] = 'Լռելյալ ինքնությունն';
 
+?>
\ No newline at end of file
diff --git a/plugins/userinfo/localization/ia.inc b/plugins/userinfo/localization/ia.inc
index 607ddba4b..bb53ba870 100644
--- a/plugins/userinfo/localization/ia.inc
+++ b/plugins/userinfo/localization/ia.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ia/labels.inc                                         |
+ | plugins/userinfo/localization/<lang>.inc                              |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Userinfo plugin            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Emilio Sepulveda <emilio@chilemoz.org>                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-userinfo/
 */
 
 $labels = array();
@@ -19,3 +22,4 @@ $labels['created'] = 'Create';
 $labels['lastlogin'] = 'Ultime initio de session';
 $labels['defaultidentity'] = 'Identitate predeterminate';
 
+?>
\ No newline at end of file
diff --git a/plugins/userinfo/localization/id_ID.inc b/plugins/userinfo/localization/id_ID.inc
index 8eed1d8a1..59ab0d486 100644
--- a/plugins/userinfo/localization/id_ID.inc
+++ b/plugins/userinfo/localization/id_ID.inc
@@ -2,16 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/id_ID/labels.inc                                         |
+ | plugins/userinfo/localization/<lang>.inc                              |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Userinfo plugin            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Putu Arya Sabda Wijaya <Unknown>                              |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-userinfo/
 */
 
 $labels = array();
@@ -20,3 +22,4 @@ $labels['created'] = 'Telah dibuat';
 $labels['lastlogin'] = 'Masuk Terakhir';
 $labels['defaultidentity'] = 'Identitas Standar';
 
+?>
\ No newline at end of file
diff --git a/plugins/userinfo/localization/it_IT.inc b/plugins/userinfo/localization/it_IT.inc
index 9c891b719..33b72114f 100644
--- a/plugins/userinfo/localization/it_IT.inc
+++ b/plugins/userinfo/localization/it_IT.inc
@@ -2,16 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/it_IT/labels.inc                                         |
+ | plugins/userinfo/localization/<lang>.inc                              |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Userinfo plugin            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: emilio brambilla <Unknown>                                    |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-userinfo/
 */
 
 $labels = array();
@@ -20,3 +22,4 @@ $labels['created'] = 'Creato';
 $labels['lastlogin'] = 'Ultimo Login';
 $labels['defaultidentity'] = 'Identità predefinita';
 
+?>
\ No newline at end of file
diff --git a/plugins/userinfo/localization/ja_JP.inc b/plugins/userinfo/localization/ja_JP.inc
index 33e7f1667..bf8d0aab8 100644
--- a/plugins/userinfo/localization/ja_JP.inc
+++ b/plugins/userinfo/localization/ja_JP.inc
@@ -2,16 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ja_JP/labels.inc                                         |
+ | plugins/userinfo/localization/<lang>.inc                              |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Userinfo plugin            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Takahiro Kambe <Unknown>                                      |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-userinfo/
 */
 
 $labels = array();
@@ -20,3 +22,4 @@ $labels['created'] = '作成日時';
 $labels['lastlogin'] = '最後のログイン';
 $labels['defaultidentity'] = '既定の識別情報';
 
+?>
\ No newline at end of file
diff --git a/plugins/userinfo/localization/km_KH.inc b/plugins/userinfo/localization/km_KH.inc
index 4536541ac..554fe3773 100644
--- a/plugins/userinfo/localization/km_KH.inc
+++ b/plugins/userinfo/localization/km_KH.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/km_KH/labels.inc                                         |
+ | plugins/userinfo/localization/<lang>.inc                              |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Userinfo plugin            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: samdyk                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-userinfo/
 */
 
 $labels = array();
@@ -19,3 +22,4 @@ $labels['created'] = 'បាន​បង្កើត';
 $labels['lastlogin'] = 'ចុះឈ្មោះចូលចុងក្រោយ';
 $labels['defaultidentity'] = 'អត្តសញ្ញាណ​លំនាំដើម';
 
+?>
\ No newline at end of file
diff --git a/plugins/userinfo/localization/ko_KR.inc b/plugins/userinfo/localization/ko_KR.inc
index c409b6858..ec8651263 100644
--- a/plugins/userinfo/localization/ko_KR.inc
+++ b/plugins/userinfo/localization/ko_KR.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ko_KR/labels.inc                                         |
+ | plugins/userinfo/localization/<lang>.inc                              |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Userinfo plugin            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Kim, Woohyun <woohyun.kim@gmail.com>                          |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-userinfo/
 */
 
 $labels = array();
@@ -19,3 +22,4 @@ $labels['created'] = '생성됨';
 $labels['lastlogin'] = '마지막 로그인';
 $labels['defaultidentity'] = '기본 신분증';
 
+?>
\ No newline at end of file
diff --git a/plugins/userinfo/localization/ku.inc b/plugins/userinfo/localization/ku.inc
index fe211f08d..80b436632 100644
--- a/plugins/userinfo/localization/ku.inc
+++ b/plugins/userinfo/localization/ku.inc
@@ -2,16 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ku/labels.inc                                         |
+ | plugins/userinfo/localization/<lang>.inc                              |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Userinfo plugin            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: david absalan <absalan@live.com>                              |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-userinfo/
 */
 
 $labels = array();
@@ -20,3 +22,4 @@ $labels['created'] = 'Hat afirandin';
 $labels['lastlogin'] = 'axrin hatna jurawa';
 $labels['defaultidentity'] = 'Nasnameya Pêşsalixbûyî';
 
+?>
\ No newline at end of file
diff --git a/plugins/userinfo/localization/lt_LT.inc b/plugins/userinfo/localization/lt_LT.inc
index af518fb20..88ce427c0 100644
--- a/plugins/userinfo/localization/lt_LT.inc
+++ b/plugins/userinfo/localization/lt_LT.inc
@@ -2,16 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/lt_LT/labels.inc                                         |
+ | plugins/userinfo/localization/<lang>.inc                              |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Userinfo plugin            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Rimas Kudelis <rq@akl.lt>                                     |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-userinfo/
 */
 
 $labels = array();
@@ -20,3 +22,4 @@ $labels['created'] = 'Sukurtas';
 $labels['lastlogin'] = 'Paskutinį kartą prisijungė';
 $labels['defaultidentity'] = 'Numatytoji tapatybė';
 
+?>
\ No newline at end of file
diff --git a/plugins/userinfo/localization/lv_LV.inc b/plugins/userinfo/localization/lv_LV.inc
index bd7369bf6..9d2a97cbd 100644
--- a/plugins/userinfo/localization/lv_LV.inc
+++ b/plugins/userinfo/localization/lv_LV.inc
@@ -2,16 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/lv_LV/labels.inc                                         |
+ | plugins/userinfo/localization/<lang>.inc                              |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Userinfo plugin            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Ivars Strazdiņš <Unknown>                                   |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-userinfo/
 */
 
 $labels = array();
@@ -20,3 +22,4 @@ $labels['created'] = 'Izveidots';
 $labels['lastlogin'] = 'Pēdējā pieteikšanās';
 $labels['defaultidentity'] = 'Noklusētā identitāte';
 
+?>
\ No newline at end of file
diff --git a/plugins/userinfo/localization/ml_IN.inc b/plugins/userinfo/localization/ml_IN.inc
index 71996473b..6b16e50ec 100644
--- a/plugins/userinfo/localization/ml_IN.inc
+++ b/plugins/userinfo/localization/ml_IN.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ml_IN/labels.inc                                         |
+ | plugins/userinfo/localization/<lang>.inc                              |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Userinfo plugin            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Anish A <aneesh.nl@gmail.com>                                 |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-userinfo/
 */
 
 $labels = array();
@@ -19,3 +22,4 @@ $labels['created'] = 'നിര്‍മ്മിച്ചു';
 $labels['lastlogin'] = 'അവസാന പ്രവേശനം';
 $labels['defaultidentity'] = 'സാധാരണ വ്യക്തിത്വം';
 
+?>
\ No newline at end of file
diff --git a/plugins/userinfo/localization/mr_IN.inc b/plugins/userinfo/localization/mr_IN.inc
index 6372cd6df..52bbde652 100644
--- a/plugins/userinfo/localization/mr_IN.inc
+++ b/plugins/userinfo/localization/mr_IN.inc
@@ -2,19 +2,24 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/mr_IN/labels.inc                                         |
+ | plugins/userinfo/localization/<lang>.inc                              |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Userinfo plugin            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Devendra Buddhikot <devendradb@rediffmail.com>                |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-userinfo/
 */
 
 $labels = array();
 $labels['userinfo'] = 'वापरकर्त्याची माहिती';
 $labels['created'] = 'निर्माण केलेले';
+$labels['lastlogin'] = 'Last Login';
+$labels['defaultidentity'] = 'Default Identity';
 
+?>
\ No newline at end of file
diff --git a/plugins/userinfo/localization/nb_NO.inc b/plugins/userinfo/localization/nb_NO.inc
index 7ae2832dd..f674375ef 100644
--- a/plugins/userinfo/localization/nb_NO.inc
+++ b/plugins/userinfo/localization/nb_NO.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/nb_NB/labels.inc                                         |
+ | plugins/userinfo/localization/<lang>.inc                              |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Userinfo plugin            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Patrick Kvaksrud <patrick@idrettsforbundet.no>                |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-userinfo/
 */
 
 $labels = array();
@@ -19,3 +22,4 @@ $labels['created'] = 'Opprettet';
 $labels['lastlogin'] = 'Sist logget inn';
 $labels['defaultidentity'] = 'Standard identitet';
 
+?>
\ No newline at end of file
diff --git a/plugins/userinfo/localization/nl_NL.inc b/plugins/userinfo/localization/nl_NL.inc
index dd93ec68c..8c46ca6c4 100644
--- a/plugins/userinfo/localization/nl_NL.inc
+++ b/plugins/userinfo/localization/nl_NL.inc
@@ -2,21 +2,24 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/nl_NL/labels.inc                                         |
+ | plugins/userinfo/localization/<lang>.inc                              |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Userinfo plugin            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Geert Wirken <Unknown>                                        |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-userinfo/
 */
 
 $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/nn_NO.inc b/plugins/userinfo/localization/nn_NO.inc
index eba946b66..749935414 100644
--- a/plugins/userinfo/localization/nn_NO.inc
+++ b/plugins/userinfo/localization/nn_NO.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/nn_NN/labels.inc                                         |
+ | plugins/userinfo/localization/<lang>.inc                              |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Userinfo plugin            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Åsmund Skjæveland <aasmunds@ulrik.uio.no>                   |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-userinfo/
 */
 
 $labels = array();
@@ -19,3 +22,4 @@ $labels['created'] = 'Laga';
 $labels['lastlogin'] = 'Sist logga inn';
 $labels['defaultidentity'] = 'Standardidentitet';
 
+?>
\ No newline at end of file
diff --git a/plugins/userinfo/localization/pl_PL.inc b/plugins/userinfo/localization/pl_PL.inc
index f59d9aa43..abdb043c7 100644
--- a/plugins/userinfo/localization/pl_PL.inc
+++ b/plugins/userinfo/localization/pl_PL.inc
@@ -2,16 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/pl_PL/labels.inc                                         |
+ | plugins/userinfo/localization/<lang>.inc                              |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Userinfo plugin            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-userinfo/
 */
 
 $labels = array();
@@ -20,3 +22,4 @@ $labels['created'] = 'Utworzony';
 $labels['lastlogin'] = 'Ostatnie logowanie';
 $labels['defaultidentity'] = 'Domyślna tożsamość';
 
+?>
\ No newline at end of file
diff --git a/plugins/userinfo/localization/pt_BR.inc b/plugins/userinfo/localization/pt_BR.inc
index a4f771923..fad85c18f 100644
--- a/plugins/userinfo/localization/pt_BR.inc
+++ b/plugins/userinfo/localization/pt_BR.inc
@@ -2,16 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/pt_BR/labels.inc                                         |
+ | plugins/userinfo/localization/<lang>.inc                              |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Userinfo plugin            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Claudio F Filho <filhocf@gmail.com>                           |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-userinfo/
 */
 
 $labels = array();
@@ -20,3 +22,4 @@ $labels['created'] = 'Criado';
 $labels['lastlogin'] = 'Último Login';
 $labels['defaultidentity'] = 'Identidade Padrão';
 
+?>
\ No newline at end of file
diff --git a/plugins/userinfo/localization/pt_PT.inc b/plugins/userinfo/localization/pt_PT.inc
index decd03484..1ea1b5cbf 100644
--- a/plugins/userinfo/localization/pt_PT.inc
+++ b/plugins/userinfo/localization/pt_PT.inc
@@ -2,16 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/pt_PT/labels.inc                                         |
+ | plugins/userinfo/localization/<lang>.inc                              |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Userinfo plugin            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: David <Unknown>                                               |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-userinfo/
 */
 
 $labels = array();
@@ -20,3 +22,4 @@ $labels['created'] = 'Criado';
 $labels['lastlogin'] = 'Último acesso';
 $labels['defaultidentity'] = 'Identidade pré-definida';
 
+?>
\ No newline at end of file
diff --git a/plugins/userinfo/localization/ro_RO.inc b/plugins/userinfo/localization/ro_RO.inc
index 77c8a39b7..25c4d1059 100755
--- a/plugins/userinfo/localization/ro_RO.inc
+++ b/plugins/userinfo/localization/ro_RO.inc
@@ -2,16 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ro_RO/labels.inc                                         |
+ | plugins/userinfo/localization/<lang>.inc                              |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Userinfo plugin            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-userinfo/
 */
 
 $labels = array();
@@ -20,3 +22,4 @@ $labels['created'] = 'Data creatiei';
 $labels['lastlogin'] = 'Ultima conectare';
 $labels['defaultidentity'] = 'Identitate principala';
 
+?>
\ No newline at end of file
diff --git a/plugins/userinfo/localization/ru_RU.inc b/plugins/userinfo/localization/ru_RU.inc
index d4fd2ca5e..cc9dd5a11 100644
--- a/plugins/userinfo/localization/ru_RU.inc
+++ b/plugins/userinfo/localization/ru_RU.inc
@@ -2,16 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ru_RU/labels.inc                                         |
+ | plugins/userinfo/localization/<lang>.inc                              |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Userinfo plugin            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-userinfo/
 */
 
 $labels = array();
@@ -20,3 +22,4 @@ $labels['created'] = 'Создан';
 $labels['lastlogin'] = 'Последний вход';
 $labels['defaultidentity'] = 'Профиль по умолчанию';
 
+?>
\ No newline at end of file
diff --git a/plugins/userinfo/localization/sk_SK.inc b/plugins/userinfo/localization/sk_SK.inc
index 31f2fe718..16339871d 100644
--- a/plugins/userinfo/localization/sk_SK.inc
+++ b/plugins/userinfo/localization/sk_SK.inc
@@ -2,16 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/sk_SK/labels.inc                                         |
+ | plugins/userinfo/localization/<lang>.inc                              |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Userinfo plugin            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: panda <Unknown>                                               |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-userinfo/
 */
 
 $labels = array();
@@ -20,3 +22,4 @@ $labels['created'] = 'Vytvorené';
 $labels['lastlogin'] = 'Posledné prihlásenie';
 $labels['defaultidentity'] = 'Štandardná identita';
 
+?>
\ No newline at end of file
diff --git a/plugins/userinfo/localization/sl_SI.inc b/plugins/userinfo/localization/sl_SI.inc
index 2c406ecf2..2e384c82c 100644
--- a/plugins/userinfo/localization/sl_SI.inc
+++ b/plugins/userinfo/localization/sl_SI.inc
@@ -2,16 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/sl_SI/labels.inc                                         |
+ | plugins/userinfo/localization/<lang>.inc                              |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Userinfo plugin            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Barbara Krasovec <barbarak@arnes.si>                          |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-userinfo/
 */
 
 $labels = array();
@@ -20,3 +22,4 @@ $labels['created'] = 'Ustvarjen';
 $labels['lastlogin'] = 'Zadnja prijava';
 $labels['defaultidentity'] = 'Privzeta identiteta';
 
+?>
\ No newline at end of file
diff --git a/plugins/userinfo/localization/sr_CS.inc b/plugins/userinfo/localization/sr_CS.inc
index fb32af46b..f4d869098 100644
--- a/plugins/userinfo/localization/sr_CS.inc
+++ b/plugins/userinfo/localization/sr_CS.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/sr_CS/labels.inc                                         |
+ | plugins/userinfo/localization/<lang>.inc                              |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Userinfo plugin            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Saša Zejnilović <zejnils@gmail.com>                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-userinfo/
 */
 
 $labels = array();
@@ -19,3 +22,4 @@ $labels['created'] = 'Направљено';
 $labels['lastlogin'] = 'Последњи Логин';
 $labels['defaultidentity'] = 'подразумевани идентитет';
 
+?>
\ No newline at end of file
diff --git a/plugins/userinfo/localization/sv_SE.inc b/plugins/userinfo/localization/sv_SE.inc
index 1b8f166e9..0b8d5fedd 100644
--- a/plugins/userinfo/localization/sv_SE.inc
+++ b/plugins/userinfo/localization/sv_SE.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/sv_SE/labels.inc                                         |
+ | plugins/userinfo/localization/<lang>.inc                              |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Userinfo plugin            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Jonas Nasholm                                                 |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-userinfo/
 */
 
 $labels = array();
@@ -19,3 +22,4 @@ $labels['created'] = 'Skapad';
 $labels['lastlogin'] = 'Senast inloggad';
 $labels['defaultidentity'] = 'Standardidentitet';
 
+?>
\ No newline at end of file
diff --git a/plugins/userinfo/localization/tr_TR.inc b/plugins/userinfo/localization/tr_TR.inc
index 636fab861..3d8a0d2da 100644
--- a/plugins/userinfo/localization/tr_TR.inc
+++ b/plugins/userinfo/localization/tr_TR.inc
@@ -2,16 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/tr_TR/labels.inc                                         |
+ | plugins/userinfo/localization/<lang>.inc                              |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Userinfo plugin            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: ismail yenigul <Unknown>                                      |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-userinfo/
 */
 
 $labels = array();
@@ -20,3 +22,4 @@ $labels['created'] = 'Oluşturuldu';
 $labels['lastlogin'] = 'Son Giriş';
 $labels['defaultidentity'] = 'Öntanımlı kimlik';
 
+?>
\ No newline at end of file
diff --git a/plugins/userinfo/localization/uk_UA.inc b/plugins/userinfo/localization/uk_UA.inc
index bef3d184f..fe2d54b27 100644
--- a/plugins/userinfo/localization/uk_UA.inc
+++ b/plugins/userinfo/localization/uk_UA.inc
@@ -2,16 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/uk_UA/labels.inc                                         |
+ | plugins/userinfo/localization/<lang>.inc                              |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Userinfo plugin            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Anton Gladky <Unknown>                                        |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-userinfo/
 */
 
 $labels = array();
@@ -20,3 +22,4 @@ $labels['created'] = 'Створено';
 $labels['lastlogin'] = 'Останній захід';
 $labels['defaultidentity'] = 'Профіль за замовчуванням';
 
+?>
\ No newline at end of file
diff --git a/plugins/userinfo/localization/vi_VN.inc b/plugins/userinfo/localization/vi_VN.inc
index 813bd0a56..46553c76a 100644
--- a/plugins/userinfo/localization/vi_VN.inc
+++ b/plugins/userinfo/localization/vi_VN.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/vi_VN/labels.inc                                         |
+ | plugins/userinfo/localization/<lang>.inc                              |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Userinfo plugin            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Kenny Tran <kennethanh@gmail.com>                             |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-userinfo/
 */
 
 $labels = array();
@@ -19,3 +22,4 @@ $labels['created'] = 'Được tạo';
 $labels['lastlogin'] = 'Lần đăng nhập cuối';
 $labels['defaultidentity'] = 'Nhận diện mặc định';
 
+?>
\ No newline at end of file
diff --git a/plugins/userinfo/localization/zh_CN.inc b/plugins/userinfo/localization/zh_CN.inc
index c3d3303cf..2b06ab218 100644
--- a/plugins/userinfo/localization/zh_CN.inc
+++ b/plugins/userinfo/localization/zh_CN.inc
@@ -2,21 +2,24 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/zh_CN/labels.inc                                         |
+ | plugins/userinfo/localization/<lang>.inc                              |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Userinfo plugin            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: waring_id <Unknown>                                           |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-userinfo/
 */
 
 $labels = array();
 $labels['userinfo'] = '用户信息';
-$labels['created'] = '创建';
-$labels['lastlogin'] = '最后登陆';
+$labels['created'] = '创建于';
+$labels['lastlogin'] = '最近登录';
 $labels['defaultidentity'] = '默认身份';
 
+?>
\ No newline at end of file
diff --git a/plugins/userinfo/localization/zh_TW.inc b/plugins/userinfo/localization/zh_TW.inc
index c5834ce4a..05b996629 100644
--- a/plugins/userinfo/localization/zh_TW.inc
+++ b/plugins/userinfo/localization/zh_TW.inc
@@ -2,16 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/zh_TW/labels.inc                                         |
+ | plugins/userinfo/localization/<lang>.inc                              |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Userinfo plugin            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-userinfo/
 */
 
 $labels = array();
@@ -20,3 +22,4 @@ $labels['created'] = '建立時間';
 $labels['lastlogin'] = '上次登入';
 $labels['defaultidentity'] = '預設身份';
 
+?>
\ No newline at end of file
diff --git a/plugins/vcard_attachments/localization/az_AZ.inc b/plugins/vcard_attachments/localization/az_AZ.inc
index e4ca20ce2..85fbf7fa5 100644
--- a/plugins/vcard_attachments/localization/az_AZ.inc
+++ b/plugins/vcard_attachments/localization/az_AZ.inc
@@ -2,18 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/az_AZ/labels.inc                                         |
+ | plugins/vcard_attachments/localization/<lang>.inc                     |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Vcard Attachments plugin   |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Orkhan Guliyev <proger@box.az>                                |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-vcard_attachments/
 */
 
 $labels = array();
 $labels['addvcardmsg'] = 'vCard-ı kontakta daxil et';
 $labels['vcardsavefailed'] = 'vCard-ı saxlamaq alınmadı';
 
+?>
\ No newline at end of file
diff --git a/plugins/vcard_attachments/localization/be_BE.inc b/plugins/vcard_attachments/localization/be_BE.inc
index d5b6c451f..eb8208e74 100644
--- a/plugins/vcard_attachments/localization/be_BE.inc
+++ b/plugins/vcard_attachments/localization/be_BE.inc
@@ -2,19 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/be_BE/labels.inc                                         |
+ | plugins/vcard_attachments/localization/<lang>.inc                     |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Vcard Attachments plugin   |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Alex Nehaichik <nab@mail.by>                                  |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-vcard_attachments/
 */
 
 $labels = array();
 $labels['addvcardmsg'] = 'Дадаць vCard у адрасную кнігу';
 $labels['vcardsavefailed'] = 'Немагчыма захаваць vCard';
 
+?>
\ No newline at end of file
diff --git a/plugins/vcard_attachments/localization/bs_BA.inc b/plugins/vcard_attachments/localization/bs_BA.inc
index 2c2a12318..e13ccc739 100644
--- a/plugins/vcard_attachments/localization/bs_BA.inc
+++ b/plugins/vcard_attachments/localization/bs_BA.inc
@@ -2,19 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/bs_BA/labels.inc                                         |
+ | plugins/vcard_attachments/localization/<lang>.inc                     |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Vcard Attachments plugin   |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Kenan Dervišević <kenan3008@gmail.com>                      |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-vcard_attachments/
 */
 
 $labels = array();
 $labels['addvcardmsg'] = 'Dodaj vCard u adresar';
 $labels['vcardsavefailed'] = 'Nije moguće sačuvati vCard';
 
+?>
\ No newline at end of file
diff --git a/plugins/vcard_attachments/localization/ca_ES.inc b/plugins/vcard_attachments/localization/ca_ES.inc
index 16caca65c..b0f36d95a 100644
--- a/plugins/vcard_attachments/localization/ca_ES.inc
+++ b/plugins/vcard_attachments/localization/ca_ES.inc
@@ -2,18 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ca_ES/labels.inc                                         |
+ | plugins/vcard_attachments/localization/<lang>.inc                     |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Vcard Attachments plugin   |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Jordi Sanfeliu <jordi@fibranet.cat>                           |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-vcard_attachments/
 */
 
 $labels = array();
 $labels['addvcardmsg'] = 'Afegeix la vCard a la llibreta d\'adreces';
 $labels['vcardsavefailed'] = 'No s\'ha pogut desar la vCard';
 
+?>
\ No newline at end of file
diff --git a/plugins/vcard_attachments/localization/cs_CZ.inc b/plugins/vcard_attachments/localization/cs_CZ.inc
index d6371e6a2..dc8e1f84c 100644
--- a/plugins/vcard_attachments/localization/cs_CZ.inc
+++ b/plugins/vcard_attachments/localization/cs_CZ.inc
@@ -2,19 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/cs_CZ/labels.inc                                         |
+ | plugins/vcard_attachments/localization/<lang>.inc                     |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Vcard Attachments plugin   |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-vcard_attachments/
 */
 
 $labels = array();
 $labels['addvcardmsg'] = 'Přidat vCard do adresáře';
 $labels['vcardsavefailed'] = 'Nelze uložit vCard';
 
+?>
\ No newline at end of file
diff --git a/plugins/vcard_attachments/localization/cy_GB.inc b/plugins/vcard_attachments/localization/cy_GB.inc
index 730ca0cf1..24d32f48e 100644
--- a/plugins/vcard_attachments/localization/cy_GB.inc
+++ b/plugins/vcard_attachments/localization/cy_GB.inc
@@ -2,19 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/cy_GB/labels.inc                                         |
+ | plugins/vcard_attachments/localization/<lang>.inc                     |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Vcard Attachments plugin   |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Dafydd Tomos <Unknown>                                        |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-vcard_attachments/
 */
 
 $labels = array();
 $labels['addvcardmsg'] = 'Ychwanegu vCard i\'r llyfr cyfeiriadau';
 $labels['vcardsavefailed'] = 'Methwyd cadw\'r vCard';
 
+?>
\ No newline at end of file
diff --git a/plugins/vcard_attachments/localization/da_DK.inc b/plugins/vcard_attachments/localization/da_DK.inc
index 9877674a4..bc9c2bef1 100644
--- a/plugins/vcard_attachments/localization/da_DK.inc
+++ b/plugins/vcard_attachments/localization/da_DK.inc
@@ -2,19 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/da_DK/labels.inc                                         |
+ | plugins/vcard_attachments/localization/<lang>.inc                     |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Vcard Attachments plugin   |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: John Loft Christiansen <Unknown>                              |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-vcard_attachments/
 */
 
 $labels = array();
 $labels['addvcardmsg'] = 'Tilføj vCard til adressebogen';
 $labels['vcardsavefailed'] = 'Kan ikke gemme dette vCard';
 
+?>
\ No newline at end of file
diff --git a/plugins/vcard_attachments/localization/de_CH.inc b/plugins/vcard_attachments/localization/de_CH.inc
index 5f8108666..577586994 100644
--- a/plugins/vcard_attachments/localization/de_CH.inc
+++ b/plugins/vcard_attachments/localization/de_CH.inc
@@ -5,7 +5,7 @@
  | plugins/vcard_attachments/localization/<lang>.inc                     |
  |                                                                       |
  | Localization file of the Roundcube Webmail Vcard Attachments plugin   |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
diff --git a/plugins/vcard_attachments/localization/de_DE.inc b/plugins/vcard_attachments/localization/de_DE.inc
index 7c334c873..577586994 100644
--- a/plugins/vcard_attachments/localization/de_DE.inc
+++ b/plugins/vcard_attachments/localization/de_DE.inc
@@ -2,19 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/de_DE/labels.inc                                         |
+ | plugins/vcard_attachments/localization/<lang>.inc                     |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Vcard Attachments plugin   |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-vcard_attachments/
 */
 
 $labels = array();
 $labels['addvcardmsg'] = 'Kontakt im Adressbuch speichern';
 $labels['vcardsavefailed'] = 'Der Kontakt konnte nicht gespeichert werden';
 
+?>
\ No newline at end of file
diff --git a/plugins/vcard_attachments/localization/en_GB.inc b/plugins/vcard_attachments/localization/en_GB.inc
index d768e5422..a52a93228 100644
--- a/plugins/vcard_attachments/localization/en_GB.inc
+++ b/plugins/vcard_attachments/localization/en_GB.inc
@@ -2,19 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/en_GB/labels.inc                                         |
+ | plugins/vcard_attachments/localization/<lang>.inc                     |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Vcard Attachments plugin   |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Tony Whitmore <Unknown>                                       |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-vcard_attachments/
 */
 
 $labels = array();
 $labels['addvcardmsg'] = 'Add vCard to addressbook';
 $labels['vcardsavefailed'] = 'Unable to save vCard';
 
+?>
\ No newline at end of file
diff --git a/plugins/vcard_attachments/localization/en_US.inc b/plugins/vcard_attachments/localization/en_US.inc
index 02eed29ea..a52a93228 100644
--- a/plugins/vcard_attachments/localization/en_US.inc
+++ b/plugins/vcard_attachments/localization/en_US.inc
@@ -5,7 +5,7 @@
  | plugins/vcard_attachments/localization/<lang>.inc                     |
  |                                                                       |
  | Localization file of the Roundcube Webmail Vcard Attachments plugin   |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
diff --git a/plugins/vcard_attachments/localization/eo.inc b/plugins/vcard_attachments/localization/eo.inc
index 1f962bbb4..e98ac1971 100644
--- a/plugins/vcard_attachments/localization/eo.inc
+++ b/plugins/vcard_attachments/localization/eo.inc
@@ -2,18 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/eo/labels.inc                                         |
+ | plugins/vcard_attachments/localization/<lang>.inc                     |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Vcard Attachments plugin   |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Michael Moroni <michael.moroni@mailoo.org>                    |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-vcard_attachments/
 */
 
 $labels = array();
 $labels['addvcardmsg'] = 'Aldoni vCard al adresaro';
 $labels['vcardsavefailed'] = 'vCard ne konserveblas';
 
+?>
\ No newline at end of file
diff --git a/plugins/vcard_attachments/localization/es_ES.inc b/plugins/vcard_attachments/localization/es_ES.inc
index 8c81a86b1..55ab6b6a1 100644
--- a/plugins/vcard_attachments/localization/es_ES.inc
+++ b/plugins/vcard_attachments/localization/es_ES.inc
@@ -2,19 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/es_ES/labels.inc                                         |
+ | plugins/vcard_attachments/localization/<lang>.inc                     |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Vcard Attachments plugin   |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-vcard_attachments/
 */
 
 $labels = array();
 $labels['addvcardmsg'] = 'Añadir la tarjeta a la libreta de direcciones';
 $labels['vcardsavefailed'] = 'No ha sido posible guardar la tarjeta';
 
+?>
\ No newline at end of file
diff --git a/plugins/vcard_attachments/localization/et_EE.inc b/plugins/vcard_attachments/localization/et_EE.inc
index faaa076b6..dd74b8f66 100644
--- a/plugins/vcard_attachments/localization/et_EE.inc
+++ b/plugins/vcard_attachments/localization/et_EE.inc
@@ -2,19 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/et_EE/labels.inc                                         |
+ | plugins/vcard_attachments/localization/<lang>.inc                     |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Vcard Attachments plugin   |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-vcard_attachments/
 */
 
 $labels = array();
 $labels['addvcardmsg'] = 'Lisa vCard aadressiraamatusse';
 $labels['vcardsavefailed'] = 'vCard salvestamine nurjus';
 
+?>
\ No newline at end of file
diff --git a/plugins/vcard_attachments/localization/fa_IR.inc b/plugins/vcard_attachments/localization/fa_IR.inc
index 8b7dae2bb..5b28d566f 100644
--- a/plugins/vcard_attachments/localization/fa_IR.inc
+++ b/plugins/vcard_attachments/localization/fa_IR.inc
@@ -2,19 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/fa_IR/labels.inc                                         |
+ | plugins/vcard_attachments/localization/<lang>.inc                     |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Vcard Attachments plugin   |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Hamid <abbaszadeh.h@gmail.com>                                |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-vcard_attachments/
 */
 
 $labels = array();
 $labels['addvcardmsg'] = 'افزودن vCard به دفترچه آدرس';
 $labels['vcardsavefailed'] = 'ناتوان در ذخیره vCard';
 
+?>
\ No newline at end of file
diff --git a/plugins/vcard_attachments/localization/fi_FI.inc b/plugins/vcard_attachments/localization/fi_FI.inc
index bd9ae73ac..254745609 100644
--- a/plugins/vcard_attachments/localization/fi_FI.inc
+++ b/plugins/vcard_attachments/localization/fi_FI.inc
@@ -2,19 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/fi_FI/labels.inc                                         |
+ | plugins/vcard_attachments/localization/<lang>.inc                     |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Vcard Attachments plugin   |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Jiri Grönroos <Unknown>                                      |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-vcard_attachments/
 */
 
 $labels = array();
 $labels['addvcardmsg'] = 'Lisää vCard osoitekirjaan';
 $labels['vcardsavefailed'] = 'vCardin tallennus epäonnistui';
 
+?>
\ No newline at end of file
diff --git a/plugins/vcard_attachments/localization/fr_FR.inc b/plugins/vcard_attachments/localization/fr_FR.inc
index 355c4f117..03274e2a9 100644
--- a/plugins/vcard_attachments/localization/fr_FR.inc
+++ b/plugins/vcard_attachments/localization/fr_FR.inc
@@ -2,19 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/fr_FR/labels.inc                                         |
+ | plugins/vcard_attachments/localization/<lang>.inc                     |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Vcard Attachments plugin   |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Edouard Moreau <Unknown>                                      |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-vcard_attachments/
 */
 
 $labels = array();
 $labels['addvcardmsg'] = 'Ajouter la vCard au carnet d\'adresses';
 $labels['vcardsavefailed'] = 'Impossible d\'enregistrer la vCard';
 
+?>
\ No newline at end of file
diff --git a/plugins/vcard_attachments/localization/gl_ES.inc b/plugins/vcard_attachments/localization/gl_ES.inc
index c2743a0ef..b502c85c7 100644
--- a/plugins/vcard_attachments/localization/gl_ES.inc
+++ b/plugins/vcard_attachments/localization/gl_ES.inc
@@ -2,19 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/gl_ES/labels.inc                                         |
+ | plugins/vcard_attachments/localization/<lang>.inc                     |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Vcard Attachments plugin   |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-vcard_attachments/
 */
 
 $labels = array();
 $labels['addvcardmsg'] = 'Engadir a tarxeta ao caderno de enderezos';
 $labels['vcardsavefailed'] = 'Non foi posible gardar a tarxeta';
 
+?>
\ No newline at end of file
diff --git a/plugins/vcard_attachments/localization/he_IL.inc b/plugins/vcard_attachments/localization/he_IL.inc
index 433511d5b..2e8716875 100644
--- a/plugins/vcard_attachments/localization/he_IL.inc
+++ b/plugins/vcard_attachments/localization/he_IL.inc
@@ -2,19 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/he_IL/labels.inc                                         |
+ | plugins/vcard_attachments/localization/<lang>.inc                     |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Vcard Attachments plugin   |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Moshe Leibovitch <moish@mln.co.il>                            |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-vcard_attachments/
 */
 
 $labels = array();
 $labels['addvcardmsg'] = 'הוספת כרטיס ביקור בפורמט vCard לספר הכתובות';
 $labels['vcardsavefailed'] = 'לא ניתן לשמור את כרטיס הביקור  vCard';
 
+?>
\ No newline at end of file
diff --git a/plugins/vcard_attachments/localization/hr_HR.inc b/plugins/vcard_attachments/localization/hr_HR.inc
index 045ae8d3c..c22f93b5f 100644
--- a/plugins/vcard_attachments/localization/hr_HR.inc
+++ b/plugins/vcard_attachments/localization/hr_HR.inc
@@ -2,19 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/hr_HR/labels.inc                                         |
+ | plugins/vcard_attachments/localization/<lang>.inc                     |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Vcard Attachments plugin   |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Svebor Prstačić <svebor.prstacic@gmail.com>                 |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-vcard_attachments/
 */
 
 $labels = array();
 $labels['addvcardmsg'] = 'Dodaj vCard u imenik';
 $labels['vcardsavefailed'] = 'Ne mogu pohraniti vCard';
 
+?>
\ No newline at end of file
diff --git a/plugins/vcard_attachments/localization/hu_HU.inc b/plugins/vcard_attachments/localization/hu_HU.inc
index 475544d09..4f166b025 100644
--- a/plugins/vcard_attachments/localization/hu_HU.inc
+++ b/plugins/vcard_attachments/localization/hu_HU.inc
@@ -2,19 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/hu_HU/labels.inc                                         |
+ | plugins/vcard_attachments/localization/<lang>.inc                     |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Vcard Attachments plugin   |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Droszler Gabor <droszler@datatrans.hu>                        |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-vcard_attachments/
 */
 
 $labels = array();
 $labels['addvcardmsg'] = 'vCard hozzáadása a címjegyzékhez';
 $labels['vcardsavefailed'] = 'Sikertelen a vCard mentése';
 
+?>
\ No newline at end of file
diff --git a/plugins/vcard_attachments/localization/hy_AM.inc b/plugins/vcard_attachments/localization/hy_AM.inc
index 5799b1cb5..7bd99aec3 100644
--- a/plugins/vcard_attachments/localization/hy_AM.inc
+++ b/plugins/vcard_attachments/localization/hy_AM.inc
@@ -2,18 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/hy_AM/labels.inc                                         |
+ | plugins/vcard_attachments/localization/<lang>.inc                     |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Vcard Attachments plugin   |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Vahan Yerkanian <vahan@yerkanian.com>                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-vcard_attachments/
 */
 
 $labels = array();
 $labels['addvcardmsg'] = 'Ավելացնել vCard-ը հասցեագրքում';
 $labels['vcardsavefailed'] = 'vCard-ի պահպանումը ձախողվեց';
 
+?>
\ No newline at end of file
diff --git a/plugins/vcard_attachments/localization/id_ID.inc b/plugins/vcard_attachments/localization/id_ID.inc
index 488b558c9..8766e613d 100644
--- a/plugins/vcard_attachments/localization/id_ID.inc
+++ b/plugins/vcard_attachments/localization/id_ID.inc
@@ -2,19 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/id_ID/labels.inc                                         |
+ | plugins/vcard_attachments/localization/<lang>.inc                     |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Vcard Attachments plugin   |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Putu Arya Sabda Wijaya <Unknown>                              |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-vcard_attachments/
 */
 
 $labels = array();
 $labels['addvcardmsg'] = 'Tambahkan vCard ke buku alamat';
-$labels['vcardsavefailed'] = 'Tidak bisa menyimpan vCard';
+$labels['vcardsavefailed'] = 'Tidak dapat menyimpan vCard';
 
+?>
\ No newline at end of file
diff --git a/plugins/vcard_attachments/localization/it_IT.inc b/plugins/vcard_attachments/localization/it_IT.inc
index f13b34a92..e91f9414c 100644
--- a/plugins/vcard_attachments/localization/it_IT.inc
+++ b/plugins/vcard_attachments/localization/it_IT.inc
@@ -2,19 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/it_IT/labels.inc                                         |
+ | plugins/vcard_attachments/localization/<lang>.inc                     |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Vcard Attachments plugin   |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-vcard_attachments/
 */
 
 $labels = array();
 $labels['addvcardmsg'] = 'Aggiungi vCard alla Agenda';
 $labels['vcardsavefailed'] = 'Abilita a salvare vCard';
 
+?>
\ No newline at end of file
diff --git a/plugins/vcard_attachments/localization/ja_JP.inc b/plugins/vcard_attachments/localization/ja_JP.inc
index 00467a885..0daf160c4 100644
--- a/plugins/vcard_attachments/localization/ja_JP.inc
+++ b/plugins/vcard_attachments/localization/ja_JP.inc
@@ -2,19 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ja_JP/labels.inc                                         |
+ | plugins/vcard_attachments/localization/<lang>.inc                     |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Vcard Attachments plugin   |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Takahiro Kambe <Unknown>                                      |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-vcard_attachments/
 */
 
 $labels = array();
 $labels['addvcardmsg'] = 'vCardをアドレス帳に追加';
 $labels['vcardsavefailed'] = 'vCardを保存できませんでした。';
 
+?>
\ No newline at end of file
diff --git a/plugins/vcard_attachments/localization/km_KH.inc b/plugins/vcard_attachments/localization/km_KH.inc
index 7fa32c057..5720c0050 100644
--- a/plugins/vcard_attachments/localization/km_KH.inc
+++ b/plugins/vcard_attachments/localization/km_KH.inc
@@ -2,18 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/km_KH/labels.inc                                         |
+ | plugins/vcard_attachments/localization/<lang>.inc                     |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Vcard Attachments plugin   |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: samdyk                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-vcard_attachments/
 */
 
 $labels = array();
 $labels['addvcardmsg'] = 'បន្ថែម vCard ទៅសៀវភៅកត់ត្រា';
 $labels['vcardsavefailed'] = 'មិនអាចរក្សាទុក vCard';
 
+?>
\ No newline at end of file
diff --git a/plugins/vcard_attachments/localization/ko_KR.inc b/plugins/vcard_attachments/localization/ko_KR.inc
index d617efbe6..3e787f01b 100644
--- a/plugins/vcard_attachments/localization/ko_KR.inc
+++ b/plugins/vcard_attachments/localization/ko_KR.inc
@@ -2,18 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ko_KR/labels.inc                                         |
+ | plugins/vcard_attachments/localization/<lang>.inc                     |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Vcard Attachments plugin   |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Kim, Woohyun <woohyun.kim@gmail.com>                          |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-vcard_attachments/
 */
 
 $labels = array();
 $labels['addvcardmsg'] = '주소록에 vCard를 추가';
 $labels['vcardsavefailed'] = 'vCard 저장이 불가능함';
 
+?>
\ No newline at end of file
diff --git a/plugins/vcard_attachments/localization/lt_LT.inc b/plugins/vcard_attachments/localization/lt_LT.inc
index 4feb827bc..ca40c90ec 100644
--- a/plugins/vcard_attachments/localization/lt_LT.inc
+++ b/plugins/vcard_attachments/localization/lt_LT.inc
@@ -2,19 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/lt_LT/labels.inc                                         |
+ | plugins/vcard_attachments/localization/<lang>.inc                     |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Vcard Attachments plugin   |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Rimas Kudelis <rq@akl.lt>                                     |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-vcard_attachments/
 */
 
 $labels = array();
 $labels['addvcardmsg'] = 'Įtraukti vizitinę kortelę į adresų knygą';
 $labels['vcardsavefailed'] = 'Įrašyti vizitinės kortelės nepavyko';
 
+?>
\ No newline at end of file
diff --git a/plugins/vcard_attachments/localization/lv_LV.inc b/plugins/vcard_attachments/localization/lv_LV.inc
index 1c173f2a1..b3e36ff15 100644
--- a/plugins/vcard_attachments/localization/lv_LV.inc
+++ b/plugins/vcard_attachments/localization/lv_LV.inc
@@ -2,19 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/lv_LV/labels.inc                                         |
+ | plugins/vcard_attachments/localization/<lang>.inc                     |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Vcard Attachments plugin   |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Ivars Strazdiņš <Unknown>                                   |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-vcard_attachments/
 */
 
 $labels = array();
 $labels['addvcardmsg'] = 'Pievienot vizītkarti adrešu grāmatai';
 $labels['vcardsavefailed'] = 'Nevarēja saglabāt vizītkarti';
 
+?>
\ No newline at end of file
diff --git a/plugins/vcard_attachments/localization/ml_IN.inc b/plugins/vcard_attachments/localization/ml_IN.inc
index 1b4d98ab7..3613eab1b 100644
--- a/plugins/vcard_attachments/localization/ml_IN.inc
+++ b/plugins/vcard_attachments/localization/ml_IN.inc
@@ -2,18 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ml_IN/labels.inc                                         |
+ | plugins/vcard_attachments/localization/<lang>.inc                     |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Vcard Attachments plugin   |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Anish A <aneesh.nl@gmail.com>                                 |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-vcard_attachments/
 */
 
 $labels = array();
 $labels['addvcardmsg'] = 'വിലാസപുസ്തകത്തിലേക്ക് വികാര്‍ഡ് ചേര്‍ക്കുക';
 $labels['vcardsavefailed'] = 'വികാര്‍ഡ് ചേര്‍ക്കാന്‍ പറ്റിയില്ല';
 
+?>
\ No newline at end of file
diff --git a/plugins/vcard_attachments/localization/mr_IN.inc b/plugins/vcard_attachments/localization/mr_IN.inc
index 51ee6a4a9..17d1e3db9 100644
--- a/plugins/vcard_attachments/localization/mr_IN.inc
+++ b/plugins/vcard_attachments/localization/mr_IN.inc
@@ -2,19 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/mr_IN/labels.inc                                         |
+ | plugins/vcard_attachments/localization/<lang>.inc                     |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Vcard Attachments plugin   |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Devendra Buddhikot <devendradb@rediffmail.com>                |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-vcard_attachments/
 */
 
 $labels = array();
 $labels['addvcardmsg'] = 'व्हीकार्ड पत्ते नोंदवहीत समाविष्ट करा';
 $labels['vcardsavefailed'] = 'व्हीकार्ड जतन करण्यास असमर्थ';
 
+?>
\ No newline at end of file
diff --git a/plugins/vcard_attachments/localization/nb_NO.inc b/plugins/vcard_attachments/localization/nb_NO.inc
index 6568b7a12..c6e4fd4cd 100644
--- a/plugins/vcard_attachments/localization/nb_NO.inc
+++ b/plugins/vcard_attachments/localization/nb_NO.inc
@@ -2,19 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/nb_NB/labels.inc                                         |
+ | plugins/vcard_attachments/localization/<lang>.inc                     |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Vcard Attachments plugin   |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Runar Furenes <Unknown>                                       |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-vcard_attachments/
 */
 
 $labels = array();
 $labels['addvcardmsg'] = 'Legg til vCard i adresseboken';
 $labels['vcardsavefailed'] = 'Ikke i stand til å lagre vCard';
 
+?>
\ No newline at end of file
diff --git a/plugins/vcard_attachments/localization/nl_NL.inc b/plugins/vcard_attachments/localization/nl_NL.inc
index da3a440e2..bcba722b0 100644
--- a/plugins/vcard_attachments/localization/nl_NL.inc
+++ b/plugins/vcard_attachments/localization/nl_NL.inc
@@ -2,19 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/nl_NL/labels.inc                                         |
+ | plugins/vcard_attachments/localization/<lang>.inc                     |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Vcard Attachments plugin   |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Geert Wirken <Unknown>                                        |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-vcard_attachments/
 */
 
 $labels = array();
 $labels['addvcardmsg'] = 'Voeg vCard toe aan adresboek';
 $labels['vcardsavefailed'] = 'Kan vCard niet opslaan';
 
+?>
\ No newline at end of file
diff --git a/plugins/vcard_attachments/localization/nn_NO.inc b/plugins/vcard_attachments/localization/nn_NO.inc
index f435c6f43..398e08bb4 100644
--- a/plugins/vcard_attachments/localization/nn_NO.inc
+++ b/plugins/vcard_attachments/localization/nn_NO.inc
@@ -2,18 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/nn_NN/labels.inc                                         |
+ | plugins/vcard_attachments/localization/<lang>.inc                     |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Vcard Attachments plugin   |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Åsmund Skjæveland <aasmunds@ulrik.uio.no>                   |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-vcard_attachments/
 */
 
 $labels = array();
 $labels['addvcardmsg'] = 'Legg til vCard i adresseboka';
 $labels['vcardsavefailed'] = 'Klarte ikkje lagra vCard';
 
+?>
\ No newline at end of file
diff --git a/plugins/vcard_attachments/localization/pl_PL.inc b/plugins/vcard_attachments/localization/pl_PL.inc
index a12889588..036dec5a0 100644
--- a/plugins/vcard_attachments/localization/pl_PL.inc
+++ b/plugins/vcard_attachments/localization/pl_PL.inc
@@ -2,19 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/pl_PL/labels.inc                                         |
+ | plugins/vcard_attachments/localization/<lang>.inc                     |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Vcard Attachments plugin   |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-vcard_attachments/
 */
 
 $labels = array();
 $labels['addvcardmsg'] = 'Dodaj wizytówkę (vCard) do kontaktów';
 $labels['vcardsavefailed'] = 'Nie można zapisać wizytówki (vCard)';
 
+?>
\ No newline at end of file
diff --git a/plugins/vcard_attachments/localization/pt_BR.inc b/plugins/vcard_attachments/localization/pt_BR.inc
index a1bce781a..afcc08cbe 100644
--- a/plugins/vcard_attachments/localization/pt_BR.inc
+++ b/plugins/vcard_attachments/localization/pt_BR.inc
@@ -2,19 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/pt_BR/labels.inc                                         |
+ | plugins/vcard_attachments/localization/<lang>.inc                     |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Vcard Attachments plugin   |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-vcard_attachments/
 */
 
 $labels = array();
 $labels['addvcardmsg'] = 'Adicionar o vCard ao Catálogo de Endereços';
 $labels['vcardsavefailed'] = 'Impossível salvar o vCard';
 
+?>
\ No newline at end of file
diff --git a/plugins/vcard_attachments/localization/pt_PT.inc b/plugins/vcard_attachments/localization/pt_PT.inc
index 2f8fb158c..5758c91df 100644
--- a/plugins/vcard_attachments/localization/pt_PT.inc
+++ b/plugins/vcard_attachments/localization/pt_PT.inc
@@ -2,19 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/pt_PT/labels.inc                                         |
+ | plugins/vcard_attachments/localization/<lang>.inc                     |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Vcard Attachments plugin   |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: David <Unknown>                                               |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-vcard_attachments/
 */
 
 $labels = array();
 $labels['addvcardmsg'] = 'Adicionar o vCard ao Livro de Endereços';
 $labels['vcardsavefailed'] = 'Não foi possível guardar o vCard';
 
+?>
\ No newline at end of file
diff --git a/plugins/vcard_attachments/localization/ro_RO.inc b/plugins/vcard_attachments/localization/ro_RO.inc
index 64a9c174e..98f68a18a 100644
--- a/plugins/vcard_attachments/localization/ro_RO.inc
+++ b/plugins/vcard_attachments/localization/ro_RO.inc
@@ -2,19 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ro_RO/labels.inc                                         |
+ | plugins/vcard_attachments/localization/<lang>.inc                     |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Vcard Attachments plugin   |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: tudor <tudor@starnet-alba.ro>                                 |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-vcard_attachments/
 */
 
 $labels = array();
 $labels['addvcardmsg'] = 'Adaugă vCard la agendă';
 $labels['vcardsavefailed'] = 'Nu pot salva vCard';
 
+?>
\ No newline at end of file
diff --git a/plugins/vcard_attachments/localization/ru_RU.inc b/plugins/vcard_attachments/localization/ru_RU.inc
index 5225142bf..851035b95 100644
--- a/plugins/vcard_attachments/localization/ru_RU.inc
+++ b/plugins/vcard_attachments/localization/ru_RU.inc
@@ -2,19 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ru_RU/labels.inc                                         |
+ | plugins/vcard_attachments/localization/<lang>.inc                     |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Vcard Attachments plugin   |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-vcard_attachments/
 */
 
 $labels = array();
 $labels['addvcardmsg'] = 'Добавить в контакты';
 $labels['vcardsavefailed'] = 'Не удалось сохранить vCard';
 
+?>
\ No newline at end of file
diff --git a/plugins/vcard_attachments/localization/si_LK.inc b/plugins/vcard_attachments/localization/si_LK.inc
index 3f1aed58f..5231cc2ec 100644
--- a/plugins/vcard_attachments/localization/si_LK.inc
+++ b/plugins/vcard_attachments/localization/si_LK.inc
@@ -2,19 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/si_LK/labels.inc                                         |
+ | plugins/vcard_attachments/localization/<lang>.inc                     |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Vcard Attachments plugin   |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Mohamed Rizmi <Unknown>                                       |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-vcard_attachments/
 */
 
 $labels = array();
 $labels['addvcardmsg'] = 'vCard පත ලිපින පොතට එක් කරන්න';
 $labels['vcardsavefailed'] = 'vCard පත සුරැකීම අසාර්ථකයි';
 
+?>
\ No newline at end of file
diff --git a/plugins/vcard_attachments/localization/sk_SK.inc b/plugins/vcard_attachments/localization/sk_SK.inc
index eecbf4f05..937ed3307 100644
--- a/plugins/vcard_attachments/localization/sk_SK.inc
+++ b/plugins/vcard_attachments/localization/sk_SK.inc
@@ -2,19 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/sk_SK/labels.inc                                         |
+ | plugins/vcard_attachments/localization/<lang>.inc                     |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Vcard Attachments plugin   |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: panda <Unknown>                                               |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-vcard_attachments/
 */
 
 $labels = array();
 $labels['addvcardmsg'] = 'Pridať vCard do adresára';
 $labels['vcardsavefailed'] = 'Nemôžem uložiť vCard';
 
+?>
\ No newline at end of file
diff --git a/plugins/vcard_attachments/localization/sl_SI.inc b/plugins/vcard_attachments/localization/sl_SI.inc
index 490dc7238..4335040b4 100644
--- a/plugins/vcard_attachments/localization/sl_SI.inc
+++ b/plugins/vcard_attachments/localization/sl_SI.inc
@@ -2,19 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/sl_SI/labels.inc                                         |
+ | plugins/vcard_attachments/localization/<lang>.inc                     |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Vcard Attachments plugin   |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Barbara Krasovec <barbarak@arnes.si>                          |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-vcard_attachments/
 */
 
 $labels = array();
 $labels['addvcardmsg'] = 'Dodaj vCard med Stike.';
 $labels['vcardsavefailed'] = 'Stika vCard ni bilo mogoče shraniti.';
 
+?>
\ No newline at end of file
diff --git a/plugins/vcard_attachments/localization/sr_CS.inc b/plugins/vcard_attachments/localization/sr_CS.inc
index e5b66ed5a..b11a48758 100644
--- a/plugins/vcard_attachments/localization/sr_CS.inc
+++ b/plugins/vcard_attachments/localization/sr_CS.inc
@@ -2,18 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/sr_CS/labels.inc                                         |
+ | plugins/vcard_attachments/localization/<lang>.inc                     |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Vcard Attachments plugin   |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Saša Zejnilović <zejnils@gmail.com>                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-vcard_attachments/
 */
 
 $labels = array();
 $labels['addvcardmsg'] = 'Додај вЦард у Адресар';
 $labels['vcardsavefailed'] = 'немоћан сачувати вчард';
 
+?>
\ No newline at end of file
diff --git a/plugins/vcard_attachments/localization/sv_SE.inc b/plugins/vcard_attachments/localization/sv_SE.inc
index da40bf628..c0e925b8f 100644
--- a/plugins/vcard_attachments/localization/sv_SE.inc
+++ b/plugins/vcard_attachments/localization/sv_SE.inc
@@ -2,19 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/sv_SE/labels.inc                                         |
+ | plugins/vcard_attachments/localization/<lang>.inc                     |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Vcard Attachments plugin   |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-vcard_attachments/
 */
 
 $labels = array();
 $labels['addvcardmsg'] = 'Lägg till vCard i adressbok';
 $labels['vcardsavefailed'] = 'Kunde inte spara vCard';
 
+?>
\ No newline at end of file
diff --git a/plugins/vcard_attachments/localization/tr_TR.inc b/plugins/vcard_attachments/localization/tr_TR.inc
index 832ef5d22..a0e0d44ef 100644
--- a/plugins/vcard_attachments/localization/tr_TR.inc
+++ b/plugins/vcard_attachments/localization/tr_TR.inc
@@ -2,19 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/tr_TR/labels.inc                                         |
+ | plugins/vcard_attachments/localization/<lang>.inc                     |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Vcard Attachments plugin   |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: ismail yenigul <Unknown>                                      |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-vcard_attachments/
 */
 
 $labels = array();
 $labels['addvcardmsg'] = 'Vcard\'ı adres deferine ekle';
 $labels['vcardsavefailed'] = 'vCard kaydedilemedi';
 
+?>
\ No newline at end of file
diff --git a/plugins/vcard_attachments/localization/uk_UA.inc b/plugins/vcard_attachments/localization/uk_UA.inc
index 9ccfbf696..ed8eab35f 100644
--- a/plugins/vcard_attachments/localization/uk_UA.inc
+++ b/plugins/vcard_attachments/localization/uk_UA.inc
@@ -2,19 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/uk_UA/labels.inc                                         |
+ | plugins/vcard_attachments/localization/<lang>.inc                     |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Vcard Attachments plugin   |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Anton Gladky <Unknown>                                        |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-vcard_attachments/
 */
 
 $labels = array();
 $labels['addvcardmsg'] = 'Додати vCard до контактів';
 $labels['vcardsavefailed'] = 'Не вдалось зберегти vCard';
 
+?>
\ No newline at end of file
diff --git a/plugins/vcard_attachments/localization/vi_VN.inc b/plugins/vcard_attachments/localization/vi_VN.inc
index 895694bb2..247d61eb9 100644
--- a/plugins/vcard_attachments/localization/vi_VN.inc
+++ b/plugins/vcard_attachments/localization/vi_VN.inc
@@ -2,19 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/vi_VN/labels.inc                                         |
+ | plugins/vcard_attachments/localization/<lang>.inc                     |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Vcard Attachments plugin   |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Hung Pham <phamhung77@gmail.com>                              |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-vcard_attachments/
 */
 
 $labels = array();
 $labels['addvcardmsg'] = 'Thêm vCard vào sổ địa chỉ';
 $labels['vcardsavefailed'] = 'Không thể lưu vCard';
 
+?>
\ 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 7fe3c8f5f..5ff81a806 100644
--- a/plugins/vcard_attachments/localization/zh_CN.inc
+++ b/plugins/vcard_attachments/localization/zh_CN.inc
@@ -2,18 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/zh_CN/labels.inc                                         |
+ | plugins/vcard_attachments/localization/<lang>.inc                     |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Vcard Attachments plugin   |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Christopher Meng <cickumqt@gmail.com>                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-vcard_attachments/
 */
 
 $labels = array();
-$labels['addvcardmsg'] = '添加 vCard 到地址簿中';
+$labels['addvcardmsg'] = '添加 vCard 至地址簿中';
 $labels['vcardsavefailed'] = '无法保存 vCard';
 
+?>
\ No newline at end of file
diff --git a/plugins/vcard_attachments/localization/zh_TW.inc b/plugins/vcard_attachments/localization/zh_TW.inc
index c20f4416a..4ed21c2a7 100644
--- a/plugins/vcard_attachments/localization/zh_TW.inc
+++ b/plugins/vcard_attachments/localization/zh_TW.inc
@@ -2,19 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/zh_TW/labels.inc                                         |
+ | plugins/vcard_attachments/localization/<lang>.inc                     |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Vcard Attachments plugin   |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-vcard_attachments/
 */
 
 $labels = array();
 $labels['addvcardmsg'] = '加入 vCard 到通訊錄';
 $labels['vcardsavefailed'] = '無法儲存 vCard';
 
+?>
\ No newline at end of file
diff --git a/plugins/vcard_attachments/vcard_attachments.php b/plugins/vcard_attachments/vcard_attachments.php
index 4905b373e..cf7e22d3a 100644
--- a/plugins/vcard_attachments/vcard_attachments.php
+++ b/plugins/vcard_attachments/vcard_attachments.php
@@ -45,7 +45,7 @@ class vcard_attachments extends rcube_plugin
             }
         }
         // the same with message bodies
-        foreach ((array)$this->message->parts as $idx => $part) {
+        foreach ((array)$this->message->parts as $part) {
             if ($this->is_vcard($part)) {
                 $this->vcard_parts[] = $part->mime_id;
                 $this->vcard_bodies[] = $part->mime_id;
@@ -63,7 +63,6 @@ class vcard_attachments extends rcube_plugin
     function html_output($p)
     {
         $attach_script = false;
-        $icon = 'plugins/vcard_attachments/' .$this->local_skin_path(). '/vcard_add_contact.png';
 
         foreach ($this->vcard_parts as $part) {
             $vcards = rcube_vcard::import($this->message->get_part_content($part, null, true));
diff --git a/plugins/virtuser_file/virtuser_file.php b/plugins/virtuser_file/virtuser_file.php
index 2c705b2d0..974f33d3d 100644
--- a/plugins/virtuser_file/virtuser_file.php
+++ b/plugins/virtuser_file/virtuser_file.php
@@ -19,13 +19,13 @@ class virtuser_file extends rcube_plugin
 
     function init()
     {
-	    $this->app = rcmail::get_instance();
-	    $this->file = $this->app->config->get('virtuser_file');
+        $this->app = rcmail::get_instance();
+        $this->file = $this->app->config->get('virtuser_file');
 
-	    if ($this->file) {
-	        $this->add_hook('user2email', array($this, 'user2email'));
-	        $this->add_hook('email2user', array($this, 'email2user'));
-	    }
+        if ($this->file) {
+            $this->add_hook('user2email', array($this, 'user2email'));
+            $this->add_hook('email2user', array($this, 'email2user'));
+        }
     }
 
     /**
@@ -34,25 +34,24 @@ class virtuser_file extends rcube_plugin
     function user2email($p)
     {
         $r = $this->findinvirtual('/\s' . preg_quote($p['user'], '/') . '\s*$/');
-	    $result = array();
+        $result = array();
 
-	    for ($i=0; $i<count($r); $i++)
-	    {
-	        $arr = preg_split('/\s+/', $r[$i]);
+        for ($i=0; $i<count($r); $i++) {
+            $arr = preg_split('/\s+/', $r[$i]);
 
-	        if (count($arr) > 0 && strpos($arr[0], '@')) {
-		        $result[] = rcube_utils::idn_to_ascii(trim(str_replace('\\@', '@', $arr[0])));
+            if (count($arr) > 0 && strpos($arr[0], '@')) {
+                $result[] = rcube_utils::idn_to_ascii(trim(str_replace('\\@', '@', $arr[0])));
 
-		        if ($p['first']) {
-		            $p['email'] = $result[0];
-		            break;
-		        }
-	        }
-	    }
+                if ($p['first']) {
+                    $p['email'] = $result[0];
+                    break;
+                }
+            }
+        }
 
-	    $p['email'] = empty($result) ? NULL : $result;
+        $p['email'] = empty($result) ? NULL : $result;
 
-	    return $p;
+        return $p;
     }
 
     /**
@@ -60,18 +59,18 @@ class virtuser_file extends rcube_plugin
      */
     function email2user($p)
     {
-	    $r = $this->findinvirtual('/^' . preg_quote($p['email'], '/') . '\s/');
+        $r = $this->findinvirtual('/^' . preg_quote($p['email'], '/') . '\s/');
 
-	    for ($i=0; $i<count($r); $i++) {
-	        $arr = preg_split('/\s+/', trim($r[$i]));
+        for ($i=0; $i<count($r); $i++) {
+            $arr = preg_split('/\s+/', trim($r[$i]));
 
-	        if (count($arr) > 0) {
-		        $p['user'] = trim($arr[count($arr)-1]);
-		        break;
-	        }
-	    }
+            if (count($arr) > 0) {
+                $p['user'] = trim($arr[count($arr)-1]);
+                break;
+            }
+        }
 
-	    return $p;
+        return $p;
     }
 
     /**
@@ -82,26 +81,25 @@ class virtuser_file extends rcube_plugin
      */
     private function findinvirtual($pattern)
     {
-	    $result = array();
-	    $virtual = null;
+        $result = array();
+        $virtual = null;
 
-	    if ($this->file)
-	        $virtual = file($this->file);
+        if ($this->file)
+            $virtual = file($this->file);
 
-	    if (empty($virtual))
-	        return $result;
+        if (empty($virtual))
+            return $result;
 
-	    // check each line for matches
-	    foreach ($virtual as $line) {
-	        $line = trim($line);
-	        if (empty($line) || $line[0]=='#')
-	            continue;
+        // check each line for matches
+        foreach ($virtual as $line) {
+            $line = trim($line);
+            if (empty($line) || $line[0]=='#')
+                continue;
 
-	        if (preg_match($pattern, $line))
-	            $result[] = $line;
-	    }
+            if (preg_match($pattern, $line))
+                $result[] = $line;
+        }
 
-	    return $result;
+        return $result;
     }
-
 }
diff --git a/plugins/virtuser_query/package.xml b/plugins/virtuser_query/package.xml
index 58f697019..b7ea565d8 100644
--- a/plugins/virtuser_query/package.xml
+++ b/plugins/virtuser_query/package.xml
@@ -13,10 +13,10 @@
 		<email>alec@alec.pl</email>
 		<active>yes</active>
 	</lead>
-	<date>2011-11-21</date>
+	<date>2012-02-17</date>
 	<version>
-		<release>1.1</release>
-		<api>1.1</api>
+		<release>2.0</release>
+		<api>2.0</api>
 	</version>
 	<stability>
 		<release>stable</release>
diff --git a/plugins/virtuser_query/virtuser_query.php b/plugins/virtuser_query/virtuser_query.php
index c479a4f7f..9e3dc9071 100644
--- a/plugins/virtuser_query/virtuser_query.php
+++ b/plugins/virtuser_query/virtuser_query.php
@@ -17,6 +17,9 @@
  * The email query can return more than one record to create more identities.
  * This requires identities_level option to be set to value less than 2.
  *
+ * By default Roundcube database is used. To use different database (or host)
+ * you can specify DSN string in $rcmail_config['virtuser_query_dsn'] option.
+ *
  * @version @package_version@
  * @author Aleksander Machniak <alec@alec.pl>
  * @author Steffen Vogel
@@ -25,6 +28,7 @@ class virtuser_query extends rcube_plugin
 {
     private $config;
     private $app;
+    private $db;
 
     function init()
     {
@@ -53,9 +57,9 @@ class virtuser_query extends rcube_plugin
      */
     function user2email($p)
     {
-        $dbh = $this->app->get_dbh();
+        $dbh = $this->get_dbh();
 
-        $sql_result = $dbh->query(preg_replace('/%u/', $dbh->escapeSimple($p['user']), $this->config['email']));
+        $sql_result = $dbh->query(preg_replace('/%u/', $dbh->escape($p['user']), $this->config['email']));
 
         while ($sql_arr = $dbh->fetch_array($sql_result)) {
             if (strpos($sql_arr[0], '@')) {
@@ -74,8 +78,9 @@ class virtuser_query extends rcube_plugin
                     $result[] = $sql_arr[0];
                 }
 
-                if ($p['first'])
+                if ($p['first']) {
                     break;
+                }
             }
         }
 
@@ -89,9 +94,9 @@ class virtuser_query extends rcube_plugin
      */
     function email2user($p)
     {
-        $dbh = $this->app->get_dbh();
+        $dbh = $this->get_dbh();
 
-        $sql_result = $dbh->query(preg_replace('/%m/', $dbh->escapeSimple($p['email']), $this->config['user']));
+        $sql_result = $dbh->query(preg_replace('/%m/', $dbh->escape($p['email']), $this->config['user']));
 
         if ($sql_arr = $dbh->fetch_array($sql_result)) {
             $p['user'] = $sql_arr[0];
@@ -105,9 +110,9 @@ class virtuser_query extends rcube_plugin
      */
     function user2host($p)
     {
-        $dbh = $this->app->get_dbh();
+        $dbh = $this->get_dbh();
 
-        $sql_result = $dbh->query(preg_replace('/%u/', $dbh->escapeSimple($p['user']), $this->config['host']));
+        $sql_result = $dbh->query(preg_replace('/%u/', $dbh->escape($p['user']), $this->config['host']));
 
         if ($sql_arr = $dbh->fetch_array($sql_result)) {
             $p['host'] = $sql_arr[0];
@@ -116,5 +121,25 @@ class virtuser_query extends rcube_plugin
         return $p;
     }
 
+    /**
+     * Initialize database handler
+     */
+    function get_dbh()
+    {
+        if (!$this->db) {
+            if ($dsn = $this->app->config->get('virtuser_query_dsn')) {
+                // connect to the virtuser database
+                $this->db = rcube_db::factory($dsn);
+                $this->db->set_debug((bool)$this->app->config->get('sql_debug'));
+                $this->db->db_connect('r'); // connect in read mode
+            }
+            else {
+                $this->db = $this->app->get_dbh();
+            }
+        }
+
+        return $this->db;
+    }
+
 }
 
diff --git a/plugins/zipdownload/localization/az_AZ.inc b/plugins/zipdownload/localization/az_AZ.inc
index 215e4591b..e23eaa1f6 100644
--- a/plugins/zipdownload/localization/az_AZ.inc
+++ b/plugins/zipdownload/localization/az_AZ.inc
@@ -2,18 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/az_AZ/labels.inc                                         |
+ | plugins/zipdownload/localization/<lang>.inc                           |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Zipdownload plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Orkhan Guliyev <proger@box.az>                                |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
 
 $labels = array();
 $labels['downloadall'] = 'Bütün qoşmaları endir';
 $labels['downloadfolder'] = 'Qovluğu endir';
 
+?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/br.inc b/plugins/zipdownload/localization/br.inc
index 764952fc8..6e6cdb342 100644
--- a/plugins/zipdownload/localization/br.inc
+++ b/plugins/zipdownload/localization/br.inc
@@ -2,18 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/br/labels.inc                                         |
+ | plugins/zipdownload/localization/<lang>.inc                           |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Zipdownload plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Denis                                                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
 
 $labels = array();
 $labels['downloadall'] = 'Pellgargañ an holl stagadennoù';
 $labels['downloadfolder'] = 'Pellgargañ an teuliad';
 
+?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/bs_BA.inc b/plugins/zipdownload/localization/bs_BA.inc
index cf7c96346..8c727987d 100644
--- a/plugins/zipdownload/localization/bs_BA.inc
+++ b/plugins/zipdownload/localization/bs_BA.inc
@@ -2,18 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/bs_BA/labels.inc                                         |
+ | plugins/zipdownload/localization/<lang>.inc                           |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Zipdownload plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Kenan Dervišević <kenan3008@gmail.com>                      |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
 
 $labels = array();
 $labels['downloadall'] = 'Preuzmi sve priloge';
 $labels['downloadfolder'] = 'Preuzmi folder';
 
+?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/ca_ES.inc b/plugins/zipdownload/localization/ca_ES.inc
index 8ccf0543c..423dae2fd 100644
--- a/plugins/zipdownload/localization/ca_ES.inc
+++ b/plugins/zipdownload/localization/ca_ES.inc
@@ -1,10 +1,23 @@
 <?php
-/* Author: Drakon */
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/zipdownload/localization/<lang>.inc                           |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail Zipdownload plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
+*/
 
 $labels = array();
 $labels['downloadall'] = 'Descarregar tots els adjunts';
 $labels['downloadfolder'] = 'Descarregar carpeta';
 
-$messages = array();
-
 ?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/cs_CZ.inc b/plugins/zipdownload/localization/cs_CZ.inc
index 4a1f75177..07f9676ac 100644
--- a/plugins/zipdownload/localization/cs_CZ.inc
+++ b/plugins/zipdownload/localization/cs_CZ.inc
@@ -1,10 +1,23 @@
 <?php
-/* Author: Tomáš Šafařík */
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/zipdownload/localization/<lang>.inc                           |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail Zipdownload plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
+*/
 
 $labels = array();
 $labels['downloadall'] = 'Stáhnout všechny přílohy';
 $labels['downloadfolder'] = 'Stáhnout složku';
 
-$messages = array();
-
 ?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/cy_GB.inc b/plugins/zipdownload/localization/cy_GB.inc
index c3b846de4..412fd2261 100644
--- a/plugins/zipdownload/localization/cy_GB.inc
+++ b/plugins/zipdownload/localization/cy_GB.inc
@@ -2,18 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/cy_GB/labels.inc                                         |
+ | plugins/zipdownload/localization/<lang>.inc                           |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Zipdownload plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Dafydd Tomos                                                  |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
 
 $labels = array();
 $labels['downloadall'] = 'Llwytho lawr holl atodiadau';
 $labels['downloadfolder'] = 'Ffolder llwytho lawr';
 
+?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/da_DK.inc b/plugins/zipdownload/localization/da_DK.inc
index 17c7c0d82..ced645ab2 100644
--- a/plugins/zipdownload/localization/da_DK.inc
+++ b/plugins/zipdownload/localization/da_DK.inc
@@ -1,10 +1,23 @@
 <?php
-/* Author: John Loft Christiansen */
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/zipdownload/localization/<lang>.inc                           |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail Zipdownload plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
+*/
 
 $labels = array();
 $labels['downloadall'] = 'Download alle som .zip-fil';
 $labels['downloadfolder'] = 'Download folder som .zip-fil';
 
-$messages = array();
-
 ?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/de_CH.inc b/plugins/zipdownload/localization/de_CH.inc
index 5a62e776f..6106c2c72 100644
--- a/plugins/zipdownload/localization/de_CH.inc
+++ b/plugins/zipdownload/localization/de_CH.inc
@@ -5,7 +5,7 @@
  | plugins/zipdownload/localization/<lang>.inc                           |
  |                                                                       |
  | Localization file of the Roundcube Webmail Zipdownload plugin         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
diff --git a/plugins/zipdownload/localization/de_DE.inc b/plugins/zipdownload/localization/de_DE.inc
index 68725605b..6106c2c72 100644
--- a/plugins/zipdownload/localization/de_DE.inc
+++ b/plugins/zipdownload/localization/de_DE.inc
@@ -1,10 +1,23 @@
 <?php
-/* Author: jedix */
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/zipdownload/localization/<lang>.inc                           |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail Zipdownload plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
+*/
 
 $labels = array();
 $labels['downloadall'] = 'Alle Anhänge herunterladen';
 $labels['downloadfolder'] = 'Ordner herunterladen';
 
-$messages = array();
-
 ?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/en_GB.inc b/plugins/zipdownload/localization/en_GB.inc
index 0db6f8f8c..aee8a5e15 100644
--- a/plugins/zipdownload/localization/en_GB.inc
+++ b/plugins/zipdownload/localization/en_GB.inc
@@ -1,10 +1,23 @@
 <?php
-/* Author: Philip Weir */
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/zipdownload/localization/<lang>.inc                           |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail Zipdownload plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
+*/
 
 $labels = array();
 $labels['downloadall'] = 'Download all attachments';
 $labels['downloadfolder'] = 'Download folder';
 
-$messages = array();
-
 ?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/en_US.inc b/plugins/zipdownload/localization/en_US.inc
index 8823d3b8d..aee8a5e15 100644
--- a/plugins/zipdownload/localization/en_US.inc
+++ b/plugins/zipdownload/localization/en_US.inc
@@ -5,7 +5,7 @@
  | plugins/zipdownload/localization/<lang>.inc                           |
  |                                                                       |
  | Localization file of the Roundcube Webmail Zipdownload plugin         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
diff --git a/plugins/zipdownload/localization/es_AR.inc b/plugins/zipdownload/localization/es_AR.inc
index f3a798c85..6240e3bce 100644
--- a/plugins/zipdownload/localization/es_AR.inc
+++ b/plugins/zipdownload/localization/es_AR.inc
@@ -1,9 +1,23 @@
 <?php
-/* Author: gboksar */
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/zipdownload/localization/<lang>.inc                           |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail Zipdownload plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
+*/
 
 $labels = array();
 $labels['downloadall'] = 'Descargar Todo';
-
-$messages = array();
+$labels['downloadfolder'] = 'Descargar carpeta';
 
 ?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/es_ES.inc b/plugins/zipdownload/localization/es_ES.inc
index 193f7b450..315362f1c 100644
--- a/plugins/zipdownload/localization/es_ES.inc
+++ b/plugins/zipdownload/localization/es_ES.inc
@@ -1,10 +1,23 @@
 <?php
-/* Author: David Garabana Barro */
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/zipdownload/localization/<lang>.inc                           |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail Zipdownload plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
+*/
 
 $labels = array();
 $labels['downloadall'] = 'Descargar todos los adjuntos';
 $labels['downloadfolder'] = 'Descargar carpeta';
 
-$messages = array();
-
 ?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/et_EE.inc b/plugins/zipdownload/localization/et_EE.inc
index f56a59870..6f03e33c0 100644
--- a/plugins/zipdownload/localization/et_EE.inc
+++ b/plugins/zipdownload/localization/et_EE.inc
@@ -2,18 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/et_EE/labels.inc                                         |
+ | plugins/zipdownload/localization/<lang>.inc                           |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Zipdownload plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: yllar                                                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
 
 $labels = array();
 $labels['downloadall'] = 'Laadi alla kõik manused';
 $labels['downloadfolder'] = 'Allalaadimiste kaust';
 
+?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/fa_IR.inc b/plugins/zipdownload/localization/fa_IR.inc
index 3ad7c2bd2..41585688e 100644
--- a/plugins/zipdownload/localization/fa_IR.inc
+++ b/plugins/zipdownload/localization/fa_IR.inc
@@ -2,18 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/fa_IR/labels.inc                                         |
+ | plugins/zipdownload/localization/<lang>.inc                           |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Zipdownload plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Hamid <abbaszadeh.h@gmail.com>                                |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
 
 $labels = array();
 $labels['downloadall'] = 'بارگیری همه پیوست‌ها';
 $labels['downloadfolder'] = 'بارگیری پوشه';
 
+?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/fr_FR.inc b/plugins/zipdownload/localization/fr_FR.inc
index b8fc4cdaa..307f0b2f6 100644
--- a/plugins/zipdownload/localization/fr_FR.inc
+++ b/plugins/zipdownload/localization/fr_FR.inc
@@ -1,10 +1,23 @@
 <?php
-/* Author: Olivier Le Brouster */
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/zipdownload/localization/<lang>.inc                           |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail Zipdownload plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
+*/
 
 $labels = array();
 $labels['downloadall'] = 'Télécharger toutes les pièces jointes';
 $labels['downloadfolder'] = 'Télécharger le répertoire';
 
-$messages = array();
-
 ?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/gl_ES.inc b/plugins/zipdownload/localization/gl_ES.inc
index 2c9107949..3925fca5b 100644
--- a/plugins/zipdownload/localization/gl_ES.inc
+++ b/plugins/zipdownload/localization/gl_ES.inc
@@ -1,10 +1,23 @@
 <?php
-/* Author: David Garabana Barro */
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/zipdownload/localization/<lang>.inc                           |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail Zipdownload plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
+*/
 
 $labels = array();
 $labels['downloadall'] = 'Descargar tódolos adxuntos';
 $labels['downloadfolder'] = 'Descargar o cartafol';
 
-$messages = array();
-
 ?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/he_IL.inc b/plugins/zipdownload/localization/he_IL.inc
index 62e82e754..0ba0fcff8 100644
--- a/plugins/zipdownload/localization/he_IL.inc
+++ b/plugins/zipdownload/localization/he_IL.inc
@@ -2,18 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/he_IL/labels.inc                                         |
+ | plugins/zipdownload/localization/<lang>.inc                           |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Zipdownload plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Moshe Leibovitch <moish@mln.co.il>                            |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
 
 $labels = array();
 $labels['downloadall'] = 'להוריד את כל הצרופות';
 $labels['downloadfolder'] = 'תיקיית צרופות';
 
+?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/hu_HU.inc b/plugins/zipdownload/localization/hu_HU.inc
index 1931cb0f2..7b8ce85dc 100644
--- a/plugins/zipdownload/localization/hu_HU.inc
+++ b/plugins/zipdownload/localization/hu_HU.inc
@@ -1,10 +1,23 @@
 <?php
-/* Author: Németh János */
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/zipdownload/localization/<lang>.inc                           |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail Zipdownload plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
+*/
 
 $labels = array();
 $labels['downloadall'] = 'Összes csatolmány letöltése';
 $labels['downloadfolder'] = 'Könyvtár letöltése';
 
-$messages = array();
-
 ?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/it_IT.inc b/plugins/zipdownload/localization/it_IT.inc
index 63b7b072e..4ea8a543d 100644
--- a/plugins/zipdownload/localization/it_IT.inc
+++ b/plugins/zipdownload/localization/it_IT.inc
@@ -1,10 +1,23 @@
 <?php
-/* Author: Roberto Puzzanghera */
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/zipdownload/localization/<lang>.inc                           |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail Zipdownload plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
+*/
 
 $labels = array();
 $labels['downloadall'] = 'Scarica tutti gli allegati';
 $labels['downloadfolder'] = 'Scarica cartella';
 
-$messages = array();
-
 ?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/ja_JP.inc b/plugins/zipdownload/localization/ja_JP.inc
index 97a436f90..c606658b4 100644
--- a/plugins/zipdownload/localization/ja_JP.inc
+++ b/plugins/zipdownload/localization/ja_JP.inc
@@ -2,18 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ja_JP/labels.inc                                         |
+ | plugins/zipdownload/localization/<lang>.inc                           |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Zipdownload plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Takahiro Kambe                                                |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
 
 $labels = array();
 $labels['downloadall'] = 'すべての添付ファイルをダウンロード';
 $labels['downloadfolder'] = 'ダウンロード先のフォルダー';
 
+?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/km_KH.inc b/plugins/zipdownload/localization/km_KH.inc
index 0fcf8e147..722e0c8ce 100644
--- a/plugins/zipdownload/localization/km_KH.inc
+++ b/plugins/zipdownload/localization/km_KH.inc
@@ -2,18 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/km_KH/labels.inc                                         |
+ | plugins/zipdownload/localization/<lang>.inc                           |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Zipdownload plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: samdyk                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
 
 $labels = array();
 $labels['downloadall'] = 'ទាញយក ឯកសារភ្ជាប់ទាំងអស់';
 $labels['downloadfolder'] = 'ទាញយក ថតឯកសារ';
 
+?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/lt_LT.inc b/plugins/zipdownload/localization/lt_LT.inc
index 1b74df371..08a5818cd 100644
--- a/plugins/zipdownload/localization/lt_LT.inc
+++ b/plugins/zipdownload/localization/lt_LT.inc
@@ -2,18 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/lt_LT/labels.inc                                         |
+ | plugins/zipdownload/localization/<lang>.inc                           |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Zipdownload plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Linvydas Lapinskas <win0lin1@gmail.com>                       |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
 
 $labels = array();
 $labels['downloadall'] = 'Atsisiųsti visus priedus';
 $labels['downloadfolder'] = 'Atsisiųsti aplanką';
 
+?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/nb_NO.inc b/plugins/zipdownload/localization/nb_NO.inc
index d8f548044..637df9063 100644
--- a/plugins/zipdownload/localization/nb_NO.inc
+++ b/plugins/zipdownload/localization/nb_NO.inc
@@ -2,18 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/nb_NB/labels.inc                                         |
+ | plugins/zipdownload/localization/<lang>.inc                           |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Zipdownload plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Martin Bore                                                   |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
 
 $labels = array();
 $labels['downloadall'] = 'Last ned alle vedlegg';
 $labels['downloadfolder'] = 'Nedlastningsmappe';
 
+?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/nl_NL.inc b/plugins/zipdownload/localization/nl_NL.inc
index 1cf32ce12..174dd0f8d 100644
--- a/plugins/zipdownload/localization/nl_NL.inc
+++ b/plugins/zipdownload/localization/nl_NL.inc
@@ -1,10 +1,23 @@
 <?php
-/* Author: Wouter Kevenaar*/
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/zipdownload/localization/<lang>.inc                           |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail Zipdownload plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
+*/
 
 $labels = array();
 $labels['downloadall'] = 'Alle bijlagen downloaden';
 $labels['downloadfolder'] = 'Map downloaden';
 
-$messages = array();
-
 ?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/nn_NO.inc b/plugins/zipdownload/localization/nn_NO.inc
index b9ae2a86f..637df9063 100644
--- a/plugins/zipdownload/localization/nn_NO.inc
+++ b/plugins/zipdownload/localization/nn_NO.inc
@@ -2,18 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/nn_NN/labels.inc                                         |
+ | plugins/zipdownload/localization/<lang>.inc                           |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Zipdownload plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Åsmund Skjæveland <aasmunds@ulrik.uio.no>                   |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
 
 $labels = array();
 $labels['downloadall'] = 'Last ned alle vedlegg';
 $labels['downloadfolder'] = 'Nedlastningsmappe';
 
+?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/pl_PL.inc b/plugins/zipdownload/localization/pl_PL.inc
index c86d87558..b0880c062 100644
--- a/plugins/zipdownload/localization/pl_PL.inc
+++ b/plugins/zipdownload/localization/pl_PL.inc
@@ -1,10 +1,23 @@
 <?php
-/* Author: DZIOBAK */
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/zipdownload/localization/<lang>.inc                           |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail Zipdownload plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
+*/
 
 $labels = array();
 $labels['downloadall'] = 'Pobierz wszystkie jako ZIP';
 $labels['downloadfolder'] = 'Pobierz folder';
 
-$messages = array();
-
 ?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/pt_BR.inc b/plugins/zipdownload/localization/pt_BR.inc
index babf7c0e9..7f80777b4 100644
--- a/plugins/zipdownload/localization/pt_BR.inc
+++ b/plugins/zipdownload/localization/pt_BR.inc
@@ -2,18 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/pt_BR/labels.inc                                         |
+ | plugins/zipdownload/localization/<lang>.inc                           |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Zipdownload plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Edir Pereira dos Santos <fennder@gmail.com>                   |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
 
 $labels = array();
 $labels['downloadall'] = 'Baixar todos os anexos';
 $labels['downloadfolder'] = 'Pasta de baixar arquivos';
 
+?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/pt_PT.inc b/plugins/zipdownload/localization/pt_PT.inc
index fb012bada..8a5afeb06 100644
--- a/plugins/zipdownload/localization/pt_PT.inc
+++ b/plugins/zipdownload/localization/pt_PT.inc
@@ -2,18 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/pt_PT/labels.inc                                         |
+ | plugins/zipdownload/localization/<lang>.inc                           |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Zipdownload plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: David                                                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
 
 $labels = array();
 $labels['downloadall'] = 'Guardar todos os anexos';
 $labels['downloadfolder'] = 'Guardar pasta';
 
+?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/ro_RO.inc b/plugins/zipdownload/localization/ro_RO.inc
index 3a2a1ac19..7cba54d32 100644
--- a/plugins/zipdownload/localization/ro_RO.inc
+++ b/plugins/zipdownload/localization/ro_RO.inc
@@ -1,9 +1,23 @@
 <?php
-/* Author: Ovidiu Bica */
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/zipdownload/localization/<lang>.inc                           |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail Zipdownload plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
+*/
 
 $labels = array();
 $labels['downloadall'] = 'Descarca toate atasamentele.';
-
-$messages = array();
+$labels['downloadfolder'] = 'Dosar de descărcare';
 
 ?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/ru_RU.inc b/plugins/zipdownload/localization/ru_RU.inc
index ac11327a0..014b2001e 100644
--- a/plugins/zipdownload/localization/ru_RU.inc
+++ b/plugins/zipdownload/localization/ru_RU.inc
@@ -1,10 +1,23 @@
 <?php
-/* Author: Peter Zotov */
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/zipdownload/localization/<lang>.inc                           |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail Zipdownload plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
+*/
 
 $labels = array();
 $labels['downloadall'] = 'Загрузить все вложения';
 $labels['downloadfolder'] = 'Загрузить каталог';
 
-$messages = array();
-
 ?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/sk_SK.inc b/plugins/zipdownload/localization/sk_SK.inc
index b12318c54..b26059cb9 100644
--- a/plugins/zipdownload/localization/sk_SK.inc
+++ b/plugins/zipdownload/localization/sk_SK.inc
@@ -2,18 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/sk_SK/labels.inc                                         |
+ | plugins/zipdownload/localization/<lang>.inc                           |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Zipdownload plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Miroslav Ďurian                                              |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
 
 $labels = array();
 $labels['downloadall'] = 'Stiahnuť všetky prílohy';
 $labels['downloadfolder'] = 'Priečinok na sťahovanie';
 
+?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/sr_CS.inc b/plugins/zipdownload/localization/sr_CS.inc
index d7076d5c8..b8d63b3f5 100644
--- a/plugins/zipdownload/localization/sr_CS.inc
+++ b/plugins/zipdownload/localization/sr_CS.inc
@@ -2,18 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/sr_CS/labels.inc                                         |
+ | plugins/zipdownload/localization/<lang>.inc                           |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Zipdownload plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Данило Шеган                                       |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
 
 $labels = array();
 $labels['downloadall'] = 'Преузми све прилоге';
 $labels['downloadfolder'] = 'Фасцикла за преузимање';
 
+?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/sv_SE.inc b/plugins/zipdownload/localization/sv_SE.inc
index 020daeed6..db8a1a368 100644
--- a/plugins/zipdownload/localization/sv_SE.inc
+++ b/plugins/zipdownload/localization/sv_SE.inc
@@ -2,18 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/sv_SE/labels.inc                                         |
+ | plugins/zipdownload/localization/<lang>.inc                           |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Zipdownload plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Jonas Nasholm                                                 |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
 
 $labels = array();
 $labels['downloadall'] = 'Hämta alla bifogade filer';
 $labels['downloadfolder'] = 'Hämta katalog';
 
+?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/tr_TR.inc b/plugins/zipdownload/localization/tr_TR.inc
index dc7489da1..bfdf98a6c 100644
--- a/plugins/zipdownload/localization/tr_TR.inc
+++ b/plugins/zipdownload/localization/tr_TR.inc
@@ -1,10 +1,23 @@
 <?php
-/* Author: Mustafa Icer */
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/zipdownload/localization/<lang>.inc                           |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail Zipdownload plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
+*/
 
 $labels = array();
 $labels['downloadall'] = 'Tüm ek dosyaları indir';
 $labels['downloadfolder'] = 'klasörü indir';
 
-$messages = array();
-
 ?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/vi_VN.inc b/plugins/zipdownload/localization/vi_VN.inc
index 919c40396..a91b32010 100644
--- a/plugins/zipdownload/localization/vi_VN.inc
+++ b/plugins/zipdownload/localization/vi_VN.inc
@@ -2,18 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/vi_VN/labels.inc                                         |
+ | plugins/zipdownload/localization/<lang>.inc                           |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Zipdownload plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Kenny Tran <kennethanh@gmail.com>                             |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
 
 $labels = array();
 $labels['downloadall'] = 'Tải tất cả đính kèm về';
 $labels['downloadfolder'] = 'Tải giữ liệu về';
 
+?>
\ No newline at end of file
diff --git a/plugins/zipdownload/localization/zh_TW.inc b/plugins/zipdownload/localization/zh_TW.inc
index 8f5ae363a..cc8d673a1 100644
--- a/plugins/zipdownload/localization/zh_TW.inc
+++ b/plugins/zipdownload/localization/zh_TW.inc
@@ -2,18 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/zh_TW/labels.inc                                         |
+ | plugins/zipdownload/localization/<lang>.inc                           |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Zipdownload plugin         |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: 林子忠                                                     |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-zipdownload/
 */
 
 $labels = array();
 $labels['downloadall'] = '下載所有附件';
 $labels['downloadfolder'] = '下載資料夾';
 
+?>
\ No newline at end of file
diff --git a/plugins/zipdownload/skins/larry/zipdownload.css b/plugins/zipdownload/skins/larry/zipdownload.css
index d719ac677..bb92631b1 100644
--- a/plugins/zipdownload/skins/larry/zipdownload.css
+++ b/plugins/zipdownload/skins/larry/zipdownload.css
@@ -2,6 +2,6 @@
 
 a.zipdownload {
 	display: inline-block;
-	margin-top: 1.5em;
+	margin-top: .5em;
 	padding: 3px 5px 4px 5px;
-}
\ No newline at end of file
+}
diff --git a/plugins/zipdownload/zipdownload.php b/plugins/zipdownload/zipdownload.php
index 96c76eec9..59431267d 100644
--- a/plugins/zipdownload/zipdownload.php
+++ b/plugins/zipdownload/zipdownload.php
@@ -30,9 +30,9 @@ class zipdownload extends rcube_plugin
 		}
 
 		$rcmail = rcmail::get_instance();
-		$this->charset = $rcmail->config->get('zipdownload_charset', RCUBE_CHARSET);
 
 		$this->load_config();
+		$this->charset = $rcmail->config->get('zipdownload_charset', RCUBE_CHARSET);
 		$this->add_texts('localization');
 
 		if ($rcmail->config->get('zipdownload_attachments', 1) > -1 && ($rcmail->action == 'show' || $rcmail->action == 'preview'))
@@ -108,7 +108,7 @@ class zipdownload extends rcube_plugin
 		foreach ($message->attachments as $part) {
 			$pid = $part->mime_id;
 			$part = $message->mime_parts[$pid];
-			$disp_name = $this->_convert_filename($part->filename, $part->charset);
+			$disp_name = $this->_convert_filename($part->filename);
 
 			if ($part->body) {
 				$orig_message_raw = $part->body;
@@ -169,7 +169,7 @@ class zipdownload extends rcube_plugin
 			for ($i = 0; ($i * $imap->get_pagesize()) <= $count; $i++) {
 				$a_headers = $imap->list_messages($mbox_name, ($i + 1));
 
-				foreach ($a_headers as $n => $header) {
+				foreach ($a_headers as $header) {
 					if (empty($header))
 						continue;
 
@@ -199,7 +199,7 @@ class zipdownload extends rcube_plugin
 		$zip = new ZipArchive();
 		$zip->open($tmpfname, ZIPARCHIVE::OVERWRITE);
 
-		foreach ($uids as $key => $uid){
+		foreach ($uids as $uid){
 			$headers = $imap->get_message_headers($uid);
 			$subject = rcube_mime::decode_mime_string((string)$headers->subject);
 			$subject = $this->_convert_filename($subject);
@@ -211,7 +211,7 @@ class zipdownload extends rcube_plugin
 				$disp_name = "message_rfc822.eml";
 
 			$disp_name = $uid . "_" . $disp_name;
-			
+
 			$tmpfn = tempnam($temp_dir, 'zipmessage');
 			$tmpfp = fopen($tmpfn, 'w');
 			$imap->get_raw_body($uid, $tmpfp);
@@ -263,10 +263,10 @@ class zipdownload extends rcube_plugin
 	/**
 	 * Helper function to convert filenames to the configured charset
 	 */
-	private function _convert_filename($str, $from = RCUBE_CHARSET)
+	private function _convert_filename($str)
 	{
-		return strtr(rcube_charset::convert($str, $from, $this->charset), array(':'=>'', '/'=>'-'));
+        $str = rcube_charset::convert($str, RCUBE_CHARSET, $this->charset);
+
+		return strtr($str, array(':'=>'', '/'=>'-'));
 	}
 }
-
-?>
\ No newline at end of file
diff --git a/program/include/bc.php b/program/include/bc.php
index 3d9d46289..a7d7b5ac1 100644
--- a/program/include/bc.php
+++ b/program/include/bc.php
@@ -62,7 +62,7 @@ function rcmail_url($action, $p=array(), $task=null)
 
 function rcmail_temp_gc()
 {
-  $rcmail = rcmail::get_instance()->temp_gc();
+  rcmail::get_instance()->gc_temp();
 }
 
 function rcube_charset_convert($str, $from, $to=NULL)
@@ -205,9 +205,9 @@ function rcmail_quota_content($attrib = null)
     return rcmail::get_instance()->quota_content($attrib);
 }
 
-function rcmail_display_server_error($fallback=null, $fallback_args=null)
+function rcmail_display_server_error($fallback=null, $fallback_args=null, $suffix='')
 {
-    rcmail::get_instance()->display_server_error($fallback, $fallback_args);
+    rcmail::get_instance()->display_server_error($fallback, $fallback_args, $suffix);
 }
 
 function rcmail_filetype2classname($mimetype, $filename)
@@ -287,7 +287,7 @@ function rcmail_remote_ip()
 
 function rcube_check_referer()
 {
-    return rcmail::check_referer();
+    return rcube_utils::check_referer();
 }
 
 function rcube_timer()
@@ -405,6 +405,16 @@ function enriched_to_html($data)
     return rcube_enriched::to_html($data);
 }
 
+function strip_quotes($str)
+{
+    return str_replace(array("'", '"'), '', $str);
+}
+
+function strip_newlines($str)
+{
+    return preg_replace('/[\r\n]/', '', $str);
+}
+
 class rcube_html_page extends rcmail_html_page
 {
 }
diff --git a/program/include/iniset.php b/program/include/iniset.php
index 35b5522fc..919cc7682 100644
--- a/program/include/iniset.php
+++ b/program/include/iniset.php
@@ -21,24 +21,9 @@
 */
 
 // application constants
-define('RCMAIL_VERSION', '0.9-git');
+define('RCMAIL_VERSION', '1.0-git');
 define('RCMAIL_START', microtime(true));
 
-$config = array(
-    // Some users are not using Installer, so we'll check some
-    // critical PHP settings here. Only these, which doesn't provide
-    // an error/warning in the logs later. See (#1486307).
-    'suhosin.session.encrypt' => 0,
-    'session.auto_start'      => 0,
-    'file_uploads'            => 1,
-);
-foreach ($config as $optname => $optval) {
-    if ($optval != ini_get($optname) && @ini_set($optname, $optval) === false) {
-        die("ERROR: Wrong '$optname' option value and it wasn't possible to set it to required value ($optval).\n"
-            ."Check your PHP configuration (including php_admin_flag).");
-    }
-}
-
 if (!defined('INSTALL_PATH')) {
     define('INSTALL_PATH', dirname($_SERVER['SCRIPT_FILENAME']).'/');
 }
@@ -75,6 +60,11 @@ require_once 'Roundcube/bootstrap.php';
 // register autoloader for rcmail app classes
 spl_autoload_register('rcmail_autoload');
 
+// include composer autoloader (if available)
+if (file_exists('vendor/autoload.php')) {
+    require 'vendor/autoload.php';
+}
+
 // backward compatybility (to be removed)
 require_once INSTALL_PATH . 'program/include/bc.php';
 
diff --git a/program/include/rcmail.php b/program/include/rcmail.php
index 5f2a2177b..39d804d1f 100644
--- a/program/include/rcmail.php
+++ b/program/include/rcmail.php
@@ -98,7 +98,10 @@ class rcmail extends rcube
 
     // reset some session parameters when changing task
     if ($this->task != 'utils') {
-      if ($this->session && $_SESSION['task'] != $this->task)
+      // we reset list page when switching to another task
+      // but only to the main task interface - empty action (#1489076)
+      // this will prevent from unintentional page reset on cross-task requests
+      if ($this->session && $_SESSION['task'] != $this->task && empty($this->action))
         $this->session->remove('page');
       // set current task to session
       $_SESSION['task'] = $this->task;
@@ -123,7 +126,7 @@ class rcmail extends rcube
    */
   public function set_task($task)
   {
-    $task = asciiwords($task);
+    $task = asciiwords($task, true);
 
     if ($this->user && $this->user->ID)
       $task = !$task ? 'mail' : $task;
@@ -225,6 +228,11 @@ class rcmail extends rcube
     }
 
     if (!$contacts) {
+      // there's no default, just return
+      if ($default) {
+        return null;
+      }
+
       self::raise_error(array(
         'code' => 700, 'type' => 'php',
         'file' => __FILE__, 'line' => __LINE__,
@@ -258,13 +266,13 @@ class rcmail extends rcube
    */
   public function get_address_sources($writeable = false, $skip_hidden = false)
   {
-    $abook_type = strtolower($this->config->get('address_book_type'));
-    $ldap_config = $this->config->get('ldap_public');
+    $abook_type   = (string) $this->config->get('address_book_type');
+    $ldap_config  = (array) $this->config->get('ldap_public');
     $autocomplete = (array) $this->config->get('autocomplete_addressbooks');
-    $list = array();
+    $list         = array();
 
     // We are using the DB address book or a plugin address book
-    if ($abook_type != 'ldap' && $abook_type != '') {
+    if (!empty($abook_type) && strtolower($abook_type) != 'ldap') {
       if (!isset($this->address_books['0']))
         $this->address_books['0'] = new rcube_contacts($this->db, $this->get_user_id());
       $list['0'] = array(
@@ -277,8 +285,7 @@ class rcmail extends rcube
       );
     }
 
-    if ($ldap_config) {
-      $ldap_config = (array) $ldap_config;
+    if (!empty($ldap_config)) {
       foreach ($ldap_config as $id => $prop) {
         // handle misconfiguration
         if (empty($prop) || !is_array($prop)) {
@@ -594,7 +601,7 @@ class rcmail extends rcube
       $post_host = rcube_utils::get_input_value('_host', rcube_utils::INPUT_POST);
       $post_user = rcube_utils::get_input_value('_user', rcube_utils::INPUT_POST);
 
-      list($user, $domain) = explode('@', $post_user);
+      list(, $domain) = explode('@', $post_user);
 
       // direct match in default_host array
       if ($default_host[$post_host] || in_array($post_host, array_values($default_host))) {
@@ -698,28 +705,6 @@ class rcmail extends rcube
 
 
   /**
-   * Create unique authorization hash
-   *
-   * @param string Session ID
-   * @param int Timestamp
-   * @return string The generated auth hash
-   */
-  private function get_auth_hash($sess_id, $ts)
-  {
-    $auth_string = sprintf('rcmail*sess%sR%s*Chk:%s;%s',
-      $sess_id,
-      $ts,
-      $this->config->get('ip_check') ? $_SERVER['REMOTE_ADDR'] : '***.***.***.***',
-      $_SERVER['HTTP_USER_AGENT']);
-
-    if (function_exists('sha1'))
-      return sha1($auth_string);
-    else
-      return md5($auth_string);
-  }
-
-
-  /**
    * Build a valid URL to this instance of Roundcube
    *
    * @param mixed Either a string with the action or url parameters as key-value pairs
@@ -764,11 +749,6 @@ class rcmail extends rcube
         $book->close();
     }
 
-    // before closing the database connection, write session data
-    if ($_SERVER['REMOTE_ADDR'] && is_object($this->session)) {
-      session_write_close();
-    }
-
     // write performance stats to logs/console
     if ($this->config->get('devel_mode')) {
       if (function_exists('memory_get_usage'))
@@ -929,189 +909,6 @@ class rcmail extends rcube
 
 
     /**
-     * Send the given message using the configured method.
-     *
-     * @param object $message    Reference to Mail_MIME object
-     * @param string $from       Sender address string
-     * @param array  $mailto     Array of recipient address strings
-     * @param array  $error      SMTP error array (reference)
-     * @param string $body_file  Location of file with saved message body (reference),
-     *                           used when delay_file_io is enabled
-     * @param array  $options    SMTP options (e.g. DSN request)
-     *
-     * @return boolean Send status.
-     */
-    public function deliver_message(&$message, $from, $mailto, &$error, &$body_file = null, $options = null)
-    {
-        $plugin = $this->plugins->exec_hook('message_before_send', array(
-            'message' => $message,
-            'from'    => $from,
-            'mailto'  => $mailto,
-            'options' => $options,
-        ));
-
-        $from    = $plugin['from'];
-        $mailto  = $plugin['mailto'];
-        $options = $plugin['options'];
-        $message = $plugin['message'];
-        $headers = $message->headers();
-
-        // send thru SMTP server using custom SMTP library
-        if ($this->config->get('smtp_server')) {
-            // generate list of recipients
-            $a_recipients = array($mailto);
-
-            if (strlen($headers['Cc']))
-                $a_recipients[] = $headers['Cc'];
-            if (strlen($headers['Bcc']))
-                $a_recipients[] = $headers['Bcc'];
-
-            // clean Bcc from header for recipients
-            $send_headers = $headers;
-            unset($send_headers['Bcc']);
-            // here too, it because txtHeaders() below use $message->_headers not only $send_headers
-            unset($message->_headers['Bcc']);
-
-            $smtp_headers = $message->txtHeaders($send_headers, true);
-
-            if ($message->getParam('delay_file_io')) {
-                // use common temp dir
-                $temp_dir = $this->config->get('temp_dir');
-                $body_file = tempnam($temp_dir, 'rcmMsg');
-                if (PEAR::isError($mime_result = $message->saveMessageBody($body_file))) {
-                    self::raise_error(array('code' => 650, 'type' => 'php',
-                        'file' => __FILE__, 'line' => __LINE__,
-                        'message' => "Could not create message: ".$mime_result->getMessage()),
-                        TRUE, FALSE);
-                    return false;
-                }
-                $msg_body = fopen($body_file, 'r');
-            }
-            else {
-                $msg_body = $message->get();
-            }
-
-            // send message
-            if (!is_object($this->smtp)) {
-                $this->smtp_init(true);
-            }
-
-            $sent     = $this->smtp->send_mail($from, $a_recipients, $smtp_headers, $msg_body, $options);
-            $response = $this->smtp->get_response();
-            $error    = $this->smtp->get_error();
-
-            // log error
-            if (!$sent) {
-                self::raise_error(array('code' => 800, 'type' => 'smtp',
-                    'line' => __LINE__, 'file' => __FILE__,
-                    'message' => "SMTP error: ".join("\n", $response)), TRUE, FALSE);
-            }
-        }
-        // send mail using PHP's mail() function
-        else {
-            // unset some headers because they will be added by the mail() function
-            $headers_enc = $message->headers($headers);
-            $headers_php = $message->_headers;
-            unset($headers_php['To'], $headers_php['Subject']);
-
-            // reset stored headers and overwrite
-            $message->_headers = array();
-            $header_str = $message->txtHeaders($headers_php);
-
-            // #1485779
-            if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
-                if (preg_match_all('/<([^@]+@[^>]+)>/', $headers_enc['To'], $m)) {
-                    $headers_enc['To'] = implode(', ', $m[1]);
-                }
-            }
-
-            $msg_body = $message->get();
-
-            if (PEAR::isError($msg_body)) {
-                self::raise_error(array('code' => 650, 'type' => 'php',
-                    'file' => __FILE__, 'line' => __LINE__,
-                    'message' => "Could not create message: ".$msg_body->getMessage()),
-                    TRUE, FALSE);
-            }
-            else {
-                $delim   = $this->config->header_delimiter();
-                $to      = $headers_enc['To'];
-                $subject = $headers_enc['Subject'];
-                $header_str = rtrim($header_str);
-
-                if ($delim != "\r\n") {
-                    $header_str = str_replace("\r\n", $delim, $header_str);
-                    $msg_body   = str_replace("\r\n", $delim, $msg_body);
-                    $to         = str_replace("\r\n", $delim, $to);
-                    $subject    = str_replace("\r\n", $delim, $subject);
-                }
-
-                if (ini_get('safe_mode'))
-                    $sent = mail($to, $subject, $msg_body, $header_str);
-                else
-                    $sent = mail($to, $subject, $msg_body, $header_str, "-f$from");
-            }
-        }
-
-        if ($sent) {
-            $this->plugins->exec_hook('message_sent', array('headers' => $headers, 'body' => $msg_body));
-
-            // remove MDN headers after sending
-            unset($headers['Return-Receipt-To'], $headers['Disposition-Notification-To']);
-
-            // get all recipients
-            if ($headers['Cc'])
-                $mailto .= $headers['Cc'];
-            if ($headers['Bcc'])
-                $mailto .= $headers['Bcc'];
-            if (preg_match_all('/<([^@]+@[^>]+)>/', $mailto, $m))
-                $mailto = implode(', ', array_unique($m[1]));
-
-            if ($this->config->get('smtp_log')) {
-                self::write_log('sendmail', sprintf("User %s [%s]; Message for %s; %s",
-                    $this->user->get_username(),
-                    $_SERVER['REMOTE_ADDR'],
-                    $mailto,
-                    !empty($response) ? join('; ', $response) : ''));
-            }
-        }
-
-        if (is_resource($msg_body)) {
-            fclose($msg_body);
-        }
-
-        $message->_headers = array();
-        $message->headers($headers);
-
-        return $sent;
-    }
-
-
-    /**
-     * Unique Message-ID generator.
-     *
-     * @return string Message-ID
-     */
-    public function gen_message_id()
-    {
-        $local_part  = md5(uniqid('rcmail'.mt_rand(),true));
-        $domain_part = $this->user->get_username('domain');
-
-        // Try to find FQDN, some spamfilters doesn't like 'localhost' (#1486924)
-        if (!preg_match('/\.[a-z]+$/i', $domain_part)) {
-            foreach (array($_SERVER['HTTP_HOST'], $_SERVER['SERVER_NAME']) as $host) {
-                $host = preg_replace('/:[0-9]+$/', '', $host);
-                if ($host && preg_match('/\.[a-z]+$/i', $host)) {
-                    $domain_part = $host;
-                }
-            }
-        }
-
-        return sprintf('<%s@%s>', $local_part, $domain_part);
-    }
-
-
-    /**
      * Returns RFC2822 formatted current date in user's timezone
      *
      * @return string Date
@@ -1165,7 +962,7 @@ class rcmail extends rcube
      */
     public function table_output($attrib, $table_data, $a_show_cols, $id_col)
     {
-        $table = new html_table(/*array('cols' => count($a_show_cols))*/);
+        $table = new html_table($attrib);
 
         // add table header
         if (!$attrib['noheader']) {
@@ -1406,6 +1203,7 @@ class rcmail extends rcube
             $js_mailboxlist = array();
             $out = html::tag('ul', $attrib, $rcmail->render_folder_tree_html($a_mailboxes, $mbox_name, $js_mailboxlist, $attrib), html::$common_attrib);
 
+            $rcmail->output->include_script('treelist.js');
             $rcmail->output->add_gui_object('mailboxlist', $attrib['id']);
             $rcmail->output->set_env('mailboxes', $js_mailboxlist);
             $rcmail->output->set_env('unreadwrap', $attrib['unreadwrap']);
@@ -1527,9 +1325,10 @@ class rcmail extends rcube
         $realnames = (bool)$attrib['realnames'];
         $msgcounts = $this->storage->get_cache('messagecount');
         $collapsed = $this->config->get('collapsed_folders');
+        $realnames = $this->config->get('show_real_foldernames');
 
         $out = '';
-        foreach ($arrFolders as $key => $folder) {
+        foreach ($arrFolders as $folder) {
             $title        = null;
             $folder_class = $this->folder_classname($folder['id']);
             $is_collapsed = strpos($collapsed, '&'.rawurlencode($folder['id']).'&') !== false;
@@ -1584,14 +1383,13 @@ class rcmail extends rcube
                 'id' => "rcmli".$folder_id,
                 'class' => join(' ', $classes),
                 'noclose' => true),
-                html::a($link_attrib, $html_name) .
-                (!empty($folder['folders']) ? html::div(array(
-                    'class' => ($is_collapsed ? 'collapsed' : 'expanded'),
-                    'style' => "position:absolute",
-                    'onclick' => sprintf("%s.command('collapse-folder', '%s')", rcmail_output::JS_OBJECT_NAME, $js_name)
-                ), '&nbsp;') : ''));
-
-            $jslist[$folder_id] = array(
+                html::a($link_attrib, $html_name));
+
+            if (!empty($folder['folders'])) {
+                $out .= html::div('treetoggle ' . ($is_collapsed ? 'collapsed' : 'expanded'), '&nbsp;');
+            }
+
+            $jslist[$folder['id']] = array(
                 'id'      => $folder['id'],
                 'name'    => $foldername,
                 'virtual' => $folder['virtual']
@@ -1616,7 +1414,7 @@ class rcmail extends rcube
     {
         $out = '';
 
-        foreach ($arrFolders as $key => $folder) {
+        foreach ($arrFolders as $folder) {
             // skip exceptions (and its subfolders)
             if (!empty($opts['exceptions']) && in_array($folder['id'], $opts['exceptions'])) {
                 continue;
@@ -1684,8 +1482,10 @@ class rcmail extends rcube
      */
     public function localize_foldername($name, $with_path = true)
     {
+        $realnames = $this->config->get('show_real_foldernames');
+
         // try to localize path of the folder
-        if ($with_path) {
+        if ($with_path && !$realnames) {
             $storage   = $this->get_storage();
             $delimiter = $storage->get_hierarchy_delimiter();
             $path      = explode($delimiter, $name);
@@ -1702,12 +1502,11 @@ class rcmail extends rcube
             }
         }
 
-        if ($folder_class = $this->folder_classname($name)) {
+        if (!$realnames && ($folder_class = $this->folder_classname($name))) {
             return $this->gettext($folder_class);
         }
-        else {
-            return rcube_charset::convert($name, 'UTF7-IMAP');
-        }
+
+        return rcube_charset::convert($name, 'UTF7-IMAP');
     }
 
 
@@ -1762,11 +1561,7 @@ class rcmail extends rcube
         $quota_result = (array) $quota;
         $quota_result['type'] = isset($_SESSION['quota_display']) ? $_SESSION['quota_display'] : '';
 
-        if (!$quota['total'] && $this->config->get('quota_zero_as_unlimited')) {
-            $quota_result['title']   = $this->gettext('unlimited');
-            $quota_result['percent'] = 0;
-        }
-        else if ($quota['total']) {
+        if ($quota['total'] > 0) {
             if (!isset($quota['percent'])) {
                 $quota_result['percent'] = min(100, round(($quota['used']/max(1,$quota['total']))*100));
             }
@@ -1785,7 +1580,8 @@ class rcmail extends rcube
             }
         }
         else {
-            $quota_result['title']   = $this->gettext('unknown');
+            $unlimited               = $this->config->get('quota_zero_as_unlimited');
+            $quota_result['title']   = $this->gettext($unlimited ? 'unlimited' : 'unknown');
             $quota_result['percent'] = 0;
         }
 
@@ -1798,32 +1594,51 @@ class rcmail extends rcube
      *
      * @param string $fallback       Fallback message label
      * @param array  $fallback_args  Fallback message label arguments
+     * @param string $suffix         Message label suffix
      */
-    public function display_server_error($fallback = null, $fallback_args = null)
+    public function display_server_error($fallback = null, $fallback_args = null, $suffix = '')
     {
         $err_code = $this->storage->get_error_code();
         $res_code = $this->storage->get_response_code();
+        $args     = array();
 
         if ($res_code == rcube_storage::NOPERM) {
-            $this->output->show_message('errornoperm', 'error');
+            $error = 'errornoperm';
         }
         else if ($res_code == rcube_storage::READONLY) {
-            $this->output->show_message('errorreadonly', 'error');
+            $error = 'errorreadonly';
+        }
+        else if ($res_code == rcube_storage::OVERQUOTA) {
+            $error = 'errorroverquota';
         }
         else if ($err_code && ($err_str = $this->storage->get_error_str())) {
             // try to detect access rights problem and display appropriate message
             if (stripos($err_str, 'Permission denied') !== false) {
-                $this->output->show_message('errornoperm', 'error');
+                $error = 'errornoperm';
+            }
+            // try to detect full mailbox problem and display appropriate message
+            // there can be e.g. "Quota exceeded" or "quotum would exceed"
+            else if (stripos($err_str, 'quot') !== false && stripos($err_str, 'exceed') !== false) {
+                $error = 'erroroverquota';
             }
             else {
-                $this->output->show_message('servererrormsg', 'error', array('msg' => $err_str));
+                $error = 'servererrormsg';
+                $args  = array('msg' => $err_str);
             }
         }
         else if ($err_code < 0) {
-            $this->output->show_message('storageerror', 'error');
+            $error = 'storageerror';
         }
         else if ($fallback) {
-            $this->output->show_message($fallback, 'error', $fallback_args);
+            $error = $fallback;
+            $args  = $fallback_args;
+        }
+
+        if ($error) {
+            if ($suffix && $this->text_exists($error . $suffix)) {
+                $error .= $suffix;
+            }
+            $this->output->show_message($error, 'error', $args);
         }
     }
 
diff --git a/program/include/rcmail_html_page.php b/program/include/rcmail_html_page.php
index 1d8391580..5d07b8d04 100644
--- a/program/include/rcmail_html_page.php
+++ b/program/include/rcmail_html_page.php
@@ -30,7 +30,7 @@ class rcmail_html_page extends rcmail_output_html
 {
     public function write($contents = '')
     {
-        self::reset();
+        self::reset(true);
 
         // load embed.css from skin folder (if exists)
         if ($embed_css = $this->get_skin_file('/embed.css')) {
diff --git a/program/include/rcmail_output_html.php b/program/include/rcmail_output_html.php
index 05904e58b..29a86b9f7 100644
--- a/program/include/rcmail_output_html.php
+++ b/program/include/rcmail_output_html.php
@@ -67,6 +67,7 @@ class rcmail_output_html extends rcmail_output
         //$this->framed = $framed;
         $this->set_env('task', $task);
         $this->set_env('x_frame_options', $this->config->get('x_frame_options', 'sameorigin'));
+        $this->set_env('standard_windows', (bool) $this->config->get('standard_windows'));
 
         // add cookie info
         $this->set_env('cookie_domain', ini_get('session.cookie_domain'));
@@ -80,6 +81,8 @@ class rcmail_output_html extends rcmail_output
 
         if (!empty($_REQUEST['_extwin']))
           $this->set_env('extwin', 1);
+        if ($this->framed || !empty($_REQUEST['_framed']))
+          $this->set_env('framed', 1);
 
         // add common javascripts
         $this->add_script('var '.self::JS_OBJECT_NAME.' = new rcube_webmail();', 'head_top');
@@ -305,13 +308,19 @@ class rcmail_output_html extends rcmail_output
 
     /**
      * Delete all stored env variables and commands
+     *
+     * @param bool $all Reset all env variables (including internal)
      */
-    public function reset()
+    public function reset($all = false)
     {
+        $env = $all ? null : array_intersect_key($this->env, array('extwin'=>1, 'framed'=>1));
+
         parent::reset();
-        $this->js_env = array();
-        $this->js_labels = array();
-        $this->js_commands = array();
+
+        // let some env variables survive
+        $this->env = $this->js_env = $env;
+        $this->js_labels    = array();
+        $this->js_commands  = array();
         $this->script_files = array();
         $this->scripts      = array();
         $this->header       = '';
@@ -356,7 +365,7 @@ class rcmail_output_html extends rcmail_output
             $this->parse($templ, false);
         }
         else {
-            $this->framed = $templ == 'iframe' ? true : $this->framed;
+            $this->framed = true;
             $this->write();
         }
 
@@ -380,7 +389,7 @@ class rcmail_output_html extends rcmail_output
         // unlock interface after iframe load
         $unlock = preg_replace('/[^a-z0-9]/i', '', $_REQUEST['_unlock']);
         if ($this->framed) {
-            array_unshift($this->js_commands, array('set_busy', false, null, $unlock));
+            array_unshift($this->js_commands, array('iframe_loaded', $unlock));
         }
         else if ($unlock) {
             array_unshift($this->js_commands, array('hide_message', $unlock));
@@ -390,9 +399,11 @@ class rcmail_output_html extends rcmail_output
           $this->set_env('request_token', $this->app->get_request_token());
 
         // write all env variables to client
-        $js = $this->framed ? "if(window.parent) {\n" : '';
-        $js .= $this->get_js_commands() . ($this->framed ? ' }' : '');
-        $this->add_script($js, 'head_top');
+        if ($commands = $this->get_js_commands()) {
+            $js = $this->framed ? "if (window.parent) {\n" : '';
+            $js .= $commands . ($this->framed ? ' }' : '');
+            $this->add_script($js, 'head_top');
+        }
 
         // send clickjacking protection headers
         $iframe = $this->framed || !empty($_REQUEST['_framed']);
@@ -645,7 +656,7 @@ class rcmail_output_html extends rcmail_output
     protected function file_callback($matches)
     {
         $file = $matches[3];
-        $file[0] = preg_replace('!^/this/!', '/', $file[0]);
+        $file = preg_replace('!^/this/!', '/', $file);
 
         // correct absolute paths
         if ($file[0] == '/') {
@@ -668,7 +679,7 @@ class rcmail_output_html extends rcmail_output
      *
      * @param  string $input
      * @return string
-     * @uses   rcube_output_html::parse_xml()
+     * @uses   rcmail_output_html::parse_xml()
      * @since  0.1-rc1
      */
     public function just_parse($input)
@@ -721,14 +732,13 @@ class rcmail_output_html extends rcmail_output
     /**
      * Determines if a given condition is met
      *
-     * @todo   Get rid off eval() once I understand what this does.
      * @todo   Extend this to allow real conditions, not just "set"
      * @param  string Condition statement
      * @return boolean True if condition is met, False if not
      */
     protected function check_condition($condition)
     {
-        return eval("return (".$this->parse_expression($condition).");");
+        return $this->eval_expression($condition);
     }
 
 
@@ -750,14 +760,15 @@ class rcmail_output_html extends rcmail_output
 
 
     /**
-     * Parses expression and replaces variables
+     * Parse & evaluate a given expression and return its result.
      *
-     * @param  string Expression statement
-     * @return string Expression value
+     * @param string Expression statement
+     *
+     * @return mixed Expression result
      */
-    protected function parse_expression($expression)
+    protected function eval_expression ($expression)
     {
-        return preg_replace(
+        $expression = preg_replace(
             array(
                 '/session:([a-z0-9_]+)/i',
                 '/config:([a-z0-9_]+)(:([a-z0-9_]+))?/i',
@@ -769,14 +780,29 @@ class rcmail_output_html extends rcmail_output
             ),
             array(
                 "\$_SESSION['\\1']",
-                "\$this->app->config->get('\\1',rcube_utils::get_boolean('\\3'))",
-                "\$this->env['\\1']",
+                "\$app->config->get('\\1',rcube_utils::get_boolean('\\3'))",
+                "\$env['\\1']",
                 "rcube_utils::get_input_value('\\1', rcube_utils::INPUT_GPC)",
                 "\$_COOKIE['\\1']",
-                "\$this->browser->{'\\1'}",
+                "\$browser->{'\\1'}",
                 $this->template_name,
             ),
-            $expression);
+            $expression
+        );
+
+        $fn = create_function('$app,$browser,$env', "return ($expression);");
+        if (!$fn) {
+            rcube::raise_error(array(
+                'code' => 505,
+                'type' => 'php',
+                'file' => __FILE__,
+                'line' => __LINE__,
+                'message' => "Expression parse error on: ($expression)"), true, false);
+
+            return null;
+        }
+
+        return $fn($this->app, $this->browser, $this->env);
     }
 
 
@@ -829,7 +855,7 @@ class rcmail_output_html extends rcmail_output
             // show a label
             case 'label':
                 if ($attrib['expression'])
-                    $attrib['name'] = eval("return " . $this->parse_expression($attrib['expression']) .";");
+                    $attrib['name'] = $this->eval_expression($attrib['expression']);
 
                 if ($attrib['name'] || $attrib['command']) {
                     // @FIXME: 'noshow' is useless, remove?
@@ -863,6 +889,7 @@ class rcmail_output_html extends rcmail_output
             // include a file
             case 'include':
                 $old_base_path = $this->base_path;
+                if (!empty($attrib['skin_path'])) $attrib['skinpath'] = $attrib['skin_path'];
                 if ($path = $this->get_skin_file($attrib['file'], $skin_path, $attrib['skinpath'])) {
                     $this->base_path = preg_replace('!plugins/\w+/!', '', $skin_path);  // set base_path to core skin directory (not plugin's skin)
                     $path = realpath($path);
@@ -960,8 +987,7 @@ class rcmail_output_html extends rcmail_output
 
             // return code for a specified eval expression
             case 'exp':
-                $value = $this->parse_expression($attrib['expression']);
-                return eval("return html::quote($value);");
+                return html::quote($this->eval_expression($attrib['expression']));
 
             // return variable
             case 'var':
@@ -1169,6 +1195,10 @@ class rcmail_output_html extends rcmail_output
             $out = sprintf('<a%s>%s</a>', $attrib_str, $btn_content);
         }
 
+        if ($attrib['wrapper']) {
+            $out = html::tag($attrib['wrapper'], null, $out);
+        }
+
         return $out;
     }
 
diff --git a/program/js/app.js b/program/js/app.js
index c2456ac4f..cb08ce29d 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -4,7 +4,7 @@
  |                                                                       |
  | This file is part of the Roundcube Webmail client                     |
  | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
- | Copyright (C) 2011-2012, Kolab Systems AG                             |
+ | Copyright (C) 2011-2013, Kolab Systems AG                             |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -44,7 +44,9 @@ function rcube_webmail()
     comm_path: './',
     blankpage: 'program/resources/blank.gif',
     recipients_separator: ',',
-    recipients_delimiter: ', '
+    recipients_delimiter: ', ',
+    popup_width: 1150,
+    popup_width_small: 900
   };
 
   // create protected reference to myself
@@ -179,7 +181,8 @@ function rcube_webmail()
     }
 
     // enable general commands
-    this.enable_command('close', 'logout', 'mail', 'addressbook', 'settings', 'save-pref', 'compose', 'undo', 'about', 'switch-task', true);
+    this.enable_command('close', 'logout', 'mail', 'addressbook', 'settings', 'save-pref',
+      'compose', 'undo', 'about', 'switch-task', 'menu-open', 'menu-save', true);
 
     if (this.env.permaurl)
       this.enable_command('permaurl', 'extwin', true);
@@ -188,7 +191,7 @@ function rcube_webmail()
 
       case 'mail':
         // enable mail commands
-        this.enable_command('list', 'checkmail', 'add-contact', 'search', 'reset-search', 'collapse-folder', true);
+        this.enable_command('list', 'checkmail', 'add-contact', 'search', 'reset-search', 'collapse-folder', 'import-messages', true);
 
         if (this.gui_objects.messagelist) {
           this.message_list = new rcube_list_widget(this.gui_objects.messagelist, {
@@ -205,12 +208,13 @@ function rcube_webmail()
           this.message_list.addEventListener('dragend', function(e){ p.drag_end(e); });
           this.message_list.addEventListener('expandcollapse', function(e){ p.msglist_expand(e); });
           this.message_list.addEventListener('column_replace', function(e){ p.msglist_set_coltypes(e); });
+          this.message_list.addEventListener('listupdate', function(e){ p.triggerEvent('listupdate', e); });
 
           document.onmouseup = function(e){ return p.doc_mouse_up(e); };
           this.gui_objects.messagelist.parentNode.onmousedown = function(e){ return p.click_on_list(e); };
 
           this.message_list.init();
-          this.enable_command('toggle_status', 'toggle_flag', 'menu-open', 'menu-save', 'sort', true);
+          this.enable_command('toggle_status', 'toggle_flag', 'sort', true);
 
           // load messages
           this.command('list');
@@ -226,8 +230,8 @@ function rcube_webmail()
 
         this.env.message_commands = ['show', 'reply', 'reply-all', 'reply-list',
           'moveto', 'copy', 'delete', 'open', 'mark', 'edit', 'viewsource',
-          'print', 'load-attachment', 'show-headers', 'hide-headers', 'download',
-          'forward', 'forward-inline', 'forward-attachment'];
+          'print', 'load-attachment', 'download-attachment', 'show-headers', 'hide-headers', 'download',
+          'forward', 'forward-inline', 'forward-attachment', 'change-format'];
 
         if (this.env.action == 'show' || this.env.action == 'preview') {
           this.enable_command(this.env.message_commands, this.env.uid);
@@ -273,11 +277,12 @@ function rcube_webmail()
           this.init_messageform();
         }
         // show printing dialog
-        else if (this.env.action == 'print' && this.env.uid)
+        else if (this.env.action == 'print' && this.env.uid) {
           if (bw.safari)
             setTimeout('window.print()', 10);
           else
             window.print();
+        }
 
         // get unread count for each mailbox
         if (this.gui_objects.mailboxlist) {
@@ -312,7 +317,7 @@ function rcube_webmail()
         }
 
         // detect browser capabilities
-        if (!this.is_framed())
+        if (!this.is_framed() && !this.env.extwin)
           this.browser_capabilities_check();
 
         break;
@@ -459,9 +464,23 @@ function rcube_webmail()
       this.display_message(this.pending_message[0], this.pending_message[1], this.pending_message[2]);
 
     // map implicit containers
-    if (this.gui_objects.folderlist)
+    if (this.gui_objects.folderlist) {
       this.gui_containers.foldertray = $(this.gui_objects.folderlist);
 
+      // init treelist widget
+      if (window.rcube_treelist_widget) {
+        this.treelist = new rcube_treelist_widget(this.gui_objects.folderlist, {
+          id_prefix: 'rcmli',
+          id_encode: this.html_identifier_encode,
+          id_decode: this.html_identifier_decode,
+          check_droptarget: function(node){ return !node.virtual && ref.check_droptarget(node.id) }
+        });
+        this.treelist.addEventListener('collapse', function(node){ ref.folder_collapsed(node) });
+        this.treelist.addEventListener('expand', function(node){ ref.folder_collapsed(node) });
+        this.treelist.addEventListener('select', function(node){ ref.triggerEvent('selectfolder', { folder:node.id, prefix:'rcmli' }) });
+      }
+    }
+
     // activate html5 file drop feature (if browser supports it and if configured)
     if (this.gui_objects.filedrop && this.env.filedrop && ((window.XMLHttpRequest && XMLHttpRequest.prototype && XMLHttpRequest.prototype.sendAsBinary) || window.FormData)) {
       $(document.body).bind('dragover dragleave drop', function(e){ return ref.document_drag_hover(e, e.type == 'dragover'); });
@@ -580,18 +599,36 @@ function rcube_webmail()
 
       case 'extwin':
         if (this.env.action == 'compose') {
-          var prevstate = this.env.compose_extwin;
-          $("input[name='_action']", this.gui_objects.messageform).val('compose');
-          this.gui_objects.messageform.action = this.url('mail/compose', { _id: this.env.compose_id, _extwin: 1 });
-          this.gui_objects.messageform.target = this.open_window('', 1100, 900);
-          this.gui_objects.messageform.submit();
+          var form = this.gui_objects.messageform,
+            win = this.open_window('');
+
+          $("input[name='_action']", form).val('compose');
+          form.action = this.url('mail/compose', { _id: this.env.compose_id, _extwin: 1 });
+          form.target = win.name;
+          form.submit();
         }
         else {
-          this.open_window(this.env.permaurl, 900, 900);
+          this.open_window(this.env.permaurl, true);
         }
         break;
 
+      case 'change-format':
+        url = this.env.permaurl + '&_format=' + props;
+
+        if (this.env.action == 'preview')
+          url = url.replace(/_action=show/, '_action=preview') + '&_framed=1';
+        if (this.env.extwin)
+          url += '&_extwin=1';
+
+        location.href = url;
+        break;
+
       case 'menu-open':
+        if (props && props.menu == 'attachmentmenu') {
+          var mimetype = this.env.attachments[props.id];
+          this.enable_command('open-attachment', mimetype && this.env.mimetypes && $.inArray(mimetype, this.env.mimetypes) >= 0);
+        }
+
       case 'menu-save':
         this.triggerEvent(command, {props:props});
         return false;
@@ -756,7 +793,7 @@ function rcube_webmail()
       case 'moveto':
         if (this.task == 'mail')
           this.move_messages(props);
-        else if (this.task == 'addressbook' && this.drag_active)
+        else if (this.task == 'addressbook')
           this.copy_contact(null, props);
         break;
 
@@ -817,15 +854,15 @@ function rcube_webmail()
         break;
 
       case 'load-attachment':
-        var qstring = '_mbox='+urlencode(this.env.mailbox)+'&_uid='+this.env.uid+'&_part='+props.part;
+      case 'open-attachment':
+      case 'download-attachment':
+        var qstring = '_mbox='+urlencode(this.env.mailbox)+'&_uid='+this.env.uid+'&_part='+props,
+          mimetype = this.env.attachments[props];
 
         // open attachment in frame if it's of a supported mimetype
-        if (this.env.uid && props.mimetype && this.env.mimetypes && $.inArray(props.mimetype, this.env.mimetypes) >= 0) {
-          var attachment_win = window.open(this.env.comm_path+'&_action=get&'+qstring+'&_frame=1', 'rcubemailattachment'+this.env.uid+props.part);
-          if (attachment_win) {
-            setTimeout(function(){ attachment_win.focus(); }, 10);
+        if (command != 'download-attachment' && mimetype && this.env.mimetypes && $.inArray(mimetype, this.env.mimetypes) >= 0) {
+          if (this.open_window(this.env.comm_path+'&_action=get&'+qstring+'&_frame=1', true, true))
             break;
-          }
         }
 
         this.goto_url('get', qstring+'&_download=1', false);
@@ -864,7 +901,7 @@ function rcube_webmail()
 
       case 'nextmessage':
         if (this.env.next_uid)
-          this.show_message(this.env.next_uid, false, this.env.action=='preview');
+          this.show_message(this.env.next_uid, false, this.env.action == 'preview');
         break;
 
       case 'lastmessage':
@@ -900,16 +937,13 @@ function rcube_webmail()
             url._to = props;
           }
           else {
-            // use contact_id passed as command parameter
-            var n, len, a_cids = [];
+            var a_cids = [];
+            // use contact id passed as command parameter
             if (props)
               a_cids.push(props);
             // get selected contacts
-            else if (this.contact_list) {
-              var selection = this.contact_list.get_selection();
-              for (n=0, len=selection.length; n<len; n++)
-                a_cids.push(selection[n]);
-            }
+            else if (this.contact_list)
+              a_cids = this.contact_list.get_selection();
 
             if (a_cids.length)
               this.http_post('mailto', { _cid: a_cids.join(','), _source: this.env.source }, true);
@@ -944,8 +978,8 @@ function rcube_webmail()
         // Reset the auto-save timer
         clearTimeout(this.save_timer);
 
-        // compose form did not change
-        if (this.cmp_hash == this.compose_field_hash()) {
+        // compose form did not change (and draft wasn't saved already)
+        if (this.env.draft_id && this.cmp_hash == this.compose_field_hash()) {
           this.auto_save_start();
           break;
         }
@@ -967,7 +1001,7 @@ function rcube_webmail()
         // Reset the auto-save timer
         clearTimeout(this.save_timer);
 
-        this.upload_file(props || this.gui_objects.uploadform);
+        this.upload_file(props || this.gui_objects.uploadform, 'upload');
         break;
 
       case 'insert-sig':
@@ -1012,9 +1046,8 @@ function rcube_webmail()
 
       case 'print':
         if (uid = this.get_single_uid()) {
-          ref.printwin = window.open(this.env.comm_path+'&_action=print&_uid='+uid+'&_mbox='+urlencode(this.env.mailbox)+(this.env.safemode ? '&_safe=1' : ''));
+          ref.printwin = this.open_window(this.env.comm_path+'&_action=print&_uid='+uid+'&_mbox='+urlencode(this.env.mailbox)+(this.env.safemode ? '&_safe=1' : ''), true, true);
           if (this.printwin) {
-            setTimeout(function(){ ref.printwin.focus(); }, 20);
             if (this.env.action != 'show')
               this.mark_message('read', uid);
           }
@@ -1022,11 +1055,8 @@ function rcube_webmail()
         break;
 
       case 'viewsource':
-        if (uid = this.get_single_uid()) {
-          ref.sourcewin = window.open(this.env.comm_path+'&_action=viewsource&_uid='+uid+'&_mbox='+urlencode(this.env.mailbox));
-          if (this.sourcewin)
-            setTimeout(function(){ ref.sourcewin.focus(); }, 20);
-          }
+        if (uid = this.get_single_uid())
+          this.open_window(this.env.comm_path+'&_action=viewsource&_uid='+uid+'&_mbox='+urlencode(this.env.mailbox), true, true);
         break;
 
       case 'download':
@@ -1072,6 +1102,12 @@ function rcube_webmail()
         this.list_contacts(props.source, props.id);
         break;
 
+      case 'import-messages':
+        var form = props || this.gui_objects.importform;
+        $('input[name="_unlock"]', form).val(this.set_busy(true, 'importwait'));
+        this.upload_file(form, 'import');
+        break;
+
       case 'import':
         if (this.env.action == 'import' && this.gui_objects.importform) {
           var file = document.getElementById('rcmimportfile');
@@ -1146,6 +1182,7 @@ function rcube_webmail()
       if (typeof cmd === 'string') {
         this.commands[cmd] = enable;
         this.set_button(cmd, (enable ? 'act' : 'pas'));
+        this.triggerEvent('enable-command', {command: cmd, status: enable});
       }
       // push array elements into commands array
       else {
@@ -1210,7 +1247,7 @@ function rcube_webmail()
     if (!url)
       url = this.env.comm_path;
 
-    return url.replace(/_task=[a-z]+/, '_task='+task);
+    return url.replace(/_task=[a-z0-9_-]+/i, '_task='+task);
   };
 
   this.reload = function(delay)
@@ -1263,11 +1300,12 @@ function rcube_webmail()
 
   this.html_identifier = function(str, encode)
   {
-    str = String(str);
-    if (encode)
-      return Base64.encode(str).replace(/=+$/, '').replace(/\+/g, '-').replace(/\//g, '_');
-    else
-      return str.replace(this.identifier_expr, '_');
+    return encode ? this.html_identifier_encode(str) : String(str).replace(this.identifier_expr, '_');
+  };
+
+  this.html_identifier_encode = function(str)
+  {
+    return Base64.encode(String(str)).replace(/=+$/, '').replace(/\+/g, '-').replace(/\//g, '_');
   };
 
   this.html_identifier_decode = function(str)
@@ -1320,29 +1358,9 @@ function rcube_webmail()
     if (this.preview_read_timer)
       clearTimeout(this.preview_read_timer);
 
-    // save folderlist and folders location/sizes for droptarget calculation in drag_move()
-    if (this.gui_objects.folderlist && model) {
-      this.initialBodyScrollTop = bw.ie ? 0 : window.pageYOffset;
-      this.initialListScrollTop = this.gui_objects.folderlist.parentNode.scrollTop;
-
-      var k, li, height,
-        list = $(this.gui_objects.folderlist);
-        pos = list.offset();
-
-      this.env.folderlist_coords = { x1:pos.left, y1:pos.top, x2:pos.left + list.width(), y2:pos.top + list.height() };
-
-      this.env.folder_coords = [];
-      for (k in model) {
-        if (li = this.get_folder_li(k)) {
-          // only visible folders
-          if (height = li.firstChild.offsetHeight) {
-            pos = $(li.firstChild).offset();
-            this.env.folder_coords[k] = { x1:pos.left, y1:pos.top,
-              x2:pos.left + li.firstChild.offsetWidth, y2:pos.top + height, on:0 };
-          }
-        }
-      }
-    }
+    // prepare treelist widget for dragging interactions
+    if (this.treelist)
+      this.treelist.drag_start();
   };
 
   this.drag_end = function(e)
@@ -1350,87 +1368,28 @@ function rcube_webmail()
     this.drag_active = false;
     this.env.last_folder_target = null;
 
-    if (this.folder_auto_timer) {
-      clearTimeout(this.folder_auto_timer);
-      this.folder_auto_timer = null;
-      this.folder_auto_expand = null;
-    }
-
-    // over the folders
-    if (this.gui_objects.folderlist && this.env.folder_coords) {
-      for (var k in this.env.folder_coords) {
-        if (this.env.folder_coords[k].on)
-          $(this.get_folder_li(k)).removeClass('droptarget');
-      }
-    }
+    if (this.treelist)
+      this.treelist.drag_end();
   };
 
   this.drag_move = function(e)
   {
-    if (this.gui_objects.folderlist && this.env.folder_coords) {
-      var k, li, div, check, oldclass,
+    if (this.gui_objects.folderlist) {
+      var drag_target, oldclass,
         layerclass = 'draglayernormal',
-        mouse = rcube_event.get_mouse_pos(e),
-        pos = this.env.folderlist_coords,
-        // offsets to compensate for scrolling while dragging a message
-        boffset = bw.ie ? -document.documentElement.scrollTop : this.initialBodyScrollTop,
-        moffset = this.initialListScrollTop-this.gui_objects.folderlist.parentNode.scrollTop;
+        mouse = rcube_event.get_mouse_pos(e);
 
       if (this.contact_list && this.contact_list.draglayer)
         oldclass = this.contact_list.draglayer.attr('class');
 
-      mouse.y += -moffset-boffset;
-
-      // if mouse pointer is outside of folderlist
-      if (mouse.x < pos.x1 || mouse.x >= pos.x2 || mouse.y < pos.y1 || mouse.y >= pos.y2) {
-        if (this.env.last_folder_target) {
-          $(this.get_folder_li(this.env.last_folder_target)).removeClass('droptarget');
-          this.env.folder_coords[this.env.last_folder_target].on = 0;
-          this.env.last_folder_target = null;
-        }
-        if (layerclass != oldclass && this.contact_list && this.contact_list.draglayer)
-          this.contact_list.draglayer.attr('class', layerclass);
-        return;
+      // mouse intersects a valid drop target on the treelist
+      if (this.treelist && (drag_target = this.treelist.intersects(mouse, true))) {
+        this.env.last_folder_target = drag_target;
+        layerclass = 'draglayer' + (this.check_droptarget(drag_target) > 1 ? 'copy' : 'normal');
       }
-
-      // over the folders
-      for (k in this.env.folder_coords) {
-        pos = this.env.folder_coords[k];
-        if (mouse.x >= pos.x1 && mouse.x < pos.x2 && mouse.y >= pos.y1 && mouse.y < pos.y2) {
-          if (check = this.check_droptarget(k)) {
-            li = this.get_folder_li(k);
-            div = $(li.getElementsByTagName('div')[0]);
-
-            // if the folder is collapsed, expand it after 1sec and restart the drag & drop process.
-            if (div.hasClass('collapsed')) {
-              if (this.folder_auto_timer)
-                clearTimeout(this.folder_auto_timer);
-
-              this.folder_auto_expand = this.env.mailboxes[k].id;
-              this.folder_auto_timer = setTimeout(function() {
-                rcmail.command('collapse-folder', rcmail.folder_auto_expand);
-                rcmail.drag_start(null);
-              }, 1000);
-            }
-            else if (this.folder_auto_timer) {
-              clearTimeout(this.folder_auto_timer);
-              this.folder_auto_timer = null;
-              this.folder_auto_expand = null;
-            }
-
-            $(li).addClass('droptarget');
-            this.env.folder_coords[k].on = 1;
-            this.env.last_folder_target = k;
-            layerclass = 'draglayer' + (check > 1 ? 'copy' : 'normal');
-          }
-          // Clear target, otherwise drag end will trigger move into last valid droptarget
-          else
-            this.env.last_folder_target = null;
-        }
-        else if (pos.on) {
-          $(this.get_folder_li(k)).removeClass('droptarget');
-          this.env.folder_coords[k].on = 0;
-        }
+      else {
+        // Clear target, otherwise drag end will trigger move into last valid droptarget
+        this.env.last_folder_target = null;
       }
 
       if (layerclass != oldclass && this.contact_list && this.contact_list.draglayer)
@@ -1440,40 +1399,33 @@ function rcube_webmail()
 
   this.collapse_folder = function(name)
   {
-    var li = this.get_folder_li(name, '', true),
-      div = $('div:first', li),
-      ul = $('ul:first', li);
+    if (this.treelist)
+      this.treelist.toggle(name);
+  };
 
-    if (div.hasClass('collapsed')) {
-      ul.show();
-      div.removeClass('collapsed').addClass('expanded');
-      var reg = new RegExp('&'+urlencode(name)+'&');
-      this.env.collapsed_folders = this.env.collapsed_folders.replace(reg, '');
-    }
-    else if (div.hasClass('expanded')) {
-      ul.hide();
-      div.removeClass('expanded').addClass('collapsed');
-      this.env.collapsed_folders = this.env.collapsed_folders+'&'+urlencode(name)+'&';
+  this.folder_collapsed = function(node)
+  {
+    var prefname = this.env.task == 'addressbook' ? 'collapsed_abooks' : 'collapsed_folders';
+
+    if (node.collapsed) {
+      this.env[prefname] = this.env[prefname] + '&'+urlencode(node.id)+'&';
 
       // select the folder if one of its childs is currently selected
       // don't select if it's virtual (#1488346)
-      if (this.env.mailbox.indexOf(name + this.env.delimiter) == 0 && !$(li).hasClass('virtual'))
+      if (this.env.mailbox && this.env.mailbox.indexOf(name + this.env.delimiter) == 0 && !node.virtual)
         this.command('list', name);
     }
-    else
-      return;
-
-    // Work around a bug in IE6 and IE7, see #1485309
-    if (bw.ie6 || bw.ie7) {
-      var siblings = li.nextSibling ? li.nextSibling.getElementsByTagName('ul') : null;
-      if (siblings && siblings.length && (li = siblings[0]) && li.style && li.style.display != 'none') {
-        li.style.display = 'none';
-        li.style.display = '';
-      }
+    else {
+      var reg = new RegExp('&'+urlencode(node.id)+'&');
+      this.env[prefname] = this.env[prefname].replace(reg, '');
     }
 
-    this.command('save-pref', { name: 'collapsed_folders', value: this.env.collapsed_folders });
-    this.set_unread_count_display(name, false);
+    if (!this.drag_active) {
+      this.command('save-pref', { name: prefname, value: this.env[prefname] });
+
+      if (this.env.unread_counts)
+        this.set_unread_count_display(node.id, false);
+    }
   };
 
   this.doc_mouse_up = function(e)
@@ -1498,9 +1450,9 @@ function rcube_webmail()
     if (this.drag_active && model && this.env.last_folder_target) {
       var target = model[this.env.last_folder_target];
 
-      $(this.get_folder_li(this.env.last_folder_target)).removeClass('droptarget');
       this.env.last_folder_target = null;
       list.draglayer.hide();
+      this.drag_end(e);
 
       if (!this.drag_menu(e, target))
         this.command('moveto', target);
@@ -1558,7 +1510,7 @@ function rcube_webmail()
 
     // start timer for message preview (wait for double click)
     if (selected && this.env.contentframe && !list.multi_selecting && !this.dummy_select)
-      this.preview_timer = setTimeout(function(){ ref.msglist_get_preview(); }, 200);
+      this.preview_timer = setTimeout(function() { ref.msglist_get_preview(); }, this.dblclick_time);
     else if (this.env.contentframe)
       this.show_contentframe(false);
   };
@@ -1574,12 +1526,13 @@ function rcube_webmail()
 
     var win = this.get_frame_window(this.env.contentframe);
 
-    if (win && win.location.href.indexOf(this.env.blankpage)>=0) {
+    if (win && win.location.href.indexOf(this.env.blankpage) >= 0) {
       if (this.preview_timer)
         clearTimeout(this.preview_timer);
       if (this.preview_read_timer)
         clearTimeout(this.preview_read_timer);
-      this.preview_timer = setTimeout(function(){ ref.msglist_get_preview(); }, 200);
+
+      this.preview_timer = setTimeout(function() { ref.msglist_get_preview(); }, this.dblclick_time);
     }
   };
 
@@ -1587,11 +1540,11 @@ function rcube_webmail()
   {
     if (this.preview_timer)
       clearTimeout(this.preview_timer);
-
     if (this.preview_read_timer)
       clearTimeout(this.preview_read_timer);
 
     var uid = list.get_single_selection();
+
     if (uid && this.env.mailbox == this.env.drafts_mailbox)
       this.open_compose_step({ _draft_uid: uid, _mbox: this.env.mailbox });
     else if (uid)
@@ -1631,7 +1584,7 @@ function rcube_webmail()
 
   this.msglist_set_coltypes = function(list)
   {
-    var i, found, name, cols = list.list.tHead.rows[0].cells;
+    var i, found, name, cols = list.thead.rows[0].cells;
 
     this.env.coltypes = [];
 
@@ -1679,15 +1632,28 @@ function rcube_webmail()
     return 0;
   };
 
-  this.open_window = function(url, width, height)
+  // open popup window
+  this.open_window = function(url, small, toolbar)
   {
-    var w = Math.min(width, screen.width - 10),
-      h = Math.min(height, screen.height - 100),
-      l = (screen.width - w) / 2 + (screen.left || 0),
-      t = Math.max(0, (screen.height - h) / 2 + (screen.top || 0) - 20),
-      wname = 'rcmextwin' + new Date().getTime(),
-      extwin = window.open(url + '&_extwin=1', wname,
-        'width='+w+',height='+h+',top='+t+',left='+l+',resizable=yes,toolbar=no,status=no,location=no');
+    var wname = 'rcmextwin' + new Date().getTime();
+
+    url += (url.match(/\?/) ? '&' : '?') + '_extwin=1';
+
+    if (this.env.standard_windows)
+      extwin = window.open(url, wname);
+    else {
+      var win = this.is_framed() ? parent.window : window,
+        page = $(win),
+        page_width = page.width(),
+        page_height = bw.mz ? $('body', win).height() : page.height(),
+        w = Math.min(small ? this.env.popup_width_small : this.env.popup_width, page_width),
+        h = page_height, // always use same height
+        l = (win.screenLeft || win.screenX) + 20,
+        t = (win.screenTop || win.screenY) + 20,
+        extwin = window.open(url, wname,
+          'width='+w+',height='+h+',top='+t+',left='+l+',resizable=yes,location=no,scrollbars=yes'
+          +(toolbar ? ',toolbar=yes,menubar=yes,status=yes' : ',toolbar=no,menubar=no,status=no'));
+    }
 
     // write loading... message to empty windows
     if (!url && extwin.document) {
@@ -1696,10 +1662,8 @@ function rcube_webmail()
 
     // focus window, delayed to bring to front
     window.setTimeout(function() { extwin.focus(); }, 10);
-    // position window with setTimeout for Chrome (#1488931)
-    window.setTimeout(function() { extwin.moveTo(l,t); }, bw.chrome ? 100 : 10);
 
-    return wname;
+    return extwin;
   };
 
 
@@ -1783,10 +1747,7 @@ function rcube_webmail()
         + (flags.flagged ? ' flagged' : '')
         + (flags.unread_children && flags.seen && !this.env.autoexpand_threads ? ' unroot' : '')
         + (message.selected ? ' selected' : ''),
-      // for performance use DOM instead of jQuery here
-      row = document.createElement('tr');
-
-    row.id = 'rcmrow'+uid;
+      row = { cols:[], style:{}, id:'rcmrow'+uid };
 
     // message status icons
     css_class = 'msgicon';
@@ -1850,8 +1811,7 @@ function rcube_webmail()
     // add each submitted col
     for (n in this.env.coltypes) {
       c = this.env.coltypes[n];
-      col = document.createElement('td');
-      col.className = String(c).toLowerCase();
+      col = { className: String(c).toLowerCase() };
 
       if (c == 'flag') {
         css_class = (flags.flagged ? 'flagged' : 'unflagged');
@@ -1896,8 +1856,7 @@ function rcube_webmail()
         html = cols[c];
 
       col.innerHTML = html;
-
-      row.appendChild(col);
+      row.cols.push(col);
     }
 
     list.insert_row(row, attop);
@@ -1998,7 +1957,7 @@ function rcube_webmail()
     }
     else {
       if (!preview && this.env.message_extwin && !this.env.extwin)
-        this.open_window(this.env.comm_path+url, 1000, 1200);
+        this.open_window(this.env.comm_path+url, true);
       else
         this.location_href(this.env.comm_path+url, target, true);
 
@@ -2260,7 +2219,7 @@ function rcube_webmail()
     if (root)
       row = rows[root] ? rows[root].obj : null;
     else
-      row = this.message_list.list.tBodies[0].firstChild;
+      row = this.message_list.tbody.firstChild;
 
     while (row) {
       if (row.nodeType == 1 && (r = rows[row.uid])) {
@@ -2436,7 +2395,7 @@ function rcube_webmail()
   this.delete_excessive_thread_rows = function()
   {
     var rows = this.message_list.rows,
-      tbody = this.message_list.list.tBodies[0],
+      tbody = this.message_list.tbody,
       row = tbody.firstChild,
       cnt = this.env.pagesize + 1;
 
@@ -3024,11 +2983,12 @@ function rcube_webmail()
 
     // open new compose window
     if (this.env.compose_extwin && !this.env.extwin) {
-      this.open_window(url, 1150, 900);
+      this.open_window(url);
     }
     else {
       this.redirect(url);
-      window.resizeTo(Math.max(1150, $(window).width()), Math.max(900, $(window).height()));
+      if (this.env.extwin)
+        window.resizeTo(Math.max(this.env.popup_width, $(window).width()), $(window).height() + 24);
     }
   };
 
@@ -3044,10 +3004,10 @@ function rcube_webmail()
       input_message = $("[name='_message']").get(0),
       html_mode = $("input[name='_is_html']").val() == '1',
       ac_fields = ['cc', 'bcc', 'replyto', 'followupto'],
-      ac_props;
+      ac_props, opener_rc = this.opener();
 
     // close compose step in opener
-    if (window.opener && !window.opener.closed && opener.rcmail && opener.rcmail.env.action == 'compose') {
+    if (opener_rc && opener_rc.env.action == 'compose') {
       setTimeout(function(){ opener.history.back(); }, 100);
       this.env.opened_extwin = true;
     }
@@ -3119,6 +3079,13 @@ function rcube_webmail()
     form._draft.value = draft ? '1' : '';
     form.action = this.add_url(form.action, '_unlock', msgid);
     form.action = this.add_url(form.action, '_lang', lang);
+
+    // register timer to notify about connection timeout
+    this.submit_timer = setTimeout(function(){
+      ref.set_busy(false, null, msgid);
+      ref.display_message(ref.get_label('requesttimedout'), 'error');
+    }, this.env.request_timeout * 1000);
+
     form.submit();
   };
 
@@ -3129,7 +3096,7 @@ function rcube_webmail()
 
   this.compose_add_recipient = function(field)
   {
-    var recipients = [], input = $('#_'+field);
+    var recipients = [], input = $('#_'+field), delim = this.env.recipients_delimiter;
 
     if (this.contact_list && this.contact_list.selection.length) {
       for (var id, n=0; n < this.contact_list.selection.length; n++) {
@@ -3148,8 +3115,10 @@ function rcube_webmail()
     }
 
     if (recipients.length && input.length) {
-      var oldval = input.val();
-      input.val((oldval ? oldval + this.env.recipients_delimiter : '') + recipients.join(this.env.recipients_delimiter));
+      var oldval = input.val(), rx = new RegExp(RegExp.escape(delim) + '\\s*$');
+      if (oldval && !rx.test(oldval))
+        oldval += delim + ' ';
+      input.val(oldval + recipients.join(delim + ' ') + delim + ' ');
       this.triggerEvent('add-recipient', { field:field, recipients:recipients });
     }
   };
@@ -3339,6 +3308,15 @@ function rcube_webmail()
 
   this.set_draft_id = function(id)
   {
+    var rc;
+
+    if (!this.env.draft_id && id && (rc = this.opener())) {
+      // refresh the drafts folder in opener window
+      if (rc.env.task == 'mail' && rc.env.action == '' && rc.env.mailbox == this.env.drafts_mailbox)
+        rc.command('checkmail');
+    }
+
+    this.env.draft_id = id;
     $("input[name='_draft_saveid']").val(id);
   };
 
@@ -3383,12 +3361,45 @@ function rcube_webmail()
     if (!show_sig)
       show_sig = this.env.show_sig;
 
-    var cursor_pos, p = -1,
+    var i, rx, cursor_pos, p = -1,
       id = obj.options[obj.selectedIndex].value,
       input_message = $("[name='_message']"),
       message = input_message.val(),
       is_html = ($("input[name='_is_html']").val() == '1'),
-      sig = this.env.identity;
+      sig = this.env.identity,
+      delim = this.env.recipients_delimiter,
+      headers = ['replyto', 'bcc'];
+
+    // update reply-to/bcc fields with addresses defined in identities
+    for (i in headers) {
+      var key = headers[i],
+        old_val = sig && this.env.identities[sig] ? this.env.identities[sig][key] : '',
+        new_val = id && this.env.identities[id] ? this.env.identities[id][key] : '',
+        input = $('[name="_'+key+'"]'), input_val = input.val();
+
+      // remove old address(es)
+      if (old_val && input_val) {
+        rx = new RegExp('\\s*' + RegExp.escape(old_val) + '\\s*');
+        input_val = input_val.replace(rx, '');
+      }
+
+      // cleanup
+      rx = new RegExp(RegExp.escape(delim) + '\\s*' + RegExp(delim), 'g');
+      input_val = input_val.replace(rx, delim)
+      rx = new RegExp('^\\s*' + RegExp.escape(delim) + '\\s*$');
+      input_val = input_val.replace(rx, '')
+
+      // add new address(es)
+      if (new_val) {
+        rx = new RegExp(RegExp.escape(delim) + '\\s*$');
+        if (input_val && !rx.test(input_val))
+          input_val += delim + ' ';
+        input_val += new_val + delim + ' ';
+      }
+
+      if (old_val || new_val)
+        input.val(input_val).change();
+    }
 
     // enable manual signature insert
     if (this.env.signatures && this.env.signatures[id]) {
@@ -3404,7 +3415,7 @@ function rcube_webmail()
         sig = this.env.signatures[sig].text;
         sig = sig.replace(/\r\n/g, '\n');
 
-        p = this.env.sig_above ? message.indexOf(sig) : message.lastIndexOf(sig);
+        p = this.env.top_posting ? message.indexOf(sig) : message.lastIndexOf(sig);
         if (p >= 0)
           message = message.substring(0, p) + message.substring(p+sig.length, message.length);
       }
@@ -3413,7 +3424,7 @@ function rcube_webmail()
         sig = this.env.signatures[id].text;
         sig = sig.replace(/\r\n/g, '\n');
 
-        if (this.env.sig_above) {
+        if (this.env.top_posting) {
           if (p >= 0) { // in place of removed signature
             message = message.substring(0, p) + sig + message.substring(p, message.length);
             cursor_pos = p - 1;
@@ -3457,7 +3468,7 @@ function rcube_webmail()
         sigElem = doc.createElement('div');
         sigElem.setAttribute('id', '_rc_sig');
 
-        if (this.env.sig_above) {
+        if (this.env.top_posting) {
           // if no existing sig and top posting then insert at caret pos
           editor.getWin().focus(); // correct focus in IE & Chrome
 
@@ -3488,8 +3499,8 @@ function rcube_webmail()
     return true;
   };
 
-  // upload attachment file
-  this.upload_file = function(form)
+  // upload (attachment) file
+  this.upload_file = function(form, action)
   {
     if (!form)
       return false;
@@ -3516,7 +3527,7 @@ function rcube_webmail()
         return;
       }
 
-      var frame_name = this.async_upload_form(form, 'upload', function(e) {
+      var frame_name = this.async_upload_form(form, action || 'upload', function(e) {
         var d, content = '';
         try {
           if (this.contentDocument) {
@@ -3714,14 +3725,19 @@ function rcube_webmail()
     this.env.search_id = null;
   };
 
-  this.sent_successfully = function(type, msg)
+  this.sent_successfully = function(type, msg, target)
   {
     this.display_message(msg, type);
 
     if (this.env.extwin) {
+      var rc = this.opener();
       this.lock_form(this.gui_objects.messageform);
-      if (window.opener && !window.opener.closed && opener.rcmail)
-        opener.rcmail.display_message(msg, type);
+      if (rc) {
+        rc.display_message(msg, type);
+        // refresh the folder where sent message was saved
+        if (target && rc.env.task == 'mail' && rc.env.action == '' && rc.env.mailbox == target)
+          rc.command('checkmail');
+      }
       setTimeout(function(){ window.close() }, 1000);
     }
     else {
@@ -4096,6 +4112,7 @@ function rcube_webmail()
     var n, id, sid, ref = this, writable = false,
       source = this.env.source ? this.env.address_sources[this.env.source] : null;
 
+    // we don't have dblclick handler here, so use 200 instead of this.dblclick_time
     if (id = list.get_single_selection())
       this.preview_timer = setTimeout(function(){ ref.load_contact(id, 'show'); }, 200);
     else if (this.env.contentframe)
@@ -4157,7 +4174,7 @@ function rcube_webmail()
     else if (!this.env.search_request)
       folder = group ? 'G'+src+group : src;
 
-    this.select_folder(folder);
+    this.select_folder(folder, '', true);
 
     this.env.source = src;
     this.env.group = group;
@@ -4288,7 +4305,7 @@ function rcube_webmail()
         this.group_member_change('add', cid, dest, to.id);
       else {
         var lock = this.display_message(this.get_label('copyingcontact'), 'loading'),
-          post_data = {_cid: cid, _source: source, _to: dest, _togid: to.id, _gid: group};
+          post_data = {_cid: cid, _source: this.env.source, _to: dest, _togid: to.id, _gid: group};
 
         this.http_post('copy', post_data, lock);
       }
@@ -4296,7 +4313,7 @@ function rcube_webmail()
     // target is an addressbook
     else if (to.id != source) {
       var lock = this.display_message(this.get_label('copyingcontact'), 'loading'),
-        post_data = {_cid: cid, _source: source, _to: to.id, _gid: group};
+        post_data = {_cid: cid, _source: this.env.source, _to: to.id, _gid: group};
 
       this.http_post('copy', post_data, lock);
     }
@@ -4358,21 +4375,7 @@ function rcube_webmail()
         newcid = newcid+'-'+source;
     }
 
-    if (list.rows[cid] && (row = list.rows[cid].obj)) {
-      for (c=0; c<cols_arr.length; c++)
-        if (row.cells[c])
-          $(row.cells[c]).html(cols_arr[c]);
-
-      // cid change
-      if (newcid) {
-        newcid = this.html_identifier(newcid);
-        row.id = 'rcmrow' + newcid;
-        list.remove_row(cid);
-        list.init_row(row);
-        list.selection[0] = newcid;
-        row.style.display = '';
-      }
-    }
+    list.update_row(cid, cols_arr, newcid, true);
   };
 
   // add row to contacts list
@@ -4382,7 +4385,7 @@ function rcube_webmail()
       return false;
 
     var c, col, list = this.contact_list,
-      row = document.createElement('tr');
+      row = { cols:[] };
 
     row.id = 'rcmrow'+this.html_identifier(cid);
     row.className = 'contact ' + (classes || '');
@@ -4392,10 +4395,10 @@ function rcube_webmail()
 
     // add each submitted col
     for (c in cols) {
-      col = document.createElement('td');
+      col = {};
       col.className = String(c).toLowerCase();
       col.innerHTML = cols[c];
-      row.appendChild(col);
+      row.cols.push(col);
     }
 
     list.insert_row(row);
@@ -4461,7 +4464,7 @@ function rcube_webmail()
       this.name_input.bind('keydown', function(e){ return rcmail.add_input_keydown(e); });
       this.env.group_renaming = true;
 
-      var link, li = this.get_folder_li(this.env.source+this.env.group, 'rcmliG');
+      var link, li = this.get_folder_li('G'+this.env.source+this.env.group,'',true);
       if (li && (link = li.firstChild)) {
         $(link).hide().before(this.name_input);
       }
@@ -4481,11 +4484,8 @@ function rcube_webmail()
   // callback from server upon group-delete command
   this.remove_group_item = function(prop)
   {
-    var li, key = 'G'+prop.source+prop.id;
-    if ((li = this.get_folder_li(key))) {
-      this.triggerEvent('group_delete', { source:prop.source, id:prop.id, li:li });
-
-      li.parentNode.removeChild(li);
+    var key = 'G'+prop.source+prop.id;
+    if (this.treelist.remove(key)) {
       delete this.env.contactfolders[key];
       delete this.env.contactgroups[key];
     }
@@ -4504,8 +4504,22 @@ function rcube_webmail()
       this.name_input.bind('keydown', function(e){ return rcmail.add_input_keydown(e); });
       this.name_input_li = $('<li>').addClass(type).append(this.name_input);
 
-      var li = type == 'contactsearch' ? $('li:last', this.gui_objects.folderlist) : this.get_folder_li(this.env.source);
-      this.name_input_li.insertAfter(li);
+      var ul, li;
+
+      // find list (UL) element
+      if (type == 'contactsearch')
+        ul = this.gui_objects.folderlist;
+      else
+        ul = $('ul.groups', this.get_folder_li(this.env.source,'',true));
+
+      // append to the list
+      li = $('li:last', ul);
+      if (li.length)
+        this.name_input_li.insertAfter(li);
+      else {
+        this.name_input_li.appendTo(ul);
+        ul.show(); // make sure the list is visible
+      }
     }
 
     this.name_input.select().focus();
@@ -4562,11 +4576,13 @@ function rcube_webmail()
   this.reset_add_input = function()
   {
     if (this.name_input) {
+      var li = this.name_input.parent();
       if (this.env.group_renaming) {
-        var li = this.name_input.parent();
         li.children().last().show();
         this.env.group_renaming = false;
       }
+      else if ($('li', li.parent()).length == 1)
+        li.parent().hide();
 
       this.name_input.remove();
 
@@ -4589,14 +4605,12 @@ function rcube_webmail()
       link = $('<a>').attr('href', '#')
         .attr('rel', prop.source+':'+prop.id)
         .click(function() { return rcmail.command('listgroup', prop, this); })
-        .html(prop.name),
-      li = $('<li>').attr({id: 'rcmli'+this.html_identifier(key), 'class': 'contactgroup'})
-        .append(link);
+        .html(prop.name);
 
     this.env.contactfolders[key] = this.env.contactgroups[key] = prop;
-    this.add_contact_group_row(prop, li);
+    this.treelist.insert({ id:key, html:link, classes:['contactgroup'] }, prop.source, true);
 
-    this.triggerEvent('group_insert', { id:prop.id, source:prop.source, name:prop.name, li:li[0] });
+    this.triggerEvent('group_insert', { id:prop.id, source:prop.source, name:prop.name, li:this.treelist.get_item(key) });
   };
 
   // callback for renaming a contact group
@@ -4605,15 +4619,13 @@ function rcube_webmail()
     this.reset_add_input();
 
     var key = 'G'+prop.source+prop.id,
-      li = this.get_folder_li(key),
-      link;
+      newnode = {};
 
     // group ID has changed, replace link node and identifiers
-    if (li && prop.newid) {
+    if (prop.newid) {
       var newkey = 'G'+prop.source+prop.newid,
-        newprop = $.extend({}, prop);;
+        newprop = $.extend({}, prop);
 
-      li.id = 'rcmli' + this.html_identifier(newkey);
       this.env.contactfolders[newkey] = this.env.contactfolders[key];
       this.env.contactfolders[newkey].id = prop.newid;
       this.env.group = prop.newid;
@@ -4624,45 +4636,22 @@ function rcube_webmail()
       newprop.id = prop.newid;
       newprop.type = 'group';
 
-      link = $('<a>').attr('href', '#')
+      newnode.id = newkey;
+      newnode.html = $('<a>').attr('href', '#')
         .attr('rel', prop.source+':'+prop.newid)
         .click(function() { return rcmail.command('listgroup', newprop, this); })
         .html(prop.name);
-      $(li).children().replaceWith(link);
     }
     // update displayed group name
-    else if (li && (link = li.firstChild) && link.tagName.toLowerCase() == 'a')
-      link.innerHTML = prop.name;
-
-    this.env.contactfolders[key].name = this.env.contactgroups[key].name = prop.name;
-    this.add_contact_group_row(prop, $(li), true);
-
-    this.triggerEvent('group_update', { id:prop.id, source:prop.source, name:prop.name, li:li[0], newid:prop.newid });
-  };
-
-  // add contact group row to the list, with sorting
-  this.add_contact_group_row = function(prop, li, reloc)
-  {
-    var row, name = prop.name.toUpperCase(),
-      sibling = this.get_folder_li(prop.source),
-      prefix = 'rcmliG' + this.html_identifier(prop.source);
-
-    // When renaming groups, we need to remove it from DOM and insert it in the proper place
-    if (reloc) {
-      row = li.clone(true);
-      li.remove();
+    else {
+      $(this.treelist.get_item(key)).children().first().html(prop.name);
+      this.env.contactfolders[key].name = this.env.contactgroups[key].name = prop.name;
     }
-    else
-      row = li;
 
-    $('li[id^="'+prefix+'"]', this.gui_objects.folderlist).each(function(i, elem) {
-      if (name >= $(this).text().toUpperCase())
-        sibling = elem;
-      else
-        return false;
-    });
+    // update list node and re-sort it
+    this.treelist.update(key, newnode, true);
 
-    row.insertAfter(sibling);
+    this.triggerEvent('group_update', { id:prop.id, source:prop.source, name:prop.name, li:this.treelist.get_item(key), newid:prop.newid });
   };
 
   this.update_group_commands = function()
@@ -4894,47 +4883,16 @@ function rcube_webmail()
         .attr('rel', id)
         .click(function() { return rcmail.command('listsearch', id, this); })
         .html(name),
-      li = $('<li>').attr({id: 'rcmli' + this.html_identifier(key), 'class': 'contactsearch'})
-        .append(link),
-      prop = {name:name, id:id, li:li[0]};
+      prop = { name:name, id:id };
 
-    this.add_saved_search_row(prop, li);
-    this.select_folder('S'+id);
+    this.treelist.insert({ id:key, html:link, classes:['contactsearch'] }, null, 'contactsearch');
+    this.select_folder(key,'',true);
     this.enable_command('search-delete', true);
     this.env.search_id = id;
 
     this.triggerEvent('abook_search_insert', prop);
   };
 
-  // add saved search row to the list, with sorting
-  this.add_saved_search_row = function(prop, li, reloc)
-  {
-    var row, sibling, name = prop.name.toUpperCase();
-
-    // When renaming groups, we need to remove it from DOM and insert it in the proper place
-    if (reloc) {
-      row = li.clone(true);
-      li.remove();
-    }
-    else
-      row = li;
-
-    $('li[class~="contactsearch"]', this.gui_objects.folderlist).each(function(i, elem) {
-      if (!sibling)
-        sibling = this.previousSibling;
-
-      if (name >= $(this).text().toUpperCase())
-        sibling = elem;
-      else
-        return false;
-    });
-
-    if (sibling)
-      row.insertAfter(sibling);
-    else
-      row.appendTo(this.gui_objects.folderlist);
-  };
-
   // creates an input for saved search name
   this.search_create = function()
   {
@@ -4953,10 +4911,8 @@ function rcube_webmail()
   this.remove_search_item = function(id)
   {
     var li, key = 'S'+id;
-    if ((li = this.get_folder_li(key))) {
+    if (this.treelist.remove(key)) {
       this.triggerEvent('search_delete', { id:id, li:li });
-
-      li.parentNode.removeChild(li);
     }
 
     this.env.search_id = null;
@@ -4975,7 +4931,7 @@ function rcube_webmail()
     }
 
     this.reset_qsearch();
-    this.select_folder('S'+id);
+    this.select_folder('S'+id, '', true);
 
     // reset vars
     this.env.current_page = 1;
@@ -5054,18 +5010,16 @@ function rcube_webmail()
 
   this.update_identity_row = function(id, name, add)
   {
-    var row, col, list = this.identity_list,
+    var list = this.identity_list,
       rid = this.html_identifier(id);
 
-    if (list.rows[rid] && (row = list.rows[rid].obj)) {
-      $(row.cells[0]).html(name);
-    }
-    else if (add) {
-      row = $('<tr>').attr('id', 'rcmrow'+rid).get(0);
-      col = $('<td>').addClass('mail').html(name).appendTo(row);
-      list.insert_row(row);
+    if (add) {
+      list.insert_row({ id:'rcmrow'+rid, cols:[ { className:'mail', innerHTML:name } ] });
       list.select(rid);
     }
+    else {
+      list.update_row(rid, [ name ]);
+    }
   };
 
 
@@ -5690,14 +5644,15 @@ function rcube_webmail()
     if (!this.gui_objects.message)
       return;
 
-    var k, n, i, msg, m = this.messages;
+    var k, n, i, o, m = this.messages;
 
     // Hide message by object, don't use for 'loading'!
     if (typeof obj === 'object') {
-      $(obj)[fade?'fadeOut':'hide']();
-      msg = $(obj).data('key');
-      if (this.messages[msg])
-        delete this.messages[msg];
+      o = $(obj);
+      k = o.data('key');
+      this.hide_message_object(o, fade);
+      if (m[k])
+        delete m[k];
     }
     // Hide message by id
     else {
@@ -5707,7 +5662,7 @@ function rcube_webmail()
             m[k].elements.splice(n, 1);
             // hide DOM element if last instance is removed
             if (!m[k].elements.length) {
-              m[k].obj[fade?'fadeOut':'hide']();
+              this.hide_message_object(m[k].obj, fade);
               delete m[k];
             }
             // set pending action label for 'loading' message
@@ -5717,9 +5672,9 @@ function rcube_webmail()
                   delete m[k].labels[i];
                 }
                 else {
-                  msg = m[k].labels[i].msg;
+                  o = m[k].labels[i].msg;
+                  m[k].obj.html(o);
                 }
-                m[k].obj.html(msg);
               }
             }
           }
@@ -5728,6 +5683,15 @@ function rcube_webmail()
     }
   };
 
+  // hide message object and remove from the DOM
+  this.hide_message_object = function(o, fade)
+  {
+    if (fade)
+      o.fadeOut(600, function() {$(this).remove(); });
+    else
+      o.hide().remove();
+  };
+
   // remove all messages immediately
   this.clear_messages = function()
   {
@@ -5740,17 +5704,17 @@ function rcube_webmail()
     for (k in m)
       for (n in m[k].elements)
         if (m[k].obj)
-          m[k].obj.hide();
+          this.hide_message_object(m[k].obj);
 
     this.messages = {};
   };
 
   // open a jquery UI dialog with the given content
-  this.show_popup_dialog = function(html, title)
+  this.show_popup_dialog = function(html, title, buttons)
   {
     // forward call to parent window
     if (this.is_framed()) {
-      parent.rcmail.show_popup_dialog(html, title);
+      parent.rcmail.show_popup_dialog(html, title, buttons);
       return;
     }
 
@@ -5758,17 +5722,21 @@ function rcube_webmail()
       .html(html)
       .dialog({
         title: title,
+        buttons: buttons,
         modal: true,
         resizable: true,
-        width: 580,
+        width: 500,
         close: function(event, ui) { $(this).remove() }
       });
 
-      // resize and center popup
-      var win = $(window), w = win.width(), h = win.height(),
-        width = popup.width(), height = popup.height();
-      popup.dialog('option', { height: Math.min(h-40, height+50), width: Math.min(w-20, width+50) })
-        .dialog('option', 'position', ['center', 'center']);  // only works in a separate call (!?)
+    // resize and center popup
+    var win = $(window), w = win.width(), h = win.height(),
+      width = popup.width(), height = popup.height();
+
+    popup.dialog('option', {
+      height: Math.min(h - 40, height + 75 + (buttons ? 50 : 0)),
+      width: Math.min(w - 20, width + 20)
+    });
   };
 
   // enable/disable buttons for page shifting
@@ -5781,7 +5749,10 @@ function rcube_webmail()
   // mark a mailbox as selected and set environment variable
   this.select_folder = function(name, prefix, encode)
   {
-    if (this.gui_objects.folderlist) {
+    if (this.treelist) {
+      this.treelist.select(name);
+    }
+    else if (this.gui_objects.folderlist) {
       var current_li, target_li;
 
       if ((current_li = $('li.selected', this.gui_objects.folderlist))) {
@@ -5827,7 +5798,7 @@ function rcube_webmail()
   this.set_message_coltypes = function(coltypes, repl, smart_col)
   {
     var list = this.message_list,
-      thead = list ? list.list.tHead : null,
+      thead = list ? list.thead : null,
       cell, col, n, len, th, tr;
 
     this.env.coltypes = coltypes;
@@ -5840,14 +5811,14 @@ function rcube_webmail()
 
         for (c=0, len=repl.length; c < len; c++) {
           cell = document.createElement('td');
-          cell.innerHTML = repl[c].html;
+          cell.innerHTML = repl[c].html || '';
           if (repl[c].id) cell.id = repl[c].id;
           if (repl[c].className) cell.className = repl[c].className;
           tr.appendChild(cell);
         }
         th.appendChild(tr);
         thead.parentNode.replaceChild(th, thead);
-        thead = th;
+        list.thead = thead = th;
       }
 
       for (n=0, len=this.env.coltypes.length; n<len; n++) {
@@ -6069,9 +6040,9 @@ function rcube_webmail()
     var base = this.env.comm_path, k, param = {};
 
     // overwrite task name
-    if (query._action.match(/([a-z]+)\/([a-z0-9-_.]+)/)) {
+    if (query._action.match(/([a-z0-9_-]+)\/([a-z0-9-_.]+)/)) {
       query._action = RegExp.$2;
-      base = base.replace(/\_task=[a-z]+/, '_task='+RegExp.$1);
+      base = base.replace(/\_task=[a-z0-9_-]+/, '_task='+RegExp.$1);
     }
 
     // remove undefined values
@@ -6345,14 +6316,31 @@ function rcube_webmail()
 
     // redirect to url specified in location header if not empty
     var location_url = request.getResponseHeader("Location");
-    if (location_url)
+    if (location_url && this.env.action != 'compose')  // don't redirect on compose screen, contents might get lost (#1488926)
       this.redirect(location_url);
 
+    // 403 Forbidden response (CSRF prevention) - reload the page.
+    // In case there's a new valid session it will be used, otherwise
+    // login form will be presented (#1488960).
+    if (request.status == 403) {
+      (this.is_framed() ? parent : window).location.reload();
+      return;
+    }
+
     // re-send keep-alive requests after 30 seconds
     if (action == 'keep-alive')
       setTimeout(function(){ ref.keep_alive(); ref.start_keepalive(); }, 30000);
   };
 
+  // callback when an iframe finished loading
+  this.iframe_loaded = function(unlock)
+  {
+    this.set_busy(false, null, unlock);
+
+    if (this.submit_timer)
+      clearTimeout(this.submit_timer);
+  };
+
   // post the given form to a hidden iframe
   this.async_upload_form = function(form, action, onload)
   {
@@ -6452,6 +6440,7 @@ function rcube_webmail()
         url: ref.url(ref.env.filedrop.action||'upload', { _id:ref.env.compose_id||ref.env.cid||'', _uploadid:ts, _remote:1 }),
         contentType: formdata ? false : 'multipart/form-data; boundary=' + boundary,
         processData: false,
+        timeout: 0, // disable default timeout set in ajaxSetup()
         data: formdata || multipart,
         headers: {'X-Roundcube-Request': ref.env.request_token},
         beforeSend: function(xhr, s) { if (!formdata && xhr.sendAsBinary) xhr.send = xhr.sendAsBinary; },
@@ -6591,6 +6580,17 @@ function rcube_webmail()
   /*********            helper methods            *********/
   /********************************************************/
 
+  // get window.opener.rcmail if available
+  this.opener = function()
+  {
+    // catch Error: Permission denied to access property rcmail
+    try {
+      if (window.opener && !opener.closed && opener.rcmail)
+        return opener.rcmail;
+    }
+    catch (e) {}
+  };
+
   // check if we're in show mode or if we have a unique selection
   // and return the message uid
   this.get_single_uid = function()
diff --git a/program/js/common.js b/program/js/common.js
index f9e945c05..de07ec131 100644
--- a/program/js/common.js
+++ b/program/js/common.js
@@ -251,7 +251,7 @@ remove_listener: function(p)
 },
 
 /**
- * Prevent event propagation and bubbeling
+ * Prevent event propagation and bubbling
  */
 cancel: function(evt)
 {
@@ -298,8 +298,7 @@ addEventListener: function(evt, func, obj)
   if (!this._events[evt])
     this._events[evt] = [];
 
-  var e = {func:func, obj:obj ? obj : window};
-  this._events[evt][this._events[evt].length] = e;
+  this._events[evt].push({func:func, obj:obj ? obj : window});
 },
 
 /**
@@ -372,117 +371,6 @@ triggerEvent: function(evt, e)
 };  // end rcube_event_engine.prototype
 
 
-
-/**
- * Roundcube generic layer (floating box) class
- *
- * @constructor
- */
-function rcube_layer(id, attributes)
-{
-  this.name = id;
-
-  // create a new layer in the current document
-  this.create = function(arg)
-  {
-    var l = (arg.x) ? arg.x : 0,
-      t = (arg.y) ? arg.y : 0,
-      w = arg.width,
-      h = arg.height,
-      z = arg.zindex,
-      vis = arg.vis,
-      parent = arg.parent,
-      obj = document.createElement('DIV');
-
-    obj.id = this.name;
-    obj.style.position = 'absolute';
-    obj.style.visibility = (vis) ? (vis==2) ? 'inherit' : 'visible' : 'hidden';
-    obj.style.left = l+'px';
-    obj.style.top = t+'px';
-    if (w)
-	  obj.style.width = w.toString().match(/\%$/) ? w : w+'px';
-    if (h)
-	  obj.style.height = h.toString().match(/\%$/) ? h : h+'px';
-    if (z)
-      obj.style.zIndex = z;
-
-    if (parent)
-      parent.appendChild(obj);
-    else
-      document.body.appendChild(obj);
-
-    this.elm = obj;
-  };
-
-  // create new layer
-  if (attributes != null) {
-    this.create(attributes);
-    this.name = this.elm.id;
-  }
-  else  // just refer to the object
-    this.elm = document.getElementById(id);
-
-  if (!this.elm)
-    return false;
-
-
-  // ********* layer object properties *********
-
-  this.css = this.elm.style;
-  this.event = this.elm;
-  this.width = this.elm.offsetWidth;
-  this.height = this.elm.offsetHeight;
-  this.x = parseInt(this.elm.offsetLeft);
-  this.y = parseInt(this.elm.offsetTop);
-  this.visible = (this.css.visibility=='visible' || this.css.visibility=='show' || this.css.visibility=='inherit') ? true : false;
-
-
-  // ********* layer object methods *********
-
-  // move the layer to a specific position
-  this.move = function(x, y)
-  {
-    this.x = x;
-    this.y = y;
-    this.css.left = Math.round(this.x)+'px';
-    this.css.top = Math.round(this.y)+'px';
-  };
-
-  // change the layers width and height
-  this.resize = function(w,h)
-  {
-    this.css.width  = w+'px';
-    this.css.height = h+'px';
-    this.width = w;
-    this.height = h;
-  };
-
-  // show or hide the layer
-  this.show = function(a)
-  {
-    if(a == 1) {
-      this.css.visibility = 'visible';
-      this.visible = true;
-    }
-    else if(a == 2) {
-      this.css.visibility = 'inherit';
-      this.visible = true;
-    }
-    else {
-      this.css.visibility = 'hidden';
-      this.visible = false;
-    }
-  };
-
-  // write new content into a Layer
-  this.write = function(cont)
-  {
-    this.elm.innerHTML = cont;
-  };
-
-};
-
-
 // check if input is a valid email address
 // By Cal Henderson <cal@iamcal.com>
 // http://code.iamcal.com/php/rfc822/
@@ -537,7 +425,7 @@ function rcube_clone_object(obj)
 
   for (var key in obj) {
     if (obj[key] && typeof obj[key] === 'object')
-      out[key] = clone_object(obj[key]);
+      out[key] = rcube_clone_object(obj[key]);
     else
       out[key] = obj[key];
   }
@@ -717,13 +605,15 @@ if (bw.ie) {
 // jQuery plugin to emulate HTML5 placeholder attributes on input elements
 jQuery.fn.placeholder = function(text) {
   return this.each(function() {
-    var elem = $(this);
+    var active = false, elem = $(this);
     this.title = text;
 
+    // Try HTML5 placeholder attribute first
     if ('placeholder' in this) {
-      elem.attr('placeholder', text);  // Try HTML5 placeholder attribute first
+      elem.attr('placeholder', text);
     }
-    else {  // Fallback to Javascript emulation of placeholder
+    // Fallback to Javascript emulation of placeholder
+    else {
       this._placeholder = text;
       elem.blur(function(e) {
         if ($.trim(elem.val()) == "")
@@ -740,7 +630,9 @@ jQuery.fn.placeholder = function(text) {
         elem[(active ? 'addClass' : 'removeClass')]('placeholder').attr('spellcheck', active);
       });
 
-      if (this != document.activeElement) // Do not blur currently focused element
+      // Do not blur currently focused element (catch exception: #1489008)
+      try { active = this == document.activeElement; } catch(e) {}
+      if (!active)
         elem.blur();
     }
   });
diff --git a/program/js/jstz.min.js b/program/js/jstz.min.js
index 81c5057fd..d5f888cac 100644
--- a/program/js/jstz.min.js
+++ b/program/js/jstz.min.js
@@ -1,11 +1,2 @@
-var jstz=function(){var b=function(a){a=-a.getTimezoneOffset();return null!==a?a:0},c=function(){return b(new Date(2010,0,1,0,0,0,0))},f=function(){return b(new Date(2010,5,1,0,0,0,0))},e=function(){var a=c(),d=f(),b=c()-f();return new jstz.TimeZone(jstz.olson.timezones[0>b?a+",1":0<b?d+",1,s":a+",0"])};return{determine_timezone:function(){"undefined"!==typeof console&&console.log("jstz.determine_timezone() is deprecated and will be removed in an upcoming version. Please use jstz.determine() instead.");
-return e()},determine:e,date_is_dst:function(a){var d=5<a.getMonth()?f():c(),a=b(a);return 0!==d-a}}}();jstz.TimeZone=function(b){var c=null,c=b;"undefined"!==typeof jstz.olson.ambiguity_list[c]&&function(){for(var b=jstz.olson.ambiguity_list[c],e=b.length,a=0,d=b[0];a<e;a+=1)if(d=b[a],jstz.date_is_dst(jstz.olson.dst_start_dates[d])){c=d;break}}();return{name:function(){return c}}};jstz.olson={};
-jstz.olson.timezones={"-720,0":"Etc/GMT+12","-660,0":"Pacific/Pago_Pago","-600,1":"America/Adak","-600,0":"Pacific/Honolulu","-570,0":"Pacific/Marquesas","-540,0":"Pacific/Gambier","-540,1":"America/Anchorage","-480,1":"America/Los_Angeles","-480,0":"Pacific/Pitcairn","-420,0":"America/Phoenix","-420,1":"America/Denver","-360,0":"America/Guatemala","-360,1":"America/Chicago","-360,1,s":"Pacific/Easter","-300,0":"America/Bogota","-300,1":"America/New_York","-270,0":"America/Caracas","-240,1":"America/Halifax",
-"-240,0":"America/Santo_Domingo","-240,1,s":"America/Asuncion","-210,1":"America/St_Johns","-180,1":"America/Godthab","-180,0":"America/Argentina/Buenos_Aires","-180,1,s":"America/Montevideo","-120,0":"America/Noronha","-120,1":"Etc/GMT+2","-60,1":"Atlantic/Azores","-60,0":"Atlantic/Cape_Verde","0,0":"Etc/UTC","0,1":"Europe/London","60,1":"Europe/Berlin","60,0":"Africa/Lagos","60,1,s":"Africa/Windhoek","120,1":"Asia/Beirut","120,0":"Africa/Johannesburg","180,1":"Europe/Moscow","180,0":"Asia/Baghdad",
-"210,1":"Asia/Tehran","240,0":"Asia/Dubai","240,1":"Asia/Yerevan","270,0":"Asia/Kabul","300,1":"Asia/Yekaterinburg","300,0":"Asia/Karachi","330,0":"Asia/Kolkata","345,0":"Asia/Kathmandu","360,0":"Asia/Dhaka","360,1":"Asia/Omsk","390,0":"Asia/Rangoon","420,1":"Asia/Krasnoyarsk","420,0":"Asia/Jakarta","480,0":"Asia/Shanghai","480,1":"Asia/Irkutsk","525,0":"Australia/Eucla","525,1,s":"Australia/Eucla","540,1":"Asia/Yakutsk","540,0":"Asia/Tokyo","570,0":"Australia/Darwin","570,1,s":"Australia/Adelaide",
-"600,0":"Australia/Brisbane","600,1":"Asia/Vladivostok","600,1,s":"Australia/Sydney","630,1,s":"Australia/Lord_Howe","660,1":"Asia/Kamchatka","660,0":"Pacific/Noumea","690,0":"Pacific/Norfolk","720,1,s":"Pacific/Auckland","720,0":"Pacific/Tarawa","765,1,s":"Pacific/Chatham","780,0":"Pacific/Tongatapu","780,1,s":"Pacific/Apia","840,0":"Pacific/Kiritimati"};
-jstz.olson.dst_start_dates={"America/Denver":new Date(2011,2,13,3,0,0,0),"America/Mazatlan":new Date(2011,3,3,3,0,0,0),"America/Chicago":new Date(2011,2,13,3,0,0,0),"America/Mexico_City":new Date(2011,3,3,3,0,0,0),"Atlantic/Stanley":new Date(2011,8,4,7,0,0,0),"America/Asuncion":new Date(2011,9,2,3,0,0,0),"America/Santiago":new Date(2011,9,9,3,0,0,0),"America/Campo_Grande":new Date(2011,9,16,5,0,0,0),"America/Montevideo":new Date(2011,9,2,3,0,0,0),"America/Sao_Paulo":new Date(2011,9,16,5,0,0,0),"America/Los_Angeles":new Date(2011,
-2,13,8,0,0,0),"America/Santa_Isabel":new Date(2011,3,5,8,0,0,0),"America/Havana":new Date(2011,2,13,2,0,0,0),"America/New_York":new Date(2011,2,13,7,0,0,0),"Asia/Gaza":new Date(2011,2,26,23,0,0,0),"Asia/Beirut":new Date(2011,2,27,1,0,0,0),"Europe/Minsk":new Date(2011,2,27,2,0,0,0),"Europe/Helsinki":new Date(2011,2,27,4,0,0,0),"Europe/Istanbul":new Date(2011,2,28,5,0,0,0),"Asia/Damascus":new Date(2011,3,1,2,0,0,0),"Asia/Jerusalem":new Date(2011,3,1,6,0,0,0),"Africa/Cairo":new Date(2010,3,30,4,0,0,
-0),"Asia/Yerevan":new Date(2011,2,27,4,0,0,0),"Asia/Baku":new Date(2011,2,27,8,0,0,0),"Pacific/Auckland":new Date(2011,8,26,7,0,0,0),"Pacific/Fiji":new Date(2010,11,29,23,0,0,0),"America/Halifax":new Date(2011,2,13,6,0,0,0),"America/Goose_Bay":new Date(2011,2,13,2,1,0,0),"America/Miquelon":new Date(2011,2,13,5,0,0,0),"America/Godthab":new Date(2011,2,27,1,0,0,0)};
-jstz.olson.ambiguity_list={"America/Denver":["America/Denver","America/Mazatlan"],"America/Chicago":["America/Chicago","America/Mexico_City"],"America/Asuncion":["Atlantic/Stanley","America/Asuncion","America/Santiago","America/Campo_Grande"],"America/Montevideo":["America/Montevideo","America/Sao_Paulo"],"Asia/Beirut":"Asia/Gaza Asia/Beirut Europe/Minsk Europe/Helsinki Europe/Istanbul Asia/Damascus Asia/Jerusalem Africa/Cairo".split(" "),"Asia/Yerevan":["Asia/Yerevan","Asia/Baku"],"Pacific/Auckland":["Pacific/Auckland",
-"Pacific/Fiji"],"America/Los_Angeles":["America/Los_Angeles","America/Santa_Isabel"],"America/New_York":["America/Havana","America/New_York"],"America/Halifax":["America/Goose_Bay","America/Halifax"],"America/Godthab":["America/Miquelon","America/Godthab"]};
\ No newline at end of file
+/*! jsTimezoneDetect - v1.0.5 - 2013-04-01 */
+(function(e){var t=function(){"use strict";var e="s",n=2011,r=function(e){var t=-e.getTimezoneOffset();return t!==null?t:0},i=function(e,t,n){var r=new Date;return e!==undefined&&r.setFullYear(e),r.setDate(n),r.setMonth(t),r},s=function(e){return r(i(e,0,2))},o=function(e){return r(i(e,5,2))},u=function(e){var t=e.getMonth()>7?o(e.getFullYear()):s(e.getFullYear()),n=r(e);return t-n!==0},a=function(){var t=s(n),r=o(n),i=t-r;return i<0?t+",1":i>0?r+",1,"+e:t+",0"},f=function(){var e=a();return new t.TimeZone(t.olson.timezones[e])},l=function(e){var t=new Date(2010,6,15,1,0,0,0),n={"America/Denver":new Date(2011,2,13,3,0,0,0),"America/Mazatlan":new Date(2011,3,3,3,0,0,0),"America/Chicago":new Date(2011,2,13,3,0,0,0),"America/Mexico_City":new Date(2011,3,3,3,0,0,0),"America/Asuncion":new Date(2012,9,7,3,0,0,0),"America/Santiago":new Date(2012,9,3,3,0,0,0),"America/Campo_Grande":new Date(2012,9,21,5,0,0,0),"America/Montevideo":new Date(2011,9,2,3,0,0,0),"America/Sao_Paulo":new Date(2011,9,16,5,0,0,0),"America/Los_Angeles":new Date(2011,2,13,8,0,0,0),"America/Santa_Isabel":new Date(2011,3,5,8,0,0,0),"America/Havana":new Date(2012,2,10,2,0,0,0),"America/New_York":new Date(2012,2,10,7,0,0,0),"Asia/Beirut":new Date(2011,2,27,1,0,0,0),"Europe/Helsinki":new Date(2011,2,27,4,0,0,0),"Europe/Istanbul":new Date(2011,2,28,5,0,0,0),"Asia/Damascus":new Date(2011,3,1,2,0,0,0),"Asia/Jerusalem":new Date(2011,3,1,6,0,0,0),"Asia/Gaza":new Date(2009,2,28,0,30,0,0),"Africa/Cairo":new Date(2009,3,25,0,30,0,0),"Pacific/Auckland":new Date(2011,8,26,7,0,0,0),"Pacific/Fiji":new Date(2010,10,29,23,0,0,0),"America/Halifax":new Date(2011,2,13,6,0,0,0),"America/Goose_Bay":new Date(2011,2,13,2,1,0,0),"America/Miquelon":new Date(2011,2,13,5,0,0,0),"America/Godthab":new Date(2011,2,27,1,0,0,0),"Europe/Moscow":t,"Asia/Yekaterinburg":t,"Asia/Omsk":t,"Asia/Krasnoyarsk":t,"Asia/Irkutsk":t,"Asia/Yakutsk":t,"Asia/Vladivostok":t,"Asia/Kamchatka":t,"Europe/Minsk":t,"Pacific/Apia":new Date(2010,10,1,1,0,0,0),"Australia/Perth":new Date(2008,10,1,1,0,0,0)};return n[e]};return{determine:f,date_is_dst:u,dst_start_for:l}}();t.TimeZone=function(e){"use strict";var n={"America/Denver":["America/Denver","America/Mazatlan"],"America/Chicago":["America/Chicago","America/Mexico_City"],"America/Santiago":["America/Santiago","America/Asuncion","America/Campo_Grande"],"America/Montevideo":["America/Montevideo","America/Sao_Paulo"],"Asia/Beirut":["Asia/Beirut","Europe/Helsinki","Europe/Istanbul","Asia/Damascus","Asia/Jerusalem","Asia/Gaza"],"Pacific/Auckland":["Pacific/Auckland","Pacific/Fiji"],"America/Los_Angeles":["America/Los_Angeles","America/Santa_Isabel"],"America/New_York":["America/Havana","America/New_York"],"America/Halifax":["America/Goose_Bay","America/Halifax"],"America/Godthab":["America/Miquelon","America/Godthab"],"Asia/Dubai":["Europe/Moscow"],"Asia/Dhaka":["Asia/Yekaterinburg"],"Asia/Jakarta":["Asia/Omsk"],"Asia/Shanghai":["Asia/Krasnoyarsk","Australia/Perth"],"Asia/Tokyo":["Asia/Irkutsk"],"Australia/Brisbane":["Asia/Yakutsk"],"Pacific/Noumea":["Asia/Vladivostok"],"Pacific/Tarawa":["Asia/Kamchatka"],"Pacific/Tongatapu":["Pacific/Apia"],"Africa/Johannesburg":["Asia/Gaza","Africa/Cairo"],"Asia/Baghdad":["Europe/Minsk"]},r=e,i=function(){var e=n[r],i=e.length,s=0,o=e[0];for(;s<i;s+=1){o=e[s];if(t.date_is_dst(t.dst_start_for(o))){r=o;return}}},s=function(){return typeof n[r]!="undefined"};return s()&&i(),{name:function(){return r}}},t.olson={},t.olson.timezones={"-720,0":"Pacific/Majuro","-660,0":"Pacific/Pago_Pago","-600,1":"America/Adak","-600,0":"Pacific/Honolulu","-570,0":"Pacific/Marquesas","-540,0":"Pacific/Gambier","-540,1":"America/Anchorage","-480,1":"America/Los_Angeles","-480,0":"Pacific/Pitcairn","-420,0":"America/Phoenix","-420,1":"America/Denver","-360,0":"America/Guatemala","-360,1":"America/Chicago","-360,1,s":"Pacific/Easter","-300,0":"America/Bogota","-300,1":"America/New_York","-270,0":"America/Caracas","-240,1":"America/Halifax","-240,0":"America/Santo_Domingo","-240,1,s":"America/Santiago","-210,1":"America/St_Johns","-180,1":"America/Godthab","-180,0":"America/Argentina/Buenos_Aires","-180,1,s":"America/Montevideo","-120,0":"America/Noronha","-120,1":"America/Noronha","-60,1":"Atlantic/Azores","-60,0":"Atlantic/Cape_Verde","0,0":"UTC","0,1":"Europe/London","60,1":"Europe/Berlin","60,0":"Africa/Lagos","60,1,s":"Africa/Windhoek","120,1":"Asia/Beirut","120,0":"Africa/Johannesburg","180,0":"Asia/Baghdad","180,1":"Europe/Moscow","210,1":"Asia/Tehran","240,0":"Asia/Dubai","240,1":"Asia/Baku","270,0":"Asia/Kabul","300,1":"Asia/Yekaterinburg","300,0":"Asia/Karachi","330,0":"Asia/Kolkata","345,0":"Asia/Kathmandu","360,0":"Asia/Dhaka","360,1":"Asia/Omsk","390,0":"Asia/Rangoon","420,1":"Asia/Krasnoyarsk","420,0":"Asia/Jakarta","480,0":"Asia/Shanghai","480,1":"Asia/Irkutsk","525,0":"Australia/Eucla","525,1,s":"Australia/Eucla","540,1":"Asia/Yakutsk","540,0":"Asia/Tokyo","570,0":"Australia/Darwin","570,1,s":"Australia/Adelaide","600,0":"Australia/Brisbane","600,1":"Asia/Vladivostok","600,1,s":"Australia/Sydney","630,1,s":"Australia/Lord_Howe","660,1":"Asia/Kamchatka","660,0":"Pacific/Noumea","690,0":"Pacific/Norfolk","720,1,s":"Pacific/Auckland","720,0":"Pacific/Tarawa","765,1,s":"Pacific/Chatham","780,0":"Pacific/Tongatapu","780,1,s":"Pacific/Apia","840,0":"Pacific/Kiritimati"},typeof exports!="undefined"?exports.jstz=t:e.jstz=t})(this);
\ No newline at end of file
diff --git a/program/js/list.js b/program/js/list.js
index 660b74d85..8b8a7196e 100644
--- a/program/js/list.js
+++ b/program/js/list.js
@@ -3,7 +3,7 @@
  | Roundcube List Widget                                                 |
  |                                                                       |
  | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2006-2009, The Roundcube Dev Team                       |
+ | Copyright (C) 2006-2013, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -30,6 +30,9 @@ function rcube_list_widget(list, p)
   this.BACKSPACE_KEY = 8;
 
   this.list = list ? list : null;
+  this.tagname = this.list ? this.list.nodeName.toLowerCase() : 'table';
+  this.thead;
+  this.tbody;
   this.frame = null;
   this.rows = [];
   this.selection = [];
@@ -55,8 +58,8 @@ function rcube_list_widget(list, p)
   this.in_selection_before = false;
   this.focused = false;
   this.drag_mouse_start = null;
-  this.dblclick_time = 600;
-  this.row_init = function(){};
+  this.dblclick_time = 500; // default value on MS Windows is 500
+  this.row_init = function(){};  // @deprecated; use list.addEventListener('initrow') instead
 
   // overwrite default paramaters
   if (p && typeof p === 'object')
@@ -73,11 +76,19 @@ rcube_list_widget.prototype = {
  */
 init: function()
 {
-  if (this.list && this.list.tBodies[0]) {
+  if (this.tagname == 'table' && this.list && this.list.tBodies[0]) {
+    this.thead = this.list.tHead;
+    this.tbody = this.list.tBodies[0];
+  }
+  else if (this.tagname != 'table' && this.list) {
+    this.tbody = this.list;
+  }
+
+  if (this.tbody) {
     this.rows = [];
     this.rowcount = 0;
 
-    var r, len, rows = this.list.tBodies[0].rows;
+    var r, len, rows = this.tbody.childNodes;
 
     for (r=0, len=rows.length; r<len; r++) {
       this.init_row(rows[r]);
@@ -127,7 +138,8 @@ init_row: function(row)
     if (document.all)
       row.onselectstart = function() { return false; };
 
-    this.row_init(this.rows[uid]);
+    this.row_init(this.rows[uid]);  // legacy support
+    this.triggerEvent('initrow', this.rows[uid]);
   }
 },
 
@@ -137,16 +149,16 @@ init_row: function(row)
  */
 init_header: function()
 {
-  if (this.list && this.list.tHead) {
+  if (this.thead) {
     this.colcount = 0;
 
     var col, r, p = this;
     // add events for list columns moving
-    if (this.column_movable && this.list.tHead && this.list.tHead.rows) {
-      for (r=0; r<this.list.tHead.rows[0].cells.length; r++) {
+    if (this.column_movable && this.thead && this.thead.rows) {
+      for (r=0; r<this.thead.rows[0].cells.length; r++) {
         if (this.column_fixed == r)
           continue;
-        col = this.list.tHead.rows[0].cells[r];
+        col = this.thead.rows[0].cells[r];
         col.onmousedown = function(e){ return p.drag_column(e, this); };
         this.colcount++;
       }
@@ -160,10 +172,16 @@ init_header: function()
  */
 clear: function(sel)
 {
-  var tbody = document.createElement('tbody');
+  if (this.tagname == 'table') {
+    var tbody = document.createElement('tbody');
+    this.list.insertBefore(tbody, this.tbody);
+    this.list.removeChild(this.list.tBodies[1]);
+    this.tbody = tbody;
+  }
+  else {
+    $(this.row_tagname() + ':not(.thead)', this.tbody).remove();
+  }
 
-  this.list.insertBefore(tbody, this.list.tBodies[0]);
-  this.list.removeChild(this.list.tBodies[1]);
   this.rows = [];
   this.rowcount = 0;
 
@@ -181,12 +199,12 @@ clear: function(sel)
  */
 remove_row: function(uid, sel_next)
 {
-  var obj = this.rows[uid] ? this.rows[uid].obj : null;
+  var node = this.rows[uid] ? this.rows[uid].obj : null;
 
-  if (!obj)
+  if (!node)
     return;
 
-  obj.style.display = 'none';
+  node.style.display = 'none';
 
   if (sel_next)
     this.select_next();
@@ -199,12 +217,31 @@ remove_row: function(uid, sel_next)
 /**
  * Add row to the list and initialize it
  */
-insert_row: function(row, attop)
+insert_row: function(row, before)
 {
-  var tbody = this.list.tBodies[0];
+  var tbody = this.tbody;
+
+  // create a real dom node first
+  if (row.nodeName === undefined) {
+    // for performance reasons use DOM instead of jQuery here
+    var domrow = document.createElement(this.row_tagname());
+    if (row.id) domrow.id = row.id;
+    if (row.className) domrow.className = row.className;
+    if (row.style) $.extend(domrow.style, row.style);
+
+    for (var domcell, col, i=0; row.cols && i < row.cols.length; i++) {
+      col = row.cols[i];
+      domcell = document.createElement(this.col_tagname());
+      if (col.className) domcell.className = col.className;
+      if (col.innerHTML) domcell.innerHTML = col.innerHTML;
+      domrow.appendChild(domcell);
+    }
 
-  if (attop && tbody.rows.length)
-    tbody.insertBefore(row, tbody.firstChild);
+    row = domrow;
+  }
+
+  if (before && tbody.childNodes.length)
+    tbody.insertBefore(row, (typeof before == 'object' && before.parentNode == tbody) ? before : tbody.firstChild);
   else
     tbody.appendChild(row);
 
@@ -212,6 +249,28 @@ insert_row: function(row, attop)
   this.rowcount++;
 },
 
+/**
+ * 
+ */
+update_row: function(id, cols, newid, select)
+{
+  var row = this.rows[id];
+  if (!row) return false;
+
+  var domrow = row.obj;
+  for (var domcell, col, i=0; cols && i < cols.length; i++) {
+    this.get_cell(domrow, i).html(cols[i]);
+  }
+
+  if (newid) {
+    delete this.rows[id];
+    domrow.id = 'rcmrow' + newid;
+    this.init_row(domrow);
+
+    if (select)
+      this.selection[0] = newid;
+  }
+},
 
 
 /**
@@ -230,8 +289,9 @@ focus: function(e)
   }
 
   // Un-focus already focused elements (#1487123, #1487316, #1488600, #1488620)
+  // It looks that window.focus() does the job for all browsers, but not Firefox (#1489058)
   $(':focus:not(body)').blur();
-  $('iframe').each(function() { this.blur(); });
+  window.focus();
 
   if (e || (e = window.event))
     rcube_event.cancel(e);
@@ -270,8 +330,8 @@ drag_column: function(e, col)
     this.add_dragfix();
 
     // find selected column number
-    for (var i=0; i<this.list.tHead.rows[0].cells.length; i++) {
-      if (col == this.list.tHead.rows[0].cells[i]) {
+    for (var i=0; i<this.thead.rows[0].cells.length; i++) {
+      if (col == this.thead.rows[0].cells[i]) {
         this.selected_column = i;
         break;
       }
@@ -434,6 +494,7 @@ collapse: function(row)
     new_row = new_row.nextSibling;
   }
 
+  this.triggerEvent('listupdate');
   return false;
 },
 
@@ -449,7 +510,7 @@ expand: function(row)
     this.triggerEvent('expandcollapse', { uid:row.uid, expanded:row.expanded, obj:row.obj });
   }
   else {
-    var tbody = this.list.tBodies[0];
+    var tbody = this.tbody;
     new_row = tbody.firstChild;
     depth = 0;
     last_expanded_parent_depth = 0;
@@ -481,6 +542,7 @@ expand: function(row)
     new_row = new_row.nextSibling;
   }
 
+  this.triggerEvent('listupdate');
   return false;
 },
 
@@ -501,7 +563,7 @@ collapse_all: function(row)
       return false;
   }
   else {
-    new_row = this.list.tBodies[0].firstChild;
+    new_row = this.tbody.firstChild;
     depth = 0;
   }
 
@@ -523,6 +585,7 @@ collapse_all: function(row)
     new_row = new_row.nextSibling;
   }
 
+  this.triggerEvent('listupdate');
   return false;
 },
 
@@ -539,7 +602,7 @@ expand_all: function(row)
     this.triggerEvent('expandcollapse', { uid:row.uid, expanded:row.expanded, obj:row.obj });
   }
   else {
-    new_row = this.list.tBodies[0].firstChild;
+    new_row = this.tbody.firstChild;
     depth = 0;
   }
 
@@ -559,6 +622,8 @@ expand_all: function(row)
     }
     new_row = new_row.nextSibling;
   }
+
+  this.triggerEvent('listupdate');
   return false;
 },
 
@@ -605,7 +670,7 @@ get_prev_row: function()
 get_first_row: function()
 {
   if (this.rowcount) {
-    var i, len, rows = this.list.tBodies[0].rows;
+    var i, len, rows = this.tbody.childNodes;
 
     for (i=0, len=rows.length-1; i<len; i++)
       if (rows[i].id && String(rows[i].id).match(/^rcmrow([a-z0-9\-_=\+\/]+)/i) && this.rows[RegExp.$1] != null)
@@ -618,7 +683,7 @@ get_first_row: function()
 get_last_row: function()
 {
   if (this.rowcount) {
-    var i, rows = this.list.tBodies[0].rows;
+    var i, rows = this.tbody.childNodes;
 
     for (i=rows.length-1; i>=0; i--)
       if (rows[i].id && String(rows[i].id).match(/^rcmrow([a-z0-9\-_=\+\/]+)/i) && this.rows[RegExp.$1] != null)
@@ -628,6 +693,22 @@ get_last_row: function()
   return null;
 },
 
+row_tagname: function()
+{
+  var row_tagnames = { table:'tr', ul:'li', '*':'div' };
+  return row_tagnames[this.tagname] || row_tagnames['*'];
+},
+
+col_tagname: function()
+{
+  var col_tagnames = { table:'td', '*':'span' };
+  return col_tagnames[this.tagname] || col_tagnames['*'];
+},
+
+get_cell: function(row, index)
+{
+  return $(this.col_tagname(), row).eq(index);
+},
 
 /**
  * selects or unselects the proper row depending on the modifier key pressed
@@ -774,14 +855,20 @@ shift_select: function(id, control)
   if (!this.rows[this.shift_start] || !this.selection.length)
     this.shift_start = id;
 
-  var n, from_rowIndex = this.rows[this.shift_start].obj.rowIndex,
-    to_rowIndex = this.rows[id].obj.rowIndex,
-    i = ((from_rowIndex < to_rowIndex)? from_rowIndex : to_rowIndex),
-    j = ((from_rowIndex > to_rowIndex)? from_rowIndex : to_rowIndex);
+  var n, i, j, to_row = this.rows[id],
+    from_rowIndex = this._rowIndex(this.rows[this.shift_start].obj),
+    to_rowIndex = this._rowIndex(to_row.obj);
+
+  if (!to_row.expanded && to_row.has_children)
+    if (to_row = this.rows[(this.row_children(id)).pop()])
+      to_rowIndex = this._rowIndex(to_row.obj);
+
+  i = ((from_rowIndex < to_rowIndex) ? from_rowIndex : to_rowIndex),
+  j = ((from_rowIndex > to_rowIndex) ? from_rowIndex : to_rowIndex);
 
   // iterate through the entire message list
   for (n in this.rows) {
-    if (this.rows[n].obj.rowIndex >= i && this.rows[n].obj.rowIndex <= j) {
+    if (this._rowIndex(this.rows[n].obj) >= i && this._rowIndex(this.rows[n].obj) <= j) {
       if (!this.in_selection(n)) {
         this.highlight_row(n, true);
       }
@@ -794,6 +881,13 @@ shift_select: function(id, control)
   }
 },
 
+/**
+ * Helper method to emulate the rowIndex property of non-tr elements
+ */
+_rowIndex: function(obj)
+{
+  return (obj.rowIndex !== undefined) ? obj.rowIndex : $(obj).prevAll().length;
+},
 
 /**
  * Check if given id is part of the current selection
@@ -823,7 +917,7 @@ select_all: function(filter)
   for (n in this.rows) {
     if (!filter || this.rows[n][filter] == true) {
       this.last_selected = n;
-      this.highlight_row(n, true);
+      this.highlight_row(n, true, true);
     }
     else {
       $(this.rows[n].obj).removeClass('selected').removeClass('unfocused');
@@ -918,7 +1012,7 @@ get_single_selection: function()
 /**
  * Highlight/unhighlight a row
  */
-highlight_row: function(id, multiple)
+highlight_row: function(id, multiple, norecur)
 {
   if (!this.rows[id])
     return;
@@ -934,7 +1028,7 @@ highlight_row: function(id, multiple)
     if (!this.in_selection(id)) { // select row
       this.selection.push(id);
       $(this.rows[id].obj).addClass('selected');
-      if (!this.rows[id].expanded)
+      if (!norecur && !this.rows[id].expanded)
         this.highlight_children(id, true);
     }
     else { // unselect row
@@ -944,7 +1038,7 @@ highlight_row: function(id, multiple)
 
       this.selection = a_pre.concat(a_post);
       $(this.rows[id].obj).removeClass('selected').removeClass('unfocused');
-      if (!this.rows[id].expanded)
+      if (!norecur && !this.rows[id].expanded)
         this.highlight_children(id, false);
     }
   }
@@ -962,7 +1056,7 @@ highlight_children: function(id, status)
   for (i=0; i<len; i++) {
     selected = this.in_selection(children[i]);
     if ((status && !selected) || (!status && selected))
-      this.highlight_row(children[i], true);
+      this.highlight_row(children[i], true, true);
   }
 },
 
@@ -1138,7 +1232,7 @@ drag_mouse_move: function(e)
     this.draglayer.html('');
 
     // get subjects of selected messages
-    var c, i, n, subject, obj;
+    var i, n, obj, me;
     for (n=0; n<this.selection.length; n++) {
       // only show 12 lines
       if (n>12) {
@@ -1146,38 +1240,28 @@ drag_mouse_move: function(e)
         break;
       }
 
+      me = this;
       if (obj = this.rows[this.selection[n]].obj) {
-        subject = '';
-
-        for (c=0, i=0; i<obj.childNodes.length; i++) {
-	      if (obj.childNodes[i].nodeName == 'TD') {
-            if (n == 0)
-	          this.drag_start_pos = $(obj.childNodes[i]).offset();
-
-	        if (this.subject_col < 0 || (this.subject_col >= 0 && this.subject_col == c)) {
-	          var entry, node, tmp_node, nodes = obj.childNodes[i].childNodes;
-	          // find text node
-	          for (m=0; m<nodes.length; m++) {
-	            if ((tmp_node = obj.childNodes[i].childNodes[m]) && (tmp_node.nodeType==3 || tmp_node.nodeName=='A'))
-	              node = tmp_node;
-	          }
-
-	          if (!node)
-	            break;
-
-              subject = $(node).text();
-	          // remove leading spaces
+        $('> '+this.col_tagname(), obj).each(function(i,elem){
+          if (n == 0)
+            me.drag_start_pos = $(elem).offset();
+
+          if (me.subject_col < 0 || (me.subject_col >= 0 && me.subject_col == i)) {
+            var subject = $(elem).text();
+
+            if (subject) {
+              // remove leading spaces
               subject = $.trim(subject);
               // truncate line to 50 characters
               subject = (subject.length > 50 ? subject.substring(0, 50) + '...' : subject);
 
-              entry = $('<div>').text(subject);
-	          this.draglayer.append(entry);
-              break;
+              var entry = $('<div>').text(subject);
+              me.draglayer.append(entry);
             }
-            c++;
+
+            return false;  // break
           }
-        }
+        });
       }
     }
 
@@ -1232,7 +1316,7 @@ drag_mouse_up: function(e)
   // remove temp divs
   this.del_dragfix();
 
-  this.triggerEvent('dragend');
+  this.triggerEvent('dragend', e);
 
   return rcube_event.cancel(e);
 },
@@ -1252,7 +1336,7 @@ column_drag_mouse_move: function(e)
 
     if (!this.col_draglayer) {
       var lpos = $(this.list).offset(),
-        cells = this.list.tHead.rows[0].cells;
+        cells = this.thead.rows[0].cells;
 
       // create dragging layer
       this.col_draglayer = $('<div>').attr('id', 'rcmcoldraglayer')
@@ -1345,7 +1429,7 @@ column_drag_mouse_up: function(e)
     }
   }
 
-  this.triggerEvent('column_dragend');
+  this.triggerEvent('column_dragend', e);
 
   return rcube_event.cancel(e);
 },
@@ -1408,7 +1492,11 @@ del_dragfix: function()
  */
 column_replace: function(from, to)
 {
-  var len, cells = this.list.tHead.rows[0].cells,
+  // only supported for <table> lists
+  if (!this.thead || !this.thead.rows)
+    return;
+
+  var len, cells = this.thead.rows[0].cells,
     elem = cells[from],
     before = cells[to],
     td = document.createElement('td');
@@ -1421,8 +1509,8 @@ column_replace: function(from, to)
   cells[0].parentNode.replaceChild(elem, td);
 
   // replace list cells
-  for (r=0, len=this.list.tBodies[0].rows.length; r<len; r++) {
-    row = this.list.tBodies[0].rows[r];
+  for (r=0, len=this.tbody.rows.length; r<len; r++) {
+    row = this.tbody.rows[r];
 
     elem = row.cells[from];
     before = row.cells[to];
diff --git a/program/js/treelist.js b/program/js/treelist.js
new file mode 100644
index 000000000..5913f44b4
--- /dev/null
+++ b/program/js/treelist.js
@@ -0,0 +1,575 @@
+/*
+ +-----------------------------------------------------------------------+
+ | Roundcube Treelist widget                                             |
+ |                                                                       |
+ | This file is part of the Roundcube Webmail client                     |
+ | Copyright (C) 2013, The Roundcube Dev Team                            |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Authors: Thomas Bruederli <roundcube@gmail.com>                       |
+ +-----------------------------------------------------------------------+
+ | Requires: common.js                                                   |
+ +-----------------------------------------------------------------------+
+*/
+
+
+/**
+ * Roundcube Treelist widget class
+ * @contructor
+ */
+function rcube_treelist_widget(node, p)
+{
+  // apply some defaults to p
+  p = $.extend({
+    id_prefix: '',
+    autoexpand: 1000,
+    selectable: false,
+    check_droptarget: function(node){ return !node.virtual }
+  }, p || {});
+
+  var container = $(node),
+    data = p.data || [],
+    indexbyid = {},
+    selection = null,
+    drag_active = false,
+    box_coords = {},
+    item_coords = [],
+    autoexpand_timer,
+    autoexpand_item,
+    body_scroll_top = 0,
+    list_scroll_top = 0,
+    me = this;
+
+
+  /////// export public members and methods
+
+  this.container = container;
+  this.expand = expand;
+  this.collapse = collapse;
+  this.select = select;
+  this.render = render;
+  this.drag_start = drag_start;
+  this.drag_end = drag_end;
+  this.intersects = intersects;
+  this.update = update_node;
+  this.insert = insert;
+  this.remove = remove;
+  this.get_item = get_item;
+  this.get_selection = get_selection;
+
+  /////// startup code (constructor)
+
+  // abort if node not found
+  if (!container.length)
+    return;
+
+  if (p.data)
+    index_data({ children:data });
+  // load data from DOM
+  else
+    update_data();
+
+  // register click handlers on list
+  container.on('click', 'div.treetoggle', function(e){
+    toggle(dom2id($(this).parent()));
+  });
+
+  container.on('click', 'li', function(e){
+    var node = p.selectable ? indexbyid[dom2id($(this))] : null;
+    if (node && !node.virtual) {
+      select(node.id);
+      e.stopPropagation();
+    }
+  });
+
+
+  /////// private methods
+
+  /**
+   * Collaps a the node with the given ID
+   */
+  function collapse(id, recursive, set)
+  {
+    var node;
+
+    if (node = indexbyid[id]) {
+      node.collapsed = typeof set == 'undefined' || set;
+      update_dom(node);
+
+      // Work around a bug in IE6 and IE7, see #1485309
+      if (window.bw && (bw.ie6 || bw.ie7) && node.collapsed) {
+        id2dom(node.id).next().children('ul:visible').hide().show();
+      }
+
+      if (recursive && node.children) {
+        for (var i=0; i < node.children.length; i++) {
+          collapse(node.children[i].id, recursive, set);
+        }
+      }
+
+      me.triggerEvent(node.collapsed ? 'collapse' : 'expand', node);
+    }
+  }
+
+  /**
+   * Expand a the node with the given ID
+   */
+  function expand(id, recursive)
+  {
+    collapse(id, recursive, false);
+  }
+
+  /**
+   * Toggle collapsed state of a list node
+   */
+  function toggle(id, recursive)
+  {
+    var node;
+    if (node = indexbyid[id]) {
+      collapse(id, recursive, !node.collapsed);
+    }
+  }
+
+  /**
+   * Select a tree node by it's ID
+   */
+  function select(id)
+  {
+    if (selection) {
+      id2dom(selection).removeClass('selected');
+      selection = null;
+    }
+
+    var li = id2dom(id);
+    if (li.length) {
+      li.addClass('selected');
+      selection = id;
+      // TODO: expand all parent nodes if collapsed
+      scroll_to_node(li);
+    }
+
+    me.triggerEvent('select', indexbyid[id]);
+  }
+
+  /**
+   * Getter for the currently selected node ID
+   */
+  function get_selection()
+  {
+    return selection;
+  }
+
+  /**
+   * Return the DOM element of the list item with the given ID
+   */
+  function get_item(id)
+  {
+    return id2dom(id).get(0);
+  }
+
+  /**
+   * Insert the given node
+   */
+  function insert(node, parent_id, sort)
+  {
+    var li, parent_li,
+      parent_node = parent_id ? indexbyid[parent_id] : null;
+
+    // insert as child of an existing node
+    if (parent_node) {
+      if (!parent_node.children)
+        parent_node.children = [];
+
+      parent_node.children.push(node);
+      parent_li = id2dom(parent_id);
+
+      // re-render the entire subtree
+      if (parent_node.children.length == 1) {
+        render_node(parent_node, parent_li.parent(), parent_li);
+        li = id2dom(node.id);
+      }
+      else {
+        // append new node to parent's child list
+        li = render_node(node, parent_li.children('ul').first());
+      }
+    }
+    // insert at top level
+    else {
+      data.push(node);
+      li = render_node(node, container);
+    }
+
+    indexbyid[node.id] = node;
+
+    if (sort) {
+      resort_node(li, typeof sort == 'string' ? '[class~="' + sort + '"]' : '');
+    }
+  }
+
+  /**
+   * Update properties of an existing node
+   */
+  function update_node(id, updates, sort)
+  {
+    var li, node = indexbyid[id];
+
+    if (node) {
+      li = id2dom(id);
+
+      if (updates.id || updates.html || updates.children || updates.classes) {
+        $.extend(node, updates);
+        render_node(node, li.parent(), li);
+      }
+
+      if (node.id != id) {
+        delete indexbyid[id];
+        indexbyid[node.id] = node;
+      }
+
+      if (sort) {
+        resort_node(li, typeof sort == 'string' ? '[class~="' + sort + '"]' : '');
+      }
+    }
+  }
+
+  /**
+   * Helper method to sort the list of the given item
+   */
+  function resort_node(li, filter)
+  {
+    var first, sibling,
+      myid = li.get(0).id,
+      sortname = li.children().first().text().toUpperCase();
+
+    li.parent().children('li' + filter).each(function(i, elem) {
+      if (i == 0)
+        first = elem;
+      if (elem.id == myid) {
+        // skip
+      }
+      else if (elem.id != myid && sortname >= $(elem).children().first().text().toUpperCase()) {
+        sibling = elem;
+      }
+      else {
+        return false;
+      }
+    });
+
+    if (sibling) {
+      li.insertAfter(sibling);
+    }
+    else if (first.id != myid) {
+      li.insertBefore(first);
+    }
+
+    // reload data from dom
+    update_data();
+  }
+
+  /**
+   * Remove the item with the given ID
+   */
+  function remove(id)
+  {
+    var node, li;
+
+    if (node = indexbyid[id]) {
+      li = id2dom(id);
+      li.remove();
+
+      node.deleted = true;
+      delete indexbyid[id];
+
+      return true;
+    }
+
+    return false;
+  }
+
+  /**
+   * (Re-)read tree data from DOM
+   */
+  function update_data()
+  {
+    data = walk_list(container);
+  }
+
+  /**
+   * Apply the 'collapsed' status of the data node to the corresponding DOM element(s)
+   */
+  function update_dom(node)
+  {
+    var li = id2dom(node.id);
+    li.children('ul').first()[(node.collapsed ? 'hide' : 'show')]();
+    li.children('div.treetoggle').removeClass('collapsed expanded').addClass(node.collapsed ? 'collapsed' : 'expanded');
+    me.triggerEvent('toggle', node);
+  }
+
+  /**
+   * Render the tree list from the internal data structure
+   */
+  function render()
+  {
+    if (me.triggerEvent('renderBefore', data) === false)
+      return;
+
+    // remove all child nodes
+    container.html('');
+
+    // render child nodes
+    for (var i=0; i < data.length; i++) {
+      render_node(data[i], container);
+    }
+
+    me.triggerEvent('renderAfter', container);
+  }
+
+  /**
+   * Render a specific node into the DOM list
+   */
+  function render_node(node, parent, replace)
+  {
+    if (node.deleted)
+      return;
+
+    var li = $('<li>')
+      .attr('id', p.id_prefix + (p.id_encode ? p.id_encode(node.id) : node.id))
+      .addClass((node.classes || []).join(' '));
+
+    if (replace)
+      replace.replaceWith(li);
+    else
+      li.appendTo(parent);
+
+    if (typeof node.html == 'string')
+      li.html(node.html);
+    else if (typeof node.html == 'object')
+      li.append(node.html);
+
+    if (node.virtual)
+      li.addClass('virtual');
+    if (node.id == selection)
+      li.addClass('selected');
+
+    // add child list and toggle icon
+    if (node.children && node.children.length) {
+      $('<div class="treetoggle '+(node.collapsed ? 'collapsed' : 'expanded') + '">&nbsp;</div>').appendTo(li);
+      var ul = $('<ul>').appendTo(li).attr('class', node.childlistclass);
+      if (node.collapsed)
+        ul.hide();
+
+      for (var i=0; i < node.children.length; i++) {
+        render_node(node.children[i], ul);
+      }
+    }
+
+    return li;
+  }
+
+  /**
+   * Recursively walk the DOM tree and build an internal data structure
+   * representing the skeleton of this tree list.
+   */
+  function walk_list(ul)
+  {
+    var result = [];
+    ul.children('li').each(function(i,e){
+      var li = $(e), sublist = li.children('ul');
+      var node = {
+        id: dom2id(li),
+        classes: li.attr('class').split(' '),
+        virtual: li.hasClass('virtual'),
+        html: li.children().first().get(0).outerHTML,
+        children: walk_list(sublist)
+      }
+
+      if (sublist.length) {
+        node.childlistclass = sublist.attr('class');
+      }
+      if (node.children.length) {
+        node.collapsed = sublist.css('display') == 'none';
+      }
+      if (li.hasClass('selected')) {
+        selection = node.id;
+      }
+
+      result.push(node);
+      indexbyid[node.id] = node;
+    })
+
+    return result;
+  }
+
+  /**
+   * Recursively walk the data tree and index nodes by their ID
+   */
+  function index_data(node)
+  {
+    if (node.id) {
+      indexbyid[node.id] = node;
+    }
+    for (var c=0; node.children && c < node.children.length; c++) {
+      index_data(node.children[c]);
+    }
+  }
+
+  /**
+   * Get the (stripped) node ID from the given DOM element
+   */
+  function dom2id(li)
+  {
+    var domid = li.attr('id').replace(new RegExp('^' + (p.id_prefix) || '%'), '');
+    return p.id_decode ? p.id_decode(domid) : domid;
+  }
+
+  /**
+   * Get the <li> element for the given node ID
+   */
+  function id2dom(id)
+  {
+    var domid = p.id_encode ? p.id_encode(id) : id;
+    return $('#' + p.id_prefix + domid);
+  }
+
+  /**
+   * Scroll the parent container to make the given list item visible
+   */
+  function scroll_to_node(li)
+  {
+    var scroller = container.parent(),
+      current_offset = scroller.scrollTop(),
+      rel_offset = li.offset().top - scroller.offset().top;
+
+    if (rel_offset < 0 || rel_offset + li.height() > scroller.height())
+      scroller.scrollTop(rel_offset + current_offset);
+  }
+
+  ///// drag & drop support
+
+  /**
+   * When dragging starts, compute absolute bounding boxes of the list and it's items
+   * for faster comparisons while mouse is moving
+   */
+  function drag_start()
+  {
+    var li, item, height,
+      pos = container.offset();
+
+    body_scroll_top = bw.ie ? 0 : window.pageYOffset;
+    list_scroll_top = container.parent().scrollTop();
+
+    drag_active = true;
+    box_coords = {
+      x1: pos.left,
+      y1: pos.top,
+      x2: pos.left + container.width(),
+      y2: pos.top + container.height()
+    };
+
+    item_coords = [];
+    for (var id in indexbyid) {
+      li = id2dom(id);
+      item = li.children().first().get(0);
+      if (height = item.offsetHeight) {
+        pos = $(item).offset();
+        item_coords[id] = {
+          x1: pos.left,
+          y1: pos.top,
+          x2: pos.left + item.offsetWidth,
+          y2: pos.top + height,
+          on: id == autoexpand_item
+        };
+      }
+    }
+  }
+
+  /**
+   * Signal that dragging has stopped
+   */
+  function drag_end()
+  {
+    drag_active = false;
+
+    if (autoexpand_timer) {
+      clearTimeout(autoexpand_timer);
+      autoexpand_timer = null;
+      autoexpand_item = null;
+    }
+
+    $('li.droptarget', container).removeClass('droptarget');
+  }
+
+  /**
+   * Determine if the given mouse coords intersect the list and one if its items
+   */
+  function intersects(mouse, highlight)
+  {
+    // offsets to compensate for scrolling while dragging a message
+    var boffset = bw.ie ? -document.documentElement.scrollTop : body_scroll_top,
+      moffset = list_scroll_top - container.parent().scrollTop(),
+      result = null;
+
+    mouse.top = mouse.y + -moffset - boffset;
+
+    // no intersection with list bounding box
+    if (mouse.x < box_coords.x1 || mouse.x >= box_coords.x2 || mouse.top < box_coords.y1 || mouse.top >= box_coords.y2) {
+      // TODO: optimize performance for this operation
+      $('li.droptarget', container).removeClass('droptarget');
+      return result;
+    }
+
+    // check intersection with visible list items
+    var pos, node;
+    for (var id in item_coords) {
+      pos = item_coords[id];
+      if (mouse.x >= pos.x1 && mouse.x < pos.x2 && mouse.top >= pos.y1 && mouse.top < pos.y2) {
+        node = indexbyid[id];
+
+        // if the folder is collapsed, expand it after the configured time
+        if (node.children && node.children.length && node.collapsed && p.autoexpand && autoexpand_item != id) {
+          if (autoexpand_timer)
+            clearTimeout(autoexpand_timer);
+
+          autoexpand_item = id;
+          autoexpand_timer = setTimeout(function() {
+            expand(autoexpand_item);
+            drag_start();  // re-calculate item coords
+            autoexpand_item = null;
+          }, p.autoexpand);
+        }
+        else if (autoexpand_timer && autoexpand_item != id) {
+          clearTimeout(autoexpand_timer);
+          autoexpand_item = null;
+          autoexpand_timer = null;
+        }
+
+        // check if this item is accepted as drop target
+        if (p.check_droptarget(node)) {
+          if (highlight) {
+            id2dom(id).addClass('droptarget');
+            pos.on = true;
+          }
+          result = id;
+        }
+        else {
+          result = null;
+        }
+      }
+      else if (pos.on) {
+        id2dom(id).removeClass('droptarget');
+        pos.on = false;
+      }
+    }
+
+    return result;
+  }
+}
+
+// use event processing functions from Roundcube's rcube_event_engine
+rcube_treelist_widget.prototype.addEventListener = rcube_event_engine.prototype.addEventListener;
+rcube_treelist_widget.prototype.removeEventListener = rcube_event_engine.prototype.removeEventListener;
+rcube_treelist_widget.prototype.triggerEvent = rcube_event_engine.prototype.triggerEvent;
diff --git a/program/lib/Net/Socket.php b/program/lib/Net/Socket.php
index dd1047c43..bf1d1bbcd 100644
--- a/program/lib/Net/Socket.php
+++ b/program/lib/Net/Socket.php
@@ -4,7 +4,7 @@
  *
  * PHP Version 4
  *
- * Copyright (c) 1997-2003 The PHP Group
+ * Copyright (c) 1997-2013 The PHP Group
  *
  * This source file is subject to version 2.0 of the PHP license,
  * that is bundled with this package in the file LICENSE, and is
@@ -23,7 +23,6 @@
  * @author    Chuck Hagenbuch <chuck@horde.org>
  * @copyright 1997-2003 The PHP Group
  * @license   http://www.php.net/license/2_02.txt PHP 2.02
- * @version   CVS: $Id$
  * @link      http://pear.php.net/packages/Net_Socket
  */
 
@@ -77,11 +76,11 @@ class Net_Socket extends PEAR
     var $port = 0;
 
     /**
-     * Number of seconds to wait on socket connections before assuming
+     * Number of seconds to wait on socket operations before assuming
      * there's no more data. Defaults to no timeout.
-     * @var integer $timeout
+     * @var integer|float $timeout
      */
-    var $timeout = false;
+    var $timeout = null;
 
     /**
      * Number of bytes to read at a time in readLine() and
@@ -100,17 +99,17 @@ class Net_Socket extends PEAR
      * Connect to the specified port. If called when the socket is
      * already connected, it disconnects and connects again.
      *
-     * @param string  $addr       IP address or host name.
+     * @param string  $addr       IP address or host name (may be with protocol prefix).
      * @param integer $port       TCP port number.
      * @param boolean $persistent (optional) Whether the connection is
      *                            persistent (kept open between requests
      *                            by the web server).
-     * @param integer $timeout    (optional) How long to wait for data.
+     * @param integer $timeout    (optional) Connection socket timeout.
      * @param array   $options    See options for stream_context_create.
      *
      * @access public
      *
-     * @return boolean | PEAR_Error  True on success or a PEAR_Error on failure.
+     * @return boolean|PEAR_Error  True on success or a PEAR_Error on failure.
      */
     function connect($addr, $port = 0, $persistent = null,
                      $timeout = null, $options = null)
@@ -122,11 +121,10 @@ class Net_Socket extends PEAR
 
         if (!$addr) {
             return $this->raiseError('$addr cannot be empty');
-        } elseif (strspn($addr, '.0123456789') == strlen($addr) ||
-                  strstr($addr, '/') !== false) {
-            $this->addr = $addr;
+        } else if (strspn($addr, ':.0123456789') == strlen($addr)) {
+            $this->addr = strpos($addr, ':') !== false ? '['.$addr.']' : $addr;
         } else {
-            $this->addr = @gethostbyname($addr);
+            $this->addr = $addr;
         }
 
         $this->port = $port % 65536;
@@ -135,22 +133,17 @@ class Net_Socket extends PEAR
             $this->persistent = $persistent;
         }
 
-        if ($timeout !== null) {
-            $this->timeout = $timeout;
-        }
-
         $openfunc = $this->persistent ? 'pfsockopen' : 'fsockopen';
         $errno    = 0;
         $errstr   = '';
 
         $old_track_errors = @ini_set('track_errors', 1);
 
+        if ($timeout <= 0) {
+            $timeout = @ini_get('default_socket_timeout');
+        }
+
         if ($options && function_exists('stream_context_create')) {
-            if ($this->timeout) {
-                $timeout = $this->timeout;
-            } else {
-                $timeout = 0;
-            }
             $context = stream_context_create($options);
 
             // Since PHP 5 fsockopen doesn't allow context specification
@@ -169,12 +162,7 @@ class Net_Socket extends PEAR
                                  $errstr, $timeout, $context);
             }
         } else {
-            if ($this->timeout) {
-                $fp = @$openfunc($this->addr, $this->port, $errno,
-                                 $errstr, $this->timeout);
-            } else {
-                $fp = @$openfunc($this->addr, $this->port, $errno, $errstr);
-            }
+            $fp = @$openfunc($this->addr, $this->port, $errno, $errstr, $timeout);
         }
 
         if (!$fp) {
@@ -187,7 +175,7 @@ class Net_Socket extends PEAR
 
         @ini_set('track_errors', $old_track_errors);
         $this->fp = $fp;
-
+        $this->setTimeout();
         return $this->setBlocking($this->blocking);
     }
 
@@ -258,18 +246,31 @@ class Net_Socket extends PEAR
      * expressed in the sum of seconds and microseconds
      *
      * @param integer $seconds      Seconds.
-     * @param integer $microseconds Microseconds.
+     * @param integer $microseconds Microseconds, optional.
      *
      * @access public
-     * @return mixed true on success or a PEAR_Error instance otherwise
+     * @return mixed True on success or false on failure or
+     *               a PEAR_Error instance when not connected
      */
-    function setTimeout($seconds, $microseconds)
+    function setTimeout($seconds = null, $microseconds = null)
     {
         if (!is_resource($this->fp)) {
             return $this->raiseError('not connected');
         }
 
-        return socket_set_timeout($this->fp, $seconds, $microseconds);
+        if ($seconds === null && $microseconds === null) {
+            $seconds      = (int) $this->timeout;
+            $microseconds = (int) (($this->timeout - $seconds) * 1000000);
+        } else {
+            $this->timeout = $seconds + $microseconds/1000000;
+        }
+
+        if ($this->timeout > 0) {
+            return stream_set_timeout($this->fp, (int) $seconds, (int) $microseconds);
+        }
+        else {
+            return false;
+        }
     }
 
     /**
@@ -315,17 +316,20 @@ class Net_Socket extends PEAR
             return $this->raiseError('not connected');
         }
 
-        return socket_get_status($this->fp);
+        return stream_get_meta_data($this->fp);
     }
 
     /**
      * Get a specified line of data
      *
-     * @param int $size ??
+     * @param int $size Reading ends when size - 1 bytes have been read,
+     *                  or a newline or an EOF (whichever comes first).
+     *                  If no size is specified, it will keep reading from
+     *                  the stream until it reaches the end of the line.
      *
      * @access public
-     * @return $size bytes of data from the socket, or a PEAR_Error if
-     *         not connected.
+     * @return mixed $size bytes of data from the socket, or a PEAR_Error if
+     *         not connected. If an error occurs, FALSE is returned.
      */
     function gets($size = null)
     {
@@ -370,9 +374,10 @@ class Net_Socket extends PEAR
      *
      * @access public
      * @return mixed If the socket is not connected, returns an instance of
-     *               PEAR_Error
-     *               If the write succeeds, returns the number of bytes written
+     *               PEAR_Error.
+     *               If the write succeeds, returns the number of bytes written.
      *               If the write fails, returns false.
+     *               If the socket times out, returns an instance of PEAR_Error.
      */
     function write($data, $blocksize = null)
     {
@@ -381,7 +386,22 @@ class Net_Socket extends PEAR
         }
 
         if (is_null($blocksize) && !OS_WINDOWS) {
-            return @fwrite($this->fp, $data);
+            $written = @fwrite($this->fp, $data);
+
+            // Check for timeout or lost connection
+            if (!$written) {
+                $meta_data = $this->getStatus();
+
+                if (!is_array($meta_data)) {
+                    return $meta_data; // PEAR_Error
+                }
+
+                if (!empty($meta_data['timed_out'])) {
+                    return $this->raiseError('timed out');
+                }
+            }
+
+            return $written;
         } else {
             if (is_null($blocksize)) {
                 $blocksize = 1024;
@@ -391,9 +411,22 @@ class Net_Socket extends PEAR
             $size = strlen($data);
             while ($pos < $size) {
                 $written = @fwrite($this->fp, substr($data, $pos, $blocksize));
+
+                // Check for timeout or lost connection
                 if (!$written) {
+                    $meta_data = $this->getStatus();
+
+                    if (!is_array($meta_data)) {
+                        return $meta_data; // PEAR_Error
+                    }
+
+                    if (!empty($meta_data['timed_out'])) {
+                        return $this->raiseError('timed out');
+                    }
+
                     return $written;
                 }
+
                 $pos += $written;
             }
 
@@ -407,7 +440,7 @@ class Net_Socket extends PEAR
      * @param string $data Data to write
      *
      * @access public
-     * @return mixed fputs result, or an error
+     * @return mixed fwrite() result, or PEAR_Error when not connected
      */
     function writeLine($data)
     {
diff --git a/program/lib/Roundcube/bootstrap.php b/program/lib/Roundcube/bootstrap.php
index 8cea48122..68d314270 100644
--- a/program/lib/Roundcube/bootstrap.php
+++ b/program/lib/Roundcube/bootstrap.php
@@ -31,21 +31,29 @@ $config = array(
     // critical PHP settings here. Only these, which doesn't provide
     // an error/warning in the logs later. See (#1486307).
     'mbstring.func_overload'  => 0,
-    'suhosin.session.encrypt' => 0,
-    'session.auto_start'      => 0,
-    'file_uploads'            => 1,
     'magic_quotes_runtime'    => 0,
     'magic_quotes_sybase'     => 0, // #1488506
 );
+
+// check these additional ini settings if not called via CLI
+if (php_sapi_name() != 'cli') {
+    $config += array(
+        'suhosin.session.encrypt' => 0,
+        'file_uploads'            => 1,
+    );
+}
+
 foreach ($config as $optname => $optval) {
     if ($optval != ini_get($optname) && @ini_set($optname, $optval) === false) {
-        die("ERROR: Wrong '$optname' option value and it wasn't possible to set it to required value ($optval).\n"
-            ."Check your PHP configuration (including php_admin_flag).");
+        $error = "ERROR: Wrong '$optname' option value and it wasn't possible to set it to required value ($optval).\n"
+            . "Check your PHP configuration (including php_admin_flag).";
+        if (defined('STDERR')) fwrite(STDERR, $error); else echo $error;
+        exit(1);
     }
 }
 
 // framework constants
-define('RCUBE_VERSION', '0.9-git');
+define('RCUBE_VERSION', '1.0-git');
 define('RCUBE_CHARSET', 'UTF-8');
 
 if (!defined('RCUBE_LIB_DIR')) {
@@ -284,32 +292,6 @@ function is_ascii($str, $control_chars = true)
 
 
 /**
- * Remove single and double quotes from a given string
- *
- * @param string Input value
- *
- * @return string Dequoted string
- */
-function strip_quotes($str)
-{
-    return str_replace(array("'", '"'), '', $str);
-}
-
-
-/**
- * Remove new lines characters from given string
- *
- * @param string $str  Input value
- *
- * @return string Stripped string
- */
-function strip_newlines($str)
-{
-    return preg_replace('/[\r\n]/', '', $str);
-}
-
-
-/**
  * Compose a valid representation of name and e-mail address
  *
  * @param string $email  E-mail address
diff --git a/program/lib/Roundcube/html.php b/program/lib/Roundcube/html.php
index a44f4d518..3e6e47a56 100644
--- a/program/lib/Roundcube/html.php
+++ b/program/lib/Roundcube/html.php
@@ -21,7 +21,7 @@
  * Class for HTML code creation
  *
  * @package    Framework
- * @subpackage HTML
+ * @subpackage View
  */
 class html
 {
@@ -35,6 +35,7 @@ class html
     public static $common_attrib = array('id','class','style','title','align');
     public static $containers = array('iframe','div','span','p','h1','h2','h3','form','textarea','table','thead','tbody','tr','th','td','style','script');
 
+
     /**
      * Constructor
      *
@@ -217,7 +218,7 @@ class html
             $attr = array('src' => $attr);
         }
         return self::tag('iframe', $attr, $cont, array_merge(self::$common_attrib,
-            array('src','name','width','height','border','frameborder')));
+            array('src','name','width','height','border','frameborder','onload')));
     }
 
     /**
@@ -332,7 +333,16 @@ class html
      */
     public static function quote($str)
     {
-        return @htmlspecialchars($str, ENT_COMPAT, RCUBE_CHARSET);
+        static $flags;
+
+        if (!$flags) {
+            $flags = ENT_COMPAT;
+            if (defined('ENT_SUBSTITUTE')) {
+                $flags |= ENT_SUBSTITUTE;
+            }
+        }
+
+        return @htmlspecialchars($str, $flags, RCUBE_CHARSET);
     }
 }
 
@@ -340,7 +350,8 @@ class html
 /**
  * Class to create an HTML input field
  *
- * @package HTML
+ * @package    Framework
+ * @subpackage View
  */
 class html_inputfield extends html
 {
@@ -349,8 +360,8 @@ class html_inputfield extends html
     protected $allowed = array(
         'type','name','value','size','tabindex','autocapitalize',
         'autocomplete','checked','onchange','onclick','disabled','readonly',
-        'spellcheck','results','maxlength','src','multiple','placeholder',
-        'autofocus',
+        'spellcheck','results','maxlength','src','multiple','accept',
+        'placeholder','autofocus',
     );
 
     /**
@@ -396,7 +407,8 @@ class html_inputfield extends html
 /**
  * Class to create an HTML password field
  *
- * @package HTML
+ * @package    Framework
+ * @subpackage View
  */
 class html_passwordfield extends html_inputfield
 {
@@ -406,9 +418,9 @@ class html_passwordfield extends html_inputfield
 /**
  * Class to create an hidden HTML input field
  *
- * @package HTML
+ * @package    Framework
+ * @subpackage View
  */
-
 class html_hiddenfield extends html
 {
     protected $tagname = 'input';
@@ -456,7 +468,8 @@ class html_hiddenfield extends html
 /**
  * Class to create HTML radio buttons
  *
- * @package HTML
+ * @package    Framework
+ * @subpackage View
  */
 class html_radiobutton extends html_inputfield
 {
@@ -486,7 +499,8 @@ class html_radiobutton extends html_inputfield
 /**
  * Class to create HTML checkboxes
  *
- * @package HTML
+ * @package    Framework
+ * @subpackage View
  */
 class html_checkbox extends html_inputfield
 {
@@ -516,7 +530,8 @@ class html_checkbox extends html_inputfield
 /**
  * Class to create an HTML textarea
  *
- * @package HTML
+ * @package    Framework
+ * @subpackage View
  */
 class html_textarea extends html
 {
@@ -574,7 +589,8 @@ class html_textarea extends html
  * print $select->show('CH');
  * </pre>
  *
- * @package HTML
+ * @package    Framework
+ * @subpackage View
  */
 class html_select extends html
 {
@@ -639,7 +655,8 @@ class html_select extends html
 /**
  * Class to build an HTML table
  *
- * @package HTML
+ * @package    Framework
+ * @subpackage View
  */
 class html_table extends html
 {
@@ -661,6 +678,11 @@ class html_table extends html
     {
         $default_attrib = self::$doctype == 'xhtml' ? array('summary' => '', 'border' => 0) : array();
         $this->attrib = array_merge($attrib, $default_attrib);
+
+        if (!empty($attrib['tagname']) && $attrib['tagname'] != 'table') {
+          $this->tagname = $attrib['tagname'];
+          $this->allowed = self::$common_attrib;
+        }
     }
 
     /**
@@ -762,6 +784,11 @@ class html_table extends html
             $index = $this->rowindex;
         }
 
+        // make sure row object exists (#1489094)
+        if (!$this->rows[$index]) {
+            $this->rows[$index] = new stdClass;
+        }
+
         $this->rows[$index]->attrib = $attr;
     }
 
@@ -799,19 +826,20 @@ class html_table extends html
         if (!empty($this->header)) {
             $rowcontent = '';
             foreach ($this->header as $c => $col) {
-                $rowcontent .= self::tag('td', $col->attrib, $col->content);
+                $rowcontent .= self::tag($this->_col_tagname(), $col->attrib, $col->content);
             }
-            $thead = self::tag('thead', null, self::tag('tr', null, $rowcontent, parent::$common_attrib));
+            $thead = $this->tagname == 'table' ? self::tag('thead', null, self::tag('tr', null, $rowcontent, parent::$common_attrib)) :
+                self::tag($this->_row_tagname(), array('class' => 'thead'), $rowcontent, parent::$common_attrib);
         }
 
         foreach ($this->rows as $r => $row) {
             $rowcontent = '';
             foreach ($row->cells as $c => $col) {
-                $rowcontent .= self::tag('td', $col->attrib, $col->content);
+                $rowcontent .= self::tag($this->_col_tagname(), $col->attrib, $col->content);
             }
 
             if ($r < $this->rowindex || count($row->cells)) {
-                $tbody .= self::tag('tr', $row->attrib, $rowcontent, parent::$common_attrib);
+                $tbody .= self::tag($this->_row_tagname(), $row->attrib, $rowcontent, parent::$common_attrib);
             }
         }
 
@@ -820,7 +848,7 @@ class html_table extends html
         }
 
         // add <tbody>
-        $this->content = $thead . self::tag('tbody', null, $tbody);
+        $this->content = $thead . ($this->tagname == 'table' ? self::tag('tbody', null, $tbody) : $tbody);
 
         unset($this->attrib['cols'], $this->attrib['rowsonly']);
         return parent::show();
@@ -845,4 +873,22 @@ class html_table extends html
         $this->rowindex = 0;
     }
 
+    /**
+     * Getter for the corresponding tag name for table row elements
+     */
+    private function _row_tagname()
+    {
+        static $row_tagnames = array('table' => 'tr', 'ul' => 'li', '*' => 'div');
+        return $row_tagnames[$this->tagname] ?: $row_tagnames['*'];
+    }
+
+    /**
+     * Getter for the corresponding tag name for table cell elements
+     */
+    private function _col_tagname()
+    {
+        static $col_tagnames = array('table' => 'td', '*' => 'span');
+        return $col_tagnames[$this->tagname] ?: $col_tagnames['*'];
+    }
+
 }
diff --git a/program/lib/Roundcube/rcube.php b/program/lib/Roundcube/rcube.php
index a914ae65a..21b49f49b 100644
--- a/program/lib/Roundcube/rcube.php
+++ b/program/lib/Roundcube/rcube.php
@@ -99,7 +99,6 @@ class rcube
     protected $texts;
     protected $caches = array();
     protected $shutdown_functions = array();
-    protected $expunge_cache = false;
 
 
     /**
@@ -258,6 +257,39 @@ class rcube
 
 
     /**
+     * Initialize and get shared cache object
+     *
+     * @param string $name   Cache identifier
+     * @param bool   $packed Enables/disables data serialization
+     *
+     * @return rcube_cache_shared Cache object
+     */
+    public function get_cache_shared($name, $packed=true)
+    {
+        $shared_name = "shared_$name";
+
+        if (!array_key_exists($shared_name, $this->caches)) {
+            $opt  = strtolower($name) . '_cache';
+            $type = $this->config->get($opt);
+            $ttl  = $this->config->get($opt . '_ttl');
+
+            if (!$type) {
+                // cache is disabled
+                return $this->caches[$shared_name] = null;
+            }
+
+            if ($ttl === null) {
+                $ttl = $this->config->get('shared_cache_ttl', '10d');
+            }
+
+            $this->caches[$shared_name] = new rcube_cache_shared($type, $name, $ttl, $packed);
+        }
+
+        return $this->caches[$shared_name];
+    }
+
+
+    /**
      * Create SMTP object and connect to server
      *
      * @param boolean True if connection should be established
@@ -405,6 +437,7 @@ class rcube
         $sess_domain = $this->config->get('session_domain');
         $sess_path   = $this->config->get('session_path');
         $lifetime    = $this->config->get('session_lifetime', 0) * 60;
+        $is_secure   = $this->config->get('use_https') || rcube_utils::https_check();
 
         // set session domain
         if ($sess_domain) {
@@ -419,34 +452,44 @@ class rcube
             ini_set('session.gc_maxlifetime', $lifetime * 2);
         }
 
-        ini_set('session.cookie_secure', rcube_utils::https_check());
+        ini_set('session.cookie_secure', $is_secure);
         ini_set('session.name', $sess_name ? $sess_name : 'roundcube_sessid');
         ini_set('session.use_cookies', 1);
         ini_set('session.use_only_cookies', 1);
-        ini_set('session.serialize_handler', 'php');
         ini_set('session.cookie_httponly', 1);
 
         // use database for storing session data
         $this->session = new rcube_session($this->get_dbh(), $this->config);
 
-        $this->session->register_gc_handler(array($this, 'temp_gc'));
-        $this->session->register_gc_handler(array($this, 'cache_gc'));
-
+        $this->session->register_gc_handler(array($this, 'gc'));
         $this->session->set_secret($this->config->get('des_key') . dirname($_SERVER['SCRIPT_NAME']));
         $this->session->set_ip_check($this->config->get('ip_check'));
 
         // start PHP session (if not in CLI mode)
         if ($_SERVER['REMOTE_ADDR']) {
-            session_start();
+            $this->session->start();
         }
     }
 
 
     /**
+     * Garbage collector - cache/temp cleaner
+     */
+    public function gc()
+    {
+        rcube_cache::gc();
+        rcube_cache_shared::gc();
+        $this->get_storage()->cache_gc();
+
+        $this->gc_temp();
+    }
+
+
+    /**
      * Garbage collector function for temp files.
      * Remove temp files older than two days
      */
-    public function temp_gc()
+    public function gc_temp()
     {
         $tmp = unslashify($this->config->get('temp_dir'));
         $expire = time() - 172800;  // expire in 48 hours
@@ -468,14 +511,21 @@ class rcube
 
 
     /**
-     * Garbage collector for cache entries.
-     * Set flag to expunge caches on shutdown
+     * Runs garbage collector with probability based on
+     * session settings. This is intended for environments
+     * without a session.
      */
-    public function cache_gc()
+    public function gc_run()
     {
-        // because this gc function is called before storage is initialized,
-        // we just set a flag to expunge storage cache on shutdown.
-        $this->expunge_cache = true;
+        $probability = (int) ini_get('session.gc_probability');
+        $divisor     = (int) ini_get('session.gc_divisor');
+
+        if ($divisor > 0 && $probability > 0) {
+            $random = mt_rand(1, $divisor);
+            if ($random <= $probability) {
+                $this->gc();
+            }
+        }
     }
 
 
@@ -859,6 +909,14 @@ class rcube
             call_user_func($function);
         }
 
+        // write session data as soon as possible and before
+        // closing database connection, don't do this before
+        // registered shutdown functions, they may need the session
+        // Note: this will run registered gc handlers (ie. cache gc)
+        if ($_SERVER['REMOTE_ADDR'] && is_object($this->session)) {
+            $this->session->write_close();
+        }
+
         if (is_object($this->smtp)) {
             $this->smtp->disconnect();
         }
@@ -870,9 +928,6 @@ class rcube
         }
 
         if (is_object($this->storage)) {
-            if ($this->expunge_cache) {
-                $this->storage->expunge_cache();
-            }
             $this->storage->close();
         }
     }
@@ -1073,14 +1128,20 @@ class rcube
     {
         // handle PHP exceptions
         if (is_object($arg) && is_a($arg, 'Exception')) {
-            $err = array(
+            $arg = array(
                 'type' => 'php',
                 'code' => $arg->getCode(),
                 'line' => $arg->getLine(),
                 'file' => $arg->getFile(),
                 'message' => $arg->getMessage(),
             );
-            $arg = $err;
+        }
+        else if (is_string($arg)) {
+            $arg = array('message' => $arg, 'type' => 'php');
+        }
+
+        if (empty($arg['code'])) {
+            $arg['code'] = 500;
         }
 
         // installer
@@ -1090,14 +1151,24 @@ class rcube
             return;
         }
 
-        if (($log || $terminate) && $arg['type'] && $arg['message']) {
+        $cli = php_sapi_name() == 'cli';
+
+        if (($log || $terminate) && !$cli && $arg['type'] && $arg['message']) {
             $arg['fatal'] = $terminate;
             self::log_bug($arg);
         }
 
-        // display error page and terminate script
-        if ($terminate && is_object(self::$instance->output)) {
-            self::$instance->output->raise_error($arg['code'], $arg['message']);
+        // terminate script
+        if ($terminate) {
+            // display error page
+            if (is_object(self::$instance->output)) {
+                self::$instance->output->raise_error($arg['code'], $arg['message']);
+            }
+            else if ($cli) {
+                fwrite(STDERR, 'ERROR: ' . $arg['message']);
+            }
+
+            exit(1);
         }
     }
 
@@ -1136,7 +1207,7 @@ class rcube
 
             if (!self::write_log('errors', $log_entry)) {
                 // send error to PHPs error handler if write_log didn't succeed
-                trigger_error($arg_arr['message']);
+                trigger_error($arg_arr['message'], E_USER_WARNING);
             }
         }
 
@@ -1274,6 +1345,188 @@ class rcube
             return $_SESSION['language'];
         }
     }
+
+    /**
+     * Unique Message-ID generator.
+     *
+     * @return string Message-ID
+     */
+    public function gen_message_id()
+    {
+        $local_part  = md5(uniqid('rcube'.mt_rand(), true));
+        $domain_part = $this->user->get_username('domain');
+
+        // Try to find FQDN, some spamfilters doesn't like 'localhost' (#1486924)
+        if (!preg_match('/\.[a-z]+$/i', $domain_part)) {
+            foreach (array($_SERVER['HTTP_HOST'], $_SERVER['SERVER_NAME']) as $host) {
+                $host = preg_replace('/:[0-9]+$/', '', $host);
+                if ($host && preg_match('/\.[a-z]+$/i', $host)) {
+                    $domain_part = $host;
+                }
+            }
+        }
+
+        return sprintf('<%s@%s>', $local_part, $domain_part);
+    }
+
+    /**
+     * Send the given message using the configured method.
+     *
+     * @param object $message    Reference to Mail_MIME object
+     * @param string $from       Sender address string
+     * @param array  $mailto     Array of recipient address strings
+     * @param array  $error      SMTP error array (reference)
+     * @param string $body_file  Location of file with saved message body (reference),
+     *                           used when delay_file_io is enabled
+     * @param array  $options    SMTP options (e.g. DSN request)
+     *
+     * @return boolean Send status.
+     */
+    public function deliver_message(&$message, $from, $mailto, &$error, &$body_file = null, $options = null)
+    {
+        $plugin = $this->plugins->exec_hook('message_before_send', array(
+            'message' => $message,
+            'from'    => $from,
+            'mailto'  => $mailto,
+            'options' => $options,
+        ));
+
+        $from    = $plugin['from'];
+        $mailto  = $plugin['mailto'];
+        $options = $plugin['options'];
+        $message = $plugin['message'];
+        $headers = $message->headers();
+
+        // send thru SMTP server using custom SMTP library
+        if ($this->config->get('smtp_server')) {
+            // generate list of recipients
+            $a_recipients = array($mailto);
+
+            if (strlen($headers['Cc']))
+                $a_recipients[] = $headers['Cc'];
+            if (strlen($headers['Bcc']))
+                $a_recipients[] = $headers['Bcc'];
+
+            // clean Bcc from header for recipients
+            $send_headers = $headers;
+            unset($send_headers['Bcc']);
+            // here too, it because txtHeaders() below use $message->_headers not only $send_headers
+            unset($message->_headers['Bcc']);
+
+            $smtp_headers = $message->txtHeaders($send_headers, true);
+
+            if ($message->getParam('delay_file_io')) {
+                // use common temp dir
+                $temp_dir = $this->config->get('temp_dir');
+                $body_file = tempnam($temp_dir, 'rcmMsg');
+                if (PEAR::isError($mime_result = $message->saveMessageBody($body_file))) {
+                    self::raise_error(array('code' => 650, 'type' => 'php',
+                        'file' => __FILE__, 'line' => __LINE__,
+                        'message' => "Could not create message: ".$mime_result->getMessage()),
+                        TRUE, FALSE);
+                    return false;
+                }
+                $msg_body = fopen($body_file, 'r');
+            }
+            else {
+                $msg_body = $message->get();
+            }
+
+            // send message
+            if (!is_object($this->smtp)) {
+                $this->smtp_init(true);
+            }
+
+            $sent     = $this->smtp->send_mail($from, $a_recipients, $smtp_headers, $msg_body, $options);
+            $response = $this->smtp->get_response();
+            $error    = $this->smtp->get_error();
+
+            // log error
+            if (!$sent) {
+                self::raise_error(array('code' => 800, 'type' => 'smtp',
+                    'line' => __LINE__, 'file' => __FILE__,
+                    'message' => "SMTP error: ".join("\n", $response)), TRUE, FALSE);
+            }
+        }
+        // send mail using PHP's mail() function
+        else {
+            // unset some headers because they will be added by the mail() function
+            $headers_enc = $message->headers($headers);
+            $headers_php = $message->_headers;
+            unset($headers_php['To'], $headers_php['Subject']);
+
+            // reset stored headers and overwrite
+            $message->_headers = array();
+            $header_str = $message->txtHeaders($headers_php);
+
+            // #1485779
+            if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
+                if (preg_match_all('/<([^@]+@[^>]+)>/', $headers_enc['To'], $m)) {
+                    $headers_enc['To'] = implode(', ', $m[1]);
+                }
+            }
+
+            $msg_body = $message->get();
+
+            if (PEAR::isError($msg_body)) {
+                self::raise_error(array('code' => 650, 'type' => 'php',
+                    'file' => __FILE__, 'line' => __LINE__,
+                    'message' => "Could not create message: ".$msg_body->getMessage()),
+                    TRUE, FALSE);
+            }
+            else {
+                $delim   = $this->config->header_delimiter();
+                $to      = $headers_enc['To'];
+                $subject = $headers_enc['Subject'];
+                $header_str = rtrim($header_str);
+
+                if ($delim != "\r\n") {
+                    $header_str = str_replace("\r\n", $delim, $header_str);
+                    $msg_body   = str_replace("\r\n", $delim, $msg_body);
+                    $to         = str_replace("\r\n", $delim, $to);
+                    $subject    = str_replace("\r\n", $delim, $subject);
+                }
+
+                if (ini_get('safe_mode'))
+                    $sent = mail($to, $subject, $msg_body, $header_str);
+                else
+                    $sent = mail($to, $subject, $msg_body, $header_str, "-f$from");
+            }
+        }
+
+        if ($sent) {
+            $this->plugins->exec_hook('message_sent', array('headers' => $headers, 'body' => $msg_body));
+
+            // remove MDN headers after sending
+            unset($headers['Return-Receipt-To'], $headers['Disposition-Notification-To']);
+
+            // get all recipients
+            if ($headers['Cc'])
+                $mailto .= $headers['Cc'];
+            if ($headers['Bcc'])
+                $mailto .= $headers['Bcc'];
+            if (preg_match_all('/<([^@]+@[^>]+)>/', $mailto, $m))
+                $mailto = implode(', ', array_unique($m[1]));
+
+            if ($this->config->get('smtp_log')) {
+                self::write_log('sendmail', sprintf("User %s [%s]; Message for %s; %s",
+                    $this->user->get_username(),
+                    $_SERVER['REMOTE_ADDR'],
+                    $mailto,
+                    !empty($response) ? join('; ', $response) : ''));
+            }
+        }
+
+        if (is_resource($msg_body)) {
+            fclose($msg_body);
+        }
+
+        $message->_headers = array();
+        $message->headers($headers);
+
+        return $sent;
+    }
+
 }
 
 
diff --git a/program/lib/Roundcube/rcube_addressbook.php b/program/lib/Roundcube/rcube_addressbook.php
index cbc3c6773..d23ad3687 100644
--- a/program/lib/Roundcube/rcube_addressbook.php
+++ b/program/lib/Roundcube/rcube_addressbook.php
@@ -309,9 +309,14 @@ abstract class rcube_addressbook
      * List all active contact groups of this source
      *
      * @param string  Optional search string to match group name
+     * @param int     Matching mode:
+     *                0 - partial (*abc*),
+     *                1 - strict (=),
+     *                2 - prefix (abc*)
+     *
      * @return array  Indexed list of contact groups, each a hash array
      */
-    function list_groups($search = null)
+    function list_groups($search = null, $mode = 0)
     {
         /* empty for address books don't supporting groups */
         return array();
@@ -370,9 +375,10 @@ abstract class rcube_addressbook
     /**
      * Add the given contact records the a certain group
      *
-     * @param string  Group identifier
-     * @param array   List of contact identifiers to be added
-     * @return int    Number of contacts added
+     * @param string       Group identifier
+     * @param array|string List of contact identifiers to be added
+     *
+     * @return int Number of contacts added
      */
     function add_to_group($group_id, $ids)
     {
@@ -383,9 +389,10 @@ abstract class rcube_addressbook
     /**
      * Remove the given contact records from a certain group
      *
-     * @param string  Group identifier
-     * @param array   List of contact identifiers to be removed
-     * @return int    Number of deleted group members
+     * @param string       Group identifier
+     * @param array|string List of contact identifiers to be removed
+     *
+     * @return int Number of deleted group members
      */
     function remove_from_group($group_id, $ids)
     {
@@ -425,7 +432,7 @@ abstract class rcube_addressbook
                     $out = array_merge($out, (array)$values);
                 }
                 else {
-                    list($f, $type) = explode(':', $c);
+                    list(, $type) = explode(':', $c);
                     $out[$type] = array_merge((array)$out[$type], (array)$values);
                 }
             }
@@ -528,7 +535,7 @@ abstract class rcube_addressbook
      */
     public static function compose_contact_key($contact, $sort_col)
     {
-        $key = $contact[$sort_col] . ':' . $row['sourceid'];
+        $key = $contact[$sort_col] . ':' . $contact['sourceid'];
 
         // add email to a key to not skip contacts with the same name (#1488375)
         if (!empty($contact['email'])) {
@@ -538,7 +545,6 @@ abstract class rcube_addressbook
          return $key;
     }
 
-
     /**
      * Compare search value with contact data
      *
diff --git a/program/lib/Roundcube/rcube_base_replacer.php b/program/lib/Roundcube/rcube_base_replacer.php
index fcd85c2c8..e41ccb1d9 100644
--- a/program/lib/Roundcube/rcube_base_replacer.php
+++ b/program/lib/Roundcube/rcube_base_replacer.php
@@ -21,7 +21,7 @@
  * using a predefined base
  *
  * @package    Framework
- * @subpackage Core
+ * @subpackage Utils
  * @author     Thomas Bruederli <roundcube@gmail.com>
  */
 class rcube_base_replacer
diff --git a/program/lib/Roundcube/rcube_browser.php b/program/lib/Roundcube/rcube_browser.php
index d10fe2a2c..34128291b 100644
--- a/program/lib/Roundcube/rcube_browser.php
+++ b/program/lib/Roundcube/rcube_browser.php
@@ -20,7 +20,7 @@
  * Provide details about the client's browser based on the User-Agent header
  *
  * @package    Framework
- * @subpackage Core
+ * @subpackage Utils
  */
 class rcube_browser
 {
diff --git a/program/lib/Roundcube/rcube_cache.php b/program/lib/Roundcube/rcube_cache.php
index 92f12a8bf..a708cb292 100644
--- a/program/lib/Roundcube/rcube_cache.php
+++ b/program/lib/Roundcube/rcube_cache.php
@@ -38,6 +38,7 @@ class rcube_cache
     private $type;
     private $userid;
     private $prefix;
+    private $table;
     private $ttl;
     private $packed;
     private $index;
@@ -71,8 +72,9 @@ class rcube_cache
             $this->db   = function_exists('apc_exists'); // APC 3.1.4 required
         }
         else {
-            $this->type = 'db';
-            $this->db   = $rcube->get_dbh();
+            $this->type  = 'db';
+            $this->db    = $rcube->get_dbh();
+            $this->table = $this->db->table_name('cache');
         }
 
         // convert ttl string to seconds
@@ -145,7 +147,7 @@ class rcube_cache
      */
     function write($key, $data)
     {
-        return $this->write_record($key, $this->packed ? serialize($data) : $data);
+        return $this->write_record($key, $this->serialize($data));
     }
 
 
@@ -192,20 +194,31 @@ class rcube_cache
      */
     function expunge()
     {
-        if ($this->type == 'db' && $this->db) {
+        if ($this->type == 'db' && $this->db && $this->ttl) {
             $this->db->query(
-                "DELETE FROM ".$this->db->table_name('cache').
+                "DELETE FROM ".$this->table.
                 " WHERE user_id = ?".
                 " AND cache_key LIKE ?".
-                " AND " . $this->db->unixtimestamp('created')." < ?",
+                " AND expires < " . $this->db->now(),
                 $this->userid,
-                $this->prefix.'.%',
-                time() - $this->ttl);
+                $this->prefix.'.%');
         }
     }
 
 
     /**
+     * Remove expired records of all caches
+     */
+    static function gc()
+    {
+        $rcube = rcube::get_instance();
+        $db    = $rcube->get_dbh();
+
+        $db->query("DELETE FROM " . $db->table_name('cache') . " WHERE expires < " . $db->now());
+    }
+
+
+    /**
      * Writes the cache back to the DB.
      */
     function close()
@@ -219,7 +232,7 @@ class rcube_cache
             if ($this->cache_changes[$key]) {
                 // Make sure we're not going to write unchanged data
                 // by comparing current md5 sum with the sum calculated on DB read
-                $data = $this->packed ? serialize($data) : $data;
+                $data = $this->serialize($data);
 
                 if (!$this->cache_sums[$key] || $this->cache_sums[$key] != md5($data)) {
                     $this->write_record($key, $data);
@@ -255,7 +268,7 @@ class rcube_cache
 
             if ($data) {
                 $md5sum = md5($data);
-                $data   = $this->packed ? unserialize($data) : $data;
+                $data   = $this->unserialize($data);
 
                 if ($nostore) {
                     return $data;
@@ -271,7 +284,7 @@ class rcube_cache
         else {
             $sql_result = $this->db->limitquery(
                 "SELECT data, cache_key".
-                " FROM ".$this->db->table_name('cache').
+                " FROM " . $this->table.
                 " WHERE user_id = ?".
                 " AND cache_key = ?".
                 // for better performance we allow more records for one key
@@ -283,7 +296,7 @@ class rcube_cache
                 $key = substr($sql_arr['cache_key'], strlen($this->prefix)+1);
                 $md5sum = $sql_arr['data'] ? md5($sql_arr['data']) : null;
                 if ($sql_arr['data']) {
-                    $data = $this->packed ? unserialize($sql_arr['data']) : $sql_arr['data'];
+                    $data = $this->unserialize($sql_arr['data']);
                 }
 
                 if ($nostore) {
@@ -326,7 +339,7 @@ class rcube_cache
         // Remove NULL rows (here we don't need to check if the record exist)
         if ($data == 'N;') {
             $this->db->query(
-                "DELETE FROM ".$this->db->table_name('cache').
+                "DELETE FROM " . $this->table.
                 " WHERE user_id = ?".
                 " AND cache_key = ?",
                 $this->userid, $key);
@@ -337,8 +350,10 @@ class rcube_cache
         // update existing cache record
         if ($key_exists) {
             $result = $this->db->query(
-                "UPDATE ".$this->db->table_name('cache').
-                " SET created = ". $this->db->now().", data = ?".
+                "UPDATE " . $this->table.
+                " SET created = " . $this->db->now().
+                    ", expires = " . ($this->ttl ? $this->db->now($this->ttl) : 'NULL').
+                    ", data = ?".
                 " WHERE user_id = ?".
                 " AND cache_key = ?",
                 $data, $this->userid, $key);
@@ -348,9 +363,9 @@ class rcube_cache
             // for better performance we allow more records for one key
             // so, no need to check if record exist (see rcube_cache::read_record())
             $result = $this->db->query(
-                "INSERT INTO ".$this->db->table_name('cache').
-                " (created, user_id, cache_key, data)".
-                " VALUES (".$this->db->now().", ?, ?, ?)",
+                "INSERT INTO " . $this->table.
+                " (created, expires, user_id, cache_key, data)".
+                " VALUES (" . $this->db->now() . ", " . ($this->ttl ? $this->db->now($this->ttl) : 'NULL') . ", ?, ?, ?)",
                 $this->userid, $key, $data);
         }
 
@@ -364,7 +379,6 @@ class rcube_cache
      * @param string  $key         Cache key name or pattern
      * @param boolean $prefix_mode Enable it to clear all keys starting
      *                             with prefix specified in $key
-     *
      */
     private function remove_record($key=null, $prefix_mode=false)
     {
@@ -412,7 +426,7 @@ class rcube_cache
         }
 
         $this->db->query(
-            "DELETE FROM ".$this->db->table_name('cache').
+            "DELETE FROM " . $this->table.
             " WHERE user_id = ?" . $where,
             $this->userid);
     }
@@ -553,4 +567,28 @@ class rcube_cache
         // This way each cache will have its own index
         return sprintf('%d:%s%s', $this->userid, $this->prefix, 'INDEX');
     }
+
+    /**
+     * Serializes data for storing
+     */
+    private function serialize($data)
+    {
+        if ($this->type == 'db') {
+            return $this->db->encode($data, $this->packed);
+        }
+
+        return $this->packed ? serialize($data) : $data;
+    }
+
+    /**
+     * Unserializes serialized data
+     */
+    private function unserialize($data)
+    {
+        if ($this->type == 'db') {
+            return $this->db->decode($data, $this->packed);
+        }
+
+        return $this->packed ? @unserialize($data) : $data;
+    }
 }
diff --git a/program/lib/Roundcube/rcube_cache_shared.php b/program/lib/Roundcube/rcube_cache_shared.php
new file mode 100644
index 000000000..8f2574046
--- /dev/null
+++ b/program/lib/Roundcube/rcube_cache_shared.php
@@ -0,0 +1,581 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | This file is part of the Roundcube Webmail client                     |
+ | Copyright (C) 2011-2013, The Roundcube Dev Team                       |
+ | Copyright (C) 2011-2013, Kolab Systems AG                             |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ | PURPOSE:                                                              |
+ |   Shared (cross-user) caching engine                                  |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas Bruederli <roundcube@gmail.com>                        |
+ | Author: Aleksander Machniak <alec@alec.pl>                            |
+ +-----------------------------------------------------------------------+
+*/
+
+
+/**
+ * Interface class for accessing Roundcube shared cache
+ *
+ * @package    Framework
+ * @subpackage Cache
+ * @author     Thomas Bruederli <roundcube@gmail.com>
+ * @author     Aleksander Machniak <alec@alec.pl>
+ */
+class rcube_cache_shared
+{
+    /**
+     * Instance of database handler
+     *
+     * @var rcube_db|Memcache|bool
+     */
+    private $db;
+    private $type;
+    private $prefix;
+    private $ttl;
+    private $packed;
+    private $index;
+    private $table;
+    private $cache         = array();
+    private $cache_changes = array();
+    private $cache_sums    = array();
+
+
+    /**
+     * Object constructor.
+     *
+     * @param string $type   Engine type ('db' or 'memcache' or 'apc')
+     * @param string $prefix Key name prefix
+     * @param string $ttl    Expiration time of memcache/apc items
+     * @param bool   $packed Enables/disabled data serialization.
+     *                       It's possible to disable data serialization if you're sure
+     *                       stored data will be always a safe string
+     */
+    function __construct($type, $prefix='', $ttl=0, $packed=true)
+    {
+        $rcube = rcube::get_instance();
+        $type  = strtolower($type);
+
+        if ($type == 'memcache') {
+            $this->type = 'memcache';
+            $this->db   = $rcube->get_memcache();
+        }
+        else if ($type == 'apc') {
+            $this->type = 'apc';
+            $this->db   = function_exists('apc_exists'); // APC 3.1.4 required
+        }
+        else {
+            $this->type  = 'db';
+            $this->db    = $rcube->get_dbh();
+            $this->table = $this->db->table_name('cache_shared');
+        }
+
+        // convert ttl string to seconds
+        $ttl = get_offset_sec($ttl);
+        if ($ttl > 2592000) $ttl = 2592000;
+
+        $this->ttl       = $ttl;
+        $this->packed    = $packed;
+        $this->prefix    = $prefix;
+    }
+
+
+    /**
+     * Returns cached value.
+     *
+     * @param string $key Cache key name
+     *
+     * @return mixed Cached value
+     */
+    function get($key)
+    {
+        if (!array_key_exists($key, $this->cache)) {
+            return $this->read_record($key);
+        }
+
+        return $this->cache[$key];
+    }
+
+
+    /**
+     * Sets (add/update) value in cache.
+     *
+     * @param string $key  Cache key name
+     * @param mixed  $data Cache data
+     */
+    function set($key, $data)
+    {
+        $this->cache[$key]         = $data;
+        $this->cache_changed       = true;
+        $this->cache_changes[$key] = true;
+    }
+
+
+    /**
+     * Returns cached value without storing it in internal memory.
+     *
+     * @param string $key Cache key name
+     *
+     * @return mixed Cached value
+     */
+    function read($key)
+    {
+        if (array_key_exists($key, $this->cache)) {
+            return $this->cache[$key];
+        }
+
+        return $this->read_record($key, true);
+    }
+
+
+    /**
+     * Sets (add/update) value in cache and immediately saves
+     * it in the backend, no internal memory will be used.
+     *
+     * @param string $key  Cache key name
+     * @param mixed  $data Cache data
+     *
+     * @param boolean True on success, False on failure
+     */
+    function write($key, $data)
+    {
+        return $this->write_record($key, $this->serialize($data));
+    }
+
+
+    /**
+     * Clears the cache.
+     *
+     * @param string  $key         Cache key name or pattern
+     * @param boolean $prefix_mode Enable it to clear all keys starting
+     *                             with prefix specified in $key
+     */
+    function remove($key=null, $prefix_mode=false)
+    {
+        // Remove all keys
+        if ($key === null) {
+            $this->cache         = array();
+            $this->cache_changed = false;
+            $this->cache_changes = array();
+            $this->cache_sums    = array();
+        }
+        // Remove keys by name prefix
+        else if ($prefix_mode) {
+            foreach (array_keys($this->cache) as $k) {
+                if (strpos($k, $key) === 0) {
+                    $this->cache[$k] = null;
+                    $this->cache_changes[$k] = false;
+                    unset($this->cache_sums[$k]);
+                }
+            }
+        }
+        // Remove one key by name
+        else {
+            $this->cache[$key] = null;
+            $this->cache_changes[$key] = false;
+            unset($this->cache_sums[$key]);
+        }
+
+        // Remove record(s) from the backend
+        $this->remove_record($key, $prefix_mode);
+    }
+
+
+    /**
+     * Remove cache records older than ttl
+     */
+    function expunge()
+    {
+        if ($this->type == 'db' && $this->db && $this->ttl) {
+            $this->db->query(
+                "DELETE FROM " . $this->table
+                . " WHERE cache_key LIKE ?"
+                . " AND expires < " . $this->db->now(),
+                $this->prefix . '.%');
+        }
+    }
+
+
+    /**
+     * Remove expired records of all caches
+     */
+    static function gc()
+    {
+        $rcube = rcube::get_instance();
+        $db    = $rcube->get_dbh();
+
+        $db->query("DELETE FROM " . $db->table_name('cache_shared') . " WHERE expires < " . $db->now());
+    }
+
+
+    /**
+     * Writes the cache back to the DB.
+     */
+    function close()
+    {
+        if (!$this->cache_changed) {
+            return;
+        }
+
+        foreach ($this->cache as $key => $data) {
+            // The key has been used
+            if ($this->cache_changes[$key]) {
+                // Make sure we're not going to write unchanged data
+                // by comparing current md5 sum with the sum calculated on DB read
+                $data = $this->serialize($data);
+
+                if (!$this->cache_sums[$key] || $this->cache_sums[$key] != md5($data)) {
+                    $this->write_record($key, $data);
+                }
+            }
+        }
+
+        $this->write_index();
+    }
+
+
+    /**
+     * Reads cache entry.
+     *
+     * @param string  $key     Cache key name
+     * @param boolean $nostore Enable to skip in-memory store
+     *
+     * @return mixed Cached value
+     */
+    private function read_record($key, $nostore=false)
+    {
+        if (!$this->db) {
+            return null;
+        }
+
+        if ($this->type != 'db') {
+            if ($this->type == 'memcache') {
+                $data = $this->db->get($this->ckey($key));
+            }
+            else if ($this->type == 'apc') {
+                $data = apc_fetch($this->ckey($key));
+            }
+
+            if ($data) {
+                $md5sum = md5($data);
+                $data   = $this->unserialize($data);
+
+                if ($nostore) {
+                    return $data;
+                }
+
+                $this->cache_sums[$key] = $md5sum;
+                $this->cache[$key]      = $data;
+            }
+            else {
+                $this->cache[$key] = null;
+            }
+        }
+        else {
+            $sql_result = $this->db->limitquery(
+                "SELECT data, cache_key".
+                " FROM " . $this->table .
+                " WHERE cache_key = ?".
+                // for better performance we allow more records for one key
+                // get the newer one
+                " ORDER BY created DESC",
+                0, 1, $this->prefix . '.' . $key);
+
+            if ($sql_arr = $this->db->fetch_assoc($sql_result)) {
+                $md5sum = $sql_arr['data'] ? md5($sql_arr['data']) : null;
+                if ($sql_arr['data']) {
+                    $data = $this->unserialize($sql_arr['data']);
+                }
+
+                if ($nostore) {
+                    return $data;
+                }
+
+                $this->cache[$key]      = $data;
+                $this->cache_sums[$key] = $md5sum;
+            }
+            else {
+                $this->cache[$key] = null;
+            }
+        }
+
+        return $this->cache[$key];
+    }
+
+
+    /**
+     * Writes single cache record into DB.
+     *
+     * @param string $key  Cache key name
+     * @param mxied  $data Serialized cache data 
+     *
+     * @param boolean True on success, False on failure
+     */
+    private function write_record($key, $data)
+    {
+        if (!$this->db) {
+            return false;
+        }
+
+        if ($this->type == 'memcache' || $this->type == 'apc') {
+            return $this->add_record($this->ckey($key), $data);
+        }
+
+        $key_exists = array_key_exists($key, $this->cache_sums);
+        $key        = $this->prefix . '.' . $key;
+
+        // Remove NULL rows (here we don't need to check if the record exist)
+        if ($data == 'N;') {
+            $this->db->query("DELETE FROM " . $this->table . " WHERE cache_key = ?", $key);
+            return true;
+        }
+
+        // update existing cache record
+        if ($key_exists) {
+            $result = $this->db->query(
+                "UPDATE " . $this->table .
+                " SET created = " . $this->db->now() .
+                    ", expires = " . ($this->ttl ? $this->db->now($this->ttl) : 'NULL') .
+                    ", data = ?".
+                " WHERE cache_key = ?",
+                $data, $key);
+        }
+        // add new cache record
+        else {
+            // for better performance we allow more records for one key
+            // so, no need to check if record exist (see rcube_cache::read_record())
+            $result = $this->db->query(
+                "INSERT INTO ".$this->table.
+                " (created, expires, cache_key, data)".
+                " VALUES (".$this->db->now().", " . ($this->ttl ? $this->db->now($this->ttl) : 'NULL') . ", ?, ?)",
+                $key, $data);
+        }
+
+        return $this->db->affected_rows($result);
+    }
+
+
+    /**
+     * Deletes the cache record(s).
+     *
+     * @param string  $key         Cache key name or pattern
+     * @param boolean $prefix_mode Enable it to clear all keys starting
+     *                             with prefix specified in $key
+     */
+    private function remove_record($key=null, $prefix_mode=false)
+    {
+        if (!$this->db) {
+            return;
+        }
+
+        if ($this->type != 'db') {
+            $this->load_index();
+
+            // Remove all keys
+            if ($key === null) {
+                foreach ($this->index as $key) {
+                    $this->delete_record($key, false);
+                }
+                $this->index = array();
+            }
+            // Remove keys by name prefix
+            else if ($prefix_mode) {
+                foreach ($this->index as $k) {
+                    if (strpos($k, $key) === 0) {
+                        $this->delete_record($k);
+                    }
+                }
+            }
+            // Remove one key by name
+            else {
+                $this->delete_record($key);
+            }
+
+            return;
+        }
+
+        // Remove all keys (in specified cache)
+        if ($key === null) {
+            $where = " WHERE cache_key LIKE " . $this->db->quote($this->prefix.'.%');
+        }
+        // Remove keys by name prefix
+        else if ($prefix_mode) {
+            $where = " WHERE cache_key LIKE " . $this->db->quote($this->prefix.'.'.$key.'%');
+        }
+        // Remove one key by name
+        else {
+            $where = " WHERE cache_key = " . $this->db->quote($this->prefix.'.'.$key);
+        }
+
+        $this->db->query("DELETE FROM " . $this->table . $where);
+    }
+
+
+    /**
+     * Adds entry into memcache/apc DB.
+     *
+     * @param string  $key   Cache key name
+     * @param mxied   $data  Serialized cache data
+     * @param bollean $index Enables immediate index update
+     *
+     * @param boolean True on success, False on failure
+     */
+    private function add_record($key, $data, $index=false)
+    {
+        if ($this->type == 'memcache') {
+            $result = $this->db->replace($key, $data, MEMCACHE_COMPRESSED, $this->ttl);
+            if (!$result) {
+                $result = $this->db->set($key, $data, MEMCACHE_COMPRESSED, $this->ttl);
+            }
+        }
+        else if ($this->type == 'apc') {
+            if (apc_exists($key)) {
+                apc_delete($key);
+            }
+            $result = apc_store($key, $data, $this->ttl);
+        }
+
+        // Update index
+        if ($index && $result) {
+            $this->load_index();
+
+            if (array_search($key, $this->index) === false) {
+                $this->index[] = $key;
+                $data = serialize($this->index);
+                $this->add_record($this->ikey(), $data);
+            }
+        }
+
+        return $result;
+    }
+
+
+    /**
+     * Deletes entry from memcache/apc DB.
+     */
+    private function delete_record($key, $index=true)
+    {
+        if ($this->type == 'memcache') {
+            // #1488592: use 2nd argument
+            $this->db->delete($this->ckey($key), 0);
+        }
+        else {
+            apc_delete($this->ckey($key));
+        }
+
+        if ($index) {
+            if (($idx = array_search($key, $this->index)) !== false) {
+                unset($this->index[$idx]);
+            }
+        }
+    }
+
+
+    /**
+     * Writes the index entry into memcache/apc DB.
+     */
+    private function write_index()
+    {
+        if (!$this->db) {
+            return;
+        }
+
+        if ($this->type == 'db') {
+            return;
+        }
+
+        $this->load_index();
+
+        // Make sure index contains new keys
+        foreach ($this->cache as $key => $value) {
+            if ($value !== null) {
+                if (array_search($key, $this->index) === false) {
+                    $this->index[] = $key;
+                }
+            }
+        }
+
+        $data = serialize($this->index);
+        $this->add_record($this->ikey(), $data);
+    }
+
+
+    /**
+     * Gets the index entry from memcache/apc DB.
+     */
+    private function load_index()
+    {
+        if (!$this->db) {
+            return;
+        }
+
+        if ($this->index !== null) {
+            return;
+        }
+
+        $index_key = $this->ikey();
+
+        if ($this->type == 'memcache') {
+            $data = $this->db->get($index_key);
+        }
+        else if ($this->type == 'apc') {
+            $data = apc_fetch($index_key);
+        }
+
+        $this->index = $data ? unserialize($data) : array();
+    }
+
+
+    /**
+     * Creates cache key name (for memcache and apc)
+     *
+     * @param string $key Cache key name
+     *
+     * @return string Cache key
+     */
+    private function ckey($key)
+    {
+        return $this->prefix . ':' . $key;
+    }
+
+
+    /**
+     * Creates index cache key name (for memcache and apc)
+     *
+     * @return string Cache key
+     */
+    private function ikey()
+    {
+        // This way each cache will have its own index
+        return $this->prefix . 'INDEX';
+    }
+
+    /**
+     * Serializes data for storing
+     */
+    private function serialize($data)
+    {
+        if ($this->type == 'db') {
+            return $this->db->encode($data, $this->packed);
+        }
+
+        return $this->packed ? serialize($data) : $data;
+    }
+
+    /**
+     * Unserializes serialized data
+     */
+    private function unserialize($data)
+    {
+        if ($this->type == 'db') {
+            return $this->db->decode($data, $this->packed);
+        }
+
+        return $this->packed ? @unserialize($data) : $data;
+    }
+}
diff --git a/program/lib/Roundcube/rcube_config.php b/program/lib/Roundcube/rcube_config.php
index 2190dc4c2..18055f77d 100644
--- a/program/lib/Roundcube/rcube_config.php
+++ b/program/lib/Roundcube/rcube_config.php
@@ -43,6 +43,8 @@ class rcube_config
         'reply_mode'           => 'top_posting',
         'refresh_interval'     => 'keep_alive',
         'min_refresh_interval' => 'min_keep_alive',
+        'messages_cache_ttl'   => 'message_cache_lifetime',
+        'redundant_attachments_cache_ttl' => 'redundant_attachments_memcache_ttl',
     );
 
 
@@ -174,7 +176,7 @@ class rcube_config
             ob_end_clean();
 
             if (is_array($rcmail_config)) {
-                $this->prop = array_merge($this->prop, $rcmail_config, $this->userprefs);
+                $this->merge($rcmail_config);
                 return true;
             }
         }
@@ -195,9 +197,6 @@ class rcube_config
         if (isset($this->prop[$name])) {
             $result = $this->prop[$name];
         }
-        else if (isset($this->legacy_props[$name])) {
-            return $this->get($this->legacy_props[$name], $def);
-        }
         else {
             $result = $def;
         }
@@ -241,6 +240,7 @@ class rcube_config
     public function merge($prefs)
     {
         $this->prop = array_merge($this->prop, $prefs, $this->userprefs);
+        $this->fix_legacy_props();
     }
 
 
@@ -273,6 +273,8 @@ class rcube_config
         $this->userprefs = $prefs;
         $this->prop      = array_merge($this->prop, $prefs);
 
+        $this->fix_legacy_props();
+
         // override timezone settings with client values
         if ($this->prop['timezone'] == 'auto') {
             $this->prop['_timezone_value'] = isset($_SESSION['timezone']) ? $this->client_timezone() : $this->prop['_timezone_value'];
@@ -435,4 +437,18 @@ class rcube_config
         return date_default_timezone_get();
     }
 
+    /**
+     * Convert legacy options into new ones
+     */
+    private function fix_legacy_props()
+    {
+        foreach ($this->legacy_props as $new => $old) {
+            if (isset($this->prop[$old])) {
+                if (!isset($this->prop[$new])) {
+                    $this->prop[$new] = $this->prop[$old];
+                }
+                unset($this->prop[$old]);
+            }
+        }
+    }
 }
diff --git a/program/lib/Roundcube/rcube_contacts.php b/program/lib/Roundcube/rcube_contacts.php
index c66e98687..3919cdc6e 100644
--- a/program/lib/Roundcube/rcube_contacts.php
+++ b/program/lib/Roundcube/rcube_contacts.php
@@ -137,16 +137,34 @@ class rcube_contacts extends rcube_addressbook
      * List all active contact groups of this source
      *
      * @param string  Search string to match group name
+     * @param int     Matching mode:
+     *                0 - partial (*abc*),
+     *                1 - strict (=),
+     *                2 - prefix (abc*)
+     *
      * @return array  Indexed list of contact groups, each a hash array
      */
-    function list_groups($search = null)
+    function list_groups($search = null, $mode = 0)
     {
         $results = array();
 
         if (!$this->groups)
             return $results;
 
-        $sql_filter = $search ? " AND " . $this->db->ilike('name', '%'.$search.'%') : '';
+        if ($search) {
+            switch (intval($mode)) {
+            case 1:
+                $sql_filter = $this->db->ilike('name', $search);
+                break;
+            case 2:
+                $sql_filter = $this->db->ilike('name', $search . '%');
+                break;
+            default:
+                $sql_filter = $this->db->ilike('name', '%' . $search . '%');
+            }
+
+            $sql_filter = " AND $sql_filter";
+        }
 
         $sql_result = $this->db->query(
             "SELECT * FROM ".$this->db->table_name($this->db_groups).
@@ -626,10 +644,6 @@ class rcube_contacts extends rcube_addressbook
             $insert_id = $this->db->insert_id($this->db_name);
         }
 
-        // also add the newly created contact to the active group
-        if ($insert_id && $this->group_id)
-            $this->add_to_group($this->group_id, $insert_id);
-
         $this->cache = null;
 
         return $insert_id;
@@ -883,9 +897,10 @@ class rcube_contacts extends rcube_addressbook
     /**
      * Add the given contact records the a certain group
      *
-     * @param string  Group identifier
-     * @param array   List of contact identifiers to be added
-     * @return int    Number of contacts added 
+     * @param string       Group identifier
+     * @param array|string List of contact identifiers to be added
+     *
+     * @return int Number of contacts added
      */
     function add_to_group($group_id, $ids)
     {
@@ -930,9 +945,10 @@ class rcube_contacts extends rcube_addressbook
     /**
      * Remove the given contact records from a certain group
      *
-     * @param string  Group identifier
-     * @param array   List of contact identifiers to be removed
-     * @return int    Number of deleted group members
+     * @param string       Group identifier
+     * @param array|string List of contact identifiers to be removed
+     *
+     * @return int Number of deleted group members
      */
     function remove_from_group($group_id, $ids)
     {
diff --git a/program/lib/Roundcube/rcube_content_filter.php b/program/lib/Roundcube/rcube_content_filter.php
index b814bb71d..ae6617d1b 100644
--- a/program/lib/Roundcube/rcube_content_filter.php
+++ b/program/lib/Roundcube/rcube_content_filter.php
@@ -20,7 +20,7 @@
  * PHP stream filter to detect html/javascript code in attachments
  *
  * @package    Framework
- * @subpackage Core
+ * @subpackage Utils
  */
 class rcube_content_filter extends php_user_filter
 {
diff --git a/program/lib/Roundcube/rcube_csv2vcard.php b/program/lib/Roundcube/rcube_csv2vcard.php
index 0d3276b84..fb8d8f103 100644
--- a/program/lib/Roundcube/rcube_csv2vcard.php
+++ b/program/lib/Roundcube/rcube_csv2vcard.php
@@ -130,6 +130,21 @@ class rcube_csv2vcard
         'work_state'            => 'region:work',
         'home_city_short'       => 'locality:home',
         'home_state_short'      => 'region:home',
+
+        // Atmail
+        'date_of_birth'         => 'birthday',
+        'email'                 => 'email:pref',
+        'home_mobile'           => 'phone:cell',
+        'home_zip'              => 'zipcode:home',
+        'info'                  => 'notes',
+        'user_photo'            => 'photo',
+        'url'                   => 'website:homepage',
+        'work_company'          => 'organization',
+        'work_dept'             => 'departament',
+        'work_fax'              => 'phone:work,fax',
+        'work_mobile'           => 'phone:work,cell',
+        'work_title'            => 'jobtitle',
+        'work_zip'              => 'zipcode:work',
     );
 
     /**
@@ -230,8 +245,29 @@ class rcube_csv2vcard
         'work_phone'        => "Work Phone",
         'work_address'      => "Work Address",
         //'work_address_2'    => "Work Address 2",
+        'work_city'         => "Work City",
         'work_country'      => "Work Country",
+        'work_state'        => "Work State",
         'work_zipcode'      => "Work ZipCode",
+
+        // Atmail
+        'date_of_birth'     => "Date of Birth",
+        'email'             => "Email",
+        //'email_2'         => "Email2",
+        //'email_3'         => "Email3",
+        //'email_4'         => "Email4",
+        //'email_5'         => "Email5",
+        'home_mobile'       => "Home Mobile",
+        'home_zip'          => "Home Zip",
+        'info'              => "Info",
+        'user_photo'        => "User Photo",
+        'url'               => "URL",
+        'work_company'      => "Work Company",
+        'work_dept'         => "Work Dept",
+        'work_fax'          => "Work Fax",
+        'work_mobile'       => "Work Mobile",
+        'work_title'        => "Work Title",
+        'work_zip'          => "Work Zip",
     );
 
     protected $local_label_map = array();
@@ -268,7 +304,6 @@ class rcube_csv2vcard
     {
         // convert to UTF-8
         $head     = substr($csv, 0, 4096);
-        $fallback = rcube::get_instance()->config->get('default_charset', 'ISO-8859-1'); // fallback to Latin-1?
         $charset  = rcube_charset::detect($head, RCUBE_CHARSET);
         $csv      = rcube_charset::convert($csv, $charset);
         $head     = '';
@@ -276,7 +311,7 @@ class rcube_csv2vcard
         $this->map = array();
 
         // Parse file
-        foreach (preg_split("/[\r\n]+/", $csv) as $i => $line) {
+        foreach (preg_split("/[\r\n]+/", $csv) as $line) {
             $elements = $this->parse_line($line);
             if (empty($elements)) {
                 continue;
@@ -353,6 +388,12 @@ class rcube_csv2vcard
         if (!empty($this->local_label_map)) {
             for ($i = 0; $i < $size; $i++) {
                 $label = $this->local_label_map[$elements[$i]];
+
+                // special localization label
+                if ($label && $label[0] == '_') {
+                    $label = substr($label, 1);
+                }
+
                 if ($label && !empty($this->csv2vcard_map[$label])) {
                     $map2[$i] = $this->csv2vcard_map[$label];
                 }
@@ -384,9 +425,13 @@ class rcube_csv2vcard
             $contact['birthday'] = $contact['birthday-y'] .'-' .$contact['birthday-m'] . '-' . $contact['birthday-d'];
         }
 
+        // Empty dates, e.g. "0/0/00", "0000-00-00 00:00:00"
         foreach (array('birthday', 'anniversary') as $key) {
-            if (!empty($contact[$key]) && $contact[$key] == '0/0/00') { // @TODO: localization?
-                unset($contact[$key]);
+            if (!empty($contact[$key])) {
+                $date = preg_replace('/[0[:^word:]]/', '', $contact[$key]);
+                if (empty($date)) {
+                    unset($contact[$key]);
+                }
             }
         }
 
diff --git a/program/lib/Roundcube/rcube_db.php b/program/lib/Roundcube/rcube_db.php
index 086a38ab4..852070073 100644
--- a/program/lib/Roundcube/rcube_db.php
+++ b/program/lib/Roundcube/rcube_db.php
@@ -47,6 +47,7 @@ class rcube_db
         'identifier_end'   => '"',
     );
 
+    const DEBUG_LINE_LENGTH = 4096;
 
     /**
      * Factory, returns driver-specific instance of the class
@@ -70,7 +71,7 @@ class rcube_db
         $driver = isset($driver_map[$driver]) ? $driver_map[$driver] : $driver;
         $class  = "rcube_db_$driver";
 
-        if (!class_exists($class)) {
+        if (!$driver || !class_exists($class)) {
             rcube::raise_error(array('code' => 600, 'type' => 'db',
                 'line' => __LINE__, 'file' => __FILE__,
                 'message' => "Configuration error. Unsupported database driver: $driver"),
@@ -99,27 +100,15 @@ class rcube_db
 
         $this->db_dsnw_array = self::parse_dsn($db_dsnw);
         $this->db_dsnr_array = self::parse_dsn($db_dsnr);
-
-        // Initialize driver class
-        $this->init();
-    }
-
-    /**
-     * Initialization of the object with driver specific code
-     */
-    protected function init()
-    {
-        // To be used by driver classes
     }
 
     /**
      * Connect to specific database
      *
-     * @param array $dsn DSN for DB connections
-     *
-     * @return PDO database handle
+     * @param array  $dsn  DSN for DB connections
+     * @param string $mode Connection mode (r|w)
      */
-    protected function dsn_connect($dsn)
+    protected function dsn_connect($dsn, $mode)
     {
         $this->db_error     = false;
         $this->db_error_msg = null;
@@ -128,7 +117,7 @@ class rcube_db
         $dsn_string  = $this->dsn_string($dsn);
         $dsn_options = $this->dsn_options($dsn);
 
-        if ($db_pconn) {
+        if ($this->db_pconn) {
             $dsn_options[PDO::ATTR_PERSISTENT] = true;
         }
 
@@ -157,9 +146,10 @@ class rcube_db
             return null;
         }
 
+        $this->dbh          = $dbh;
+        $this->db_mode      = $mode;
+        $this->db_connected = true;
         $this->conn_configure($dsn, $dbh);
-
-        return $dbh;
     }
 
     /**
@@ -182,16 +172,6 @@ class rcube_db
     }
 
     /**
-     * Driver-specific database character set setting
-     *
-     * @param string $charset Character set name
-     */
-    protected function set_charset($charset)
-    {
-        $this->query("SET NAMES 'utf8'");
-    }
-
-    /**
      * Connect to appropriate database depending on the operation
      *
      * @param string $mode Connection mode (r|w)
@@ -218,23 +198,14 @@ class rcube_db
 
         $dsn = ($mode == 'r') ? $this->db_dsnr_array : $this->db_dsnw_array;
 
-        $this->dbh          = $this->dsn_connect($dsn);
-        $this->db_connected = is_object($this->dbh);
+        $this->dsn_connect($dsn, $mode);
 
         // use write-master when read-only fails
-        if (!$this->db_connected && $mode == 'r') {
-            $mode = 'w';
-            $this->dbh          = $this->dsn_connect($this->db_dsnw_array);
-            $this->db_connected = is_object($this->dbh);
+        if (!$this->db_connected && $mode == 'r' && $this->is_replicated()) {
+            $this->dsn_connect($this->db_dsnw_array, 'w');
         }
 
-        if ($this->db_connected) {
-            $this->db_mode = $mode;
-            $this->set_charset('utf8');
-        }
-        else {
-            $this->conn_failure = true;
-        }
+        $this->conn_failure = !$this->db_connected;
     }
 
     /**
@@ -255,6 +226,11 @@ class rcube_db
     protected function debug($query)
     {
         if ($this->options['debug_mode']) {
+            if (($len = strlen($query)) > self::DEBUG_LINE_LENGTH) {
+                $diff  = $len - self::DEBUG_LINE_LENGTH;
+                $query = substr($query, 0, self::DEBUG_LINE_LENGTH)
+                    . "... [truncated $diff bytes]";
+            }
             rcube::write_log('sql', '[' . (++$this->db_index) . '] ' . $query . ';');
         }
     }
@@ -362,8 +338,10 @@ class rcube_db
      */
     protected function _query($query, $offset, $numrows, $params)
     {
+        $query = trim($query);
+
         // Read or write ?
-        $mode = preg_match('/^(select|show)/i', ltrim($query)) ? 'r' : 'w';
+        $mode = preg_match('/^(select|show|set)/i', $query) ? 'r' : 'w';
 
         $this->db_connect($mode);
 
@@ -405,21 +383,25 @@ class rcube_db
         $this->db_error_msg = null;
 
         // send query
-        $query = $this->dbh->query($query);
+        $result = $this->dbh->query($query);
 
-        if ($query === false) {
+        if ($result === false) {
             $error = $this->dbh->errorInfo();
-            $this->db_error = true;
-            $this->db_error_msg = sprintf('[%s] %s', $error[1], $error[2]);
 
-            rcube::raise_error(array('code' => 500, 'type' => 'db',
-                'line' => __LINE__, 'file' => __FILE__,
-                'message' => $this->db_error_msg), true, false);
+            if (empty($this->options['ignore_key_errors']) || $error[0] != '23000') {
+                $this->db_error = true;
+                $this->db_error_msg = sprintf('[%s] %s', $error[1], $error[2]);
+
+                rcube::raise_error(array('code' => 500, 'type' => 'db',
+                    'line' => __LINE__, 'file' => __FILE__,
+                    'message' => $this->db_error_msg . " (SQL Query: $query)"
+                    ), true, false);
+            }
         }
 
-        $this->last_result = $query;
+        $this->last_result = $result;
 
-        return $query;
+        return $result;
     }
 
     /**
@@ -439,6 +421,32 @@ class rcube_db
     }
 
     /**
+     * Get number of rows for a SQL query
+     * If no query handle is specified, the last query will be taken as reference
+     *
+     * @param mixed $result Optional query handle
+     * @return mixed   Number of rows or false on failure
+     * @deprecated This method shows very poor performance and should be avoided.
+     */
+    public function num_rows($result = null)
+    {
+        if ($result || ($result === null && ($result = $this->last_result))) {
+            // repeat query with SELECT COUNT(*) ...
+            if (preg_match('/^SELECT\s+(?:ALL\s+|DISTINCT\s+)?(?:.*?)\s+FROM\s+(.*)$/ims', $result->queryString, $m)) {
+                $query = $this->dbh->query('SELECT COUNT(*) FROM ' . $m[1], PDO::FETCH_NUM);
+                return $query ? intval($query->fetchColumn(0)) : false;
+            }
+            else {
+                $num = count($result->fetchAll());
+                $result->execute();  // re-execute query because there's no seek(0)
+                return $num;
+            }
+        }
+
+        return false;
+    }
+
+    /**
      * Get last inserted record ID
      *
      * @param string $table Table name (to find the incremented sequence)
@@ -571,7 +579,7 @@ class rcube_db
      * Formats input so it can be safely used in a query
      *
      * @param mixed  $input Value to quote
-     * @param string $type  Type of data
+     * @param string $type  Type of data (integer, bool, ident)
      *
      * @return string Quoted/converted string for use in query
      */
@@ -586,6 +594,10 @@ class rcube_db
             return 'NULL';
         }
 
+        if ($type == 'ident') {
+            return $this->quote_identifier($input);
+        }
+
         // create DB handle if not available
         if (!$this->dbh) {
             $this->db_connect('r');
@@ -604,6 +616,22 @@ class rcube_db
     }
 
     /**
+     * Escapes a string so it can be safely used in a query
+     *
+     * @param string $str A string to escape
+     *
+     * @return string Escaped string for use in a query
+     */
+    public function escape($str)
+    {
+        if (is_null($str)) {
+            return 'NULL';
+        }
+
+        return substr($this->quote($str), 1, -1);
+    }
+
+    /**
      * Quotes a string so it can be safely used as a table or column name
      *
      * @param string $str Value to quote
@@ -618,6 +646,20 @@ class rcube_db
     }
 
     /**
+     * Escapes a string so it can be safely used in a query
+     *
+     * @param string $str A string to escape
+     *
+     * @return string Escaped string for use in a query
+     * @deprecated    Replaced by rcube_db::escape
+     * @see           rcube_db::escape
+     */
+    public function escapeSimple($str)
+    {
+        return $this->escape($str);
+    }
+
+    /**
      * Quotes a string so it can be safely used as a table or column name
      *
      * @param string $str Value to quote
@@ -635,24 +677,32 @@ class rcube_db
             $name[] = $start . $elem . $end;
         }
 
-        return  implode($name, '.');
+        return implode($name, '.');
     }
 
     /**
      * Return SQL function for current time and date
      *
+     * @param int $interval Optional interval (in seconds) to add/subtract
+     *
      * @return string SQL function to use in query
      */
-    public function now()
+    public function now($interval = 0)
     {
-        return "now()";
+        if ($interval) {
+            $add = ' ' . ($interval > 0 ? '+' : '-') . ' INTERVAL ';
+            $add .= $interval > 0 ? intval($interval) : intval($interval) * -1;
+            $add .= ' SECOND';
+        }
+
+        return "now()" . $add;
     }
 
     /**
      * Return list of elements for use with SQL's IN clause
      *
      * @param array  $arr  Input array
-     * @param string $type Type of data
+     * @param string $type Type of data (integer, bool, ident)
      *
      * @return string Comma-separated list of quoted values for use in query
      */
@@ -728,12 +778,19 @@ class rcube_db
     /**
      * Encodes non-UTF-8 characters in string/array/object (recursive)
      *
-     * @param mixed $input Data to fix
+     * @param mixed $input      Data to fix
+     * @param bool  $serialized Enable serialization
      *
      * @return mixed Properly UTF-8 encoded data
      */
-    public static function encode($input)
+    public static function encode($input, $serialized = false)
     {
+        // use Base64 encoding to workaround issues with invalid
+        // or null characters in serialized string (#1489142)
+        if ($serialized) {
+            return base64_encode(serialize($input));
+        }
+
         if (is_object($input)) {
             foreach (get_object_vars($input) as $idx => $value) {
                 $input->$idx = self::encode($value);
@@ -744,6 +801,7 @@ class rcube_db
             foreach ($input as $idx => $value) {
                 $input[$idx] = self::encode($value);
             }
+
             return $input;
         }
 
@@ -753,12 +811,24 @@ class rcube_db
     /**
      * Decodes encoded UTF-8 string/object/array (recursive)
      *
-     * @param mixed $input Input data
+     * @param mixed $input      Input data
+     * @param bool  $serialized Enable serialization
      *
      * @return mixed Decoded data
      */
-    public static function decode($input)
+    public static function decode($input, $serialized = false)
     {
+        // use Base64 encoding to workaround issues with invalid
+        // or null characters in serialized string (#1489142)
+        if ($serialized) {
+            // Keep backward compatybility where base64 wasn't used
+            if (strpos(substr($input, 0, 16), ':') !== false) {
+                return self::decode(@unserialize($input));
+            }
+
+            return @unserialize(base64_decode($input));
+        }
+
         if (is_object($input)) {
             foreach (get_object_vars($input) as $idx => $value) {
                 $input->$idx = self::decode($value);
@@ -786,17 +856,26 @@ class rcube_db
     {
         $rcube = rcube::get_instance();
 
-        // return table name if configured
-        $config_key = 'db_table_'.$table;
-
-        if ($name = $rcube->config->get($config_key)) {
-            return $name;
+        // add prefix to the table name if configured
+        if ($prefix = $rcube->config->get('db_prefix')) {
+            return $prefix . $table;
         }
 
         return $table;
     }
 
     /**
+     * Set class option value
+     *
+     * @param string $name  Option name
+     * @param mixed  $value Option value
+     */
+    public function set_option($name, $value)
+    {
+        $this->options[$name] = $value;
+    }
+
+    /**
      * MDB2 DSN string parser
      *
      * @param string $sequence Secuence name
diff --git a/program/lib/Roundcube/rcube_db_mssql.php b/program/lib/Roundcube/rcube_db_mssql.php
index 84fe22bbc..3c1b9d71f 100644
--- a/program/lib/Roundcube/rcube_db_mssql.php
+++ b/program/lib/Roundcube/rcube_db_mssql.php
@@ -29,38 +29,52 @@ class rcube_db_mssql extends rcube_db
     public $db_provider = 'mssql';
 
     /**
-     * Driver initialization
+     * Object constructor
+     *
+     * @param string $db_dsnw DSN for read/write operations
+     * @param string $db_dsnr Optional DSN for read only operations
+     * @param bool   $pconn   Enables persistent connections
      */
-    protected function init()
+    public function __construct($db_dsnw, $db_dsnr = '', $pconn = false)
     {
+        parent::__construct($db_dsnw, $db_dsnr, $pconn);
+
         $this->options['identifier_start'] = '[';
         $this->options['identifier_end'] = ']';
     }
 
     /**
-     * Character setting
+     * Driver-specific configuration of database connection
+     *
+     * @param array $dsn DSN for DB connections
+     * @param PDO   $dbh Connection handler
      */
-    protected function set_charset($charset)
+    protected function conn_configure($dsn, $dbh)
     {
-        // UTF-8 is default
+        // Set date format in case of non-default language (#1488918)
+        $this->query("SET DATEFORMAT ymd");
     }
 
     /**
      * Return SQL function for current time and date
      *
+     * @param int $interval Optional interval (in seconds) to add/subtract
+     *
      * @return string SQL function to use in query
      */
-    public function now()
+    public function now($interval = 0)
     {
+        if ($interval) {
+            $interval = intval($interval);
+            return "dateadd(second, $interval, getdate())";
+        }
+
         return "getdate()";
     }
 
     /**
      * Return SQL statement to convert a field value into a unix timestamp
      *
-     * This method is deprecated and should not be used anymore due to limitations
-     * of timestamp functions in Mysql (year 2038 problem)
-     *
      * @param string $field Field name
      *
      * @return string SQL statement to use in query
@@ -100,26 +114,30 @@ class rcube_db_mssql extends rcube_db
     {
         $limit  = intval($limit);
         $offset = intval($offset);
+        $end    = $offset + $limit;
 
-        $orderby = stristr($query, 'ORDER BY');
-        if ($orderby !== false) {
-            $sort  = (stripos($orderby, ' desc') !== false) ? 'desc' : 'asc';
-            $order = str_ireplace('ORDER BY', '', $orderby);
-            $order = trim(preg_replace('/\bASC\b|\bDESC\b/i', '', $order));
+        // query without OFFSET
+        if (!$offset) {
+            $query = preg_replace('/^SELECT\s/i', "SELECT TOP $limit ", $query);
+            return $query;
         }
 
-        $query = preg_replace('/^SELECT\s/i', 'SELECT TOP ' . ($limit + $offset) . ' ', $query);
+        $orderby = stristr($query, 'ORDER BY');
+        $offset += 1;
 
-        $query = 'SELECT * FROM (SELECT TOP ' . $limit . ' * FROM (' . $query . ') AS inner_tbl';
         if ($orderby !== false) {
-            $query .= ' ORDER BY ' . $order . ' ';
-            $query .= (stripos($sort, 'asc') !== false) ? 'DESC' : 'ASC';
+            $query = trim(substr($query, 0, -1 * strlen($orderby)));
         }
-        $query .= ') AS outer_tbl';
-        if ($orderby !== false) {
-            $query .= ' ORDER BY ' . $order . ' ' . $sort;
+        else {
+            // it shouldn't happen, paging without sorting has not much sense
+            // @FIXME: I don't know how to build paging query without ORDER BY
+            $orderby = "ORDER BY 1";
         }
 
+        $query = preg_replace('/^SELECT\s/i', '', $query);
+        $query = "WITH paging AS (SELECT ROW_NUMBER() OVER ($orderby) AS [RowNumber], $query)"
+            . " SELECT * FROM paging WHERE [RowNumber] BETWEEN $offset AND $end ORDER BY [RowNumber]";
+
         return $query;
     }
 
diff --git a/program/lib/Roundcube/rcube_db_mysql.php b/program/lib/Roundcube/rcube_db_mysql.php
index 8ab6403c8..6fa5ad768 100644
--- a/program/lib/Roundcube/rcube_db_mysql.php
+++ b/program/lib/Roundcube/rcube_db_mysql.php
@@ -30,16 +30,40 @@ class rcube_db_mysql extends rcube_db
     public $db_provider = 'mysql';
 
     /**
-     * Driver initialization/configuration
+     * Object constructor
+     *
+     * @param string $db_dsnw DSN for read/write operations
+     * @param string $db_dsnr Optional DSN for read only operations
+     * @param bool   $pconn   Enables persistent connections
      */
-    protected function init()
+    public function __construct($db_dsnw, $db_dsnr = '', $pconn = false)
     {
+        if (version_compare(PHP_VERSION, '5.3.0', '<')) {
+            rcube::raise_error(array('code' => 600, 'type' => 'db',
+                'line' => __LINE__, 'file' => __FILE__,
+                'message' => "MySQL driver requires PHP >= 5.3, current version is " . PHP_VERSION),
+                true, true);
+        }
+
+        parent::__construct($db_dsnw, $db_dsnr, $pconn);
+
         // SQL identifiers quoting
         $this->options['identifier_start'] = '`';
         $this->options['identifier_end'] = '`';
     }
 
     /**
+     * Driver-specific configuration of database connection
+     *
+     * @param array $dsn DSN for DB connections
+     * @param PDO   $dbh Connection handler
+     */
+    protected function conn_configure($dsn, $dbh)
+    {
+        $this->query("SET NAMES 'utf8'");
+    }
+
+    /**
      * Abstract SQL statement for value concatenation
      *
      * @return string SQL statement to be used in query
@@ -127,7 +151,7 @@ class rcube_db_mysql extends rcube_db
         $result[PDO::MYSQL_ATTR_FOUND_ROWS] = true;
 
         // Enable AUTOCOMMIT mode (#1488902)
-        $dsn_options[PDO::ATTR_AUTOCOMMIT] = true;
+        $result[PDO::ATTR_AUTOCOMMIT] = true;
 
         return $result;
     }
@@ -147,7 +171,7 @@ class rcube_db_mysql extends rcube_db
 
             $result = $this->query('SHOW VARIABLES');
 
-            while ($sql_arr = $this->fetch_array($result)) {
+            while ($row = $this->fetch_array($result)) {
                 $this->variables[$row[0]] = $row[1];
             }
         }
diff --git a/program/lib/Roundcube/rcube_db_pgsql.php b/program/lib/Roundcube/rcube_db_pgsql.php
index cf23c5e48..d72c9d6b3 100644
--- a/program/lib/Roundcube/rcube_db_pgsql.php
+++ b/program/lib/Roundcube/rcube_db_pgsql.php
@@ -29,6 +29,17 @@ class rcube_db_pgsql extends rcube_db
     public $db_provider = 'postgres';
 
     /**
+     * Driver-specific configuration of database connection
+     *
+     * @param array $dsn DSN for DB connections
+     * @param PDO   $dbh Connection handler
+     */
+    protected function conn_configure($dsn, $dbh)
+    {
+        $this->query("SET NAMES 'utf8'");
+    }
+
+    /**
      * Get last inserted record ID
      *
      * @param string $table Table name (to find the incremented sequence)
@@ -53,19 +64,20 @@ class rcube_db_pgsql extends rcube_db
     /**
      * Return correct name for a specific database sequence
      *
-     * @param string $sequence Secuence name
+     * @param string $table Table name
      *
      * @return string Translated sequence name
      */
-    protected function sequence_name($sequence)
+    protected function sequence_name($table)
     {
-        $rcube = rcube::get_instance();
+        // Note: we support only one sequence per table
+        // Note: The sequence name must be <table_name>_seq
+        $sequence = $table . '_seq';
+        $rcube    = rcube::get_instance();
 
         // return sequence name if configured
-        $config_key = 'db_sequence_'.$sequence;
-
-        if ($name = $rcube->config->get($config_key)) {
-            return $name;
+        if ($prefix = $rcube->config->get('db_prefix')) {
+            return $prefix . $sequence;
         }
 
         return $sequence;
@@ -74,9 +86,6 @@ class rcube_db_pgsql extends rcube_db
     /**
      * Return SQL statement to convert a field value into a unix timestamp
      *
-     * This method is deprecated and should not be used anymore due to limitations
-     * of timestamp functions in Mysql (year 2038 problem)
-     *
      * @param string $field Field name
      *
      * @return string SQL statement to use in query
@@ -88,6 +97,24 @@ class rcube_db_pgsql extends rcube_db
     }
 
     /**
+     * Return SQL function for current time and date
+     *
+     * @param int $interval Optional interval (in seconds) to add/subtract
+     *
+     * @return string SQL function to use in query
+     */
+    public function now($interval = 0)
+    {
+        if ($interval) {
+            $add = ' ' . ($interval > 0 ? '+' : '-') . " interval '";
+            $add .= $interval > 0 ? intval($interval) : intval($interval) * -1;
+            $add .= " seconds'";
+        }
+
+        return "now()" . $add;
+    }
+
+    /**
      * Return SQL statement for case insensitive LIKE
      *
      * @param string $column Field name
@@ -129,4 +156,38 @@ class rcube_db_pgsql extends rcube_db
         return isset($this->variables[$varname]) ? $this->variables[$varname] : $default;
     }
 
+    /**
+     * Returns PDO DSN string from DSN array
+     *
+     * @param array $dsn DSN parameters
+     *
+     * @return string DSN string
+     */
+    protected function dsn_string($dsn)
+    {
+        $params = array();
+        $result = 'pgsql:';
+
+        if ($dsn['hostspec']) {
+            $params[] = 'host=' . $dsn['hostspec'];
+        }
+        else if ($dsn['socket']) {
+            $params[] = 'host=' . $dsn['socket'];
+        }
+
+        if ($dsn['port']) {
+            $params[] = 'port=' . $dsn['port'];
+        }
+
+        if ($dsn['database']) {
+            $params[] = 'dbname=' . $dsn['database'];
+        }
+
+        if (!empty($params)) {
+            $result .= implode(';', $params);
+        }
+
+        return $result;
+    }
+
 }
diff --git a/program/lib/Roundcube/rcube_db_sqlite.php b/program/lib/Roundcube/rcube_db_sqlite.php
index 145b8a371..b66c56097 100644
--- a/program/lib/Roundcube/rcube_db_sqlite.php
+++ b/program/lib/Roundcube/rcube_db_sqlite.php
@@ -29,13 +29,6 @@ class rcube_db_sqlite extends rcube_db
     public $db_provider = 'sqlite';
 
     /**
-     * Database character set
-     */
-    protected function set_charset($charset)
-    {
-    }
-
-    /**
      * Prepare connection
      */
     protected function conn_prepare($dsn)
@@ -56,10 +49,6 @@ class rcube_db_sqlite extends rcube_db
      */
     protected function conn_configure($dsn, $dbh)
     {
-        // we emulate via callback some missing functions
-        $dbh->sqliteCreateFunction('unix_timestamp', array('rcube_db_sqlite', 'sqlite_unix_timestamp'), 1);
-        $dbh->sqliteCreateFunction('now', array('rcube_db_sqlite', 'sqlite_now'), 0);
-
         // Initialize database structure in file is empty
         if (!empty($dsn['database']) && !filesize($dsn['database'])) {
             $data = file_get_contents(RCUBE_INSTALL_PATH . 'SQL/sqlite.initial.sql');
@@ -83,30 +72,32 @@ class rcube_db_sqlite extends rcube_db
     }
 
     /**
-     * Callback for sqlite: unix_timestamp()
+     * Return SQL statement to convert a field value into a unix timestamp
+     *
+     * @param string $field Field name
+     *
+     * @return string  SQL statement to use in query
+     * @deprecated
      */
-    public static function sqlite_unix_timestamp($timestamp = '')
+    public function unixtimestamp($field)
     {
-        $timestamp = trim($timestamp);
-        if (!$timestamp) {
-            $ret = time();
-        }
-        else if (!preg_match('/^[0-9]+$/s', $timestamp)) {
-            $ret = strtotime($timestamp);
-        }
-        else {
-            $ret = $timestamp;
-        }
-
-        return $ret;
+        return "strftime('%s', $field)";
     }
 
     /**
-     * Callback for sqlite: now()
+     * Return SQL function for current time and date
+     *
+     * @param int $interval Optional interval (in seconds) to add/subtract
+     *
+     * @return string SQL function to use in query
      */
-    public static function sqlite_now()
+    public function now($interval = 0)
     {
-        return date("Y-m-d H:i:s");
+        if ($interval) {
+            $add = ($interval > 0 ? '+' : '') . intval($interval) . ' seconds';
+        }
+
+        return "datetime('now'" . ($add ? ",'$add'" : "") . ")";
     }
 
     /**
diff --git a/program/lib/Roundcube/rcube_db_sqlsrv.php b/program/lib/Roundcube/rcube_db_sqlsrv.php
index e69678025..45c41cdaf 100644
--- a/program/lib/Roundcube/rcube_db_sqlsrv.php
+++ b/program/lib/Roundcube/rcube_db_sqlsrv.php
@@ -29,29 +29,46 @@ class rcube_db_sqlsrv extends rcube_db
     public $db_provider = 'mssql';
 
     /**
-     * Driver initialization
+     * Object constructor
+     *
+     * @param string $db_dsnw DSN for read/write operations
+     * @param string $db_dsnr Optional DSN for read only operations
+     * @param bool   $pconn   Enables persistent connections
      */
-    protected function init()
+    public function __construct($db_dsnw, $db_dsnr = '', $pconn = false)
     {
+        parent::__construct($db_dsnw, $db_dsnr, $pconn);
+
         $this->options['identifier_start'] = '[';
         $this->options['identifier_end'] = ']';
     }
 
     /**
-     * Database character set setting
+     * Driver-specific configuration of database connection
+     *
+     * @param array $dsn DSN for DB connections
+     * @param PDO   $dbh Connection handler
      */
-    protected function set_charset($charset)
+    protected function conn_configure($dsn, $dbh)
     {
-        // UTF-8 is default
+        // Set date format in case of non-default language (#1488918)
+        $this->query("SET DATEFORMAT ymd");
     }
 
     /**
      * Return SQL function for current time and date
      *
+     * @param int $interval Optional interval (in seconds) to add/subtract
+     *
      * @return string SQL function to use in query
      */
-    public function now()
+    public function now($interval = 0)
     {
+        if ($interval) {
+            $interval = intval($interval);
+            return "dateadd(second, $interval, getdate())";
+        }
+
         return "getdate()";
     }
 
@@ -100,26 +117,30 @@ class rcube_db_sqlsrv extends rcube_db
     {
         $limit  = intval($limit);
         $offset = intval($offset);
+        $end    = $offset + $limit;
 
-        $orderby = stristr($query, 'ORDER BY');
-        if ($orderby !== false) {
-            $sort  = (stripos($orderby, ' desc') !== false) ? 'desc' : 'asc';
-            $order = str_ireplace('ORDER BY', '', $orderby);
-            $order = trim(preg_replace('/\bASC\b|\bDESC\b/i', '', $order));
+        // query without OFFSET
+        if (!$offset) {
+            $query = preg_replace('/^SELECT\s/i', "SELECT TOP $limit ", $query);
+            return $query;
         }
 
-        $query = preg_replace('/^SELECT\s/i', 'SELECT TOP ' . ($limit + $offset) . ' ', $query);
+        $orderby = stristr($query, 'ORDER BY');
+        $offset += 1;
 
-        $query = 'SELECT * FROM (SELECT TOP ' . $limit . ' * FROM (' . $query . ') AS inner_tbl';
         if ($orderby !== false) {
-            $query .= ' ORDER BY ' . $order . ' ';
-            $query .= (stripos($sort, 'asc') !== false) ? 'DESC' : 'ASC';
+            $query = trim(substr($query, 0, -1 * strlen($orderby)));
         }
-        $query .= ') AS outer_tbl';
-        if ($orderby !== false) {
-            $query .= ' ORDER BY ' . $order . ' ' . $sort;
+        else {
+            // it shouldn't happen, paging without sorting has not much sense
+            // @FIXME: I don't know how to build paging query without ORDER BY
+            $orderby = "ORDER BY 1";
         }
 
+        $query = preg_replace('/^SELECT\s/i', '', $query);
+        $query = "WITH paging AS (SELECT ROW_NUMBER() OVER ($orderby) AS [RowNumber], $query)"
+            . " SELECT * FROM paging WHERE [RowNumber] BETWEEN $offset AND $end ORDER BY [RowNumber]";
+
         return $query;
     }
 
diff --git a/program/lib/Roundcube/rcube_enriched.php b/program/lib/Roundcube/rcube_enriched.php
index 8c628c912..12deb33ce 100644
--- a/program/lib/Roundcube/rcube_enriched.php
+++ b/program/lib/Roundcube/rcube_enriched.php
@@ -118,7 +118,7 @@ class rcube_enriched
             $quoted = '';
             $lines  = explode('<br>', $a[2]);
 
-            foreach ($lines as $n => $line)
+            foreach ($lines as $line)
                 $quoted .= '&gt;'.$line.'<br>';
 
             $body = $a[1].'<span class="quotes">'.$quoted.'</span>'.$a[3];
diff --git a/program/lib/Roundcube/rcube_html2text.php b/program/lib/Roundcube/rcube_html2text.php
index 3d32fe766..9b248a3a8 100644
--- a/program/lib/Roundcube/rcube_html2text.php
+++ b/program/lib/Roundcube/rcube_html2text.php
@@ -597,9 +597,16 @@ class rcube_html2text
                     // get blockquote content
                     $body = trim(substr($text, $startpos, $end - $startpos));
 
+                    // adjust text wrapping width
+                    $p_width = $this->width;
+                    if ($this->width > 0) $this->width -= 2;
+
                     // replace content with inner blockquotes
                     $this->_converter($body);
 
+                    // resore text width
+                    $this->width = $p_width;
+
                     // Add citation markers and create <pre> block
                     $body = preg_replace_callback('/((?:^|\n)>*)([^\n]*)/', array($this, 'blockquote_citation_ballback'), trim($body));
                     $body = '<pre>' . htmlspecialchars($body) . '</pre>';
diff --git a/program/lib/Roundcube/rcube_image.php b/program/lib/Roundcube/rcube_image.php
index 9695022da..09bb4e81b 100644
--- a/program/lib/Roundcube/rcube_image.php
+++ b/program/lib/Roundcube/rcube_image.php
@@ -77,7 +77,8 @@ class rcube_image
     }
 
     /**
-     * Resize image to a given size
+     * Resize image to a given size. Use only to shrink an image.
+     * If an image is smaller than specified size it will be not resized.
      *
      * @param int    $size      Max width/height size
      * @param string $filename  Output filename
@@ -92,6 +93,10 @@ class rcube_image
         $convert = $rcube->config->get('im_convert_path', false);
         $props   = $this->props();
 
+        if (empty($props)) {
+            return false;
+        }
+
         if (!$filename) {
             $filename = $this->image_file;
         }
@@ -123,6 +128,7 @@ class rcube_image
             }
 
             if ($result === '') {
+                @chmod($filename, 0600);
                 return $type;
             }
         }
@@ -131,19 +137,34 @@ class rcube_image
         if ($props['gd_type']) {
             if ($props['gd_type'] == IMAGETYPE_JPEG && function_exists('imagecreatefromjpeg')) {
                 $image = imagecreatefromjpeg($this->image_file);
+                $type  = 'jpg';
             }
             else if($props['gd_type'] == IMAGETYPE_GIF && function_exists('imagecreatefromgif')) {
                 $image = imagecreatefromgif($this->image_file);
+                $type  = 'gid';
             }
             else if($props['gd_type'] == IMAGETYPE_PNG && function_exists('imagecreatefrompng')) {
                 $image = imagecreatefrompng($this->image_file);
+                $type  = 'png';
             }
             else {
                 // @TODO: print error to the log?
                 return false;
             }
 
-            $scale  = $size / max($props['width'], $props['height']);
+            if ($image === false) {
+                return false;
+            }
+
+            $scale = $size / max($props['width'], $props['height']);
+
+            // Imagemagick resize is implemented in shrinking mode (see -resize argument above)
+            // we do the same here, if an image is smaller than specified size
+            // we do nothing but copy original file to destination file
+            if ($scale > 1) {
+                return $this->image_file == $filename || copy($this->image_file, $filename) ? $type : false;
+            }
+
             $width  = $props['width']  * $scale;
             $height = $props['height'] * $scale;
 
@@ -162,18 +183,16 @@ class rcube_image
 
             if ($props['gd_type'] == IMAGETYPE_JPEG) {
                 $result = imagejpeg($image, $filename, 75);
-                $type = 'jpg';
             }
             elseif($props['gd_type'] == IMAGETYPE_GIF) {
                 $result = imagegif($image, $filename);
-                $type = 'gid';
             }
             elseif($props['gd_type'] == IMAGETYPE_PNG) {
                 $result = imagepng($image, $filename, 6, PNG_ALL_FILTERS);
-                $type = 'png';
             }
 
             if ($result) {
+                @chmod($filename, 0600);
                 return $type;
             }
         }
@@ -214,6 +233,7 @@ class rcube_image
             $result = rcube::exec($convert . ' 2>&1 -colorspace RGB -quality 75 {in} {type}:{out}', $p);
 
             if ($result === '') {
+                @chmod($filename, 0600);
                 return true;
             }
         }
@@ -245,6 +265,11 @@ class rcube_image
             else if ($type == self::TYPE_PNG) {
                 $result = imagepng($image, $filename, 6, PNG_ALL_FILTERS);
             }
+
+            if ($result) {
+                @chmod($filename, 0600);
+                return true;
+            }
         }
 
         // @TODO: print error to the log?
diff --git a/program/lib/Roundcube/rcube_imap.php b/program/lib/Roundcube/rcube_imap.php
index 74c1f5324..3ca8a07c9 100644
--- a/program/lib/Roundcube/rcube_imap.php
+++ b/program/lib/Roundcube/rcube_imap.php
@@ -308,14 +308,7 @@ class rcube_imap extends rcube_storage
      */
     public function set_folder($folder)
     {
-        if ($this->folder == $folder) {
-            return;
-        }
-
         $this->folder = $folder;
-
-        // clear messagecount cache for this folder
-        $this->clear_messagecount($folder);
     }
 
 
@@ -626,7 +619,7 @@ class rcube_imap extends rcube_storage
         }
 
         if ($mode == 'THREADS') {
-            $res   = $this->fetch_threads($folder, $force);
+            $res   = $this->threads($folder);
             $count = $res->count();
 
             if ($status) {
@@ -656,11 +649,11 @@ class rcube_imap extends rcube_storage
                     $keys[] = 'ALL';
                 }
                 if ($status) {
-                    $keys[]   = 'MAX';
+                    $keys[] = 'MAX';
                 }
             }
 
-            // @TODO: if $force==false && $mode == 'ALL' we could try to use cache index here
+            // @TODO: if $mode == 'ALL' we could try to use cache index here
 
             // get message count using (E)SEARCH
             // not very performant but more precise (using UNDELETED)
@@ -791,7 +784,7 @@ class rcube_imap extends rcube_storage
             $threads = $mcache->get_thread($folder);
         }
         else {
-            $threads = $this->fetch_threads($folder);
+            $threads = $this->threads($folder);
         }
 
         return $this->fetch_thread_headers($folder, $threads, $page, $slice);
@@ -800,32 +793,47 @@ class rcube_imap extends rcube_storage
     /**
      * Method for fetching threads data
      *
-     * @param  string $folder  Folder name
-     * @param  bool   $force   Use IMAP server, no cache
+     * @param  string $folder Folder name
      *
      * @return rcube_imap_thread Thread data object
      */
-    function fetch_threads($folder, $force = false)
+    function threads($folder)
     {
-        if (!$force && ($mcache = $this->get_mcache_engine())) {
+        if ($mcache = $this->get_mcache_engine()) {
             // don't store in self's internal cache, cache has it's own internal cache
             return $mcache->get_thread($folder);
         }
 
-        if (empty($this->icache['threads'])) {
-            if (!$this->check_connection()) {
-                return new rcube_result_thread();
+        if (!empty($this->icache['threads'])) {
+            if ($this->icache['threads']->get_parameters('MAILBOX') == $folder) {
+                return $this->icache['threads'];
             }
+        }
+
+        // get all threads
+        $result = $this->threads_direct($folder);
+
+        // add to internal (fast) cache
+        return $this->icache['threads'] = $result;
+    }
 
-            // get all threads
-            $result = $this->conn->thread($folder, $this->threading,
-                $this->options['skip_deleted'] ? 'UNDELETED' : '', true);
 
-            // add to internal (fast) cache
-            $this->icache['threads'] = $result;
+    /**
+     * Method for direct fetching of threads data
+     *
+     * @param  string $folder Folder name
+     *
+     * @return rcube_imap_thread Thread data object
+     */
+    function threads_direct($folder)
+    {
+        if (!$this->check_connection()) {
+            return new rcube_result_thread();
         }
 
-        return $this->icache['threads'];
+        // get all threads
+        return $this->conn->thread($folder, $this->threading,
+            $this->options['skip_deleted'] ? 'UNDELETED' : '', true);
     }
 
 
@@ -981,7 +989,7 @@ class rcube_imap extends rcube_storage
             // use memory less expensive (and quick) method for big result set
             $index = clone $this->index('', $this->sort_field, $this->sort_order);
             // get messages uids for one page...
-            $index->slice($start_msg, min($cnt-$from, $this->page_size));
+            $index->slice($from, min($cnt-$from, $this->page_size));
 
             if ($slice) {
                 $index->slice(-$slice, $slice);
@@ -1096,16 +1104,17 @@ class rcube_imap extends rcube_storage
 
 
     /**
-     * Returns current status of folder
+     * Returns current status of a folder (compared to the last time use)
      *
      * We compare the maximum UID to determine the number of
      * new messages because the RECENT flag is not reliable.
      *
      * @param string $folder Folder name
+     * @param array  $diff   Difference data
      *
-     * @return int   Folder status
+     * @return int Folder status
      */
-    public function folder_status($folder = null)
+    public function folder_status($folder = null, &$diff = array())
     {
         if (!strlen($folder)) {
             $folder = $this->folder;
@@ -1126,6 +1135,9 @@ class rcube_imap extends rcube_storage
         // got new messages
         if ($new['maxuid'] > $old['maxuid']) {
             $result += 1;
+            // get new message UIDs range, that can be used for example
+            // to get the data of these messages
+            $diff['new'] = ($old['maxuid'] + 1 < $new['maxuid'] ? ($old['maxuid']+1).':' : '') . $new['maxuid'];
         }
         // some messages has been deleted
         if ($new['cnt'] < $old['cnt']) {
@@ -1176,12 +1188,13 @@ class rcube_imap extends rcube_storage
      * @param string $folder     Folder to get index from
      * @param string $sort_field Sort column
      * @param string $sort_order Sort order [ASC, DESC]
+     * @param bool   $no_threads Get not threaded index
      *
      * @return rcube_result_index|rcube_result_thread List of messages (UIDs)
      */
-    public function index($folder = '', $sort_field = NULL, $sort_order = NULL)
+    public function index($folder = '', $sort_field = NULL, $sort_order = NULL, $no_threads = false)
     {
-        if ($this->threading) {
+        if (!$no_threads && $this->threading) {
             return $this->thread_index($folder, $sort_field, $sort_order);
         }
 
@@ -1240,17 +1253,13 @@ class rcube_imap extends rcube_storage
      * @param string $folder     Folder to get index from
      * @param string $sort_field Sort column
      * @param string $sort_order Sort order [ASC, DESC]
-     * @param bool   $skip_cache Disables cache usage
      *
      * @return rcube_result_index Sorted list of message UIDs
      */
-    public function index_direct($folder, $sort_field = null, $sort_order = null, $skip_cache = true)
+    public function index_direct($folder, $sort_field = null, $sort_order = null)
     {
-        if (!$skip_cache && ($mcache = $this->get_mcache_engine())) {
-            $index = $mcache->get_index($folder, $sort_field, $sort_order);
-        }
         // use message index sort as default sorting
-        else if (!$sort_field) {
+        if (!$sort_field) {
             // use search result from count() if possible
             if ($this->options['skip_deleted'] && !empty($this->icache['undeleted_idx'])
                 && $this->icache['undeleted_idx']->get_parameters('ALL') !== null
@@ -1311,7 +1320,7 @@ class rcube_imap extends rcube_storage
         }
         else {
             // get all threads (default sort order)
-            $threads = $this->fetch_threads($folder);
+            $threads = $this->threads($folder);
         }
 
         $this->set_sort_order($sort_field, $sort_order);
@@ -1322,9 +1331,10 @@ class rcube_imap extends rcube_storage
 
 
     /**
-     * Sort threaded result, using THREAD=REFS method
+     * Sort threaded result, using THREAD=REFS method if available.
+     * If not, use any method and re-sort the result in THREAD=REFS way.
      *
-     * @param rcube_result_thread $threads  Threads result set
+     * @param rcube_result_thread $threads Threads result set
      */
     protected function sort_threads($threads)
     {
@@ -1336,17 +1346,16 @@ class rcube_imap extends rcube_storage
         // THREAD=REFERENCES:     sorting by sent date of root message
         // THREAD=REFS:           sorting by the most recent date in each thread
 
-        if ($this->sort_field && ($this->sort_field != 'date' || $this->get_capability('THREAD') != 'REFS')) {
-            $index = $this->index_direct($this->folder, $this->sort_field, $this->sort_order, false);
+        if ($this->get_capability('THREAD') != 'REFS') {
+            $sortby = $this->sort_field ? $this->sort_field : 'date';
+            $index  = $this->index($this->folder, $sortby, $this->sort_order, true);
 
             if (!$index->is_empty()) {
                 $threads->sort($index);
             }
         }
-        else {
-            if ($this->sort_order != $threads->get_parameters('ORDER')) {
-                $threads->revert();
-            }
+        else if ($this->sort_order != $threads->get_parameters('ORDER')) {
+            $threads->revert();
         }
     }
 
@@ -1419,8 +1428,6 @@ class rcube_imap extends rcube_storage
      */
     protected function search_index($folder, $criteria='ALL', $charset=NULL, $sort_field=NULL)
     {
-        $orig_criteria = $criteria;
-
         if (!$this->check_connection()) {
             if ($this->threading) {
                 return new rcube_result_thread();
@@ -1634,9 +1641,15 @@ class rcube_imap extends rcube_storage
         // Example of structure for malformed MIME message:
         // ("text" "plain" NIL NIL NIL "7bit" 2154 70 NIL NIL NIL)
         if ($headers->ctype && !is_array($structure[0]) && $headers->ctype != 'text/plain'
-            && strtolower($structure[0].'/'.$structure[1]) == 'text/plain') {
+            && strtolower($structure[0].'/'.$structure[1]) == 'text/plain'
+        ) {
+            // A special known case "Content-type: text" (#1488968)
+            if ($headers->ctype == 'text') {
+                $structure[1]   = 'plain';
+                $headers->ctype = 'text/plain';
+            }
             // we can handle single-part messages, by simple fix in structure (#1486898)
-            if (preg_match('/^(text|application)\/(.*)/', $headers->ctype, $m)) {
+            else if (preg_match('/^(text|application)\/(.*)/', $headers->ctype, $m)) {
                 $structure[0] = $m[1];
                 $structure[1] = $m[2];
             }
@@ -1660,11 +1673,21 @@ class rcube_imap extends rcube_storage
             $struct = $this->structure_part($structure, 0, '', $headers);
         }
 
-        // don't trust given content-type
-        if (empty($struct->parts) && !empty($headers->ctype)) {
-            $struct->mime_id = '1';
-            $struct->mimetype = strtolower($headers->ctype);
-            list($struct->ctype_primary, $struct->ctype_secondary) = explode('/', $struct->mimetype);
+        // some workarounds on simple messages...
+        if (empty($struct->parts)) {
+            // ...don't trust given content-type
+            if (!empty($headers->ctype)) {
+                $struct->mime_id  = '1';
+                $struct->mimetype = strtolower($headers->ctype);
+                list($struct->ctype_primary, $struct->ctype_secondary) = explode('/', $struct->mimetype);
+            }
+
+            // ...and charset (there's a case described in #1488968 where invalid content-type
+            // results in invalid charset in BODYSTRUCTURE)
+            if (!empty($headers->charset) && $headers->charset != $struct->ctype_parameters['charset']) {
+                $struct->charset                     = $headers->charset;
+                $struct->ctype_parameters['charset'] = $headers->charset;
+            }
         }
 
         $headers->structure = $struct;
@@ -2317,10 +2340,7 @@ class rcube_imap extends rcube_storage
         // move messages
         $moved = $this->conn->move($uids, $from_mbox, $to_mbox);
 
-        // send expunge command in order to have the moved message
-        // really deleted from the source folder
         if ($moved) {
-            $this->expunge_message($uids, $from_mbox, false);
             $this->clear_messagecount($from_mbox);
             $this->clear_messagecount($to_mbox);
         }
@@ -2710,7 +2730,7 @@ class rcube_imap extends rcube_storage
 
         // filter folders list according to rights requirements
         if ($rights && $this->get_capability('ACL')) {
-            $a_folders = $this->filter_rights($a_folders, $rights);
+            $a_mboxes = $this->filter_rights($a_mboxes, $rights);
         }
 
         // filter folders and sort them
@@ -2766,7 +2786,6 @@ class rcube_imap extends rcube_storage
      */
     private function list_folders_update(&$result, $type = null)
     {
-        $delim     = $this->get_hierarchy_delimiter();
         $namespace = $this->get_namespace();
         $search    = array();
 
@@ -3355,7 +3374,6 @@ class rcube_imap extends rcube_storage
     {
         if (!empty($this->options['fetch_headers'])) {
             $headers = explode(' ', $this->options['fetch_headers']);
-            $headers = array_map('strtoupper', $headers);
         }
         else {
             $headers = array();
@@ -3365,7 +3383,7 @@ class rcube_imap extends rcube_storage
             $headers = array_merge($headers, $this->all_headers);
         }
 
-        return implode(' ', array_unique($headers));
+        return $headers;
     }
 
 
@@ -3678,7 +3696,7 @@ class rcube_imap extends rcube_storage
     {
         if ($this->caching && !$this->cache) {
             $rcube = rcube::get_instance();
-            $ttl = $rcube->config->get('message_cache_lifetime', '10d');
+            $ttl   = $rcube->config->get('imap_cache_ttl', '10d');
             $this->cache = $rcube->get_cache('IMAP', $this->caching, $ttl);
         }
 
@@ -3726,21 +3744,6 @@ class rcube_imap extends rcube_storage
         }
     }
 
-    /**
-     * Delete outdated cache entries
-     */
-    public function expunge_cache()
-    {
-        if ($this->mcache) {
-            $ttl = rcube::get_instance()->config->get('message_cache_lifetime', '10d');
-            $this->mcache->expunge($ttl);
-        }
-
-        if ($this->cache) {
-            $this->cache->expunge();
-        }
-    }
-
 
     /* --------------------------------
      *   message caching methods
@@ -3774,8 +3777,9 @@ class rcube_imap extends rcube_storage
         if ($this->messages_caching && !$this->mcache) {
             $rcube = rcube::get_instance();
             if (($dbh = $rcube->get_dbh()) && ($userid = $rcube->get_user_id())) {
+                $ttl = $rcube->config->get('messages_cache_ttl', '10d');
                 $this->mcache = new rcube_imap_cache(
-                    $dbh, $this, $userid, $this->options['skip_deleted']);
+                    $dbh, $this, $userid, $this->options['skip_deleted'], $ttl);
             }
         }
 
@@ -3797,6 +3801,15 @@ class rcube_imap extends rcube_storage
     }
 
 
+    /**
+     * Delete outdated cache entries
+     */
+    function cache_gc()
+    {
+        rcube_imap_cache::gc();
+    }
+
+
     /* --------------------------------
      *         protected methods
      * --------------------------------*/
@@ -3830,7 +3843,7 @@ class rcube_imap extends rcube_storage
         $delimiter = $this->get_hierarchy_delimiter();
 
         // find default folders and skip folders starting with '.'
-        foreach ($a_folders as $i => $folder) {
+        foreach ($a_folders as $folder) {
             if ($folder[0] == '.') {
                 continue;
             }
@@ -4090,9 +4103,9 @@ class rcube_imap extends rcube_storage
         return $this->index($folder, $sort_field, $sort_order);
     }
 
-    public function message_index_direct($folder, $sort_field = null, $sort_order = null, $skip_cache = true)
+    public function message_index_direct($folder, $sort_field = null, $sort_order = null)
     {
-        return $this->index_direct($folder, $sort_field, $sort_order, $skip_cache);
+        return $this->index_direct($folder, $sort_field, $sort_order);
     }
 
     public function list_mailboxes($root='', $name='*', $filter=null, $rights=null, $skip_sort=false)
diff --git a/program/lib/Roundcube/rcube_imap_cache.php b/program/lib/Roundcube/rcube_imap_cache.php
index f33ac076c..061ac546d 100644
--- a/program/lib/Roundcube/rcube_imap_cache.php
+++ b/program/lib/Roundcube/rcube_imap_cache.php
@@ -49,6 +49,13 @@ class rcube_imap_cache
     private $userid;
 
     /**
+     * Expiration time in seconds
+     *
+     * @var int
+     */
+    private $ttl;
+
+    /**
      * Internal (in-memory) cache
      *
      * @var array
@@ -83,13 +90,25 @@ class rcube_imap_cache
 
     /**
      * Object constructor.
+     *
+     * @param rcube_db   $db           DB handler
+     * @param rcube_imap $imap         IMAP handler
+     * @param int        $userid       User identifier
+     * @param bool       $skip_deleted skip_deleted flag
+     * @param string     $ttl          Expiration time of memcache/apc items
+     *
      */
-    function __construct($db, $imap, $userid, $skip_deleted)
+    function __construct($db, $imap, $userid, $skip_deleted, $ttl=0)
     {
+        // convert ttl string to seconds
+        $ttl = get_offset_sec($ttl);
+        if ($ttl > 2592000) $ttl = 2592000;
+
         $this->db           = $db;
         $this->imap         = $imap;
         $this->userid       = $userid;
         $this->skip_deleted = $skip_deleted;
+        $this->ttl          = $ttl;
     }
 
 
@@ -215,9 +234,7 @@ class rcube_imap_cache
      * Return messages thread.
      * If threaded index doesn't exist or is invalid, will be updated.
      *
-     * @param string  $mailbox     Folder name
-     * @param string  $sort_field  Sorting column
-     * @param string  $sort_order  Sorting order (ASC|DESC)
+     * @param string $mailbox Folder name
      *
      * @return array Messages threaded index
      */
@@ -256,19 +273,11 @@ class rcube_imap_cache
         if ($index === null) {
             // Get mailbox data (UIDVALIDITY, counters, etc.) for status check
             $mbox_data = $this->imap->folder_data($mailbox);
-
-            if ($mbox_data['EXISTS']) {
-                // get all threads (default sort order)
-                $threads = $this->imap->fetch_threads($mailbox, true);
-            }
-            else {
-                $threads = new rcube_result_thread($mailbox, '* THREAD');
-            }
-
-            $index['object'] = $threads;
+            // Get THREADS result
+            $index['object'] = $this->get_thread_data($mailbox, $mbox_data);
 
             // insert/update
-            $this->add_thread_row($mailbox, $threads, $mbox_data, $exists);
+            $this->add_thread_row($mailbox, $index['object'], $mbox_data, $exists);
         }
 
         $this->icache[$mailbox]['thread'] = $index;
@@ -407,8 +416,8 @@ class rcube_imap_cache
             return;
         }
 
-        $msg   = serialize($this->db->encode(clone $message));
         $flags = 0;
+        $msg   = clone $message;
 
         if (!empty($message->flags)) {
             foreach ($this->flags as $idx => $flag) {
@@ -417,30 +426,49 @@ class rcube_imap_cache
                 }
             }
         }
+
         unset($msg->flags);
+        $msg = $this->db->encode($msg, true);
 
         // update cache record (even if it exists, the update
         // here will work as select, assume row exist if affected_rows=0)
         if (!$force) {
             $res = $this->db->query(
                 "UPDATE ".$this->db->table_name('cache_messages')
-                ." SET flags = ?, data = ?, changed = ".$this->db->now()
+                ." SET flags = ?, data = ?, expires = " . ($this->ttl ? $this->db->now($this->ttl) : 'NULL')
                 ." WHERE user_id = ?"
                     ." AND mailbox = ?"
                     ." AND uid = ?",
                 $flags, $msg, $this->userid, $mailbox, (int) $message->uid);
 
-            if ($this->db->affected_rows()) {
+            if ($this->db->affected_rows($res)) {
                 return;
             }
         }
 
+        $this->db->set_option('ignore_key_errors', true);
+
         // insert new record
-        $this->db->query(
+        $res = $this->db->query(
             "INSERT INTO ".$this->db->table_name('cache_messages')
-            ." (user_id, mailbox, uid, flags, changed, data)"
-            ." VALUES (?, ?, ?, ?, ".$this->db->now().", ?)",
+            ." (user_id, mailbox, uid, flags, expires, data)"
+            ." VALUES (?, ?, ?, ?, ". ($this->ttl ? $this->db->now($this->ttl) : 'NULL') . ", ?)",
             $this->userid, $mailbox, (int) $message->uid, $flags, $msg);
+
+        // race-condition, insert failed so try update (#1489146)
+        // thanks to ignore_key_errors "duplicate row" errors will be ignored
+        if ($force && !$res && !$this->db->is_error($res)) {
+            $this->db->query(
+                "UPDATE ".$this->db->table_name('cache_messages')
+                ." SET expires = " . ($this->ttl ? $this->db->now($this->ttl) : 'NULL')
+                    .", flags = ?, data = ?"
+                ." WHERE user_id = ?"
+                    ." AND mailbox = ?"
+                    ." AND uid = ?",
+                $flags, $msg, $this->userid, $mailbox, (int) $message->uid);
+        }
+
+        $this->db->set_option('ignore_key_errors', false);
     }
 
 
@@ -481,11 +509,11 @@ class rcube_imap_cache
 
         $this->db->query(
             "UPDATE ".$this->db->table_name('cache_messages')
-            ." SET changed = ".$this->db->now()
+            ." SET expires = ". ($this->ttl ? $this->db->now($this->ttl) : 'NULL')
             .", flags = flags ".($enabled ? "+ $idx" : "- $idx")
             ." WHERE user_id = ?"
                 ." AND mailbox = ?"
-                .($uids !== null ? " AND uid IN (".$this->db->array2list($uids, 'integer').")" : "")
+                .(!empty($uids) ? " AND uid IN (".$this->db->array2list($uids, 'integer').")" : "")
                 ." AND (flags & $idx) ".($enabled ? "= 0" : "= $idx"),
             $this->userid, $mailbox);
     }
@@ -604,23 +632,21 @@ class rcube_imap_cache
 
 
     /**
-     * Delete cache entries older than TTL
-     *
-     * @param string $ttl  Lifetime of message cache entries
+     * Delete expired cache entries
      */
-    function expunge($ttl)
+    static function gc()
     {
-        // get expiration timestamp
-        $ts = get_offset_time($ttl, -1);
+        $rcube = rcube::get_instance();
+        $db    = $rcube->get_dbh();
 
-        $this->db->query("DELETE FROM ".$this->db->table_name('cache_messages')
-              ." WHERE changed < " . $this->db->fromunixtime($ts));
+        $db->query("DELETE FROM ".$db->table_name('cache_messages')
+              ." WHERE expires < " . $db->now());
 
-        $this->db->query("DELETE FROM ".$this->db->table_name('cache_index')
-              ." WHERE changed < " . $this->db->fromunixtime($ts));
+        $db->query("DELETE FROM ".$db->table_name('cache_index')
+              ." WHERE expires < " . $db->now());
 
-        $this->db->query("DELETE FROM ".$this->db->table_name('cache_thread')
-              ." WHERE changed < " . $this->db->fromunixtime($ts));
+        $db->query("DELETE FROM ".$db->table_name('cache_thread')
+              ." WHERE expires < " . $db->now());
     }
 
 
@@ -639,7 +665,7 @@ class rcube_imap_cache
 
         if ($sql_arr = $this->db->fetch_assoc($sql_result)) {
             $data  = explode('@', $sql_arr['data']);
-            $index = @unserialize($data[0]);
+            $index = $this->db->decode($data[0], true);
             unset($data[0]);
 
             if (empty($index)) {
@@ -676,7 +702,7 @@ class rcube_imap_cache
 
         if ($sql_arr = $this->db->fetch_assoc($sql_result)) {
             $data   = explode('@', $sql_arr['data']);
-            $thread = @unserialize($data[0]);
+            $thread = $this->db->decode($data[0], true);
             unset($data[0]);
 
             if (empty($thread)) {
@@ -702,7 +728,7 @@ class rcube_imap_cache
         $data, $mbox_data = array(), $exists = false, $modseq = null)
     {
         $data = array(
-            serialize($data),
+            $this->db->encode($data, true),
             $sort_field,
             (int) $this->skip_deleted,
             (int) $mbox_data['UIDVALIDITY'],
@@ -712,20 +738,38 @@ class rcube_imap_cache
         $data = implode('@', $data);
 
         if ($exists) {
-            $sql_result = $this->db->query(
+            $res = $this->db->query(
                 "UPDATE ".$this->db->table_name('cache_index')
-                ." SET data = ?, valid = 1, changed = ".$this->db->now()
+                ." SET data = ?, valid = 1, expires = " . ($this->ttl ? $this->db->now($this->ttl) : 'NULL')
                 ." WHERE user_id = ?"
                     ." AND mailbox = ?",
                 $data, $this->userid, $mailbox);
+
+            if ($this->db->affected_rows($res)) {
+                return;
+            }
         }
-        else {
-            $sql_result = $this->db->query(
-                "INSERT INTO ".$this->db->table_name('cache_index')
-                ." (user_id, mailbox, data, valid, changed)"
-                ." VALUES (?, ?, ?, 1, ".$this->db->now().")",
-                $this->userid, $mailbox, $data);
+
+        $this->db->set_option('ignore_key_errors', true);
+
+        $res = $this->db->query(
+            "INSERT INTO ".$this->db->table_name('cache_index')
+            ." (user_id, mailbox, valid, expires, data)"
+            ." VALUES (?, ?, 1, ". ($this->ttl ? $this->db->now($this->ttl) : 'NULL') .", ?)",
+            $this->userid, $mailbox, $data);
+
+        // race-condition, insert failed so try update (#1489146)
+        // thanks to ignore_key_errors "duplicate row" errors will be ignored
+        if (!$exists && !$res && !$this->db->is_error($res)) {
+            $res = $this->db->query(
+                "UPDATE ".$this->db->table_name('cache_index')
+                ." SET data = ?, valid = 1, expires = " . ($this->ttl ? $this->db->now($this->ttl) : 'NULL')
+                ." WHERE user_id = ?"
+                    ." AND mailbox = ?",
+                $data, $this->userid, $mailbox);
         }
+
+        $this->db->set_option('ignore_key_errors', false);
     }
 
 
@@ -735,28 +779,48 @@ class rcube_imap_cache
     private function add_thread_row($mailbox, $data, $mbox_data = array(), $exists = false)
     {
         $data = array(
-            serialize($data),
+            $this->db->encode($data, true),
             (int) $this->skip_deleted,
             (int) $mbox_data['UIDVALIDITY'],
             (int) $mbox_data['UIDNEXT'],
         );
         $data = implode('@', $data);
 
+        $expires = ($this->ttl ? $this->db->now($this->ttl) : 'NULL');
+
         if ($exists) {
-            $sql_result = $this->db->query(
+            $res = $this->db->query(
                 "UPDATE ".$this->db->table_name('cache_thread')
-                ." SET data = ?, changed = ".$this->db->now()
+                ." SET data = ?, expires = $expires"
                 ." WHERE user_id = ?"
                     ." AND mailbox = ?",
                 $data, $this->userid, $mailbox);
+
+            if ($this->db->affected_rows($res)) {
+                return;
+            }
         }
-        else {
-            $sql_result = $this->db->query(
-                "INSERT INTO ".$this->db->table_name('cache_thread')
-                ." (user_id, mailbox, data, changed)"
-                ." VALUES (?, ?, ?, ".$this->db->now().")",
-                $this->userid, $mailbox, $data);
+
+        $this->db->set_option('ignore_key_errors', true);
+
+        $res = $this->db->query(
+            "INSERT INTO ".$this->db->table_name('cache_thread')
+            ." (user_id, mailbox, expires, data)"
+            ." VALUES (?, ?, $expires, ?)",
+            $this->userid, $mailbox, $data);
+
+        // race-condition, insert failed so try update (#1489146)
+        // thanks to ignore_key_errors "duplicate row" errors will be ignored
+        if (!$exists && !$res && !$this->db->is_error($res)) {
+            $this->db->query(
+                "UPDATE ".$this->db->table_name('cache_thread')
+                ." SET expires = $expires, data = ?"
+                ." WHERE user_id = ?"
+                    ." AND mailbox = ?",
+                $data, $this->userid, $mailbox);
         }
+
+        $this->db->set_option('ignore_key_errors', false);
     }
 
 
@@ -983,7 +1047,7 @@ class rcube_imap_cache
                 $uids, true, array('FLAGS'), $index['modseq'], $qresync);
 
             if (!empty($result)) {
-                foreach ($result as $id => $msg) {
+                foreach ($result as $msg) {
                     $uid = $msg->uid;
                     // Remove deleted message
                     if ($this->skip_deleted && !empty($msg->flags['DELETED'])) {
@@ -1004,7 +1068,7 @@ class rcube_imap_cache
 
                     $this->db->query(
                         "UPDATE ".$this->db->table_name('cache_messages')
-                        ." SET flags = ?, changed = ".$this->db->now()
+                        ." SET flags = ?, expires = " . ($this->ttl ? $this->db->now($this->ttl) : 'NULL')
                         ." WHERE user_id = ?"
                             ." AND mailbox = ?"
                             ." AND uid = ?"
@@ -1032,17 +1096,18 @@ class rcube_imap_cache
             }
         }
 
-        // Invalidate thread index (?)
-        if (!$index['valid']) {
-            $this->remove_thread($mailbox);
-        }
-
         $sort_field = $index['sort_field'];
         $sort_order = $index['object']->get_parameters('ORDER');
         $exists     = true;
 
         // Validate index
         if (!$this->validate($mailbox, $index, $exists)) {
+            // Invalidate (remove) thread index
+            // if $exists=false it was already removed in validate()
+            if ($exists) {
+                $this->remove_thread($mailbox);
+            }
+
             // Update index
             $data = $this->get_index_data($mailbox, $sort_field, $sort_order, $mbox_data);
         }
@@ -1067,7 +1132,7 @@ class rcube_imap_cache
      */
     private function build_message($sql_arr)
     {
-        $message = $this->db->decode(unserialize($sql_arr['data']));
+        $message = $this->db->decode($sql_arr['data'], true);
 
         if ($message) {
             $message->flags = array();
@@ -1150,6 +1215,25 @@ class rcube_imap_cache
 
         return $index;
     }
+
+
+    /**
+     * Fetches thread data from IMAP server
+     */
+    private function get_thread_data($mailbox, $mbox_data = array())
+    {
+        if (empty($mbox_data)) {
+            $mbox_data = $this->imap->folder_data($mailbox);
+        }
+
+        if ($mbox_data['EXISTS']) {
+            // get all threads (default sort order)
+            return $this->imap->threads_direct($mailbox);
+        }
+
+        return new rcube_result_thread($mailbox, '* THREAD');
+    }
+
 }
 
 // for backward compat.
diff --git a/program/lib/Roundcube/rcube_imap_generic.php b/program/lib/Roundcube/rcube_imap_generic.php
index b9a796c33..292b932e1 100644
--- a/program/lib/Roundcube/rcube_imap_generic.php
+++ b/program/lib/Roundcube/rcube_imap_generic.php
@@ -72,6 +72,8 @@ class rcube_imap_generic
     const COMMAND_CAPABILITY = 2;
     const COMMAND_LASTLINE   = 4;
 
+    const DEBUG_LINE_LENGTH = 4098; // 4KB + 2B for \r\n
+
     /**
      * Object constructor
      */
@@ -746,7 +748,7 @@ class rcube_imap_generic
         }
 
         if ($this->prefs['timeout'] <= 0) {
-            $this->prefs['timeout'] = ini_get('default_socket_timeout');
+            $this->prefs['timeout'] = max(0, intval(ini_get('default_socket_timeout')));
         }
 
         // Connect
@@ -1065,8 +1067,8 @@ class rcube_imap_generic
     /**
      * Executes EXPUNGE command
      *
-     * @param string $mailbox  Mailbox name
-     * @param string $messages Message UIDs to expunge
+     * @param string       $mailbox  Mailbox name
+     * @param string|array $messages Message UIDs to expunge
      *
      * @return boolean True on success, False on error
      */
@@ -1077,17 +1079,20 @@ class rcube_imap_generic
         }
 
         if (!$this->data['READ-WRITE']) {
-            $this->setError(self::ERROR_READONLY, "Mailbox is read-only", 'EXPUNGE');
+            $this->setError(self::ERROR_READONLY, "Mailbox is read-only");
             return false;
         }
 
         // Clear internal status cache
         unset($this->data['STATUS:'.$mailbox]);
 
-        if ($messages)
-            $result = $this->execute('UID EXPUNGE', array($messages), self::COMMAND_NORESPONSE);
-        else
+        if (!empty($messages) && $messages != '*' && $this->hasCapability('UIDPLUS')) {
+            $messages = self::compressMessageSet($messages);
+            $result   = $this->execute('UID EXPUNGE', array($messages), self::COMMAND_NORESPONSE);
+        }
+        else {
             $result = $this->execute('EXPUNGE', null, self::COMMAND_NORESPONSE);
+        }
 
         if ($result == self::ERROR_OK) {
             $this->selected = null; // state has changed, need to reselect
@@ -1649,7 +1654,6 @@ class rcube_imap_generic
         }
 
         if (!empty($criteria)) {
-            $modseq = stripos($criteria, 'MODSEQ') !== false;
             $params .= ($params ? ' ' : '') . $criteria;
         }
         else {
@@ -1788,7 +1792,6 @@ class rcube_imap_generic
                 if ($skip_deleted && preg_match('/FLAGS \(([^)]+)\)/', $line, $matches)) {
                     $flags = explode(' ', strtoupper($matches[1]));
                     if (in_array('\\DELETED', $flags)) {
-                        $deleted[$id] = $id;
                         continue;
                     }
                 }
@@ -1933,7 +1936,7 @@ class rcube_imap_generic
         }
 
         if (!$this->data['READ-WRITE']) {
-            $this->setError(self::ERROR_READONLY, "Mailbox is read-only", 'STORE');
+            $this->setError(self::ERROR_READONLY, "Mailbox is read-only");
             return false;
         }
 
@@ -1980,7 +1983,6 @@ class rcube_imap_generic
 
     /**
      * Moves message(s) from one folder to another.
-     * Original message(s) will be marked as deleted.
      *
      * @param string|array  $messages  Message UID(s)
      * @param string        $from      Mailbox name
@@ -1995,19 +1997,45 @@ class rcube_imap_generic
         }
 
         if (!$this->data['READ-WRITE']) {
-            $this->setError(self::ERROR_READONLY, "Mailbox is read-only", 'STORE');
+            $this->setError(self::ERROR_READONLY, "Mailbox is read-only");
             return false;
         }
 
-        $r = $this->copy($messages, $from, $to);
+        // use MOVE command (RFC 6851)
+        if ($this->hasCapability('MOVE')) {
+            // Clear last COPYUID data
+            unset($this->data['COPYUID']);
 
-        if ($r) {
             // Clear internal status cache
+            unset($this->data['STATUS:'.$to]);
             unset($this->data['STATUS:'.$from]);
 
-            return $this->flag($from, $messages, 'DELETED');
+            $result = $this->execute('UID MOVE', array(
+                $this->compressMessageSet($messages), $this->escape($to)),
+                self::COMMAND_NORESPONSE);
+
+            return ($result == self::ERROR_OK);
         }
-        return $r;
+
+        // use COPY + STORE +FLAGS.SILENT \Deleted + EXPUNGE
+        $result = $this->copy($messages, $from, $to);
+
+        if ($result) {
+            // Clear internal status cache
+            unset($this->data['STATUS:'.$from]);
+
+            $result = $this->flag($from, $messages, 'DELETED');
+
+            if ($messages == '*') {
+                // CLOSE+SELECT should be faster than EXPUNGE
+                $this->close();
+            }
+            else {
+                $this->expunge($from, $messages);
+            }
+        }
+
+        return $result;
     }
 
     /**
@@ -2144,7 +2172,7 @@ class rcube_imap_generic
                 // create array with header field:data
                 if (!empty($headers)) {
                     $headers = explode("\n", trim($headers));
-                    foreach ($headers as $hid => $resln) {
+                    foreach ($headers as $resln) {
                         if (ord($resln[0]) <= 32) {
                             $lines[$ln] .= (empty($lines[$ln]) ? '' : "\n") . trim($resln);
                         } else {
@@ -2152,7 +2180,7 @@ class rcube_imap_generic
                         }
                     }
 
-                    while (list($lines_key, $str) = each($lines)) {
+                    foreach ($lines as $str) {
                         list($field, $string) = explode(':', $str, 2);
 
                         $field  = strtolower($field);
@@ -2237,24 +2265,53 @@ class rcube_imap_generic
         return $result;
     }
 
-    function fetchHeaders($mailbox, $message_set, $is_uid = false, $bodystr = false, $add = '')
+    /**
+     * Returns message(s) data (flags, headers, etc.)
+     *
+     * @param string $mailbox     Mailbox name
+     * @param mixed  $message_set Message(s) sequence identifier(s) or UID(s)
+     * @param bool   $is_uid      True if $message_set contains UIDs
+     * @param bool   $bodystr     Enable to add BODYSTRUCTURE data to the result
+     * @param array  $add_headers List of additional headers
+     *
+     * @return bool|array List of rcube_message_header elements, False on error
+     */
+    function fetchHeaders($mailbox, $message_set, $is_uid = false, $bodystr = false, $add_headers = array())
     {
         $query_items = array('UID', 'RFC822.SIZE', 'FLAGS', 'INTERNALDATE');
-        if ($bodystr)
+        $headers     = array('DATE', 'FROM', 'TO', 'SUBJECT', 'CONTENT-TYPE', 'CC', 'REPLY-TO',
+            'LIST-POST', 'DISPOSITION-NOTIFICATION-TO', 'X-PRIORITY');
+
+        if (!empty($add_headers)) {
+            $add_headers = array_map('strtoupper', $add_headers);
+            $headers     = array_unique(array_merge($headers, $add_headers));
+        }
+
+        if ($bodystr) {
             $query_items[] = 'BODYSTRUCTURE';
-        $query_items[] = 'BODY.PEEK[HEADER.FIELDS ('
-            . 'DATE FROM TO SUBJECT CONTENT-TYPE CC REPLY-TO LIST-POST DISPOSITION-NOTIFICATION-TO X-PRIORITY'
-            . ($add ? ' ' . trim($add) : '')
-            . ')]';
+        }
+
+        $query_items[] = 'BODY.PEEK[HEADER.FIELDS (' . implode(' ', $headers) . ')]';
 
         $result = $this->fetch($mailbox, $message_set, $is_uid, $query_items);
 
         return $result;
     }
 
-    function fetchHeader($mailbox, $id, $uidfetch=false, $bodystr=false, $add='')
+    /**
+     * Returns message data (flags, headers, etc.)
+     *
+     * @param string $mailbox     Mailbox name
+     * @param int    $id          Message sequence identifier or UID
+     * @param bool   $is_uid      True if $id is an UID
+     * @param bool   $bodystr     Enable to add BODYSTRUCTURE data to the result
+     * @param array  $add_headers List of additional headers
+     *
+     * @return bool|rcube_message_header Message data, False on error
+     */
+    function fetchHeader($mailbox, $id, $is_uid = false, $bodystr = false, $add_headers = array())
     {
-        $a = $this->fetchHeaders($mailbox, $id, $uidfetch, $bodystr, $add);
+        $a = $this->fetchHeaders($mailbox, $id, $is_uid, $bodystr, $add_headers);
         if (is_array($a)) {
             return array_shift($a);
         }
@@ -2418,6 +2475,7 @@ class rcube_imap_generic
         $key     = $this->nextTag();
         $request = $key . ($is_uid ? ' UID' : '') . " FETCH $id ($fetch_mode.PEEK[$part]$partial)";
         $result  = false;
+        $found   = false;
 
         // send request
         if (!$this->putLine($request)) {
@@ -2437,18 +2495,25 @@ class rcube_imap_generic
                 break;
             }
 
-            if (!preg_match('/^\* ([0-9]+) FETCH (.*)$/', $line, $m)) {
+            // skip irrelevant untagged responses (we have a result already)
+            if ($found || !preg_match('/^\* ([0-9]+) FETCH (.*)$/', $line, $m)) {
                 continue;
             }
 
             $line = $m[2];
-            $last = substr($line, -1);
 
             // handle one line response
-            if ($line[0] == '(' && $last == ')') {
+            if ($line[0] == '(' && substr($line, -1) == ')') {
                 // tokenize content inside brackets
-                $tokens = $this->tokenizeResponse(preg_replace('/(^\(|\$)/', '', $line));
-                $result = count($tokens) == 1 ? $tokens[0] : false;
+                $tokens = $this->tokenizeResponse(preg_replace('/(^\(|\)$)/', '', $line));
+
+                for ($i=0; $i<count($tokens); $i+=2) {
+                    if (preg_match('/^(BODY|BINARY)/i', $tokens[$i])) {
+                        $result = $tokens[$i+1];
+                        $found  = true;
+                        break;
+                    }
+                }
 
                 if ($result !== false) {
                     if ($mode == 1) {
@@ -2466,6 +2531,7 @@ class rcube_imap_generic
             else if (preg_match('/\{([0-9]+)\}$/', $line, $m)) {
                 $bytes = (int) $m[1];
                 $prev  = '';
+                $found = true;
 
                 while ($bytes > 0) {
                     $line = $this->readLine(8192);
@@ -3474,7 +3540,7 @@ class rcube_imap_generic
 
         if (is_array($element)) {
             reset($element);
-            while (list($key, $value) = each($element)) {
+            foreach ($element as $value) {
                 $string .= ' ' . self::r_implode($value);
             }
         }
@@ -3502,7 +3568,7 @@ class rcube_imap_generic
             // if less than 255 bytes long, let's not bother
             if (!$force && strlen($messages)<255) {
                 return $messages;
-           }
+            }
 
             // see if it's already been compressed
             if (strpos($messages, ':') !== false) {
@@ -3610,8 +3676,20 @@ class rcube_imap_generic
      */
     static function strToTime($date)
     {
-        // support non-standard "GMTXXXX" literal
-        $date = preg_replace('/GMT\s*([+-][0-9]+)/', '\\1', $date);
+        // Clean malformed data
+        $date = preg_replace(
+            array(
+                '/GMT\s*([+-][0-9]+)/',                     // support non-standard "GMTXXXX" literal
+                '/[^a-z0-9\x20\x09:+-]/i',                  // remove any invalid characters
+                '/\s*(Mon|Tue|Wed|Thu|Fri|Sat|Sun)\s*/i',   // remove weekday names
+            ),
+            array(
+                '\\1',
+                '',
+                '',
+            ), $date);
+
+        $date = trim($date);
 
         // if date parsing fails, we have a date in non-rfc format
         // remove token from the end and try again
@@ -3681,9 +3759,10 @@ class rcube_imap_generic
     /**
      * Set the value of the debugging flag.
      *
-     * @param   boolean $debug      New value for the debugging flag.
+     * @param boolean  $debug   New value for the debugging flag.
+     * @param callback $handler Logging handler function
      *
-     * @since   0.5-stable
+     * @since 0.5-stable
      */
     function setDebug($debug, $handler = null)
     {
@@ -3694,12 +3773,18 @@ class rcube_imap_generic
     /**
      * Write the given debug text to the current debug output handler.
      *
-     * @param   string  $message    Debug mesage text.
+     * @param string $message Debug mesage text.
      *
-     * @since   0.5-stable
+     * @since 0.5-stable
      */
     private function debug($message)
     {
+        if (($len = strlen($message)) > self::DEBUG_LINE_LENGTH) {
+            $diff    = $len - self::DEBUG_LINE_LENGTH;
+            $message = substr($message, 0, self::DEBUG_LINE_LENGTH)
+                . "... [truncated $diff bytes]";
+        }
+
         if ($this->resourceid) {
             $message = sprintf('[%s] %s', $this->resourceid, $message);
         }
diff --git a/program/lib/Roundcube/rcube_ldap.php b/program/lib/Roundcube/rcube_ldap.php
index a2dd163e9..39a48b456 100644
--- a/program/lib/Roundcube/rcube_ldap.php
+++ b/program/lib/Roundcube/rcube_ldap.php
@@ -169,7 +169,7 @@ class rcube_ldap extends rcube_addressbook
         // Build sub_fields filter
         if (!empty($this->prop['sub_fields']) && is_array($this->prop['sub_fields'])) {
             $this->sub_filter = '';
-            foreach ($this->prop['sub_fields'] as $attr => $class) {
+            foreach ($this->prop['sub_fields'] as $class) {
                 if (!empty($class)) {
                     $class = is_array($class) ? array_pop($class) : $class;
                     $this->sub_filter .= '(objectClass=' . $class . ')';
@@ -185,8 +185,12 @@ class rcube_ldap extends rcube_addressbook
         $this->mail_domain = $mail_domain;
 
         // initialize cache
-        $rcube = rcube::get_instance();
-        $this->cache = $rcube->get_cache('LDAP.' . asciiwords($this->prop['name']), 'db', 600);
+        $rcube      = rcube::get_instance();
+        $cache_type = $rcube->config->get('ldap_cache', 'db');
+        $cache_ttl  = $rcube->config->get('ldap_cache_ttl', '10m');
+        $cache_name = 'LDAP.' . asciiwords($this->prop['name']);
+
+        $this->cache = $rcube->get_cache($cache_name, $cache_type, $cache_ttl);
 
         $this->_connect();
     }
@@ -1035,7 +1039,6 @@ class rcube_ldap extends rcube_addressbook
                 $mail_field  = $this->fieldmap['email'];
 
                 // try to extract surname and firstname from displayname
-                $reverse_map = array_flip($this->fieldmap);
                 $name_parts  = preg_split('/[\s,.]+/', $save_data['name']);
 
                 if ($sn_field && $missing[$sn_field]) {
@@ -1107,7 +1110,7 @@ class rcube_ldap extends rcube_addressbook
         // Remove attributes that need to be added separately (child objects)
         $xfields = array();
         if (!empty($this->prop['sub_fields']) && is_array($this->prop['sub_fields'])) {
-            foreach ($this->prop['sub_fields'] as $xf => $xclass) {
+            foreach (array_keys($this->prop['sub_fields']) as $xf) {
                 if (!empty($newentry[$xf])) {
                     $xfields[$xf] = $newentry[$xf];
                     unset($newentry[$xf]);
@@ -1170,7 +1173,7 @@ class rcube_ldap extends rcube_addressbook
             }
         }
 
-        foreach ($this->fieldmap as $col => $fld) {
+        foreach ($this->fieldmap as $fld) {
             if ($fld) {
                 $val = $ldap_data[$fld];
                 $old = $old_data[$fld];
@@ -1396,6 +1399,10 @@ class rcube_ldap extends rcube_addressbook
      */
     protected function add_autovalues(&$attrs)
     {
+        if (empty($this->prop['autovalues'])) {
+            return;
+        }
+
         $attrvals = array();
         foreach ($attrs as $k => $v) {
             $attrvals['{'.$k.'}'] = is_array($v) ? $v[0] : $v;
@@ -1403,13 +1410,24 @@ class rcube_ldap extends rcube_addressbook
 
         foreach ((array)$this->prop['autovalues'] as $lf => $templ) {
             if (empty($attrs[$lf])) {
-                // replace {attr} placeholders with concrete attribute values
-                $templ = preg_replace('/\{\w+\}/', '', strtr($templ, $attrvals));
+                if (strpos($templ, '(') !== false) {
+                    // replace {attr} placeholders with (escaped!) attribute values to be safely eval'd
+                    $code = preg_replace('/\{\w+\}/', '', strtr($templ, array_map('addslashes', $attrvals)));
+                    $fn   = create_function('', "return ($code);");
+                    if (!$fn) {
+                        rcube::raise_error(array(
+                            'code' => 505, 'type' => 'php',
+                            'file' => __FILE__, 'line' => __LINE__,
+                            'message' => "Expression parse error on: ($code)"), true, false);
+                        continue;
+                    }
 
-                if (strpos($templ, '(') !== false)
-                    $attrs[$lf] = eval("return ($templ);");
-                else
-                    $attrs[$lf] = $templ;
+                    $attrs[$lf] = $fn();
+                }
+                else {
+                    // replace {attr} placeholders with concrete attribute values
+                    $attrs[$lf] = preg_replace('/\{\w+\}/', '', strtr($templ, $attrvals));
+                }
             }
         }
     }
@@ -1715,9 +1733,14 @@ class rcube_ldap extends rcube_addressbook
      * List all active contact groups of this source
      *
      * @param string  Optional search string to match group name
+     * @param int     Matching mode:
+     *                0 - partial (*abc*),
+     *                1 - strict (=),
+     *                2 - prefix (abc*)
+     *
      * @return array  Indexed list of contact groups, each a hash array
      */
-    function list_groups($search = null)
+    function list_groups($search = null, $mode = 0)
     {
         if (!$this->groups)
             return array();
@@ -1729,10 +1752,10 @@ class rcube_ldap extends rcube_addressbook
 
         $groups = array();
         if ($search) {
-            $search = mb_strtolower($search);
             foreach ($group_cache as $group) {
-                if (strpos(mb_strtolower($group['name']), $search) !== false)
+                if ($this->compare_search_value('name', $group['name'], $search, $mode)) {
                     $groups[] = $group;
+                }
             }
         }
         else
@@ -1763,7 +1786,7 @@ class rcube_ldap extends rcube_addressbook
             $vlv_active = $this->_vlv_set_controls($this->prop['groups'], $vlv_page+1, $page_size);
         }
 
-        $function = $this->_scope2func($this->prop['groups']['scope'], $ns_function);
+        $function = $this->_scope2func($this->prop['groups']['scope']);
         $res = @$function($this->conn, $base_dn, $filter, array_unique(array('dn', 'objectClass', $name_attr, $email_attr, $sort_attr)));
         if ($res === false)
         {
@@ -1921,9 +1944,10 @@ class rcube_ldap extends rcube_addressbook
     /**
      * Add the given contact records the a certain group
      *
-     * @param string  Group identifier
-     * @param array   List of contact identifiers to be added
-     * @return int    Number of contacts added
+     * @param string       Group identifier
+     * @param array|string List of contact identifiers to be added
+     *
+     * @return int Number of contacts added
      */
     function add_to_group($group_id, $contact_ids)
     {
@@ -1937,8 +1961,8 @@ class rcube_ldap extends rcube_addressbook
         $group_name  = $group_cache[$group_id]['name'];
         $member_attr = $group_cache[$group_id]['member_attr'];
         $group_dn    = "cn=$group_name,$base_dn";
+        $new_attrs   = array();
 
-        $new_attrs = array();
         foreach ($contact_ids as $id)
             $new_attrs[$member_attr][] = self::dn_decode($id);
 
@@ -1949,28 +1973,32 @@ class rcube_ldap extends rcube_addressbook
 
         $this->cache->remove('groups');
 
-        return count($new_attrs['member']);
+        return count($new_attrs[$member_attr]);
     }
 
     /**
      * Remove the given contact records from a certain group
      *
-     * @param string  Group identifier
-     * @param array   List of contact identifiers to be removed
-     * @return int    Number of deleted group members
+     * @param string       Group identifier
+     * @param array|string List of contact identifiers to be removed
+     *
+     * @return int Number of deleted group members
      */
     function remove_from_group($group_id, $contact_ids)
     {
         if (($group_cache = $this->cache->get('groups')) === null)
             $group_cache = $this->_fetch_groups();
 
+        if (!is_array($contact_ids))
+            $contact_ids = explode(',', $contact_ids);
+
         $base_dn     = $this->groups_base_dn;
         $group_name  = $group_cache[$group_id]['name'];
         $member_attr = $group_cache[$group_id]['member_attr'];
         $group_dn    = "cn=$group_name,$base_dn";
+        $del_attrs   = array();
 
-        $del_attrs = array();
-        foreach (explode(",", $contact_ids) as $id)
+        foreach ($contact_ids as $id)
             $del_attrs[$member_attr][] = self::dn_decode($id);
 
         if (!$this->ldap_mod_del($group_dn, $del_attrs)) {
@@ -1980,7 +2008,7 @@ class rcube_ldap extends rcube_addressbook
 
         $this->cache->remove('groups');
 
-        return count($del_attrs['member']);
+        return count($del_attrs[$member_attr]);
     }
 
     /**
diff --git a/program/lib/Roundcube/rcube_message.php b/program/lib/Roundcube/rcube_message.php
index e0c3e3475..797ca185e 100644
--- a/program/lib/Roundcube/rcube_message.php
+++ b/program/lib/Roundcube/rcube_message.php
@@ -85,15 +85,16 @@ class rcube_message
 
         $this->headers = $this->storage->get_message($uid);
 
-        if (!$this->headers)
+        if (!$this->headers) {
             return;
+        }
 
         $this->mime = new rcube_mime($this->headers->charset);
 
-        $this->subject = $this->mime->decode_mime_string($this->headers->subject);
+        $this->subject = $this->headers->get('subject');
         list(, $this->sender) = each($this->mime->decode_address_list($this->headers->from, 1));
 
-        $this->set_safe((intval($_GET['_safe']) || $_SESSION['safe_messages'][$uid]));
+        $this->set_safe((intval($_GET['_safe']) || $_SESSION['safe_messages'][$this->folder.':'.$uid]));
         $this->opt = array(
             'safe' => $this->is_safe,
             'prefer_html' => $this->app->config->get('prefer_html'),
@@ -125,15 +126,11 @@ class rcube_message
      */
     public function get_header($name, $raw = false)
     {
-        if (empty($this->headers))
+        if (empty($this->headers)) {
             return null;
+        }
 
-        if ($this->headers->$name)
-            $value = $this->headers->$name;
-        else if ($this->headers->others[$name])
-            $value = $this->headers->others[$name];
-
-        return $raw ? $value : $this->mime->decode_header($value);
+        return $this->headers->get($name, !$raw);
     }
 
 
@@ -144,8 +141,7 @@ class rcube_message
      */
     public function set_safe($safe = true)
     {
-        $this->is_safe = $safe;
-        $_SESSION['safe_messages'][$this->uid] = $this->is_safe;
+        $_SESSION['safe_messages'][$this->folder.':'.$this->uid] = $this->is_safe = $safe;
     }
 
 
@@ -153,12 +149,13 @@ class rcube_message
      * Compose a valid URL for getting a message part
      *
      * @param string $mime_id Part MIME-ID
+     * @param mixed  $embed Mimetype class for parts to be embedded
      * @return string URL or false if part does not exist
      */
     public function get_part_url($mime_id, $embed = false)
     {
         if ($this->mime_parts[$mime_id])
-            return $this->opt['get_url'] . '&_part=' . $mime_id . ($embed ? '&_embed=1' : '');
+            return $this->opt['get_url'] . '&_part=' . $mime_id . ($embed ? '&_embed=1&_mimeclass=' . $embed : '');
         else
             return false;
     }
@@ -194,39 +191,82 @@ class rcube_message
 
 
     /**
-     * Determine if the message contains a HTML part
+     * Determine if the message contains a HTML part. This must to be
+     * a real part not an attachment (or its part)
+     * This must to be
+     * a real part not an attachment (or its part)
      *
-     * @param bool $recursive Enables checking in all levels of the structure
-     * @param bool $enriched  Enables checking for text/enriched parts too
+     * @param bool $enriched Enables checking for text/enriched parts too
      *
      * @return bool True if a HTML is available, False if not
      */
-    function has_html_part($recursive = true, $enriched = false)
+    function has_html_part($enriched = false)
     {
         // check all message parts
-        foreach ($this->parts as $part) {
+        foreach ($this->mime_parts as $part) {
             if ($part->mimetype == 'text/html' || ($enriched && $part->mimetype == 'text/enriched')) {
-                // Level check, we'll skip e.g. HTML attachments
-                if (!$recursive) {
-                    $level = explode('.', $part->mime_id);
+                // Skip if part is an attachment, don't use is_attachment() here
+                if ($part->filename) {
+                    continue;
+                }
 
-                    // Skip if level too deep or part has a file name
-                    if (count($level) > 2 || $part->filename) {
-                        continue;
+                $level = explode('.', $part->mime_id);
+
+                // Check if the part belongs to higher-level's alternative/related
+                while (array_pop($level) !== null) {
+                    if (!count($level)) {
+                        return true;
                     }
 
-                    // HTML part can be on the lower level, if not...
-                    if (count($level) > 1) {
-                        array_pop($level);
-                        $parent = $this->mime_parts[join('.', $level)];
-                        // ... parent isn't multipart/alternative or related
-                        if ($parent->mimetype != 'multipart/alternative' && $parent->mimetype != 'multipart/related') {
-                            continue;
-                        }
+                    $parent = $this->mime_parts[join('.', $level)];
+                    if ($parent->mimetype != 'multipart/alternative' && $parent->mimetype != 'multipart/related') {
+                        continue 2;
                     }
                 }
 
-                return true;
+                if ($part->size) {
+                    return true;
+                }
+            }
+        }
+
+        return false;
+    }
+
+
+    /**
+     * Determine if the message contains a text/plain part. This must to be
+     * a real part not an attachment (or its part)
+     *
+     * @return bool True if a plain text part is available, False if not
+     */
+    function has_text_part()
+    {
+        // check all message parts
+        foreach ($this->mime_parts as $part) {
+            if ($part->mimetype == 'text/plain') {
+                // Skip if part is an attachment, don't use is_attachment() here
+                if ($part->filename) {
+                    continue;
+                }
+
+                $level = explode('.', $part->mime_id);
+
+                // Check if the part belongs to higher-level's alternative/related
+                while (array_pop($level) !== null) {
+                    if (!count($level)) {
+                        return true;
+                    }
+
+                    $parent = $this->mime_parts[join('.', $level)];
+                    if ($parent->mimetype != 'multipart/alternative' && $parent->mimetype != 'multipart/related') {
+                        continue 2;
+                    }
+                }
+
+                if ($part->size) {
+                    return true;
+                }
             }
         }
 
@@ -322,7 +362,7 @@ class rcube_message
 
             // parse headers from message/rfc822 part
             if (!isset($structure->headers['subject']) && !isset($structure->headers['from'])) {
-                list($headers, $dump) = explode("\r\n\r\n", $this->get_part_content($structure->mime_id, null, true, 8192));
+                list($headers, ) = explode("\r\n\r\n", $this->get_part_content($structure->mime_id, null, true, 32768));
                 $structure->headers = rcube_mime::parse_headers($headers);
             }
         }
@@ -330,7 +370,8 @@ class rcube_message
             $mimetype = $structure->mimetype;
 
         // show message headers
-        if ($recursive && is_array($structure->headers) && (isset($structure->headers['subject']) || isset($structure->headers['from']))) {
+        if ($recursive && is_array($structure->headers) &&
+                (isset($structure->headers['subject']) || $structure->headers['from'] || $structure->headers['to'])) {
             $c = new stdClass;
             $c->type = 'headers';
             $c->headers = $structure->headers;
@@ -444,14 +485,6 @@ class rcube_message
                 $this->parts[] = $c;
             }
 
-            // add html part as attachment
-            if ($html_part !== null && $structure->parts[$html_part] !== $print_part) {
-                $html_part = $structure->parts[$html_part];
-                $html_part->mimetype = 'text/html';
-
-                $this->attachments[] = $html_part;
-            }
-
             // add unsupported/unrecognized parts to attachments list
             if ($attach_part) {
                 $this->attachments[] = $structure->parts[$attach_part];
@@ -468,6 +501,17 @@ class rcube_message
 
             $this->parts[] = $p;
         }
+        // this is an S/MIME ecrypted message -> create a plaintext body with the according message
+        else if ($mimetype == 'application/pkcs7-mime') {
+            $p = new stdClass;
+            $p->type            = 'content';
+            $p->ctype_primary   = 'text';
+            $p->ctype_secondary = 'plain';
+            $p->mimetype        = 'text/plain';
+            $p->realtype        = 'application/pkcs7-mime';
+
+            $this->parts[] = $p;
+        }
         // message contains multiple parts
         else if (is_array($structure->parts) && !empty($structure->parts)) {
             // iterate over parts
@@ -525,10 +569,6 @@ class rcube_message
                     if (!empty($mail_part->filename)) {
                         $this->attachments[] = $mail_part;
                     }
-                    // list html part as attachment (here the part is most likely inside a multipart/related part)
-                    else if ($this->parse_alternative && ($secondary_type == 'html' && !$this->opt['prefer_html'])) {
-                        $this->attachments[] = $mail_part;
-                    }
                 }
                 // part message/*
                 else if ($primary_type == 'message') {
@@ -604,8 +644,8 @@ class rcube_message
                 $img_regexp = '/^image\/(gif|jpe?g|png|tiff|bmp|svg)/';
 
                 foreach ($this->inline_parts as $inline_object) {
-                    $part_url = $this->get_part_url($inline_object->mime_id, true);
-                    if ($inline_object->content_id)
+                    $part_url = $this->get_part_url($inline_object->mime_id, $inline_object->ctype_primary);
+                    if (isset($inline_object->content_id))
                         $a_replaces['cid:'.$inline_object->content_id] = $part_url;
                     if ($inline_object->content_location) {
                         $a_replaces[$inline_object->content_location] = $part_url;
@@ -745,7 +785,7 @@ class rcube_message
                 $uupart->size     = strlen($uupart->body);
                 $uupart->mime_id  = 'uu.' . $part->mime_id . '.' . $pid;
 
-                $ctype = rcube_mime::content_type($uupart->body, $uupart->filename, 'application/octet-stream', true);
+                $ctype = rcube_mime::file_content_type($uupart->body, $uupart->filename, 'application/octet-stream', true);
                 $uupart->mimetype = $ctype;
                 list($uupart->ctype_primary, $uupart->ctype_secondary) = explode('/', $ctype);
 
diff --git a/program/lib/Roundcube/rcube_message_header.php b/program/lib/Roundcube/rcube_message_header.php
index 274ae7f9f..2c5e2b6c8 100644
--- a/program/lib/Roundcube/rcube_message_header.php
+++ b/program/lib/Roundcube/rcube_message_header.php
@@ -215,7 +215,12 @@ class rcube_message_header
             $value = $this->others[$name];
         }
 
-        return $decode ? rcube_mime::decode_header($value, $this->charset) : $value;
+        if ($decode) {
+            $value = rcube_mime::decode_header($value, $this->charset);
+            $value = rcube_charset::clean($value);
+        }
+
+        return $value;
     }
 
     /**
diff --git a/program/lib/Roundcube/rcube_mime.php b/program/lib/Roundcube/rcube_mime.php
index 2f24a1bb3..572540f47 100644
--- a/program/lib/Roundcube/rcube_mime.php
+++ b/program/lib/Roundcube/rcube_mime.php
@@ -127,10 +127,11 @@ class rcube_mime
      * @param int     $max      List only this number of addresses
      * @param boolean $decode   Decode address strings
      * @param string  $fallback Fallback charset if none specified
+     * @param boolean $addronly Return flat array with e-mail addresses only
      *
-     * @return array  Indexed list of addresses
+     * @return array Indexed list of addresses
      */
-    static function decode_address_list($input, $max = null, $decode = true, $fallback = null)
+    static function decode_address_list($input, $max = null, $decode = true, $fallback = null, $addronly = false)
     {
         $a   = self::parse_address_list($input, $decode, $fallback);
         $out = array();
@@ -145,20 +146,21 @@ class rcube_mime
         foreach ($a as $val) {
             $j++;
             $address = trim($val['address']);
-            $name    = trim($val['name']);
 
-            if ($name && $address && $name != $address)
-                $string = sprintf('%s <%s>', preg_match("/$special_chars/", $name) ? '"'.addcslashes($name, '"').'"' : $name, $address);
-            else if ($address)
-                $string = $address;
-            else if ($name)
-                $string = $name;
-
-            $out[$j] = array(
-                'name'   => $name,
-                'mailto' => $address,
-                'string' => $string
-            );
+            if ($addronly) {
+                $out[$j] = $address;
+            }
+            else {
+                $name = trim($val['name']);
+                if ($name && $address && $name != $address)
+                    $string = sprintf('%s <%s>', preg_match("/$special_chars/", $name) ? '"'.addcslashes($name, '"').'"' : $name, $address);
+                else if ($address)
+                    $string = $address;
+                else if ($name)
+                    $string = $name;
+
+                $out[$j] = array('name' => $name, 'mailto' => $address, 'string' => $string);
+            }
 
             if ($max && $j==$max)
                 break;
@@ -359,6 +361,11 @@ class rcube_mime
                 $address = $m[1];
                 $name    = '';
             }
+            // special case (#1489092)
+            else if (preg_match('/(\s*<MAILER-DAEMON>)$/', $val, $m)) {
+                $address = 'MAILER-DAEMON';
+                $name    = substr($val, 0, -strlen($m[1]));
+            }
             else {
                 $name = $val;
             }
@@ -476,9 +483,10 @@ class rcube_mime
         $q_level = 0;
 
         foreach ($text as $idx => $line) {
-            if ($line[0] == '>') {
-                // remove quote chars, store level in $q
-                $line = preg_replace('/^>+/', '', $line, -1, $q);
+            if (preg_match('/^(>+)/', $line, $m)) {
+                // remove quote chars
+                $q    = strlen($m[1]);
+                $line = preg_replace('/^>+/', '', $line);
                 // remove (optional) space-staffing
                 $line = preg_replace('/^ /', '', $line);
 
@@ -541,9 +549,10 @@ class rcube_mime
 
         foreach ($text as $idx => $line) {
             if ($line != '-- ') {
-                if ($line[0] == '>') {
-                    // remove quote chars, store level in $level
-                    $line   = preg_replace('/^>+/', '', $line, -1, $level);
+                if (preg_match('/^(>+)/', $line, $m)) {
+                    // remove quote chars
+                    $level  = strlen($m[1]);
+                    $line   = preg_replace('/^>+/', '', $line);
                     // remove (optional) space-staffing and spaces before the line end
                     $line   = preg_replace('/(^ | +$)/', '', $line);
                     $prefix = str_repeat('>', $level) . ' ';
@@ -564,81 +573,122 @@ class rcube_mime
 
 
     /**
-     * Improved wordwrap function.
+     * Improved wordwrap function with multibyte support.
+     * The code is based on Zend_Text_MultiByte::wordWrap().
      *
-     * @param string $string  Text to wrap
-     * @param int    $width   Line width
-     * @param string $break   Line separator
-     * @param bool   $cut     Enable to cut word
-     * @param string $charset Charset of $string
+     * @param string $string      Text to wrap
+     * @param int    $width       Line width
+     * @param string $break       Line separator
+     * @param bool   $cut         Enable to cut word
+     * @param string $charset     Charset of $string
+     * @param bool   $wrap_quoted When enabled quoted lines will not be wrapped
      *
      * @return string Text
      */
-    public static function wordwrap($string, $width=75, $break="\n", $cut=false, $charset=null)
+    public static function wordwrap($string, $width=75, $break="\n", $cut=false, $charset=null, $wrap_quoted=true)
     {
-        if ($charset && function_exists('mb_internal_encoding')) {
+        // Note: Never try to use iconv instead of mbstring functions here
+        //       Iconv's substr/strlen are 100x slower (#1489113)
+
+        if ($charset && $charset != RCUBE_CHARSET && function_exists('mb_internal_encoding')) {
             mb_internal_encoding($charset);
         }
 
-        $para   = preg_split('/\r?\n/', $string);
-        $string = '';
+        // Convert \r\n to \n, this is our line-separator
+        $string       = str_replace("\r\n", "\n", $string);
+        $separator    = "\n"; // must be 1 character length
+        $result       = array();
 
-        while (count($para)) {
-            $line = array_shift($para);
-            if ($line[0] == '>') {
-                $string .= $line . (count($para) ? $break : '');
-                continue;
-            }
+        while (($stringLength = mb_strlen($string)) > 0) {
+            $breakPos = mb_strpos($string, $separator, 0);
 
-            $list = explode(' ', $line);
-            $len = 0;
-            while (count($list)) {
-                $line   = array_shift($list);
-                $l      = mb_strlen($line);
-                $newlen = $len + $l + ($len ? 1 : 0);
+            // quoted line (do not wrap)
+            if ($wrap_quoted && $string[0] == '>') {
+                if ($breakPos === $stringLength - 1 || $breakPos === false) {
+                    $subString = $string;
+                    $cutLength = null;
+                }
+                else {
+                    $subString = mb_substr($string, 0, $breakPos);
+                    $cutLength = $breakPos + 1;
+                }
+            }
+            // next line found and current line is shorter than the limit
+            else if ($breakPos !== false && $breakPos < $width) {
+                if ($breakPos === $stringLength - 1) {
+                    $subString = $string;
+                    $cutLength = null;
+                }
+                else {
+                    $subString = mb_substr($string, 0, $breakPos);
+                    $cutLength = $breakPos + 1;
+                }
+            }
+            else {
+                $subString = mb_substr($string, 0, $width);
 
-                if ($newlen <= $width) {
-                    $string .= ($len ? ' ' : '').$line;
-                    $len += (1 + $l);
+                // last line
+                if ($breakPos === false && $subString === $string) {
+                    $cutLength = null;
                 }
                 else {
-                    if ($l > $width) {
-                        if ($cut) {
-                            $start = 0;
-                            while ($l) {
-                                $str = mb_substr($line, $start, $width);
-                                $strlen = mb_strlen($str);
-                                $string .= ($len ? $break : '').$str;
-                                $start += $strlen;
-                                $l -= $strlen;
-                                $len = $strlen;
+                    $nextChar = mb_substr($string, $width, 1);
+
+                    if ($nextChar === ' ' || $nextChar === $separator) {
+                        $afterNextChar = mb_substr($string, $width + 1, 1);
+
+                        if ($afterNextChar === false) {
+                            $subString .= $nextChar;
+                        }
+
+                        $cutLength = mb_strlen($subString) + 1;
+                    }
+                    else {
+                        $spacePos = mb_strrpos($subString, ' ', 0);
+
+                        if ($spacePos !== false) {
+                            $subString = mb_substr($subString, 0, $spacePos);
+                            $cutLength = $spacePos + 1;
+                        }
+                        else if ($cut === false && $breakPos === false) {
+                            $subString = $string;
+                            $cutLength = null;
+                        }
+                        else if ($cut === false) {
+                            $spacePos = mb_strpos($string, ' ', 0);
+
+                            if ($spacePos !== false && $spacePos < $breakPos) {
+                                $subString = mb_substr($string, 0, $spacePos);
+                                $cutLength = $spacePos + 1;
+                            }
+                            else {
+                                $subString = mb_substr($string, 0, $breakPos);
+                                $cutLength = $breakPos + 1;
                             }
                         }
                         else {
-                            $string .= ($len ? $break : '').$line;
-                            if (count($list)) {
-                                $string .= $break;
-                            }
-                            $len = 0;
+                            $subString = mb_substr($subString, 0, $width);
+                            $cutLength = $width;
                         }
                     }
-                    else {
-                        $string .= $break.$line;
-                        $len = $l;
-                    }
                 }
             }
 
-            if (count($para)) {
-                $string .= $break;
+            $result[] = $subString;
+
+            if ($cutLength !== null) {
+                $string = mb_substr($string, $cutLength, ($stringLength - $cutLength));
+            }
+            else {
+                break;
             }
         }
 
-        if ($charset && function_exists('mb_internal_encoding')) {
+        if ($charset && $charset != RCUBE_CHARSET && function_exists('mb_internal_encoding')) {
             mb_internal_encoding(RCUBE_CHARSET);
         }
 
-        return $string;
+        return implode($break, $result);
     }
 
 
@@ -671,7 +721,16 @@ class rcube_mime
 
         // try fileinfo extension if available
         if (!$mime_type && function_exists('finfo_open')) {
-            if ($finfo = finfo_open(FILEINFO_MIME, $mime_magic)) {
+            // null as a 2nd argument should be the same as no argument
+            // this however is not true on all systems/versions
+            if ($mime_magic) {
+                $finfo = finfo_open(FILEINFO_MIME, $mime_magic);
+            }
+            else {
+                $finfo = finfo_open(FILEINFO_MIME);
+            }
+
+            if ($finfo) {
                 if ($is_stream)
                     $mime_type = finfo_buffer($finfo, $path);
                 else
@@ -717,21 +776,27 @@ class rcube_mime
         // load mapping file
         $file_paths = array();
 
-        if ($mime_types = rcube::get_instance()->config->get('mime_types'))
+        if ($mime_types = rcube::get_instance()->config->get('mime_types')) {
             $file_paths[] = $mime_types;
+        }
 
         // try common locations
-        $file_paths[] = '/etc/mime.types';
-        $file_paths[] = '/etc/httpd/mime.types';
-        $file_paths[] = '/etc/httpd2/mime.types';
-        $file_paths[] = '/etc/apache/mime.types';
-        $file_paths[] = '/etc/apache2/mime.types';
-        $file_paths[] = '/usr/local/etc/httpd/conf/mime.types';
-        $file_paths[] = '/usr/local/etc/apache/conf/mime.types';
+        if (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN') {
+            $file_paths[] = 'C:/xampp/apache/conf/mime.types.';
+        }
+        else {
+            $file_paths[] = '/etc/mime.types';
+            $file_paths[] = '/etc/httpd/mime.types';
+            $file_paths[] = '/etc/httpd2/mime.types';
+            $file_paths[] = '/etc/apache/mime.types';
+            $file_paths[] = '/etc/apache2/mime.types';
+            $file_paths[] = '/usr/local/etc/httpd/conf/mime.types';
+            $file_paths[] = '/usr/local/etc/apache/conf/mime.types';
+        }
 
         foreach ($file_paths as $fp) {
-            if (is_readable($fp)) {
-                $lines = file($fp, FILE_IGNORE_NEW_LINES);
+            if (@is_readable($fp)) {
+                $lines = file($fp, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
                 break;
             }
         }
@@ -753,11 +818,35 @@ class rcube_mime
 
         // fallback to some well-known types most important for daily emails
         if (empty($mime_types)) {
-            $mime_extensions = @include(RCUBE_CONFIG_DIR . '/mimetypes.php');
-            $mime_extensions += array('gif' => 'image/gif', 'png' => 'image/png', 'jpg' => 'image/jpeg', 'jpeg' => 'image/jpeg', 'tif' => 'image/tiff');
+            $mime_extensions = (array) @include(RCUBE_CONFIG_DIR . '/mimetypes.php');
 
-            foreach ($mime_extensions as $ext => $mime)
+            foreach ($mime_extensions as $ext => $mime) {
                 $mime_types[$mime][] = $ext;
+            }
+        }
+
+        // Add some known aliases that aren't included by some mime.types (#1488891)
+        // the order is important here so standard extensions have higher prio
+        $aliases = array(
+            'image/gif'      => array('gif'),
+            'image/png'      => array('png'),
+            'image/x-png'    => array('png'),
+            'image/jpeg'     => array('jpg', 'jpeg', 'jpe'),
+            'image/jpg'      => array('jpg', 'jpeg', 'jpe'),
+            'image/pjpeg'    => array('jpg', 'jpeg', 'jpe'),
+            'image/tiff'     => array('tif'),
+            'message/rfc822' => array('eml'),
+            'text/x-mail'    => array('eml'),
+        );
+
+        foreach ($aliases as $mime => $exts) {
+            $mime_types[$mime] = array_unique(array_merge((array) $mime_types[$mime], $exts));
+
+            foreach ($exts as $ext) {
+                if (!isset($mime_extensions[$ext])) {
+                    $mime_extensions[$ext] = $mime;
+                }
+            }
         }
 
         return $mimetype ? $mime_types[$mimetype] : $mime_extensions;
diff --git a/program/lib/Roundcube/rcube_output.php b/program/lib/Roundcube/rcube_output.php
index b8ae86cf6..7ccf9a02e 100644
--- a/program/lib/Roundcube/rcube_output.php
+++ b/program/lib/Roundcube/rcube_output.php
@@ -162,7 +162,7 @@ abstract class rcube_output
             header("Cache-Control: private, must-revalidate");
         }
         else {
-            header("Cache-Control: private, no-cache, must-revalidate, post-check=0, pre-check=0");
+            header("Cache-Control: private, no-cache, no-store, must-revalidate, post-check=0, pre-check=0");
             header("Pragma: no-cache");
         }
     }
diff --git a/program/lib/Roundcube/rcube_plugin.php b/program/lib/Roundcube/rcube_plugin.php
index 66e77cce2..3153a8410 100644
--- a/program/lib/Roundcube/rcube_plugin.php
+++ b/program/lib/Roundcube/rcube_plugin.php
@@ -60,6 +60,14 @@ abstract class rcube_plugin
      */
     public $noframe = false;
 
+    /**
+     * A list of config option names that can be modified
+     * by the user via user interface (with save-prefs command)
+     *
+     * @var array
+     */
+    public $allowed_prefs;
+
     protected $home;
     protected $urlbase;
     private $mytask;
@@ -84,6 +92,16 @@ abstract class rcube_plugin
     abstract function init();
 
     /**
+     * Provide information about this
+     *
+     * @return array Meta information about a plugin or false if not implemented
+     */
+    public static function info()
+    {
+        return false;
+    }
+
+    /**
      * Attempt to load the given plugin which is required for the current plugin
      *
      * @param string Plugin name
@@ -209,7 +227,7 @@ abstract class rcube_plugin
             $rcube->load_language($lang, $add);
 
             // add labels to client
-            if ($add2client) {
+            if ($add2client && method_exists($rcube->output, 'add_label')) {
                 if (is_array($add2client)) {
                     $js_labels = array_map(array($this, 'label_map_callback'), $add2client);
                 }
@@ -222,6 +240,24 @@ abstract class rcube_plugin
     }
 
     /**
+     * Wrapper for add_label() adding the plugin ID as domain
+     */
+    public function add_label()
+    {
+        $rcube = rcube::get_instance();
+
+        if (method_exists($rcube->output, 'add_label')) {
+            $args = func_get_args();
+            if (count($args) == 1 && is_array($args[0])) {
+                $args = $args[0];
+            }
+
+            $args = array_map(array($this, 'label_map_callback'), $args);
+            $rcube->output->add_label($args);
+        }
+    }
+
+    /**
      * Wrapper for rcube::gettext() adding the plugin ID as domain
      *
      * @param string $p Message identifier
@@ -237,7 +273,7 @@ abstract class rcube_plugin
     /**
      * Register this plugin to be responsible for a specific task
      *
-     * @param string $task Task name (only characters [a-z0-9_.-] are allowed)
+     * @param string $task Task name (only characters [a-z0-9_-] are allowed)
      */
     public function register_task($task)
     {
@@ -372,6 +408,10 @@ abstract class rcube_plugin
      */
     private function label_map_callback($key)
     {
+        if (strpos($key, $this->ID.'.') === 0) {
+            return $key;
+        }
+
         return $this->ID.'.'.$key;
     }
 }
diff --git a/program/lib/Roundcube/rcube_plugin_api.php b/program/lib/Roundcube/rcube_plugin_api.php
index 8a4cce215..33f04eaa5 100644
--- a/program/lib/Roundcube/rcube_plugin_api.php
+++ b/program/lib/Roundcube/rcube_plugin_api.php
@@ -36,6 +36,7 @@ class rcube_plugin_api
     public $task = '';
     public $output;
     public $handlers = array();
+    public $allowed_prefs = array();
 
     protected $plugins = array();
     protected $tasks = array();
@@ -202,6 +203,11 @@ class rcube_plugin_api
                         $plugin->init();
                         $this->plugins[$plugin_name] = $plugin;
                     }
+
+                    if (!empty($plugin->allowed_prefs)) {
+                        $this->allowed_prefs = array_merge($this->allowed_prefs, $plugin->allowed_prefs);
+                    }
+
                     return true;
                 }
             }
@@ -222,6 +228,119 @@ class rcube_plugin_api
     }
 
     /**
+     * Get information about a specific plugin.
+     * This is either provided my a plugin's info() method or extracted from a package.xml or a composer.json file
+     *
+     * @param string Plugin name
+     * @return array Meta information about a plugin or False if plugin was not found
+     */
+    public function get_info($plugin_name)
+    {
+      static $composer_lock, $license_uris = array(
+        'Apache'     => 'http://www.apache.org/licenses/LICENSE-2.0.html',
+        'Apache-2'   => 'http://www.apache.org/licenses/LICENSE-2.0.html',
+        'Apache-1'   => 'http://www.apache.org/licenses/LICENSE-1.0',
+        'Apache-1.1' => 'http://www.apache.org/licenses/LICENSE-1.1',
+        'GPL'        => 'http://www.gnu.org/licenses/gpl.html',
+        'GPLv2'      => 'http://www.gnu.org/licenses/gpl-2.0.html',
+        'GPL-2.0'    => 'http://www.gnu.org/licenses/gpl-2.0.html',
+        'GPLv3'      => 'http://www.gnu.org/licenses/gpl-3.0.html',
+        'GPL-3.0'    => 'http://www.gnu.org/licenses/gpl-3.0.html',
+        'GPL-3.0+'   => 'http://www.gnu.org/licenses/gpl.html',
+        'GPL-2.0+'   => 'http://www.gnu.org/licenses/gpl.html',
+        'LGPL'       => 'http://www.gnu.org/licenses/lgpl.html',
+        'LGPLv2'     => 'http://www.gnu.org/licenses/lgpl-2.0.html',
+        'LGPLv2.1'   => 'http://www.gnu.org/licenses/lgpl-2.1.html',
+        'LGPLv3'     => 'http://www.gnu.org/licenses/lgpl.html',
+        'LGPL-2.0'   => 'http://www.gnu.org/licenses/lgpl-2.0.html',
+        'LGPL-2.1'   => 'http://www.gnu.org/licenses/lgpl-2.1.html',
+        'LGPL-3.0'   => 'http://www.gnu.org/licenses/lgpl.html',
+        'LGPL-3.0+'  => 'http://www.gnu.org/licenses/lgpl.html',
+        'BSD'          => 'http://opensource.org/licenses/bsd-license.html',
+        'BSD-2-Clause' => 'http://opensource.org/licenses/BSD-2-Clause',
+        'BSD-3-Clause' => 'http://opensource.org/licenses/BSD-3-Clause',
+        'FreeBSD'      => 'http://opensource.org/licenses/BSD-2-Clause',
+        'MIT'          => 'http://www.opensource.org/licenses/mit-license.php',
+        'PHP'          => 'http://opensource.org/licenses/PHP-3.0',
+        'PHP-3'        => 'http://www.php.net/license/3_01.txt',
+        'PHP-3.0'      => 'http://www.php.net/license/3_0.txt',
+        'PHP-3.01'     => 'http://www.php.net/license/3_01.txt',
+      );
+
+      $dir = dir($this->dir);
+      $fn = unslashify($dir->path) . DIRECTORY_SEPARATOR . $plugin_name . DIRECTORY_SEPARATOR . $plugin_name . '.php';
+      $info = false;
+
+      if (!class_exists($plugin_name))
+        include($fn);
+
+      if (class_exists($plugin_name))
+        $info = $plugin_name::info();
+
+      // fall back to composer.json file
+      if (!$info) {
+        $composer = INSTALL_PATH . "/plugins/$plugin_name/composer.json";
+        if (file_exists($composer) && ($json = @json_decode(file_get_contents($composer), true))) {
+          list($info['vendor'], $info['name']) = explode('/', $json['name']);
+          $info['license'] = $json['license'];
+          if ($license_uri = $license_uris[$info['license']])
+            $info['license_uri'] = $license_uri;
+        }
+
+        // read local composer.lock file (once)
+        if (!isset($composer_lock)) {
+          $composer_lock = @json_decode(@file_get_contents(INSTALL_PATH . "/composer.lock"), true);
+          if ($composer_lock['packages']) {
+            foreach ($composer_lock['packages'] as $i => $package) {
+              $composer_lock['installed'][$package['name']] = $package;
+            }
+          }
+        }
+
+        // load additional information from local composer.lock file
+        if ($lock = $composer_lock['installed'][$json['name']]) {
+          $info['version'] = $lock['version'];
+          $info['uri']     = $lock['homepage'] ? $lock['homepage'] : $lock['source']['uri'];
+          $info['src_uri'] = $lock['dist']['uri'] ? $lock['dist']['uri'] : $lock['source']['uri'];
+        }
+      }
+
+      // fall back to package.xml file
+      if (!$info) {
+        $package = INSTALL_PATH . "/plugins/$plugin_name/package.xml";
+        if (file_exists($package) && ($file = file_get_contents($package))) {
+          $doc = new DOMDocument();
+          $doc->loadXML($file);
+          $xpath = new DOMXPath($doc);
+          $xpath->registerNamespace('rc', "http://pear.php.net/dtd/package-2.0");
+
+          // XPaths of plugin metadata elements
+          $metadata = array(
+            'name'    => 'string(//rc:package/rc:name)',
+            'version' => 'string(//rc:package/rc:version/rc:release)',
+            'license' => 'string(//rc:package/rc:license)',
+            'license_uri' => 'string(//rc:package/rc:license/@uri)',
+            'src_uri' => 'string(//rc:package/rc:srcuri)',
+            'uri' => 'string(//rc:package/rc:uri)',
+          );
+
+          foreach ($metadata as $key => $path) {
+            $info[$key] = $xpath->evaluate($path);
+          }
+
+          // dependent required plugins (can be used, but not included in config)
+          $deps = $xpath->evaluate('//rc:package/rc:dependencies/rc:required/rc:package/rc:name');
+          for ($i = 0; $i < $deps->length; $i++) {
+            $dn = $deps->item($i)->nodeValue;
+            $info['requires'][] = $dn;
+          }
+        }
+      }
+
+      return $info;
+    }
+
+    /**
      * Allows a plugin object to register a callback for a certain hook
      *
      * @param string $hook Hook name
@@ -372,7 +491,7 @@ class rcube_plugin_api
     /**
      * Register this plugin to be responsible for a specific task
      *
-     * @param string $task Task name (only characters [a-z0-9_.-] are allowed)
+     * @param string $task Task name (only characters [a-z0-9_-] are allowed)
      * @param string $owner Plugin name that registers this action
      */
     public function register_task($task, $owner)
@@ -382,7 +501,7 @@ class rcube_plugin_api
             return true;
         }
 
-        if ($task != asciiwords($task)) {
+        if ($task != asciiwords($task, true)) {
             rcube::raise_error(array('code' => 526, 'type' => 'php',
                 'file' => __FILE__, 'line' => __LINE__,
                 'message' => "Invalid task name: $task."
diff --git a/program/lib/Roundcube/rcube_result_set.php b/program/lib/Roundcube/rcube_result_set.php
index 1391e5e4b..a4b070e28 100644
--- a/program/lib/Roundcube/rcube_result_set.php
+++ b/program/lib/Roundcube/rcube_result_set.php
@@ -3,7 +3,7 @@
 /*
  +-----------------------------------------------------------------------+
  | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2006-2011, The Roundcube Dev Team                       |
+ | Copyright (C) 2006-2013, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -17,20 +17,22 @@
 */
 
 /**
- * Roundcube result set class.
+ * Roundcube result set class
+ *
  * Representing an address directory result set.
+ * Implenets Iterator and thus be used in foreach() loops.
  *
  * @package    Framework
  * @subpackage Addressbook
  */
-class rcube_result_set
+class rcube_result_set implements Iterator
 {
-    var $count = 0;
-    var $first = 0;
-    var $current = 0;
-    var $searchonly = false;
-    var $records = array();
+    public $count = 0;
+    public $first = 0;
+    public $searchonly = false;
+    public $records = array();
 
+    private $current = 0;
 
     function __construct($c=0, $f=0)
     {
@@ -51,18 +53,39 @@ class rcube_result_set
     function first()
     {
         $this->current = 0;
-        return $this->records[$this->current++];
+        return $this->records[$this->current];
+    }
+
+    function seek($i)
+    {
+        $this->current = $i;
+    }
+
+    /***  PHP 5 Iterator interface  ***/
+
+    function rewind()
+    {
+        $this->current = 0;
+    }
+
+    function current()
+    {
+        return $this->records[$this->current];
+    }
+
+    function key()
+    {
+        return $this->current;
     }
 
-    // alias for iterate()
     function next()
     {
         return $this->iterate();
     }
 
-    function seek($i)
+    function valid()
     {
-        $this->current = $i;
+        return isset($this->records[$this->current]);
     }
 
 }
diff --git a/program/lib/Roundcube/rcube_session.php b/program/lib/Roundcube/rcube_session.php
index 1aa5d5856..615ec6f0e 100644
--- a/program/lib/Roundcube/rcube_session.php
+++ b/program/lib/Roundcube/rcube_session.php
@@ -32,6 +32,8 @@ class rcube_session
     private $ip;
     private $start;
     private $changed;
+    private $time_diff = 0;
+    private $reloaded = false;
     private $unsets = array();
     private $gc_handlers = array();
     private $cookiename = 'roundcube_sessauth';
@@ -41,6 +43,7 @@ class rcube_session
     private $secret = '';
     private $ip_check = false;
     private $logging = false;
+    private $storage;
     private $memcache;
 
 
@@ -58,11 +61,14 @@ class rcube_session
         $this->set_lifetime($lifetime);
 
         // use memcache backend
-        if ($config->get('session_storage', 'db') == 'memcache') {
+        $this->storage = $config->get('session_storage', 'db');
+        if ($this->storage == 'memcache') {
             $this->memcache = rcube::get_instance()->get_memcache();
 
             // set custom functions for PHP session management if memcache is available
             if ($this->memcache) {
+                ini_set('session.serialize_handler', 'php');
+
                 session_set_save_handler(
                     array($this, 'open'),
                     array($this, 'close'),
@@ -78,7 +84,9 @@ class rcube_session
                 true, true);
             }
         }
-        else {
+        else if ($this->storage != 'php') {
+            ini_set('session.serialize_handler', 'php');
+
             // set custom functions for PHP session management
             session_set_save_handler(
                 array($this, 'open'),
@@ -86,7 +94,23 @@ class rcube_session
                 array($this, 'db_read'),
                 array($this, 'db_write'),
                 array($this, 'db_destroy'),
-                array($this, 'db_gc'));
+                array($this, 'gc'));
+        }
+    }
+
+
+    /**
+     * Wrapper for session_start()
+     */
+    public function start()
+    {
+        session_start();
+
+        // copy some session properties to object vars
+        if ($this->storage == 'php') {
+            $this->key     = session_id();
+            $this->ip      = $_SESSION['__IP'];
+            $this->changed = $_SESSION['__MTIME'];
         }
     }
 
@@ -115,6 +139,25 @@ class rcube_session
 
 
     /**
+     * Wrapper for session_write_close()
+     */
+    public function write_close()
+    {
+        if ($this->storage == 'php') {
+            $_SESSION['__IP'] = $this->ip;
+            $_SESSION['__MTIME'] = time();
+        }
+
+        session_write_close();
+
+        // write_close() is called on script shutdown, see rcube::shutdown()
+        // execute cleanup functionality if enabled by session gc handler
+        // we do this after closing the session for better performance
+        $this->gc_shutdown();
+    }
+
+
+    /**
      * Read session data from database
      *
      * @param string Session ID
@@ -124,14 +167,16 @@ class rcube_session
     public function db_read($key)
     {
         $sql_result = $this->db->query(
-            "SELECT vars, ip, changed FROM ".$this->db->table_name('session')
-            ." WHERE sess_id = ?", $key);
+            "SELECT vars, ip, changed, " . $this->db->now() . " AS ts"
+            . " FROM " . $this->db->table_name('session')
+            . " WHERE sess_id = ?", $key);
 
         if ($sql_result && ($sql_arr = $this->db->fetch_assoc($sql_result))) {
-            $this->changed = strtotime($sql_arr['changed']);
-            $this->ip      = $sql_arr['ip'];
-            $this->vars    = base64_decode($sql_arr['vars']);
-            $this->key     = $key;
+            $this->time_diff = time() - strtotime($sql_arr['ts']);
+            $this->changed   = strtotime($sql_arr['changed']);
+            $this->ip        = $sql_arr['ip'];
+            $this->vars      = base64_decode($sql_arr['vars']);
+            $this->key       = $key;
 
             return !empty($this->vars) ? (string) $this->vars : '';
         }
@@ -151,8 +196,9 @@ class rcube_session
      */
     public function db_write($key, $vars)
     {
-        $ts  = microtime(true);
-        $now = $this->db->fromunixtime((int)$ts);
+        $now   = $this->db->now();
+        $table = $this->db->table_name('session');
+        $ts    = microtime(true);
 
         // no session row in DB (db_read() returns false)
         if (!$this->key) {
@@ -170,22 +216,19 @@ class rcube_session
             $newvars = $this->_fixvars($vars, $oldvars);
 
             if ($newvars !== $oldvars) {
-                $this->db->query(
-                    sprintf("UPDATE %s SET vars=?, changed=%s WHERE sess_id=?",
-                        $this->db->table_name('session'), $now),
-                        base64_encode($newvars), $key);
+                $this->db->query("UPDATE $table "
+                    . "SET changed = $now, vars = ? WHERE sess_id = ?",
+                    base64_encode($newvars), $key);
             }
-            else if ($ts - $this->changed > $this->lifetime / 2) {
-                $this->db->query("UPDATE ".$this->db->table_name('session')
-                    ." SET changed=$now WHERE sess_id=?", $key);
+            else if ($ts - $this->changed + $this->time_diff > $this->lifetime / 2) {
+                $this->db->query("UPDATE $table SET changed = $now"
+                    . " WHERE sess_id = ?", $key);
             }
         }
         else {
-            $this->db->query(
-                sprintf("INSERT INTO %s (sess_id, vars, ip, created, changed) ".
-                    "VALUES (?, ?, ?, %s, %s)",
-                    $this->db->table_name('session'), $now, $now),
-                    $key, base64_encode($vars), (string)$this->ip);
+            $this->db->query("INSERT INTO $table (sess_id, vars, ip, created, changed)"
+                . " VALUES (?, ?, ?, $now, $now)",
+                $key, base64_encode($vars), (string)$this->ip);
         }
 
         return true;
@@ -200,8 +243,18 @@ class rcube_session
         if ($oldvars !== null) {
             $a_oldvars = $this->unserialize($oldvars);
             if (is_array($a_oldvars)) {
-                foreach ((array)$this->unsets as $k)
-                    unset($a_oldvars[$k]);
+                // remove unset keys on oldvars
+                foreach ((array)$this->unsets as $var) {
+                    if (isset($a_oldvars[$var])) {
+                        unset($a_oldvars[$var]);
+                    }
+                    else {
+                        $path = explode('.', $var);
+                        $k = array_pop($path);
+                        $node = &$this->get_node($path, $a_oldvars);
+                        unset($node[$k]);
+                    }
+                }
 
                 $newvars = $this->serialize(array_merge(
                     (array)$a_oldvars, (array)$this->unserialize($vars)));
@@ -235,25 +288,6 @@ class rcube_session
 
 
     /**
-     * Garbage collecting function
-     *
-     * @param string Session lifetime in seconds
-     * @return boolean True on success
-     */
-    public function db_gc($maxlifetime)
-    {
-        // just delete all expired sessions
-        $this->db->query(
-            sprintf("DELETE FROM %s WHERE changed < %s",
-                $this->db->table_name('session'), $this->db->fromunixtime(time() - $maxlifetime)));
-
-        $this->gc();
-
-        return true;
-    }
-
-
-    /**
      * Read session data from memcache
      *
      * @param string Session ID
@@ -329,11 +363,11 @@ class rcube_session
     /**
      * Execute registered garbage collector routines
      */
-    public function gc()
+    public function gc($maxlifetime)
     {
-        foreach ($this->gc_handlers as $fct) {
-            call_user_func($fct);
-        }
+        // move gc execution to the script shutdown function
+        // see rcube::shutdown() and rcube_session::write_close()
+        return $this->gc_enabled = $maxlifetime;
     }
 
 
@@ -355,6 +389,25 @@ class rcube_session
 
 
     /**
+     * Garbage collector handler to run on script shutdown
+     */
+    protected function gc_shutdown()
+    {
+        if ($this->gc_enabled) {
+            // just delete all expired sessions
+            if ($this->storage == 'db') {
+                $this->db->query("DELETE FROM " . $this->db->table_name('session')
+                    . " WHERE changed < " . $this->db->now(-$this->gc_enabled));
+            }
+
+            foreach ($this->gc_handlers as $fct) {
+                call_user_func($fct);
+            }
+        }
+    }
+
+
+    /**
      * Generate and set new session id
      *
      * @param boolean $destroy If enabled the current session will be destroyed
@@ -371,9 +424,32 @@ class rcube_session
 
 
     /**
+     * Append the given value to the certain node in the session data array
+     *
+     * @param string Path denoting the session variable where to append the value
+     * @param string Key name under which to append the new value (use null for appending to an indexed list)
+     * @param mixed  Value to append to the session data array
+     */
+    public function append($path, $key, $value)
+    {
+        // re-read session data from DB because it might be outdated
+        if (!$this->reloaded && microtime(true) - $this->start > 0.5) {
+            $this->reload();
+            $this->reloaded = true;
+            $this->start = microtime(true);
+        }
+
+        $node = &$this->get_node(explode('.', $path), $_SESSION);
+
+        if ($key !== null) $node[$key] = $value;
+        else               $node[] = $value;
+    }
+
+
+    /**
      * Unset a session variable
      *
-     * @param string Varibale name
+     * @param string Variable name (can be a path denoting a certain node in the session array, e.g. compose.attachments.5)
      * @return boolean True on success
      */
     public function remove($var=null)
@@ -383,7 +459,16 @@ class rcube_session
         }
 
         $this->unsets[] = $var;
-        unset($_SESSION[$var]);
+
+        if (isset($_SESSION[$var])) {
+            unset($_SESSION[$var]);
+        }
+        else {
+            $path = explode('.', $var);
+            $key = array_pop($path);
+            $node = &$this->get_node($path, $_SESSION);
+            unset($node[$key]);
+        }
 
         return true;
     }
@@ -415,6 +500,23 @@ class rcube_session
             session_decode($data);
     }
 
+    /**
+     * Returns a reference to the node in data array referenced by the given path.
+     * e.g. ['compose','attachments'] will return $_SESSION['compose']['attachments']
+     */
+    private function &get_node($path, &$data_arr)
+    {
+        $node = &$data_arr;
+        if (!empty($path)) {
+            foreach ((array)$path as $key) {
+                if (!isset($node[$key]))
+                    $node[$key] = array();
+                $node = &$node[$key];
+            }
+        }
+
+        return $node;
+    }
 
     /**
      * Serialize session data
diff --git a/program/lib/Roundcube/rcube_smtp.php b/program/lib/Roundcube/rcube_smtp.php
index 5c7d2203c..60b1389ea 100644
--- a/program/lib/Roundcube/rcube_smtp.php
+++ b/program/lib/Roundcube/rcube_smtp.php
@@ -33,6 +33,8 @@ class rcube_smtp
     // define headers delimiter
     const SMTP_MIME_CRLF = "\r\n";
 
+    const DEBUG_LINE_LENGTH = 4098; // 4KB + 2B for \r\n
+
 
     /**
      * SMTP Connection and authentication
@@ -119,7 +121,7 @@ class rcube_smtp
         }
 
         // try to connect to server and exit on failure
-        $result = $this->conn->connect($smtp_timeout);
+        $result = $this->conn->connect($CONFIG['smtp_timeout']);
 
         if (PEAR::isError($result)) {
             $this->response[] = "Connection failed: ".$result->getMessage();
@@ -327,6 +329,12 @@ class rcube_smtp
      */
     public function debug_handler(&$smtp, $message)
     {
+        if (($len = strlen($message)) > self::DEBUG_LINE_LENGTH) {
+            $diff    = $len - self::DEBUG_LINE_LENGTH;
+            $message = substr($message, 0, self::DEBUG_LINE_LENGTH)
+                . "... [truncated $diff bytes]";
+        }
+
         rcube::write_log('smtp', preg_replace('/\r\n$/', '', $message));
     }
 
@@ -433,9 +441,9 @@ class rcube_smtp
         $recipients = rcube_utils::explode_quoted_string(',', $recipients);
 
         reset($recipients);
-        while (list($k, $recipient) = each($recipients)) {
+        foreach ($recipients as $recipient) {
             $a = rcube_utils::explode_quoted_string(' ', $recipient);
-            while (list($k2, $word) = each($a)) {
+            foreach ($a as $word) {
                 if (strpos($word, "@") > 0 && $word[strlen($word)-1] != '"') {
                     $word = preg_replace('/^<|>$/', '', trim($word));
                     if (in_array($word, $addresses) === false) {
diff --git a/program/lib/Roundcube/rcube_spellchecker.php b/program/lib/Roundcube/rcube_spellchecker.php
index 3d4d3a3d6..60aec500f 100644
--- a/program/lib/Roundcube/rcube_spellchecker.php
+++ b/program/lib/Roundcube/rcube_spellchecker.php
@@ -31,7 +31,7 @@ class rcube_spellchecker
     private $lang;
     private $rc;
     private $error;
-    private $separator = '/[\s\r\n\t\(\)\/\[\]{}<>\\"]+|[:;?!,\.]([^\w]|$)/';
+    private $separator = '/[\s\r\n\t\(\)\/\[\]{}<>\\"]+|[:;?!,\.](?=\W|$)/';
     private $options = array();
     private $dict;
     private $have_dict;
@@ -314,11 +314,6 @@ class rcube_spellchecker
         if (!$this->plink) {
             if (!extension_loaded('pspell')) {
                 $this->error = "Pspell extension not available";
-                rcube::raise_error(array(
-                    'code' => 500, 'type' => 'php',
-                    'file' => __FILE__, 'line' => __LINE__,
-                    'message' => $this->error), true, false);
-
                 return;
             }
 
@@ -372,9 +367,19 @@ class rcube_spellchecker
             fclose($fp);
         }
 
+        // parse HTTP response
+        if (preg_match('!^HTTP/1.\d (\d+)(.+)!', $store, $m)) {
+            $http_status = $m[1];
+            if ($http_status != '200')
+                $this->error = 'HTTP ' . $m[1] . $m[2];
+        }
+
         if (!$store) {
             $this->error = "Empty result from spelling engine";
         }
+        else if (preg_match('/<spellresult error="([^"]+)"/', $store, $m)) {
+            $this->error = "Error code $m[1] returned";
+        }
 
         preg_match_all('/<c o="([^"]*)" l="([^"]*)" s="([^"]*)">([^<]*)<\/c>/', $store, $matches, PREG_SET_ORDER);
 
@@ -588,7 +593,7 @@ class rcube_spellchecker
 
         if (empty($plugin['abort'])) {
             $dict = array();
-            $this->rc->db->query(
+            $sql_result = $this->rc->db->query(
                 "SELECT data FROM ".$this->rc->db->table_name('dictionary')
                 ." WHERE user_id ". ($plugin['userid'] ? "= ".$this->rc->db->quote($plugin['userid']) : "IS NULL")
                     ." AND " . $this->rc->db->quoteIdentifier('language') . " = ?",
diff --git a/program/lib/Roundcube/rcube_storage.php b/program/lib/Roundcube/rcube_storage.php
index 8a36f1f9d..b17291bdf 100644
--- a/program/lib/Roundcube/rcube_storage.php
+++ b/program/lib/Roundcube/rcube_storage.php
@@ -807,13 +807,14 @@ abstract class rcube_storage
 
 
     /**
-     * Returns current status of a folder
+     * Returns current status of a folder (compared to the last time use)
      *
      * @param string $folder Folder name
+     * @param array  $diff   Difference data
      *
      * @return int Folder status
      */
-    abstract function folder_status($folder = null);
+    abstract function folder_status($folder = null, &$diff = array());
 
 
     /**
@@ -985,6 +986,6 @@ abstract class rcube_storage
     /**
      * Delete outdated cache entries
      */
-    abstract function expunge_cache();
+    abstract function cache_gc();
 
 }  // end class rcube_storage
diff --git a/program/lib/Roundcube/rcube_string_replacer.php b/program/lib/Roundcube/rcube_string_replacer.php
index 49a378166..0fc90a55a 100644
--- a/program/lib/Roundcube/rcube_string_replacer.php
+++ b/program/lib/Roundcube/rcube_string_replacer.php
@@ -28,9 +28,10 @@ class rcube_string_replacer
     public $mailto_pattern;
     public $link_pattern;
     private $values = array();
+    private $options = array();
 
 
-    function __construct()
+    function __construct($options = array())
     {
         // Simplified domain expression for UTF8 characters handling
         // Support unicode/punycode in top-level domain part
@@ -44,6 +45,8 @@ class rcube_string_replacer
             ."@$utf_domain"                                                 // domain-part
             ."(\?[$url1$url2]+)?"                                           // e.g. ?subject=test...
             .")/";
+
+        $this->options = $options;
     }
 
     /**
@@ -89,15 +92,15 @@ class rcube_string_replacer
 
         if ($url) {
             $suffix = $this->parse_url_brackets($url);
-            $i = $this->add($prefix . html::a(array(
-                'href'   => $url_prefix . $url,
-                'target' => '_blank'
-            ), rcube::Q($url)) . $suffix);
+            $attrib = (array)$this->options['link_attribs'];
+            $attrib['href'] = $url_prefix . $url;
+
+            $i = $this->add(html::a($attrib, rcube::Q($url)) . $suffix);
         }
 
         // Return valid link for recognized schemes, otherwise
         // return the unmodified string for unrecognized schemes.
-        return $i >= 0 ? $this->get_replacement($i) : $matches[0];
+        return $i >= 0 ? $prefix . $this->get_replacement($i) : $matches[0];
     }
 
     /**
diff --git a/program/lib/Roundcube/rcube_user.php b/program/lib/Roundcube/rcube_user.php
index 505b190d1..5e9c9af80 100644
--- a/program/lib/Roundcube/rcube_user.php
+++ b/program/lib/Roundcube/rcube_user.php
@@ -495,9 +495,9 @@ class rcube_user
             "INSERT INTO ".$dbh->table_name('users').
             " (created, last_login, username, mail_host, language)".
             " VALUES (".$dbh->now().", ".$dbh->now().", ?, ?, ?)",
-            strip_newlines($data['user']),
-            strip_newlines($data['host']),
-            strip_newlines($data['language']));
+            $data['user'],
+            $data['host'],
+            $data['language']);
 
         if ($user_id = $dbh->insert_id('users')) {
             // create rcube_user instance to make plugin hooks work
@@ -517,7 +517,7 @@ class rcube_user
                 if (empty($user_email)) {
                     $user_email = strpos($data['user'], '@') ? $user : sprintf('%s@%s', $data['user'], $mail_domain);
                 }
-                $email_list[] = strip_newlines($user_email);
+                $email_list[] = $user_email;
             }
             // identities_level check
             else if (count($email_list) > 1 && $rcube->config->get('identities_level', 0) > 1) {
@@ -547,7 +547,6 @@ class rcube_user
                     $record['name'] = $user_name != $record['email'] ? $user_name : '';
                 }
 
-                $record['name']     = strip_newlines($record['name']);
                 $record['user_id']  = $user_id;
                 $record['standard'] = $standard;
 
diff --git a/program/lib/Roundcube/rcube_utils.php b/program/lib/Roundcube/rcube_utils.php
index 1ae782a25..29baa82f3 100644
--- a/program/lib/Roundcube/rcube_utils.php
+++ b/program/lib/Roundcube/rcube_utils.php
@@ -404,7 +404,7 @@ class rcube_utils
         $out = array();
         $src = $mode == self::INPUT_GET ? $_GET : ($mode == self::INPUT_POST ? $_POST : $_REQUEST);
 
-        foreach ($src as $key => $value) {
+        foreach (array_keys($src) as $key) {
             $fname = $key[0] == '_' ? substr($key, 1) : $key;
             if ($ignore && !preg_match('/^(' . $ignore . ')$/', $fname)) {
                 $out[$fname] = self::get_input_value($key, $mode);
@@ -510,17 +510,24 @@ class rcube_utils
      */
     public static function file2class($mimetype, $filename)
     {
+        $mimetype = strtolower($mimetype);
+        $filename = strtolower($filename);
+
         list($primary, $secondary) = explode('/', $mimetype);
 
         $classes = array($primary ? $primary : 'unknown');
+
         if ($secondary) {
             $classes[] = $secondary;
         }
-        if (preg_match('/\.([a-z0-9]+)$/i', $filename, $m)) {
-            $classes[] = $m[1];
+
+        if (preg_match('/\.([a-z0-9]+)$/', $filename, $m)) {
+            if (!in_array($m[1], $classes)) {
+                $classes[] = $m[1];
+            }
         }
 
-        return strtolower(join(" ", $classes));
+        return join(" ", $classes);
     }
 
 
@@ -726,11 +733,23 @@ class rcube_utils
             return mktime(0,0,0, intval($matches[2]), intval($matches[3]), intval($matches[1]));
         }
         else if (is_numeric($date)) {
-            return $date;
+            return (int) $date;
         }
 
-        // support non-standard "GMTXXXX" literal
-        $date = preg_replace('/GMT\s*([+-][0-9]+)/', '\\1', $date);
+        // Clean malformed data
+        $date = preg_replace(
+            array(
+                '/GMT\s*([+-][0-9]+)/',                     // support non-standard "GMTXXXX" literal
+                '/[^a-z0-9\x20\x09:+-]/i',                  // remove any invalid characters
+                '/\s*(Mon|Tue|Wed|Thu|Fri|Sat|Sun)\s*/i',   // remove weekday names
+            ),
+            array(
+                '\\1',
+                '',
+                '',
+            ), $date);
+
+        $date = trim($date);
 
         // if date parsing fails, we have a date in non-rfc format.
         // remove token from the end and try again
@@ -743,7 +762,7 @@ class rcube_utils
             $date = implode(' ', $d);
         }
 
-        return $ts;
+        return (int) $ts;
     }
 
 
diff --git a/program/lib/Roundcube/rcube_vcard.php b/program/lib/Roundcube/rcube_vcard.php
index c2b30af59..90acb2110 100644
--- a/program/lib/Roundcube/rcube_vcard.php
+++ b/program/lib/Roundcube/rcube_vcard.php
@@ -90,7 +90,7 @@ class rcube_vcard
      */
     public function __construct($vcard = null, $charset = RCUBE_CHARSET, $detect = false, $fieldmap = array())
     {
-        if (!empty($fielmap)) {
+        if (!empty($fieldmap)) {
             $this->extend_fieldmap($fieldmap);
         }
 
@@ -481,7 +481,7 @@ class rcube_vcard
         $vcard_block    = '';
         $in_vcard_block = false;
 
-        foreach (preg_split("/[\r\n]+/", $data) as $i => $line) {
+        foreach (preg_split("/[\r\n]+/", $data) as $line) {
             if ($in_vcard_block && !empty($line)) {
                 $vcard_block .= $line . "\n";
             }
@@ -491,7 +491,9 @@ class rcube_vcard
             if (preg_match('/^END:VCARD$/i', $line)) {
                 // parse vcard
                 $obj = new rcube_vcard(self::cleanup($vcard_block), $charset, true, self::$fieldmap);
-                if (!empty($obj->displayname) || !empty($obj->email)) {
+                // FN and N is required by vCard format (RFC 2426)
+                // on import we can be less restrictive, let's addressbook decide
+                if (!empty($obj->displayname) || !empty($obj->surname) || !empty($obj->firstname) || !empty($obj->email)) {
                     $out[] = $obj;
                 }
 
@@ -513,7 +515,7 @@ class rcube_vcard
      *
      * @return string Cleaned vcard block
      */
-    private static function cleanup($vcard)
+    public static function cleanup($vcard)
     {
         // Convert special types (like Skype) to normal type='skype' classes with this simple regex ;)
         $vcard = preg_replace(
@@ -782,9 +784,30 @@ class rcube_vcard
                 }
                 return $result;
             }
+
+            $s = strtr($s, $rep2);
+        }
+
+        // some implementations (GMail) use non-standard backslash before colon (#1489085)
+        // we will handle properly any backslashed character - removing dummy backslahes
+        // return strtr($s, array("\r" => '', '\\\\' => '\\', '\n' => "\n", '\N' => "\n", '\,' => ',', '\;' => ';'));
+
+        $s   = str_replace("\r", '', $s);
+        $pos = 0;
+
+        while (($pos = strpos($s, '\\', $pos)) !== false) {
+            $next = substr($s, $pos + 1, 1);
+            if ($next == 'n' || $next == 'N') {
+                $s = substr_replace($s, "\n", $pos, 2);
+            }
+            else {
+                $s = substr_replace($s, '', $pos, 1);
+            }
+
+            $pos += 1;
         }
 
-        return strtr($s, array("\r" => '', '\\\\' => '\\', '\n' => "\n", '\N' => "\n", '\,' => ',', '\;' => ';'));
+        return $s;
     }
 
     /**
diff --git a/program/lib/Roundcube/rcube_washtml.php b/program/lib/Roundcube/rcube_washtml.php
index 715c46047..6b2efcc78 100644
--- a/program/lib/Roundcube/rcube_washtml.php
+++ b/program/lib/Roundcube/rcube_washtml.php
@@ -113,10 +113,9 @@ class rcube_washtml
         'type', 'rows', 'cols', 'disabled', 'readonly', 'checked', 'multiple', 'value'
     );
 
-    /* Block elements which could be empty but cannot be returned in short form (<tag />) */
-    static $block_elements = array('div', 'p', 'pre', 'blockquote', 'a', 'font', 'center',
-        'table', 'ul', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'ol', 'dl', 'strong',
-        'i', 'b', 'u', 'span',
+    /* Elements which could be empty and be returned in short form (<tag />) */
+    static $void_elements = array('area', 'base', 'br', 'col', 'command', 'embed', 'hr',
+        'img', 'input', 'keygen', 'link', 'meta', 'param', 'source', 'track', 'wbr'
     );
 
     /* State for linked objects in HTML */
@@ -134,12 +133,15 @@ class rcube_washtml
     /* Ignore these HTML tags but process their content */
     private $_ignore_elements = array();
 
-    /* Block elements which could be empty but cannot be returned in short form (<tag />) */
-    private $_block_elements = array();
+    /* Elements which could be empty and be returned in short form (<tag />) */
+    private $_void_elements = array();
 
     /* Allowed HTML attributes */
     private $_html_attribs = array();
 
+    /* Max nesting level */
+    private $max_nesting_level;
+
 
     /**
      * Class constructor
@@ -149,9 +151,9 @@ class rcube_washtml
         $this->_html_elements   = array_flip((array)$p['html_elements']) + array_flip(self::$html_elements) ;
         $this->_html_attribs    = array_flip((array)$p['html_attribs']) + array_flip(self::$html_attribs);
         $this->_ignore_elements = array_flip((array)$p['ignore_elements']) + array_flip(self::$ignore_elements);
-        $this->_block_elements  = array_flip((array)$p['block_elements']) + array_flip(self::$block_elements);
+        $this->_void_elements   = array_flip((array)$p['void_elements']) + array_flip(self::$void_elements);
 
-        unset($p['html_elements'], $p['html_attribs'], $p['ignore_elements'], $p['block_elements']);
+        unset($p['html_elements'], $p['html_attribs'], $p['ignore_elements'], $p['void_elements']);
 
         $this->config = $p + array('show_washed' => true, 'allow_remote' => false, 'cid_map' => array());
     }
@@ -240,7 +242,8 @@ class rcube_washtml
             $value = $node->getAttribute($key);
 
             if (isset($this->_html_attribs[$key]) ||
-                ($key == 'href' && !preg_match('!^(javascript|vbscript|data:text)!i', $value)
+                ($key == 'href' && ($value = trim($value))
+                    && !preg_match('!^(javascript|vbscript|data:text)!i', $value)
                     && preg_match('!^([a-z][a-z0-9.+-]+:|//|#).+!i', $value))
             ) {
                 $t .= ' ' . $key . '="' . htmlspecialchars($value, ENT_QUOTES) . '"';
@@ -283,12 +286,26 @@ class rcube_washtml
      * It output only allowed tags with allowed attributes
      * and allowed inline styles
      */
-    private function dumpHtml($node)
+    private function dumpHtml($node, $level = 0)
     {
         if (!$node->hasChildNodes()) {
             return '';
         }
 
+        $level++;
+
+        if ($this->max_nesting_level > 0 && $level == $this->max_nesting_level - 1) {
+            // log error message once
+            if (!$this->max_nesting_level_error) {
+                $this->max_nesting_level_error = true;
+                rcube::raise_error(array('code' => 500, 'type' => 'php',
+                    'line' => __LINE__, 'file' => __FILE__,
+                    'message' => "Maximum nesting level exceeded (xdebug.max_nesting_level={$this->max_nesting_level})"),
+                    true, false);
+            }
+            return '<!-- ignored -->';
+        }
+
         $node = $node->firstChild;
         $dump = '';
 
@@ -298,19 +315,19 @@ class rcube_washtml
                 $tagName = strtolower($node->tagName);
                 if ($callback = $this->handlers[$tagName]) {
                     $dump .= call_user_func($callback, $tagName,
-                        $this->wash_attribs($node), $this->dumpHtml($node), $this);
+                        $this->wash_attribs($node), $this->dumpHtml($node, $level), $this);
                 }
                 else if (isset($this->_html_elements[$tagName])) {
-                    $content = $this->dumpHtml($node);
+                    $content = $this->dumpHtml($node, $level);
                     $dump .= '<' . $tagName . $this->wash_attribs($node) .
-                        ($content != '' || isset($this->_block_elements[$tagName]) ? ">$content</$tagName>" : ' />');
+                        ($content === '' && isset($this->_void_elements[$tagName]) ? ' />' : ">$content</$tagName>");
                 }
                 else if (isset($this->_ignore_elements[$tagName])) {
                     $dump .= '<!-- ' . htmlspecialchars($tagName, ENT_QUOTES) . ' not allowed -->';
                 }
                 else {
                     $dump .= '<!-- ' . htmlspecialchars($tagName, ENT_QUOTES) . ' ignored -->';
-                    $dump .= $this->dumpHtml($node); // ignore tags not its content
+                    $dump .= $this->dumpHtml($node, $level); // ignore tags not its content
                 }
                 break;
 
@@ -323,14 +340,14 @@ class rcube_washtml
                 break;
 
             case XML_HTML_DOCUMENT_NODE:
-                $dump .= $this->dumpHtml($node);
+                $dump .= $this->dumpHtml($node, $level);
                 break;
 
             case XML_DOCUMENT_TYPE_NODE:
                 break;
 
             default:
-                $dump . '<!-- node type ' . $node->nodeType . ' -->';
+                $dump .= '<!-- node type ' . $node->nodeType . ' -->';
             }
         } while($node = $node->nextSibling);
 
@@ -357,6 +374,9 @@ class rcube_washtml
             $this->config['base_url'] = '';
         }
 
+        // Detect max nesting level (for dumpHTML) (#1489110)
+        $this->max_nesting_level = (int) @ini_get('xdebug.max_nesting_level');
+
         @$node->loadHTML($html);
         return $this->dumpHtml($node);
     }
@@ -404,6 +424,7 @@ class rcube_washtml
             rcube::raise_error(array('code' => 620, 'type' => 'php',
                 'line' => __LINE__, 'file' => __FILE__,
                 'message' => $errstr), true, false);
+
             return '';
         }
 
@@ -412,7 +433,8 @@ class rcube_washtml
 
         // Remove invalid HTML comments (#1487759)
         // Don't remove valid conditional comments
-        $html = preg_replace('/<!--[^->[\n]*>/', '', $html);
+        // Don't remove MSOutlook (<!-->) conditional comments (#1489004)
+        $html = preg_replace('/<!--[^->\[\n]+>/', '', $html);
 
         // turn relative into absolute urls
         $html = self::resolve_base($html);
diff --git a/program/lib/tnef_decoder.php b/program/lib/tnef_decoder.php
index 28d368989..e6ccc23d7 100644
--- a/program/lib/tnef_decoder.php
+++ b/program/lib/tnef_decoder.php
@@ -243,16 +243,16 @@ class tnef_decoder
             /* Store any interesting attributes. */
             switch ($attr_name) {
             case self::MAPI_ATTACH_LONG_FILENAME:
+                $value = str_replace("\0", '', $value);
                 /* Used in preference to AFILENAME value. */
                 $attachment_data[0]['name'] = preg_replace('/.*[\/](.*)$/', '\1', $value);
-                $attachment_data[0]['name'] = str_replace("\0", '', $attachment_data[0]['name']);
                 break;
 
             case self::MAPI_ATTACH_MIME_TAG:
+                $value = str_replace("\0", '', $value);
                 /* Is this ever set, and what is format? */
-                $attachment_data[0]['type'] = preg_replace('/^(.*)\/.*/', '\1', $value);
+                $attachment_data[0]['type']    = preg_replace('/^(.*)\/.*/', '\1', $value);
                 $attachment_data[0]['subtype'] = preg_replace('/.*\/(.*)$/', '\1', $value);
-                $attachment_data[0]['subtype'] = str_replace("\0", '', $attachment_data[0]['subtype']);
                 break;
             }
         }
@@ -295,9 +295,10 @@ class tnef_decoder
             break;
 
         case self::AFILENAME:
+            $value = $this->_getx($data, $this->_geti($data, 32));
+            $value = str_replace("\0", '', $value);
             /* Strip path. */
-            $attachment_data[0]['name'] = preg_replace('/.*[\/](.*)$/', '\1', $this->_getx($data, $this->_geti($data, 32)));
-            $attachment_data[0]['name'] = str_replace("\0", '', $attachment_data[0]['name']);
+            $attachment_data[0]['name'] = preg_replace('/.*[\/](.*)$/', '\1', $value);
 
             /* Checksum */
             $this->_geti($data, 16);
diff --git a/program/lib/utf8.class.php b/program/lib/utf8.class.php
index e0dc9e2bd..0446159c7 100644
--- a/program/lib/utf8.class.php
+++ b/program/lib/utf8.class.php
@@ -60,8 +60,8 @@ Class utf8 {
   function loadCharset($charset) {
     
     $charset = preg_replace(array('/^WINDOWS-*125([0-8])$/', '/^CP-/'), array('CP125\\1', 'CP'), $charset);
-    if (isset($aliases[$charset]))
-      $charset = $aliases[$charset];
+    if (isset($this->aliases[$charset]))
+      $charset = $this->aliases[$charset];
     
     $this->charset = $charset;
 
diff --git a/program/localization/ar_SA/labels.inc b/program/localization/ar_SA/labels.inc
index 0fe7214d6..af08cc301 100644
--- a/program/localization/ar_SA/labels.inc
+++ b/program/localization/ar_SA/labels.inc
@@ -2,56 +2,78 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ar_SA/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Fifawe <hany.samir@gmail.com>                                 |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = 'مرحباً بكم في $product';
-$labels['username'] = 'اسم المستخدم';
-$labels['password'] = 'كلمة المرور';
-$labels['server'] = 'الخادم';
-$labels['login'] = 'تسجيل الدخول';
-$labels['logout'] = 'تسجيل الخروج';
-$labels['mail'] = 'البريد';
+
+// login page
+$labels['welcome']   = 'مرحباً بكم في $product';
+$labels['username']  = 'اسم المستخدم';
+$labels['password']  = 'كلمة المرور';
+$labels['server']    = 'الخادم';
+$labels['login']     = 'تسجيل الدخول';
+
+// taskbar
+$labels['logout']   = 'تسجيل الخروج';
+$labels['mail']     = 'البريد';
 $labels['settings'] = 'الإعدادات الشخصية';
 $labels['addressbook'] = 'دفتر العناوين';
-$labels['inbox'] = 'الوارد';
+
+// mailbox names
+$labels['inbox']  = 'الوارد';
 $labels['drafts'] = 'المسودات';
-$labels['sent'] = 'المرسل';
-$labels['trash'] = 'المهملات';
-$labels['junk'] = 'غير المرغوب';
+$labels['sent']   = 'المرسل';
+$labels['trash']  = 'المهملات';
+$labels['junk']   = 'غير المرغوب';
+
+// message listing
 $labels['subject'] = 'الموضوع';
-$labels['from'] = 'المرسل';
-$labels['to'] = 'المستقبل';
-$labels['cc'] = 'نسخة';
-$labels['bcc'] = 'نسخة مخفية';
+$labels['from']    = 'المرسل';
+$labels['sender']  = 'Sender';
+$labels['to']      = 'المستقبل';
+$labels['cc']      = 'نسخة';
+$labels['bcc']     = 'نسخة مخفية';
 $labels['replyto'] = 'الرد إلى';
 $labels['followupto'] = 'Mail-Followup-To';
-$labels['date'] = 'التاريخ';
-$labels['size'] = 'الحجم';
+$labels['date']    = 'التاريخ';
+$labels['size']    = 'الحجم';
 $labels['priority'] = 'الأولوية';
 $labels['organization'] = 'المنظمة';
 $labels['readstatus'] = 'حالة القراءة';
+$labels['listoptions'] = 'List options...';
+
 $labels['mailboxlist'] = 'مجلدات';
-$labels['folders'] = 'مجلدات';
 $labels['messagesfromto'] = 'الرسالة $from إلى $to من مجموع $count';
 $labels['threadsfromto'] = 'جهات الإتصال $from إلى $to من مجموع $count';
 $labels['messagenrof'] = 'الرسالة $nr من $count';
-$labels['copy'] = 'نسخ';
-$labels['move'] = 'نقل';
-$labels['moveto'] = 'نقل إلى...';
+$labels['fromtoshort'] = '$from – $to of $count';
+
+$labels['copy']     = 'نسخ';
+$labels['move']     = 'نقل';
+$labels['moveto']   = 'نقل إلى...';
 $labels['download'] = 'تنزيل';
+$labels['open']     = 'Open';
+$labels['showattachment'] = 'Show';
+$labels['showanyway'] = 'Show it anyway';
+
 $labels['filename'] = 'اسم الملف';
 $labels['filesize'] = 'حجم الملف';
+
 $labels['addtoaddressbook'] = 'إضافة إلى دفتر العناوين';
+
+// weekdays short
 $labels['sun'] = 'أحد';
 $labels['mon'] = 'إثنين';
 $labels['tue'] = 'ثلاثاء';
@@ -59,78 +81,88 @@ $labels['wed'] = 'أربعاء';
 $labels['thu'] = 'خميس';
 $labels['fri'] = 'جمعة';
 $labels['sat'] = 'سبت';
-$labels['sunday'] = 'الأحد';
-$labels['monday'] = 'الإثنين';
-$labels['tuesday'] = 'الثلاثاء';
+
+// weekdays long
+$labels['sunday']    = 'الأحد';
+$labels['monday']    = 'الإثنين';
+$labels['tuesday']   = 'الثلاثاء';
 $labels['wednesday'] = 'الأربعاء';
-$labels['thursday'] = 'الخميس';
-$labels['friday'] = 'الجمعة';
-$labels['saturday'] = 'السبت';
-$labels['jan'] = 'يناير';
-$labels['feb'] = 'فبراير';
-$labels['mar'] = 'مارس';
-$labels['apr'] = 'أبريل';
-$labels['may'] = 'مايو';
-$labels['longmay'] = 'مايو';
-$labels['jun'] = 'يونيو';
-$labels['jul'] = 'يوليو';
-$labels['aug'] = 'أغسطس';
-$labels['sep'] = 'سبتمبر';
-$labels['oct'] = 'أكتوبر';
-$labels['nov'] = 'نوفمبر';
-$labels['dec'] = 'ديسمبر';
-$labels['longjan'] = 'يناير';
-$labels['longfeb'] = 'فبراير';
-$labels['longmar'] = 'مارس';
-$labels['longapr'] = 'إبريل';
-$labels['longjun'] = 'يونيو';
-$labels['longjul'] = 'يوليو';
-$labels['longaug'] = 'أغسطس';
-$labels['longsep'] = 'سبتمبر';
-$labels['longoct'] = 'أكتوبر';
-$labels['longnov'] = 'نوفمبر';
-$labels['longdec'] = 'ديسمبر';
+$labels['thursday']  = 'الخميس';
+$labels['friday']    = 'الجمعة';
+$labels['saturday']  = 'السبت';
+
+// months short
+$labels['jan']	= 'يناير';
+$labels['feb']	= 'فبراير';
+$labels['mar']	= 'مارس';
+$labels['apr']	= 'أبريل';
+$labels['may']	= 'مايو';
+$labels['jun']	= 'يونيو';
+$labels['jul'] 	= 'يوليو';
+$labels['aug']	= 'أغسطس';
+$labels['sep']	= 'سبتمبر';
+$labels['oct']	= 'أكتوبر';
+$labels['nov']	= 'نوفمبر';
+$labels['dec']	= 'ديسمبر';
+
+// months long
+$labels['longjan']	= 'يناير';
+$labels['longfeb']	= 'فبراير';
+$labels['longmar']	= 'مارس';
+$labels['longapr']	= 'إبريل';
+$labels['longmay']	= 'مايو';
+$labels['longjun']	= 'يونيو';
+$labels['longjul']	= 'يوليو';
+$labels['longaug']	= 'أغسطس';
+$labels['longsep']	= 'سبتمبر';
+$labels['longoct']	= 'أكتوبر';
+$labels['longnov']	= 'نوفمبر';
+$labels['longdec']	= 'ديسمبر';
+
 $labels['today'] = 'اليوم';
-$labels['refresh'] = 'تحديث';
-$labels['checkmail'] = 'التحقق من وجود رسائل جديدة';
-$labels['compose'] = 'إنشاء رسالة';
-$labels['writenewmessage'] = 'إنشاء رسالة جديدة';
-$labels['reply'] = 'رد';
-$labels['replytomessage'] = 'الرد على الرسالة';
+
+// toolbar buttons
+$labels['refresh']          = 'تحديث';
+$labels['checkmail']        = 'التحقق من وجود رسائل جديدة';
+$labels['compose']          = 'إنشاء رسالة';
+$labels['writenewmessage']  = 'إنشاء رسالة جديدة';
+$labels['reply']            = 'رد';
+$labels['replytomessage']   = 'الرد على الرسالة';
 $labels['replytoallmessage'] = 'الرد على المرسل وجميع مستقبلي الرسالة';
-$labels['replyall'] = 'الرد على الجميع';
-$labels['replylist'] = 'الرد على القائمة';
-$labels['forward'] = 'إعادة توجيه';
-$labels['forwardinline'] = 'تمرير الرسالة ضمنياً';
+$labels['replyall']         = 'الرد على الجميع';
+$labels['replylist']        = 'الرد على القائمة';
+$labels['forward']          = 'إعادة توجيه';
+$labels['forwardinline']    = 'تمرير الرسالة ضمنياً';
 $labels['forwardattachment'] = 'تمرير الرسالة كمرفق';
-$labels['forwardmessage'] = 'تمرير الرسالة';
-$labels['deletemessage'] = 'حذف الرسالة إلى المهملات';
+$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['more'] = 'المزيد';
-$labels['back'] = 'العودة';
-$labels['options'] = 'خيارات';
+$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['more']             = 'المزيد';
+$labels['back']             = 'العودة';
+$labels['options']          = 'خيارات';
+
 $labels['select'] = 'تحديد';
 $labels['all'] = 'الكل';
 $labels['none'] = 'لاشيء';
-$labels['nonesort'] = 'لاشيء';
 $labels['currpage'] = 'الصفحة الحالية';
 $labels['unread'] = 'غير المقروءة';
 $labels['flagged'] = 'موسوم';
 $labels['unanswered'] = 'بلا رد';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'محذوف';
 $labels['undeleted'] = 'غير محذوفة';
 $labels['invert'] = 'عكس';
@@ -141,12 +173,14 @@ $labels['expand-all'] = 'إظهار الكل';
 $labels['expand-unread'] = 'إظهار الغير مقروءة';
 $labels['collapse-all'] = 'ضمّ الكل';
 $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['asc'] = 'تصاعدي';
@@ -155,179 +189,220 @@ $labels['listcolumns'] = 'أعمدة السرد';
 $labels['listsorting'] = 'أعمدة الترتيب';
 $labels['listorder'] = 'طريقة الترتيب';
 $labels['listmode'] = 'وضع طريقة السرد';
+
 $labels['folderactions'] = 'إجراءات المجلد...';
 $labels['compact'] = 'ضغط';
 $labels['empty'] = 'تفريغ';
+
 $labels['quota'] = 'المساحة المستخدمة';
-$labels['unknown'] = 'مجهول';
-$labels['unlimited'] = 'غير محدود';
-$labels['quicksearch'] = 'البحث السريع';
-$labels['resetsearch'] = 'استعادة البحث للافتراضي';
-$labels['searchmod'] = 'أماكن البحث';
-$labels['msgtext'] = 'كامل الرسالة';
+$labels['unknown']  = 'مجهول';
+$labels['unlimited']  = 'غير محدود';
+
+$labels['quicksearch']  = 'البحث السريع';
+$labels['resetsearch']  = 'استعادة البحث للافتراضي';
+$labels['searchmod']  = 'أماكن البحث';
+$labels['msgtext']  = 'كامل الرسالة';
+$labels['body']  = 'Body';
+
 $labels['openinextwin'] = 'افتح في نافذة جديدة';
 $labels['emlsave'] = 'تنزيل (.eml)';
-$labels['editasnew'] = 'تعديل كجديد';
-$labels['send'] = 'ارسل';
-$labels['sendmessage'] = 'إرسال الرسالة الآن';
-$labels['savemessage'] = 'حفظ هذه المسودة';
-$labels['addattachment'] = 'إرفاق ملف';
-$labels['charset'] = 'مجموعة المحارف';
-$labels['editortype'] = 'نوع المُحرّر';
-$labels['returnreceipt'] = 'ايصال استلام';
-$labels['dsn'] = 'تنويه حالة التوصيل';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
+
+// message compose
+$labels['editasnew']      = 'تعديل كجديد';
+$labels['send']           = 'ارسل';
+$labels['sendmessage']    = 'إرسال الرسالة الآن';
+$labels['savemessage']    = 'حفظ هذه المسودة';
+$labels['addattachment']  = 'إرفاق ملف';
+$labels['charset']        = 'مجموعة المحارف';
+$labels['editortype']     = 'نوع المُحرّر';
+$labels['returnreceipt']  = 'ايصال استلام';
+$labels['dsn']            = 'تنويه حالة التوصيل';
 $labels['mailreplyintro'] = 'كتب $sender في $date:';
 $labels['originalmessage'] = 'الرسالة الأساسية';
-$labels['editidents'] = 'تعديل الهويات';
-$labels['spellcheck'] = 'التدقيق اﻹملائى';
+
+$labels['editidents']    = 'تعديل الهويات';
+$labels['spellcheck']    = 'التدقيق اﻹملائى';
 $labels['checkspelling'] = 'التدقيق الإملائي';
 $labels['resumeediting'] = 'متابعة التحرير';
-$labels['revertto'] = 'استعادة إلى';
+$labels['revertto']      = 'استعادة إلى';
+
 $labels['attach'] = 'إرفاق';
 $labels['attachments'] = 'مرفقات';
 $labels['upload'] = 'تحميل';
 $labels['uploadprogress'] = '$percent ($current من $total)';
-$labels['close'] = 'إغلاق';
-$labels['messageoptions'] = 'خيارات الرسائل...';
-$labels['low'] = 'منخض';
-$labels['lowest'] = 'الأقل';
-$labels['normal'] = 'عادي';
-$labels['high'] = 'مرتفع';
+$labels['close']  = 'إغلاق';
+$labels['messageoptions']  = 'خيارات الرسائل...';
+
+$labels['low']     = 'منخض';
+$labels['lowest']  = 'الأقل';
+$labels['normal']  = 'عادي';
+$labels['high']    = 'مرتفع';
 $labels['highest'] = 'الأعلى';
-$labels['nosubject'] = '(دون موضوع)';
+
+$labels['nosubject']  = '(دون موضوع)';
 $labels['showimages'] = 'إظهار الصور';
 $labels['alwaysshow'] = 'دائماً أظهر الصّور القادمة من $sender';
-$labels['isdraft'] = 'هذه مسودّة رسالة';
-$labels['andnmore'] = '$nr المزيد ...';
+$labels['isdraft']    = 'هذه مسودّة رسالة';
+$labels['andnmore']   = '$nr المزيد ...';
+$labels['togglemoreheaders'] = 'Show more message headers';
+$labels['togglefullheaders'] = 'Toggle raw message headers';
+
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'نص مجرد';
 $labels['savesentmessagein'] = 'احفظ الرسالة المُرسلة في';
 $labels['dontsave'] = 'لا تحفظها';
 $labels['maxuploadsize'] = 'أقصى حجم للملف هو $size';
+
 $labels['addcc'] = 'أضف CC';
 $labels['addbcc'] = 'أضف BCC';
 $labels['addreplyto'] = 'أضيف Reply-To';
 $labels['addfollowupto'] = 'إضافة Mail-Followup-To';
+
+// mdn
 $labels['mdnrequest'] = 'طلب المرسل إعلامه عند قراءتك لرسالته. هل تود إعلام المرسل؟';
 $labels['receiptread'] = 'إيصال الاستلام )بالقراءة)';
 $labels['yourmessage'] = 'هذا إيصال بقراءة رسالتك';
 $labels['receiptnote'] = 'ملاحظة: يُعلمك هذا الإيصال بأن رسالتك قد ظهرت على جهاز المستقبِل. ليست هناك أية ضمانات أن المستقبل قد قرأ أو فهم محتويات الرسالة.';
-$labels['name'] = 'اسم العرض';
-$labels['firstname'] = 'الإسم الأول';
-$labels['surname'] = 'الإسم الأخير';
-$labels['middlename'] = 'الاسم الثاني';
-$labels['nameprefix'] = 'السابقة';
-$labels['namesuffix'] = 'اللاحقة';
-$labels['nickname'] = 'اللقب';
-$labels['jobtitle'] = 'المسمى الوظيفي';
-$labels['department'] = 'الإدارة';
-$labels['gender'] = 'الجنس';
-$labels['maidenname'] = 'إسم الزواج';
-$labels['email'] = 'البريد الإلكتروني';
-$labels['phone'] = 'الهاتف';
-$labels['address'] = 'العنوان';
-$labels['street'] = 'الشارع';
-$labels['locality'] = 'المدينة';
-$labels['zipcode'] = 'الرمز البريدي';
-$labels['region'] = 'المنطقة';
-$labels['country'] = 'الدولة';
-$labels['birthday'] = 'تاريخ الميلاد';
-$labels['anniversary'] = 'المناسبة السنوية';
-$labels['website'] = 'الموقع';
+
+// address boook
+$labels['name']         = 'اسم العرض';
+$labels['firstname']    = 'الإسم الأول';
+$labels['surname']      = 'الإسم الأخير';
+$labels['middlename']   = 'الاسم الثاني';
+$labels['nameprefix']   = 'السابقة';
+$labels['namesuffix']   = 'اللاحقة';
+$labels['nickname']     = 'اللقب';
+$labels['jobtitle']     = 'المسمى الوظيفي';
+$labels['department']   = 'الإدارة';
+$labels['gender']       = 'الجنس';
+$labels['maidenname']   = 'إسم الزواج';
+$labels['email']        = 'البريد الإلكتروني';
+$labels['phone']        = 'الهاتف';
+$labels['address']      = 'العنوان';
+$labels['street']       = 'الشارع';
+$labels['locality']     = 'المدينة';
+$labels['zipcode']      = 'الرمز البريدي';
+$labels['region']       = 'المنطقة';
+$labels['country']      = 'الدولة';
+$labels['birthday']     = 'تاريخ الميلاد';
+$labels['anniversary']  = 'المناسبة السنوية';
+$labels['website']      = 'الموقع';
 $labels['instantmessenger'] = 'IM';
 $labels['notes'] = 'ملاحظات';
-$labels['male'] = 'ذكر';
+$labels['male']   = 'ذكر';
 $labels['female'] = 'أنثى';
 $labels['manager'] = 'مدير';
 $labels['assistant'] = 'المساعد';
-$labels['typeassistant'] = 'المساعد';
 $labels['spouse'] = 'زوجة';
 $labels['allfields'] = 'جميع الحقول';
 $labels['search'] = 'بحث';
 $labels['advsearch'] = 'بحث متقدم';
 $labels['advanced'] = 'مُتقدم';
 $labels['other'] = 'آخر';
-$labels['typeother'] = 'آخر';
-$labels['typehome'] = 'المنزل';
-$labels['typework'] = 'العمل';
-$labels['typemobile'] = 'المحمول';
-$labels['typemain'] = 'الرئيسي';
-$labels['typehomefax'] = 'فاكس المنزل';
-$labels['typeworkfax'] = 'فاكس العمل';
-$labels['typecar'] = 'السيارة';
-$labels['typepager'] = 'الرنان';
-$labels['typevideo'] = 'الفيديو';
-$labels['typehomepage'] = 'الرئيسية';
+
+$labels['typehome']   = 'المنزل';
+$labels['typework']   = 'العمل';
+$labels['typeother']  = 'آخر';
+$labels['typemobile']  = 'المحمول';
+$labels['typemain']  = 'الرئيسي';
+$labels['typehomefax']  = 'فاكس المنزل';
+$labels['typeworkfax']  = 'فاكس العمل';
+$labels['typecar']  = 'السيارة';
+$labels['typepager']  = 'الرنان';
+$labels['typevideo']  = 'الفيديو';
+$labels['typeassistant']  = 'المساعد';
+$labels['typehomepage']  = 'الرئيسية';
 $labels['typeblog'] = 'المدوّنة';
 $labels['typeprofile'] = 'الملف الشخصي';
+
 $labels['addfield'] = 'إضافة حقل...';
 $labels['addcontact'] = 'إضافة المراسل المحدد إلى دفتر عناويني';
 $labels['editcontact'] = 'تحرير بيانات المراسل';
 $labels['contacts'] = 'المراسلين';
 $labels['contactproperties'] = 'خواص جهة الإتصال';
 $labels['personalinfo'] = 'المعلومات الشخصية';
-$labels['edit'] = 'تحرير';
+
+$labels['edit']   = 'تحرير';
 $labels['cancel'] = 'إلغاء';
-$labels['save'] = 'حفظ';
+$labels['save']   = 'حفظ';
 $labels['delete'] = 'حذف';
 $labels['rename'] = 'إعادة التسمية';
 $labels['addphoto'] = 'إضافة';
 $labels['replacephoto'] = 'استبدال';
 $labels['uploadphoto'] = 'ارفع صورة';
-$labels['newcontact'] = 'إنشاء بطاقة مراسل جديدة';
-$labels['deletecontact'] = 'حذف المراسلين المحددين';
-$labels['composeto'] = 'إنشاء رسالة إليه';
+
+$labels['newcontact']     = 'إنشاء بطاقة مراسل جديدة';
+$labels['deletecontact']  = 'حذف المراسلين المحددين';
+$labels['composeto']      = 'إنشاء رسالة إليه';
 $labels['contactsfromto'] = 'المراسلون $from إلى $to من $count';
-$labels['print'] = 'طباعة';
-$labels['export'] = 'تصدير';
-$labels['exportvcards'] = 'صدّر المراسلين بنسق vCard';
+$labels['print']          = 'طباعة';
+$labels['export']         = 'تصدير';
+$labels['exportall']      = 'Export all';
+$labels['exportsel']      = 'Export selected';
+$labels['exportvcards']   = 'صدّر المراسلين بنسق vCard';
 $labels['newcontactgroup'] = 'إنشاء مجموعة مراسلين جديدة';
-$labels['grouprename'] = 'تغيير اسم المجموعة';
-$labels['groupdelete'] = 'حذف المجموعة';
+$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'] = 'حفظ البحث';
 $labels['searchdelete'] = 'حذف البحث';
+
 $labels['import'] = 'استورد';
 $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['done'] = 'تم';
+
+// settings
 $labels['settingsfor'] = 'إعدادات';
 $labels['about'] = 'نبذة';
 $labels['preferences'] = 'التفضيلات';
 $labels['userpreferences'] = 'تفضيلات المستخدم';
 $labels['editpreferences'] = 'تحرير تفضيلات المستخدم';
+
 $labels['identities'] = 'الهويات';
 $labels['manageidentities'] = 'إدارة هويات هذا الحساب';
 $labels['newidentity'] = 'هوية جديدة';
+
 $labels['newitem'] = 'عنصر جديد';
 $labels['edititem'] = 'تحرير عنصر';
+
 $labels['preferhtml'] = 'تفضيل صيغة HTML';
 $labels['defaultcharset'] = 'ترميز المحارف الافتراضي';
 $labels['htmlmessage'] = 'رسالة بنسق HTML';
+$labels['messagepart'] = 'Part';
+$labels['digitalsig'] = 'Digital Signature';
 $labels['dateformat'] = 'نسق التاريخ';
 $labels['timeformat'] = 'نسق الوقت';
 $labels['prettydate'] = 'تواريخ منمقة';
-$labels['setdefault'] = 'تعيين كإفتراضي';
-$labels['autodetect'] = 'آلي';
-$labels['language'] = 'اللغة';
-$labels['timezone'] = 'المنطقة الزمنية';
-$labels['pagesize'] = 'عدد الرسائل في الصفحة';
+$labels['setdefault']  = 'تعيين كإفتراضي';
+$labels['autodetect']  = 'آلي';
+$labels['language']  = 'اللغة';
+$labels['timezone']  = 'المنطقة الزمنية';
+$labels['pagesize']  = 'عدد الرسائل في الصفحة';
 $labels['signature'] = 'التوقيع';
-$labels['dstactive'] = 'التوقيت الصيفي';
+$labels['dstactive']  = 'التوقيت الصيفي';
 $labels['showinextwin'] = 'فتح الرسالة فى نافذة جديدة';
 $labels['composeextwin'] = 'أرسال عن طريق نافذة جديدة';
 $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'] = 'إفراغ سلة المحذوفات عند الخروج';
@@ -345,14 +420,16 @@ $labels['readwhendeleted'] = 'تحديد الرسالة كمقروءة عند ح
 $labels['flagfordeletion'] = 'وضع علامة على الرسالة لحذفها بدلاً منحذفها';
 $labels['skipdeleted'] = 'لا تظهر الرسائل المحذوفة';
 $labels['deletealways'] = 'حذف الرسائل مباشرة، إن تعذر نقلها إلىالمهملات';
+$labels['deletejunk'] = 'Directly delete messages in Junk';
 $labels['showremoteimages'] = 'إظهار الصور الخارجية المدمجة';
 $labels['fromknownsenders'] = 'للمرسلين المعلومين';
 $labels['always'] = 'دائماً';
 $labels['showinlineimages'] = 'إظهار الصّور المرفقة أسفل الرسالة';
-$labels['autosavedraft'] = 'حفظ المسودة تلقائياً';
-$labels['everynminutes'] = 'كل $n دقيقة';
-$labels['never'] = 'أبداً';
-$labels['immediately'] = 'حالاً';
+$labels['autosavedraft']  = 'حفظ المسودة تلقائياً';
+$labels['everynminutes']  = 'كل $n دقيقة';
+$labels['refreshinterval']  = 'Refresh (check for new messages, etc.)';
+$labels['never']  = 'أبداً';
+$labels['immediately']  = 'حالاً';
 $labels['messagesdisplaying'] = 'إظهار الرسائل';
 $labels['messagescomposition'] = 'إنشاء الرسائل';
 $labels['mimeparamfolding'] = 'أسماء الملفات المرفقة';
@@ -364,42 +441,49 @@ $labels['advancedoptions'] = 'خيارات متقدّمة';
 $labels['focusonnewmessage'] = 'التركيز على نافذة المتصفح عند وجود رسالةجديدة';
 $labels['checkallfolders'] = 'التحقق من وجود رسائل جديدة في جميعالمجلدات';
 $labels['displaynext'] = 'إظهار الرسالة التالية بعد حذف/نقلالرسالة الحالية';
+$labels['defaultfont'] = 'Default font of HTML message';
 $labels['mainoptions'] = 'الخيارات الأساسية';
+$labels['browseroptions'] = 'Browser Options';
 $labels['section'] = 'قسم';
 $labels['maintenance'] = 'الصيانة';
 $labels['newmessage'] = 'رسالة جديدة';
 $labels['signatureoptions'] = 'خيارات التوقيع';
 $labels['whenreplying'] = 'عند الرد';
+$labels['replyempty'] = 'do not quote the original message';
 $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 ثواني';
+$labels['previewpanemarkread']  = 'تحديد الرسائل المُعاينة كمقروءة';
+$labels['afternseconds']  = 'بعد $n ثواني';
 $labels['reqmdn'] = 'طلب إشعار استلام دائماً';
 $labels['reqdsn'] = 'طلب تنويه لحالة التوصيل دائماً';
 $labels['replysamefolder'] = 'وضع الردود في المجلد الذي يحوي الرسالةالمردود عليها';
-$labels['defaultaddressbook'] = 'أضف المراسلين الجديد إلى دفتر العناوينالمحدد';
+$labels['defaultabook'] = 'Default address book';
 $labels['autocompletesingle'] = 'تجاهل عنوان البريد الإلكتروني البديل فيالتكملة التلقائية';
+$labels['listnamedisplay'] = 'List contacts as';
 $labels['spellcheckbeforesend'] = 'تحقق من الإملاء قبل إرسال الرسائل';
 $labels['spellcheckoptions'] = 'خيارات التدقيق الإملاءي';
 $labels['spellcheckignoresyms'] = 'تجاهل الكلمات التي تحتوي رموز';
 $labels['spellcheckignorenums'] = 'تجاهل الكلمات التي تحتوي أرقام';
 $labels['spellcheckignorecaps'] = 'تجاهل الكلمات التي بها أحرف كبيرة';
 $labels['addtodict'] = 'إضافة إلى القامس';
-$labels['folder'] = 'مجلد';
-$labels['foldername'] = 'اسم المجلد';
-$labels['subscribed'] = 'مشترك';
+$labels['mailtoprotohandler'] = 'Register protocol handler for mailto: links';
+$labels['forwardmode'] = 'Messages forwarding';
+$labels['inline'] = 'inline';
+$labels['asattachment'] = 'as attachment';
+
+$labels['folder']  = 'مجلد';
+$labels['folders']  = 'مجلدات';
+$labels['foldername']  = 'اسم المجلد';
+$labels['subscribed']  = 'مشترك';
 $labels['messagecount'] = 'الرسائل';
-$labels['create'] = 'أنشئ';
-$labels['createfolder'] = 'أنشئ مجلد جديد';
-$labels['managefolders'] = 'إدارة المجلدات';
+$labels['create']  = 'أنشئ';
+$labels['createfolder']  = 'أنشئ مجلد جديد';
+$labels['managefolders']  = 'إدارة المجلدات';
 $labels['specialfolders'] = 'المجلّدات المُميّزة';
 $labels['properties'] = 'الخواص';
 $labels['folderproperties'] = 'خواص المجلد';
@@ -409,22 +493,29 @@ $labels['info'] = 'معلومات';
 $labels['getfoldersize'] = 'اضغط لمعرفة حجم المجلد';
 $labels['changesubscription'] = 'اضغط لتغيير حالة الإشتراك';
 $labels['foldertype'] = 'نوع المجلد';
-$labels['personalfolder'] = 'مجلد خاص';
-$labels['otherfolder'] = 'مجلد مستخدم آخر';
-$labels['sharedfolder'] = 'مجلد عام';
+$labels['personalfolder']  = 'مجلد خاص';
+$labels['otherfolder']  = 'مجلد مستخدم آخر';
+$labels['sharedfolder']  = 'مجلد عام';
+
 $labels['sortby'] = 'ترتيب بحسب';
-$labels['sortasc'] = 'ترتيب تصاعدي';
+$labels['sortasc']  = 'ترتيب تصاعدي';
 $labels['sortdesc'] = 'ترتيب تنازلي';
 $labels['undo'] = 'تراجع';
+
+$labels['installedplugins'] = 'Installed plugins';
 $labels['plugin'] = 'إضافة';
 $labels['version'] = 'النسخة';
 $labels['source'] = 'المصدر';
 $labels['license'] = 'الترخيص';
 $labels['support'] = 'احصل على الدعم الفني';
+
+// units
 $labels['B'] = 'ب';
 $labels['KB'] = 'ك.ب';
 $labels['MB'] = 'م.ب';
 $labels['GB'] = 'ج.ب';
+
+// character sets
 $labels['unicode'] = 'يونيكود';
 $labels['english'] = 'الإنجليزية';
 $labels['westerneuropean'] = 'الغرب أوروبية';
@@ -444,3 +535,4 @@ $labels['japanese'] = 'اليابانية';
 $labels['korean'] = 'الكورية';
 $labels['chinese'] = 'الصينية';
 
+?>
diff --git a/program/localization/ar_SA/messages.inc b/program/localization/ar_SA/messages.inc
index b1e25b88d..9429a3910 100644
--- a/program/localization/ar_SA/messages.inc
+++ b/program/localization/ar_SA/messages.inc
@@ -2,31 +2,40 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ar_SA/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['loginfailed'] = 'فشل تسجيل الدخول';
+$messages['errortitle']  = 'An error occurred!';
+$messages['loginfailed']  = 'فشل تسجيل الدخول';
 $messages['cookiesdisabled'] = 'المتصفح الخاص بك لا يقبل الكوكيز';
 $messages['sessionerror'] = 'انتهت صلاحية الجلسة الحالية أو أنها غيرصالحة';
 $messages['storageerror'] = 'فشل الاتصال بخادم IMAP';
 $messages['servererror'] = 'خطأ في الخادم!';
 $messages['servererrormsg'] = 'خطأ خادم: $msg';
 $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'] = 'لم يعثر على أية رسائل في صندوق البريد هذا';
 $messages['loggedout'] = 'قمت بإنهاء هذه الجلسة بنجاح. إلى اللقاء!';
 $messages['mailboxempty'] = 'صندوق البريد فارغ';
+$messages['refreshing'] = 'Refreshing...';
 $messages['loading'] = 'جاري العمل...';
 $messages['uploading'] = 'جاري رفع الملف...';
 $messages['uploadingmany'] = 'جاري تحميل الملفات...';
@@ -53,11 +62,11 @@ $messages['errormoving'] = 'تعذر نقل هذه الرسالة';
 $messages['errorcopying'] = 'تعذر نسخ الرسائل';
 $messages['errordeleting'] = 'تعذر حذف هذه الرسالة';
 $messages['errormarking'] = 'تعذر تحديد الرسائل';
-$messages['deletecontactconfirm'] = 'هل تريد حقاً حذف المراسلـ(ين) المحدد(ين)؟';
-$messages['deletegroupconfirm'] = 'هل تريد فعلاً حذف المجموعة المحددة؟';
+$messages['deletecontactconfirm']  = 'هل تريد حقاً حذف المراسلـ(ين) المحدد(ين)؟';
+$messages['deletegroupconfirm']  = 'هل تريد فعلاً حذف المجموعة المحددة؟';
 $messages['deletemessagesconfirm'] = 'هل تريد حذف الرسائل المحددة؟';
-$messages['deletefolderconfirm'] = 'هل تريد حقاً حذف هذا المجلد؟';
-$messages['purgefolderconfirm'] = 'هل تريد حقاً حذف جميع الرسائل في هذاالمجلد؟';
+$messages['deletefolderconfirm']  = 'هل تريد حقاً حذف هذا المجلد؟';
+$messages['purgefolderconfirm']  = 'هل تريد حقاً حذف جميع الرسائل في هذاالمجلد؟';
 $messages['contactdeleting'] = 'جاري حذف المُراسلين...';
 $messages['groupdeleting'] = 'جاري حذف المجموعة...';
 $messages['folderdeleting'] = 'جاري حذف المجلد...';
@@ -66,11 +75,11 @@ $messages['foldersubscribing'] = 'الإشتراك في المجلد...';
 $messages['folderunsubscribing'] = 'إلغاء الإشتراك في المجد...';
 $messages['formincomplete'] = 'لم يتم تعبئة بيانات الاستمارة بالكامل';
 $messages['noemailwarning'] = 'الرجاء إدخال عنوان بريد إلكتروني صالح';
-$messages['nonamewarning'] = 'الرجاء إدخال اسم';
+$messages['nonamewarning']  = 'الرجاء إدخال اسم';
 $messages['nopagesizewarning'] = 'الرجاء إدخال حجم الصفحة';
 $messages['nosenderwarning'] = 'رجاء اكتب عنوان البريد الالكترونيللمُرسل';
 $messages['norecipientwarning'] = 'الرجاء إدخال اسم مستقبل واحد على الأقل';
-$messages['nosubjectwarning'] = 'حقل "الموضوع" فارغ. هل تريد كتابة موضوعللرسالة؟';
+$messages['nosubjectwarning']  = 'حقل "الموضوع" فارغ. هل تريد كتابة موضوعللرسالة؟';
 $messages['nobodywarning'] = 'إرسال هذه الرسالة دون نص؟';
 $messages['notsentwarning'] = 'لم يتم إرسال الرسالة. هل تريد تجاهلالرسالة؟';
 $messages['noldapserver'] = 'الرجاء اختيار خادم ldap للبحث فيه';
@@ -105,13 +114,16 @@ $messages['addingmember'] = 'جاري إضافة المُراسلين إلى ا�
 $messages['removingmember'] = 'جاري إزالة المراسلين من المجموعة...';
 $messages['receiptsent'] = 'أرسل إيصال الاستلام بنجاح';
 $messages['errorsendingreceipt'] = 'تعذر إرسال إيصال الاستلام';
+$messages['deleteidentityconfirm'] = 'Do you really want to delete this identity?';
 $messages['nodeletelastidentity'] = 'لا يمكن حذف هذا السجل حيث أنه الوحيدالمتبقي.';
 $messages['forbiddencharacter'] = 'اسم المجلّد يحتوي حروفاً ممنوعة';
 $messages['selectimportfile'] = 'رجاء اختر ملفاً لرفعه';
 $messages['addresswriterror'] = 'دفتر العناوين المحدد غير قابل للكتابة';
 $messages['contactaddedtogroup'] = 'تمت إضافة المراسلين إلى هذه المجموعةبنجاح';
 $messages['contactremovedfromgroup'] = 'تمت إزالة المراسلين من هذه المجموعةبنجاح';
+$messages['nogroupassignmentschanged'] = 'No group assignments changed.';
 $messages['importwait'] = 'جاري الاستيراد، رجاء انتظر...';
+$messages['importformaterror'] = 'Import failed! The uploaded file is not a valid import data file.';
 $messages['importconfirm'] = '<b>تم استيراد $inserted مراسلين بنجاح، وتجاهل$skipped موجودين مسبقاً</b>:<p><em>$names</em></p>';
 $messages['importconfirmskipped'] = '<b>تم تجاهل $skipped عناصر موجودة</b>';
 $messages['opnotpermitted'] = 'العملية ممنوعة!';
@@ -153,4 +165,7 @@ $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['noscriptwarning'] = 'Warning: This webmail service requires Javascript! In order to use it please enable Javascript in your browser\'s settings.';
 
+?>
diff --git a/program/localization/ast/labels.inc b/program/localization/ast/labels.inc
index fedc40019..49f85689b 100644
--- a/program/localization/ast/labels.inc
+++ b/program/localization/ast/labels.inc
@@ -2,53 +2,78 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization//labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = 'Bienllegáu a $product';
-$labels['username'] = 'Usuariu';
-$labels['password'] = 'Clave';
-$labels['server'] = 'Sirvidor';
-$labels['login'] = 'Entrar';
-$labels['logout'] = 'Zarrar';
-$labels['mail'] = 'Corréu';
+
+// login page
+$labels['welcome']   = 'Bienllegáu a $product';
+$labels['username']  = 'Usuariu';
+$labels['password']  = 'Clave';
+$labels['server']    = 'Sirvidor';
+$labels['login']     = 'Entrar';
+
+// taskbar
+$labels['logout']   = 'Zarrar';
+$labels['mail']     = 'Corréu';
 $labels['settings'] = 'Preferencies personales';
 $labels['addressbook'] = 'Llibru de direiciones';
-$labels['inbox'] = 'Entrantes';
+
+// mailbox names
+$labels['inbox']  = 'Entrantes';
 $labels['drafts'] = 'Borradores';
-$labels['sent'] = 'Unviaos';
-$labels['trash'] = 'Papelera';
-$labels['junk'] = 'Puxarra';
+$labels['sent']   = 'Unviaos';
+$labels['trash']  = 'Papelera';
+$labels['junk']   = 'Puxarra';
+
+// message listing
 $labels['subject'] = 'Asuntu';
-$labels['from'] = 'De';
-$labels['to'] = 'Pa';
-$labels['cc'] = 'Copia';
-$labels['bcc'] = 'Bcc';
+$labels['from']    = 'De';
+$labels['sender']  = 'Sender';
+$labels['to']      = 'Pa';
+$labels['cc']      = 'Copia';
+$labels['bcc']     = 'Bcc';
 $labels['replyto'] = 'Contestar a';
-$labels['date'] = 'Fecha';
-$labels['size'] = 'Tamañu';
+$labels['followupto'] = 'Followup-To';
+$labels['date']    = 'Fecha';
+$labels['size']    = 'Tamañu';
 $labels['priority'] = 'Prioridá';
 $labels['organization'] = 'Organización';
+$labels['readstatus'] = 'Read status';
+$labels['listoptions'] = 'List options...';
+
 $labels['mailboxlist'] = 'Bandexes';
-$labels['folders'] = 'Bandexes';
 $labels['messagesfromto'] = 'Mensaxes del $from a $to de $count';
+$labels['threadsfromto'] = 'Threads $from to $to of $count';
 $labels['messagenrof'] = 'Mensaxe $nr de $count';
-$labels['copy'] = 'Copia';
-$labels['moveto'] = 'mover pa...';
+$labels['fromtoshort'] = '$from – $to of $count';
+
+$labels['copy']     = 'Copia';
+$labels['move']     = 'Move';
+$labels['moveto']   = 'mover pa...';
 $labels['download'] = 'baxar';
+$labels['open']     = 'Open';
+$labels['showattachment'] = 'Show';
+$labels['showanyway'] = 'Show it anyway';
+
 $labels['filename'] = 'Nome del Ficheru';
 $labels['filesize'] = 'Tamañu del ficheru';
+
 $labels['addtoaddressbook'] = 'Amestar al llibru de direiciones';
+
+// weekdays short
 $labels['sun'] = 'Dom';
 $labels['mon'] = 'Llu';
 $labels['tue'] = 'Mar';
@@ -56,162 +81,328 @@ $labels['wed'] = 'Mie';
 $labels['thu'] = 'Xue';
 $labels['fri'] = 'Vie';
 $labels['sat'] = 'Sab';
-$labels['sunday'] = 'Domingu';
-$labels['monday'] = 'Llunes';
-$labels['tuesday'] = 'Martes';
+
+// weekdays long
+$labels['sunday']    = 'Domingu';
+$labels['monday']    = 'Llunes';
+$labels['tuesday']   = 'Martes';
 $labels['wednesday'] = 'Miércoles';
-$labels['thursday'] = 'Xueves';
-$labels['friday'] = 'Vienres';
-$labels['saturday'] = 'Sábadu';
-$labels['jan'] = 'Xin';
-$labels['feb'] = 'Feb';
-$labels['mar'] = 'Mar';
-$labels['apr'] = 'Abr';
-$labels['may'] = 'Mayu';
-$labels['longmay'] = 'Mayu';
-$labels['jun'] = 'Xun';
-$labels['jul'] = 'Xnt';
-$labels['aug'] = 'Ago';
-$labels['sep'] = 'Set';
-$labels['oct'] = 'Och';
-$labels['nov'] = 'Pay';
-$labels['dec'] = 'Avi';
-$labels['longjan'] = 'Xineru';
-$labels['longfeb'] = 'Febreru';
-$labels['longmar'] = 'Marzu';
-$labels['longapr'] = 'Abril';
-$labels['longjun'] = 'Xunu';
-$labels['longjul'] = 'Xunetu';
-$labels['longaug'] = 'Agostu';
-$labels['longsep'] = 'Setiembre';
-$labels['longoct'] = 'Ochobre';
-$labels['longnov'] = 'Payares';
-$labels['longdec'] = 'Avientu';
+$labels['thursday']  = 'Xueves';
+$labels['friday']    = 'Vienres';
+$labels['saturday']  = 'Sábadu';
+
+// months short
+$labels['jan']	= 'Xin';
+$labels['feb']	= 'Feb';
+$labels['mar']	= 'Mar';
+$labels['apr']	= 'Abr';
+$labels['may']	= 'Mayu';
+$labels['jun']	= 'Xun';
+$labels['jul'] 	= 'Xnt';
+$labels['aug']	= 'Ago';
+$labels['sep']	= 'Set';
+$labels['oct']	= 'Och';
+$labels['nov']	= 'Pay';
+$labels['dec']	= 'Avi';
+
+// months long
+$labels['longjan']	= 'Xineru';
+$labels['longfeb']	= 'Febreru';
+$labels['longmar']	= 'Marzu';
+$labels['longapr']	= 'Abril';
+$labels['longmay']	= 'Mayu';
+$labels['longjun']	= 'Xunu';
+$labels['longjul']	= 'Xunetu';
+$labels['longaug']	= 'Agostu';
+$labels['longsep']	= 'Setiembre';
+$labels['longoct']	= 'Ochobre';
+$labels['longnov']	= 'Payares';
+$labels['longdec']	= 'Avientu';
+
 $labels['today'] = 'Güei';
-$labels['checkmail'] = 'Buscar mensaxes nuevos';
-$labels['writenewmessage'] = 'Facer un mensaxe nuevu';
-$labels['replytomessage'] = 'Contestar al mensaxe';
+
+// toolbar buttons
+$labels['refresh']          = 'Refresh';
+$labels['checkmail']        = 'Buscar mensaxes nuevos';
+$labels['compose']          = 'Escribir un mensaxe';
+$labels['writenewmessage']  = 'Facer un mensaxe nuevu';
+$labels['reply']            = 'Reply';
+$labels['replytomessage']   = 'Contestar al mensaxe';
 $labels['replytoallmessage'] = 'Contestar a toos';
-$labels['forwardmessage'] = 'Reunviar mensaxe';
-$labels['deletemessage'] = 'Desaniciar mensaxe';
+$labels['replyall']         = 'Reply all';
+$labels['replylist']        = 'Reply list';
+$labels['forward']          = 'Forward';
+$labels['forwardinline']    = 'Forward inline';
+$labels['forwardattachment'] = 'Forward as attachment';
+$labels['forwardmessage']   = 'Reunviar mensaxe';
+$labels['deletemessage']    = 'Desaniciar mensaxe';
 $labels['movemessagetotrash'] = 'Mover mensaxe a la papelera';
-$labels['printmessage'] = 'Imprentar esti mensaxe';
-$labels['previousmessage'] = 'Amosar el mensaxe anterior';
-$labels['firstmessage'] = 'Amosar primer mensaxe';
-$labels['nextmessage'] = 'Amosar el mensaxe siguiente';
-$labels['lastmessage'] = 'Amosar l\'últimu mensaxe';
-$labels['backtolist'] = 'Tornar a la llista de mensaxes';
-$labels['viewsource'] = 'Amosar el códigu';
-$labels['markmessages'] = 'Marcar mensaxes';
-$labels['markread'] = 'Como lleíu';
-$labels['markunread'] = 'Como non lleíu';
-$labels['markflagged'] = 'Como marcáu';
-$labels['markunflagged'] = 'Como non marcáu';
+$labels['printmessage']     = 'Imprentar esti mensaxe';
+$labels['previousmessage']  = 'Amosar el mensaxe anterior';
+$labels['firstmessage']     = 'Amosar primer mensaxe';
+$labels['nextmessage']      = 'Amosar el mensaxe siguiente';
+$labels['lastmessage']      = 'Amosar l\'últimu mensaxe';
+$labels['backtolist']       = 'Tornar a la llista de mensaxes';
+$labels['viewsource']       = 'Amosar el códigu';
+$labels['mark']             = 'Mark';
+$labels['markmessages']     = 'Marcar mensaxes';
+$labels['markread']         = 'Como lleíu';
+$labels['markunread']       = 'Como non lleíu';
+$labels['markflagged']      = 'Como marcáu';
+$labels['markunflagged']    = 'Como non marcáu';
+$labels['moreactions']      = 'More actions...';
+$labels['more']             = 'More';
+$labels['back']             = 'Back';
+$labels['options']          = 'Options';
+
 $labels['select'] = 'Escueye';
 $labels['all'] = 'Toos';
 $labels['none'] = 'Nengún';
-$labels['nonesort'] = 'Nengún';
+$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';
 $labels['filter'] = 'Filtru';
+$labels['list'] = 'List';
+$labels['threads'] = 'Threads';
+$labels['expand-all'] = 'Expand All';
+$labels['expand-unread'] = 'Expand Unread';
+$labels['collapse-all'] = 'Collapse All';
+$labels['threaded'] = 'Threaded';
+
+$labels['autoexpand_threads'] = 'Expand message threads';
+$labels['do_expand'] = 'all threads';
+$labels['expand_only_unread'] = 'only with unread messages';
+$labels['fromto'] = 'From/To';
+$labels['flag'] = 'Flag';
+$labels['attachment'] = 'Attachment';
+$labels['nonesort'] = 'Nengún';
+$labels['sentdate'] = 'Sent date';
+$labels['arrival'] = 'Arrival date';
+$labels['asc'] = 'ascending';
+$labels['desc'] = 'descending';
+$labels['listcolumns'] = 'List columns';
+$labels['listsorting'] = 'Sorting column';
+$labels['listorder'] = 'Sorting order';
+$labels['listmode'] = 'List view mode';
+
+$labels['folderactions'] = 'Folder actions...';
 $labels['compact'] = 'Compautar';
 $labels['empty'] = 'Vaciar';
+
 $labels['quota'] = 'Espaciu en discu';
-$labels['unknown'] = 'desconocíu';
-$labels['unlimited'] = 'ensin llímite';
-$labels['quicksearch'] = 'Búsqueda rápida';
-$labels['resetsearch'] = 'Anovar la búsqueda';
-$labels['searchmod'] = 'Guetar modificadores';
-$labels['msgtext'] = 'Mensax completu';
+$labels['unknown']  = 'desconocíu';
+$labels['unlimited']  = 'ensin llímite';
+
+$labels['quicksearch']  = 'Búsqueda rápida';
+$labels['resetsearch']  = 'Anovar la búsqueda';
+$labels['searchmod']  = 'Guetar modificadores';
+$labels['msgtext']  = 'Mensax completu';
+$labels['body']  = 'Body';
+
 $labels['openinextwin'] = 'Abrir en una ventana nueva';
 $labels['emlsave'] = 'Baxar (.eml)';
-$labels['compose'] = 'Escribir un mensaxe';
-$labels['editasnew'] = 'Editar como nuevu';
-$labels['savemessage'] = 'Guardar como borrador';
-$labels['sendmessage'] = 'Unviar el mensaxe yá';
-$labels['addattachment'] = 'Amestar un archivu';
-$labels['charset'] = 'Codificación';
-$labels['editortype'] = 'Tipo d\'editor';
-$labels['returnreceipt'] = 'Avisu de recibu';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
+
+// message compose
+$labels['editasnew']      = 'Editar como nuevu';
+$labels['send']           = 'Send';
+$labels['sendmessage']    = 'Unviar el mensaxe yá';
+$labels['savemessage']    = 'Guardar como borrador';
+$labels['addattachment']  = 'Amestar un archivu';
+$labels['charset']        = 'Codificación';
+$labels['editortype']     = 'Tipo d\'editor';
+$labels['returnreceipt']  = 'Avisu de recibu';
+$labels['dsn']            = 'Delivery status notification';
+$labels['mailreplyintro'] = 'On $date, $sender wrote:';
+$labels['originalmessage'] = 'Original Message';
+
+$labels['editidents']    = 'Edit identities';
+$labels['spellcheck']    = 'Spell';
 $labels['checkspelling'] = 'Revisar ortografía';
 $labels['resumeediting'] = 'Siguir cola edición';
-$labels['revertto'] = 'Desfacer a';
+$labels['revertto']      = 'Desfacer a';
+
+$labels['attach'] = 'Attach';
 $labels['attachments'] = 'Axuntos';
 $labels['upload'] = 'Xubir';
-$labels['close'] = 'Zarrar';
-$labels['low'] = 'Baxu';
-$labels['lowest'] = 'Mui baxu';
-$labels['normal'] = 'Normal';
-$labels['high'] = 'Altu';
+$labels['uploadprogress'] = '$percent ($current from $total)';
+$labels['close']  = 'Zarrar';
+$labels['messageoptions']  = 'Message options...';
+
+$labels['low']     = 'Baxu';
+$labels['lowest']  = 'Mui baxu';
+$labels['normal']  = 'Normal';
+$labels['high']    = 'Altu';
 $labels['highest'] = 'Mui altu';
-$labels['nosubject'] = '(ensin asuntu)';
+
+$labels['nosubject']  = '(ensin asuntu)';
 $labels['showimages'] = 'Amosar imáxenes';
 $labels['alwaysshow'] = 'Amosar siempre les imáxenes de $sender';
+$labels['isdraft']    = 'This is a draft message.';
+$labels['andnmore']   = '$nr more...';
+$labels['togglemoreheaders'] = 'Show more message headers';
+$labels['togglefullheaders'] = 'Toggle raw message headers';
+
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Testu';
 $labels['savesentmessagein'] = 'Guardar mensaxe unviau en';
 $labels['dontsave'] = 'Desanicialu';
 $labels['maxuploadsize'] = 'El tamañu másimu pa un ficheru ye $size';
+
 $labels['addcc'] = 'Amestar Cc';
 $labels['addbcc'] = 'Amestar Bcc';
 $labels['addreplyto'] = 'Amestar Rempuesta pa';
+$labels['addfollowupto'] = 'Add Followup-To';
+
+// mdn
 $labels['mdnrequest'] = 'El qu\'unvia esti mensaxe quier que lo avises cuando lleas el corréu. ¿Quies avisalo?';
 $labels['receiptread'] = 'Avisu de llectura';
 $labels['yourmessage'] = 'Esto ye un avisu de llectura del to mensaxe';
 $labels['receiptnote'] = 'Nota: Esti avisu namás quier dicir que\'l to mensaxe amosośe nel equipu del receptor. Nun hai forma de garantizate que lo lleera o que pescanciara\'l to mensaxe.';
-$labels['name'] = 'Nome completu';
-$labels['firstname'] = 'Nome';
-$labels['surname'] = 'Apellíu';
-$labels['email'] = 'Corréu';
+
+// address boook
+$labels['name']         = 'Nome completu';
+$labels['firstname']    = 'Nome';
+$labels['surname']      = 'Apellíu';
+$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['email']        = 'Corréu';
+$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['typepager']  = 'Pager';
+$labels['typevideo']  = 'Video';
+$labels['typeassistant']  = 'Assistant';
+$labels['typehomepage']  = 'Home Page';
+$labels['typeblog'] = 'Blog';
+$labels['typeprofile'] = 'Profile';
+
+$labels['addfield'] = 'Add field...';
 $labels['addcontact'] = 'Amestar contautu nuevu';
 $labels['editcontact'] = 'Editar contautu';
-$labels['edit'] = 'Editar';
+$labels['contacts'] = 'Contacts';
+$labels['contactproperties'] = 'Contact properties';
+$labels['personalinfo'] = 'Personal information';
+
+$labels['edit']   = 'Editar';
 $labels['cancel'] = 'Encaboxar';
-$labels['save'] = 'Guardar';
+$labels['save']   = 'Guardar';
 $labels['delete'] = 'Desaniciar';
-$labels['newcontact'] = 'Facer un contautu nuevu';
-$labels['deletecontact'] = 'Desaniciar los contautos marcaos';
-$labels['composeto'] = 'Unviar mensaxe a';
+$labels['rename'] = 'Rename';
+$labels['addphoto'] = 'Add';
+$labels['replacephoto'] = 'Replace';
+$labels['uploadphoto'] = 'Upload photo';
+
+$labels['newcontact']     = 'Facer un contautu nuevu';
+$labels['deletecontact']  = 'Desaniciar los contautos marcaos';
+$labels['composeto']      = 'Unviar mensaxe a';
 $labels['contactsfromto'] = 'Contautos $from a $to de $count';
-$labels['print'] = 'Imprentar';
-$labels['export'] = 'Esportar';
-$labels['exportvcards'] = 'Esportar contautos en formatu vCard';
-$labels['previouspage'] = 'Amosar grupu anterior';
-$labels['firstpage'] = 'Amosar primer grupu';
-$labels['nextpage'] = 'Amosar siguiente grupu';
-$labels['lastpage'] = 'Amosar l\'últimu grupu';
+$labels['print']          = 'Imprentar';
+$labels['export']         = 'Esportar';
+$labels['exportall']      = 'Export all';
+$labels['exportsel']      = 'Export selected';
+$labels['exportvcards']   = 'Esportar contautos en formatu vCard';
+$labels['newcontactgroup'] = 'Create new contact group';
+$labels['grouprename']    = 'Rename group';
+$labels['groupdelete']    = 'Delete group';
+$labels['groupremoveselected'] = 'Remove selected contacts from group';
+
+$labels['previouspage']   = 'Amosar grupu anterior';
+$labels['firstpage']      = 'Amosar primer grupu';
+$labels['nextpage']       = 'Amosar siguiente grupu';
+$labels['lastpage']       = 'Amosar l\'últimu grupu';
+
+$labels['group'] = 'Group';
 $labels['groups'] = 'Grupos';
 $labels['personaladrbook'] = 'Direiciones personales';
+
+$labels['searchsave'] = 'Save search';
+$labels['searchdelete'] = 'Delete search';
+
 $labels['import'] = 'Importar';
 $labels['importcontacts'] = 'Importar contautos';
 $labels['importfromfile'] = 'Importar dende un ficheru:';
+$labels['importtarget'] = 'Add new contacts to address book:';
 $labels['importreplace'] = 'Trocar el llibru de direiciones enteru';
-$labels['importtext'] = 'Puedes xubir direcione d\'un llibr que yá tengas.<br/>Anguaño puedes importar direiciones en formatu <a href="http://ast.wikipedia.org/wiki/VCard">vCard</a>.';
+$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['done'] = 'Fecho';
+
+// settings
 $labels['settingsfor'] = 'Configuración pa';
+$labels['about'] = 'About';
 $labels['preferences'] = 'Preferencies';
 $labels['userpreferences'] = 'Preferencies d\'usuariu';
 $labels['editpreferences'] = 'Editar preferencies d\'usuariu';
+
 $labels['identities'] = 'Identidaes';
 $labels['manageidentities'] = 'Remanar identidaes pa esta cuenta';
 $labels['newidentity'] = 'Identidad nueva';
+
 $labels['newitem'] = 'Nuevu';
 $labels['edititem'] = 'Editar';
+
 $labels['preferhtml'] = 'Amosar HTML';
+$labels['defaultcharset'] = 'Default Character Set';
 $labels['htmlmessage'] = 'Mensaxe HTML';
+$labels['messagepart'] = 'Part';
+$labels['digitalsig'] = 'Digital Signature';
+$labels['dateformat'] = 'Date format';
+$labels['timeformat'] = 'Time format';
 $labels['prettydate'] = 'Fecha prestosa';
-$labels['setdefault'] = 'Escoyer opción preferída';
-$labels['autodetect'] = 'Escoyer automáticamente';
-$labels['language'] = 'Idioma';
-$labels['timezone'] = 'Franxa horaria';
-$labels['pagesize'] = 'Fileres per páxina';
+$labels['setdefault']  = 'Escoyer opción preferída';
+$labels['autodetect']  = 'Escoyer automáticamente';
+$labels['language']  = 'Idioma';
+$labels['timezone']  = 'Franxa horaria';
+$labels['pagesize']  = 'Fileres per páxina';
 $labels['signature'] = 'Firma';
-$labels['dstactive'] = 'Cambéu horariu';
+$labels['dstactive']  = 'Cambéu horariu';
+$labels['showinextwin'] = 'Open message in a new window';
+$labels['composeextwin'] = 'Compose in a new window';
 $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';
@@ -222,45 +413,126 @@ $labels['mailboxview'] = 'Vista del buzón';
 $labels['mdnrequests'] = 'Avisos d\'unvios';
 $labels['askuser'] = 'preguntar al usuariu';
 $labels['autosend'] = 'unviar de secute';
+$labels['autosendknown'] = 'send receipt to my contacts, otherwise ask me';
+$labels['autosendknownignore'] = 'send receipt to my contacts, otherwise ignore';
 $labels['ignore'] = 'ignoralos';
 $labels['readwhendeleted'] = 'Marcar el mensaxe como lleíu al desanicialu';
 $labels['flagfordeletion'] = 'Marcar el mensaxe pa desaniciase en cuenta de desanicialu dafechu';
 $labels['skipdeleted'] = 'Nun amosar los mensaxes desaniciaos';
+$labels['deletealways'] = 'If moving messages to Trash fails, delete them';
+$labels['deletejunk'] = 'Directly delete messages in Junk';
 $labels['showremoteimages'] = 'Amosar imáxenes remotes';
 $labels['fromknownsenders'] = 'de contautos conocíos';
 $labels['always'] = 'siempre';
 $labels['showinlineimages'] = 'Amosar imáxenes axuntes embaxu\'l mensaxe';
-$labels['autosavedraft'] = 'Guardar borrador de secute';
-$labels['everynminutes'] = 'cada $n minutu/os';
-$labels['keepalive'] = 'Guetar mensaxes nuevos cada';
-$labels['never'] = 'nunca';
+$labels['autosavedraft']  = 'Guardar borrador de secute';
+$labels['everynminutes']  = 'cada $n minutu/os';
+$labels['refreshinterval']  = 'Refresh (check for new messages, etc.)';
+$labels['never']  = 'nunca';
+$labels['immediately']  = 'immediately';
 $labels['messagesdisplaying'] = 'Vista de mensaxes';
 $labels['messagescomposition'] = 'Edición de mensaxes';
 $labels['mimeparamfolding'] = 'Nomes d\'axuntos';
 $labels['2231folding'] = 'Too RFC 2231 (Thunderbird)';
 $labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
 $labels['2047folding'] = 'Too RFC 2047 (otros)';
+$labels['force7bit'] = 'Use MIME encoding for 8-bit characters';
 $labels['advancedoptions'] = 'Opciones avanzaes';
 $labels['focusonnewmessage'] = 'Poner el focu nos mensaxes nuevos';
 $labels['checkallfolders'] = 'Guetar mensaxes nuevos en toles bandexes';
 $labels['displaynext'] = 'Depués de mover/desaniciar amosar el mensaxe que sigue darréu';
+$labels['defaultfont'] = 'Default font of HTML message';
 $labels['mainoptions'] = 'Opciones principales';
+$labels['browseroptions'] = 'Browser Options';
 $labels['section'] = 'Seición';
 $labels['maintenance'] = 'Mantenimientu';
 $labels['newmessage'] = 'Mensax nuevu';
-$labels['folder'] = 'Bandexa';
-$labels['foldername'] = 'Nome de bandexa';
-$labels['subscribed'] = 'Soscrita';
+$labels['signatureoptions'] = 'Signature Options';
+$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'] = 'Automatically add signature';
+$labels['newmessageonly'] = 'new message only';
+$labels['replyandforwardonly'] = 'replies and forwards only';
+$labels['insertsignature'] = 'Insert signature';
+$labels['previewpanemarkread']  = 'Mark previewed messages as read';
+$labels['afternseconds']  = 'after $n seconds';
+$labels['reqmdn'] = 'Always request a return receipt';
+$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'] = 'Check spelling before sending a message';
+$labels['spellcheckoptions'] = 'Spellcheck Options';
+$labels['spellcheckignoresyms'] = 'Ignore words with symbols';
+$labels['spellcheckignorenums'] = 'Ignore words with numbers';
+$labels['spellcheckignorecaps'] = 'Ignore words with all letters capitalized';
+$labels['addtodict'] = 'Add to dictionary';
+$labels['mailtoprotohandler'] = 'Register protocol handler for mailto: links';
+$labels['forwardmode'] = 'Messages forwarding';
+$labels['inline'] = 'inline';
+$labels['asattachment'] = 'as attachment';
+
+$labels['folder']  = 'Bandexa';
+$labels['folders']  = 'Bandexes';
+$labels['foldername']  = 'Nome de bandexa';
+$labels['subscribed']  = 'Soscrita';
 $labels['messagecount'] = 'Mensaxes';
-$labels['create'] = 'Facer';
-$labels['createfolder'] = 'Facer una bandexa nueva';
-$labels['managefolders'] = 'Alministrar bandexes';
+$labels['create']  = 'Facer';
+$labels['createfolder']  = 'Facer una bandexa nueva';
+$labels['managefolders']  = 'Alministrar bandexes';
 $labels['specialfolders'] = 'Bandexes especiales';
+$labels['properties'] = 'Properties';
+$labels['folderproperties'] = 'Folder properties';
+$labels['parentfolder'] = 'Parent folder';
+$labels['location'] = 'Location';
+$labels['info'] = 'Information';
+$labels['getfoldersize'] = 'Click to get folder size';
+$labels['changesubscription'] = 'Click to change subscription';
+$labels['foldertype'] = 'Folder Type';
+$labels['personalfolder']  = 'Private Folder';
+$labels['otherfolder']  = 'Other User\'s Folder';
+$labels['sharedfolder']  = 'Public Folder';
+
 $labels['sortby'] = 'Ordenar por';
-$labels['sortasc'] = 'Orden ascendente';
+$labels['sortasc']  = 'Orden ascendente';
 $labels['sortdesc'] = 'Orden descendente';
+$labels['undo'] = 'Undo';
+
+$labels['installedplugins'] = 'Installed plugins';
+$labels['plugin'] = 'Plugin';
+$labels['version'] = 'Version';
+$labels['source'] = 'Source';
+$labels['license'] = 'License';
+$labels['support'] = 'Get support';
+
+// units
 $labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
 $labels['GB'] = 'GB';
 
+// character sets
+$labels['unicode'] = 'Unicode';
+$labels['english'] = '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['turkish'] = 'Turkish';
+$labels['nordic'] = 'Nordic';
+$labels['thai'] = 'Thai';
+$labels['celtic'] = 'Celtic';
+$labels['vietnamese'] = 'Vietnamese';
+$labels['japanese'] = 'Japanese';
+$labels['korean'] = 'Korean';
+$labels['chinese'] = 'Chinese';
+
+?>
diff --git a/program/localization/ast/messages.inc b/program/localization/ast/messages.inc
index 19bbfed8b..9e415b8ec 100644
--- a/program/localization/ast/messages.inc
+++ b/program/localization/ast/messages.inc
@@ -2,29 +2,43 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization//messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['loginfailed'] = 'La clave nun val';
+$messages['errortitle']  = 'An error occurred!';
+$messages['loginfailed']  = 'La clave nun val';
 $messages['cookiesdisabled'] = 'El to navegador nun acepta "cookies';
 $messages['sessionerror'] = 'La to sesión nun val';
 $messages['storageerror'] = 'Fallu de conexón col sirvidor IMAP';
 $messages['servererror'] = '¡Fallu del sirvidor!';
+$messages['servererrormsg'] = 'Server Error: $msg';
+$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';
 $messages['loggedout'] = 'Zarraste la sesión.';
 $messages['mailboxempty'] = 'La to cuenta nun tien mensaxes';
+$messages['refreshing'] = 'Refreshing...';
 $messages['loading'] = 'Cargando...';
+$messages['uploading'] = 'Uploading file...';
+$messages['uploadingmany'] = 'Uploading files...';
 $messages['loadingdata'] = 'Cargando datos...';
 $messages['checkingmail'] = 'A la gueta de mensaxes nuevos...';
 $messages['sendingmessage'] = 'Unviando mensaxe...';
@@ -34,40 +48,54 @@ $messages['messagesaved'] = 'El mensaxe guardóse en borradores';
 $messages['successfullysaved'] = 'Guardose correchamente';
 $messages['addedsuccessfully'] = 'El contautu amestose correchamente a la llibreta de direiciones';
 $messages['contactexists'] = 'Yá hai un contuaut con es direición de corréu';
+$messages['contactnameexists'] = 'A contact with the same name already exists.';
 $messages['blockedimages'] = 'Pa protexer la to privacidá, torgáronse les imáxenes esternes n\'esti mensaxe';
 $messages['encryptedmessage'] = 'Esti ye un mensaxe cifráu y nun soi a amosalu.';
 $messages['nocontactsfound'] = 'Nun doi con nengún contautu';
 $messages['contactnotfound'] = 'Nun doi col contautu que pides';
+$messages['contactsearchonly'] = 'Enter some search terms to find contacts';
 $messages['sendingfailed'] = 'Falló l\'unvio del mensaxe';
 $messages['senttooquickly'] = 'Por favor espera $sec segundu/os enantes d\'unviar esti mensaxe.';
 $messages['errorsavingsent'] = 'Di con un fallu al guardar el mensaxe';
 $messages['errorsaving'] = 'Falló al guardase';
 $messages['errormoving'] = 'Nun fui a mover el mensaxe';
+$messages['errorcopying'] = 'Could not copy the message(s).';
 $messages['errordeleting'] = 'Nun fui a desaniciar el mensaxe';
 $messages['errormarking'] = 'Nun se puede marcar el mensaxe';
-$messages['deletecontactconfirm'] = '¿Tas seguru de desaniciar los contautos que marcaste?';
+$messages['deletecontactconfirm']  = '¿Tas seguru de desaniciar los contautos que marcaste?';
+$messages['deletegroupconfirm']  = 'Do you really want to delete selected group?';
 $messages['deletemessagesconfirm'] = '¿Tas seguru de desaniciar los mensaxes que marcaste?';
-$messages['deletefolderconfirm'] = '¿Tas seguru de desaniciar esta bandexa?';
-$messages['purgefolderconfirm'] = '¿Tas seguru de desaniciar tolos mensaxes d\'esta bandexa?';
+$messages['deletefolderconfirm']  = '¿Tas seguru de desaniciar esta bandexa?';
+$messages['purgefolderconfirm']  = '¿Tas seguru de desaniciar tolos mensaxes d\'esta bandexa?';
+$messages['contactdeleting'] = 'Deleting contact(s)...';
+$messages['groupdeleting'] = 'Deleting group...';
 $messages['folderdeleting'] = 'Desaniciando la bandexa...';
 $messages['foldermoving'] = 'Moviendo la bandexa...';
+$messages['foldersubscribing'] = 'Subscribing folder...';
+$messages['folderunsubscribing'] = 'Unsubscribing folder...';
 $messages['formincomplete'] = 'Tienes de rellenar tolos campos del formulariu';
 $messages['noemailwarning'] = 'Por favor, dame un corréu válidu';
-$messages['nonamewarning'] = 'Por favor, dame\'l to nome';
+$messages['nonamewarning']  = 'Por favor, dame\'l to nome';
 $messages['nopagesizewarning'] = 'Por favor, dame un tamañu de páxina';
 $messages['nosenderwarning'] = 'Por favor dame un corréu dende donde unviar mesaxes';
 $messages['norecipientwarning'] = 'Por favor, dame polo menos un destinatariu';
-$messages['nosubjectwarning'] = 'El campo "Asuntu" ta vacíu. ¿Quiés rellenalu anguaño?';
+$messages['nosubjectwarning']  = 'El campo "Asuntu" ta vacíu. ¿Quiés rellenalu anguaño?';
 $messages['nobodywarning'] = '¿Quies unviar esti mensaxe ensin testu?';
 $messages['notsentwarning'] = 'Nun unvie\'l mensaxe. ¿Quies desanicialu?';
 $messages['noldapserver'] = 'Por favor, escueye un sirvidor LDAP pa buscar';
 $messages['nosearchname'] = 'Por favor, dame un nome o una direición de corréu';
+$messages['notuploadedwarning'] = 'Not all attachments have been uploaded yet. Please wait or cancel the upload.';
 $messages['searchsuccessful'] = 'Di con $nr mensaxes';
+$messages['contactsearchsuccessful'] = '$nr contacts found.';
 $messages['searchnomatch'] = 'Nun di con nengún resultáu';
 $messages['searching'] = 'A la gueta...';
 $messages['checking'] = 'Comprobando...';
 $messages['nospellerrors'] = 'Nun di con errores ortográficos';
 $messages['folderdeleted'] = 'Desaniciose la bandexa correchamente';
+$messages['foldersubscribed'] = 'Folder successfully subscribed.';
+$messages['folderunsubscribed'] = 'Folder successfully unsubscribed.';
+$messages['folderpurged'] = 'Folder has successfully been emptied.';
+$messages['folderexpunged'] = 'Folder has successfully been compacted.';
 $messages['deletedsuccessfully'] = 'Desaniciose correchamente';
 $messages['converting'] = 'Desaniciando\'l formatu del mensaxe...';
 $messages['messageopenerror'] = 'Nun soi a baxer el mensaxe del sirvidor';
@@ -78,15 +106,26 @@ $messages['copyerror'] = 'Nun fui a copiar nenguna direición';
 $messages['sourceisreadonly'] = 'Esta direición ye de namái-llectura';
 $messages['errorsavingcontact'] = 'Nun fui a guardar la direición del contautu';
 $messages['movingmessage'] = 'Moviendo\'l mensaxe...';
+$messages['copyingmessage'] = 'Copying message(s)...';
+$messages['copyingcontact'] = 'Copying contact(s)...';
+$messages['deletingmessage'] = 'Deleting message(s)...';
+$messages['markingmessage'] = 'Marking message(s)...';
+$messages['addingmember'] = 'Adding contact(s) to the group...';
+$messages['removingmember'] = 'Removing contact(s) from the group...';
 $messages['receiptsent'] = 'Unviose correchamente l\'avisu de llectura.';
 $messages['errorsendingreceipt'] = 'Nun fui a unviar l\'avisu de llectura.';
+$messages['deleteidentityconfirm'] = 'Do you really want to delete this identity?';
 $messages['nodeletelastidentity'] = 'Nun puedo desaniciar esa identidá porque ye la última.';
 $messages['forbiddencharacter'] = 'El nome de la bandexa tien un caráuter que nun val';
 $messages['selectimportfile'] = 'Por favor escueye el ficheru que quies xubir';
 $messages['addresswriterror'] = 'Nun puedo escribir nel llibru de direiciones qu\'escoyisti';
+$messages['contactaddedtogroup'] = 'Successfully added the contacts to this group.';
+$messages['contactremovedfromgroup'] = 'Successfully removed contacts from this group.';
+$messages['nogroupassignmentschanged'] = 'No group assignments changed.';
 $messages['importwait'] = 'Importando, dame un minutín...';
-$messages['importerror'] = 'Nun fui a importar. El ficheru qu\'escoyiste nun ye un ficheru vCard válidu.';
+$messages['importformaterror'] = 'Import failed! The uploaded file is not a valid import data file.';
 $messages['importconfirm'] = '<b>Importaronse correchamente $inserted contautos, saltáronse $skipped entrase que yá esistíen</b>:<p><em>$names</em></p>';
+$messages['importconfirmskipped'] = '<b>Skipped $skipped existing entries</b>';
 $messages['opnotpermitted'] = 'Nun tienes permisu pa facelo.';
 $messages['nofromaddress'] = 'Perdiose la direición de corréu de la identidá qu\'escoyisti';
 $messages['editorwarning'] = 'Si pases a editor en modu testu vas perder tol estilu aplicáu al mensaxe. ¿Tas seguru de que quies facelo?';
@@ -97,4 +136,36 @@ $messages['smtpfromerror'] = 'Fallu SMTP ($code): Fallu al aficar el remitente "
 $messages['smtptoerror'] = 'Fallu SMTP ($code): Fallu al amestar el destinatariu "$to" ($msg)';
 $messages['smtprecipientserror'] = 'Fallu SMTP: Nun soi a amosar la llista de destinatarios';
 $messages['smtperror'] = 'Fallu SMTP: $msg';
+$messages['emailformaterror'] = 'Invalid e-mail address: $email';
+$messages['toomanyrecipients'] = 'Too many recipients. Reduce the number of recipients to $max.';
+$messages['maxgroupmembersreached'] = 'The number of group members exceeds the maximum of $max.';
+$messages['internalerror'] = 'An internal error occured. Please try again.';
+$messages['contactdelerror'] = 'Could not delete contact(s).';
+$messages['contactdeleted'] = 'Contact(s) deleted successfully.';
+$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.';
 
+?>
diff --git a/program/localization/az_AZ/labels.inc b/program/localization/az_AZ/labels.inc
index 67450be9b..0cb4b3e82 100644
--- a/program/localization/az_AZ/labels.inc
+++ b/program/localization/az_AZ/labels.inc
@@ -2,60 +2,78 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/az_AZ/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Orkhan Guliyev <proger@box.az>                                |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = '$product-a xoş gəldiniz!';
-$labels['username'] = 'İstifadəçi adı';
-$labels['password'] = 'Şifrə';
-$labels['server'] = 'Server';
-$labels['login'] = 'Giriş';
-$labels['logout'] = 'Çıx';
-$labels['mail'] = 'Poçt';
+
+// login page
+$labels['welcome']   = '$product-a xoş gəldiniz!';
+$labels['username']  = 'İstifadəçi adı';
+$labels['password']  = 'Şifrə';
+$labels['server']    = 'Server';
+$labels['login']     = 'Giriş';
+
+// taskbar
+$labels['logout']   = 'Çıx';
+$labels['mail']     = 'Poçt';
 $labels['settings'] = 'Nizamlamalar';
 $labels['addressbook'] = 'Ünvanlar';
-$labels['inbox'] = 'Gələnlər';
+
+// mailbox names
+$labels['inbox']  = 'Gələnlər';
 $labels['drafts'] = 'Qaralamalar';
-$labels['sent'] = 'Göndərilənlər';
-$labels['trash'] = 'Səbət';
-$labels['junk'] = 'Spam';
+$labels['sent']   = 'Göndərilənlər';
+$labels['trash']  = 'Səbət';
+$labels['junk']   = 'Spam';
+
+// message listing
 $labels['subject'] = 'Mövzu';
-$labels['from'] = 'Kimdən';
-$labels['to'] = 'Kimə';
-$labels['cc'] = 'Nüsxə';
-$labels['bcc'] = 'Gizli';
+$labels['from']    = 'Kimdən';
+$labels['sender']  = 'Göndərən';
+$labels['to']      = 'Kimə';
+$labels['cc']      = 'Nüsxə';
+$labels['bcc']     = 'Gizli';
 $labels['replyto'] = 'Cavabla';
 $labels['followupto'] = 'İzlə';
-$labels['date'] = 'Tarix';
-$labels['size'] = 'Ölçü';
+$labels['date']    = 'Tarix';
+$labels['size']    = 'Ölçü';
 $labels['priority'] = 'Vaciblik';
 $labels['organization'] = 'Təşkilat';
 $labels['readstatus'] = 'Statusu oxu';
 $labels['listoptions'] = 'Siyahı ayarları...';
+
 $labels['mailboxlist'] = 'Qovluqlar';
-$labels['folders'] = 'Qovluqlar';
 $labels['messagesfromto'] = '$count mesajdan $from - $to arası mesajlar';
 $labels['threadsfromto'] = 'Müzakirə: $from - $to Toplam: $count';
 $labels['messagenrof'] = 'Məktub: $nr / $count';
 $labels['fromtoshort'] = '$from – $to-dan $count';
-$labels['copy'] = 'Kopyala';
-$labels['move'] = 'Köçür';
-$labels['moveto'] = 'Burada köçür...';
+
+$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';
+
 $labels['filename'] = 'Faylın adı';
 $labels['filesize'] = 'Faylın ölçüsü';
+
 $labels['addtoaddressbook'] = 'Ünvanlara əlavə et';
+
+// weekdays short
 $labels['sun'] = 'B';
 $labels['mon'] = 'Be';
 $labels['tue'] = 'Ç';
@@ -63,78 +81,88 @@ $labels['wed'] = 'Ça';
 $labels['thu'] = 'C';
 $labels['fri'] = 'Ca';
 $labels['sat'] = 'Ş';
-$labels['sunday'] = 'Bazar';
-$labels['monday'] = 'Bazar ertəsi';
-$labels['tuesday'] = 'Çərçənbə';
+
+// weekdays long
+$labels['sunday']    = 'Bazar';
+$labels['monday']    = 'Bazar ertəsi';
+$labels['tuesday']   = 'Çərçənbə';
 $labels['wednesday'] = 'Çərşənbə axşamı';
-$labels['thursday'] = 'Cümə';
-$labels['friday'] = 'Cümə axşamı';
-$labels['saturday'] = 'Şənbə';
-$labels['jan'] = 'Yan';
-$labels['feb'] = 'Fev';
-$labels['mar'] = 'Mar';
-$labels['apr'] = 'Apr';
-$labels['may'] = 'May';
-$labels['longmay'] = 'May';
-$labels['jun'] = 'İyn';
-$labels['jul'] = 'İyl';
-$labels['aug'] = 'Avq';
-$labels['sep'] = 'Sen';
-$labels['oct'] = 'Okt';
-$labels['nov'] = 'Noy';
-$labels['dec'] = 'Dek';
-$labels['longjan'] = 'Yanvar';
-$labels['longfeb'] = 'Fevral';
-$labels['longmar'] = 'Mart';
-$labels['longapr'] = 'Aprel';
-$labels['longjun'] = 'İyun';
-$labels['longjul'] = 'İyul';
-$labels['longaug'] = 'Avqust';
-$labels['longsep'] = 'Sentyabr';
-$labels['longoct'] = 'Oktyabr';
-$labels['longnov'] = 'Noyabr';
-$labels['longdec'] = 'Dekabr';
+$labels['thursday']  = 'Cümə';
+$labels['friday']    = 'Cümə axşamı';
+$labels['saturday']  = 'Şənbə';
+
+// months short
+$labels['jan']	= 'Yan';
+$labels['feb']	= 'Fev';
+$labels['mar']	= 'Mar';
+$labels['apr']	= 'Apr';
+$labels['may']	= 'May';
+$labels['jun']	= 'İyn';
+$labels['jul'] 	= 'İyl';
+$labels['aug']	= 'Avq';
+$labels['sep']	= 'Sen';
+$labels['oct']	= 'Okt';
+$labels['nov']	= 'Noy';
+$labels['dec']	= 'Dek';
+
+// months long
+$labels['longjan']	= 'Yanvar';
+$labels['longfeb']	= 'Fevral';
+$labels['longmar']	= 'Mart';
+$labels['longapr']	= 'Aprel';
+$labels['longmay']	= 'May';
+$labels['longjun']	= 'İyun';
+$labels['longjul']	= 'İyul';
+$labels['longaug']	= 'Avqust';
+$labels['longsep']	= 'Sentyabr';
+$labels['longoct']	= 'Oktyabr';
+$labels['longnov']	= 'Noyabr';
+$labels['longdec']	= 'Dekabr';
+
 $labels['today'] = 'Bu gün';
-$labels['refresh'] = 'Yenilə';
-$labels['checkmail'] = 'Gələnləri yoxla';
-$labels['compose'] = 'Məktub yaz';
-$labels['writenewmessage'] = 'Yeni məktub';
-$labels['reply'] = 'Cavabla';
-$labels['replytomessage'] = 'Göndərənə cavabla';
+
+// toolbar buttons
+$labels['refresh']          = 'Yenilə';
+$labels['checkmail']        = 'Gələnləri yoxla';
+$labels['compose']          = 'Məktub yaz';
+$labels['writenewmessage']  = 'Yeni məktub';
+$labels['reply']            = 'Cavabla';
+$labels['replytomessage']   = 'Göndərənə cavabla';
 $labels['replytoallmessage'] = 'Hamıya cavabla';
-$labels['replyall'] = 'Hamıya cavab';
-$labels['replylist'] = 'Cavab siyahısı';
-$labels['forward'] = 'Ötür';
-$labels['forwardinline'] = 'Məktubda ötür';
+$labels['replyall']         = 'Hamıya cavab';
+$labels['replylist']        = 'Cavab siyahısı';
+$labels['forward']          = 'Ötür';
+$labels['forwardinline']    = 'Məktubda ötür';
 $labels['forwardattachment'] = 'Əlavə kimi ötür';
-$labels['forwardmessage'] = 'Yönəlt';
-$labels['deletemessage'] = 'Sil';
+$labels['forwardmessage']   = 'Yönəlt';
+$labels['deletemessage']    = 'Sil';
 $labels['movemessagetotrash'] = 'Məktubu səbətə köçür';
-$labels['printmessage'] = 'Çap et';
-$labels['previousmessage'] = 'Əvvəlki məktubu göstər';
-$labels['firstmessage'] = 'Birinci məktubu göstər';
-$labels['nextmessage'] = 'Sonrakı məktubu göstər';
-$labels['lastmessage'] = 'Sonuncu məktubu göstər';
-$labels['backtolist'] = 'Məktublar siyahısına qayıt';
-$labels['viewsource'] = 'Mənbəni göstər';
-$labels['mark'] = 'İşarələ';
-$labels['markmessages'] = 'Məktubları işarələ';
-$labels['markread'] = 'Oxunmuş';
-$labels['markunread'] = 'Oxunmamış';
-$labels['markflagged'] = 'Qeyd et';
-$labels['markunflagged'] = 'Qeydi çıxar';
-$labels['moreactions'] = 'Daha çox seçim...';
-$labels['more'] = 'Daha çox';
-$labels['back'] = 'Geri';
-$labels['options'] = 'Ayarlar';
+$labels['printmessage']     = 'Çap et';
+$labels['previousmessage']  = 'Əvvəlki məktubu göstər';
+$labels['firstmessage']     = 'Birinci məktubu göstər';
+$labels['nextmessage']      = 'Sonrakı məktubu göstər';
+$labels['lastmessage']      = 'Sonuncu məktubu göstər';
+$labels['backtolist']       = 'Məktublar siyahısına qayıt';
+$labels['viewsource']       = 'Mənbəni göstər';
+$labels['mark']             = 'İşarələ';
+$labels['markmessages']     = 'Məktubları işarələ';
+$labels['markread']         = 'Oxunmuş';
+$labels['markunread']       = 'Oxunmamış';
+$labels['markflagged']      = 'Qeyd et';
+$labels['markunflagged']    = 'Qeydi çıxar';
+$labels['moreactions']      = 'Daha çox seçim...';
+$labels['more']             = 'Daha çox';
+$labels['back']             = 'Geri';
+$labels['options']          = 'Ayarlar';
+
 $labels['select'] = 'Seçin';
 $labels['all'] = 'Hamısı';
 $labels['none'] = 'Heç biri';
-$labels['nonesort'] = 'Heç biri';
 $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';
@@ -145,12 +173,14 @@ $labels['expand-all'] = 'Hamısını aç';
 $labels['expand-unread'] = 'Oxunmamışları aç';
 $labels['collapse-all'] = 'Hamısını bük';
 $labels['threaded'] = 'Müzakirə';
+
 $labels['autoexpand_threads'] = 'Müzakirəni aç';
 $labels['do_expand'] = 'bütün müzakirələr';
 $labels['expand_only_unread'] = 'yalnız oxunmamış məktublarla';
 $labels['fromto'] = 'Göndərən/Qəbul edən';
 $labels['flag'] = 'Bayrağ';
 $labels['attachment'] = 'Əlavə';
+$labels['nonesort'] = 'Heç biri';
 $labels['sentdate'] = 'Göndərilmə tarixi';
 $labels['arrival'] = 'Çatdırılma tarixi';
 $labels['asc'] = 'Çoxalan';
@@ -159,147 +189,176 @@ $labels['listcolumns'] = 'Sütunlar';
 $labels['listsorting'] = 'Sütunları çeşidlə';
 $labels['listorder'] = 'Çeşidləmə qaydası';
 $labels['listmode'] = 'Görünüş rejimi';
+
 $labels['folderactions'] = 'Qovluq işləri...';
 $labels['compact'] = 'Sıx';
 $labels['empty'] = 'Boşalt';
+
 $labels['quota'] = 'Disk istifadəsi';
-$labels['unknown'] = 'naməlum';
-$labels['unlimited'] = 'limitsiz';
-$labels['quicksearch'] = 'Sürətli axtarış';
-$labels['resetsearch'] = 'Axtarışı yenilə';
-$labels['searchmod'] = 'Axtarış variantları';
-$labels['msgtext'] = 'Bütün məktub';
+$labels['unknown']  = 'naməlum';
+$labels['unlimited']  = 'limitsiz';
+
+$labels['quicksearch']  = 'Sürətli axtarış';
+$labels['resetsearch']  = 'Axtarışı yenilə';
+$labels['searchmod']  = 'Axtarış variantları';
+$labels['msgtext']  = 'Bütün məktub';
+$labels['body']  = 'Mətn';
+
 $labels['openinextwin'] = 'Yeni pəncərədə aç';
 $labels['emlsave'] = 'Saxla (.eml)';
-$labels['editasnew'] = 'Yeni kimi redaktə et';
-$labels['send'] = 'Göndər';
-$labels['sendmessage'] = 'İndi göndər';
-$labels['savemessage'] = 'Qaralama saxla';
-$labels['addattachment'] = 'Fayl əlavə et';
-$labels['charset'] = 'Kodlaşdırma';
-$labels['editortype'] = 'Redaktor';
-$labels['returnreceipt'] = 'Cavab sorğusu';
-$labels['dsn'] = 'Çatdırılma statusu haqda bildiriş';
+$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';
+$labels['send']           = 'Göndər';
+$labels['sendmessage']    = 'İndi göndər';
+$labels['savemessage']    = 'Qaralama saxla';
+$labels['addattachment']  = 'Fayl əlavə et';
+$labels['charset']        = 'Kodlaşdırma';
+$labels['editortype']     = 'Redaktor';
+$labels['returnreceipt']  = 'Cavab sorğusu';
+$labels['dsn']            = 'Çatdırılma statusu haqda bildiriş';
 $labels['mailreplyintro'] = '$date tarixdə, $sender yazıb:';
 $labels['originalmessage'] = 'Orijinal məktub';
-$labels['editidents'] = 'İdentifikasiyanı dəyiş';
-$labels['spellcheck'] = 'Orfoqrafiya';
+
+$labels['editidents']    = 'İdentifikasiyanı dəyiş';
+$labels['spellcheck']    = 'Orfoqrafiya';
 $labels['checkspelling'] = 'Orfoqrafiyanı yoxla';
 $labels['resumeediting'] = 'Redaktəni davam et';
-$labels['revertto'] = 'Dəyişiklikləri ləğv et';
+$labels['revertto']      = 'Dəyişiklikləri ləğv et';
+
 $labels['attach'] = 'Fayl əlavə et';
 $labels['attachments'] = 'Bərkidilmiş Fayllar';
 $labels['upload'] = 'Yüklə';
 $labels['uploadprogress'] = '$percent ($current cəmi: $total)';
-$labels['close'] = 'Bağla';
-$labels['messageoptions'] = 'Məktub xüsusiyyətləri...';
-$labels['low'] = 'Alçaq';
-$labels['lowest'] = 'Çox alçaq';
-$labels['normal'] = 'Normal';
-$labels['high'] = 'Yüksək';
+$labels['close']  = 'Bağla';
+$labels['messageoptions']  = 'Məktub xüsusiyyətləri...';
+
+$labels['low']     = 'Alçaq';
+$labels['lowest']  = 'Çox alçaq';
+$labels['normal']  = 'Normal';
+$labels['high']    = 'Yüksək';
 $labels['highest'] = 'Çox yüksək';
-$labels['nosubject'] = '(mövzu yoxdur)';
+
+$labels['nosubject']  = '(mövzu yoxdur)';
 $labels['showimages'] = 'Şəkilləri göstər';
 $labels['alwaysshow'] = '$sender-dən olan məktublarda həmişə şəkilləri göstər';
-$labels['isdraft'] = 'Bu qaralama məktubudur.';
-$labels['andnmore'] = 'Daha çox $nr more...';
+$labels['isdraft']    = 'Bu qaralama məktubudur.';
+$labels['andnmore']   = 'Daha çox $nr more...';
 $labels['togglemoreheaders'] = 'Daha çox məktub';
 $labels['togglefullheaders'] = 'Məktubun çiy başlıqlarını keçir';
+
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Mətn';
 $labels['savesentmessagein'] = 'Məktubu saxla...';
 $labels['dontsave'] = 'saxlama';
 $labels['maxuploadsize'] = 'Faylın maksimal ölçüsü: $size';
+
 $labels['addcc'] = 'Kopya əlavə et';
 $labels['addbcc'] = 'Gizli kopya əlavə et';
 $labels['addreplyto'] = 'Yönəltmə əlavə et';
 $labels['addfollowupto'] = '"İzlə" əlavə et';
+
+// mdn
 $labels['mdnrequest'] = 'Məktubu göndərən onu oxuduğunuz haqda sorğu almaq istəyir. Göndərilsin?';
 $labels['receiptread'] = 'Oxunulma haqda soğru';
 $labels['yourmessage'] = 'Bu məktubunuzun oxunulduğu haqda sorğudur';
 $labels['receiptnote'] = 'Bu sorğu yalnız qəbul edilən tərəfindən məktubun açıldığına göstərir. Onun oxunulduğuna zəmanət vermir.';
-$labels['name'] = 'Göstərilən ad';
-$labels['firstname'] = 'Adı';
-$labels['surname'] = 'Soyadı';
-$labels['middlename'] = 'Orta adı';
-$labels['nameprefix'] = 'Prefiks';
-$labels['namesuffix'] = 'Suffiks';
-$labels['nickname'] = 'Ləqəb';
-$labels['jobtitle'] = 'Vəzifə';
-$labels['department'] = 'Departament';
-$labels['gender'] = 'Cins';
-$labels['maidenname'] = 'Qız adı';
-$labels['email'] = 'E-Poçt';
-$labels['phone'] = 'Telefon';
-$labels['address'] = 'Ünvan';
-$labels['street'] = 'Küçə';
-$labels['locality'] = 'Şəhər';
-$labels['zipcode'] = 'ZIP kod';
-$labels['region'] = 'Region';
-$labels['country'] = 'Ölkə';
-$labels['birthday'] = 'Ad günü';
-$labels['anniversary'] = 'İldönümü';
-$labels['website'] = 'Vebsayt';
+
+// address boook
+$labels['name']         = 'Göstərilən ad';
+$labels['firstname']    = 'Adı';
+$labels['surname']      = 'Soyadı';
+$labels['middlename']   = 'Orta adı';
+$labels['nameprefix']   = 'Prefiks';
+$labels['namesuffix']   = 'Suffiks';
+$labels['nickname']     = 'Ləqəb';
+$labels['jobtitle']     = 'Vəzifə';
+$labels['department']   = 'Departament';
+$labels['gender']       = 'Cins';
+$labels['maidenname']   = 'Qız adı';
+$labels['email']        = 'E-Poçt';
+$labels['phone']        = 'Telefon';
+$labels['address']      = 'Ünvan';
+$labels['street']       = 'Küçə';
+$labels['locality']     = 'Şəhər';
+$labels['zipcode']      = 'ZIP kod';
+$labels['region']       = 'Region';
+$labels['country']      = 'Ölkə';
+$labels['birthday']     = 'Ad günü';
+$labels['anniversary']  = 'İldönümü';
+$labels['website']      = 'Vebsayt';
 $labels['instantmessenger'] = 'IM';
 $labels['notes'] = 'Qeydlər';
-$labels['male'] = 'kişi';
+$labels['male']   = 'kişi';
 $labels['female'] = 'qadın';
 $labels['manager'] = 'Menecer';
 $labels['assistant'] = 'Köməkçi';
-$labels['typeassistant'] = 'Köməkçi';
 $labels['spouse'] = 'Ər-arvad';
 $labels['allfields'] = 'Bütün sahələr';
 $labels['search'] = 'Axtar';
 $labels['advsearch'] = 'Ətraflı axtarış';
 $labels['advanced'] = 'Əlavə';
 $labels['other'] = 'Başqa';
-$labels['typeother'] = 'Başqa';
-$labels['typehome'] = 'Ev';
-$labels['typework'] = 'İş';
-$labels['typemobile'] = 'Mobil';
-$labels['typemain'] = 'Əsas';
-$labels['typehomefax'] = 'Ev faksı';
-$labels['typeworkfax'] = 'İş faksı';
-$labels['typecar'] = 'Maşın';
-$labels['typepager'] = 'Peycer';
-$labels['typevideo'] = 'Video';
-$labels['typehomepage'] = 'Ana səhifə';
+
+$labels['typehome']   = 'Ev';
+$labels['typework']   = 'İş';
+$labels['typeother']  = 'Başqa';
+$labels['typemobile']  = 'Mobil';
+$labels['typemain']  = 'Əsas';
+$labels['typehomefax']  = 'Ev faksı';
+$labels['typeworkfax']  = 'İş faksı';
+$labels['typecar']  = 'Maşın';
+$labels['typepager']  = 'Peycer';
+$labels['typevideo']  = 'Video';
+$labels['typeassistant']  = 'Köməkçi';
+$labels['typehomepage']  = 'Ana səhifə';
 $labels['typeblog'] = 'Bloq';
 $labels['typeprofile'] = 'Profil';
+
 $labels['addfield'] = 'Sahə əlavə et';
 $labels['addcontact'] = 'Ünvanlara əlavə et';
 $labels['editcontact'] = 'Ünvanı redaktə et';
 $labels['contacts'] = 'Əlaqələr';
 $labels['contactproperties'] = 'Kontakt xüsusiyyətləri';
 $labels['personalinfo'] = 'Şəxsi məlumat';
-$labels['edit'] = 'Redaktə et';
+
+$labels['edit']   = 'Redaktə et';
 $labels['cancel'] = 'Ləğv et';
-$labels['save'] = 'Saxla';
+$labels['save']   = 'Saxla';
 $labels['delete'] = 'Sil';
 $labels['rename'] = 'Adlandır';
 $labels['addphoto'] = 'Əlavə et';
 $labels['replacephoto'] = 'Adı dəyiş';
 $labels['uploadphoto'] = 'Şəkil yüklə';
-$labels['newcontact'] = 'Yeni ünvan kartı əlavə et';
-$labels['deletecontact'] = 'Seçilmiş ünvanları sil';
-$labels['composeto'] = 'Seçilmiş ünvanlara məktub yaz';
+
+$labels['newcontact']     = 'Yeni ünvan kartı əlavə et';
+$labels['deletecontact']  = 'Seçilmiş ünvanları sil';
+$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['exportvcards'] = 'Ünvanları vCards formatında ixrac et';
+$labels['print']          = 'Çap et';
+$labels['export']         = 'İxrac et';
+$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';
-$labels['groupdelete'] = 'Qrupu sil';
+$labels['grouprename']    = 'Qruğun adını dəyişdir';
+$labels['groupdelete']    = 'Qrupu sil';
 $labels['groupremoveselected'] = 'Qrupdan seçilmiş kontaktları sil';
-$labels['previouspage'] = 'Əvvəlkini göstər';
-$labels['firstpage'] = 'Birincini göstər';
-$labels['nextpage'] = 'Sonrakını göstər';
-$labels['lastpage'] = 'Sonuncunu göstər';
+
+$labels['previouspage']   = 'Əvvəlkini göstər';
+$labels['firstpage']      = 'Birincini göstər';
+$labels['nextpage']       = 'Sonrakını göstər';
+$labels['lastpage']       = 'Sonuncunu göstər';
+
 $labels['group'] = 'Qrup';
 $labels['groups'] = 'Qruplar';
 $labels['personaladrbook'] = 'Şəxsi ünvanlar';
+
 $labels['searchsave'] = 'Sorğunu saxla';
 $labels['searchdelete'] = 'Sorğunu sil';
+
 $labels['import'] = 'İdxal';
 $labels['importcontacts'] = 'Ünvanların idxalı';
 $labels['importfromfile'] = 'Fayldan idxal:';
@@ -307,35 +366,43 @@ $labels['importtarget'] = 'Əlaqə kitabçasına yeni kontaktları əlavə et';
 $labels['importreplace'] = 'Ünvan kitabçasını dəyiş';
 $labels['importdesc'] = 'Siz kontaktları mövcud ünvan kitabçasından yükləyə bilərsiniz. <br/> Hal-hazırda biz ünvanların idxalını <a href="http://az.wikipedia.org/wiki/VCard">vCard</a> və ya CSV (vergüllə bölünmüş) formatında olan vizit kartları dəstəkləyirik.';
 $labels['done'] = 'Bitdi';
+
+// settings
 $labels['settingsfor'] = 'Nizamlamaları';
 $labels['about'] = 'Haqqında';
 $labels['preferences'] = 'Nizamlamalar';
 $labels['userpreferences'] = 'İstifadəçi nizamlamaları';
 $labels['editpreferences'] = 'İstifadəçi nizamlamalarını redaktə et';
+
 $labels['identities'] = 'Kimliklər';
 $labels['manageidentities'] = 'Bu hesab üçün kimlikləri idarə et';
 $labels['newidentity'] = 'Yeni kimlik';
+
 $labels['newitem'] = 'Yeni maddə';
 $labels['edititem'] = 'Maddəni redaktə et';
+
 $labels['preferhtml'] = 'HTML-də göstər';
 $labels['defaultcharset'] = 'İlkin vəziyyətdəki kodlaşdırma';
 $labels['htmlmessage'] = 'HTML məktub';
+$labels['messagepart'] = 'Hissə';
+$labels['digitalsig'] = 'Rəqəmsal imza';
 $labels['dateformat'] = 'Tarix formatı';
 $labels['timeformat'] = 'Vaxt formatı';
 $labels['prettydate'] = 'Qəşəng tarixlər';
-$labels['setdefault'] = 'İlkin vəziyyətə qaytar';
-$labels['autodetect'] = 'Avto';
-$labels['language'] = 'Dil';
-$labels['timezone'] = 'Saat qurşağı';
-$labels['pagesize'] = 'Səhifədə sətrlər';
+$labels['setdefault']  = 'İlkin vəziyyətə qaytar';
+$labels['autodetect']  = 'Avto';
+$labels['language']  = 'Dil';
+$labels['timezone']  = 'Saat qurşağı';
+$labels['pagesize']  = 'Səhifədə sətrlər';
 $labels['signature'] = 'İmza';
-$labels['dstactive'] = 'Yay vaxtı';
+$labels['dstactive']  = 'Yay vaxtı';
 $labels['showinextwin'] = 'Məktubu yeni pəncərədə aç';
 $labels['composeextwin'] = 'Yeni pəncərədə yarat';
 $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ə';
@@ -358,11 +425,11 @@ $labels['showremoteimages'] = 'Silinmiç şəkilləri göstər';
 $labels['fromknownsenders'] = 'məlum göndərənlərdən';
 $labels['always'] = 'hər zaman';
 $labels['showinlineimages'] = 'Əlavə olunmuş şəkili məktubun aşağısında göstər';
-$labels['autosavedraft'] = 'Qaralamanı avtomatik saxla';
-$labels['everynminutes'] = 'hər $n dəqiqə(lər)';
-$labels['refreshinterval'] = 'Yenilə (yeni məktubları yoxla v.s.)';
-$labels['never'] = 'heç vaxt';
-$labels['immediately'] = 'dərhal';
+$labels['autosavedraft']  = 'Qaralamanı avtomatik saxla';
+$labels['everynminutes']  = 'hər $n dəqiqə(lər)';
+$labels['refreshinterval']  = 'Yenilə (yeni məktubları yoxla v.s.)';
+$labels['never']  = 'heç vaxt';
+$labels['immediately']  = 'dərhal';
 $labels['messagesdisplaying'] = 'Məktubların göstərilməsi';
 $labels['messagescomposition'] = 'Məktubların yazılması';
 $labels['mimeparamfolding'] = 'Bərkidilənlərin adları';
@@ -389,12 +456,9 @@ $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';
+$labels['previewpanemarkread']  = 'Baxılmış şəkilləri oxunmuş kimi qeyd et';
+$labels['afternseconds']  = '$n saniyədən sonra';
 $labels['reqmdn'] = 'Hər zaman çatdırılma bildirişini istə';
 $labels['reqdsn'] = 'Hər zaman çatıdrılma haqda statusu istə';
 $labels['replysamefolder'] = 'Cavab mesajları üçün saxlanılan yer';
@@ -411,13 +475,15 @@ $labels['mailtoprotohandler'] = 'mailto: keçid üçün protokol qeyd et';
 $labels['forwardmode'] = 'Məktubların yönəldilməsi';
 $labels['inline'] = 'mətndə';
 $labels['asattachment'] = 'fayl kimi';
-$labels['folder'] = 'Qovluq';
-$labels['foldername'] = 'Qovluq adı';
-$labels['subscribed'] = 'İmzalanıb';
+
+$labels['folder']  = 'Qovluq';
+$labels['folders']  = 'Qovluqlar';
+$labels['foldername']  = 'Qovluq adı';
+$labels['subscribed']  = 'İmzalanıb';
 $labels['messagecount'] = 'Məktublar';
-$labels['create'] = 'Yarad';
-$labels['createfolder'] = 'Yeni qovluq yarad';
-$labels['managefolders'] = 'Qovluqlarla iş';
+$labels['create']  = 'Yarad';
+$labels['createfolder']  = 'Yeni qovluq yarad';
+$labels['managefolders']  = 'Qovluqlarla iş';
 $labels['specialfolders'] = 'Xüsusi qovluqlar';
 $labels['properties'] = 'Xüsusiyyətlər';
 $labels['folderproperties'] = 'Qovluq xüsusiyyətləri';
@@ -427,23 +493,29 @@ $labels['info'] = 'Məlumat';
 $labels['getfoldersize'] = 'Qovluq ölçüsünü öyrənmək üçün vur';
 $labels['changesubscription'] = 'Abunəni dəyişmək üçün vurun';
 $labels['foldertype'] = 'Qovluq növü';
-$labels['personalfolder'] = 'Gizli qovluq';
-$labels['otherfolder'] = 'Başqa istifadəçilərin qovluğu';
-$labels['sharedfolder'] = 'İctimai qovluq';
+$labels['personalfolder']  = 'Gizli qovluq';
+$labels['otherfolder']  = 'Başqa istifadəçilərin qovluğu';
+$labels['sharedfolder']  = 'İctimai qovluq';
+
 $labels['sortby'] = 'Çeşidlə';
-$labels['sortasc'] = 'Azdan çoxa';
+$labels['sortasc']  = 'Azdan çoxa';
 $labels['sortdesc'] = 'Çoxdan aza';
 $labels['undo'] = 'Ləğv et';
+
 $labels['installedplugins'] = 'Yazılmış qoşmalar';
 $labels['plugin'] = 'Qoşma';
 $labels['version'] = 'Versiya';
 $labels['source'] = 'Mənbə';
 $labels['license'] = 'Lisenziya';
 $labels['support'] = 'Dəstək';
+
+// units
 $labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
 $labels['GB'] = 'GB';
+
+// character sets
 $labels['unicode'] = 'Unicode';
 $labels['english'] = 'İngilis dili';
 $labels['westerneuropean'] = 'Qərbi Avropa';
@@ -463,3 +535,4 @@ $labels['japanese'] = 'Yaponca';
 $labels['korean'] = 'Koreya';
 $labels['chinese'] = 'Çincə';
 
+?>
diff --git a/program/localization/az_AZ/messages.inc b/program/localization/az_AZ/messages.inc
index b56297695..418f270be 100644
--- a/program/localization/az_AZ/messages.inc
+++ b/program/localization/az_AZ/messages.inc
@@ -2,32 +2,37 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/az_AZ/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Orkhan Guliyev <proger@box.az>                                |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $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ə...';
@@ -57,11 +62,11 @@ $messages['errormoving'] = 'Məktubu (məktubları) köçürmək alnmadı';
 $messages['errorcopying'] = 'Məktubu (məktubları) kopyalamaq alınmadı';
 $messages['errordeleting'] = 'Məktubu (məktubları) silmək alınmadı';
 $messages['errormarking'] = 'Məktubu (məktubları) işarələmək mümkün deyil';
-$messages['deletecontactconfirm'] = 'Seçilən ünvanı (ünvanları) silməyə əminsiniz?';
-$messages['deletegroupconfirm'] = 'Qrupu silməkdə əminsiniz?';
+$messages['deletecontactconfirm']  = 'Seçilən ünvanı (ünvanları) silməyə əminsiniz?';
+$messages['deletegroupconfirm']  = 'Qrupu silməkdə əminsiniz?';
 $messages['deletemessagesconfirm'] = 'Seçilən məktubu (məktubları) silməyə əminsiniz?';
-$messages['deletefolderconfirm'] = 'Bu qovluğu silməyə əminsiniz?';
-$messages['purgefolderconfirm'] = 'Bu qovluqdakı bütün məktubları silməyə əminsiniz?';
+$messages['deletefolderconfirm']  = 'Bu qovluğu silməyə əminsiniz?';
+$messages['purgefolderconfirm']  = 'Bu qovluqdakı bütün məktubları silməyə əminsiniz?';
 $messages['contactdeleting'] = 'Kontak(lar)ın silinməsi...';
 $messages['groupdeleting'] = 'Qrupun silinməsi...';
 $messages['folderdeleting'] = 'Qovluğ silinir...';
@@ -70,11 +75,11 @@ $messages['foldersubscribing'] = 'Qovluğa abunə...';
 $messages['folderunsubscribing'] = 'Qovluğa abunədən çıx...';
 $messages['formincomplete'] = 'Bütün sətrlər doldurulmayıb';
 $messages['noemailwarning'] = 'Lütfən, düzgün e-poçt ünvanı daxil edin';
-$messages['nonamewarning'] = 'Lütfən, ad daxil edin';
+$messages['nonamewarning']  = 'Lütfən, ad daxil edin';
 $messages['nopagesizewarning'] = 'Lütfən, səhifənin ölçüsünü daxil edin';
 $messages['nosenderwarning'] = 'Lütfən, göndərənin elektron poçt ünvanını daxil edin';
 $messages['norecipientwarning'] = 'Lütfən, qəbul edənin ünvanını daxil edin';
-$messages['nosubjectwarning'] = '"Mövzu" sahəsi boşdur. Mövzu daxil etmək istəyirsiniz?';
+$messages['nosubjectwarning']  = '"Mövzu" sahəsi boşdur. Mövzu daxil etmək istəyirsiniz?';
 $messages['nobodywarning'] = 'Məktub boş göndərilsin?';
 $messages['notsentwarning'] = 'Məktub göndərilmədi. Göndərilmədən imtina etmək istəyirsiniz?';
 $messages['noldapserver'] = 'Lütfən, axtarış üçün LDAP server seçin';
@@ -163,3 +168,4 @@ $messages['messagetoobig'] = 'Məktubun bir hissəsi emal üçün böyükdür.';
 $messages['attachmentvalidationerror'] = 'DİQQƏT! Bu qoşma şübhəlidir, çünki məktubda deyilən növlə eyni deyil. Əgər siz göndərə güvənmirsinizsə, brauzerdə bunu açmayın. Tərkibi təhlükəli ola bilər.<br/><br/><em>Expected: $expected; found: $detected</em>';
 $messages['noscriptwarning'] = 'Xəbərdarlıq: Bu vebmeyl xidməti Javascript tələb edir! Funksiyanı istifadə etmək üçün lütfən, brauzerinizin ayarlarında Javascript-i yandırın.';
 
+?>
diff --git a/program/localization/be_BE/labels.inc b/program/localization/be_BE/labels.inc
index 76a79bf78..a5489a454 100644
--- a/program/localization/be_BE/labels.inc
+++ b/program/localization/be_BE/labels.inc
@@ -2,43 +2,537 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/be_BE/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Alex Nehaichik <nab@mail.by>                                  |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = 'Вітаем у $product';
-$labels['username'] = 'Карыстальнік';
-$labels['password'] = 'Пароль';
-$labels['server'] = 'Сервер';
-$labels['login'] = 'Уваход';
-$labels['logout'] = 'Выхад';
-$labels['mail'] = 'Пошта';
+
+// login page
+$labels['welcome']   = 'Вітаем у $product';
+$labels['username']  = 'Карыстальнік';
+$labels['password']  = 'Пароль';
+$labels['server']    = 'Сервер';
+$labels['login']     = 'Уваход';
+
+// taskbar
+$labels['logout']   = 'Выхад';
+$labels['mail']     = 'Пошта';
 $labels['settings'] = 'Настаўленні';
 $labels['addressbook'] = 'Адрасная кніга';
-$labels['inbox'] = 'Атрыманыя';
+
+// mailbox names
+$labels['inbox']  = 'Атрыманыя';
 $labels['drafts'] = 'Чарнавікі';
-$labels['sent'] = 'Дасланыя';
-$labels['trash'] = 'Сметніца';
-$labels['junk'] = 'Спам';
+$labels['sent']   = 'Дасланыя';
+$labels['trash']  = 'Сметніца';
+$labels['junk']   = 'Спам';
+
+// message listing
 $labels['subject'] = 'Тэма';
-$labels['from'] = 'Ад каго';
-$labels['to'] = 'Каму';
-$labels['cc'] = 'Копія (СС)';
-$labels['bcc'] = 'Сх.копія (ВСС)';
+$labels['from']    = 'Ад каго';
+$labels['sender']  = 'Sender';
+$labels['to']      = 'Каму';
+$labels['cc']      = 'Копія (СС)';
+$labels['bcc']     = 'Сх.копія (ВСС)';
 $labels['replyto'] = 'Адказаць на';
-$labels['date'] = 'Дата';
-$labels['size'] = 'Памер';
+$labels['followupto'] = 'Followup-To';
+$labels['date']    = 'Дата';
+$labels['size']    = 'Памер';
 $labels['priority'] = 'Прыярытэт';
+$labels['organization'] = 'Organization';
 $labels['readstatus'] = 'Не прачытанае';
+$labels['listoptions'] = 'List options...';
+
 $labels['mailboxlist'] = 'Тэчкі';
-$labels['folders'] = 'Тэчкі';
+$labels['messagesfromto'] = 'Messages $from to $to of $count';
+$labels['threadsfromto'] = 'Threads $from to $to of $count';
+$labels['messagenrof'] = 'Message $nr of $count';
+$labels['fromtoshort'] = '$from – $to of $count';
+
+$labels['copy']     = 'Copy';
+$labels['move']     = 'Move';
+$labels['moveto']   = 'Move to...';
+$labels['download'] = 'Download';
+$labels['open']     = 'Open';
+$labels['showattachment'] = 'Show';
+$labels['showanyway'] = 'Show it anyway';
+
+$labels['filename'] = 'File name';
+$labels['filesize'] = 'File size';
+
+$labels['addtoaddressbook'] = 'Add to address book';
+
+// weekdays short
+$labels['sun'] = 'Sun';
+$labels['mon'] = 'Mon';
+$labels['tue'] = 'Tue';
+$labels['wed'] = 'Wed';
+$labels['thu'] = 'Thu';
+$labels['fri'] = 'Fri';
+$labels['sat'] = 'Sat';
+
+// weekdays long
+$labels['sunday']    = 'Sunday';
+$labels['monday']    = 'Monday';
+$labels['tuesday']   = 'Tuesday';
+$labels['wednesday'] = 'Wednesday';
+$labels['thursday']  = 'Thursday';
+$labels['friday']    = 'Friday';
+$labels['saturday']  = 'Saturday';
+
+// months short
+$labels['jan']	= 'Jan';
+$labels['feb']	= 'Feb';
+$labels['mar']	= 'Mar';
+$labels['apr']	= 'Apr';
+$labels['may']	= 'May';
+$labels['jun']	= 'Jun';
+$labels['jul'] 	= 'Jul';
+$labels['aug']	= 'Aug';
+$labels['sep']	= 'Sep';
+$labels['oct']	= 'Oct';
+$labels['nov']	= 'Nov';
+$labels['dec']	= 'Dec';
+
+// months long
+$labels['longjan']	= 'January';
+$labels['longfeb']	= 'February';
+$labels['longmar']	= 'March';
+$labels['longapr']	= 'April';
+$labels['longmay']	= 'May';
+$labels['longjun']	= 'June';
+$labels['longjul']	= 'July';
+$labels['longaug']	= 'August';
+$labels['longsep']	= 'September';
+$labels['longoct']	= 'October';
+$labels['longnov']	= 'November';
+$labels['longdec']	= 'December';
+
+$labels['today'] = 'Today';
+
+// toolbar buttons
+$labels['refresh']          = 'Refresh';
+$labels['checkmail']        = 'Check for new messages';
+$labels['compose']          = 'Compose';
+$labels['writenewmessage']  = 'Create a new message';
+$labels['reply']            = 'Reply';
+$labels['replytomessage']   = 'Reply to sender';
+$labels['replytoallmessage'] = 'Reply to list or to sender and all recipients';
+$labels['replyall']         = 'Reply all';
+$labels['replylist']        = 'Reply list';
+$labels['forward']          = 'Forward';
+$labels['forwardinline']    = 'Forward inline';
+$labels['forwardattachment'] = 'Forward as attachment';
+$labels['forwardmessage']   = 'Forward the message';
+$labels['deletemessage']    = 'Delete message';
+$labels['movemessagetotrash'] = 'Move message to trash';
+$labels['printmessage']     = 'Print this message';
+$labels['previousmessage']  = 'Show previous message';
+$labels['firstmessage']     = 'Show first message';
+$labels['nextmessage']      = 'Show next message';
+$labels['lastmessage']      = 'Show last message';
+$labels['backtolist']       = 'Back to message list';
+$labels['viewsource']       = 'Show source';
+$labels['mark']             = 'Mark';
+$labels['markmessages']     = 'Mark messages';
+$labels['markread']         = 'As read';
+$labels['markunread']       = 'As unread';
+$labels['markflagged']      = 'As flagged';
+$labels['markunflagged']    = 'As unflagged';
+$labels['moreactions']      = 'More actions...';
+$labels['more']             = 'More';
+$labels['back']             = 'Back';
+$labels['options']          = 'Options';
+
+$labels['select'] = 'Select';
+$labels['all'] = 'All';
+$labels['none'] = 'None';
+$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';
+$labels['filter'] = 'Filter';
+$labels['list'] = 'List';
+$labels['threads'] = 'Threads';
+$labels['expand-all'] = 'Expand All';
+$labels['expand-unread'] = 'Expand Unread';
+$labels['collapse-all'] = 'Collapse All';
+$labels['threaded'] = 'Threaded';
+
+$labels['autoexpand_threads'] = 'Expand message threads';
+$labels['do_expand'] = 'all threads';
+$labels['expand_only_unread'] = 'only with unread messages';
+$labels['fromto'] = 'From/To';
+$labels['flag'] = 'Flag';
+$labels['attachment'] = 'Attachment';
+$labels['nonesort'] = 'None';
+$labels['sentdate'] = 'Sent date';
+$labels['arrival'] = 'Arrival date';
+$labels['asc'] = 'ascending';
+$labels['desc'] = 'descending';
+$labels['listcolumns'] = 'List columns';
+$labels['listsorting'] = 'Sorting column';
+$labels['listorder'] = 'Sorting order';
+$labels['listmode'] = 'List view mode';
+
+$labels['folderactions'] = 'Folder actions...';
+$labels['compact'] = 'Compact';
+$labels['empty'] = 'Empty';
+
+$labels['quota'] = 'Disk usage';
+$labels['unknown']  = 'unknown';
+$labels['unlimited']  = 'unlimited';
+
+$labels['quicksearch']  = 'Quick search';
+$labels['resetsearch']  = 'Reset search';
+$labels['searchmod']  = 'Search modifiers';
+$labels['msgtext']  = 'Entire message';
+$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';
+$labels['send']           = 'Send';
+$labels['sendmessage']    = 'Send message';
+$labels['savemessage']    = 'Save as draft';
+$labels['addattachment']  = 'Attach a file';
+$labels['charset']        = 'Charset';
+$labels['editortype']     = 'Editor type';
+$labels['returnreceipt']  = 'Return receipt';
+$labels['dsn']            = 'Delivery status notification';
+$labels['mailreplyintro'] = 'On $date, $sender wrote:';
+$labels['originalmessage'] = 'Original Message';
+
+$labels['editidents']    = 'Edit identities';
+$labels['spellcheck']    = 'Spell';
+$labels['checkspelling'] = 'Check spelling';
+$labels['resumeediting'] = 'Resume editing';
+$labels['revertto']      = 'Revert to';
+
+$labels['attach'] = 'Attach';
+$labels['attachments'] = 'Attachments';
+$labels['upload'] = 'Upload';
+$labels['uploadprogress'] = '$percent ($current from $total)';
+$labels['close']  = 'Close';
+$labels['messageoptions']  = 'Message options...';
+
+$labels['low']     = 'Low';
+$labels['lowest']  = 'Lowest';
+$labels['normal']  = 'Normal';
+$labels['high']    = 'High';
+$labels['highest'] = 'Highest';
+
+$labels['nosubject']  = '(no subject)';
+$labels['showimages'] = 'Display images';
+$labels['alwaysshow'] = 'Always show images from $sender';
+$labels['isdraft']    = 'This is a draft message.';
+$labels['andnmore']   = '$nr more...';
+$labels['togglemoreheaders'] = 'Show more message headers';
+$labels['togglefullheaders'] = 'Toggle raw message headers';
+
+$labels['htmltoggle'] = 'HTML';
+$labels['plaintoggle'] = 'Plain text';
+$labels['savesentmessagein'] = 'Save sent message in';
+$labels['dontsave'] = 'don\'t save';
+$labels['maxuploadsize'] = 'Maximum allowed file size is $size';
+
+$labels['addcc'] = 'Add Cc';
+$labels['addbcc'] = 'Add Bcc';
+$labels['addreplyto'] = 'Add Reply-To';
+$labels['addfollowupto'] = 'Add Followup-To';
+
+// mdn
+$labels['mdnrequest'] = 'The sender of this message has asked to be notified when you read this message. Do you wish to notify the sender?';
+$labels['receiptread'] = 'Return Receipt (read)';
+$labels['yourmessage'] = 'This is a Return Receipt for your message';
+$labels['receiptnote'] = 'Note: This receipt only acknowledges that the message was displayed on the recipient\'s computer. There is no guarantee that the recipient has read or understood the message contents.';
+
+// address boook
+$labels['name']         = 'Display Name';
+$labels['firstname']    = 'First Name';
+$labels['surname']      = 'Last Name';
+$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['email']        = 'Email';
+$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['typepager']  = 'Pager';
+$labels['typevideo']  = 'Video';
+$labels['typeassistant']  = 'Assistant';
+$labels['typehomepage']  = 'Home Page';
+$labels['typeblog'] = 'Blog';
+$labels['typeprofile'] = 'Profile';
+
+$labels['addfield'] = 'Add field...';
+$labels['addcontact'] = 'Add new contact';
+$labels['editcontact'] = 'Edit contact';
+$labels['contacts'] = 'Contacts';
+$labels['contactproperties'] = 'Contact properties';
+$labels['personalinfo'] = 'Personal information';
+
+$labels['edit']   = 'Edit';
+$labels['cancel'] = 'Cancel';
+$labels['save']   = 'Save';
+$labels['delete'] = 'Delete';
+$labels['rename'] = 'Rename';
+$labels['addphoto'] = 'Add';
+$labels['replacephoto'] = 'Replace';
+$labels['uploadphoto'] = 'Upload photo';
+
+$labels['newcontact']     = 'Create new contact card';
+$labels['deletecontact']  = 'Delete selected contacts';
+$labels['composeto']      = 'Compose mail to';
+$labels['contactsfromto'] = 'Contacts $from to $to of $count';
+$labels['print']          = 'Print';
+$labels['export']         = 'Export';
+$labels['exportall']      = 'Export all';
+$labels['exportsel']      = 'Export selected';
+$labels['exportvcards']   = 'Export contacts in vCard format';
+$labels['newcontactgroup'] = 'Create new contact group';
+$labels['grouprename']    = 'Rename group';
+$labels['groupdelete']    = 'Delete group';
+$labels['groupremoveselected'] = 'Remove selected contacts from group';
+
+$labels['previouspage']   = 'Show previous page';
+$labels['firstpage']      = 'Show first page';
+$labels['nextpage']       = 'Show next page';
+$labels['lastpage']       = 'Show last page';
+
+$labels['group'] = 'Group';
+$labels['groups'] = 'Groups';
+$labels['personaladrbook'] = 'Personal Addresses';
+
+$labels['searchsave'] = 'Save search';
+$labels['searchdelete'] = 'Delete search';
+
+$labels['import'] = 'Import';
+$labels['importcontacts'] = 'Import contacts';
+$labels['importfromfile'] = 'Import from file:';
+$labels['importtarget'] = 'Add new contacts to address book:';
+$labels['importreplace'] = 'Replace the entire address book';
+$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['done'] = 'Done';
+
+// settings
+$labels['settingsfor'] = 'Settings for';
+$labels['about'] = 'About';
+$labels['preferences'] = 'Preferences';
+$labels['userpreferences'] = 'User preferences';
+$labels['editpreferences'] = 'Edit user preferences';
+
+$labels['identities'] = 'Identities';
+$labels['manageidentities'] = 'Manage identities for this account';
+$labels['newidentity'] = 'New identity';
+
+$labels['newitem'] = 'New item';
+$labels['edititem'] = 'Edit item';
+
+$labels['preferhtml'] = 'Display HTML';
+$labels['defaultcharset'] = 'Default Character Set';
+$labels['htmlmessage'] = 'HTML Message';
+$labels['messagepart'] = 'Part';
+$labels['digitalsig'] = 'Digital Signature';
+$labels['dateformat'] = 'Date format';
+$labels['timeformat'] = 'Time format';
+$labels['prettydate'] = 'Pretty dates';
+$labels['setdefault']  = 'Set default';
+$labels['autodetect']  = 'Auto';
+$labels['language']  = 'Language';
+$labels['timezone']  = 'Time zone';
+$labels['pagesize']  = 'Rows per page';
+$labels['signature'] = 'Signature';
+$labels['dstactive']  = 'Daylight saving time';
+$labels['showinextwin'] = 'Open message in a new window';
+$labels['composeextwin'] = 'Compose in a new window';
+$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';
+$labels['logoutcompact'] = 'Compact Inbox on logout';
+$labels['uisettings'] = 'User Interface';
+$labels['serversettings'] = 'Server Settings';
+$labels['mailboxview'] = 'Mailbox View';
+$labels['mdnrequests'] = 'On request for return receipt';
+$labels['askuser'] = 'ask me';
+$labels['autosend'] = 'send receipt';
+$labels['autosendknown'] = 'send receipt to my contacts, otherwise ask me';
+$labels['autosendknownignore'] = 'send receipt to my contacts, otherwise ignore';
+$labels['ignore'] = 'ignore';
+$labels['readwhendeleted'] = 'Mark the message as read on delete';
+$labels['flagfordeletion'] = 'Flag the message for deletion instead of delete';
+$labels['skipdeleted'] = 'Do not show deleted messages';
+$labels['deletealways'] = 'If moving messages to Trash fails, delete them';
+$labels['deletejunk'] = 'Directly delete messages in Junk';
+$labels['showremoteimages'] = 'Display remote inline images';
+$labels['fromknownsenders'] = 'from known senders';
+$labels['always'] = 'always';
+$labels['showinlineimages'] = 'Display attached images below the message';
+$labels['autosavedraft']  = 'Automatically save draft';
+$labels['everynminutes']  = 'every $n minute(s)';
+$labels['refreshinterval']  = 'Refresh (check for new messages, etc.)';
+$labels['never']  = 'never';
+$labels['immediately']  = 'immediately';
+$labels['messagesdisplaying'] = 'Displaying Messages';
+$labels['messagescomposition'] = 'Composing Messages';
+$labels['mimeparamfolding'] = 'Attachment names';
+$labels['2231folding'] = 'Full RFC 2231 (Thunderbird)';
+$labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
+$labels['2047folding'] = 'Full RFC 2047 (other)';
+$labels['force7bit'] = 'Use MIME encoding for 8-bit characters';
+$labels['advancedoptions'] = 'Advanced options';
+$labels['focusonnewmessage'] = 'Focus browser window on new message';
+$labels['checkallfolders'] = 'Check all folders for new messages';
+$labels['displaynext'] = 'After message delete/move display the next message';
+$labels['defaultfont'] = 'Default font of HTML message';
+$labels['mainoptions'] = 'Main Options';
+$labels['browseroptions'] = 'Browser Options';
+$labels['section'] = 'Section';
+$labels['maintenance'] = 'Maintenance';
+$labels['newmessage'] = 'New Message';
+$labels['signatureoptions'] = 'Signature Options';
+$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'] = 'Automatically add signature';
+$labels['newmessageonly'] = 'new message only';
+$labels['replyandforwardonly'] = 'replies and forwards only';
+$labels['insertsignature'] = 'Insert signature';
+$labels['previewpanemarkread']  = 'Mark previewed messages as read';
+$labels['afternseconds']  = 'after $n seconds';
+$labels['reqmdn'] = 'Always request a return receipt';
+$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'] = 'Check spelling before sending a message';
+$labels['spellcheckoptions'] = 'Spellcheck Options';
+$labels['spellcheckignoresyms'] = 'Ignore words with symbols';
+$labels['spellcheckignorenums'] = 'Ignore words with numbers';
+$labels['spellcheckignorecaps'] = 'Ignore words with all letters capitalized';
+$labels['addtodict'] = 'Add to dictionary';
+$labels['mailtoprotohandler'] = 'Register protocol handler for mailto: links';
+$labels['forwardmode'] = 'Messages forwarding';
+$labels['inline'] = 'inline';
+$labels['asattachment'] = 'as attachment';
+
+$labels['folder']  = 'Folder';
+$labels['folders']  = 'Тэчкі';
+$labels['foldername']  = 'Folder name';
+$labels['subscribed']  = 'Subscribed';
+$labels['messagecount'] = 'Messages';
+$labels['create']  = 'Create';
+$labels['createfolder']  = 'Create new folder';
+$labels['managefolders']  = 'Manage folders';
+$labels['specialfolders'] = 'Special Folders';
+$labels['properties'] = 'Properties';
+$labels['folderproperties'] = 'Folder properties';
+$labels['parentfolder'] = 'Parent folder';
+$labels['location'] = 'Location';
+$labels['info'] = 'Information';
+$labels['getfoldersize'] = 'Click to get folder size';
+$labels['changesubscription'] = 'Click to change subscription';
+$labels['foldertype'] = 'Folder Type';
+$labels['personalfolder']  = 'Private Folder';
+$labels['otherfolder']  = 'Other User\'s Folder';
+$labels['sharedfolder']  = 'Public Folder';
+
+$labels['sortby'] = 'Sort by';
+$labels['sortasc']  = 'Sort ascending';
+$labels['sortdesc'] = 'Sort descending';
+$labels['undo'] = 'Undo';
+
+$labels['installedplugins'] = 'Installed plugins';
+$labels['plugin'] = 'Plugin';
+$labels['version'] = 'Version';
+$labels['source'] = 'Source';
+$labels['license'] = 'License';
+$labels['support'] = 'Get support';
+
+// units
+$labels['B'] = 'B';
+$labels['KB'] = 'KB';
+$labels['MB'] = 'MB';
+$labels['GB'] = 'GB';
+
+// character sets
+$labels['unicode'] = 'Unicode';
+$labels['english'] = '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['turkish'] = 'Turkish';
+$labels['nordic'] = 'Nordic';
+$labels['thai'] = 'Thai';
+$labels['celtic'] = 'Celtic';
+$labels['vietnamese'] = 'Vietnamese';
+$labels['japanese'] = 'Japanese';
+$labels['korean'] = 'Korean';
+$labels['chinese'] = 'Chinese';
 
+?>
diff --git a/program/localization/be_BE/messages.inc b/program/localization/be_BE/messages.inc
index 2c743af1f..73cdb3ed8 100644
--- a/program/localization/be_BE/messages.inc
+++ b/program/localization/be_BE/messages.inc
@@ -2,26 +2,170 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/be_BE/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Alex Nehaichik <nab@mail.by>                                  |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['loginfailed'] = 'Збой уваходу.';
+$messages['errortitle']  = 'An error occurred!';
+$messages['loginfailed']  = 'Збой уваходу.';
 $messages['cookiesdisabled'] = 'Ваш азіральнік не падтрымлівае кукіс.';
 $messages['sessionerror'] = 'Ваша сесія не дзейсная ці састарэла.';
+$messages['storageerror'] = 'Connection to storage server failed.';
 $messages['servererror'] = 'Памылка сервера!';
 $messages['servererrormsg'] = 'Памылка сервера: $msg';
 $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.';
+$messages['loggedout'] = 'You have successfully terminated the session. Good bye!';
+$messages['mailboxempty'] = 'Mailbox is empty.';
+$messages['refreshing'] = 'Refreshing...';
+$messages['loading'] = 'Loading...';
+$messages['uploading'] = 'Uploading file...';
+$messages['uploadingmany'] = 'Uploading files...';
+$messages['loadingdata'] = 'Loading data...';
+$messages['checkingmail'] = 'Checking for new messages...';
+$messages['sendingmessage'] = 'Sending message...';
+$messages['messagesent'] = 'Message sent successfully.';
+$messages['savingmessage'] = 'Saving message...';
+$messages['messagesaved'] = 'Message saved to Drafts.';
+$messages['successfullysaved'] = 'Successfully saved.';
+$messages['addedsuccessfully'] = 'Contact added successfully to address book.';
+$messages['contactexists'] = 'A contact with the same e-mail address already exists.';
+$messages['contactnameexists'] = 'A contact with the same name already exists.';
+$messages['blockedimages'] = 'To protect your privacy, remote images are blocked in this message.';
+$messages['encryptedmessage'] = 'This is an encrypted message and can not be displayed. Sorry!';
+$messages['nocontactsfound'] = 'No contacts found.';
+$messages['contactnotfound'] = 'The requested contact was not found.';
+$messages['contactsearchonly'] = 'Enter some search terms to find contacts';
+$messages['sendingfailed'] = 'Failed to send message.';
+$messages['senttooquickly'] = 'Please wait $sec sec(s). before sending this message.';
+$messages['errorsavingsent'] = 'An error occured while saving sent message.';
+$messages['errorsaving'] = 'An error occured while saving.';
+$messages['errormoving'] = 'Could not move the message(s).';
+$messages['errorcopying'] = 'Could not copy the message(s).';
+$messages['errordeleting'] = 'Could not delete the message(s).';
+$messages['errormarking'] = 'Could not mark the message(s).';
+$messages['deletecontactconfirm']  = 'Do you really want to delete selected contact(s)?';
+$messages['deletegroupconfirm']  = 'Do you really want to delete selected group?';
+$messages['deletemessagesconfirm'] = 'Do you really want to delete selected message(s)?';
+$messages['deletefolderconfirm']  = 'Do you really want to delete this folder?';
+$messages['purgefolderconfirm']  = 'Do you really want to delete all messages in this folder?';
+$messages['contactdeleting'] = 'Deleting contact(s)...';
+$messages['groupdeleting'] = 'Deleting group...';
+$messages['folderdeleting'] = 'Deleting folder...';
+$messages['foldermoving'] = 'Moving folder...';
+$messages['foldersubscribing'] = 'Subscribing folder...';
+$messages['folderunsubscribing'] = 'Unsubscribing folder...';
+$messages['formincomplete'] = 'The form was not completely filled out.';
+$messages['noemailwarning'] = 'Please enter a valid email address.';
+$messages['nonamewarning']  = 'Please enter a name.';
+$messages['nopagesizewarning'] = 'Please enter a page size.';
+$messages['nosenderwarning'] = 'Please enter sender e-mail address.';
+$messages['norecipientwarning'] = 'Please enter at least one recipient.';
+$messages['nosubjectwarning']  = 'The "Subject" field is empty. Would you like to enter one now?';
+$messages['nobodywarning'] = 'Send this message without text?';
+$messages['notsentwarning'] = 'Message has not been sent. Do you want to discard your message?';
+$messages['noldapserver'] = 'Please select an ldap server to search.';
+$messages['nosearchname'] = 'Please enter a contact name or email address.';
+$messages['notuploadedwarning'] = 'Not all attachments have been uploaded yet. Please wait or cancel the upload.';
+$messages['searchsuccessful'] = '$nr messages found.';
+$messages['contactsearchsuccessful'] = '$nr contacts found.';
+$messages['searchnomatch'] = 'Search returned no matches.';
+$messages['searching'] = 'Searching...';
+$messages['checking'] = 'Checking...';
+$messages['nospellerrors'] = 'No spelling errors found.';
+$messages['folderdeleted'] = 'Folder successfully deleted.';
+$messages['foldersubscribed'] = 'Folder successfully subscribed.';
+$messages['folderunsubscribed'] = 'Folder successfully unsubscribed.';
+$messages['folderpurged'] = 'Folder has successfully been emptied.';
+$messages['folderexpunged'] = 'Folder has successfully been compacted.';
+$messages['deletedsuccessfully'] = 'Successfully deleted.';
+$messages['converting'] = 'Removing formatting...';
+$messages['messageopenerror'] = 'Could not load message from server.';
+$messages['fileuploaderror'] = 'File upload failed.';
+$messages['filesizeerror'] = 'The uploaded file exceeds the maximum size of $size.';
+$messages['copysuccess'] = 'Successfully copied $nr addresses.';
+$messages['copyerror'] = 'Could not copy any addresses.';
+$messages['sourceisreadonly'] = 'This address source is read only.';
+$messages['errorsavingcontact'] = 'Could not save the contact address.';
+$messages['movingmessage'] = 'Moving message(s)...';
+$messages['copyingmessage'] = 'Copying message(s)...';
+$messages['copyingcontact'] = 'Copying contact(s)...';
+$messages['deletingmessage'] = 'Deleting message(s)...';
+$messages['markingmessage'] = 'Marking message(s)...';
+$messages['addingmember'] = 'Adding contact(s) to the group...';
+$messages['removingmember'] = 'Removing contact(s) from the group...';
+$messages['receiptsent'] = 'Successfully sent a read receipt.';
+$messages['errorsendingreceipt'] = 'Could not send the receipt.';
+$messages['deleteidentityconfirm'] = 'Do you really want to delete this identity?';
+$messages['nodeletelastidentity'] = 'You cannot delete this identity, it\'s your last one.';
+$messages['forbiddencharacter'] = 'Folder name contains a forbidden character.';
+$messages['selectimportfile'] = 'Please select a file to upload.';
+$messages['addresswriterror'] = 'The selected address book is not writeable.';
+$messages['contactaddedtogroup'] = 'Successfully added the contacts to this group.';
+$messages['contactremovedfromgroup'] = 'Successfully removed contacts from this group.';
+$messages['nogroupassignmentschanged'] = 'No group assignments changed.';
+$messages['importwait'] = 'Importing, please wait...';
+$messages['importformaterror'] = 'Import failed! The uploaded file is not a valid import data file.';
+$messages['importconfirm'] = '<b>Successfully imported $inserted contacts</b>';
+$messages['importconfirmskipped'] = '<b>Skipped $skipped existing entries</b>';
+$messages['opnotpermitted'] = 'Operation not permitted!';
+$messages['nofromaddress'] = 'Missing e-mail address in selected identity.';
+$messages['editorwarning'] = 'Switching to the plain text editor will cause all text formatting to be lost. Do you wish to continue?';
+$messages['httpreceivedencrypterror'] = 'A fatal configuration error occurred. Contact your administrator immediately. <b>Your message can not be sent.</b>';
+$messages['smtpconnerror'] = 'SMTP Error ($code): Connection to server failed.';
+$messages['smtpautherror'] = 'SMTP Error ($code): Authentication failed.';
+$messages['smtpfromerror'] = 'SMTP Error ($code): Failed to set sender "$from" ($msg).';
+$messages['smtptoerror'] = 'SMTP Error ($code): Failed to add recipient "$to" ($msg).';
+$messages['smtprecipientserror'] = 'SMTP Error: Unable to parse recipients list.';
+$messages['smtperror'] = 'SMTP Error: $msg';
+$messages['emailformaterror'] = 'Invalid e-mail address: $email';
+$messages['toomanyrecipients'] = 'Too many recipients. Reduce the number of recipients to $max.';
+$messages['maxgroupmembersreached'] = 'The number of group members exceeds the maximum of $max.';
+$messages['internalerror'] = 'An internal error occured. Please try again.';
+$messages['contactdelerror'] = 'Could not delete contact(s).';
+$messages['contactdeleted'] = 'Contact(s) deleted successfully.';
+$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.';
 
+?>
diff --git a/program/localization/bg_BG/labels.inc b/program/localization/bg_BG/labels.inc
index 70413f925..6542cfc53 100644
--- a/program/localization/bg_BG/labels.inc
+++ b/program/localization/bg_BG/labels.inc
@@ -2,60 +2,78 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/bg_BG/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Blagovest Petrov <blagovest@petrovs.info>                     |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = 'Добре дошли в $product';
-$labels['username'] = 'Потребител';
-$labels['password'] = 'Парола';
-$labels['server'] = 'Сървър';
-$labels['login'] = 'Вход';
-$labels['logout'] = 'Изход';
-$labels['mail'] = 'Кутия';
+
+// login page
+$labels['welcome']   = 'Добре дошли в $product';
+$labels['username']  = 'Потребител';
+$labels['password']  = 'Парола';
+$labels['server']    = 'Сървър';
+$labels['login']     = 'Вход';
+
+// taskbar
+$labels['logout']   = 'Изход';
+$labels['mail']     = 'Кутия';
 $labels['settings'] = 'Настройки';
-$labels['addressbook'] = 'Книга с адреси';
-$labels['inbox'] = 'Входящи';
+$labels['addressbook'] = 'Адресна книга';
+
+// mailbox names
+$labels['inbox']  = 'Входящи';
 $labels['drafts'] = 'Чернови';
-$labels['sent'] = 'Изпратени';
-$labels['trash'] = 'Кошче';
-$labels['junk'] = 'Спам';
+$labels['sent']   = 'Изпратени';
+$labels['trash']  = 'Кошче';
+$labels['junk']   = 'Спам';
+
+// message listing
 $labels['subject'] = 'Заглавие';
-$labels['from'] = 'От';
-$labels['to'] = 'Получател';
-$labels['cc'] = 'Копие до';
-$labels['bcc'] = 'Скрито копие до';
+$labels['from']    = 'От';
+$labels['sender']  = 'Подател';
+$labels['to']      = 'Получател';
+$labels['cc']      = 'Копие до';
+$labels['bcc']     = 'Скрито копие до';
 $labels['replyto'] = 'Отговор до';
 $labels['followupto'] = 'Препращане към';
-$labels['date'] = 'Дата';
-$labels['size'] = 'Размер';
+$labels['date']    = 'Дата';
+$labels['size']    = 'Размер';
 $labels['priority'] = 'Приоритет';
 $labels['organization'] = 'Организация';
-$labels['readstatus'] = 'Статут (прочетено/непрочетено)';
+$labels['readstatus'] = 'Статут (прочетено/ново)';
 $labels['listoptions'] = 'Показване на възможни опции';
+
 $labels['mailboxlist'] = 'Папки';
-$labels['folders'] = 'Папки';
 $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['copy']     = 'Копиране';
+$labels['move']     = 'Преместване';
+$labels['moveto']   = 'Премести в...';
 $labels['download'] = 'Изтегли';
+$labels['open']     = 'Отвори';
 $labels['showattachment'] = 'Показване';
 $labels['showanyway'] = 'Показване въпреки това';
+
 $labels['filename'] = 'Име на файла';
 $labels['filesize'] = 'Размер на файла';
+
 $labels['addtoaddressbook'] = 'Добави в адресната книга';
+
+// weekdays short
 $labels['sun'] = 'Нед';
 $labels['mon'] = 'Пон';
 $labels['tue'] = 'Вто';
@@ -63,78 +81,88 @@ $labels['wed'] = 'Сря';
 $labels['thu'] = 'Чет';
 $labels['fri'] = 'Пет';
 $labels['sat'] = 'Съб';
-$labels['sunday'] = 'Неделя';
-$labels['monday'] = 'Понеделник';
-$labels['tuesday'] = 'Вторник';
+
+// weekdays long
+$labels['sunday']    = 'Неделя';
+$labels['monday']    = 'Понеделник';
+$labels['tuesday']   = 'Вторник';
 $labels['wednesday'] = 'Сряда';
-$labels['thursday'] = 'Четвъртък';
-$labels['friday'] = 'Петък';
-$labels['saturday'] = 'Събота';
-$labels['jan'] = 'Яну';
-$labels['feb'] = 'Фев';
-$labels['mar'] = 'Мар';
-$labels['apr'] = 'Апр';
-$labels['may'] = 'Май';
-$labels['longmay'] = 'Май';
-$labels['jun'] = 'Юни';
-$labels['jul'] = 'Юли';
-$labels['aug'] = 'Авг';
-$labels['sep'] = 'Сеп';
-$labels['oct'] = 'Окт';
-$labels['nov'] = 'Ное';
-$labels['dec'] = 'Дек';
-$labels['longjan'] = 'Януари';
-$labels['longfeb'] = 'Февруари';
-$labels['longmar'] = 'Март';
-$labels['longapr'] = 'Април';
-$labels['longjun'] = 'Юни';
-$labels['longjul'] = 'Юли';
-$labels['longaug'] = 'Август';
-$labels['longsep'] = 'Септември';
-$labels['longoct'] = 'Октомври';
-$labels['longnov'] = 'Ноември';
-$labels['longdec'] = 'Декември';
+$labels['thursday']  = 'Четвъртък';
+$labels['friday']    = 'Петък';
+$labels['saturday']  = 'Събота';
+
+// months short
+$labels['jan']	= 'Яну';
+$labels['feb']	= 'Фев';
+$labels['mar']	= 'Мар';
+$labels['apr']	= 'Апр';
+$labels['may']	= 'Май';
+$labels['jun']	= 'Юни';
+$labels['jul'] 	= 'Юли';
+$labels['aug']	= 'Авг';
+$labels['sep']	= 'Сеп';
+$labels['oct']	= 'Окт';
+$labels['nov']	= 'Ное';
+$labels['dec']	= 'Дек';
+
+// months long
+$labels['longjan']	= 'Януари';
+$labels['longfeb']	= 'Февруари';
+$labels['longmar']	= 'Март';
+$labels['longapr']	= 'Април';
+$labels['longmay']	= 'Май';
+$labels['longjun']	= 'Юни';
+$labels['longjul']	= 'Юли';
+$labels['longaug']	= 'Август';
+$labels['longsep']	= 'Септември';
+$labels['longoct']	= 'Октомври';
+$labels['longnov']	= 'Ноември';
+$labels['longdec']	= 'Декември';
+
 $labels['today'] = 'Днес';
-$labels['refresh'] = 'Опресняване';
-$labels['checkmail'] = 'Провери за нови писма';
-$labels['compose'] = 'Ново писмо';
-$labels['writenewmessage'] = 'Създай ново писмо';
-$labels['reply'] = 'Отговор';
-$labels['replytomessage'] = 'Отговори на писмото';
-$labels['replytoallmessage'] = 'Отговор до изпращача и всички получатели';
-$labels['replyall'] = 'Отговор на всички';
-$labels['replylist'] = 'Списък за отговор';
-$labels['forward'] = 'Препращане';
-$labels['forwardinline'] = 'Препрати като част от съобщението';
+
+// toolbar buttons
+$labels['refresh']          = 'Опресняване';
+$labels['checkmail']        = 'Провери за нови писма';
+$labels['compose']          = 'Ново писмо';
+$labels['writenewmessage']  = 'Създай ново писмо';
+$labels['reply']            = 'Отговор';
+$labels['replytomessage']   = 'Отговори на писмото';
+$labels['replytoallmessage'] = 'Отговор до подателя и всички получатели';
+$labels['replyall']         = 'Отговор на всички';
+$labels['replylist']        = 'Списък за отговор';
+$labels['forward']          = 'Препращане';
+$labels['forwardinline']    = 'Препрати като част от съобщението';
 $labels['forwardattachment'] = 'Препрати като прикачен файл';
-$labels['forwardmessage'] = 'Препрати писмото';
-$labels['deletemessage'] = 'Изтрий писмото';
+$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['more'] = 'Повече';
-$labels['back'] = 'Назад';
-$labels['options'] = 'Опции';
+$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['more']             = 'Повече';
+$labels['back']             = 'Назад';
+$labels['options']          = 'Опции';
+
 $labels['select'] = 'Избери';
 $labels['all'] = 'Всички';
-$labels['none'] = 'Никакъв';
-$labels['nonesort'] = 'Никакъв';
+$labels['none'] = 'Няма';
 $labels['currpage'] = 'Страница';
 $labels['unread'] = 'Нови';
 $labels['flagged'] = 'Отбелязано';
-$labels['unanswered'] = 'Неотговорено';
+$labels['unanswered'] = 'Без отговор';
+$labels['withattachment'] = 'С прикачен файл';
 $labels['deleted'] = 'Изтрито';
 $labels['undeleted'] = 'Не е изтрит';
 $labels['invert'] = 'Инвертирай';
@@ -145,12 +173,14 @@ $labels['expand-all'] = 'Отваряне на всички';
 $labels['expand-unread'] = 'Отваряне на непрочетени';
 $labels['collapse-all'] = 'Затваряне на всички';
 $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['asc'] = 'възходящ';
@@ -159,144 +189,176 @@ $labels['listcolumns'] = 'Колони за списък';
 $labels['listsorting'] = 'Колона за сортиране';
 $labels['listorder'] = 'Режим на сортиране';
 $labels['listmode'] = 'Кратък списък';
+
 $labels['folderactions'] = 'Действия за папки...';
-$labels['compact'] = 'Свий';
+$labels['compact'] = 'Свиване';
 $labels['empty'] = 'Изпразни';
+
 $labels['quota'] = 'Използвано място';
-$labels['unknown'] = 'няма информация';
-$labels['unlimited'] = 'няма ограничение';
-$labels['quicksearch'] = 'Бързо търсене';
-$labels['resetsearch'] = 'Изчисти търсенето и покажи всички писма';
-$labels['searchmod'] = 'Търсене във';
-$labels['msgtext'] = 'Цялото съобщение';
+$labels['unknown']  = 'няма информация';
+$labels['unlimited']  = 'няма ограничение';
+
+$labels['quicksearch']  = 'Бързо търсене';
+$labels['resetsearch']  = 'Изчисти търсенето и покажи всички писма';
+$labels['searchmod']  = 'Търсене във';
+$labels['msgtext']  = 'Цялото съобщение';
+$labels['body']  = 'Основен текст';
+
 $labels['openinextwin'] = 'Отвори в нов прозорец';
 $labels['emlsave'] = 'Изтегли като .eml';
-$labels['editasnew'] = 'Редактирай като ново';
-$labels['send'] = 'Изпращане';
-$labels['sendmessage'] = 'Изпрати писмото';
-$labels['savemessage'] = 'Запиши в Чернови';
-$labels['addattachment'] = 'Прикачи файл';
-$labels['charset'] = 'Кодировка';
-$labels['editortype'] = 'Вид редактор';
-$labels['returnreceipt'] = 'Обратна разписка';
-$labels['dsn'] = 'Информиране при доставка';
+$labels['changeformattext'] = 'Покажи в опростен текстов формат';
+$labels['changeformathtml'] = 'Покажи в HTML формат';
+
+// message compose
+$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['editidents'] = 'Редактиране на самоличности';
+
+$labels['editidents']    = 'Редактиране на самоличности';
+$labels['spellcheck']    = 'Спелуване';
 $labels['checkspelling'] = 'Провери правописа';
 $labels['resumeediting'] = 'Продължи черновата';
-$labels['revertto'] = 'Върни се към';
+$labels['revertto']      = 'Върни се към';
+
 $labels['attach'] = 'Прикачване';
 $labels['attachments'] = 'Прикачени файлове';
 $labels['upload'] = 'Качи';
 $labels['uploadprogress'] = '$percent ($current от $total)';
-$labels['close'] = 'Затвори';
-$labels['messageoptions'] = 'Настройки на съобщения...';
-$labels['low'] = 'Нисък';
-$labels['lowest'] = 'Най-нисък';
-$labels['normal'] = 'Нормален';
-$labels['high'] = 'Висок';
+$labels['close']  = 'Затвори';
+$labels['messageoptions']  = 'Настройки на съобщения...';
+
+$labels['low']     = 'Нисък';
+$labels['lowest']  = 'Най-нисък';
+$labels['normal']  = 'Нормален';
+$labels['high']    = 'Висок';
 $labels['highest'] = 'Най-висок';
-$labels['nosubject'] = '(няма заглавие)';
+
+$labels['nosubject']  = '(няма заглавие)';
 $labels['showimages'] = 'Показвай изображения';
 $labels['alwaysshow'] = 'Винаги показвай изображения от $';
-$labels['isdraft'] = 'Това съобщение е чернова';
-$labels['andnmore'] = '$nr повече...';
+$labels['isdraft']    = 'Това съобщение е чернова';
+$labels['andnmore']   = '$nr повече...';
+$labels['togglemoreheaders'] = 'Показва още съобщения';
+$labels['togglefullheaders'] = 'Само новите съобщения';
+
 $labels['htmltoggle'] = 'HTML';
-$labels['plaintoggle'] = 'текстов';
+$labels['plaintoggle'] = 'Текстово';
 $labels['savesentmessagein'] = 'Запази съобщението в';
 $labels['dontsave'] = 'Не съхранявай';
 $labels['maxuploadsize'] = 'Максимално позволен размер $size';
+
 $labels['addcc'] = 'Копие до';
 $labels['addbcc'] = 'Скрито копие до';
 $labels['addreplyto'] = 'Отговор на';
 $labels['addfollowupto'] = 'Добавяне на препращане към';
+
+// mdn
 $labels['mdnrequest'] = 'Подателят на писмото е пожелал да бъде уведомен, че сте го прочели. Желаете ли да изпратите обратна разписка?';
 $labels['receiptread'] = 'Обратна разписка (прочетено)';
 $labels['yourmessage'] = 'Това е обратна разписка за писмото Ви';
 $labels['receiptnote'] = 'Забележка: Тази разписка потвърждава само, че писмото е било показано на компютъра на получателят. Няма никаква гаранция, че получателят е прочел и/или разбрал съдържанието на писмото.';
-$labels['name'] = 'Кратко име';
-$labels['firstname'] = 'Име';
-$labels['surname'] = 'Фамилия';
-$labels['middlename'] = 'Презиме';
-$labels['nameprefix'] = 'Представка (Титла)';
-$labels['namesuffix'] = 'Наставка (Титла)';
-$labels['nickname'] = 'Прякор';
-$labels['jobtitle'] = 'Длъжност';
-$labels['department'] = 'Отдел';
-$labels['gender'] = 'Пол';
-$labels['maidenname'] = 'Бащино име';
-$labels['email'] = 'E-Mail';
-$labels['phone'] = 'Телефон';
-$labels['address'] = 'Адрес';
-$labels['street'] = 'Улица';
-$labels['locality'] = 'Град';
-$labels['zipcode'] = 'Пощенски код';
-$labels['region'] = 'Област';
-$labels['country'] = 'Държава';
-$labels['birthday'] = 'Рожден ден';
-$labels['anniversary'] = 'Годишнина';
-$labels['website'] = 'Уебсайт';
+
+// address boook
+$labels['name']         = 'Екранно име';
+$labels['firstname']    = 'Име';
+$labels['surname']      = 'Фамилия';
+$labels['middlename']   = 'Презиме';
+$labels['nameprefix']   = 'Представка (Титла)';
+$labels['namesuffix']   = 'Наставка (Титла)';
+$labels['nickname']     = 'Псевдоним';
+$labels['jobtitle']     = 'Длъжност';
+$labels['department']   = 'Отдел';
+$labels['gender']       = 'Пол';
+$labels['maidenname']   = 'Бащино фамилия';
+$labels['email']        = 'E-Mail';
+$labels['phone']        = 'Телефон';
+$labels['address']      = 'Адрес';
+$labels['street']       = 'Улица';
+$labels['locality']     = 'Град';
+$labels['zipcode']      = 'Пощенски код';
+$labels['region']       = 'Област';
+$labels['country']      = 'Държава';
+$labels['birthday']     = 'Рожден ден';
+$labels['anniversary']  = 'Годишнина';
+$labels['website']      = 'Сайт';
 $labels['instantmessenger'] = 'IM';
 $labels['notes'] = 'Бележки';
-$labels['male'] = 'Мъж';
+$labels['male']   = 'Мъж';
 $labels['female'] = 'Жена';
 $labels['manager'] = 'Мениджър';
 $labels['assistant'] = 'Асистент';
-$labels['typeassistant'] = 'Асистент';
-$labels['spouse'] = 'Съпруг (а)';
+$labels['spouse'] = 'Съпруг(а)';
 $labels['allfields'] = 'Всички полета';
 $labels['search'] = 'Търсене';
 $labels['advsearch'] = 'Разширено търсене';
 $labels['advanced'] = 'Разширени';
 $labels['other'] = 'Други';
-$labels['typeother'] = 'Други';
-$labels['typehome'] = 'Начало';
-$labels['typework'] = 'Работа';
-$labels['typemobile'] = 'Мобилни';
-$labels['typemain'] = 'Главни';
-$labels['typehomefax'] = 'Домашен факс';
-$labels['typeworkfax'] = 'Служебен факс';
-$labels['typecar'] = 'Автомобил';
-$labels['typepager'] = 'Пейджър';
-$labels['typevideo'] = 'Видео';
-$labels['typehomepage'] = 'Начална страница';
+
+$labels['typehome']   = 'Начало';
+$labels['typework']   = 'Работа';
+$labels['typeother']  = 'Други';
+$labels['typemobile']  = 'Мобилни';
+$labels['typemain']  = 'Главни';
+$labels['typehomefax']  = 'Домашен факс';
+$labels['typeworkfax']  = 'Служебен факс';
+$labels['typecar']  = 'Автомобил';
+$labels['typepager']  = 'Пейджър';
+$labels['typevideo']  = 'Видео';
+$labels['typeassistant']  = 'Асистент';
+$labels['typehomepage']  = 'Начална страница';
 $labels['typeblog'] = 'Блог';
 $labels['typeprofile'] = 'Профил';
+
 $labels['addfield'] = 'Добави поле';
-$labels['addcontact'] = 'Добави';
-$labels['editcontact'] = 'Редактирай';
+$labels['addcontact'] = 'Добавяне';
+$labels['editcontact'] = 'Промяна';
 $labels['contacts'] = 'Контакти';
 $labels['contactproperties'] = 'Свойства на контакт';
 $labels['personalinfo'] = 'Лична информация';
-$labels['edit'] = 'Редактирай';
+
+$labels['edit']   = 'Редактирай';
 $labels['cancel'] = 'Отказ';
-$labels['save'] = 'Запиши';
+$labels['save']   = 'Запиши';
 $labels['delete'] = 'Изтрий';
 $labels['rename'] = 'Преименувай';
 $labels['addphoto'] = 'Добави';
 $labels['replacephoto'] = 'Замени';
 $labels['uploadphoto'] = 'Качване на снимка';
-$labels['newcontact'] = 'Нов контакт';
-$labels['deletecontact'] = 'Изтрий маркираните контакти';
-$labels['composeto'] = 'Напиши писмо до';
+
+$labels['newcontact']     = 'Нов контакт';
+$labels['deletecontact']  = 'Изтрий маркираните контакти';
+$labels['composeto']      = 'Напиши писмо до';
 $labels['contactsfromto'] = 'Контакти $from до $to от $count';
-$labels['print'] = 'Разпечатай';
-$labels['export'] = 'Изнасяне';
-$labels['exportvcards'] = 'Изнасяне във vCard формат';
+$labels['print']          = 'Разпечатай';
+$labels['export']         = 'Изнасяне';
+$labels['exportall']      = 'Експортиране';
+$labels['exportsel']      = 'Експортиране на избраното';
+$labels['exportvcards']   = 'Изнасяне във vCard формат';
 $labels['newcontactgroup'] = 'Създаване на нова група';
-$labels['grouprename'] = 'Преименувай група';
-$labels['groupdelete'] = 'Изтриване на група';
+$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'] = 'Запази търсенето';
 $labels['searchdelete'] = 'Изтрий търсенето';
+
 $labels['import'] = 'Внасяне';
 $labels['importcontacts'] = 'Внасяне';
 $labels['importfromfile'] = 'Внасяне от файл';
@@ -304,33 +366,43 @@ $labels['importtarget'] = 'Добави нови контакти в книга�
 $labels['importreplace'] = 'Замени цялата книга с адреси';
 $labels['importdesc'] = 'Можете да качвате контакти от съществуваща адресна книга.<br/>В момента поддържаме внасяне на адреси от файловите формати <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> или CSV (comma-separated).';
 $labels['done'] = 'Извършено';
+
+// settings
 $labels['settingsfor'] = 'Настройки за';
 $labels['about'] = 'Относно';
 $labels['preferences'] = 'Настройки';
 $labels['userpreferences'] = 'Потребителски настройки';
 $labels['editpreferences'] = 'Редактирай потребителските настройки';
+
 $labels['identities'] = 'Самоличност';
 $labels['manageidentities'] = 'Промяна на самоличностите за този акаунт';
 $labels['newidentity'] = 'Нова самоличност';
+
 $labels['newitem'] = 'Нова самоличност';
 $labels['edititem'] = 'Редактиране на самоличност';
+
 $labels['preferhtml'] = 'Показвай първо HTML версия';
 $labels['defaultcharset'] = 'Подразбиращо се кодиране';
 $labels['htmlmessage'] = 'HTML съобщение';
+$labels['messagepart'] = 'Част';
+$labels['digitalsig'] = 'Показва подпис';
 $labels['dateformat'] = 'Формат на датата';
 $labels['timeformat'] = 'Формат на времето';
 $labels['prettydate'] = 'Кратки дати';
-$labels['setdefault'] = 'По подразбиране';
-$labels['autodetect'] = 'Автоматично';
-$labels['language'] = 'Език';
-$labels['timezone'] = 'Часова зона';
-$labels['pagesize'] = 'Редове на страница';
+$labels['setdefault']  = 'По подразбиране';
+$labels['autodetect']  = 'Автоматично';
+$labels['language']  = 'Език';
+$labels['timezone']  = 'Часова зона';
+$labels['pagesize']  = 'Редове на страница';
 $labels['signature'] = 'Подпис';
-$labels['dstactive'] = 'Маркирай при лятно време';
+$labels['dstactive']  = 'Маркирай при лятно време';
 $labels['showinextwin'] = 'Отваряне на съобщението в нов прозорец';
+$labels['composeextwin'] = 'Ново писмо в прозорец';
 $labels['htmleditor'] = 'Писане на съобщениe като HTML';
 $labels['htmlonreply'] = 'само при отговор на HTML събощения';
+$labels['htmlonreplyandforward'] = 'само при препращане или отговор на HTML съобщение';
 $labels['htmlsignature'] = 'HTML подпис';
+$labels['showemail'] = 'Показва email адрес с екранното име';
 $labels['previewpane'] = 'Панел за преглед';
 $labels['skin'] = 'Смяна изгледа на интерфейса';
 $labels['logoutclear'] = 'Изчисти кошчето при изход';
@@ -338,25 +410,26 @@ $labels['logoutcompact'] = 'Упллътни Входящи при изход';
 $labels['uisettings'] = 'Потребителски интерфейс';
 $labels['serversettings'] = 'Настройки на сървъра';
 $labels['mailboxview'] = 'Преглед на Кутия';
-$labels['mdnrequests'] = 'Уведомление на изпращача';
-$labels['askuser'] = 'Питай';
+$labels['mdnrequests'] = 'Уведомление на подателя';
+$labels['askuser'] = 'Задай въпрос';
 $labels['autosend'] = 'Изпрати автоматично';
-$labels['autosendknown'] = 'да се изпрати обратна разписка на моите контакти и да се при външни контакти';
+$labels['autosendknown'] = 'да се изпрати обратна разписка на моите контакти и да се пита при външни контакти';
 $labels['autosendknownignore'] = 'да се изпрати обратна разписка на моите контакти, а на външни не';
 $labels['ignore'] = 'Отхвърли';
 $labels['readwhendeleted'] = 'Отбележи като прочетено при изтриване';
 $labels['flagfordeletion'] = 'Отбележи съобщението за изтриване';
 $labels['skipdeleted'] = 'Не показвай изтритите съобщения';
 $labels['deletealways'] = 'При неуспешно преместване на съобщение в Кошчето, да се изтрие';
+$labels['deletejunk'] = 'Местене на изтритите съобщения в кошчето';
 $labels['showremoteimages'] = 'Покажи блокираните изображения';
-$labels['fromknownsenders'] = 'Oт познати изпращачи';
+$labels['fromknownsenders'] = 'Oт познати податели';
 $labels['always'] = 'Винаги';
 $labels['showinlineimages'] = 'Покажи прикачените изображения след съобщението';
-$labels['autosavedraft'] = 'Автоматично записвай чернова';
-$labels['everynminutes'] = 'всеки $n минути';
-$labels['refreshinterval'] = 'Опресняване (проверка за нови съобщения и т.н.)';
-$labels['never'] = 'никога';
-$labels['immediately'] = 'веднага';
+$labels['autosavedraft']  = 'Автоматично записвай чернова';
+$labels['everynminutes']  = 'всеки $n минути';
+$labels['refreshinterval']  = 'Опресняване (проверка за нови съобщения и т.н.)';
+$labels['never']  = 'никога';
+$labels['immediately']  = 'Веднага';
 $labels['messagesdisplaying'] = 'Показване на събщенията';
 $labels['messagescomposition'] = 'Писане на съобщения';
 $labels['mimeparamfolding'] = 'Добавяне име на прикрепените файлове';
@@ -368,9 +441,10 @@ $labels['advancedoptions'] = 'Настройки за напреднали';
 $labels['focusonnewmessage'] = 'Премигване на прозореца при ново писмо';
 $labels['checkallfolders'] = 'Провери всички папки за нови писма';
 $labels['displaynext'] = 'След изтриване / премини към следващото писмо';
+$labels['defaultfont'] = 'Шрифт по подразбиране за HTML съобщенията';
 $labels['mainoptions'] = 'Основни настройки';
 $labels['browseroptions'] = 'Настройки на четеца';
-$labels['section'] = 'Раздел';
+$labels['section'] = 'Секция';
 $labels['maintenance'] = 'Поддръжка';
 $labels['newmessage'] = 'Ново съобщение';
 $labels['signatureoptions'] = 'Настройки на подпис';
@@ -382,12 +456,9 @@ $labels['replyremovesignature'] = 'Премахване на предишния
 $labels['autoaddsignature'] = 'Автоматично добавяне на подпис';
 $labels['newmessageonly'] = 'само на нови съобщения';
 $labels['replyandforwardonly'] = 'само на отговори и препратени';
-$labels['replysignaturepos'] = 'Поставяне на подпис при отговор или препращане';
-$labels['belowquote'] = 'над цитатът';
-$labels['abovequote'] = 'под цитатът';
 $labels['insertsignature'] = 'Вмъкване на подпис';
-$labels['previewpanemarkread'] = 'Маркиране на прегледаните съобщения като прочетени';
-$labels['afternseconds'] = 'след $n секунди';
+$labels['previewpanemarkread']  = 'Маркиране на прегледаните съобщения като прочетени';
+$labels['afternseconds']  = 'след $n секунди';
 $labels['reqmdn'] = 'Винаги връщай обратна разписка';
 $labels['reqdsn'] = 'Винаги изисквай отговор при доставка на съобщение';
 $labels['replysamefolder'] = 'Постави отговора в папката на съобщението, на което се отговаря';
@@ -400,15 +471,19 @@ $labels['spellcheckignoresyms'] = 'Игнорирай думи съдържащ�
 $labels['spellcheckignorenums'] = 'Игнорирай думи съдържащи числа';
 $labels['spellcheckignorecaps'] = 'Игнорирай думи съдържащи единствено главни букви';
 $labels['addtodict'] = 'Добави в речника';
+$labels['mailtoprotohandler'] = 'Регистриран протокол за mailto: връзките';
 $labels['forwardmode'] = 'Препращане на съобщения';
+$labels['inline'] = 'вградено';
 $labels['asattachment'] = 'като прикачен файл';
-$labels['folder'] = 'Папка';
-$labels['foldername'] = 'Име на папката';
-$labels['subscribed'] = 'Използвай';
+
+$labels['folder']  = 'Папка';
+$labels['folders']  = 'Папки';
+$labels['foldername']  = 'Име на папката';
+$labels['subscribed']  = 'Използвай';
 $labels['messagecount'] = 'Писма';
-$labels['create'] = 'Създай';
-$labels['createfolder'] = 'Направи нова папка';
-$labels['managefolders'] = 'Настройки на папките';
+$labels['create']  = 'Създай';
+$labels['createfolder']  = 'Направи нова папка';
+$labels['managefolders']  = 'Настройки на папките';
 $labels['specialfolders'] = 'Служебни папки';
 $labels['properties'] = 'Свойства';
 $labels['folderproperties'] = 'Свойства на папката';
@@ -418,20 +493,29 @@ $labels['info'] = 'Информация';
 $labels['getfoldersize'] = 'Щракни за големина на папката';
 $labels['changesubscription'] = 'Щракни за промяна на абонамент';
 $labels['foldertype'] = 'Вид на папката';
-$labels['personalfolder'] = 'Лична папка';
-$labels['otherfolder'] = 'Папка на друг потребител';
-$labels['sharedfolder'] = 'Публична папка';
+$labels['personalfolder']  = 'Лична папка';
+$labels['otherfolder']  = 'Папка на друг потребител';
+$labels['sharedfolder']  = 'Публична папка';
+
 $labels['sortby'] = 'Сортирай по';
-$labels['sortasc'] = 'Сортирай възходящо';
+$labels['sortasc']  = 'Сортирай възходящо';
 $labels['sortdesc'] = 'Сортирай низходящо';
 $labels['undo'] = 'Отмени';
+
 $labels['installedplugins'] = 'Инсталирани добавки';
 $labels['plugin'] = 'Добавки';
 $labels['version'] = 'Версия';
+$labels['source'] = 'Източник';
+$labels['license'] = 'Лиценз';
+$labels['support'] = 'Поддръжка';
+
+// units
 $labels['B'] = 'Б';
 $labels['KB'] = 'КБ';
 $labels['MB'] = 'МБ';
 $labels['GB'] = 'ГБ';
+
+// character sets
 $labels['unicode'] = 'Уникод';
 $labels['english'] = 'Английски';
 $labels['westerneuropean'] = 'Западна Европа';
@@ -451,3 +535,4 @@ $labels['japanese'] = 'Японски';
 $labels['korean'] = 'Корейски';
 $labels['chinese'] = 'Китайски';
 
+?>
diff --git a/program/localization/bg_BG/messages.inc b/program/localization/bg_BG/messages.inc
index 757e2842d..219772e74 100644
--- a/program/localization/bg_BG/messages.inc
+++ b/program/localization/bg_BG/messages.inc
@@ -2,35 +2,43 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/bg_BG/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['loginfailed'] = 'Вход неуспешен';
+$messages['errortitle']  = 'Възникна грешка!';
+$messages['loginfailed']  = 'Неуспешен вход';
 $messages['cookiesdisabled'] = 'Вашият браузър не приема cookies';
 $messages['sessionerror'] = 'Невалидна или изтекла сесия';
 $messages['storageerror'] = 'Неуспешно свързване към IMAP сървъра';
 $messages['servererror'] = 'Грешка!';
 $messages['servererrormsg'] = 'Сървърна грешка: $msg';
 $messages['dberror'] = 'Грешка с базата данни!';
+$messages['requesttimedout'] = 'Заявката е с изтекло време';
 $messages['errorreadonly'] = 'Операцията не може да бъде изпълнена. Папката е с права само за четене';
 $messages['errornoperm'] = 'Операцията не може да бъде изпълнена. Отказани права за достъп';
+$messages['erroroverquota'] = 'Невъзможно извършване на действието, няма достатъчно свободно дисково пространство.';
+$messages['erroroverquotadelete'] = 'Няма достатъчно свободно дисково пространство. Ползвайте SHIFT+DEL за да изтриете съобщение.';
 $messages['invalidrequest'] = 'Невалидна заявка! Данните не са съхранени.';
+$messages['invalidhost'] = 'Невалидно име на сървър';
 $messages['nomessagesfound'] = 'Няма съобщения';
 $messages['loggedout'] = 'Довиждане!';
 $messages['mailboxempty'] = 'Кутията е празна';
+$messages['refreshing'] = 'Опресняване...';
 $messages['loading'] = 'Зареждане...';
 $messages['uploading'] = 'Качване на файла...';
-$messages['uploadingmany'] = 'Качване на файлове...';
+$messages['uploadingmany'] = 'Качване на файловете...';
 $messages['loadingdata'] = 'Зареждане на данни...';
 $messages['checkingmail'] = 'Проверка за нови писма...';
 $messages['sendingmessage'] = 'Изпращане на писмото...';
@@ -54,11 +62,11 @@ $messages['errormoving'] = 'Писмото не може да бъде прем�
 $messages['errorcopying'] = 'Съобщенията не могат да бъдат копирани';
 $messages['errordeleting'] = 'Писмото не може да бъде изтрито';
 $messages['errormarking'] = 'Съобщението не може да бъде маркирано';
-$messages['deletecontactconfirm'] = 'Искате ли да изтриете маркираните контакти?';
-$messages['deletegroupconfirm'] = 'Искате ли да изтриете избраната група?';
+$messages['deletecontactconfirm']  = 'Искате ли да изтриете маркираните контакти?';
+$messages['deletegroupconfirm']  = 'Искате ли да изтриете избраната група?';
 $messages['deletemessagesconfirm'] = 'Искате ли да изтриете маркираните съобщения?';
-$messages['deletefolderconfirm'] = 'Искате ли да изтриете тази папка?';
-$messages['purgefolderconfirm'] = 'Искате ли да изтриете всички писма в тази папка?';
+$messages['deletefolderconfirm']  = 'Искате ли да изтриете тази папка?';
+$messages['purgefolderconfirm']  = 'Искате ли да изтриете всички писма в тази папка?';
 $messages['contactdeleting'] = 'Изтриване на контакт(и)...';
 $messages['groupdeleting'] = 'Изтриване на група...';
 $messages['folderdeleting'] = 'Изтриване на папка...';
@@ -67,11 +75,11 @@ $messages['foldersubscribing'] = 'Абониране...';
 $messages['folderunsubscribing'] = 'Отписване на папка...';
 $messages['formincomplete'] = 'Не сте попълнили всички полета';
 $messages['noemailwarning'] = 'Моля, въведете валиден e-mail адрес';
-$messages['nonamewarning'] = 'Моля, въведете име';
+$messages['nonamewarning']  = 'Моля, въведете име';
 $messages['nopagesizewarning'] = 'Въведете брой редове на страница';
-$messages['nosenderwarning'] = 'Моля въведете валиден e-mail адрес на изпращача';
+$messages['nosenderwarning'] = 'Моля въведете валиден e-mail адрес на подателя';
 $messages['norecipientwarning'] = 'Въведете поне един получател';
-$messages['nosubjectwarning'] = 'Полето "Заглавие" е празно. Искате ли да въведете заглавие?';
+$messages['nosubjectwarning']  = 'Полето "Заглавие" е празно. Искате ли да въведете заглавие?';
 $messages['nobodywarning'] = 'Изпрати това писмо без текст?';
 $messages['notsentwarning'] = 'Писмото не е изпратено. Искате ли да бъде унищожено?';
 $messages['noldapserver'] = 'Изберете LDAP сървър за търсене';
@@ -106,15 +114,17 @@ $messages['addingmember'] = 'Добавяне на контакт(и) в гру�
 $messages['removingmember'] = 'Премахване на контакт(и) от групата...';
 $messages['receiptsent'] = 'Обратната разписка е изпратена.';
 $messages['errorsendingreceipt'] = 'Грешка при изпращането на обратна разписка.';
+$messages['deleteidentityconfirm'] = 'Наистина ли желаете да изтриете тази самоличност?';
 $messages['nodeletelastidentity'] = 'Не можете да изтриете тази самоличност, трябва да имате поне една.';
 $messages['forbiddencharacter'] = 'Името на папката съдържа непозволени символи';
 $messages['selectimportfile'] = 'Моля изберете файл за качване';
 $messages['addresswriterror'] = 'Избраната адресна книга не може да бъде записвана';
 $messages['contactaddedtogroup'] = 'Контактите бяха успешно добавени към групата';
 $messages['contactremovedfromgroup'] = 'Контактите бяха успешно премахнати от групата';
-$messages['importwait'] = 'Внасяне, моля изчакайте...';
-$messages['importerror'] = 'Внасянето неуспешно! Каченият файл не е във валиден vCard формат.';
-$messages['importconfirm'] = '<b>Успешно са внесени $inserted контакта, вече съществуващите $skipped контакта са пропуснати</b>:<p><em>$names</em></p>';
+$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'] = 'Липсва e-mail адрес за избраната самоличност';
@@ -154,4 +164,8 @@ $messages['foldercreated'] = 'Папката е създадена';
 $messages['invalidimageformat'] = 'Невалиден формат на изображението';
 $messages['mispellingsfound'] = 'В съобщението са намерени правописни грешки.';
 $messages['parentnotwritable'] = 'Създаването/преместването на папка в избраната родителска папка е неуспешно. Няма права за достъп.';
+$messages['messagetoobig'] = 'Съобщението е прекалено голямо, за да бъде обработено.';
+$messages['attachmentvalidationerror'] = 'ВНИМАНИЕ! Прикаченият файл е опасен, защото типа му не съвпада с този деклариран в съобщението.<br/><br/><em>Очакван: $expected; открит: $detected</em>';
+$messages['noscriptwarning'] = 'ВНИМАНИЕ! Тази пощенска услуга изисква JavaScript за да функционира, моля включете поддръжката на JavaScript в настройките на браузъра Ви.';
 
+?>
diff --git a/program/localization/bn_BD/labels.inc b/program/localization/bn_BD/labels.inc
index c4fdb3c85..a0866a3a7 100644
--- a/program/localization/bn_BD/labels.inc
+++ b/program/localization/bn_BD/labels.inc
@@ -2,52 +2,78 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/bn_BD/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = 'স্বাগতম';
-$labels['username'] = 'গ্রাহক নাম (username)';
-$labels['password'] = 'গোপোন শব্দ (password)';
-$labels['server'] = 'সারভার';
-$labels['login'] = 'প্রবেশ';
-$labels['logout'] = 'প্রস্থান';
-$labels['mail'] = 'ই-মেইল';
+
+// login page
+$labels['welcome']   = 'স্বাগতম';
+$labels['username']  = 'গ্রাহক নাম (username)';
+$labels['password']  = 'গোপোন শব্দ (password)';
+$labels['server']    = 'সারভার';
+$labels['login']     = 'প্রবেশ';
+
+// taskbar
+$labels['logout']   = 'প্রস্থান';
+$labels['mail']     = 'ই-মেইল';
 $labels['settings'] = 'ব্যাক্তিগত খুটিনাটি';
 $labels['addressbook'] = 'ঠিকানার বই';
-$labels['inbox'] = 'প্রধান বাক্স';
+
+// mailbox names
+$labels['inbox']  = 'প্রধান বাক্স';
 $labels['drafts'] = 'খসড়া';
-$labels['sent'] = 'প্রেরিত(পাঠানো মেইল)';
-$labels['trash'] = 'ডাস্টবিন';
-$labels['junk'] = 'আজেবাজে মেইল';
+$labels['sent']   = 'প্রেরিত(পাঠানো মেইল)';
+$labels['trash']  = 'ডাস্টবিন';
+$labels['junk']   = 'আজেবাজে মেইল';
+
+// message listing
 $labels['subject'] = 'বিষয়';
-$labels['from'] = 'প্রেরক';
-$labels['to'] = 'প্রাপক';
-$labels['cc'] = 'অনুলিপির ঠিকানা';
-$labels['bcc'] = 'নাজানিয়ে অনুলিপির ঠিকানা';
+$labels['from']    = 'প্রেরক';
+$labels['sender']  = 'Sender';
+$labels['to']      = 'প্রাপক';
+$labels['cc']      = 'অনুলিপির ঠিকানা';
+$labels['bcc']     = 'নাজানিয়ে অনুলিপির ঠিকানা';
 $labels['replyto'] = 'উত্তর পাঠানোর ঠিকানা';
-$labels['date'] = 'তারিখ';
-$labels['size'] = 'সাইজ';
+$labels['followupto'] = 'Followup-To';
+$labels['date']    = 'তারিখ';
+$labels['size']    = 'সাইজ';
 $labels['priority'] = 'গুরুত্ব';
 $labels['organization'] = 'কোম্পানি';
+$labels['readstatus'] = 'Read status';
+$labels['listoptions'] = 'List options...';
+
 $labels['mailboxlist'] = 'ফোল্ডার/মেইলবক্স';
-$labels['folders'] = 'ফোল্ডার/মেইলবক্স';
 $labels['messagesfromto'] = '$count মেইলের মধ্যে, $from হতে $to দেখানো হচ্ছে';
+$labels['threadsfromto'] = 'Threads $from to $to of $count';
 $labels['messagenrof'] = '$nr #মেইল/চিঠি , $count এর মধ্যে';
-$labels['copy'] = 'অনুলিপির ঠিকানা';
-$labels['moveto'] = 'সরিয়ে ফেলুন..';
+$labels['fromtoshort'] = '$from – $to of $count';
+
+$labels['copy']     = 'অনুলিপির ঠিকানা';
+$labels['move']     = 'Move';
+$labels['moveto']   = 'সরিয়ে ফেলুন..';
 $labels['download'] = 'ডাউনলোড';
+$labels['open']     = 'Open';
+$labels['showattachment'] = 'Show';
+$labels['showanyway'] = 'Show it anyway';
+
 $labels['filename'] = 'ফাইলের নাম';
 $labels['filesize'] = 'ফাইলের সাইজ';
+
 $labels['addtoaddressbook'] = 'ঠিকানার বইতে ঢুকান';
+
+// weekdays short
 $labels['sun'] = 'রবি';
 $labels['mon'] = 'সোম';
 $labels['tue'] = 'মঙ্গল';
@@ -55,155 +81,328 @@ $labels['wed'] = 'বুধ';
 $labels['thu'] = 'বৃহ:';
 $labels['fri'] = 'শুক্র';
 $labels['sat'] = 'শনি';
-$labels['sunday'] = 'রবিবার';
-$labels['monday'] = 'সোমবার';
-$labels['tuesday'] = 'মঙ্গলবার';
+
+// weekdays long
+$labels['sunday']    = 'রবিবার';
+$labels['monday']    = 'সোমবার';
+$labels['tuesday']   = 'মঙ্গলবার';
 $labels['wednesday'] = 'বুধবার';
-$labels['thursday'] = 'বৃহস্পতিবার';
-$labels['friday'] = 'শুক্রবার';
-$labels['saturday'] = 'শনিবার';
-$labels['jan'] = 'জানুয়ারি';
-$labels['feb'] = 'ফেব্রুয়ারি';
-$labels['mar'] = 'মার্চ';
-$labels['apr'] = 'এপ্রিল';
-$labels['may'] = 'মে';
-$labels['longmay'] = 'মে';
-$labels['jun'] = 'জুন';
-$labels['jul'] = 'জুলাই';
-$labels['aug'] = 'আগস্ট';
-$labels['sep'] = 'সেপ্তেমবার';
-$labels['oct'] = 'অষ্টবার';
-$labels['nov'] = 'নবেমবার';
-$labels['dec'] = 'দিশেমবার';
-$labels['longjan'] = 'জানুয়ারি';
-$labels['longfeb'] = 'ফেব্রুয়ারি';
-$labels['longmar'] = 'মার্চ';
-$labels['longapr'] = 'এপ্রিল';
-$labels['longjun'] = 'জুন';
-$labels['longjul'] = 'জুলাই';
-$labels['longaug'] = 'আগস্ট';
-$labels['longsep'] = 'সেপ্তেমবার (September)';
-$labels['longoct'] = 'অষ্টবার (October)';
-$labels['longnov'] = 'নবেমবার (November)';
-$labels['longdec'] = 'দিশেমবার (December)';
+$labels['thursday']  = 'বৃহস্পতিবার';
+$labels['friday']    = 'শুক্রবার';
+$labels['saturday']  = 'শনিবার';
+
+// months short
+$labels['jan']	= 'জানুয়ারি';
+$labels['feb']	= 'ফেব্রুয়ারি';
+$labels['mar']	= 'মার্চ';
+$labels['apr']	= 'এপ্রিল';
+$labels['may']	= 'মে';
+$labels['jun']	= 'জুন';
+$labels['jul'] 	= 'জুলাই';
+$labels['aug']	= 'আগস্ট';
+$labels['sep']	= 'সেপ্তেমবার';
+$labels['oct']	= 'অষ্টবার';
+$labels['nov']	= 'নবেমবার';
+$labels['dec']	= 'দিশেমবার';
+
+// months long
+$labels['longjan']	= 'জানুয়ারি';
+$labels['longfeb']	= 'ফেব্রুয়ারি';
+$labels['longmar']	= 'মার্চ';
+$labels['longapr']	= 'এপ্রিল';
+$labels['longmay']	= 'মে';
+$labels['longjun']	= 'জুন';
+$labels['longjul']	= 'জুলাই';
+$labels['longaug']	= 'আগস্ট';
+$labels['longsep']	= 'সেপ্তেমবার (September)';
+$labels['longoct']	= 'অষ্টবার (October)';
+$labels['longnov']	= 'নবেমবার (November)';
+$labels['longdec']	= 'দিশেমবার (December)';
+
 $labels['today'] = 'আজকে';
-$labels['checkmail'] = 'দেখুন নতুন কোনো মেইল/চিঠি এলো কিনা';
-$labels['compose'] = 'নতুন মেইল/চিঠি লিখুন';
-$labels['writenewmessage'] = 'নতুন মেইল/চিঠি লিখুন';
-$labels['replytomessage'] = 'শুধু প্রেরকের কাছে উত্তর পাঠান';
+
+// toolbar buttons
+$labels['refresh']          = 'Refresh';
+$labels['checkmail']        = 'দেখুন নতুন কোনো মেইল/চিঠি এলো কিনা';
+$labels['compose']          = 'নতুন মেইল/চিঠি লিখুন';
+$labels['writenewmessage']  = 'নতুন মেইল/চিঠি লিখুন';
+$labels['reply']            = 'Reply';
+$labels['replytomessage']   = 'শুধু প্রেরকের কাছে উত্তর পাঠান';
 $labels['replytoallmessage'] = 'প্রেরক ও এই চিঠির অন্যান্য প্রাপকদের কাছে উত্তর পাঠান';
-$labels['forwardmessage'] = 'মেইল/চিঠি এগিয়ে দিন';
-$labels['deletemessage'] = 'মেইল/চিঠি ছিড়ে ফেলুন';
+$labels['replyall']         = 'Reply all';
+$labels['replylist']        = 'Reply list';
+$labels['forward']          = 'Forward';
+$labels['forwardinline']    = 'Forward inline';
+$labels['forwardattachment'] = 'Forward as attachment';
+$labels['forwardmessage']   = 'মেইল/চিঠি এগিয়ে দিন';
+$labels['deletemessage']    = 'মেইল/চিঠি ছিড়ে ফেলুন';
 $labels['movemessagetotrash'] = 'মেইল/চিঠি ডাস্টবিনে ফেলুন';
-$labels['printmessage'] = 'মেইল/চিঠি প্রিন্ট করুন';
-$labels['previousmessage'] = 'আগের মেইল/চিঠিটি দেখুন';
-$labels['firstmessage'] = 'প্রথম মেইল/চিঠিটি দেখুন';
-$labels['nextmessage'] = 'পরের মেইল/চিঠিটি দেখুন';
-$labels['lastmessage'] = 'শেষ মেইল/চিঠিটি দেখুন';
-$labels['backtolist'] = 'মেইল/চিঠির তালিকায় ফিরে যান';
-$labels['viewsource'] = 'মূল উৎসদেখুন';
-$labels['markmessages'] = 'মেইল/চিঠি (গুলো)';
-$labels['markread'] = 'পড়া শেষ (read)';
-$labels['markunread'] = 'নাদেখা (unread)';
-$labels['markflagged'] = 'দাগানো (flagged)';
-$labels['markunflagged'] = 'দাগহীন (unflagged)';
+$labels['printmessage']     = 'মেইল/চিঠি প্রিন্ট করুন';
+$labels['previousmessage']  = 'আগের মেইল/চিঠিটি দেখুন';
+$labels['firstmessage']     = 'প্রথম মেইল/চিঠিটি দেখুন';
+$labels['nextmessage']      = 'পরের মেইল/চিঠিটি দেখুন';
+$labels['lastmessage']      = 'শেষ মেইল/চিঠিটি দেখুন';
+$labels['backtolist']       = 'মেইল/চিঠির তালিকায় ফিরে যান';
+$labels['viewsource']       = 'মূল উৎসদেখুন';
+$labels['mark']             = 'Mark';
+$labels['markmessages']     = 'মেইল/চিঠি (গুলো)';
+$labels['markread']         = 'পড়া শেষ (read)';
+$labels['markunread']       = 'নাদেখা (unread)';
+$labels['markflagged']      = 'দাগানো (flagged)';
+$labels['markunflagged']    = 'দাগহীন (unflagged)';
+$labels['moreactions']      = 'More actions...';
+$labels['more']             = 'More';
+$labels['back']             = 'Back';
+$labels['options']          = 'Options';
+
 $labels['select'] = 'বেছেনিন';
 $labels['all'] = 'সবগুলো';
 $labels['none'] = 'কোনোটাই না';
-$labels['nonesort'] = 'কোনোটাই না';
+$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';
 $labels['filter'] = 'ছাকনি';
+$labels['list'] = 'List';
+$labels['threads'] = 'Threads';
+$labels['expand-all'] = 'Expand All';
+$labels['expand-unread'] = 'Expand Unread';
+$labels['collapse-all'] = 'Collapse All';
+$labels['threaded'] = 'Threaded';
+
+$labels['autoexpand_threads'] = 'Expand message threads';
+$labels['do_expand'] = 'all threads';
+$labels['expand_only_unread'] = 'only with unread messages';
+$labels['fromto'] = 'From/To';
+$labels['flag'] = 'Flag';
+$labels['attachment'] = 'Attachment';
+$labels['nonesort'] = 'কোনোটাই না';
+$labels['sentdate'] = 'Sent date';
+$labels['arrival'] = 'Arrival date';
+$labels['asc'] = 'ascending';
+$labels['desc'] = 'descending';
+$labels['listcolumns'] = 'List columns';
+$labels['listsorting'] = 'Sorting column';
+$labels['listorder'] = 'Sorting order';
+$labels['listmode'] = 'List view mode';
+
+$labels['folderactions'] = 'Folder actions...';
 $labels['compact'] = 'টাইটকরুন';
 $labels['empty'] = 'খালিকরুন';
+
 $labels['quota'] = 'ডিস্ক এ খালি যায়গা';
-$labels['unknown'] = 'অজানা';
-$labels['unlimited'] = 'সীমাহীন';
-$labels['quicksearch'] = 'ঝটকরে খোজা';
-$labels['resetsearch'] = 'নতুনকরে খুজুন';
+$labels['unknown']  = 'অজানা';
+$labels['unlimited']  = 'সীমাহীন';
+
+$labels['quicksearch']  = 'ঝটকরে খোজা';
+$labels['resetsearch']  = 'নতুনকরে খুজুন';
+$labels['searchmod']  = 'Search modifiers';
+$labels['msgtext']  = 'Entire message';
+$labels['body']  = 'Body';
+
 $labels['openinextwin'] = 'নতুন উইন্ডো তে দেখুন';
-$labels['sendmessage'] = 'এখুনি মেইল / চিঠিটি পাঠান';
-$labels['savemessage'] = 'খসড়া হিসাবে জমা করে রাখুন';
-$labels['addattachment'] = 'একটা ফাইল জুড়ে দিন চিঠির সাথে';
-$labels['charset'] = 'Charset';
-$labels['editortype'] = 'Editor type';
-$labels['returnreceipt'] = 'ফিরতি রসিদ';
+$labels['emlsave'] = 'Download (.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['addattachment']  = 'একটা ফাইল জুড়ে দিন চিঠির সাথে';
+$labels['charset']        = 'Charset';
+$labels['editortype']     = 'Editor type';
+$labels['returnreceipt']  = 'ফিরতি রসিদ';
+$labels['dsn']            = 'Delivery status notification';
+$labels['mailreplyintro'] = 'On $date, $sender wrote:';
+$labels['originalmessage'] = 'Original Message';
+
+$labels['editidents']    = 'Edit identities';
+$labels['spellcheck']    = 'Spell';
 $labels['checkspelling'] = 'Check spelling';
 $labels['resumeediting'] = 'Resume editing';
-$labels['revertto'] = 'Revert to';
+$labels['revertto']      = 'Revert to';
+
+$labels['attach'] = 'Attach';
 $labels['attachments'] = 'জুড়ে দেওয়া ফাইল (Attachments)';
 $labels['upload'] = 'উঠায় দেন';
-$labels['close'] = 'বন্ধ করুন';
-$labels['low'] = 'Low';
-$labels['lowest'] = 'Lowest';
-$labels['normal'] = 'Normal';
-$labels['high'] = 'High';
+$labels['uploadprogress'] = '$percent ($current from $total)';
+$labels['close']  = 'বন্ধ করুন';
+$labels['messageoptions']  = 'Message options...';
+
+$labels['low']     = 'Low';
+$labels['lowest']  = 'Lowest';
+$labels['normal']  = 'Normal';
+$labels['high']    = 'High';
 $labels['highest'] = 'Highest';
-$labels['nosubject'] = '(বিষয়হীন)';
+
+$labels['nosubject']  = '(বিষয়হীন)';
 $labels['showimages'] = 'ছবি দেখান';
 $labels['alwaysshow'] = 'সবসময় $sender এর কাছে থেকে পাওয়া ছবিগুলো দেখানো হোক';
+$labels['isdraft']    = 'This is a draft message.';
+$labels['andnmore']   = '$nr more...';
+$labels['togglemoreheaders'] = 'Show more message headers';
+$labels['togglefullheaders'] = 'Toggle raw message headers';
+
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'খালি লেখা দেখুন';
 $labels['savesentmessagein'] = 'পাঠানো চিঠি/মেইল জমা করুন >>';
 $labels['dontsave'] = 'জমিয়ে রাখা লাগবে না';
 $labels['maxuploadsize'] = 'ফাইল উঠানোর সর্বোচ্চ সাইজ $size';
+
 $labels['addcc'] = 'অনুলিপির ঠিকানা ঢুকান';
 $labels['addbcc'] = 'নাজানিয়ে অনুলিপির ঠিকানা ঢুকান';
 $labels['addreplyto'] = 'উত্তর পাঠানোর ঠিকানা ঢুকান';
+$labels['addfollowupto'] = 'Add Followup-To';
+
+// mdn
 $labels['mdnrequest'] = 'প্রাপক আপনার কাছে মেইল/চিঠিটা যে পেয়েছেন তার ফিরতি রসিদ চেয়েছেন। আপনি কি ফিরতি রসিদ টা পাঠাবেন?';
 $labels['receiptread'] = 'মেইল/চিঠি যে পেয়েছেন তার ফিরতি রসিদ';
 $labels['yourmessage'] = 'নিচে রয়েছে আপনার চিঠিটা যে প্রাপক পেয়েছেন তার রসিদ';
 $labels['receiptnote'] = 'এই রসিদ খালি এতটুকু প্রমান করে যে প্রাপক চিঠিটি পেয়েছেন। কিন্তু তিনি ঠিকমতো পড়তে পেরেছেন কিনা অথবা তিনি পড়ে বুঝতে পেরেছেন কিনা তার কোনো প্রমান নেই।';
-$labels['name'] = 'নাম';
-$labels['firstname'] = 'নামের প্রথমাংশ';
-$labels['surname'] = 'নামের শেষাংশ';
-$labels['email'] = 'ই-মেইল/চিঠি';
+
+// address boook
+$labels['name']         = 'নাম';
+$labels['firstname']    = 'নামের প্রথমাংশ';
+$labels['surname']      = 'নামের শেষাংশ';
+$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['email']        = 'ই-মেইল/চিঠি';
+$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['typepager']  = 'Pager';
+$labels['typevideo']  = 'Video';
+$labels['typeassistant']  = 'Assistant';
+$labels['typehomepage']  = 'Home Page';
+$labels['typeblog'] = 'Blog';
+$labels['typeprofile'] = 'Profile';
+
+$labels['addfield'] = 'Add field...';
 $labels['addcontact'] = 'নতুন ঠিকানা ঢুকান';
 $labels['editcontact'] = 'একটা ঠিকানা বদলান';
-$labels['edit'] = 'বদলান';
+$labels['contacts'] = 'Contacts';
+$labels['contactproperties'] = 'Contact properties';
+$labels['personalinfo'] = 'Personal information';
+
+$labels['edit']   = 'বদলান';
 $labels['cancel'] = 'বাতিল';
-$labels['save'] = 'জমা দিন';
+$labels['save']   = 'জমা দিন';
 $labels['delete'] = 'ফেলে দিন';
-$labels['newcontact'] = 'একটা নতুন ঠিকানার কার্ড বানান';
-$labels['deletecontact'] = 'বেছে নেওয়া ঠিকানা গুলো ফেলে দিন';
-$labels['composeto'] = 'চিঠি পাঠাবেন কার কাছে?';
+$labels['rename'] = 'Rename';
+$labels['addphoto'] = 'Add';
+$labels['replacephoto'] = 'Replace';
+$labels['uploadphoto'] = 'Upload photo';
+
+$labels['newcontact']     = 'একটা নতুন ঠিকানার কার্ড বানান';
+$labels['deletecontact']  = 'বেছে নেওয়া ঠিকানা গুলো ফেলে দিন';
+$labels['composeto']      = 'চিঠি পাঠাবেন কার কাছে?';
 $labels['contactsfromto'] = '$count ঠিকানার মধ্যে $from থেকে $to টা';
-$labels['print'] = 'প্রিন্ট করুন';
-$labels['export'] = 'রপ্তানি করুন';
-$labels['exportvcards'] = 'রপ্তানি করুন vCard আকারে';
-$labels['previouspage'] = 'আগের গুলো দেখান';
-$labels['firstpage'] = 'প্রথম গুলো দেখান';
-$labels['nextpage'] = 'পরের গুলো দেখান';
-$labels['lastpage'] = 'শেষের গুলো দেখান';
+$labels['print']          = 'প্রিন্ট করুন';
+$labels['export']         = 'রপ্তানি করুন';
+$labels['exportall']      = 'Export all';
+$labels['exportsel']      = 'Export selected';
+$labels['exportvcards']   = 'রপ্তানি করুন vCard আকারে';
+$labels['newcontactgroup'] = 'Create new contact group';
+$labels['grouprename']    = 'Rename group';
+$labels['groupdelete']    = 'Delete group';
+$labels['groupremoveselected'] = 'Remove selected contacts from group';
+
+$labels['previouspage']   = 'আগের গুলো দেখান';
+$labels['firstpage']      = 'প্রথম গুলো দেখান';
+$labels['nextpage']       = 'পরের গুলো দেখান';
+$labels['lastpage']       = 'শেষের গুলো দেখান';
+
+$labels['group'] = 'Group';
 $labels['groups'] = 'গ্রুপ';
 $labels['personaladrbook'] = 'নিজের ঠিকানা';
+
+$labels['searchsave'] = 'Save search';
+$labels['searchdelete'] = 'Delete search';
+
 $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['done'] = 'শেষ';
+
+// settings
 $labels['settingsfor'] = 'খুটিনাটি';
+$labels['about'] = 'About';
 $labels['preferences'] = 'পছন্দ';
 $labels['userpreferences'] = 'গ্রাহক পছন্দ';
 $labels['editpreferences'] = 'গ্রাহক পছন্দ বদলান';
+
 $labels['identities'] = 'পরিচিতি';
 $labels['manageidentities'] = 'এই অ্যাকউন্টের "পরচিতি" বদলান';
 $labels['newidentity'] = 'নতুন পরিচিতি';
+
 $labels['newitem'] = 'নতুন জিনিষ';
 $labels['edititem'] = 'জিনিষ বদলান';
+
 $labels['preferhtml'] = 'HTML এ দেখি';
+$labels['defaultcharset'] = 'Default Character Set';
 $labels['htmlmessage'] = 'HTML মেইল/চিঠি';
+$labels['messagepart'] = 'Part';
+$labels['digitalsig'] = 'Digital Signature';
+$labels['dateformat'] = 'Date format';
+$labels['timeformat'] = 'Time format';
 $labels['prettydate'] = 'তারিখ ভালো করে দেখা যাবে';
-$labels['setdefault'] = 'এইটাই আসল';
-$labels['autodetect'] = 'কম্পুটার নিজেনিজি বেছে নেবে';
-$labels['language'] = 'ভাষা';
-$labels['timezone'] = 'সময়ভিত্তিক এলাকা';
-$labels['pagesize'] = 'প্রতি পৃষ্ঠায় লাইন সংখ্যা';
+$labels['setdefault']  = 'এইটাই আসল';
+$labels['autodetect']  = 'কম্পুটার নিজেনিজি বেছে নেবে';
+$labels['language']  = 'ভাষা';
+$labels['timezone']  = 'সময়ভিত্তিক এলাকা';
+$labels['pagesize']  = 'প্রতি পৃষ্ঠায় লাইন সংখ্যা';
 $labels['signature'] = 'স্বাক্ষর';
-$labels['dstactive'] = 'Daylight saving time';
+$labels['dstactive']  = 'Daylight saving time';
+$labels['showinextwin'] = 'Open message in a new window';
+$labels['composeextwin'] = 'Compose in a new window';
 $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'] = 'বেরহবার সময় ডাস্টবিন অটোমেটিক খালি হবে';
@@ -214,39 +413,126 @@ $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'] = 'If moving messages to Trash fails, delete them';
+$labels['deletejunk'] = 'Directly delete messages in Junk';
 $labels['showremoteimages'] = 'মেইলে অন্য ওয়েবসাইট থেকে আসা ছবি থাকলে তা দেখা যাবে';
 $labels['fromknownsenders'] = 'পরিচিত প্রেরক এর ক্ষেত্রে';
 $labels['always'] = 'সবসময়';
 $labels['showinlineimages'] = 'মেইলের সাথে জোড়া লাগানো ছবি, মেইলের নিচে দেখা যাবে';
-$labels['autosavedraft'] = 'নিজেনিজি খসড়া জমা হয়ে যাবে';
-$labels['everynminutes'] = 'প্রতি $n মিনিটে';
-$labels['never'] = 'কখোনোই না';
+$labels['autosavedraft']  = 'নিজেনিজি খসড়া জমা হয়ে যাবে';
+$labels['everynminutes']  = 'প্রতি $n মিনিটে';
+$labels['refreshinterval']  = 'Refresh (check for new messages, etc.)';
+$labels['never']  = 'কখোনোই না';
+$labels['immediately']  = 'immediately';
 $labels['messagesdisplaying'] = 'মেইল/চিঠি দেখা যাচ্ছে';
 $labels['messagescomposition'] = 'মেইল/চিঠি লেখা হচ্ছে';
 $labels['mimeparamfolding'] = 'জুড়ে দেওয়া জিনিষের নাম';
 $labels['2231folding'] = 'Full RFC 2231 (Thunderbird)';
 $labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
 $labels['2047folding'] = 'Full RFC 2047 (other)';
+$labels['force7bit'] = 'Use MIME encoding for 8-bit characters';
 $labels['advancedoptions'] = 'জটিল বিষয়';
 $labels['focusonnewmessage'] = 'নতুন মেইল এলেই তা হাইলাইট হয়ে যাবে';
 $labels['checkallfolders'] = 'সবগুলো মেইলবক্সে নতুন চিঠি খোজা হবে';
-$labels['folder'] = 'ফোল্ডার/মেইলবক্স';
-$labels['foldername'] = 'ফোল্ডার/মেইলবক্স এর নাম';
-$labels['subscribed'] = 'গ্রহনকারি';
+$labels['displaynext'] = 'After message delete/move display the next message';
+$labels['defaultfont'] = 'Default font of HTML message';
+$labels['mainoptions'] = 'Main Options';
+$labels['browseroptions'] = 'Browser Options';
+$labels['section'] = 'Section';
+$labels['maintenance'] = 'Maintenance';
+$labels['newmessage'] = 'New Message';
+$labels['signatureoptions'] = 'Signature Options';
+$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'] = 'Automatically add signature';
+$labels['newmessageonly'] = 'new message only';
+$labels['replyandforwardonly'] = 'replies and forwards only';
+$labels['insertsignature'] = 'Insert signature';
+$labels['previewpanemarkread']  = 'Mark previewed messages as read';
+$labels['afternseconds']  = 'after $n seconds';
+$labels['reqmdn'] = 'Always request a return receipt';
+$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'] = 'Check spelling before sending a message';
+$labels['spellcheckoptions'] = 'Spellcheck Options';
+$labels['spellcheckignoresyms'] = 'Ignore words with symbols';
+$labels['spellcheckignorenums'] = 'Ignore words with numbers';
+$labels['spellcheckignorecaps'] = 'Ignore words with all letters capitalized';
+$labels['addtodict'] = 'Add to dictionary';
+$labels['mailtoprotohandler'] = 'Register protocol handler for mailto: links';
+$labels['forwardmode'] = 'Messages forwarding';
+$labels['inline'] = 'inline';
+$labels['asattachment'] = 'as attachment';
+
+$labels['folder']  = 'ফোল্ডার/মেইলবক্স';
+$labels['folders']  = 'ফোল্ডার/মেইলবক্স';
+$labels['foldername']  = 'ফোল্ডার/মেইলবক্স এর নাম';
+$labels['subscribed']  = 'গ্রহনকারি';
 $labels['messagecount'] = 'মেইল/চিঠি';
-$labels['create'] = 'প্রস্তুত করুন';
-$labels['createfolder'] = 'নতুন ফোল্ডার / মেইলবক্স প্রস্তুত করুন';
-$labels['managefolders'] = 'ফোল্ডার/মেইলবক্স গুলো কে গুছান';
+$labels['create']  = 'প্রস্তুত করুন';
+$labels['createfolder']  = 'নতুন ফোল্ডার / মেইলবক্স প্রস্তুত করুন';
+$labels['managefolders']  = 'ফোল্ডার/মেইলবক্স গুলো কে গুছান';
 $labels['specialfolders'] = 'বিশেষ ফোল্ডার/মেইলবক্স';
+$labels['properties'] = 'Properties';
+$labels['folderproperties'] = 'Folder properties';
+$labels['parentfolder'] = 'Parent folder';
+$labels['location'] = 'Location';
+$labels['info'] = 'Information';
+$labels['getfoldersize'] = 'Click to get folder size';
+$labels['changesubscription'] = 'Click to change subscription';
+$labels['foldertype'] = 'Folder Type';
+$labels['personalfolder']  = 'Private Folder';
+$labels['otherfolder']  = 'Other User\'s Folder';
+$labels['sharedfolder']  = 'Public Folder';
+
 $labels['sortby'] = 'সাজান';
-$labels['sortasc'] = 'কম থেকে বেশি হিসাবে সাজান';
+$labels['sortasc']  = 'কম থেকে বেশি হিসাবে সাজান';
 $labels['sortdesc'] = 'বেশি থেকে কম হিসাবে সাজান';
+$labels['undo'] = 'Undo';
+
+$labels['installedplugins'] = 'Installed plugins';
+$labels['plugin'] = 'Plugin';
+$labels['version'] = 'Version';
+$labels['source'] = 'Source';
+$labels['license'] = 'License';
+$labels['support'] = 'Get support';
+
+// units
 $labels['B'] = 'বাইট';
 $labels['KB'] = 'কিলোবাইট';
 $labels['MB'] = 'মেগাবাইট';
 $labels['GB'] = 'গিগাবাইট';
 
+// character sets
+$labels['unicode'] = 'Unicode';
+$labels['english'] = '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['turkish'] = 'Turkish';
+$labels['nordic'] = 'Nordic';
+$labels['thai'] = 'Thai';
+$labels['celtic'] = 'Celtic';
+$labels['vietnamese'] = 'Vietnamese';
+$labels['japanese'] = 'Japanese';
+$labels['korean'] = 'Korean';
+$labels['chinese'] = 'Chinese';
+
+?>
diff --git a/program/localization/bn_BD/messages.inc b/program/localization/bn_BD/messages.inc
index 3b0c65c9f..44d5fcc60 100644
--- a/program/localization/bn_BD/messages.inc
+++ b/program/localization/bn_BD/messages.inc
@@ -2,27 +2,43 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/bn_BD/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['loginfailed'] = 'ঢোকা গেল না';
+$messages['errortitle']  = 'An error occurred!';
+$messages['loginfailed']  = 'ঢোকা গেল না';
 $messages['cookiesdisabled'] = 'আপনার ব্রাউজার, কুকি গ্রহন করে না';
 $messages['sessionerror'] = 'আপনার সেশন শেষ';
 $messages['storageerror'] = 'মেইল সারভার এর সাথে যোগাযোগ করা গেল না';
+$messages['servererror'] = 'Server Error!';
+$messages['servererrormsg'] = 'Server Error: $msg';
+$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'] = 'এই মেইলবক্সে কোনো চিঠি নাই';
 $messages['loggedout'] = 'আপনের সেশন ঠিকঠাক মতো শেষ হইছে। শুভবিদায়।';
 $messages['mailboxempty'] = 'মেইলবক্স খালি';
+$messages['refreshing'] = 'Refreshing...';
 $messages['loading'] = 'কম্পুটার কাজ করতেছে . .';
+$messages['uploading'] = 'Uploading file...';
+$messages['uploadingmany'] = 'Uploading files...';
 $messages['loadingdata'] = 'কম্পুটার তথ্য আনছে আপনার জন্য..';
 $messages['checkingmail'] = 'নতুন চিঠি আসছে কিনা তা দেখা হচ্ছে';
 $messages['sendingmessage'] = 'চিঠি পাঠায় দেওয়া হচ্ছে';
@@ -32,39 +48,54 @@ $messages['messagesaved'] = 'চিঠি খসড়া হিসাবে জম
 $messages['successfullysaved'] = 'ঠিকঠাকমতো জমা হয়ে গিয়েছে';
 $messages['addedsuccessfully'] = 'নতুন ঠিকানা ঠিকঠাক মতো ঢোকানো হয়ে গেছে';
 $messages['contactexists'] = 'একই ই-মেইল এ আরেকটা নাম ঠিকানা তালিকায় আছে';
+$messages['contactnameexists'] = 'A contact with the same name already exists.';
 $messages['blockedimages'] = 'আপনার গোপনীয়তা রক্ষার জন্য আমরা ছবি গুলো সরিয়ে রেখেছি';
 $messages['encryptedmessage'] = 'এটা একটি গোপন (encrypted) চিঠি। এটা আপনাকে দেখানো যাবে না। দু্ঃখিত।';
 $messages['nocontactsfound'] = 'কোনো ঠিকানা পাওয়া গেলনা। দু্ঃখিত।';
 $messages['contactnotfound'] = 'আপনি যে ঠিকানা খুজছেন সেটা পাওয়া গেল না';
+$messages['contactsearchonly'] = 'Enter some search terms to find contacts';
 $messages['sendingfailed'] = 'চিঠি পাঠানো গেলনা';
 $messages['senttooquickly'] = 'এই চিঠি পাঠানোর আগে, দয়া করে $sec সেকেন্ড';
 $messages['errorsavingsent'] = 'প্রেরিত চিঠি হিসাবে জমা রাখার সময় একটা ঝামেলা হয়েছে';
 $messages['errorsaving'] = 'জমা করার সময় একটা ঝামেলা হয়েছে';
 $messages['errormoving'] = 'চিঠিটা সরানো গেলো না';
+$messages['errorcopying'] = 'Could not copy the message(s).';
 $messages['errordeleting'] = 'চিঠিটা ফেলানো গেলো না';
-$messages['deletecontactconfirm'] = 'আপনি কি আসলেই এই ঠিকানা(গুলো) ফেলো দিতে চান?';
+$messages['errormarking'] = 'Could not mark the message(s).';
+$messages['deletecontactconfirm']  = 'আপনি কি আসলেই এই ঠিকানা(গুলো) ফেলো দিতে চান?';
+$messages['deletegroupconfirm']  = 'Do you really want to delete selected group?';
 $messages['deletemessagesconfirm'] = 'আপনি কি আসলেই এই চিঠি(গুলো) ফেলো দিতে চান?';
-$messages['deletefolderconfirm'] = 'আপনি কি আসলেই এই ফোল্ডার/মেইলবক্স ফেলো দিতে চান?';
-$messages['purgefolderconfirm'] = 'আপনি কি আসলেই এই ফোল্ডার/মেইলবক্স এর সব চিঠি ফেলো দিতে চান?';
+$messages['deletefolderconfirm']  = 'আপনি কি আসলেই এই ফোল্ডার/মেইলবক্স ফেলো দিতে চান?';
+$messages['purgefolderconfirm']  = 'আপনি কি আসলেই এই ফোল্ডার/মেইলবক্স এর সব চিঠি ফেলো দিতে চান?';
+$messages['contactdeleting'] = 'Deleting contact(s)...';
+$messages['groupdeleting'] = 'Deleting group...';
 $messages['folderdeleting'] = 'ফোল্ডার/মেইলবক্স ফেলে দেওয়া হচ্ছে';
 $messages['foldermoving'] = 'ফোল্ডার/মেইলবক্স সরানো হচ্ছে';
+$messages['foldersubscribing'] = 'Subscribing folder...';
+$messages['folderunsubscribing'] = 'Unsubscribing folder...';
 $messages['formincomplete'] = 'আপনি সবগুলো জিনিষ লেখেননি';
 $messages['noemailwarning'] = 'একটি সঠিক ই-মেইল লিখুন';
-$messages['nonamewarning'] = 'দয়া করে নামটি লিখুন';
+$messages['nonamewarning']  = 'দয়া করে নামটি লিখুন';
 $messages['nopagesizewarning'] = 'দয়া করে পৃষ্ঠার সাইজটি লিখুন';
 $messages['nosenderwarning'] = 'দয়া করে ফিরতি ই-মেইলটা লিখুন';
 $messages['norecipientwarning'] = 'দয়া করে একজন প্রাপক এর ই-মেইলটা লিখুন';
-$messages['nosubjectwarning'] = 'বিষয় হিসাবে কিছু লেখা হয়নি, আপনি কি কিছু লিখবেন এখন বিষয় হিসাবে?';
+$messages['nosubjectwarning']  = 'বিষয় হিসাবে কিছু লেখা হয়নি, আপনি কি কিছু লিখবেন এখন বিষয় হিসাবে?';
 $messages['nobodywarning'] = 'কোনো কিছু না লিখেই এই চিঠি পাঠিয়ে দেবেন?';
 $messages['notsentwarning'] = 'চিঠি পাঠানো হয়নি। চিঠিটা কি বাতিল করে দেবেন?';
 $messages['noldapserver'] = 'দয়া করে একটি এল্ডাপ সারভার বেছে নিন সার্চ করার জন্যে';
 $messages['nosearchname'] = 'দয়া করে একজনের নাম অথবা ই-মেইল লিখুন';
+$messages['notuploadedwarning'] = 'Not all attachments have been uploaded yet. Please wait or cancel the upload.';
 $messages['searchsuccessful'] = '$nr টা চিঠি পাওয়া গেছে';
+$messages['contactsearchsuccessful'] = '$nr contacts found.';
 $messages['searchnomatch'] = 'খুজে কিছু পাওয়া গেলোনা';
 $messages['searching'] = 'খুজছি ....';
 $messages['checking'] = 'দেখছি ...';
 $messages['nospellerrors'] = 'No spelling errors found';
 $messages['folderdeleted'] = 'ফোল্ডার/মেইলবক্স ঠিকঠাকমতো ফেলানো হয়ে গেছে';
+$messages['foldersubscribed'] = 'Folder successfully subscribed.';
+$messages['folderunsubscribed'] = 'Folder successfully unsubscribed.';
+$messages['folderpurged'] = 'Folder has successfully been emptied.';
+$messages['folderexpunged'] = 'Folder has successfully been compacted.';
 $messages['deletedsuccessfully'] = 'ঠিকঠাকমতো ফেলানো হয়ে গেছে';
 $messages['converting'] = 'বিন্যাস (formatting) সরানো হচ্ছে ..';
 $messages['messageopenerror'] = 'সারভার থেকে চিঠি আনা গেলোনা';
@@ -75,16 +106,66 @@ $messages['copyerror'] = 'কোনো ঠিকানা তোলা গেল
 $messages['sourceisreadonly'] = 'এইঠিকানাটা খালি পড়ার জন্যে';
 $messages['errorsavingcontact'] = 'ঠিকানা জমা রাখা গেলোনা';
 $messages['movingmessage'] = 'চিঠি সরানো হচ্ছে..';
+$messages['copyingmessage'] = 'Copying message(s)...';
+$messages['copyingcontact'] = 'Copying contact(s)...';
+$messages['deletingmessage'] = 'Deleting message(s)...';
+$messages['markingmessage'] = 'Marking message(s)...';
+$messages['addingmember'] = 'Adding contact(s) to the group...';
+$messages['removingmember'] = 'Removing contact(s) from the group...';
 $messages['receiptsent'] = 'ঠিকঠাক মতো ফিরতি রশিদ পাঠানো হয়েছে';
 $messages['errorsendingreceipt'] = 'রশিদ পাঠানো গেলোনা';
+$messages['deleteidentityconfirm'] = 'Do you really want to delete this identity?';
 $messages['nodeletelastidentity'] = 'আপনি এই পরিচিতি ফেলতে পারবেন না কারন এইটায় বর্তমানে আপনার একমাত্র পরিচিতি।';
 $messages['forbiddencharacter'] = 'ফোল্ডার এর নামের মধ্যে নিষিদ্ধ অক্ষর আছে';
 $messages['selectimportfile'] = 'একটা ফাইল বেছে নিন তোলার জন্য';
 $messages['addresswriterror'] = 'বেছে নেওয়া ঠিকানার বইটিতে লেখাযায় না';
+$messages['contactaddedtogroup'] = 'Successfully added the contacts to this group.';
+$messages['contactremovedfromgroup'] = 'Successfully removed contacts from this group.';
+$messages['nogroupassignmentschanged'] = 'No group assignments changed.';
 $messages['importwait'] = 'আমদানি করা হচ্ছে। একটু অপেক্ষা করুন...';
-$messages['importerror'] = 'আমদানি করা গেলোনা। আপনি যে ফাইলটা তুলেছেন সেটা সঠিক vCard ফাইল নয়।';
+$messages['importformaterror'] = 'Import failed! The uploaded file is not a valid import data file.';
 $messages['importconfirm'] = '<b>ঠিকমতো $inserted ঠিকানা আমদানি করা গেছে, $skipped ঠিকানা আগের থেকেই ছিলো বলে তাদের টা যা ছিলো তাই রাখা হয়েছে</b>:<p><em>$names</em></p>';
+$messages['importconfirmskipped'] = '<b>Skipped $skipped existing entries</b>';
 $messages['opnotpermitted'] = 'এই কাজটা করার অনুমতি নাই আপনার';
 $messages['nofromaddress'] = 'বেছে নেওয়া যে পরিচিতিটা, তাতে ই-মেইল নেই';
 $messages['editorwarning'] = 'যদি আপনি শুধু লেখার স্টাইলে যান তাহলে বর্তমানের কোনো বিন্যাস হারিয়ে যাবে';
+$messages['httpreceivedencrypterror'] = 'A fatal configuration error occurred. Contact your administrator immediately. <b>Your message can not be sent.</b>';
+$messages['smtpconnerror'] = 'SMTP Error ($code): Connection to server failed.';
+$messages['smtpautherror'] = 'SMTP Error ($code): Authentication failed.';
+$messages['smtpfromerror'] = 'SMTP Error ($code): Failed to set sender "$from" ($msg).';
+$messages['smtptoerror'] = 'SMTP Error ($code): Failed to add recipient "$to" ($msg).';
+$messages['smtprecipientserror'] = 'SMTP Error: Unable to parse recipients list.';
+$messages['smtperror'] = 'SMTP Error: $msg';
+$messages['emailformaterror'] = 'Invalid e-mail address: $email';
+$messages['toomanyrecipients'] = 'Too many recipients. Reduce the number of recipients to $max.';
+$messages['maxgroupmembersreached'] = 'The number of group members exceeds the maximum of $max.';
+$messages['internalerror'] = 'An internal error occured. Please try again.';
+$messages['contactdelerror'] = 'Could not delete contact(s).';
+$messages['contactdeleted'] = 'Contact(s) deleted successfully.';
+$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.';
 
+?>
diff --git a/program/localization/br/labels.inc b/program/localization/br/labels.inc
index 7e882a670..537a887df 100644
--- a/program/localization/br/labels.inc
+++ b/program/localization/br/labels.inc
@@ -2,59 +2,78 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/br/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Denis                                                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = 'Degemer mat war $product';
-$labels['username'] = 'Anv an arveriad';
-$labels['password'] = 'Ger-Tremen';
-$labels['server'] = 'Dafariad';
-$labels['login'] = 'Kennaskañ';
-$labels['logout'] = 'Digennaskañ';
-$labels['mail'] = 'Postel elektronek';
+
+// login page
+$labels['welcome']   = 'Degemer mat war $product';
+$labels['username']  = 'Anv an arveriad';
+$labels['password']  = 'Ger-Tremen';
+$labels['server']    = 'Dafariad';
+$labels['login']     = 'Kennaskañ';
+
+// taskbar
+$labels['logout']   = 'Digennaskañ';
+$labels['mail']     = 'Postel elektronek';
 $labels['settings'] = 'Arventennoù';
 $labels['addressbook'] = 'Karned chomlec\'hioù';
-$labels['inbox'] = 'Boest degemer';
+
+// mailbox names
+$labels['inbox']  = 'Boest degemer';
 $labels['drafts'] = 'Brouilhedoù';
-$labels['sent'] = 'Kaset';
-$labels['trash'] = 'Pod-lastez';
-$labels['junk'] = 'Stroboù';
+$labels['sent']   = 'Kaset';
+$labels['trash']  = 'Pod-lastez';
+$labels['junk']   = 'Stroboù';
+
+// message listing
 $labels['subject'] = 'Sujed';
-$labels['from'] = 'Eus';
-$labels['to'] = 'Da';
-$labels['cc'] = 'Cc';
-$labels['bcc'] = 'Cci';
+$labels['from']    = 'Eus';
+$labels['sender']  = 'Sender';
+$labels['to']      = 'Da';
+$labels['cc']      = 'Cc';
+$labels['bcc']     = 'Cci';
 $labels['replyto'] = 'Respont-da';
-$labels['date'] = 'Deiz';
-$labels['size'] = 'Ment';
+$labels['followupto'] = 'Followup-To';
+$labels['date']    = 'Deiz';
+$labels['size']    = 'Ment';
 $labels['priority'] = 'Kentwir';
 $labels['organization'] = 'Aozadur';
 $labels['readstatus'] = 'Stad al lenn';
 $labels['listoptions'] = 'Dibarzhioù ar roll...';
+
 $labels['mailboxlist'] = 'Teuliadoù';
-$labels['folders'] = 'Teuliadoù';
 $labels['messagesfromto'] = 'Kemennadoù eus $from da $to war $count';
 $labels['threadsfromto'] = 'Sujedoù $from da $to war $count';
 $labels['messagenrof'] = 'Kemennad $nr war $count';
 $labels['fromtoshort'] = '$from - $to war $count';
-$labels['copy'] = 'Eilañ';
-$labels['move'] = 'Dilec\'hiañ';
-$labels['moveto'] = 'Dilec\'hiañ da...';
+
+$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';
+
 $labels['filename'] = 'Anv ar restr';
 $labels['filesize'] = 'Ment ar restr';
+
 $labels['addtoaddressbook'] = 'Ouzhpennañ er c\'harned chomlec\'hioù';
+
+// weekdays short
 $labels['sun'] = 'Sul';
 $labels['mon'] = 'Lun';
 $labels['tue'] = 'Meu';
@@ -62,142 +81,458 @@ $labels['wed'] = 'Mer';
 $labels['thu'] = 'Yao';
 $labels['fri'] = 'Gwe';
 $labels['sat'] = 'Sad';
-$labels['sunday'] = 'Sul';
-$labels['monday'] = 'Lun';
-$labels['tuesday'] = 'Meurzh';
+
+// weekdays long
+$labels['sunday']    = 'Sul';
+$labels['monday']    = 'Lun';
+$labels['tuesday']   = 'Meurzh';
 $labels['wednesday'] = 'Merc\'her';
-$labels['thursday'] = 'Yaou';
-$labels['friday'] = 'Gwener';
-$labels['saturday'] = 'Sadorn';
-$labels['jan'] = 'Gen';
-$labels['feb'] = 'C\'hwe';
-$labels['mar'] = 'Meu';
-$labels['apr'] = 'Ebr';
-$labels['may'] = 'Mae';
-$labels['longmay'] = 'Mae';
-$labels['jun'] = 'Mez';
-$labels['jul'] = 'Gou';
-$labels['aug'] = 'Eos';
-$labels['sep'] = 'Gwe';
-$labels['oct'] = 'Her';
-$labels['nov'] = 'Du';
-$labels['dec'] = 'Ker';
-$labels['longjan'] = 'Genver';
-$labels['longfeb'] = 'C\'hwevrer';
-$labels['longmar'] = 'Meurzh';
-$labels['longapr'] = 'Ebrel';
-$labels['longjun'] = 'Mezheven';
-$labels['longjul'] = 'Gouere';
-$labels['longaug'] = 'Eost';
-$labels['longsep'] = 'Gwengolo';
-$labels['longoct'] = 'Here';
-$labels['longnov'] = 'Du';
-$labels['longdec'] = 'Kerzu';
+$labels['thursday']  = 'Yaou';
+$labels['friday']    = 'Gwener';
+$labels['saturday']  = 'Sadorn';
+
+// months short
+$labels['jan']	= 'Gen';
+$labels['feb']	= 'C\'hwe';
+$labels['mar']	= 'Meu';
+$labels['apr']	= 'Ebr';
+$labels['may']	= 'Mae';
+$labels['jun']	= 'Mez';
+$labels['jul'] 	= 'Gou';
+$labels['aug']	= 'Eos';
+$labels['sep']	= 'Gwe';
+$labels['oct']	= 'Her';
+$labels['nov']	= 'Du';
+$labels['dec']	= 'Ker';
+
+// months long
+$labels['longjan']	= 'Genver';
+$labels['longfeb']	= 'C\'hwevrer';
+$labels['longmar']	= 'Meurzh';
+$labels['longapr']	= 'Ebrel';
+$labels['longmay']	= 'Mae';
+$labels['longjun']	= 'Mezheven';
+$labels['longjul']	= 'Gouere';
+$labels['longaug']	= 'Eost';
+$labels['longsep']	= 'Gwengolo';
+$labels['longoct']	= 'Here';
+$labels['longnov']	= 'Du';
+$labels['longdec']	= 'Kerzu';
+
 $labels['today'] = 'Hiziv';
-$labels['refresh'] = 'Azgrenaat';
-$labels['checkmail'] = 'Gwiriañ kemennadoù nevez';
-$labels['compose'] = 'Skrivañ ur c\'hemennad nevez';
-$labels['writenewmessage'] = 'Skrivañ ur c\'hemennad nevez';
-$labels['reply'] = 'Respont';
-$labels['replytomessage'] = 'Respont d\'ar kaser';
+
+// toolbar buttons
+$labels['refresh']          = 'Azgrenaat';
+$labels['checkmail']        = 'Gwiriañ kemennadoù nevez';
+$labels['compose']          = 'Skrivañ ur c\'hemennad nevez';
+$labels['writenewmessage']  = 'Skrivañ ur c\'hemennad nevez';
+$labels['reply']            = 'Respont';
+$labels['replytomessage']   = 'Respont d\'ar kaser';
 $labels['replytoallmessage'] = 'Respont d\'an holl';
-$labels['replyall'] = 'Respont d\'an holl';
-$labels['replylist'] = 'Respont d\'ar roll';
-$labels['forwardmessage'] = 'Treuzkas ar c\'hemennad';
-$labels['deletemessage'] = 'Dilec\'hiañ ar c\'hemennad er pod-lastez';
-$labels['printmessage'] = 'Moulañ ar c\'hemennad-se';
-$labels['previousmessage'] = 'Gwelout ar c"hemennad a-raok';
-$labels['firstmessage'] = 'Gwelout ar c\'hemennad kentañ';
-$labels['nextmessage'] = 'Gwelout ar c\'hemennad da heul';
-$labels['lastmessage'] = 'Gwelout ar c\'hemennad diwezhañ';
-$labels['backtolist'] = 'Distreiñ el listenn kemennadoù';
-$labels['viewsource'] = 'Gwelout an tarzh';
+$labels['replyall']         = 'Respont d\'an holl';
+$labels['replylist']        = 'Respont d\'ar roll';
+$labels['forward']          = 'Forward';
+$labels['forwardinline']    = 'Forward inline';
+$labels['forwardattachment'] = 'Forward as attachment';
+$labels['forwardmessage']   = 'Treuzkas ar c\'hemennad';
+$labels['deletemessage']    = 'Dilec\'hiañ ar c\'hemennad er pod-lastez';
+$labels['movemessagetotrash'] = 'Move message to trash';
+$labels['printmessage']     = 'Moulañ ar c\'hemennad-se';
+$labels['previousmessage']  = 'Gwelout ar c"hemennad a-raok';
+$labels['firstmessage']     = 'Gwelout ar c\'hemennad kentañ';
+$labels['nextmessage']      = 'Gwelout ar c\'hemennad da heul';
+$labels['lastmessage']      = 'Gwelout ar c\'hemennad diwezhañ';
+$labels['backtolist']       = 'Distreiñ el listenn kemennadoù';
+$labels['viewsource']       = 'Gwelout an tarzh';
+$labels['mark']             = 'Mark';
+$labels['markmessages']     = 'Mark messages';
+$labels['markread']         = 'As read';
+$labels['markunread']       = 'As unread';
+$labels['markflagged']      = 'As flagged';
+$labels['markunflagged']    = 'As unflagged';
+$labels['moreactions']      = 'More actions...';
+$labels['more']             = 'More';
+$labels['back']             = 'Back';
+$labels['options']          = 'Options';
+
 $labels['select'] = 'Diuzañ';
 $labels['all'] = 'An holl';
 $labels['none'] = 'Ebet';
-$labels['nonesort'] = 'Ebet';
+$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';
+$labels['filter'] = 'Filter';
+$labels['list'] = 'List';
+$labels['threads'] = 'Threads';
+$labels['expand-all'] = 'Expand All';
+$labels['expand-unread'] = 'Expand Unread';
+$labels['collapse-all'] = 'Collapse All';
+$labels['threaded'] = 'Threaded';
+
+$labels['autoexpand_threads'] = 'Expand message threads';
+$labels['do_expand'] = 'all threads';
+$labels['expand_only_unread'] = 'only with unread messages';
+$labels['fromto'] = 'From/To';
+$labels['flag'] = 'Flag';
+$labels['attachment'] = 'Attachment';
+$labels['nonesort'] = 'Ebet';
+$labels['sentdate'] = 'Sent date';
+$labels['arrival'] = 'Arrival date';
+$labels['asc'] = 'ascending';
+$labels['desc'] = 'descending';
+$labels['listcolumns'] = 'List columns';
+$labels['listsorting'] = 'Sorting column';
+$labels['listorder'] = 'Sorting order';
+$labels['listmode'] = 'List view mode';
+
+$labels['folderactions'] = 'Folder actions...';
 $labels['compact'] = 'Stummaat';
 $labels['empty'] = 'Skarzhañ';
+
 $labels['quota'] = 'Implijadur pladenn';
-$labels['unknown'] = 'Dianav';
-$labels['unlimited'] = 'didermen';
-$labels['quicksearch'] = 'Klask prim';
-$labels['resetsearch'] = 'Aderaouekaat ar glask';
-$labels['sendmessage'] = 'Kas ar c\'hemennad diouzhtu';
-$labels['savemessage'] = 'Gwarediñ ar brouilhed-se';
-$labels['addattachment'] = 'Stagañ ur restr';
-$labels['charset'] = 'Engodadur';
-$labels['editortype'] = 'Furmad aozer';
-$labels['returnreceipt'] = 'Testeni degemer';
+$labels['unknown']  = 'Dianav';
+$labels['unlimited']  = 'didermen';
+
+$labels['quicksearch']  = 'Klask prim';
+$labels['resetsearch']  = 'Aderaouekaat ar glask';
+$labels['searchmod']  = 'Search modifiers';
+$labels['msgtext']  = 'Entire message';
+$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';
+$labels['send']           = 'Send';
+$labels['sendmessage']    = 'Kas ar c\'hemennad diouzhtu';
+$labels['savemessage']    = 'Gwarediñ ar brouilhed-se';
+$labels['addattachment']  = 'Stagañ ur restr';
+$labels['charset']        = 'Engodadur';
+$labels['editortype']     = 'Furmad aozer';
+$labels['returnreceipt']  = 'Testeni degemer';
+$labels['dsn']            = 'Delivery status notification';
+$labels['mailreplyintro'] = 'On $date, $sender wrote:';
+$labels['originalmessage'] = 'Original Message';
+
+$labels['editidents']    = 'Edit identities';
+$labels['spellcheck']    = 'Spell';
 $labels['checkspelling'] = 'Gwiriañ ar reizhskrivadur';
 $labels['resumeediting'] = 'Distreiñ en aozer';
-$labels['revertto'] = 'Distreiñ en/r';
+$labels['revertto']      = 'Distreiñ en/r';
+
+$labels['attach'] = 'Attach';
 $labels['attachments'] = 'Restroù staget';
 $labels['upload'] = 'Stagañ';
-$labels['close'] = 'Serriñ';
-$labels['low'] = 'Izel';
-$labels['lowest'] = 'An izelañ';
-$labels['normal'] = 'Reizh';
-$labels['high'] = 'Uhel';
+$labels['uploadprogress'] = '$percent ($current from $total)';
+$labels['close']  = 'Serriñ';
+$labels['messageoptions']  = 'Message options...';
+
+$labels['low']     = 'Izel';
+$labels['lowest']  = 'An izelañ';
+$labels['normal']  = 'Reizh';
+$labels['high']    = 'Uhel';
 $labels['highest'] = 'An uhelañ';
-$labels['nosubject'] = '(n\'eus ket sujed)';
+
+$labels['nosubject']  = '(n\'eus ket sujed)';
 $labels['showimages'] = 'Diskouez ar skeudennoù';
+$labels['alwaysshow'] = 'Always show images from $sender';
+$labels['isdraft']    = 'This is a draft message.';
+$labels['andnmore']   = '$nr more...';
+$labels['togglemoreheaders'] = 'Show more message headers';
+$labels['togglefullheaders'] = 'Toggle raw message headers';
+
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'testenn kriz';
-$labels['name'] = 'Anv da ziskouez';
-$labels['firstname'] = 'Raganv';
-$labels['surname'] = 'Anv';
-$labels['email'] = 'Postel elektronek';
+$labels['savesentmessagein'] = 'Save sent message in';
+$labels['dontsave'] = 'don\'t save';
+$labels['maxuploadsize'] = 'Maximum allowed file size is $size';
+
+$labels['addcc'] = 'Add Cc';
+$labels['addbcc'] = 'Add Bcc';
+$labels['addreplyto'] = 'Add Reply-To';
+$labels['addfollowupto'] = 'Add Followup-To';
+
+// mdn
+$labels['mdnrequest'] = 'The sender of this message has asked to be notified when you read this message. Do you wish to notify the sender?';
+$labels['receiptread'] = 'Return Receipt (read)';
+$labels['yourmessage'] = 'This is a Return Receipt for your message';
+$labels['receiptnote'] = 'Note: This receipt only acknowledges that the message was displayed on the recipient\'s computer. There is no guarantee that the recipient has read or understood the message contents.';
+
+// address boook
+$labels['name']         = 'Anv da ziskouez';
+$labels['firstname']    = 'Raganv';
+$labels['surname']      = 'Anv';
+$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['email']        = 'Postel elektronek';
+$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['typepager']  = 'Pager';
+$labels['typevideo']  = 'Video';
+$labels['typeassistant']  = 'Assistant';
+$labels['typehomepage']  = 'Home Page';
+$labels['typeblog'] = 'Blog';
+$labels['typeprofile'] = 'Profile';
+
+$labels['addfield'] = 'Add field...';
 $labels['addcontact'] = 'Ouzhpennañ an darempred diuzet en hor c\'harned chomlec\'hioù';
 $labels['editcontact'] = 'Cheñch an darempred';
-$labels['edit'] = 'Cheñch';
+$labels['contacts'] = 'Contacts';
+$labels['contactproperties'] = 'Contact properties';
+$labels['personalinfo'] = 'Personal information';
+
+$labels['edit']   = 'Cheñch';
 $labels['cancel'] = 'Nullañ';
-$labels['save'] = 'Gwarediñ';
+$labels['save']   = 'Gwarediñ';
 $labels['delete'] = 'Dilemel';
-$labels['newcontact'] = 'Krouiñ un darempred nevez';
-$labels['deletecontact'] = 'Dilemel an darempredoù diuzet';
-$labels['composeto'] = 'Skrivañ ur c\'hemennad ouzh';
+$labels['rename'] = 'Rename';
+$labels['addphoto'] = 'Add';
+$labels['replacephoto'] = 'Replace';
+$labels['uploadphoto'] = 'Upload photo';
+
+$labels['newcontact']     = 'Krouiñ un darempred nevez';
+$labels['deletecontact']  = 'Dilemel an darempredoù diuzet';
+$labels['composeto']      = 'Skrivañ ur c\'hemennad ouzh';
 $labels['contactsfromto'] = 'Darempredoù eus $from ouzh $to war $count';
-$labels['print'] = 'Moulañ';
-$labels['export'] = 'Ezporzhiañ';
-$labels['previouspage'] = 'Diskouez pajenn a-raok';
-$labels['firstpage'] = 'Gwelout ar bajenn gentañ';
-$labels['nextpage'] = 'Diskouez pajenn da heul';
-$labels['lastpage'] = 'Gwelout ar bajenn diwezhañ';
+$labels['print']          = 'Moulañ';
+$labels['export']         = 'Ezporzhiañ';
+$labels['exportall']      = 'Export all';
+$labels['exportsel']      = 'Export selected';
+$labels['exportvcards']   = 'Export contacts in vCard format';
+$labels['newcontactgroup'] = 'Create new contact group';
+$labels['grouprename']    = 'Rename group';
+$labels['groupdelete']    = 'Delete group';
+$labels['groupremoveselected'] = 'Remove selected contacts from group';
+
+$labels['previouspage']   = 'Diskouez pajenn a-raok';
+$labels['firstpage']      = 'Gwelout ar bajenn gentañ';
+$labels['nextpage']       = 'Diskouez pajenn da heul';
+$labels['lastpage']       = 'Gwelout ar bajenn diwezhañ';
+
+$labels['group'] = 'Group';
 $labels['groups'] = 'Strolladoù';
 $labels['personaladrbook'] = 'Chomlec\'h personel';
+
+$labels['searchsave'] = 'Save search';
+$labels['searchdelete'] = 'Delete search';
+
+$labels['import'] = 'Import';
+$labels['importcontacts'] = 'Import contacts';
+$labels['importfromfile'] = 'Import from file:';
+$labels['importtarget'] = 'Add new contacts to address book:';
+$labels['importreplace'] = 'Replace the entire address book';
+$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['done'] = 'Done';
+
+// settings
 $labels['settingsfor'] = 'Arventennoù evit';
+$labels['about'] = 'About';
 $labels['preferences'] = 'Dibarzhioù';
 $labels['userpreferences'] = 'Dibarzhioù implijer';
 $labels['editpreferences'] = 'Cheñch dibarzhioù implijer';
+
 $labels['identities'] = 'Identelezhioù';
 $labels['manageidentities'] = 'Merañ an identelezhioù evit ar c\'hont-se';
 $labels['newidentity'] = 'Identelezh nevez';
+
 $labels['newitem'] = 'Elfenn nevez';
 $labels['edititem'] = 'Cheñch an elfenn';
+
 $labels['preferhtml'] = 'Diskouez en HTML';
+$labels['defaultcharset'] = 'Default Character Set';
 $labels['htmlmessage'] = 'Kemennad en HTML';
+$labels['messagepart'] = 'Part';
+$labels['digitalsig'] = 'Digital Signature';
+$labels['dateformat'] = 'Date format';
+$labels['timeformat'] = 'Time format';
 $labels['prettydate'] = 'Diskouez berr deizioù';
-$labels['setdefault'] = 'Arventennoù dre ziouer';
-$labels['language'] = 'Yezh';
-$labels['timezone'] = 'Gwerzhid-eur';
-$labels['pagesize'] = 'Niver a linenn dre bajenn';
+$labels['setdefault']  = 'Arventennoù dre ziouer';
+$labels['autodetect']  = 'Auto';
+$labels['language']  = 'Yezh';
+$labels['timezone']  = 'Gwerzhid-eur';
+$labels['pagesize']  = 'Niver a linenn dre bajenn';
 $labels['signature'] = 'Sinadur';
-$labels['dstactive'] = 'Eur an hañv';
+$labels['dstactive']  = 'Eur an hañv';
+$labels['showinextwin'] = 'Open message in a new window';
+$labels['composeextwin'] = 'Compose in a new window';
 $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['autosavedraft'] = 'Gwarediñ emgefre brouilhedoù';
-$labels['everynminutes'] = 'Bep $n munutoù';
-$labels['never'] = 'ebet';
-$labels['folder'] = 'Renkell';
-$labels['foldername'] = 'Anv ar renkell';
-$labels['subscribed'] = 'Koumananer';
-$labels['create'] = 'Krouiñ';
-$labels['createfolder'] = 'Krouiñ ur renkell nevez';
-$labels['managefolders'] = 'Aozañ ar renkelloù';
+$labels['skin'] = 'Interface skin';
+$labels['logoutclear'] = 'Clear Trash on logout';
+$labels['logoutcompact'] = 'Compact Inbox on logout';
+$labels['uisettings'] = 'User Interface';
+$labels['serversettings'] = 'Server Settings';
+$labels['mailboxview'] = 'Mailbox View';
+$labels['mdnrequests'] = 'On request for return receipt';
+$labels['askuser'] = 'ask me';
+$labels['autosend'] = 'send receipt';
+$labels['autosendknown'] = 'send receipt to my contacts, otherwise ask me';
+$labels['autosendknownignore'] = 'send receipt to my contacts, otherwise ignore';
+$labels['ignore'] = 'ignore';
+$labels['readwhendeleted'] = 'Mark the message as read on delete';
+$labels['flagfordeletion'] = 'Flag the message for deletion instead of delete';
+$labels['skipdeleted'] = 'Do not show deleted messages';
+$labels['deletealways'] = 'If moving messages to Trash fails, delete them';
+$labels['deletejunk'] = 'Directly delete messages in Junk';
+$labels['showremoteimages'] = 'Display remote inline images';
+$labels['fromknownsenders'] = 'from known senders';
+$labels['always'] = 'always';
+$labels['showinlineimages'] = 'Display attached images below the message';
+$labels['autosavedraft']  = 'Gwarediñ emgefre brouilhedoù';
+$labels['everynminutes']  = 'Bep $n munutoù';
+$labels['refreshinterval']  = 'Refresh (check for new messages, etc.)';
+$labels['never']  = 'ebet';
+$labels['immediately']  = 'immediately';
+$labels['messagesdisplaying'] = 'Displaying Messages';
+$labels['messagescomposition'] = 'Composing Messages';
+$labels['mimeparamfolding'] = 'Attachment names';
+$labels['2231folding'] = 'Full RFC 2231 (Thunderbird)';
+$labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
+$labels['2047folding'] = 'Full RFC 2047 (other)';
+$labels['force7bit'] = 'Use MIME encoding for 8-bit characters';
+$labels['advancedoptions'] = 'Advanced options';
+$labels['focusonnewmessage'] = 'Focus browser window on new message';
+$labels['checkallfolders'] = 'Check all folders for new messages';
+$labels['displaynext'] = 'After message delete/move display the next message';
+$labels['defaultfont'] = 'Default font of HTML message';
+$labels['mainoptions'] = 'Main Options';
+$labels['browseroptions'] = 'Browser Options';
+$labels['section'] = 'Section';
+$labels['maintenance'] = 'Maintenance';
+$labels['newmessage'] = 'New Message';
+$labels['signatureoptions'] = 'Signature Options';
+$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'] = 'Automatically add signature';
+$labels['newmessageonly'] = 'new message only';
+$labels['replyandforwardonly'] = 'replies and forwards only';
+$labels['insertsignature'] = 'Insert signature';
+$labels['previewpanemarkread']  = 'Mark previewed messages as read';
+$labels['afternseconds']  = 'after $n seconds';
+$labels['reqmdn'] = 'Always request a return receipt';
+$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'] = 'Check spelling before sending a message';
+$labels['spellcheckoptions'] = 'Spellcheck Options';
+$labels['spellcheckignoresyms'] = 'Ignore words with symbols';
+$labels['spellcheckignorenums'] = 'Ignore words with numbers';
+$labels['spellcheckignorecaps'] = 'Ignore words with all letters capitalized';
+$labels['addtodict'] = 'Add to dictionary';
+$labels['mailtoprotohandler'] = 'Register protocol handler for mailto: links';
+$labels['forwardmode'] = 'Messages forwarding';
+$labels['inline'] = 'inline';
+$labels['asattachment'] = 'as attachment';
+
+$labels['folder']  = 'Renkell';
+$labels['folders']  = 'Teuliadoù';
+$labels['foldername']  = 'Anv ar renkell';
+$labels['subscribed']  = 'Koumananer';
+$labels['messagecount'] = 'Messages';
+$labels['create']  = 'Krouiñ';
+$labels['createfolder']  = 'Krouiñ ur renkell nevez';
+$labels['managefolders']  = 'Aozañ ar renkelloù';
+$labels['specialfolders'] = 'Special Folders';
+$labels['properties'] = 'Properties';
+$labels['folderproperties'] = 'Folder properties';
+$labels['parentfolder'] = 'Parent folder';
+$labels['location'] = 'Location';
+$labels['info'] = 'Information';
+$labels['getfoldersize'] = 'Click to get folder size';
+$labels['changesubscription'] = 'Click to change subscription';
+$labels['foldertype'] = 'Folder Type';
+$labels['personalfolder']  = 'Private Folder';
+$labels['otherfolder']  = 'Other User\'s Folder';
+$labels['sharedfolder']  = 'Public Folder';
+
 $labels['sortby'] = 'Rummañ dre';
-$labels['sortasc'] = 'Rumm diagentad';
+$labels['sortasc']  = 'Rumm diagentad';
 $labels['sortdesc'] = 'Rumm diskennad';
+$labels['undo'] = 'Undo';
+
+$labels['installedplugins'] = 'Installed plugins';
+$labels['plugin'] = 'Plugin';
+$labels['version'] = 'Version';
+$labels['source'] = 'Source';
+$labels['license'] = 'License';
+$labels['support'] = 'Get support';
+
+// units
+$labels['B'] = 'B';
+$labels['KB'] = 'KB';
+$labels['MB'] = 'MB';
+$labels['GB'] = 'GB';
+
+// character sets
+$labels['unicode'] = 'Unicode';
+$labels['english'] = '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['turkish'] = 'Turkish';
+$labels['nordic'] = 'Nordic';
+$labels['thai'] = 'Thai';
+$labels['celtic'] = 'Celtic';
+$labels['vietnamese'] = 'Vietnamese';
+$labels['japanese'] = 'Japanese';
+$labels['korean'] = 'Korean';
+$labels['chinese'] = 'Chinese';
 
+?>
diff --git a/program/localization/br/messages.inc b/program/localization/br/messages.inc
index 1eff8a84c..c1988577d 100644
--- a/program/localization/br/messages.inc
+++ b/program/localization/br/messages.inc
@@ -2,30 +2,43 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/br/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Denis                                                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['errortitle'] = 'Degouezhet ez eus bet ur fazi !';
-$messages['loginfailed'] = 'C\'hwitadenn war kennaskañ';
+$messages['errortitle']  = 'Degouezhet ez eus bet ur fazi !';
+$messages['loginfailed']  = 'C\'hwitadenn war kennaskañ';
 $messages['cookiesdisabled'] = 'N\'eus ket c\'hoant toupinoù Hor merder';
 $messages['sessionerror'] = 'Didalvoudek pe echuet eo hoc\'h estez.';
 $messages['storageerror'] = 'C\'hwitadenn war kennaskañ ouzh an dafariad mirout';
 $messages['servererror'] = 'Fazi dafariad !';
 $messages['servererrormsg'] = 'Fazi dafariad : $msg';
 $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';
 $messages['loggedout'] = 'Digevreet hoc\'h eus mat. Kenavo !';
 $messages['mailboxempty'] = 'Boest lizhiri dileun';
+$messages['refreshing'] = 'Refreshing...';
 $messages['loading'] = 'O kargañ...';
+$messages['uploading'] = 'Uploading file...';
+$messages['uploadingmany'] = 'Uploading files...';
 $messages['loadingdata'] = 'O kargañ roadennoù...';
 $messages['checkingmail'] = 'O Gwiriañ kemennadoù nevez...';
 $messages['sendingmessage'] = 'O kas ar c\'hemennad...';
@@ -35,34 +48,54 @@ $messages['messagesaved'] = 'Kemennad gwaredet dindan Brouilhedoù';
 $messages['successfullysaved'] = 'Gwarediñ graet';
 $messages['addedsuccessfully'] = 'Darempred ouzhpennet er c\'harned chomlec\'hioù';
 $messages['contactexists'] = 'Bout a ra un darempred gant memes postel elektronek';
+$messages['contactnameexists'] = 'A contact with the same name already exists.';
 $messages['blockedimages'] = 'Evit gwarantiñ hoc\'h buhez prevez, stanket eo bet skeudennoù pell er c\'hemennad-se.';
 $messages['encryptedmessage'] = 'Rineget eo ar c\'hemennad, ha ne c\'hall ket bezañ diskouez. Ma Digarezit !';
 $messages['nocontactsfound'] = 'N\'eo ket bet kavet darempred ebet';
 $messages['contactnotfound'] = 'N\'eo ket bet kavet an darempred goulennet';
+$messages['contactsearchonly'] = 'Enter some search terms to find contacts';
 $messages['sendingfailed'] = 'N\'eo ket bet kaset ar c\'hemennad';
+$messages['senttooquickly'] = 'Please wait $sec sec(s). before sending this message.';
+$messages['errorsavingsent'] = 'An error occured while saving sent message.';
 $messages['errorsaving'] = 'Fazi en deus graet reuz en hoc\'h gwarediñ';
 $messages['errormoving'] = 'N\'eus ket tu da zilec\'hiañ ar c\'hemennad';
+$messages['errorcopying'] = 'Could not copy the message(s).';
 $messages['errordeleting'] = 'N\'eus ket tu da zilemel ar c\'hemennad';
-$messages['deletecontactconfirm'] = 'C\'hoant hoc\'h eus da zilemel an darempred(où) diuzet ?';
+$messages['errormarking'] = 'Could not mark the message(s).';
+$messages['deletecontactconfirm']  = 'C\'hoant hoc\'h eus da zilemel an darempred(où) diuzet ?';
+$messages['deletegroupconfirm']  = 'Do you really want to delete selected group?';
 $messages['deletemessagesconfirm'] = 'C\'hoant hoc\'h eus da zilemel ar c\'hemennad(où) diuzet ?';
-$messages['deletefolderconfirm'] = 'C\'hoant hoc\'h eus da skarzhañ ar renkell-se ?';
-$messages['purgefolderconfirm'] = 'C\'hoant hoc\'h eus da skarzhañ an holl kemennad eus ar renkell-se ?';
+$messages['deletefolderconfirm']  = 'C\'hoant hoc\'h eus da skarzhañ ar renkell-se ?';
+$messages['purgefolderconfirm']  = 'C\'hoant hoc\'h eus da skarzhañ an holl kemennad eus ar renkell-se ?';
+$messages['contactdeleting'] = 'Deleting contact(s)...';
+$messages['groupdeleting'] = 'Deleting group...';
+$messages['folderdeleting'] = 'Deleting folder...';
+$messages['foldermoving'] = 'Moving folder...';
+$messages['foldersubscribing'] = 'Subscribing folder...';
+$messages['folderunsubscribing'] = 'Unsubscribing folder...';
 $messages['formincomplete'] = 'N\'eo ket leuniet ar furmskrid penn-da-benn';
 $messages['noemailwarning'] = 'Termenit ur postel elektronek mat mar plij ganeoc\'h';
-$messages['nonamewarning'] = 'Termenit un anv mar plij ganeoc\'h';
+$messages['nonamewarning']  = 'Termenit un anv mar plij ganeoc\'h';
 $messages['nopagesizewarning'] = 'Termenit ur ment pajenn mar plij ganeoc\'h';
+$messages['nosenderwarning'] = 'Please enter sender e-mail address.';
 $messages['norecipientwarning'] = 'Ouzhpennit ur resever da nebeutañ mar plij ganeoc\'h';
-$messages['nosubjectwarning'] = 'Dileun eo ar maezienn « Sujed » . C\'hoant hoc\'h eus da leuniañ anezhiñ diouzhtu ?';
+$messages['nosubjectwarning']  = 'Dileun eo ar maezienn « Sujed » . C\'hoant hoc\'h eus da leuniañ anezhiñ diouzhtu ?';
 $messages['nobodywarning'] = 'Kas ar c\'hemennad hep testenn ?';
 $messages['notsentwarning'] = 'N\'eo ket bet kaset ar c\'hemennad. C\'hoant hoc\'h eus dilezel ar c\'hemennad-se ?';
 $messages['noldapserver'] = 'Dizuit ur servijer LDAP evit ar glask';
 $messages['nosearchname'] = 'Skrivit un anv darempred pe ur postel elektronek';
+$messages['notuploadedwarning'] = 'Not all attachments have been uploaded yet. Please wait or cancel the upload.';
 $messages['searchsuccessful'] = '$nr kemennad kavet';
+$messages['contactsearchsuccessful'] = '$nr contacts found.';
 $messages['searchnomatch'] = 'Disoc\'h ebet gant ar glask';
 $messages['searching'] = 'O klask...';
 $messages['checking'] = 'O gwiriañ...';
 $messages['nospellerrors'] = 'Fazi ebet kavet';
 $messages['folderdeleted'] = 'Renkell skarzhet';
+$messages['foldersubscribed'] = 'Folder successfully subscribed.';
+$messages['folderunsubscribed'] = 'Folder successfully unsubscribed.';
+$messages['folderpurged'] = 'Folder has successfully been emptied.';
+$messages['folderexpunged'] = 'Folder has successfully been compacted.';
 $messages['deletedsuccessfully'] = 'Dilemet mat';
 $messages['converting'] = 'O tilemel furmaozañ...';
 $messages['messageopenerror'] = 'N\'us ket tu da gargañ ar c\'hemennad adalek ar servijer';
@@ -72,4 +105,67 @@ $messages['copysuccess'] = 'Kopiañ mat $nr chomlec\'h';
 $messages['copyerror'] = 'Ne c\'hall ket kopiañ chomlec\'hioù';
 $messages['sourceisreadonly'] = 'Lenn hepken eo an tarzh chomlec\'h se';
 $messages['errorsavingcontact'] = 'Ne c\'haller ket gwarediñ chomlec\'h darempred';
+$messages['movingmessage'] = 'Moving message(s)...';
+$messages['copyingmessage'] = 'Copying message(s)...';
+$messages['copyingcontact'] = 'Copying contact(s)...';
+$messages['deletingmessage'] = 'Deleting message(s)...';
+$messages['markingmessage'] = 'Marking message(s)...';
+$messages['addingmember'] = 'Adding contact(s) to the group...';
+$messages['removingmember'] = 'Removing contact(s) from the group...';
+$messages['receiptsent'] = 'Successfully sent a read receipt.';
+$messages['errorsendingreceipt'] = 'Could not send the receipt.';
+$messages['deleteidentityconfirm'] = 'Do you really want to delete this identity?';
+$messages['nodeletelastidentity'] = 'You cannot delete this identity, it\'s your last one.';
+$messages['forbiddencharacter'] = 'Folder name contains a forbidden character.';
+$messages['selectimportfile'] = 'Please select a file to upload.';
+$messages['addresswriterror'] = 'The selected address book is not writeable.';
+$messages['contactaddedtogroup'] = 'Successfully added the contacts to this group.';
+$messages['contactremovedfromgroup'] = 'Successfully removed contacts from this group.';
+$messages['nogroupassignmentschanged'] = 'No group assignments changed.';
+$messages['importwait'] = 'Importing, please wait...';
+$messages['importformaterror'] = 'Import failed! The uploaded file is not a valid import data file.';
+$messages['importconfirm'] = '<b>Successfully imported $inserted contacts</b>';
+$messages['importconfirmskipped'] = '<b>Skipped $skipped existing entries</b>';
+$messages['opnotpermitted'] = 'Operation not permitted!';
+$messages['nofromaddress'] = 'Missing e-mail address in selected identity.';
+$messages['editorwarning'] = 'Switching to the plain text editor will cause all text formatting to be lost. Do you wish to continue?';
+$messages['httpreceivedencrypterror'] = 'A fatal configuration error occurred. Contact your administrator immediately. <b>Your message can not be sent.</b>';
+$messages['smtpconnerror'] = 'SMTP Error ($code): Connection to server failed.';
+$messages['smtpautherror'] = 'SMTP Error ($code): Authentication failed.';
+$messages['smtpfromerror'] = 'SMTP Error ($code): Failed to set sender "$from" ($msg).';
+$messages['smtptoerror'] = 'SMTP Error ($code): Failed to add recipient "$to" ($msg).';
+$messages['smtprecipientserror'] = 'SMTP Error: Unable to parse recipients list.';
+$messages['smtperror'] = 'SMTP Error: $msg';
+$messages['emailformaterror'] = 'Invalid e-mail address: $email';
+$messages['toomanyrecipients'] = 'Too many recipients. Reduce the number of recipients to $max.';
+$messages['maxgroupmembersreached'] = 'The number of group members exceeds the maximum of $max.';
+$messages['internalerror'] = 'An internal error occured. Please try again.';
+$messages['contactdelerror'] = 'Could not delete contact(s).';
+$messages['contactdeleted'] = 'Contact(s) deleted successfully.';
+$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.';
 
+?>
diff --git a/program/localization/bs_BA/labels.inc b/program/localization/bs_BA/labels.inc
index 72bc3b0a0..5afdcad1f 100644
--- a/program/localization/bs_BA/labels.inc
+++ b/program/localization/bs_BA/labels.inc
@@ -2,60 +2,78 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/bs_BA/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Kenan Dervišević <kenan3008@gmail.com>                      |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = 'Dobrodošli u $product';
-$labels['username'] = 'Korisnik';
-$labels['password'] = 'Šifra';
-$labels['server'] = 'Server';
-$labels['login'] = 'Prijava';
-$labels['logout'] = 'Odjava';
-$labels['mail'] = 'Email';
+
+// login page
+$labels['welcome']   = 'Dobrodošli u $product';
+$labels['username']  = 'Korisnik';
+$labels['password']  = 'Šifra';
+$labels['server']    = 'Server';
+$labels['login']     = 'Prijava';
+
+// taskbar
+$labels['logout']   = 'Odjava';
+$labels['mail']     = 'Email';
 $labels['settings'] = 'Podešavanja';
 $labels['addressbook'] = 'Adresar';
-$labels['inbox'] = 'Sanduče';
+
+// mailbox names
+$labels['inbox']  = 'Sanduče';
 $labels['drafts'] = 'Skice';
-$labels['sent'] = 'Poslano';
-$labels['trash'] = 'Smeće';
-$labels['junk'] = 'Spam';
+$labels['sent']   = 'Poslano';
+$labels['trash']  = 'Smeće';
+$labels['junk']   = 'Spam';
+
+// message listing
 $labels['subject'] = 'Naslov';
-$labels['from'] = 'Od';
-$labels['to'] = 'Za';
-$labels['cc'] = 'Cc';
-$labels['bcc'] = 'Bcc';
+$labels['from']    = 'Od';
+$labels['sender']  = 'Pošiljalac';
+$labels['to']      = 'Za';
+$labels['cc']      = 'Cc';
+$labels['bcc']     = 'Bcc';
 $labels['replyto'] = 'Reply-To adresa';
 $labels['followupto'] = 'Prati';
-$labels['date'] = 'Datum';
-$labels['size'] = 'Veličina';
+$labels['date']    = 'Datum';
+$labels['size']    = 'Veličina';
 $labels['priority'] = 'Prioritet';
 $labels['organization'] = 'Organizacija';
 $labels['readstatus'] = 'Status poruke';
 $labels['listoptions'] = 'Izlistaj opcije...';
+
 $labels['mailboxlist'] = 'Folderi';
-$labels['folders'] = 'Folderi';
 $labels['messagesfromto'] = 'Poruke od $from do $to od ukupno $count';
 $labels['threadsfromto'] = 'Teme od $from do $to od ukupno $count';
 $labels['messagenrof'] = 'Poruka broj $nr od $count';
 $labels['fromtoshort'] = '$from – $to od ukupno $count';
-$labels['copy'] = 'Kopiraj';
-$labels['move'] = 'Premjesti';
-$labels['moveto'] = 'Premjesti u...';
+
+$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';
+
 $labels['filename'] = 'Ime datoteke';
 $labels['filesize'] = 'Veličina datoteke';
+
 $labels['addtoaddressbook'] = 'Dodaj u adresar';
+
+// weekdays short
 $labels['sun'] = 'Ned';
 $labels['mon'] = 'Pon';
 $labels['tue'] = 'Uto';
@@ -63,78 +81,88 @@ $labels['wed'] = 'Sri';
 $labels['thu'] = 'Čet';
 $labels['fri'] = 'Pet';
 $labels['sat'] = 'Sub';
-$labels['sunday'] = 'Nedjelja';
-$labels['monday'] = 'Ponedjeljak';
-$labels['tuesday'] = 'Utorak';
+
+// weekdays long
+$labels['sunday']    = 'Nedjelja';
+$labels['monday']    = 'Ponedjeljak';
+$labels['tuesday']   = 'Utorak';
 $labels['wednesday'] = 'Srijeda';
-$labels['thursday'] = 'Četvrtak';
-$labels['friday'] = 'Petak';
-$labels['saturday'] = 'Subota';
-$labels['jan'] = 'Jan';
-$labels['feb'] = 'Feb';
-$labels['mar'] = 'Mar';
-$labels['apr'] = 'Apr';
-$labels['may'] = 'Maj';
-$labels['longmay'] = 'Maj';
-$labels['jun'] = 'Jun';
-$labels['jul'] = 'Jul';
-$labels['aug'] = 'Avg';
-$labels['sep'] = 'Sep';
-$labels['oct'] = 'Okt';
-$labels['nov'] = 'Nov';
-$labels['dec'] = 'Dec';
-$labels['longjan'] = 'Januar';
-$labels['longfeb'] = 'Februar';
-$labels['longmar'] = 'Mart';
-$labels['longapr'] = 'April';
-$labels['longjun'] = 'Juni';
-$labels['longjul'] = 'Juli';
-$labels['longaug'] = 'Avgust';
-$labels['longsep'] = 'Septembar';
-$labels['longoct'] = 'Oktobar';
-$labels['longnov'] = 'Novembar';
-$labels['longdec'] = 'Decembar';
+$labels['thursday']  = 'Četvrtak';
+$labels['friday']    = 'Petak';
+$labels['saturday']  = 'Subota';
+
+// months short
+$labels['jan']	= 'Jan';
+$labels['feb']	= 'Feb';
+$labels['mar']	= 'Mar';
+$labels['apr']	= 'Apr';
+$labels['may']	= 'Maj';
+$labels['jun']	= 'Jun';
+$labels['jul'] 	= 'Jul';
+$labels['aug']	= 'Avg';
+$labels['sep']	= 'Sep';
+$labels['oct']	= 'Okt';
+$labels['nov']	= 'Nov';
+$labels['dec']	= 'Dec';
+
+// months long
+$labels['longjan']	= 'Januar';
+$labels['longfeb']	= 'Februar';
+$labels['longmar']	= 'Mart';
+$labels['longapr']	= 'April';
+$labels['longmay']	= 'Maj';
+$labels['longjun']	= 'Juni';
+$labels['longjul']	= 'Juli';
+$labels['longaug']	= 'Avgust';
+$labels['longsep']	= 'Septembar';
+$labels['longoct']	= 'Oktobar';
+$labels['longnov']	= 'Novembar';
+$labels['longdec']	= 'Decembar';
+
 $labels['today'] = 'Danas';
-$labels['refresh'] = 'Osvježi';
-$labels['checkmail'] = 'Provjeri ima li novih poruka';
-$labels['compose'] = 'Nova poruka';
-$labels['writenewmessage'] = 'Kreiraj novu poruku';
-$labels['reply'] = 'Odgovori';
-$labels['replytomessage'] = 'Odgovori pošiljaocu';
+
+// toolbar buttons
+$labels['refresh']          = 'Osvježi';
+$labels['checkmail']        = 'Provjeri ima li novih poruka';
+$labels['compose']          = 'Nova poruka';
+$labels['writenewmessage']  = 'Kreiraj novu poruku';
+$labels['reply']            = 'Odgovori';
+$labels['replytomessage']   = 'Odgovori pošiljaocu';
 $labels['replytoallmessage'] = 'Odgovori listi osoba ili pošiljaocu i svim primaocima';
-$labels['replyall'] = 'Odgovori svima';
-$labels['replylist'] = 'Odgovori listi';
-$labels['forward'] = 'Proslijedi';
-$labels['forwardinline'] = 'Proslijedi odmah';
+$labels['replyall']         = 'Odgovori svima';
+$labels['replylist']        = 'Odgovori listi';
+$labels['forward']          = 'Proslijedi';
+$labels['forwardinline']    = 'Proslijedi odmah';
 $labels['forwardattachment'] = 'Proslijedi kao prilog';
-$labels['forwardmessage'] = 'Proslijedi poruku';
-$labels['deletemessage'] = 'Obriši poruku';
+$labels['forwardmessage']   = 'Proslijedi poruku';
+$labels['deletemessage']    = 'Obriši poruku';
 $labels['movemessagetotrash'] = 'Prebaci poruku u smeće';
-$labels['printmessage'] = 'Odštampaj poruku';
-$labels['previousmessage'] = 'Prikaži prethodnu poruku';
-$labels['firstmessage'] = 'Prikaži prvu poruku';
-$labels['nextmessage'] = 'Prikaži sljedeću poruku';
-$labels['lastmessage'] = 'Prikaži zadnju poruku';
-$labels['backtolist'] = 'Nazad na listu poruka';
-$labels['viewsource'] = 'Prikaži izvornu poruku';
-$labels['mark'] = 'Označi';
-$labels['markmessages'] = 'Označi poruke';
-$labels['markread'] = 'Kao pročitane';
-$labels['markunread'] = 'Kao nepročitane';
-$labels['markflagged'] = 'Kao važne';
-$labels['markunflagged'] = 'Kao nevažne';
-$labels['moreactions'] = 'Više akcija...';
-$labels['more'] = 'Više';
-$labels['back'] = 'Nazad';
-$labels['options'] = 'Opcije';
+$labels['printmessage']     = 'Odštampaj poruku';
+$labels['previousmessage']  = 'Prikaži prethodnu poruku';
+$labels['firstmessage']     = 'Prikaži prvu poruku';
+$labels['nextmessage']      = 'Prikaži sljedeću poruku';
+$labels['lastmessage']      = 'Prikaži zadnju poruku';
+$labels['backtolist']       = 'Nazad na listu poruka';
+$labels['viewsource']       = 'Prikaži izvornu poruku';
+$labels['mark']             = 'Označi';
+$labels['markmessages']     = 'Označi poruke';
+$labels['markread']         = 'Kao pročitane';
+$labels['markunread']       = 'Kao nepročitane';
+$labels['markflagged']      = 'Kao važne';
+$labels['markunflagged']    = 'Kao nevažne';
+$labels['moreactions']      = 'Više akcija...';
+$labels['more']             = 'Više';
+$labels['back']             = 'Nazad';
+$labels['options']          = 'Opcije';
+
 $labels['select'] = 'Odaberi';
 $labels['all'] = 'Sve';
 $labels['none'] = 'Ništa';
-$labels['nonesort'] = 'Ništa';
 $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';
@@ -145,12 +173,14 @@ $labels['expand-all'] = 'Proširi sve';
 $labels['expand-unread'] = 'Proširi nepročitane';
 $labels['collapse-all'] = 'Zatvori sve';
 $labels['threaded'] = 'Teme';
+
 $labels['autoexpand_threads'] = 'Proširi teme poruka';
 $labels['do_expand'] = 'sve teme';
 $labels['expand_only_unread'] = 'samo sa nepročitanim porukama';
 $labels['fromto'] = 'Od/Za';
 $labels['flag'] = 'Oznaka';
 $labels['attachment'] = 'Prilog';
+$labels['nonesort'] = 'Ništa';
 $labels['sentdate'] = 'Datum slanja';
 $labels['arrival'] = 'Datum primanja';
 $labels['asc'] = 'rastući';
@@ -159,147 +189,176 @@ $labels['listcolumns'] = 'Lista kolona';
 $labels['listsorting'] = 'Sortiranje kolona';
 $labels['listorder'] = 'Raspored sortiranja';
 $labels['listmode'] = 'Način prikaza liste';
+
 $labels['folderactions'] = 'Akcije za foldere...';
 $labels['compact'] = 'Optimiziraj';
 $labels['empty'] = 'Isprazni';
+
 $labels['quota'] = 'Zauzeće diska';
-$labels['unknown'] = 'nepoznato';
-$labels['unlimited'] = 'neograničeno';
-$labels['quicksearch'] = 'Brza pretraga';
-$labels['resetsearch'] = 'Resetuj pretragu';
-$labels['searchmod'] = 'Modifikacija pretrage';
-$labels['msgtext'] = 'Cijela poruka';
+$labels['unknown']  = 'nepoznato';
+$labels['unlimited']  = 'neograničeno';
+
+$labels['quicksearch']  = 'Brza pretraga';
+$labels['resetsearch']  = 'Resetuj pretragu';
+$labels['searchmod']  = 'Modifikacija pretrage';
+$labels['msgtext']  = 'Cijela poruka';
+$labels['body']  = 'Tijelo';
+
 $labels['openinextwin'] = 'Otvori u novom prozoru';
 $labels['emlsave'] = 'Preuzmi (.eml)';
-$labels['editasnew'] = 'Uredi kao novo';
-$labels['send'] = 'Pošalji';
-$labels['sendmessage'] = 'Pošalji poruku';
-$labels['savemessage'] = 'Sačuvaj skicu';
-$labels['addattachment'] = 'Priloži datoteku';
-$labels['charset'] = 'Skup znakova';
-$labels['editortype'] = 'Vrsta urednika';
-$labels['returnreceipt'] = 'Potvrda o prispijeću poruke';
-$labels['dsn'] = 'Obavještenje o statusu dostave';
+$labels['changeformattext'] = 'Prikaži kao obični tekst';
+$labels['changeformathtml'] = 'Prikaži kao HTML';
+
+// message compose
+$labels['editasnew']      = 'Uredi kao novo';
+$labels['send']           = 'Pošalji';
+$labels['sendmessage']    = 'Pošalji poruku';
+$labels['savemessage']    = 'Sačuvaj skicu';
+$labels['addattachment']  = 'Priloži datoteku';
+$labels['charset']        = 'Skup znakova';
+$labels['editortype']     = 'Vrsta urednika';
+$labels['returnreceipt']  = 'Potvrda o prispijeću poruke';
+$labels['dsn']            = 'Obavještenje o statusu dostave';
 $labels['mailreplyintro'] = '$date, $sender je napisao/la:';
 $labels['originalmessage'] = 'Originalna poruka';
-$labels['editidents'] = 'Uredi identitete';
-$labels['spellcheck'] = 'Spelovanje';
+
+$labels['editidents']    = 'Uredi identitete';
+$labels['spellcheck']    = 'Spelovanje';
 $labels['checkspelling'] = 'Provjera pravopisa';
 $labels['resumeediting'] = 'Nastavi uređivanje';
-$labels['revertto'] = 'Vrati na';
+$labels['revertto']      = 'Vrati na';
+
 $labels['attach'] = 'Priloži';
 $labels['attachments'] = 'Prilozi';
 $labels['upload'] = 'Dodaj';
 $labels['uploadprogress'] = '$percent ($current od $total)';
-$labels['close'] = 'Zatvori';
-$labels['messageoptions'] = 'Opcije poruke...';
-$labels['low'] = 'Nizak';
-$labels['lowest'] = 'Najniži';
-$labels['normal'] = 'Normalan';
-$labels['high'] = 'Visok';
+$labels['close']  = 'Zatvori';
+$labels['messageoptions']  = 'Opcije poruke...';
+
+$labels['low']     = 'Nizak';
+$labels['lowest']  = 'Najniži';
+$labels['normal']  = 'Normalan';
+$labels['high']    = 'Visok';
 $labels['highest'] = 'Najveći';
-$labels['nosubject'] = '(bez naslova)';
+
+$labels['nosubject']  = '(bez naslova)';
 $labels['showimages'] = 'Prikaži slike';
 $labels['alwaysshow'] = 'Uvijek prikaži slike od $sender';
-$labels['isdraft'] = 'Ovo je skica.';
-$labels['andnmore'] = 'još $nr...';
+$labels['isdraft']    = 'Ovo je skica.';
+$labels['andnmore']   = 'još $nr...';
 $labels['togglemoreheaders'] = 'Prikaži još zaglavlja poruka';
 $labels['togglefullheaders'] = 'Aktiviranje izvornih zaglavlja poruka';
+
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Obični tekst';
 $labels['savesentmessagein'] = 'Sačuvaj poslane poruke u';
 $labels['dontsave'] = 'ne snimaj';
 $labels['maxuploadsize'] = 'Maksimalna dozvoljena veličina datoteke je $size';
+
 $labels['addcc'] = 'Dodaj Cc';
 $labels['addbcc'] = 'Dodaj Bcc';
 $labels['addreplyto'] = 'Dodaj odgovor na';
 $labels['addfollowupto'] = 'Dodaj praćenje za';
+
+// mdn
 $labels['mdnrequest'] = 'Pošiljaoc ove poruke je tražio da bude obaviješten kada pročitate ovu poruku. Želite li obavijestiti pošiljaoca?';
 $labels['receiptread'] = 'Povratnica (pročitano)';
 $labels['yourmessage'] = 'Ovo je povratnica vaše poruke';
 $labels['receiptnote'] = 'Napomena: Ova povratnica samo potvrđuje da je poruka bila prikazana na računaru primaoca. Nema garancija da je primaoc pročitao ili razumio sadržaj poruke.';
-$labels['name'] = 'Ime za prikaz';
-$labels['firstname'] = 'Ime';
-$labels['surname'] = 'Prezime';
-$labels['middlename'] = 'Srednje ime';
-$labels['nameprefix'] = 'Prefiks';
-$labels['namesuffix'] = 'Sufiks';
-$labels['nickname'] = 'Nadimak';
-$labels['jobtitle'] = 'Titula';
-$labels['department'] = 'Odjel';
-$labels['gender'] = 'Spol';
-$labels['maidenname'] = 'Djevojačko ime';
-$labels['email'] = 'Email';
-$labels['phone'] = 'Telefon';
-$labels['address'] = 'Adresa';
-$labels['street'] = 'Ulica';
-$labels['locality'] = 'Grad';
-$labels['zipcode'] = 'Poštanski broj';
-$labels['region'] = 'Oblast';
-$labels['country'] = 'Zemlja';
-$labels['birthday'] = 'Rođendan';
-$labels['anniversary'] = 'Godišnjica';
-$labels['website'] = 'Web stranica';
+
+// address boook
+$labels['name']         = 'Ime za prikaz';
+$labels['firstname']    = 'Ime';
+$labels['surname']      = 'Prezime';
+$labels['middlename']   = 'Srednje ime';
+$labels['nameprefix']   = 'Prefiks';
+$labels['namesuffix']   = 'Sufiks';
+$labels['nickname']     = 'Nadimak';
+$labels['jobtitle']     = 'Titula';
+$labels['department']   = 'Odjel';
+$labels['gender']       = 'Spol';
+$labels['maidenname']   = 'Djevojačko ime';
+$labels['email']        = 'Email';
+$labels['phone']        = 'Telefon';
+$labels['address']      = 'Adresa';
+$labels['street']       = 'Ulica';
+$labels['locality']     = 'Grad';
+$labels['zipcode']      = 'Poštanski broj';
+$labels['region']       = 'Oblast';
+$labels['country']      = 'Zemlja';
+$labels['birthday']     = 'Rođendan';
+$labels['anniversary']  = 'Godišnjica';
+$labels['website']      = 'Web stranica';
 $labels['instantmessenger'] = 'IM';
 $labels['notes'] = 'Napomene';
-$labels['male'] = 'Muško';
+$labels['male']   = 'Muško';
 $labels['female'] = 'Žensko';
 $labels['manager'] = 'Menadžer';
 $labels['assistant'] = 'Pomoćnik';
-$labels['typeassistant'] = 'Pomoćnik';
 $labels['spouse'] = 'Supružnik';
 $labels['allfields'] = 'Sva polja';
 $labels['search'] = 'Pretraga';
 $labels['advsearch'] = 'Napredna pretraga';
 $labels['advanced'] = 'Napredno';
 $labels['other'] = 'Ostalo';
-$labels['typeother'] = 'Ostalo';
-$labels['typehome'] = 'Kućni broj';
-$labels['typework'] = 'Poslovni broj';
-$labels['typemobile'] = 'Mobilni broj';
-$labels['typemain'] = 'Glavni broj';
-$labels['typehomefax'] = 'Fax kuća';
-$labels['typeworkfax'] = 'Fax posao';
-$labels['typecar'] = 'Automobil';
-$labels['typepager'] = 'Pejdžer';
-$labels['typevideo'] = 'Video';
-$labels['typehomepage'] = 'Početna stranica';
+
+$labels['typehome']   = 'Kućni broj';
+$labels['typework']   = 'Poslovni broj';
+$labels['typeother']  = 'Ostalo';
+$labels['typemobile']  = 'Mobilni broj';
+$labels['typemain']  = 'Glavni broj';
+$labels['typehomefax']  = 'Fax kuća';
+$labels['typeworkfax']  = 'Fax posao';
+$labels['typecar']  = 'Automobil';
+$labels['typepager']  = 'Pejdžer';
+$labels['typevideo']  = 'Video';
+$labels['typeassistant']  = 'Pomoćnik';
+$labels['typehomepage']  = 'Početna stranica';
 $labels['typeblog'] = 'Blog';
 $labels['typeprofile'] = 'Profil';
+
 $labels['addfield'] = 'Dodaj polje...';
 $labels['addcontact'] = 'Dodaj novi kontakt';
 $labels['editcontact'] = 'Uredi kontakt';
 $labels['contacts'] = 'Kontakti';
 $labels['contactproperties'] = 'Svojstva kontakta';
 $labels['personalinfo'] = 'Lični podaci';
-$labels['edit'] = 'Uredi';
+
+$labels['edit']   = 'Uredi';
 $labels['cancel'] = 'Otkaži';
-$labels['save'] = 'Sačuvaj';
+$labels['save']   = 'Sačuvaj';
 $labels['delete'] = 'Obriši';
 $labels['rename'] = 'Preimenuj';
 $labels['addphoto'] = 'Dodaj';
 $labels['replacephoto'] = 'Zamijeni';
 $labels['uploadphoto'] = 'Dodaj fotografiju';
-$labels['newcontact'] = 'Dodaj novi kontakt';
-$labels['deletecontact'] = 'Obriši odabrane kontakte';
-$labels['composeto'] = 'Napiši email za';
+
+$labels['newcontact']     = 'Dodaj novi kontakt';
+$labels['deletecontact']  = 'Obriši odabrane kontakte';
+$labels['composeto']      = 'Napiši email za';
 $labels['contactsfromto'] = 'Kontakti od $from do $to od ukupno $count';
-$labels['print'] = 'Štampaj';
-$labels['export'] = 'Izvoz';
-$labels['exportvcards'] = 'Izvezi kontakte u vCard formatu';
+$labels['print']          = 'Štampaj';
+$labels['export']         = 'Izvoz';
+$labels['exportall']      = 'Izvezi sve';
+$labels['exportsel']      = 'Izvezi označeno';
+$labels['exportvcards']   = 'Izvezi kontakte u vCard formatu';
 $labels['newcontactgroup'] = 'Kreiraj novu grupu kontakata';
-$labels['grouprename'] = 'Preimenuj grupu';
-$labels['groupdelete'] = 'Obriši grupu';
+$labels['grouprename']    = 'Preimenuj grupu';
+$labels['groupdelete']    = 'Obriši grupu';
 $labels['groupremoveselected'] = 'Ukloni odabrane kontakte iz grupe';
-$labels['previouspage'] = 'Prikaži prethodnu stranicu';
-$labels['firstpage'] = 'Prikaži prvu stranicu';
-$labels['nextpage'] = 'Prikaži sljedeću stranicu';
-$labels['lastpage'] = 'Prikaži zadnju stranicu';
+
+$labels['previouspage']   = 'Prikaži prethodnu stranicu';
+$labels['firstpage']      = 'Prikaži prvu stranicu';
+$labels['nextpage']       = 'Prikaži sljedeću stranicu';
+$labels['lastpage']       = 'Prikaži zadnju stranicu';
+
 $labels['group'] = 'Grupa';
 $labels['groups'] = 'Grupe';
 $labels['personaladrbook'] = 'Lične adrese';
+
 $labels['searchsave'] = 'Sačuvaj pretragu';
 $labels['searchdelete'] = 'Obriši pretragu';
+
 $labels['import'] = 'Uvoz';
 $labels['importcontacts'] = 'Uvoz kontakata';
 $labels['importfromfile'] = 'Uvoz iz datoteke:';
@@ -307,35 +366,43 @@ $labels['importtarget'] = 'Dodaj novi kontakt u adresar:';
 $labels['importreplace'] = 'Zamijeni cijeli adresar';
 $labels['importdesc'] = 'Kontakte možete dodati iz postojećeg adresara.<br/>Trenutno podržavamo uvoz adresara u formatima <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> ili CSV (comma-separated).';
 $labels['done'] = 'Završeno';
+
+// settings
 $labels['settingsfor'] = 'Podešavanja za';
 $labels['about'] = 'Informacije';
 $labels['preferences'] = 'Podešavanja';
 $labels['userpreferences'] = 'Korisničke opcije';
 $labels['editpreferences'] = 'Uredi korisničke opcije';
+
 $labels['identities'] = 'Identiteti';
 $labels['manageidentities'] = 'Podesi identitete za ovaj račun';
 $labels['newidentity'] = 'Dodaj identitet';
+
 $labels['newitem'] = 'Nova stavka';
 $labels['edititem'] = 'Uredi stavku';
+
 $labels['preferhtml'] = 'Prikaži HTML';
 $labels['defaultcharset'] = 'Glavni skup znakova';
 $labels['htmlmessage'] = 'HTML poruke';
+$labels['messagepart'] = 'Dio';
+$labels['digitalsig'] = 'Digitalni potpis';
 $labels['dateformat'] = 'Format datuma';
 $labels['timeformat'] = 'Format vremena';
 $labels['prettydate'] = 'Formatirani datum';
-$labels['setdefault'] = 'Postavi kao glavno';
-$labels['autodetect'] = 'Automatski';
-$labels['language'] = 'Jezik';
-$labels['timezone'] = 'Vremenska zona';
-$labels['pagesize'] = 'Redova po stranici';
+$labels['setdefault']  = 'Postavi kao glavno';
+$labels['autodetect']  = 'Automatski';
+$labels['language']  = 'Jezik';
+$labels['timezone']  = 'Vremenska zona';
+$labels['pagesize']  = 'Redova po stranici';
 $labels['signature'] = 'Potpis';
-$labels['dstactive'] = 'Ljetno računanje vremena';
+$labels['dstactive']  = 'Ljetno računanje vremena';
 $labels['showinextwin'] = 'Otvori poruku u novom prozoru';
 $labels['composeextwin'] = 'Napiši u novom prozor';
 $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';
@@ -358,11 +425,11 @@ $labels['showremoteimages'] = 'Prikaži vanjske slike u porukama';
 $labels['fromknownsenders'] = 'od poznatih pošiljatelja';
 $labels['always'] = 'uvijek';
 $labels['showinlineimages'] = 'Prikaži priložene slike ispod poruke';
-$labels['autosavedraft'] = 'Automatski sačuvaj skicu';
-$labels['everynminutes'] = 'svakih $n minuta';
-$labels['refreshinterval'] = 'Osvježi (provjeri ima li novih poruka itd.)';
-$labels['never'] = 'nikad';
-$labels['immediately'] = 'odmah';
+$labels['autosavedraft']  = 'Automatski sačuvaj skicu';
+$labels['everynminutes']  = 'svakih $n minuta';
+$labels['refreshinterval']  = 'Osvježi (provjeri ima li novih poruka itd.)';
+$labels['never']  = 'nikad';
+$labels['immediately']  = 'odmah';
 $labels['messagesdisplaying'] = 'Prikaz poruka';
 $labels['messagescomposition'] = 'Pisanje poruka';
 $labels['mimeparamfolding'] = 'Nazivi priloga';
@@ -389,12 +456,9 @@ $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';
+$labels['previewpanemarkread']  = 'Obilježi prikazane poruke kao pročitane';
+$labels['afternseconds']  = 'nakon $n sekundi';
 $labels['reqmdn'] = 'Uvijek zahtjevaj povratnicu';
 $labels['reqdsn'] = 'Uvijek zahtjevaj obavijest o statusu dostave';
 $labels['replysamefolder'] = 'Sačuvaj odgovore u folder poruke na osnovu koje se piše odgovor';
@@ -411,13 +475,15 @@ $labels['mailtoprotohandler'] = 'Registruj upravljač protokola za mailto: linko
 $labels['forwardmode'] = 'Prosljeđivanje poruka';
 $labels['inline'] = 'u istom redu';
 $labels['asattachment'] = 'kao prilog';
-$labels['folder'] = 'Folder';
-$labels['foldername'] = 'Naziv foldera';
-$labels['subscribed'] = 'Pretplaćen';
+
+$labels['folder']  = 'Folder';
+$labels['folders']  = 'Folderi';
+$labels['foldername']  = 'Naziv foldera';
+$labels['subscribed']  = 'Pretplaćen';
 $labels['messagecount'] = 'Poruke';
-$labels['create'] = 'Kreiraj';
-$labels['createfolder'] = 'Kreiraj novi folder';
-$labels['managefolders'] = 'Upravljanje folderima';
+$labels['create']  = 'Kreiraj';
+$labels['createfolder']  = 'Kreiraj novi folder';
+$labels['managefolders']  = 'Upravljanje folderima';
 $labels['specialfolders'] = 'Specijalni folder';
 $labels['properties'] = 'Svojstva';
 $labels['folderproperties'] = 'Svojstva foldera';
@@ -427,23 +493,29 @@ $labels['info'] = 'Informacije';
 $labels['getfoldersize'] = 'Kliknite da biste dobili informaciju o veličini foldera';
 $labels['changesubscription'] = 'Kliknite da promijenite pretplatu';
 $labels['foldertype'] = 'Vrsta foldera';
-$labels['personalfolder'] = 'Privatni folder';
-$labels['otherfolder'] = 'Folder drugog korisnika';
-$labels['sharedfolder'] = 'Javni folder';
+$labels['personalfolder']  = 'Privatni folder';
+$labels['otherfolder']  = 'Folder drugog korisnika';
+$labels['sharedfolder']  = 'Javni folder';
+
 $labels['sortby'] = 'Sortiraj po';
-$labels['sortasc'] = 'Sortiraj uzlazno';
+$labels['sortasc']  = 'Sortiraj uzlazno';
 $labels['sortdesc'] = 'Sortiraj silazno';
 $labels['undo'] = 'Nazad';
+
 $labels['installedplugins'] = 'Instalirani plugini';
 $labels['plugin'] = 'Plugin';
 $labels['version'] = 'Verzija';
 $labels['source'] = 'Izvorni kod';
 $labels['license'] = 'Licenca';
 $labels['support'] = 'Podrška';
+
+// units
 $labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
 $labels['GB'] = 'GB';
+
+// character sets
 $labels['unicode'] = 'Unikod';
 $labels['english'] = 'engleski';
 $labels['westerneuropean'] = 'Zapadna Evropa';
@@ -463,3 +535,4 @@ $labels['japanese'] = 'japanski';
 $labels['korean'] = 'korejski';
 $labels['chinese'] = 'kineski';
 
+?>
diff --git a/program/localization/bs_BA/messages.inc b/program/localization/bs_BA/messages.inc
index b8dceb9c7..7a1b26168 100644
--- a/program/localization/bs_BA/messages.inc
+++ b/program/localization/bs_BA/messages.inc
@@ -2,20 +2,23 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/bs_BA/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Kenan Dervišević <kenan3008@gmail.com>                      |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['errortitle'] = 'Desila se greška!';
-$messages['loginfailed'] = 'Prijava nije uspjela.';
+$messages['errortitle']  = 'Desila se greška!';
+$messages['loginfailed']  = 'Prijava nije uspjela.';
 $messages['cookiesdisabled'] = 'Vaš preglednik ne prihvata kolačiće.';
 $messages['sessionerror'] = 'Vaša sesija je neispravna ili je istekla.';
 $messages['storageerror'] = 'Neuspješna konekcija na IMAP server';
@@ -25,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.';
@@ -57,11 +62,11 @@ $messages['errormoving'] = 'Nije moguće premjestiti poruke.';
 $messages['errorcopying'] = 'Nije moguće kopirati poruke.';
 $messages['errordeleting'] = 'Nije moguće obrisati poruke.';
 $messages['errormarking'] = 'Nije moguće označiti poruke.';
-$messages['deletecontactconfirm'] = 'Da li zaista želite obrisati označene kontakte?';
-$messages['deletegroupconfirm'] = 'Da li zaista želite obrisati označenu grupu?';
+$messages['deletecontactconfirm']  = 'Da li zaista želite obrisati označene kontakte?';
+$messages['deletegroupconfirm']  = 'Da li zaista želite obrisati označenu grupu?';
 $messages['deletemessagesconfirm'] = 'Da li zaista želite obrisati označene poruke?';
-$messages['deletefolderconfirm'] = 'Da li zaista želite obrisati ovaj folder?';
-$messages['purgefolderconfirm'] = 'Da li zaista želite obrisati sve poruke u ovom folderu?';
+$messages['deletefolderconfirm']  = 'Da li zaista želite obrisati ovaj folder?';
+$messages['purgefolderconfirm']  = 'Da li zaista želite obrisati sve poruke u ovom folderu?';
 $messages['contactdeleting'] = 'Brišem kontakte...';
 $messages['groupdeleting'] = 'Brišem grupu...';
 $messages['folderdeleting'] = 'Brišem folder...';
@@ -70,11 +75,11 @@ $messages['foldersubscribing'] = 'Pretplaćujem se na folder...';
 $messages['folderunsubscribing'] = 'Uklanjam pretplatu za folder...';
 $messages['formincomplete'] = 'Obrazac nije popunjen u cjelosti.';
 $messages['noemailwarning'] = 'Molimo vas da upišete ispravnu email adresu.';
-$messages['nonamewarning'] = 'Molimo vas da upišete ime.';
+$messages['nonamewarning']  = 'Molimo vas da upišete ime.';
 $messages['nopagesizewarning'] = 'Molimo vas da upišete veličinu stranice.';
 $messages['nosenderwarning'] = 'Molimo vas da upišete email adresu pošiljaoca';
 $messages['norecipientwarning'] = 'Molimo vas da upišete barem jednog primaoca.';
-$messages['nosubjectwarning'] = 'Polje \'Naslov\' je prazno. Želite li unijeti naslov?';
+$messages['nosubjectwarning']  = 'Polje \'Naslov\' je prazno. Želite li unijeti naslov?';
 $messages['nobodywarning'] = 'Želite li poslati poruku bez teksta?';
 $messages['notsentwarning'] = 'Poruka nije poslana. Želite li odbaciti ovu poruku?';
 $messages['noldapserver'] = 'Molimo vas da odaberete LDAP server za pretragu.';
@@ -163,3 +168,4 @@ $messages['messagetoobig'] = 'Dio poruke je prevelik za procesiranje.';
 $messages['attachmentvalidationerror'] = 'UPOZORENJE! Ovaj prilog je sumnjiv zbog toga što se njegov tip ne poklapa s tipom navedenim u poruci. Ako nemate povjerenja u pošiljaova, ne biste trebali da otvarate ovaj prilog u vašem browseru jer bi on mogao da sadrži zlonamjerni sadržaj.<br/><br/><em>Očekivano: $expected; pronađeno: $detected</em>';
 $messages['noscriptwarning'] = 'Upozorenje! Ovom webmail servisu je potreban Javascript! Da biste ga mogli koristiti, prvo je potrebno da omogućite Javascript u postavkama vašeg browsera.';
 
+?>
diff --git a/program/localization/ca_ES/labels.inc b/program/localization/ca_ES/labels.inc
index 8ba29c5ba..3be753b68 100644
--- a/program/localization/ca_ES/labels.inc
+++ b/program/localization/ca_ES/labels.inc
@@ -2,60 +2,78 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ca_ES/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Pau Argelaguet <pau@paelladebits.cat>                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = 'Benvingut a $product';
-$labels['username'] = 'Nom d\'usuari';
-$labels['password'] = 'Contrasenya';
-$labels['server'] = 'Servidor';
-$labels['login'] = 'Entra';
-$labels['logout'] = 'Tanca sessió';
-$labels['mail'] = 'Correu';
+
+// login page
+$labels['welcome']   = 'Benvingut a $product';
+$labels['username']  = 'Nom d\'usuari';
+$labels['password']  = 'Contrasenya';
+$labels['server']    = 'Servidor';
+$labels['login']     = 'Entra';
+
+// taskbar
+$labels['logout']   = 'Tanca sessió';
+$labels['mail']     = 'Correu';
 $labels['settings'] = 'Configuració';
 $labels['addressbook'] = 'Contactes';
-$labels['inbox'] = 'Safata d\'entrada';
+
+// mailbox names
+$labels['inbox']  = 'Safata d\'entrada';
 $labels['drafts'] = 'Esborranys';
-$labels['sent'] = 'Enviats';
-$labels['trash'] = 'Paperera';
-$labels['junk'] = 'Correu brossa';
+$labels['sent']   = 'Enviats';
+$labels['trash']  = 'Paperera';
+$labels['junk']   = 'Correu brossa';
+
+// message listing
 $labels['subject'] = 'Assumpte';
-$labels['from'] = 'Remitent';
-$labels['to'] = 'Destinatari';
-$labels['cc'] = 'Cc';
-$labels['bcc'] = 'Bcc';
+$labels['from']    = 'Remitent';
+$labels['sender']  = 'Remitent';
+$labels['to']      = 'Destinatari';
+$labels['cc']      = 'Cc';
+$labels['bcc']     = 'Bcc';
 $labels['replyto'] = 'Respon a';
 $labels['followupto'] = 'Seguiment-a';
-$labels['date'] = 'Data';
-$labels['size'] = 'Mida';
+$labels['date']    = 'Data';
+$labels['size']    = 'Mida';
 $labels['priority'] = 'Prioritat';
 $labels['organization'] = 'Organització';
 $labels['readstatus'] = 'Estat de lectura';
 $labels['listoptions'] = 'Llista d\'opcions...';
+
 $labels['mailboxlist'] = 'Carpetes';
-$labels['folders'] = 'Carpetes';
 $labels['messagesfromto'] = 'Missatges des de $from a $to de $count';
 $labels['threadsfromto'] = 'Fils $from a $to de $count';
 $labels['messagenrof'] = 'Missatge $nr de $count';
 $labels['fromtoshort'] = '$from - $to de $count';
-$labels['copy'] = 'Copia';
-$labels['move'] = 'Mou';
-$labels['moveto'] = 'Mou a...';
+
+$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';
 $labels['filesize'] = 'Mida del fitxer';
+
 $labels['addtoaddressbook'] = 'Afegeix a contactes';
+
+// weekdays short
 $labels['sun'] = 'Diu';
 $labels['mon'] = 'Dll';
 $labels['tue'] = 'Dmt';
@@ -63,78 +81,88 @@ $labels['wed'] = 'Dmc';
 $labels['thu'] = 'Dij';
 $labels['fri'] = 'Div';
 $labels['sat'] = 'Dis';
-$labels['sunday'] = 'Diumenge';
-$labels['monday'] = 'Dilluns';
-$labels['tuesday'] = 'Dimarts';
+
+// weekdays long
+$labels['sunday']    = 'Diumenge';
+$labels['monday']    = 'Dilluns';
+$labels['tuesday']   = 'Dimarts';
 $labels['wednesday'] = 'Dimecres';
-$labels['thursday'] = 'Dijous';
-$labels['friday'] = 'Divendres';
-$labels['saturday'] = 'Dissabte';
-$labels['jan'] = 'gen';
-$labels['feb'] = 'feb';
-$labels['mar'] = 'mar';
-$labels['apr'] = 'abr';
-$labels['may'] = 'mai';
-$labels['longmay'] = 'mai';
-$labels['jun'] = 'jun';
-$labels['jul'] = 'jul';
-$labels['aug'] = 'ago';
-$labels['sep'] = 'set';
-$labels['oct'] = 'oct';
-$labels['nov'] = 'nov';
-$labels['dec'] = 'des';
-$labels['longjan'] = 'gener';
-$labels['longfeb'] = 'febrer';
-$labels['longmar'] = 'març';
-$labels['longapr'] = 'abril';
-$labels['longjun'] = 'juny';
-$labels['longjul'] = 'juliol';
-$labels['longaug'] = 'agost';
-$labels['longsep'] = 'setembre';
-$labels['longoct'] = 'octubre';
-$labels['longnov'] = 'novembre';
-$labels['longdec'] = 'desembre';
+$labels['thursday']  = 'Dijous';
+$labels['friday']    = 'Divendres';
+$labels['saturday']  = 'Dissabte';
+
+// months short
+$labels['jan']	= 'gen';
+$labels['feb']	= 'feb';
+$labels['mar']	= 'mar';
+$labels['apr']	= 'abr';
+$labels['may']	= 'mai';
+$labels['jun']	= 'jun';
+$labels['jul'] 	= 'jul';
+$labels['aug']	= 'ago';
+$labels['sep']	= 'set';
+$labels['oct']	= 'oct';
+$labels['nov']	= 'nov';
+$labels['dec']	= 'des';
+
+// months long
+$labels['longjan']	= 'gener';
+$labels['longfeb']	= 'febrer';
+$labels['longmar']	= 'març';
+$labels['longapr']	= 'abril';
+$labels['longmay']	= 'mai';
+$labels['longjun']	= 'juny';
+$labels['longjul']	= 'juliol';
+$labels['longaug']	= 'agost';
+$labels['longsep']	= 'setembre';
+$labels['longoct']	= 'octubre';
+$labels['longnov']	= 'novembre';
+$labels['longdec']	= 'desembre';
+
 $labels['today'] = 'Avui';
-$labels['refresh'] = 'Actualitza';
-$labels['checkmail'] = 'Recupera missatges nous';
-$labels['compose'] = 'Escriu un missatge';
-$labels['writenewmessage'] = 'Crea un nou missatge';
-$labels['reply'] = 'Respon';
-$labels['replytomessage'] = 'Respon al remitent';
+
+// toolbar buttons
+$labels['refresh']          = 'Actualitza';
+$labels['checkmail']        = 'Recupera missatges nous';
+$labels['compose']          = 'Escriu un missatge';
+$labels['writenewmessage']  = 'Crea un nou missatge';
+$labels['reply']            = 'Respon';
+$labels['replytomessage']   = 'Respon al remitent';
 $labels['replytoallmessage'] = 'Respon al remitent i a tots els destinataris';
-$labels['replyall'] = 'Respon a tots';
-$labels['replylist'] = 'Llista de resposta';
-$labels['forward'] = 'Reenvia';
-$labels['forwardinline'] = 'Reenvia com en línia';
+$labels['replyall']         = 'Respon a tots';
+$labels['replylist']        = 'Llista de resposta';
+$labels['forward']          = 'Reenvia';
+$labels['forwardinline']    = 'Reenvia com en línia';
 $labels['forwardattachment'] = 'Reenvia com a adjunt';
-$labels['forwardmessage'] = 'Reenvia el missatge';
-$labels['deletemessage'] = 'Suprimeix el missatge';
+$labels['forwardmessage']   = 'Reenvia el missatge';
+$labels['deletemessage']    = 'Suprimeix el missatge';
 $labels['movemessagetotrash'] = 'Mou el missatge a la paperera';
-$labels['printmessage'] = 'Imprimeix aquest missatge';
-$labels['previousmessage'] = 'Mostra el missatge anterior';
-$labels['firstmessage'] = 'Mostra el primer missatge';
-$labels['nextmessage'] = 'Mostra el missatge següent';
-$labels['lastmessage'] = 'Mostra l\'últim missatge';
-$labels['backtolist'] = 'Torna a la llista de missatges';
-$labels['viewsource'] = 'Mostra el codi font';
-$labels['mark'] = 'Marca';
-$labels['markmessages'] = 'Marca missatges';
-$labels['markread'] = 'Com a llegits';
-$labels['markunread'] = 'Com a no llegits';
-$labels['markflagged'] = 'Com a marcat';
-$labels['markunflagged'] = 'Com a no marcat';
-$labels['moreactions'] = 'Més accions...';
-$labels['more'] = 'Més';
-$labels['back'] = 'Torna';
-$labels['options'] = 'Opcions';
+$labels['printmessage']     = 'Imprimeix aquest missatge';
+$labels['previousmessage']  = 'Mostra el missatge anterior';
+$labels['firstmessage']     = 'Mostra el primer missatge';
+$labels['nextmessage']      = 'Mostra el missatge següent';
+$labels['lastmessage']      = 'Mostra l\'últim missatge';
+$labels['backtolist']       = 'Torna a la llista de missatges';
+$labels['viewsource']       = 'Mostra el codi font';
+$labels['mark']             = 'Marca';
+$labels['markmessages']     = 'Marca missatges';
+$labels['markread']         = 'Com a llegits';
+$labels['markunread']       = 'Com a no llegits';
+$labels['markflagged']      = 'Com a marcat';
+$labels['markunflagged']    = 'Com a no marcat';
+$labels['moreactions']      = 'Més accions...';
+$labels['more']             = 'Més';
+$labels['back']             = 'Torna';
+$labels['options']          = 'Opcions';
+
 $labels['select'] = 'Selecciona';
 $labels['all'] = 'Tots';
 $labels['none'] = 'Cap';
-$labels['nonesort'] = 'Cap';
 $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';
@@ -145,12 +173,14 @@ $labels['expand-all'] = 'Expandeix tots';
 $labels['expand-unread'] = 'Expandeix No llegits';
 $labels['collapse-all'] = 'Redueix tots';
 $labels['threaded'] = 'Encadenat';
+
 $labels['autoexpand_threads'] = 'Expandeix els missatges encadenats';
 $labels['do_expand'] = 'tots els fils de discusió';
 $labels['expand_only_unread'] = 'només amb missatges no llegits';
 $labels['fromto'] = 'Remitent/Destinatari';
 $labels['flag'] = 'Marca';
 $labels['attachment'] = 'Adjunció';
+$labels['nonesort'] = 'Cap';
 $labels['sentdate'] = 'Data d\'enviament';
 $labels['arrival'] = 'Data d\'arribada';
 $labels['asc'] = 'ascendent';
@@ -159,180 +189,220 @@ $labels['listcolumns'] = 'Llista les columnes';
 $labels['listsorting'] = 'Columna d\'ordenació';
 $labels['listorder'] = 'Ordre d\'ordenació';
 $labels['listmode'] = 'Mode de vista de llista';
+
 $labels['folderactions'] = 'Accions de carpeta';
 $labels['compact'] = 'Compacta';
 $labels['empty'] = 'Buida';
+
 $labels['quota'] = 'Ús del disc';
-$labels['unknown'] = 'desconegut';
-$labels['unlimited'] = 'il·limitat';
-$labels['quicksearch'] = 'Cerca ràpida';
-$labels['resetsearch'] = 'Neteja cerca';
-$labels['searchmod'] = 'Cerca modificadors';
-$labels['msgtext'] = 'Missatge sencer';
+$labels['unknown']  = 'desconegut';
+$labels['unlimited']  = 'il·limitat';
+
+$labels['quicksearch']  = 'Cerca ràpida';
+$labels['resetsearch']  = 'Neteja cerca';
+$labels['searchmod']  = 'Cerca modificadors';
+$labels['msgtext']  = 'Missatge sencer';
+$labels['body']  = 'Cos';
+
 $labels['openinextwin'] = 'Obre a una nova finestra';
 $labels['emlsave'] = 'Descarrega (.eml)';
-$labels['editasnew'] = 'Edita com a nou';
-$labels['send'] = 'Enviar';
-$labels['sendmessage'] = 'Envia el missatge';
-$labels['savemessage'] = 'Desa aquest esborrany';
-$labels['addattachment'] = 'Adjunta un fitxer';
-$labels['charset'] = 'Codificació de caràcters';
-$labels['editortype'] = 'Tipus d\'editor';
-$labels['returnreceipt'] = 'Confirmació de recepció';
-$labels['dsn'] = 'Notificació d\'estat de lliurament';
+$labels['changeformattext'] = 'Mostra en format de text net';
+$labels['changeformathtml'] = 'Mostra en format HTML';
+
+// message compose
+$labels['editasnew']      = 'Edita com a nou';
+$labels['send']           = 'Enviar';
+$labels['sendmessage']    = 'Envia el missatge';
+$labels['savemessage']    = 'Desa aquest esborrany';
+$labels['addattachment']  = 'Adjunta un fitxer';
+$labels['charset']        = 'Codificació de caràcters';
+$labels['editortype']     = 'Tipus d\'editor';
+$labels['returnreceipt']  = 'Confirmació de recepció';
+$labels['dsn']            = 'Notificació d\'estat de lliurament';
 $labels['mailreplyintro'] = 'A $date, $sender escrigué:';
 $labels['originalmessage'] = 'Missatge Original';
-$labels['editidents'] = 'Edita identitats';
-$labels['spellcheck'] = 'Ortografia';
+
+$labels['editidents']    = 'Edita identitats';
+$labels['spellcheck']    = 'Ortografia';
 $labels['checkspelling'] = 'Comprova l\'ortografia';
 $labels['resumeediting'] = 'Reprèn l\'edició';
-$labels['revertto'] = 'Torna a';
+$labels['revertto']      = 'Torna a';
+
 $labels['attach'] = 'Adjunta';
 $labels['attachments'] = 'Adjuncions';
 $labels['upload'] = 'Afegeix';
 $labels['uploadprogress'] = '$percent ($current de $total)';
-$labels['close'] = 'Tanca';
-$labels['messageoptions'] = 'Opcions de missatge...';
-$labels['low'] = 'Baixa';
-$labels['lowest'] = 'La més baixa';
-$labels['normal'] = 'Normal';
-$labels['high'] = 'Alta';
+$labels['close']  = 'Tanca';
+$labels['messageoptions']  = 'Opcions de missatge...';
+
+$labels['low']     = 'Baixa';
+$labels['lowest']  = 'La més baixa';
+$labels['normal']  = 'Normal';
+$labels['high']    = 'Alta';
 $labels['highest'] = 'La més alta';
-$labels['nosubject'] = '(sense assumpte)';
+
+$labels['nosubject']  = '(sense assumpte)';
 $labels['showimages'] = 'Mostra les imatges';
 $labels['alwaysshow'] = 'Mostra sempre les imatges de $sender';
-$labels['isdraft'] = 'Aquest és un missatge esborrany.';
-$labels['andnmore'] = '$nr més...';
+$labels['isdraft']    = 'Aquest és un missatge esborrany.';
+$labels['andnmore']   = '$nr més...';
 $labels['togglemoreheaders'] = 'Mostra més capçaleres del missatge';
+$labels['togglefullheaders'] = 'Conmuta les capçaleres de text cru';
+
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Text net';
 $labels['savesentmessagein'] = 'Desa el missatge enviat a';
 $labels['dontsave'] = 'no ho desis';
 $labels['maxuploadsize'] = 'El mida màxima del fitxer és $size';
+
 $labels['addcc'] = 'Afegeix Cc';
 $labels['addbcc'] = 'Afegeix Bcc';
 $labels['addreplyto'] = 'Afegeix Respon-A';
 $labels['addfollowupto'] = 'Afegir Seguiment-A';
+
+// mdn
 $labels['mdnrequest'] = 'El remitent d\'aquest missatge ha demanat ser notificat quan llegiu aquest missatge. Voleu notificar al remitent?';
 $labels['receiptread'] = 'Confirmació de recepció';
 $labels['yourmessage'] = 'Això és una confirmació de recepció per al vostre missatge';
 $labels['receiptnote'] = 'Nota: Aquesta confirmació només indica que el missatge ha estat mostrat a l\'ordinador del destinatari. No hi ha garantia que el destinatari hagi llegit o entès el contingut del missatge.';
-$labels['name'] = 'Nom a mostrar';
-$labels['firstname'] = 'Nom';
-$labels['surname'] = 'Cognom';
-$labels['middlename'] = 'Segon Nom';
-$labels['nameprefix'] = 'Prefix';
-$labels['namesuffix'] = 'Sufix';
-$labels['nickname'] = 'Àlies';
-$labels['jobtitle'] = 'Càrrec';
-$labels['department'] = 'Departament';
-$labels['gender'] = 'Sexe';
-$labels['maidenname'] = 'Cognom de Solter/a';
-$labels['email'] = 'Correu electrònic';
-$labels['phone'] = 'Telèfon';
-$labels['address'] = 'Adreça';
-$labels['street'] = 'Carrer';
-$labels['locality'] = 'Ciutat';
-$labels['zipcode'] = 'Codi postal';
-$labels['region'] = 'Estat/Província';
-$labels['country'] = 'País';
-$labels['birthday'] = 'Data de naixement';
-$labels['anniversary'] = 'Aniversari';
-$labels['website'] = 'Pàgina web';
+
+// address boook
+$labels['name']         = 'Nom a mostrar';
+$labels['firstname']    = 'Nom';
+$labels['surname']      = 'Cognom';
+$labels['middlename']   = 'Segon Nom';
+$labels['nameprefix']   = 'Prefix';
+$labels['namesuffix']   = 'Sufix';
+$labels['nickname']     = 'Àlies';
+$labels['jobtitle']     = 'Càrrec';
+$labels['department']   = 'Departament';
+$labels['gender']       = 'Sexe';
+$labels['maidenname']   = 'Cognom de Solter/a';
+$labels['email']        = 'Correu electrònic';
+$labels['phone']        = 'Telèfon';
+$labels['address']      = 'Adreça';
+$labels['street']       = 'Carrer';
+$labels['locality']     = 'Ciutat';
+$labels['zipcode']      = 'Codi postal';
+$labels['region']       = 'Estat/Província';
+$labels['country']      = 'País';
+$labels['birthday']     = 'Data de naixement';
+$labels['anniversary']  = 'Aniversari';
+$labels['website']      = 'Pàgina web';
 $labels['instantmessenger'] = 'IM';
 $labels['notes'] = 'Notes';
-$labels['male'] = 'home';
+$labels['male']   = 'home';
 $labels['female'] = 'dona';
 $labels['manager'] = 'Gerent';
 $labels['assistant'] = 'Assistent';
-$labels['typeassistant'] = 'Assistent';
 $labels['spouse'] = 'Cònjuge';
 $labels['allfields'] = 'Tots els camps';
 $labels['search'] = 'Cerca';
 $labels['advsearch'] = 'Cerca Avançada';
 $labels['advanced'] = 'Paràmetres avançats';
 $labels['other'] = 'Un altre';
-$labels['typeother'] = 'Un altre';
-$labels['typehome'] = 'Casa';
-$labels['typework'] = 'Feina';
-$labels['typemobile'] = 'Mòbil';
-$labels['typemain'] = 'Principal';
-$labels['typehomefax'] = 'Fax particular';
-$labels['typeworkfax'] = 'Fax de la feina';
-$labels['typecar'] = 'Cotxe';
-$labels['typepager'] = 'Cercapersones';
-$labels['typevideo'] = 'Vídeo';
-$labels['typehomepage'] = 'Pàgina Inicial';
+
+$labels['typehome']   = 'Casa';
+$labels['typework']   = 'Feina';
+$labels['typeother']  = 'Un altre';
+$labels['typemobile']  = 'Mòbil';
+$labels['typemain']  = 'Principal';
+$labels['typehomefax']  = 'Fax particular';
+$labels['typeworkfax']  = 'Fax de la feina';
+$labels['typecar']  = 'Cotxe';
+$labels['typepager']  = 'Cercapersones';
+$labels['typevideo']  = 'Vídeo';
+$labels['typeassistant']  = 'Assistent';
+$labels['typehomepage']  = 'Pàgina Inicial';
 $labels['typeblog'] = 'Bloc';
 $labels['typeprofile'] = 'Perfil';
+
 $labels['addfield'] = 'Afegeix camp...';
 $labels['addcontact'] = 'Afegeix un nou contacte';
 $labels['editcontact'] = 'Edita el contacte';
 $labels['contacts'] = 'Contactes';
 $labels['contactproperties'] = 'Propietats del contacte';
 $labels['personalinfo'] = 'Informació personal';
-$labels['edit'] = 'Edita';
+
+$labels['edit']   = 'Edita';
 $labels['cancel'] = 'Cancel·la';
-$labels['save'] = 'Desa';
+$labels['save']   = 'Desa';
 $labels['delete'] = 'Suprimeix';
 $labels['rename'] = 'Reanomena';
 $labels['addphoto'] = 'Afegeix';
 $labels['replacephoto'] = 'Reemplaça';
 $labels['uploadphoto'] = 'Puja una fotografia';
-$labels['newcontact'] = 'Crea un nou contacte';
-$labels['deletecontact'] = 'Suprimeix els contactes seleccionats';
-$labels['composeto'] = 'Redacta correu per a';
+
+$labels['newcontact']     = 'Crea un nou contacte';
+$labels['deletecontact']  = 'Suprimeix els contactes seleccionats';
+$labels['composeto']      = 'Redacta correu per a';
 $labels['contactsfromto'] = 'Contactes $from a $to de $count';
-$labels['print'] = 'Imprimeix';
-$labels['export'] = 'Exporta';
-$labels['exportvcards'] = 'Exporta contactes en format vCard';
+$labels['print']          = 'Imprimeix';
+$labels['export']         = 'Exporta';
+$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';
-$labels['groupdelete'] = 'Suprimeix el grup';
+$labels['grouprename']    = 'Reanomena el grup';
+$labels['groupdelete']    = 'Suprimeix el grup';
 $labels['groupremoveselected'] = 'Suprimeix els contactes seleccionats del grup';
-$labels['previouspage'] = 'Mostra la pàgina anterior';
-$labels['firstpage'] = 'Mostra la primera pàgina';
-$labels['nextpage'] = 'Mostra la pàgina següent';
-$labels['lastpage'] = 'Mostra la darrera pàgina';
+
+$labels['previouspage']   = 'Mostra la pàgina anterior';
+$labels['firstpage']      = 'Mostra la primera pàgina';
+$labels['nextpage']       = 'Mostra la pàgina següent';
+$labels['lastpage']       = 'Mostra la darrera pàgina';
+
 $labels['group'] = 'Grup';
 $labels['groups'] = 'Grups';
 $labels['personaladrbook'] = 'Llibreta d\'adreces';
+
 $labels['searchsave'] = 'Desa la cerca';
 $labels['searchdelete'] = 'Suprimeix la cerca';
+
 $labels['import'] = 'Importa';
 $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'] = '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
 $labels['settingsfor'] = 'Configuració per a';
 $labels['about'] = 'Quant a';
 $labels['preferences'] = 'Preferències';
 $labels['userpreferences'] = 'Preferències de l\'usuari';
 $labels['editpreferences'] = 'Edita les preferències de l\'usuari';
+
 $labels['identities'] = 'Identitats';
 $labels['manageidentities'] = 'Gestiona les identitats per a aquest compte';
 $labels['newidentity'] = 'Nova identitat';
+
 $labels['newitem'] = 'Nou element';
 $labels['edititem'] = 'Edita l\'element';
+
 $labels['preferhtml'] = 'Mostra HTML';
 $labels['defaultcharset'] = 'Joc de caràcters per defecte';
 $labels['htmlmessage'] = 'Missatge HTML';
+$labels['messagepart'] = 'Part';
+$labels['digitalsig'] = 'Signatura digital';
 $labels['dateformat'] = 'Format de la data';
 $labels['timeformat'] = 'Format horari';
 $labels['prettydate'] = 'Dates curtes';
-$labels['setdefault'] = 'Posa-ho per defecte';
-$labels['autodetect'] = 'Auto';
-$labels['language'] = 'Idioma';
-$labels['timezone'] = 'Fus horari';
-$labels['pagesize'] = 'Files per pàgina';
+$labels['setdefault']  = 'Posa-ho per defecte';
+$labels['autodetect']  = 'Auto';
+$labels['language']  = 'Idioma';
+$labels['timezone']  = 'Fus horari';
+$labels['pagesize']  = 'Files per pàgina';
 $labels['signature'] = 'Signatura';
-$labels['dstactive'] = 'Horari d\'estiu';
+$labels['dstactive']  = 'Horari d\'estiu';
 $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'] = '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ó';
@@ -355,11 +425,11 @@ $labels['showremoteimages'] = 'Mostra les imatges remotes del missatge';
 $labels['fromknownsenders'] = 'de remitent conegut';
 $labels['always'] = 'sempre';
 $labels['showinlineimages'] = 'Mostra les imatges adjuntes sota el missatge';
-$labels['autosavedraft'] = 'Desa l\'esborrany automàticament';
-$labels['everynminutes'] = 'cada $n minut(s)';
-$labels['refreshinterval'] = 'Resfrescar (comprovar nous missatges, etc.)';
-$labels['never'] = 'mai';
-$labels['immediately'] = 'immediatament';
+$labels['autosavedraft']  = 'Desa l\'esborrany automàticament';
+$labels['everynminutes']  = 'cada $n minut(s)';
+$labels['refreshinterval']  = 'Resfrescar (comprovar nous missatges, etc.)';
+$labels['never']  = 'mai';
+$labels['immediately']  = 'immediatament';
 $labels['messagesdisplaying'] = 'Vista de missatges';
 $labels['messagescomposition'] = 'Composició de missatges';
 $labels['mimeparamfolding'] = 'Noms dels adjunts';
@@ -386,12 +456,9 @@ $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';
+$labels['previewpanemarkread']  = 'Marca els missatges previsualitzats com a llegits';
+$labels['afternseconds']  = 'després de $n segons';
 $labels['reqmdn'] = 'Demana sempre la confirmació de recepció';
 $labels['reqdsn'] = 'Demana sempre una notificació d\'estat de lliurament';
 $labels['replysamefolder'] = 'Posa les respostes a la carpeta del missatge que es respon';
@@ -405,15 +472,18 @@ $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'] = 'Reenviament de missatges';
 $labels['inline'] = 'en línia';
 $labels['asattachment'] = 'com adjunt';
-$labels['folder'] = 'Carpeta';
-$labels['foldername'] = 'Nom de la carpeta';
-$labels['subscribed'] = 'Subscrit';
+
+$labels['folder']  = 'Carpeta';
+$labels['folders']  = 'Carpetes';
+$labels['foldername']  = 'Nom de la carpeta';
+$labels['subscribed']  = 'Subscrit';
 $labels['messagecount'] = 'Missatges';
-$labels['create'] = 'Crea';
-$labels['createfolder'] = 'Crea una carpeta nova';
-$labels['managefolders'] = 'Gestiona carpetes';
+$labels['create']  = 'Crea';
+$labels['createfolder']  = 'Crea una carpeta nova';
+$labels['managefolders']  = 'Gestiona carpetes';
 $labels['specialfolders'] = 'Carpetes especials';
 $labels['properties'] = 'Propietats';
 $labels['folderproperties'] = 'Propietats de la carpeta';
@@ -423,23 +493,29 @@ $labels['info'] = 'Informació';
 $labels['getfoldersize'] = 'Feu clic per veure la mida de la carpeta';
 $labels['changesubscription'] = 'Feu clic per canviar la subscripció';
 $labels['foldertype'] = 'Tipus de Carpeta';
-$labels['personalfolder'] = 'Carpeta privada';
-$labels['otherfolder'] = 'Carpeta d\'un altre usuari';
-$labels['sharedfolder'] = 'Carpeta pública';
+$labels['personalfolder']  = 'Carpeta privada';
+$labels['otherfolder']  = 'Carpeta d\'un altre usuari';
+$labels['sharedfolder']  = 'Carpeta pública';
+
 $labels['sortby'] = 'Ordena per';
-$labels['sortasc'] = 'Ordena ascendentment';
+$labels['sortasc']  = 'Ordena ascendentment';
 $labels['sortdesc'] = 'Ordena descendentment';
 $labels['undo'] = 'Desfés';
+
 $labels['installedplugins'] = 'Connectors Instal·lats';
 $labels['plugin'] = 'Complement';
 $labels['version'] = 'Versió';
 $labels['source'] = 'Font';
 $labels['license'] = 'Llicència';
 $labels['support'] = 'Obtingueu ajuda';
+
+// units
 $labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
 $labels['GB'] = 'GB';
+
+// character sets
 $labels['unicode'] = 'Unicode';
 $labels['english'] = 'Anglès';
 $labels['westerneuropean'] = 'Europeu occidental';
@@ -459,3 +535,4 @@ $labels['japanese'] = 'Japonès';
 $labels['korean'] = 'Coreà';
 $labels['chinese'] = 'Xinès';
 
+?>
diff --git a/program/localization/ca_ES/messages.inc b/program/localization/ca_ES/messages.inc
index b4a5741b1..70c3fbd0c 100644
--- a/program/localization/ca_ES/messages.inc
+++ b/program/localization/ca_ES/messages.inc
@@ -2,38 +2,43 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ca_ES/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Pau Argelaguet <pau@paelladebits.cat>                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $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['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 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…';
@@ -49,32 +54,32 @@ $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['deletefolderconfirm'] = 'Esteu segurs de voler suprimir aquesta carpeta?';
-$messages['purgefolderconfirm'] = 'Esteu segurs de voler suprimir tots els missatges d\'aquesta carpeta?';
+$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['nonamewarning']  = 'Si us plau, introduïu un nom.';
 $messages['nopagesizewarning'] = 'Si us plau, introduïu una mida de pàgina.';
 $messages['nosenderwarning'] = 'Si us plau, entreu l\'adreça de correu del remitent.';
 $messages['norecipientwarning'] = 'Si us plau, introduïu com a mínim un destinatari.';
-$messages['nosubjectwarning'] = 'El camp "Assumpte" és buit. Voleu introduir-ne un ara?';
+$messages['nosubjectwarning']  = 'El camp "Assumpte" és buit. Voleu introduir-ne un ara?';
 $messages['nobodywarning'] = 'Voleu enviar aquest missatge sense text?';
 $messages['notsentwarning'] = 'El missatge no s\'ha enviat. Voleu descartar el vostre missatge?';
 $messages['noldapserver'] = 'Si us plau, seleccioneu un servidor LDAP per cercar.';
@@ -88,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.';
@@ -100,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?';
@@ -129,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.';
@@ -146,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.';
@@ -157,9 +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 a30867a9b..8fb7ffade 100644
--- a/program/localization/cs_CZ/labels.inc
+++ b/program/localization/cs_CZ/labels.inc
@@ -2,58 +2,78 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/cs_CZ/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Jan Žárský <jan.zarsky@gmail.com>                          |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = 'Vítejte v $product';
-$labels['username'] = 'Uživatel';
-$labels['password'] = 'Heslo';
-$labels['server'] = 'Server';
-$labels['login'] = 'Přihlásit';
-$labels['logout'] = 'Odhlásit';
-$labels['mail'] = 'E-mail';
+
+// login page
+$labels['welcome']   = 'Vítejte v $product';
+$labels['username']  = 'Uživatel';
+$labels['password']  = 'Heslo';
+$labels['server']    = 'Server';
+$labels['login']     = 'Přihlásit';
+
+// taskbar
+$labels['logout']   = 'Odhlásit';
+$labels['mail']     = 'E-mail';
 $labels['settings'] = 'Nastavení';
 $labels['addressbook'] = 'Adresář';
-$labels['inbox'] = 'Příchozí pošta';
+
+// mailbox names
+$labels['inbox']  = 'Příchozí pošta';
 $labels['drafts'] = 'Rozepsané';
-$labels['sent'] = 'Odeslané';
-$labels['trash'] = 'Koš';
-$labels['junk'] = 'Spam';
+$labels['sent']   = 'Odeslané';
+$labels['trash']  = 'Koš';
+$labels['junk']   = 'Spam';
+
+// message listing
 $labels['subject'] = 'Předmět';
-$labels['from'] = 'Odesílatel';
-$labels['to'] = 'Adresát';
-$labels['cc'] = 'Kopie';
-$labels['bcc'] = 'Skrytá kopie';
+$labels['from']    = 'Odesílatel';
+$labels['sender']  = 'Odesílatel';
+$labels['to']      = 'Adresát';
+$labels['cc']      = 'Kopie';
+$labels['bcc']     = 'Skrytá kopie';
 $labels['replyto'] = 'Odpověď na';
 $labels['followupto'] = 'Následuje-po';
-$labels['date'] = 'Datum';
-$labels['size'] = 'Velikost';
+$labels['date']    = 'Datum';
+$labels['size']    = 'Velikost';
 $labels['priority'] = 'Priorita';
 $labels['organization'] = 'Organizace';
 $labels['readstatus'] = 'Přečteno';
 $labels['listoptions'] = 'Seznam  možností ...';
+
 $labels['mailboxlist'] = 'Složky';
-$labels['folders'] = 'Složky';
 $labels['messagesfromto'] = 'Zprávy $from až $to z celkem $count';
 $labels['threadsfromto'] = 'Konverzace $from až $to z celkem $count';
 $labels['messagenrof'] = 'Zpráva $nr z $count';
 $labels['fromtoshort'] = '$from - $to z $count';
-$labels['copy'] = 'Kopírovat';
-$labels['move'] = 'Přesunout';
-$labels['moveto'] = 'přesunout do...';
+
+$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';
+
 $labels['filename'] = 'Jméno přílohy';
 $labels['filesize'] = 'Velikost přílohy';
+
 $labels['addtoaddressbook'] = 'Přidat do adresáře';
+
+// weekdays short
 $labels['sun'] = 'Ne';
 $labels['mon'] = 'Po';
 $labels['tue'] = 'Út';
@@ -61,78 +81,88 @@ $labels['wed'] = 'St';
 $labels['thu'] = 'Čt';
 $labels['fri'] = 'Pá';
 $labels['sat'] = 'So';
-$labels['sunday'] = 'Neděle';
-$labels['monday'] = 'Pondělí';
-$labels['tuesday'] = 'Úterý';
+
+// weekdays long
+$labels['sunday']    = 'Neděle';
+$labels['monday']    = 'Pondělí';
+$labels['tuesday']   = 'Úterý';
 $labels['wednesday'] = 'Středa';
-$labels['thursday'] = 'Čtvrtek';
-$labels['friday'] = 'Pátek';
-$labels['saturday'] = 'Sobota';
-$labels['jan'] = 'Led';
-$labels['feb'] = 'Úno';
-$labels['mar'] = 'Bře';
-$labels['apr'] = 'Dub';
-$labels['may'] = 'Květen';
-$labels['longmay'] = 'Květen';
-$labels['jun'] = 'Čer';
-$labels['jul'] = 'Čec';
-$labels['aug'] = 'Srp';
-$labels['sep'] = 'Zář';
-$labels['oct'] = 'Říj';
-$labels['nov'] = 'Lis';
-$labels['dec'] = 'Pro';
-$labels['longjan'] = 'Leden';
-$labels['longfeb'] = 'Únor';
-$labels['longmar'] = 'Březen';
-$labels['longapr'] = 'Duben';
-$labels['longjun'] = 'Červen';
-$labels['longjul'] = 'Červenec';
-$labels['longaug'] = 'Srpen';
-$labels['longsep'] = 'Září';
-$labels['longoct'] = 'Říjen';
-$labels['longnov'] = 'Listopad';
-$labels['longdec'] = 'Prosinec';
+$labels['thursday']  = 'Čtvrtek';
+$labels['friday']    = 'Pátek';
+$labels['saturday']  = 'Sobota';
+
+// months short
+$labels['jan']	= 'Led';
+$labels['feb']	= 'Úno';
+$labels['mar']	= 'Bře';
+$labels['apr']	= 'Dub';
+$labels['may']	= 'Květen';
+$labels['jun']	= 'Čer';
+$labels['jul'] 	= 'Čec';
+$labels['aug']	= 'Srp';
+$labels['sep']	= 'Zář';
+$labels['oct']	= 'Říj';
+$labels['nov']	= 'Lis';
+$labels['dec']	= 'Pro';
+
+// months long
+$labels['longjan']	= 'Leden';
+$labels['longfeb']	= 'Únor';
+$labels['longmar']	= 'Březen';
+$labels['longapr']	= 'Duben';
+$labels['longmay']	= 'Květen';
+$labels['longjun']	= 'Červen';
+$labels['longjul']	= 'Červenec';
+$labels['longaug']	= 'Srpen';
+$labels['longsep']	= 'Září';
+$labels['longoct']	= 'Říjen';
+$labels['longnov']	= 'Listopad';
+$labels['longdec']	= 'Prosinec';
+
 $labels['today'] = 'Dnes';
-$labels['refresh'] = 'Obnovit';
-$labels['checkmail'] = 'Zkontrolovat nové zprávy';
-$labels['compose'] = 'Napsat zprávu';
-$labels['writenewmessage'] = 'Vytvořit novou zprávu';
-$labels['reply'] = 'Odpovědět';
-$labels['replytomessage'] = 'Odpovědět odesílateli';
+
+// toolbar buttons
+$labels['refresh']          = 'Obnovit';
+$labels['checkmail']        = 'Zkontrolovat nové zprávy';
+$labels['compose']          = 'Napsat zprávu';
+$labels['writenewmessage']  = 'Vytvořit novou zprávu';
+$labels['reply']            = 'Odpovědět';
+$labels['replytomessage']   = 'Odpovědět odesílateli';
 $labels['replytoallmessage'] = 'Odpovědět všem';
-$labels['replyall'] = 'Odpovědět všem';
-$labels['replylist'] = 'Odpovědět do e-mailové konference';
-$labels['forward'] = 'Přeposlat';
-$labels['forwardinline'] = 'Přeposlat v textu';
+$labels['replyall']         = 'Odpovědět všem';
+$labels['replylist']        = 'Odpovědět do e-mailové konference';
+$labels['forward']          = 'Přeposlat';
+$labels['forwardinline']    = 'Přeposlat v textu';
 $labels['forwardattachment'] = 'Přeposlat jako přílohu';
-$labels['forwardmessage'] = 'Předat zprávu';
-$labels['deletemessage'] = 'Odstranit zprávu';
+$labels['forwardmessage']   = 'Předat zprávu';
+$labels['deletemessage']    = 'Odstranit zprávu';
 $labels['movemessagetotrash'] = 'Přesunout zprávu do koše';
-$labels['printmessage'] = 'Vytisknout zprávu';
-$labels['previousmessage'] = 'Zobrazit předchozí zprávu';
-$labels['firstmessage'] = 'Zobrazit první zprávu';
-$labels['nextmessage'] = 'Zobrazit další zprávu';
-$labels['lastmessage'] = 'Zobrazit poslední zprávu';
-$labels['backtolist'] = 'Zpět do seznamu zpráv';
-$labels['viewsource'] = 'Zobrazit zdroj';
-$labels['mark'] = 'Označit';
-$labels['markmessages'] = 'Označ zprávy';
-$labels['markread'] = 'Jako přečtené';
-$labels['markunread'] = 'Jako nepřečtené';
-$labels['markflagged'] = 'Jako označené';
-$labels['markunflagged'] = 'Jako neoznačené';
-$labels['moreactions'] = 'Další akce...';
-$labels['more'] = 'Více';
-$labels['back'] = 'Zpět';
-$labels['options'] = 'Možnosti';
+$labels['printmessage']     = 'Vytisknout zprávu';
+$labels['previousmessage']  = 'Zobrazit předchozí zprávu';
+$labels['firstmessage']     = 'Zobrazit první zprávu';
+$labels['nextmessage']      = 'Zobrazit další zprávu';
+$labels['lastmessage']      = 'Zobrazit poslední zprávu';
+$labels['backtolist']       = 'Zpět do seznamu zpráv';
+$labels['viewsource']       = 'Zobrazit zdroj';
+$labels['mark']             = 'Označit';
+$labels['markmessages']     = 'Označ zprávy';
+$labels['markread']         = 'Jako přečtené';
+$labels['markunread']       = 'Jako nepřečtené';
+$labels['markflagged']      = 'Jako označené';
+$labels['markunflagged']    = 'Jako neoznačené';
+$labels['moreactions']      = 'Další akce...';
+$labels['more']             = 'Více';
+$labels['back']             = 'Zpět';
+$labels['options']          = 'Možnosti';
+
 $labels['select'] = 'Vybrat';
 $labels['all'] = 'Vše';
 $labels['none'] = 'Nic';
-$labels['nonesort'] = 'Nic';
 $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';
@@ -143,12 +173,14 @@ $labels['expand-all'] = 'Rozbalit všechny';
 $labels['expand-unread'] = 'Rozbalit nepřečtené';
 $labels['collapse-all'] = 'Sbalit všechny';
 $labels['threaded'] = 'Spojovat do konverzací';
+
 $labels['autoexpand_threads'] = 'Rozbalit konverzace';
 $labels['do_expand'] = 'všechny konverzace';
 $labels['expand_only_unread'] = 'pouze s nepřečtenými zprávami';
 $labels['fromto'] = 'Odesílatel/Příjemce';
 $labels['flag'] = 'Vlajka';
 $labels['attachment'] = 'Příloha';
+$labels['nonesort'] = 'Nic';
 $labels['sentdate'] = 'Datum odeslání';
 $labels['arrival'] = 'Datum přijetí';
 $labels['asc'] = 'vzestupně';
@@ -157,181 +189,220 @@ $labels['listcolumns'] = 'Seznam sloupců';
 $labels['listsorting'] = 'Třídění sloupců';
 $labels['listorder'] = 'Uspořádání';
 $labels['listmode'] = 'Režim zobrazení seznamu';
+
 $labels['folderactions'] = 'Akce se složkou...';
 $labels['compact'] = 'Zmenšit';
 $labels['empty'] = 'Vymazat';
+
 $labels['quota'] = 'Využití schránky';
-$labels['unknown'] = 'neznámý';
-$labels['unlimited'] = 'neomezený';
-$labels['quicksearch'] = 'Rychlé vyhledávání';
-$labels['resetsearch'] = 'Zrušit vyhledávání';
-$labels['searchmod'] = 'Parametry hledání';
-$labels['msgtext'] = 'Celá zpráva';
+$labels['unknown']  = 'neznámý';
+$labels['unlimited']  = 'neomezený';
+
+$labels['quicksearch']  = 'Rychlé vyhledávání';
+$labels['resetsearch']  = 'Zrušit vyhledávání';
+$labels['searchmod']  = 'Parametry hledání';
+$labels['msgtext']  = 'Celá zpráva';
+$labels['body']  = 'Tělo';
+
 $labels['openinextwin'] = 'Otevřít v novém okně';
 $labels['emlsave'] = 'Stáhnout (.eml)';
-$labels['editasnew'] = 'Upravit jako novou';
-$labels['send'] = 'Odeslat';
-$labels['sendmessage'] = 'Odeslat zprávu nyní';
-$labels['savemessage'] = 'Uložit do rozepsaných';
-$labels['addattachment'] = 'Přidat přílohu';
-$labels['charset'] = 'Znaková sada';
-$labels['editortype'] = 'Typ editoru zpráv';
-$labels['returnreceipt'] = 'Doručenka';
-$labels['dsn'] = 'Stav doručení';
+$labels['changeformattext'] = 'Zobrazit v textovém formátu';
+$labels['changeformathtml'] = 'Zobrazit v HTML formátu';
+
+// message compose
+$labels['editasnew']      = 'Upravit jako novou';
+$labels['send']           = 'Odeslat';
+$labels['sendmessage']    = 'Odeslat zprávu nyní';
+$labels['savemessage']    = 'Uložit do rozepsaných';
+$labels['addattachment']  = 'Přidat přílohu';
+$labels['charset']        = 'Znaková sada';
+$labels['editortype']     = 'Typ editoru zpráv';
+$labels['returnreceipt']  = 'Doručenka';
+$labels['dsn']            = 'Stav doručení';
 $labels['mailreplyintro'] = 'Dne $date, $sender napsal:';
 $labels['originalmessage'] = 'Původní zpráva';
-$labels['editidents'] = 'Editovat identity';
-$labels['spellcheck'] = 'Pravopis';
+
+$labels['editidents']    = 'Editovat identity';
+$labels['spellcheck']    = 'Pravopis';
 $labels['checkspelling'] = 'Zkontrolovat pravopis';
 $labels['resumeediting'] = 'Pokračovat v úpravách';
-$labels['revertto'] = 'Přejít na';
+$labels['revertto']      = 'Přejít na';
+
 $labels['attach'] = 'Přiložit';
 $labels['attachments'] = 'Přílohy';
 $labels['upload'] = 'Nahrát';
 $labels['uploadprogress'] = '$percent ($current z $total)';
-$labels['close'] = 'Zavřít';
-$labels['messageoptions'] = 'Nastavení zprávy...';
-$labels['low'] = 'Nízká';
-$labels['lowest'] = 'Nejnižší';
-$labels['normal'] = 'Normální';
-$labels['high'] = 'Vysoká';
+$labels['close']  = 'Zavřít';
+$labels['messageoptions']  = 'Nastavení zprávy...';
+
+$labels['low']     = 'Nízká';
+$labels['lowest']  = 'Nejnižší';
+$labels['normal']  = 'Normální';
+$labels['high']    = 'Vysoká';
 $labels['highest'] = 'Nejvyšší';
-$labels['nosubject'] = '(bez predmetu)';
+
+$labels['nosubject']  = '(bez predmetu)';
 $labels['showimages'] = 'Zobrazit obrázky';
 $labels['alwaysshow'] = 'Vždy ukazovat obrázky od $sender';
-$labels['isdraft'] = 'Toto je šablona zprávy.';
-$labels['andnmore'] = '$nr dalších...';
+$labels['isdraft']    = 'Toto je šablona zprávy.';
+$labels['andnmore']   = '$nr dalších...';
 $labels['togglemoreheaders'] = 'Zobrazit více hlaviček zprávy';
 $labels['togglefullheaders'] = 'Přepnout skutečné hlavičky zprávy';
+
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Prostý text';
 $labels['savesentmessagein'] = 'Ukládat odeslané zprávy v';
 $labels['dontsave'] = 'neukládat';
 $labels['maxuploadsize'] = 'Maximální povolená velikost souboru je $size';
+
 $labels['addcc'] = 'Přidat pole "Kopie';
 $labels['addbcc'] = 'Přidat pole "Skrytá kopie';
 $labels['addreplyto'] = 'Přidat pole "Odpověď';
 $labels['addfollowupto'] = 'Přidat pole "Followup-To';
+
+// mdn
 $labels['mdnrequest'] = 'Odesílatel této zprávy si přeje být upozorněn na to, že jste zprávu obdrželi. Chcete přijetí zprávy potvrdit?';
 $labels['receiptread'] = 'Potvrzení o přijetí zprávy';
 $labels['yourmessage'] = 'Toto je potvrzení o přijetí Vaší zprávy';
 $labels['receiptnote'] = 'Poznámka: Toto potvrzení negarantuje, že zpráva byla příjemce přečtena a že porozuměl jejímu obsahu.';
-$labels['name'] = 'Zobrazit jméno';
-$labels['firstname'] = 'Jméno';
-$labels['surname'] = 'Příjmení';
-$labels['middlename'] = 'Rodné příjmení';
-$labels['nameprefix'] = 'Titul před';
-$labels['namesuffix'] = 'Titul za';
-$labels['nickname'] = 'Přezdívka';
-$labels['jobtitle'] = 'Pracovní pozice';
-$labels['department'] = 'Oddělení';
-$labels['gender'] = 'Pohlaví';
-$labels['maidenname'] = 'Rodné příjmení';
-$labels['email'] = 'E-mail';
-$labels['phone'] = 'Telefon';
-$labels['address'] = 'Adresa';
-$labels['street'] = 'Ulice';
-$labels['locality'] = 'Město';
-$labels['zipcode'] = 'PSČ';
-$labels['region'] = 'Kraj';
-$labels['country'] = 'Země';
-$labels['birthday'] = 'Datum narození';
-$labels['anniversary'] = 'Výročí';
-$labels['website'] = 'WWW';
+
+// address boook
+$labels['name']         = 'Zobrazit jméno';
+$labels['firstname']    = 'Jméno';
+$labels['surname']      = 'Příjmení';
+$labels['middlename']   = 'Rodné příjmení';
+$labels['nameprefix']   = 'Titul před';
+$labels['namesuffix']   = 'Titul za';
+$labels['nickname']     = 'Přezdívka';
+$labels['jobtitle']     = 'Pracovní pozice';
+$labels['department']   = 'Oddělení';
+$labels['gender']       = 'Pohlaví';
+$labels['maidenname']   = 'Rodné příjmení';
+$labels['email']        = 'E-mail';
+$labels['phone']        = 'Telefon';
+$labels['address']      = 'Adresa';
+$labels['street']       = 'Ulice';
+$labels['locality']     = 'Město';
+$labels['zipcode']      = 'PSČ';
+$labels['region']       = 'Kraj';
+$labels['country']      = 'Země';
+$labels['birthday']     = 'Datum narození';
+$labels['anniversary']  = 'Výročí';
+$labels['website']      = 'WWW';
 $labels['instantmessenger'] = 'Komunikace (ICQ, messenger...)';
 $labels['notes'] = 'Poznámky';
-$labels['male'] = 'Muž';
+$labels['male']   = 'Muž';
 $labels['female'] = 'Žena';
 $labels['manager'] = 'Manažer';
 $labels['assistant'] = 'Asistent';
-$labels['typeassistant'] = 'Asistent';
 $labels['spouse'] = 'Manžel/ka';
 $labels['allfields'] = 'Všechny položky';
 $labels['search'] = 'Hledat';
 $labels['advsearch'] = 'Pokročilé vyhledávání';
 $labels['advanced'] = 'Pokročilé';
 $labels['other'] = 'Ostatní';
-$labels['typeother'] = 'Ostatní';
-$labels['typehome'] = 'Domací';
-$labels['typework'] = 'Pracovní';
-$labels['typemobile'] = 'Mobil';
-$labels['typemain'] = 'Osobní';
-$labels['typehomefax'] = 'Domácí FAX';
-$labels['typeworkfax'] = 'Pracovní FAX';
-$labels['typecar'] = 'Automobil';
-$labels['typepager'] = 'Pager';
-$labels['typevideo'] = 'Video';
-$labels['typehomepage'] = 'Domácí stránka';
+
+$labels['typehome']   = 'Domací';
+$labels['typework']   = 'Pracovní';
+$labels['typeother']  = 'Ostatní';
+$labels['typemobile']  = 'Mobil';
+$labels['typemain']  = 'Osobní';
+$labels['typehomefax']  = 'Domácí FAX';
+$labels['typeworkfax']  = 'Pracovní FAX';
+$labels['typecar']  = 'Automobil';
+$labels['typepager']  = 'Pager';
+$labels['typevideo']  = 'Video';
+$labels['typeassistant']  = 'Asistent';
+$labels['typehomepage']  = 'Domácí stránka';
 $labels['typeblog'] = 'Blog';
 $labels['typeprofile'] = 'Profil';
+
 $labels['addfield'] = 'Přidat položku';
 $labels['addcontact'] = 'Přidat kontakt';
 $labels['editcontact'] = 'Upravit kontakt';
 $labels['contacts'] = 'Kontakty';
 $labels['contactproperties'] = 'Vlastnosti kontaktu';
 $labels['personalinfo'] = 'Osobní informace';
-$labels['edit'] = 'Upravit';
+
+$labels['edit']   = 'Upravit';
 $labels['cancel'] = 'Konec';
-$labels['save'] = 'Uložit';
+$labels['save']   = 'Uložit';
 $labels['delete'] = 'Smazat';
 $labels['rename'] = 'Přejmenovat';
 $labels['addphoto'] = 'Přidat';
 $labels['replacephoto'] = 'Změnit';
 $labels['uploadphoto'] = 'Nahrát fotku';
-$labels['newcontact'] = 'Vytvořit nový kontakt';
-$labels['deletecontact'] = 'Smazat vybrané kontakty';
-$labels['composeto'] = 'Poslat e-mail';
+
+$labels['newcontact']     = 'Vytvořit nový kontakt';
+$labels['deletecontact']  = 'Smazat vybrané kontakty';
+$labels['composeto']      = 'Poslat e-mail';
 $labels['contactsfromto'] = 'Kontakty $from až $to z celkem $count';
-$labels['print'] = 'Tisk';
-$labels['export'] = 'Export';
-$labels['exportvcards'] = 'Exportovat kontakty ve formátu vCard';
+$labels['print']          = 'Tisk';
+$labels['export']         = 'Export';
+$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';
-$labels['groupdelete'] = 'Smazat skupinu';
+$labels['grouprename']    = 'Přejmenovat skupinu';
+$labels['groupdelete']    = 'Smazat skupinu';
 $labels['groupremoveselected'] = 'Odstranit označené kontakty ze skupiny';
-$labels['previouspage'] = 'Předchozí';
-$labels['firstpage'] = 'Zobrazit první zprávy';
-$labels['nextpage'] = 'Další';
-$labels['lastpage'] = 'Zobrazit poslední zprávy';
+
+$labels['previouspage']   = 'Předchozí';
+$labels['firstpage']      = 'Zobrazit první zprávy';
+$labels['nextpage']       = 'Další';
+$labels['lastpage']       = 'Zobrazit poslední zprávy';
+
 $labels['group'] = 'Skupina';
 $labels['groups'] = 'Skupiny';
 $labels['personaladrbook'] = 'Osobní kontakty';
+
 $labels['searchsave'] = 'Uložit hledání';
 $labels['searchdelete'] = 'Smazat hledání';
+
 $labels['import'] = 'Import';
 $labels['importcontacts'] = 'Importovat kontakty';
 $labels['importfromfile'] = 'Importovat ze souboru';
 $labels['importtarget'] = 'Přidat nové kontakty do seznamu kontaktů:';
 $labels['importreplace'] = 'Nahradit celý seznam kontaktů';
+$labels['importdesc'] = 'Můžete nahrát kontakty z existujícího adresáře kontaktů.<br/>Momentálně podporujeme kontakty ve formátu <a href="http://cs.wikipedia.org/wiki/VCard">vCard</a> nebo CSV (comma-separated).';
 $labels['done'] = 'Hotovo';
+
+// settings
 $labels['settingsfor'] = 'Nastavení pro';
 $labels['about'] = 'O programu';
 $labels['preferences'] = 'Vlastnosti';
 $labels['userpreferences'] = 'Vlastnosti uživatele';
 $labels['editpreferences'] = 'Upravit vlastnosti uživatele';
+
 $labels['identities'] = 'Profily';
 $labels['manageidentities'] = 'Spravovat profily u tohoto účtu';
 $labels['newidentity'] = 'Nový profil';
+
 $labels['newitem'] = 'Nová položka';
 $labels['edititem'] = 'Upravit položku';
+
 $labels['preferhtml'] = 'Upřednostňovat HTML zobrazení';
 $labels['defaultcharset'] = 'Výchozí kódování';
 $labels['htmlmessage'] = 'HTML zpráva';
+$labels['messagepart'] = 'Část';
+$labels['digitalsig'] = 'Digitální podpis';
 $labels['dateformat'] = 'Formát data';
 $labels['timeformat'] = 'Formát času';
 $labels['prettydate'] = 'Hezčí datum';
-$labels['setdefault'] = 'Nastavit výchozí';
-$labels['autodetect'] = 'Automaticky';
-$labels['language'] = 'Jazyk';
-$labels['timezone'] = 'Časová zóna';
-$labels['pagesize'] = 'Řádků na stránku';
+$labels['setdefault']  = 'Nastavit výchozí';
+$labels['autodetect']  = 'Automaticky';
+$labels['language']  = 'Jazyk';
+$labels['timezone']  = 'Časová zóna';
+$labels['pagesize']  = 'Řádků na stránku';
 $labels['signature'] = 'Podpis';
-$labels['dstactive'] = 'Letní čas';
+$labels['dstactive']  = 'Letní čas';
 $labels['showinextwin'] = 'Otevřít zprávu v novém okně';
+$labels['composeextwin'] = 'Vytvořit v novém okně';
 $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í';
@@ -354,10 +425,11 @@ $labels['showremoteimages'] = 'Zobrazovat obrázky uložené mimo mail';
 $labels['fromknownsenders'] = 'od známých uživatelů';
 $labels['always'] = 'vždy';
 $labels['showinlineimages'] = 'Zobrazovat připojené obrázky pod textem';
-$labels['autosavedraft'] = 'Automaticky uložit rozepsané zprávy';
-$labels['everynminutes'] = 'každých $n minut';
-$labels['never'] = 'nikdy';
-$labels['immediately'] = 'ihned';
+$labels['autosavedraft']  = 'Automaticky uložit rozepsané zprávy';
+$labels['everynminutes']  = 'každých $n minut';
+$labels['refreshinterval']  = 'Obnovit (zkontroluj nové zprávy, atd)';
+$labels['never']  = 'nikdy';
+$labels['immediately']  = 'ihned';
 $labels['messagesdisplaying'] = 'Zobrazování zpráv';
 $labels['messagescomposition'] = 'Psaní zpráv';
 $labels['mimeparamfolding'] = 'Jména příloh';
@@ -384,16 +456,13 @@ $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';
+$labels['previewpanemarkread']  = 'Označit zobrazené zprávy jako přečtené';
+$labels['afternseconds']  = 'po $n sekundách';
 $labels['reqmdn'] = 'Vždy požadovat doručenku';
 $labels['reqdsn'] = 'Vždy požádat o oznámení o stavu doručení';
 $labels['replysamefolder'] = 'Ukládat odpovědi ve stejné složce jako je zodpovězená zpráva';
-$labels['defaultaddressbook'] = 'Přidávat nové kontakty do seznamu kontaktů';
+$labels['defaultabook'] = 'Výchozí adresář kontaktů';
 $labels['autocompletesingle'] = 'Při doplňování adres přeskočit alternativní email.';
 $labels['listnamedisplay'] = 'Vypsat kontakty jako';
 $labels['spellcheckbeforesend'] = 'Před odesláním zkontrolovat pravopis';
@@ -406,13 +475,15 @@ $labels['mailtoprotohandler'] = 'Zaregistrovat handler pro odkazy „mailto:“'
 $labels['forwardmode'] = 'Přeposlat zprávu';
 $labels['inline'] = 'vloženě';
 $labels['asattachment'] = 'jako přílohu';
-$labels['folder'] = 'Složka';
-$labels['foldername'] = 'Jméno složky';
-$labels['subscribed'] = 'Vybráno';
+
+$labels['folder']  = 'Složka';
+$labels['folders']  = 'Složky';
+$labels['foldername']  = 'Jméno složky';
+$labels['subscribed']  = 'Vybráno';
 $labels['messagecount'] = 'Počet zpráv';
-$labels['create'] = 'Vytvořit';
-$labels['createfolder'] = 'Vytvořit novou složku';
-$labels['managefolders'] = 'Spravovat složky';
+$labels['create']  = 'Vytvořit';
+$labels['createfolder']  = 'Vytvořit novou složku';
+$labels['managefolders']  = 'Spravovat složky';
 $labels['specialfolders'] = 'Speciální složky';
 $labels['properties'] = 'Vlastnosti';
 $labels['folderproperties'] = 'Vlastnosti složky';
@@ -422,22 +493,29 @@ $labels['info'] = 'Informace';
 $labels['getfoldersize'] = 'Kliknutím zjistíte velikost složky';
 $labels['changesubscription'] = 'Kliknutím změníte přednastavení';
 $labels['foldertype'] = 'Typ složky';
-$labels['personalfolder'] = 'Soukromá složka';
-$labels['otherfolder'] = 'Složky ostatních uživatelů';
-$labels['sharedfolder'] = 'Sdílená složka';
+$labels['personalfolder']  = 'Soukromá složka';
+$labels['otherfolder']  = 'Složky ostatních uživatelů';
+$labels['sharedfolder']  = 'Sdílená složka';
+
 $labels['sortby'] = 'Seřadit podle';
-$labels['sortasc'] = 'Seřadit vzestupně';
+$labels['sortasc']  = 'Seřadit vzestupně';
 $labels['sortdesc'] = 'Seřadit sestupně';
 $labels['undo'] = 'Vrátit zpět';
+
+$labels['installedplugins'] = 'Nainstalované pluginy';
 $labels['plugin'] = 'Zásuvný modul';
 $labels['version'] = 'Verze';
 $labels['source'] = 'Zdroj';
 $labels['license'] = 'Licence';
 $labels['support'] = 'Podpora';
+
+// units
 $labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
 $labels['GB'] = 'GB';
+
+// character sets
 $labels['unicode'] = 'Unicode';
 $labels['english'] = 'Angličtina';
 $labels['westerneuropean'] = 'Západní Evropa';
@@ -457,3 +535,4 @@ $labels['japanese'] = 'Japonština';
 $labels['korean'] = 'Korejština';
 $labels['chinese'] = 'Čínština';
 
+?>
diff --git a/program/localization/cs_CZ/messages.inc b/program/localization/cs_CZ/messages.inc
index 4a2e6f8c8..9800b2412 100644
--- a/program/localization/cs_CZ/messages.inc
+++ b/program/localization/cs_CZ/messages.inc
@@ -2,20 +2,23 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/cs_CZ/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Zbynek Vanzura <heptau@gmail.com>                             |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['errortitle'] = 'Došlo k chybě!';
-$messages['loginfailed'] = 'Přihlášení selhalo';
+$messages['errortitle']  = 'Došlo k chybě!';
+$messages['loginfailed']  = 'Přihlášení selhalo';
 $messages['cookiesdisabled'] = 'Váš prohlížeč nepodporuje cookies, které jsou pro přihlášení nezbytné';
 $messages['sessionerror'] = 'Vaše přihlášení je neplatné nebo vypršelo';
 $messages['storageerror'] = 'Připojení na IMAP server selhalo';
@@ -25,11 +28,14 @@ $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';
 $messages['loggedout'] = 'Byli jste úspěšně odhlášeni. Nashledanou!';
 $messages['mailboxempty'] = 'Schránka je prázdná';
+$messages['refreshing'] = 'Obnovuji...';
 $messages['loading'] = 'Načítám...';
 $messages['uploading'] = 'Nahrávám soubor...';
 $messages['uploadingmany'] = 'Nahrávám soubory...';
@@ -56,11 +62,11 @@ $messages['errormoving'] = 'Nemohu přesunout zprávu';
 $messages['errorcopying'] = 'Nemohu zkopírovat zprávu';
 $messages['errordeleting'] = 'Nemohu smazat zprávu';
 $messages['errormarking'] = 'Zprávu nelze označit';
-$messages['deletecontactconfirm'] = 'Opravdu chcete smazat označené kontakty?';
-$messages['deletegroupconfirm'] = 'Opravdu chcete smazat skupinu?';
+$messages['deletecontactconfirm']  = 'Opravdu chcete smazat označené kontakty?';
+$messages['deletegroupconfirm']  = 'Opravdu chcete smazat skupinu?';
 $messages['deletemessagesconfirm'] = 'Opravdu chcete smazat označené zprávy?';
-$messages['deletefolderconfirm'] = 'Chcete opravdu smazat tento adresář?';
-$messages['purgefolderconfirm'] = 'Opravdu chcete smazat všechny zprávy v této složce?';
+$messages['deletefolderconfirm']  = 'Chcete opravdu smazat tento adresář?';
+$messages['purgefolderconfirm']  = 'Opravdu chcete smazat všechny zprávy v této složce?';
 $messages['contactdeleting'] = 'Mažu kontakty...';
 $messages['groupdeleting'] = 'Mažu skupinu...';
 $messages['folderdeleting'] = 'Odstraňuji složku...';
@@ -69,11 +75,11 @@ $messages['foldersubscribing'] = 'Připojuji složku...';
 $messages['folderunsubscribing'] = 'Odpojuji složku...';
 $messages['formincomplete'] = 'Formulář nebyl korektně vyplněn';
 $messages['noemailwarning'] = 'Zadejte, prosím, platnou e-mailovou adresu';
-$messages['nonamewarning'] = 'Zadejte, prosím, jméno';
+$messages['nonamewarning']  = 'Zadejte, prosím, jméno';
 $messages['nopagesizewarning'] = 'Zadejte, prosím, velikost stránky';
 $messages['nosenderwarning'] = 'Zadejte e-mailovou adresu odesílatele';
 $messages['norecipientwarning'] = 'Zadejte, prosím, alespoň jednoho příjemce';
-$messages['nosubjectwarning'] = 'Předmět nebyl vyplňen. Přejete si jej zadat nyní?';
+$messages['nosubjectwarning']  = 'Předmět nebyl vyplňen. Přejete si jej zadat nyní?';
 $messages['nobodywarning'] = 'Opravdu chtete odeslat prázdnou zprávu?';
 $messages['notsentwarning'] = 'Zpráva nebyla odeslána. Přejete si zprávu zahodit?';
 $messages['noldapserver'] = 'Zvolte, prosím, LDAP server k hledání';
@@ -115,7 +121,9 @@ $messages['selectimportfile'] = 'Prosím vyberte soubor k nahrání';
 $messages['addresswriterror'] = 'Vybraný seznam kontaktů není zapisovatelný';
 $messages['contactaddedtogroup'] = 'Kontakty byly úspěšně přidány do této skupiny';
 $messages['contactremovedfromgroup'] = 'Kontakty byly odstraněny z této skupiny';
+$messages['nogroupassignmentschanged'] = 'Nebylo změněno přiřazení do skupin.';
 $messages['importwait'] = 'Importuji, prosím čekejte...';
+$messages['importformaterror'] = 'Import se nezdařil! Typ souboru není podporován.';
 $messages['importconfirm'] = 'Úspěšně naimportováno $inserted kontaktů, $skipped existujících záznamů přeskočeno: $names';
 $messages['importconfirmskipped'] = '<b>Přeskočeno $skipped existujících položek</b>';
 $messages['opnotpermitted'] = 'Operace není povolena!';
@@ -157,4 +165,7 @@ $messages['invalidimageformat'] = 'Formát obrázku není podporován';
 $messages['mispellingsfound'] = 'Ve zprávě byly zjištěny pravopisné chyby';
 $messages['parentnotwritable'] = 'Nelze vytvořit/přesunout složku do vybrané rodičovské složky. Nemáte práva.';
 $messages['messagetoobig'] = 'Část zprávy je příliš velká pro zpracování.';
+$messages['attachmentvalidationerror'] = 'Varování: Tato příloha je podezřelá, protože její typ se neshoduje s typem uvedeným ve zprávě. Pokud nedůvěřujete odesílateli, neměli byste přílohu otevírat v prohlížeči, protože může obsahovat škodlivý obsah.<br/><br/><em>Očekáváno: $expected; nalezeno: $detected</em>';
+$messages['noscriptwarning'] = 'Upozornění: Tato emailová aplikace vyžaduje Javascript! Prosím, zapněte Javascript v nastavení prohlížeče.';
 
+?>
diff --git a/program/localization/cy_GB/labels.inc b/program/localization/cy_GB/labels.inc
index cde7f6f46..3e4f136bc 100644
--- a/program/localization/cy_GB/labels.inc
+++ b/program/localization/cy_GB/labels.inc
@@ -2,60 +2,78 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/cy_GB/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Dafydd Tomos                                                  |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = 'Croeso i $product';
-$labels['username'] = 'Enw defnyddiwr';
-$labels['password'] = 'Cyfrinair';
-$labels['server'] = 'Gweinydd';
-$labels['login'] = 'Mewngofnodi';
-$labels['logout'] = 'Allgofnodi';
-$labels['mail'] = 'E-bost';
+
+// login page
+$labels['welcome']   = 'Croeso i $product';
+$labels['username']  = 'Enw defnyddiwr';
+$labels['password']  = 'Cyfrinair';
+$labels['server']    = 'Gweinydd';
+$labels['login']     = 'Mewngofnodi';
+
+// taskbar
+$labels['logout']   = 'Allgofnodi';
+$labels['mail']     = 'E-bost';
 $labels['settings'] = 'Gosodiadau Personol';
 $labels['addressbook'] = 'Llyfr Cyfeiriadau';
-$labels['inbox'] = 'Mewnflwch';
+
+// mailbox names
+$labels['inbox']  = 'Mewnflwch';
 $labels['drafts'] = 'Drafftiau';
-$labels['sent'] = 'Danfonwyd';
-$labels['trash'] = 'Sbwriel';
-$labels['junk'] = 'Sothach';
+$labels['sent']   = 'Danfonwyd';
+$labels['trash']  = 'Sbwriel';
+$labels['junk']   = 'Sothach';
+
+// message listing
 $labels['subject'] = 'Pwnc';
-$labels['from'] = 'Anfonwr';
-$labels['to'] = 'Derbyniwr';
-$labels['cc'] = 'Copi';
-$labels['bcc'] = 'Bcc';
+$labels['from']    = 'Anfonwr';
+$labels['sender']  = 'Anfonwr';
+$labels['to']      = 'Derbyniwr';
+$labels['cc']      = 'Copi';
+$labels['bcc']     = 'Bcc';
 $labels['replyto'] = 'Ateb-I';
 $labels['followupto'] = 'Followup-To';
-$labels['date'] = 'Dyddiad';
-$labels['size'] = 'Maint';
+$labels['date']    = 'Dyddiad';
+$labels['size']    = 'Maint';
 $labels['priority'] = 'Blaenoriaeth';
 $labels['organization'] = 'Enw\'r Sefydliad';
 $labels['readstatus'] = 'Statws darllen';
 $labels['listoptions'] = 'Dewisiadau rhestr...';
+
 $labels['mailboxlist'] = 'Ffolderi';
-$labels['folders'] = 'Ffolderi';
 $labels['messagesfromto'] = 'Negeseuon $from i $to o $count';
 $labels['threadsfromto'] = 'Edefau $from i $to o $count';
 $labels['messagenrof'] = 'Neges $nr o $count';
 $labels['fromtoshort'] = '$from - $to o $count';
-$labels['copy'] = 'Copio';
-$labels['move'] = 'Symud';
-$labels['moveto'] = 'Symud i...';
+
+$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';
+
 $labels['filename'] = 'Enw ffeil';
 $labels['filesize'] = 'Maint ffeil';
+
 $labels['addtoaddressbook'] = 'Ychwanegu i\'r llyfr cyfeiriadau';
+
+// weekdays short
 $labels['sun'] = 'Sul';
 $labels['mon'] = 'Llun';
 $labels['tue'] = 'Maw';
@@ -63,78 +81,88 @@ $labels['wed'] = 'Mer';
 $labels['thu'] = 'Iau';
 $labels['fri'] = 'Gwe';
 $labels['sat'] = 'Sad';
-$labels['sunday'] = 'Dydd Sul';
-$labels['monday'] = 'Dydd Llun';
-$labels['tuesday'] = 'Dydd Mawrth';
+
+// weekdays long
+$labels['sunday']    = 'Dydd Sul';
+$labels['monday']    = 'Dydd Llun';
+$labels['tuesday']   = 'Dydd Mawrth';
 $labels['wednesday'] = 'Dydd Mercher';
-$labels['thursday'] = 'Dydd Iau';
-$labels['friday'] = 'Dydd Gwener';
-$labels['saturday'] = 'Dydd Sadwrn';
-$labels['jan'] = 'Ion';
-$labels['feb'] = 'Chwe';
-$labels['mar'] = 'Maw';
-$labels['apr'] = 'Ebr';
-$labels['may'] = 'Mai';
-$labels['longmay'] = 'Mai';
-$labels['jun'] = 'Meh';
-$labels['jul'] = 'Gor';
-$labels['aug'] = 'Aws';
-$labels['sep'] = 'Med';
-$labels['oct'] = 'Hyd';
-$labels['nov'] = 'Tach';
-$labels['dec'] = 'Rhag';
-$labels['longjan'] = 'Ionawr';
-$labels['longfeb'] = 'Chwefror';
-$labels['longmar'] = 'Mawrth';
-$labels['longapr'] = 'Ebrill';
-$labels['longjun'] = 'Mehefin';
-$labels['longjul'] = 'Gorffennaf';
-$labels['longaug'] = 'Awst';
-$labels['longsep'] = 'Medi';
-$labels['longoct'] = 'Hydref';
-$labels['longnov'] = 'Tachwedd';
-$labels['longdec'] = 'Rhagfyr';
+$labels['thursday']  = 'Dydd Iau';
+$labels['friday']    = 'Dydd Gwener';
+$labels['saturday']  = 'Dydd Sadwrn';
+
+// months short
+$labels['jan']	= 'Ion';
+$labels['feb']	= 'Chwe';
+$labels['mar']	= 'Maw';
+$labels['apr']	= 'Ebr';
+$labels['may']	= 'Mai';
+$labels['jun']	= 'Meh';
+$labels['jul'] 	= 'Gor';
+$labels['aug']	= 'Aws';
+$labels['sep']	= 'Med';
+$labels['oct']	= 'Hyd';
+$labels['nov']	= 'Tach';
+$labels['dec']	= 'Rhag';
+
+// months long
+$labels['longjan']	= 'Ionawr';
+$labels['longfeb']	= 'Chwefror';
+$labels['longmar']	= 'Mawrth';
+$labels['longapr']	= 'Ebrill';
+$labels['longmay']	= 'Mai';
+$labels['longjun']	= 'Mehefin';
+$labels['longjul']	= 'Gorffennaf';
+$labels['longaug']	= 'Awst';
+$labels['longsep']	= 'Medi';
+$labels['longoct']	= 'Hydref';
+$labels['longnov']	= 'Tachwedd';
+$labels['longdec']	= 'Rhagfyr';
+
 $labels['today'] = 'Heddiw';
-$labels['refresh'] = 'Ail-ofyn';
-$labels['checkmail'] = 'Edrych am negeseuon newydd';
-$labels['compose'] = 'Ysgrifennu neges';
-$labels['writenewmessage'] = 'Creu neges newydd';
-$labels['reply'] = 'Ymateb';
-$labels['replytomessage'] = 'Ymateb i\'r anfonwr';
+
+// toolbar buttons
+$labels['refresh']          = 'Ail-ofyn';
+$labels['checkmail']        = 'Edrych am negeseuon newydd';
+$labels['compose']          = 'Ysgrifennu neges';
+$labels['writenewmessage']  = 'Creu neges newydd';
+$labels['reply']            = 'Ymateb';
+$labels['replytomessage']   = 'Ymateb i\'r anfonwr';
 $labels['replytoallmessage'] = 'Ymateb i\'r anfonwr a phob derbyniwr';
-$labels['replyall'] = 'Ymateb i bawb';
-$labels['replylist'] = 'Ymateb i\'r rhestr';
-$labels['forward'] = 'Anfon ymlaen';
-$labels['forwardinline'] = 'Anfon ymlaen o fewn y neges';
+$labels['replyall']         = 'Ymateb i bawb';
+$labels['replylist']        = 'Ymateb i\'r rhestr';
+$labels['forward']          = 'Anfon ymlaen';
+$labels['forwardinline']    = 'Anfon ymlaen o fewn y neges';
 $labels['forwardattachment'] = 'Anfon ymlaen fel atodiad';
-$labels['forwardmessage'] = 'Danfon y neges ymlaen';
-$labels['deletemessage'] = 'Dileu\'r neges';
+$labels['forwardmessage']   = 'Danfon y neges ymlaen';
+$labels['deletemessage']    = 'Dileu\'r neges';
 $labels['movemessagetotrash'] = 'Symud y neges i\'r sbwriel';
-$labels['printmessage'] = 'Argraffu\'r neges';
-$labels['previousmessage'] = 'Dangos y neges flaenorol';
-$labels['firstmessage'] = 'Dangos y neges gyntaf';
-$labels['nextmessage'] = 'Dangos y neges nesaf';
-$labels['lastmessage'] = 'Dangos y neges olaf';
-$labels['backtolist'] = 'Nôl i\'r rhestr o negeseuon';
-$labels['viewsource'] = 'Edrych ar y ffynhonnell';
-$labels['mark'] = 'Nodi';
-$labels['markmessages'] = 'Nodi\'r negeseuon';
-$labels['markread'] = 'Wedi eu darllen';
-$labels['markunread'] = 'Heb eu darllen';
-$labels['markflagged'] = 'Wedi eu fflagio';
-$labels['markunflagged'] = 'Heb eu fflagio';
-$labels['moreactions'] = 'Mwy o weithredoedd...';
-$labels['more'] = 'Mwy';
-$labels['back'] = 'Yn ôl';
-$labels['options'] = 'Dewisiadau';
+$labels['printmessage']     = 'Argraffu\'r neges';
+$labels['previousmessage']  = 'Dangos y neges flaenorol';
+$labels['firstmessage']     = 'Dangos y neges gyntaf';
+$labels['nextmessage']      = 'Dangos y neges nesaf';
+$labels['lastmessage']      = 'Dangos y neges olaf';
+$labels['backtolist']       = 'Nôl i\'r rhestr o negeseuon';
+$labels['viewsource']       = 'Edrych ar y ffynhonnell';
+$labels['mark']             = 'Nodi';
+$labels['markmessages']     = 'Nodi\'r negeseuon';
+$labels['markread']         = 'Wedi eu darllen';
+$labels['markunread']       = 'Heb eu darllen';
+$labels['markflagged']      = 'Wedi eu fflagio';
+$labels['markunflagged']    = 'Heb eu fflagio';
+$labels['moreactions']      = 'Mwy o weithredoedd...';
+$labels['more']             = 'Mwy';
+$labels['back']             = 'Yn ôl';
+$labels['options']          = 'Dewisiadau';
+
 $labels['select'] = 'Dewis';
 $labels['all'] = 'Popeth';
 $labels['none'] = 'Dim';
-$labels['nonesort'] = 'Dim';
 $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';
@@ -145,12 +173,14 @@ $labels['expand-all'] = 'Ehangu Popeth';
 $labels['expand-unread'] = 'Ehangu Negeseuon Heb eu darllen';
 $labels['collapse-all'] = 'Crebachu Popeth';
 $labels['threaded'] = 'Edafedd';
+
 $labels['autoexpand_threads'] = 'Ehangu edefau neges';
 $labels['do_expand'] = 'pob edefyn';
 $labels['expand_only_unread'] = 'dim ond gyda negeseuon heb eu darllen';
 $labels['fromto'] = 'Danfonwr/Derbynnydd';
 $labels['flag'] = 'Fflag';
 $labels['attachment'] = 'Atodiad';
+$labels['nonesort'] = 'Dim';
 $labels['sentdate'] = 'Dyddiad danfon';
 $labels['arrival'] = 'Dyddiad derbyn';
 $labels['asc'] = 'esgynnol';
@@ -159,147 +189,176 @@ $labels['listcolumns'] = 'Rhestr colofnau';
 $labels['listsorting'] = 'Colofn trefnu';
 $labels['listorder'] = 'Trefn didoli';
 $labels['listmode'] = 'Golwg rhestr';
+
 $labels['folderactions'] = 'Gweithredoedd ffolder...';
 $labels['compact'] = 'Crynhoi';
 $labels['empty'] = 'Gwagio';
+
 $labels['quota'] = 'Defnydd';
-$labels['unknown'] = 'anhysbys';
-$labels['unlimited'] = 'diderfyn';
-$labels['quicksearch'] = 'Chwiliad cyflym';
-$labels['resetsearch'] = 'Ail-osod chwiliad';
-$labels['searchmod'] = 'Addasyddion chwilio';
-$labels['msgtext'] = 'Y neges yn llawn';
+$labels['unknown']  = 'anhysbys';
+$labels['unlimited']  = 'diderfyn';
+
+$labels['quicksearch']  = 'Chwiliad cyflym';
+$labels['resetsearch']  = 'Ail-osod chwiliad';
+$labels['searchmod']  = 'Addasyddion chwilio';
+$labels['msgtext']  = 'Y neges yn llawn';
+$labels['body']  = 'Corff';
+
 $labels['openinextwin'] = 'Agor mewn ffenest newydd';
 $labels['emlsave'] = 'Llwytho lawr (.eml)';
-$labels['editasnew'] = 'Golygu fel neges newydd';
-$labels['send'] = 'Anfon';
-$labels['sendmessage'] = 'Danfon nawr';
-$labels['savemessage'] = 'Cadw\'r drafft hwn';
-$labels['addattachment'] = 'Atodi ffeil';
-$labels['charset'] = 'Set nodiau';
-$labels['editortype'] = 'Math golygydd';
-$labels['returnreceipt'] = 'Cadarnhau derbyn';
-$labels['dsn'] = 'Hysbysiad statws danfon';
+$labels['changeformattext'] = 'Dangos mewn fformat testun plaen';
+$labels['changeformathtml'] = 'Dangos mewn fformat HTML';
+
+// message compose
+$labels['editasnew']      = 'Golygu fel neges newydd';
+$labels['send']           = 'Anfon';
+$labels['sendmessage']    = 'Danfon nawr';
+$labels['savemessage']    = 'Cadw\'r drafft hwn';
+$labels['addattachment']  = 'Atodi ffeil';
+$labels['charset']        = 'Set nodiau';
+$labels['editortype']     = 'Math golygydd';
+$labels['returnreceipt']  = 'Cadarnhau derbyn';
+$labels['dsn']            = 'Hysbysiad statws danfon';
 $labels['mailreplyintro'] = 'Ar $date, ysgrifennodd $sender:';
 $labels['originalmessage'] = 'Neges Wreiddiol';
-$labels['editidents'] = 'Golygu personoliaethau';
-$labels['spellcheck'] = 'Sillafu';
+
+$labels['editidents']    = 'Golygu personoliaethau';
+$labels['spellcheck']    = 'Sillafu';
 $labels['checkspelling'] = 'Gwirio sillafu';
 $labels['resumeediting'] = 'Ail-ddechrau golygu';
-$labels['revertto'] = 'Dychwelyd i';
+$labels['revertto']      = 'Dychwelyd i';
+
 $labels['attach'] = 'Atodi';
 $labels['attachments'] = 'Atodiadau';
 $labels['upload'] = 'Llwytho fyny';
 $labels['uploadprogress'] = '$percent ($current o $total)';
-$labels['close'] = 'Cau';
-$labels['messageoptions'] = 'Dewisiadau neges...';
-$labels['low'] = 'Isel';
-$labels['lowest'] = 'Isaf';
-$labels['normal'] = 'Cyffredin';
-$labels['high'] = 'Uchel';
+$labels['close']  = 'Cau';
+$labels['messageoptions']  = 'Dewisiadau neges...';
+
+$labels['low']     = 'Isel';
+$labels['lowest']  = 'Isaf';
+$labels['normal']  = 'Cyffredin';
+$labels['high']    = 'Uchel';
 $labels['highest'] = 'Uchaf';
-$labels['nosubject'] = '(dim pwnc)';
+
+$labels['nosubject']  = '(dim pwnc)';
 $labels['showimages'] = 'Dangos lluniau';
 $labels['alwaysshow'] = 'Dangos lluniau bob amser o $sender';
-$labels['isdraft'] = 'Mae hwn yn neges ddrafft';
-$labels['andnmore'] = '$nr mwy...';
+$labels['isdraft']    = 'Mae hwn yn neges ddrafft';
+$labels['andnmore']   = '$nr mwy...';
 $labels['togglemoreheaders'] = 'Dangos fwy o benynnau\'r neges';
 $labels['togglefullheaders'] = 'Toglo penawdau llawn y neges';
+
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Testun plaen';
 $labels['savesentmessagein'] = 'Cadw negeseuon a ddanfonir yn';
 $labels['dontsave'] = 'peidio cadw';
 $labels['maxuploadsize'] = 'Y maint ffeil uchaf a ganiateir yw $size';
+
 $labels['addcc'] = 'Ychwanegu Cc';
 $labels['addbcc'] = 'Ychwanegu Bcc';
 $labels['addreplyto'] = 'Ychwanegu Ateb-I';
 $labels['addfollowupto'] = 'Ychwanegu Followup-To';
+
+// mdn
 $labels['mdnrequest'] = 'Mae anfonwr y neges hwn wedi gofyn am hysbysiad eich bod wedi darllen y neges. Hoffech chi hysbysu\'r anfonwr?';
 $labels['receiptread'] = 'Cadarnhad Derbyn (darllenwyd)';
 $labels['yourmessage'] = 'Mae hwn yn gadarnhad o dderbyn eich neges';
 $labels['receiptnote'] = 'Nodyn: Mae\'r cadarnhad hwn yn cydnabod fod y neges wedi ei ddangos ar gyfrifiadur y derbynnydd. \'Does dim sicrwydd fod y derbynydd wedi darllen neu ddeall cynnwys y neges.';
-$labels['name'] = 'Enw ddangosir';
-$labels['firstname'] = 'Enw cyntaf';
-$labels['surname'] = 'Enw olaf';
-$labels['middlename'] = 'Enw Canol';
-$labels['nameprefix'] = 'Rhagddodiad';
-$labels['namesuffix'] = 'Olddodiad';
-$labels['nickname'] = 'Llysenw';
-$labels['jobtitle'] = 'Teitl Swydd';
-$labels['department'] = 'Adran';
-$labels['gender'] = 'Rhyw';
-$labels['maidenname'] = 'Enw cyn priodi';
-$labels['email'] = 'E-bost';
-$labels['phone'] = 'Ffôn';
-$labels['address'] = 'Cyfeiriad';
-$labels['street'] = 'Stryd';
-$labels['locality'] = 'Tref/Dinas';
-$labels['zipcode'] = 'Côd Post/ZIP';
-$labels['region'] = 'Sîr/Talaith';
-$labels['country'] = 'Gwlad';
-$labels['birthday'] = 'Penblwydd';
-$labels['anniversary'] = 'Cylchwyl';
-$labels['website'] = 'Gwefan';
+
+// address boook
+$labels['name']         = 'Enw ddangosir';
+$labels['firstname']    = 'Enw cyntaf';
+$labels['surname']      = 'Enw olaf';
+$labels['middlename']   = 'Enw Canol';
+$labels['nameprefix']   = 'Rhagddodiad';
+$labels['namesuffix']   = 'Olddodiad';
+$labels['nickname']     = 'Llysenw';
+$labels['jobtitle']     = 'Teitl Swydd';
+$labels['department']   = 'Adran';
+$labels['gender']       = 'Rhyw';
+$labels['maidenname']   = 'Enw cyn priodi';
+$labels['email']        = 'E-bost';
+$labels['phone']        = 'Ffôn';
+$labels['address']      = 'Cyfeiriad';
+$labels['street']       = 'Stryd';
+$labels['locality']     = 'Tref/Dinas';
+$labels['zipcode']      = 'Côd Post/ZIP';
+$labels['region']       = 'Sîr/Talaith';
+$labels['country']      = 'Gwlad';
+$labels['birthday']     = 'Penblwydd';
+$labels['anniversary']  = 'Cylchwyl';
+$labels['website']      = 'Gwefan';
 $labels['instantmessenger'] = 'IM';
 $labels['notes'] = 'Nodiadau';
-$labels['male'] = 'gwryw';
+$labels['male']   = 'gwryw';
 $labels['female'] = 'benyw';
 $labels['manager'] = 'Rheolwr';
 $labels['assistant'] = 'Cynorthwyydd';
-$labels['typeassistant'] = 'Cynorthwyydd';
 $labels['spouse'] = 'Cymar';
 $labels['allfields'] = 'Pob maes';
 $labels['search'] = 'Chwilio';
 $labels['advsearch'] = 'Chwilio Uwch';
 $labels['advanced'] = 'Uwch';
 $labels['other'] = 'Arall';
-$labels['typeother'] = 'Arall';
-$labels['typehome'] = 'Cartref';
-$labels['typework'] = 'Gwaith';
-$labels['typemobile'] = 'Symudol';
-$labels['typemain'] = 'Prif';
-$labels['typehomefax'] = 'Ffacs Adref';
-$labels['typeworkfax'] = 'Ffacs Gwaith';
-$labels['typecar'] = 'Car';
-$labels['typepager'] = 'Peiriant Galw';
-$labels['typevideo'] = 'Fideo';
-$labels['typehomepage'] = 'Gwefan';
+
+$labels['typehome']   = 'Cartref';
+$labels['typework']   = 'Gwaith';
+$labels['typeother']  = 'Arall';
+$labels['typemobile']  = 'Symudol';
+$labels['typemain']  = 'Prif';
+$labels['typehomefax']  = 'Ffacs Adref';
+$labels['typeworkfax']  = 'Ffacs Gwaith';
+$labels['typecar']  = 'Car';
+$labels['typepager']  = 'Peiriant Galw';
+$labels['typevideo']  = 'Fideo';
+$labels['typeassistant']  = 'Cynorthwyydd';
+$labels['typehomepage']  = 'Gwefan';
 $labels['typeblog'] = 'Blog';
 $labels['typeprofile'] = 'Proffil';
+
 $labels['addfield'] = 'Ychwanegu maes...';
 $labels['addcontact'] = 'Ychwanegu cyswllt newydd';
 $labels['editcontact'] = 'Golygu cyswllt';
 $labels['contacts'] = 'Cysylltiadau';
 $labels['contactproperties'] = 'Nodweddion cyswllt';
 $labels['personalinfo'] = 'Gwybodaeth bersonol';
-$labels['edit'] = 'Golygu';
+
+$labels['edit']   = 'Golygu';
 $labels['cancel'] = 'Canslo';
-$labels['save'] = 'Cadw';
+$labels['save']   = 'Cadw';
 $labels['delete'] = 'Dileu';
 $labels['rename'] = 'Ail-enwi';
 $labels['addphoto'] = 'Ychwanegu';
 $labels['replacephoto'] = 'Amnewid';
 $labels['uploadphoto'] = 'Llwytho fyny llun';
-$labels['newcontact'] = 'Creu cerdyn cyswllt newydd';
-$labels['deletecontact'] = 'Dileu y cysylltiadau a ddewiswyd';
-$labels['composeto'] = 'Ysgrifennu neges at';
+
+$labels['newcontact']     = 'Creu cerdyn cyswllt newydd';
+$labels['deletecontact']  = 'Dileu y cysylltiadau a ddewiswyd';
+$labels['composeto']      = 'Ysgrifennu neges at';
 $labels['contactsfromto'] = 'Cysylltiadau $from i $to o $count';
-$labels['print'] = 'Argraffu';
-$labels['export'] = 'Allforio';
-$labels['exportvcards'] = 'Allforio cysylltiadau mewn fformat vCard';
+$labels['print']          = 'Argraffu';
+$labels['export']         = 'Allforio';
+$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';
-$labels['groupdelete'] = 'Dileu grŵp';
+$labels['grouprename']    = 'Ail-enwi grŵp';
+$labels['groupdelete']    = 'Dileu grŵp';
 $labels['groupremoveselected'] = 'Dileu y cysylltiadau dewiswyd o\'r grŵp';
-$labels['previouspage'] = 'Dangos y set flaenorol';
-$labels['firstpage'] = 'Dangos y set gyntaf';
-$labels['nextpage'] = 'Dangos y set nesaf';
-$labels['lastpage'] = 'Dangos y set olaf';
+
+$labels['previouspage']   = 'Dangos y set flaenorol';
+$labels['firstpage']      = 'Dangos y set gyntaf';
+$labels['nextpage']       = 'Dangos y set nesaf';
+$labels['lastpage']       = 'Dangos y set olaf';
+
 $labels['group'] = 'Grŵp';
 $labels['groups'] = 'Grwpiau';
 $labels['personaladrbook'] = 'Cyfeiriadau Personol';
+
 $labels['searchsave'] = 'Cadw chwiliad';
 $labels['searchdelete'] = 'Dileu chwiliad';
+
 $labels['import'] = 'Mewnforio';
 $labels['importcontacts'] = 'Mewnforio cysylltiadau';
 $labels['importfromfile'] = 'Mewnforio o ffeil:';
@@ -307,35 +366,43 @@ $labels['importtarget'] = 'Ychwanegu cysylltiadau newydd i\'r llyfr cyfeiriad:';
 $labels['importreplace'] = 'Dileu y llyfr cyfeiriadau cyfan wrth lwytho';
 $labels['importdesc'] = 'Fe allwch chi lwytho fyny cysylltiadau o lyfr cyfeiriadau presennol.<br/>Ar hyn o bryd, rydym yn cefnogi mewnforio cyfeiriadau o\'r fformatau <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> neu CSV.';
 $labels['done'] = 'Wedi gorffen';
+
+// settings
 $labels['settingsfor'] = 'Gosodiadau ar gyfer';
 $labels['about'] = 'Amdan';
 $labels['preferences'] = 'Dewisiadau';
 $labels['userpreferences'] = 'Dewisiadau\'r defnyddiwr';
 $labels['editpreferences'] = 'Golygu dewisiadau\'r defnyddiwr';
+
 $labels['identities'] = 'Personoliaethau';
 $labels['manageidentities'] = 'Rheoli personoliaethau ar gyfer y cyfri hwn';
 $labels['newidentity'] = 'Personoliaeth newydd';
+
 $labels['newitem'] = 'Eitem newydd';
 $labels['edititem'] = 'Golygu eitem';
+
 $labels['preferhtml'] = 'Dangos HTML';
 $labels['defaultcharset'] = 'Set Nodau Diofyn';
 $labels['htmlmessage'] = 'Neges HTML';
+$labels['messagepart'] = 'Rhan';
+$labels['digitalsig'] = 'Llofnod Digidol';
 $labels['dateformat'] = 'Fformat dyddiad';
 $labels['timeformat'] = 'Fformat amser';
 $labels['prettydate'] = 'Dyddiadau pert';
-$labels['setdefault'] = 'Rhagosod';
-$labels['autodetect'] = 'Awto';
-$labels['language'] = 'Iaith';
-$labels['timezone'] = 'Parth amser';
-$labels['pagesize'] = 'Rhesi ar bob tudalen';
+$labels['setdefault']  = 'Rhagosod';
+$labels['autodetect']  = 'Awto';
+$labels['language']  = 'Iaith';
+$labels['timezone']  = 'Parth amser';
+$labels['pagesize']  = 'Rhesi ar bob tudalen';
 $labels['signature'] = 'Llofnod';
-$labels['dstactive'] = 'Amser arbed golau ddydd';
+$labels['dstactive']  = 'Amser arbed golau ddydd';
 $labels['showinextwin'] = 'Agor neges mewn ffenest newydd';
 $labels['composeextwin'] = 'Ysgrifennu mewn ffenest newydd';
 $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';
@@ -358,11 +425,11 @@ $labels['showremoteimages'] = 'Dangos lluniau o wefannau allanol';
 $labels['fromknownsenders'] = 'o ddanfonwyr hysbys';
 $labels['always'] = 'bob amser';
 $labels['showinlineimages'] = 'Dangos lluniau atodol islaw\'r neges';
-$labels['autosavedraft'] = 'Cadw drafft yn awtomatig';
-$labels['everynminutes'] = 'bob $n munud';
-$labels['refreshinterval'] = 'Ail-lwytho (edrych am negeseuon newydd ayyb)';
-$labels['never'] = 'byth';
-$labels['immediately'] = 'ar unwaith';
+$labels['autosavedraft']  = 'Cadw drafft yn awtomatig';
+$labels['everynminutes']  = 'bob $n munud';
+$labels['refreshinterval']  = 'Ail-lwytho (edrych am negeseuon newydd ayyb)';
+$labels['never']  = 'byth';
+$labels['immediately']  = 'ar unwaith';
 $labels['messagesdisplaying'] = 'Dangos Negeseuon';
 $labels['messagescomposition'] = 'Ysgrifennu Negeseuon';
 $labels['mimeparamfolding'] = 'Enw atodiadau';
@@ -389,12 +456,9 @@ $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';
+$labels['previewpanemarkread']  = 'Nodi negeseuon rhagolwg fel darllenwyd';
+$labels['afternseconds']  = 'ar ôl $n eiliad';
 $labels['reqmdn'] = 'Bob amser gofyn am dderbynneb danfon';
 $labels['reqdsn'] = 'Gofyn am hysbysiad statws danfon bob amser';
 $labels['replysamefolder'] = 'Rhoi atebion yn yr un ffolder i\'r neges sy\'n cael ei ateb';
@@ -411,13 +475,15 @@ $labels['mailtoprotohandler'] = 'Cofrestru trafodwr protocol ar gyfer dolenni ma
 $labels['forwardmode'] = 'Danfon neges ymlaen';
 $labels['inline'] = 'mewnlin';
 $labels['asattachment'] = 'fel atodiad';
-$labels['folder'] = 'Ffolder';
-$labels['foldername'] = 'Enw ffolder';
-$labels['subscribed'] = 'Tanysgrifwyd';
+
+$labels['folder']  = 'Ffolder';
+$labels['folders']  = 'Ffolderi';
+$labels['foldername']  = 'Enw ffolder';
+$labels['subscribed']  = 'Tanysgrifwyd';
 $labels['messagecount'] = 'Negeseuon';
-$labels['create'] = 'Creu';
-$labels['createfolder'] = 'Creu ffolder newydd';
-$labels['managefolders'] = 'Rheoli ffolderi';
+$labels['create']  = 'Creu';
+$labels['createfolder']  = 'Creu ffolder newydd';
+$labels['managefolders']  = 'Rheoli ffolderi';
 $labels['specialfolders'] = 'Ffolderi arbennig';
 $labels['properties'] = 'Nodweddion';
 $labels['folderproperties'] = 'Ffolder nodweddion';
@@ -427,23 +493,29 @@ $labels['info'] = 'Gwybodaeth';
 $labels['getfoldersize'] = 'Cliciwch i gael maint ffolder';
 $labels['changesubscription'] = 'Cliciwch i newid y tanysgrifiad';
 $labels['foldertype'] = 'Math Ffolder';
-$labels['personalfolder'] = 'Ffolder Preifat';
-$labels['otherfolder'] = 'Ffolder Defnyddiwr Arall';
-$labels['sharedfolder'] = 'Ffolder Cyhoeddus';
+$labels['personalfolder']  = 'Ffolder Preifat';
+$labels['otherfolder']  = 'Ffolder Defnyddiwr Arall';
+$labels['sharedfolder']  = 'Ffolder Cyhoeddus';
+
 $labels['sortby'] = 'Trefnu yn ôl';
-$labels['sortasc'] = 'Trefn esgynnol';
+$labels['sortasc']  = 'Trefn esgynnol';
 $labels['sortdesc'] = 'Trefn ddisgynnol';
 $labels['undo'] = 'Dad-wneud';
+
 $labels['installedplugins'] = 'Ategynnau wedi eu gosod';
 $labels['plugin'] = 'Ategyn';
 $labels['version'] = 'Fersiwn';
 $labels['source'] = 'Ffynhonnell';
 $labels['license'] = 'Trwydded';
 $labels['support'] = 'Gofyn am gymorth';
+
+// units
 $labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
 $labels['GB'] = 'GB';
+
+// character sets
 $labels['unicode'] = 'Unicode';
 $labels['english'] = 'Saesneg';
 $labels['westerneuropean'] = 'Gorllewin Ewropeaidd';
@@ -463,3 +535,4 @@ $labels['japanese'] = 'Japaneaidd';
 $labels['korean'] = 'Corëeg';
 $labels['chinese'] = 'Tsieineaidd';
 
+?>
diff --git a/program/localization/cy_GB/messages.inc b/program/localization/cy_GB/messages.inc
index 508feef6b..edadc3b45 100644
--- a/program/localization/cy_GB/messages.inc
+++ b/program/localization/cy_GB/messages.inc
@@ -2,20 +2,23 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/cy_GB/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Dafydd Tomos                                                  |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['errortitle'] = 'Fe gafwyd gwall!';
-$messages['loginfailed'] = 'Methwyd a\'ch mewngofnodi';
+$messages['errortitle']  = 'Fe gafwyd gwall!';
+$messages['loginfailed']  = 'Methwyd a\'ch mewngofnodi';
 $messages['cookiesdisabled'] = 'Nid yw eich porwr yn derbyn cwcis';
 $messages['sessionerror'] = 'Mae\'r sesiwn yn anghywir neu wedi dod i ben';
 $messages['storageerror'] = 'Methwyd cysylltu a\'r gweinydd IMAP';
@@ -25,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';
@@ -57,11 +62,11 @@ $messages['errormoving'] = 'Methwyd symud y neges';
 $messages['errorcopying'] = 'Methwyd copïo\'r neges(euon)';
 $messages['errordeleting'] = 'Methwyd dileu y neges';
 $messages['errormarking'] = 'Methwyd nodi y neges';
-$messages['deletecontactconfirm'] = 'Ydych chi wir am ddileu y cysylltiadau ddewiswyd?';
-$messages['deletegroupconfirm'] = 'Ydych chi wir am ddileu\'r grŵp dewiswyd?';
+$messages['deletecontactconfirm']  = 'Ydych chi wir am ddileu y cysylltiadau ddewiswyd?';
+$messages['deletegroupconfirm']  = 'Ydych chi wir am ddileu\'r grŵp dewiswyd?';
 $messages['deletemessagesconfirm'] = 'Ydych chi wir am ddileu y neges(euon) ddewiswyd?';
-$messages['deletefolderconfirm'] = 'Ydych chi wir am ddileu y ffolder yma?';
-$messages['purgefolderconfirm'] = 'Ydych chi wir am ddileu yr holl negeseuon yn y ffolder yma?';
+$messages['deletefolderconfirm']  = 'Ydych chi wir am ddileu y ffolder yma?';
+$messages['purgefolderconfirm']  = 'Ydych chi wir am ddileu yr holl negeseuon yn y ffolder yma?';
 $messages['contactdeleting'] = 'Dileu cyswllt/cysylltiadau...';
 $messages['groupdeleting'] = 'Yn dileu grŵp...';
 $messages['folderdeleting'] = 'Yn dileu ffolder...';
@@ -70,11 +75,11 @@ $messages['foldersubscribing'] = 'Yn tanysgrifio i\'r ffolder...';
 $messages['folderunsubscribing'] = 'Yn dad-danysgrifio i\'r ffolder...';
 $messages['formincomplete'] = 'Nid oedd y ffurflen wedi ei gwblhau yn llawn';
 $messages['noemailwarning'] = 'Rhowch gyfeiriad e-bost dilys';
-$messages['nonamewarning'] = 'Rhowch enw';
+$messages['nonamewarning']  = 'Rhowch enw';
 $messages['nopagesizewarning'] = 'Rhowch maint tudalen';
 $messages['nosenderwarning'] = 'Rhowch gyfeiriad e-bost y danfonwr';
 $messages['norecipientwarning'] = 'Rhowch o leiaf un derbynnydd';
-$messages['nosubjectwarning'] = 'Mae\'r pennawd "Pwnc" yn wag. Hoffech chi roi un fewn nawr?';
+$messages['nosubjectwarning']  = 'Mae\'r pennawd "Pwnc" yn wag. Hoffech chi roi un fewn nawr?';
 $messages['nobodywarning'] = 'Danfon y neges hwn heb destun?';
 $messages['notsentwarning'] = 'Ni ddanfonwyd y neges. Hoffech chi gael gwared a\'r neges?';
 $messages['noldapserver'] = 'Dewiswch weinydd ldap i chwilio';
@@ -163,3 +168,4 @@ $messages['messagetoobig'] = 'Mae darn y neges yn rhy fawr i\'w brosesu.';
 $messages['attachmentvalidationerror'] = 'RHYBUDD! Mae\'r atodiad yn amheus oherwydd nid yw ei fath yn gymharu\'r gyda\'r math ddatganwyd yn y neges. Os nad ydych yn ymddiried yn y danfonwr, ni ddylech agor hwn yn y porwr oherwydd fe all gynnwys ffeil maleisus.<br></br><em>Disgwylwyd:$expected;canfuwyd:$detected</em>';
 $messages['noscriptwarning'] = 'Rhybudd: Mae\'r gwasanaeth gwebost angen Javascript i weithio! Er mwyn ei ddefnyddio, galluogwch Javascript yng ngosodiadau eich porwr.';
 
+?>
diff --git a/program/localization/da_DK/labels.inc b/program/localization/da_DK/labels.inc
index 0e1dc0063..02d7dd9e3 100644
--- a/program/localization/da_DK/labels.inc
+++ b/program/localization/da_DK/labels.inc
@@ -2,58 +2,78 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/da_DK/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = 'Velkommen til $product';
-$labels['username'] = 'Brugernavn';
-$labels['password'] = 'Adgangskode';
-$labels['server'] = 'Server';
-$labels['login'] = 'Log på';
-$labels['logout'] = 'Log af';
-$labels['mail'] = 'E-mail';
+
+// login page
+$labels['welcome']   = 'Velkommen til $product';
+$labels['username']  = 'Brugernavn';
+$labels['password']  = 'Adgangskode';
+$labels['server']    = 'Server';
+$labels['login']     = 'Log på';
+
+// taskbar
+$labels['logout']   = 'Log af';
+$labels['mail']     = 'E-mail';
 $labels['settings'] = 'Indstillinger';
 $labels['addressbook'] = 'Adressebog';
-$labels['inbox'] = 'Indbakke';
+
+// mailbox names
+$labels['inbox']  = 'Indbakke';
 $labels['drafts'] = 'Kladder';
-$labels['sent'] = 'Sendt post';
-$labels['trash'] = 'Papirkurv';
-$labels['junk'] = 'Spam';
+$labels['sent']   = 'Sendt post';
+$labels['trash']  = 'Papirkurv';
+$labels['junk']   = 'Spam';
+
+// message listing
 $labels['subject'] = 'Emne';
-$labels['from'] = 'Afsender';
-$labels['to'] = 'Modtager';
-$labels['cc'] = 'Cc';
-$labels['bcc'] = 'Bcc';
+$labels['from']    = 'Afsender';
+$labels['sender']  = 'Afsender';
+$labels['to']      = 'Modtager';
+$labels['cc']      = 'Cc';
+$labels['bcc']     = 'Bcc';
 $labels['replyto'] = 'Svar til';
 $labels['followupto'] = 'Opfølgning til';
-$labels['date'] = 'Dato';
-$labels['size'] = 'Størrelse';
+$labels['date']    = 'Dato';
+$labels['size']    = 'Størrelse';
 $labels['priority'] = 'Prioritet';
 $labels['organization'] = 'Firma';
 $labels['readstatus'] = 'Læst status';
 $labels['listoptions'] = 'Listeindstillinger';
+
 $labels['mailboxlist'] = 'Mapper';
-$labels['folders'] = 'Mapper';
 $labels['messagesfromto'] = 'Besked $from til $to af $count';
 $labels['threadsfromto'] = 'Tråd $from til $to af $count';
 $labels['messagenrof'] = 'Besked $nr af $count';
 $labels['fromtoshort'] = '$from – $to af $count';
-$labels['copy'] = 'Kopiér';
-$labels['move'] = 'Flyt';
-$labels['moveto'] = 'Flyt til...';
+
+$labels['copy']     = 'Kopiér';
+$labels['move']     = 'Flyt';
+$labels['moveto']   = 'Flyt til...';
 $labels['download'] = 'Download';
+$labels['open']     = 'Åben';
+$labels['showattachment'] = 'Vis';
+$labels['showanyway'] = 'Vis alligevel';
+
 $labels['filename'] = 'Filnavn';
 $labels['filesize'] = 'Filstørrelse';
+
 $labels['addtoaddressbook'] = 'Tilføj til adressebog';
+
+// weekdays short
 $labels['sun'] = 'Søn';
 $labels['mon'] = 'Man';
 $labels['tue'] = 'Tir';
@@ -61,79 +81,90 @@ $labels['wed'] = 'Ons';
 $labels['thu'] = 'Tor';
 $labels['fri'] = 'Fre';
 $labels['sat'] = 'Lør';
-$labels['sunday'] = 'Søndag';
-$labels['monday'] = 'Mandag';
-$labels['tuesday'] = 'Tirsdag';
+
+// weekdays long
+$labels['sunday']    = 'Søndag';
+$labels['monday']    = 'Mandag';
+$labels['tuesday']   = 'Tirsdag';
 $labels['wednesday'] = 'Onsdag';
-$labels['thursday'] = 'Torsdag';
-$labels['friday'] = 'Fredag';
-$labels['saturday'] = 'Lørdag';
-$labels['jan'] = 'Jan';
-$labels['feb'] = 'Feb';
-$labels['mar'] = 'Mar';
-$labels['apr'] = 'Apr';
-$labels['may'] = 'Maj';
-$labels['longmay'] = 'Maj';
-$labels['jun'] = 'Jun';
-$labels['jul'] = 'Jul';
-$labels['aug'] = 'Aug';
-$labels['sep'] = 'Sep';
-$labels['oct'] = 'Okt';
-$labels['nov'] = 'Nov';
-$labels['dec'] = 'Dec';
-$labels['longjan'] = 'Januar';
-$labels['longfeb'] = 'Februar';
-$labels['longmar'] = 'Marts';
-$labels['longapr'] = 'April';
-$labels['longjun'] = 'Juni';
-$labels['longjul'] = 'Juli';
-$labels['longaug'] = 'August';
-$labels['longsep'] = 'September';
-$labels['longoct'] = 'Oktober';
-$labels['longnov'] = 'November';
-$labels['longdec'] = 'December';
+$labels['thursday']  = 'Torsdag';
+$labels['friday']    = 'Fredag';
+$labels['saturday']  = 'Lørdag';
+
+// months short
+$labels['jan']	= 'Jan';
+$labels['feb']	= 'Feb';
+$labels['mar']	= 'Mar';
+$labels['apr']	= 'Apr';
+$labels['may']	= 'Maj';
+$labels['jun']	= 'Jun';
+$labels['jul'] 	= 'Jul';
+$labels['aug']	= 'Aug';
+$labels['sep']	= 'Sep';
+$labels['oct']	= 'Okt';
+$labels['nov']	= 'Nov';
+$labels['dec']	= 'Dec';
+
+// months long
+$labels['longjan']	= 'Januar';
+$labels['longfeb']	= 'Februar';
+$labels['longmar']	= 'Marts';
+$labels['longapr']	= 'April';
+$labels['longmay']	= 'Maj';
+$labels['longjun']	= 'Juni';
+$labels['longjul']	= 'Juli';
+$labels['longaug']	= 'August';
+$labels['longsep']	= 'September';
+$labels['longoct']	= 'Oktober';
+$labels['longnov']	= 'November';
+$labels['longdec']	= 'December';
+
 $labels['today'] = 'I dag';
-$labels['refresh'] = 'Opdatér';
-$labels['checkmail'] = 'Se efter nye beskeder';
-$labels['compose'] = 'Ny besked';
-$labels['writenewmessage'] = 'Skriv en ny besked';
-$labels['reply'] = 'Svar';
-$labels['replytomessage'] = 'Svar på denne besked';
+
+// toolbar buttons
+$labels['refresh']          = 'Opdatér';
+$labels['checkmail']        = 'Se efter nye beskeder';
+$labels['compose']          = 'Ny besked';
+$labels['writenewmessage']  = 'Skriv en ny besked';
+$labels['reply']            = 'Svar';
+$labels['replytomessage']   = 'Svar på denne besked';
 $labels['replytoallmessage'] = 'Svar til alle modtagere';
-$labels['replyall'] = 'Svar alle';
-$labels['replylist'] = 'Svar til listen';
-$labels['forward'] = 'Videresend';
-$labels['forwardinline'] = 'Videresend';
+$labels['replyall']         = 'Svar alle';
+$labels['replylist']        = 'Svar til listen';
+$labels['forward']          = 'Videresend';
+$labels['forwardinline']    = 'Videresend';
 $labels['forwardattachment'] = 'Videresend som vedhæftning';
-$labels['forwardmessage'] = 'Videresend denne besked';
-$labels['deletemessage'] = 'Slet besked';
+$labels['forwardmessage']   = 'Videresend denne besked';
+$labels['deletemessage']    = 'Slet besked';
 $labels['movemessagetotrash'] = 'Flyt besked til skrald';
-$labels['printmessage'] = 'Udskriv denne besked';
-$labels['previousmessage'] = 'Vis forrige besked';
-$labels['firstmessage'] = 'Vis første besked';
-$labels['nextmessage'] = 'Vis næste besked';
-$labels['lastmessage'] = 'Vis sidste besked';
-$labels['backtolist'] = 'Tilbage til oversigten';
-$labels['viewsource'] = 'Vis kilde';
-$labels['mark'] = 'Markér';
-$labels['markmessages'] = 'Markér beskeder';
-$labels['markread'] = 'Som læst';
-$labels['markunread'] = 'Som ulæst';
-$labels['markflagged'] = 'Som markeret';
-$labels['markunflagged'] = 'Som umarkeret';
-$labels['moreactions'] = 'Flere funktioner...';
-$labels['more'] = 'Mere';
-$labels['back'] = 'Tilbage';
-$labels['options'] = 'Indstillinger';
+$labels['printmessage']     = 'Udskriv denne besked';
+$labels['previousmessage']  = 'Vis forrige besked';
+$labels['firstmessage']     = 'Vis første besked';
+$labels['nextmessage']      = 'Vis næste besked';
+$labels['lastmessage']      = 'Vis sidste besked';
+$labels['backtolist']       = 'Tilbage til oversigten';
+$labels['viewsource']       = 'Vis kilde';
+$labels['mark']             = 'Markér';
+$labels['markmessages']     = 'Markér beskeder';
+$labels['markread']         = 'Som læst';
+$labels['markunread']       = 'Som ulæst';
+$labels['markflagged']      = 'Som markeret';
+$labels['markunflagged']    = 'Som umarkeret';
+$labels['moreactions']      = 'Flere funktioner...';
+$labels['more']             = 'Mere';
+$labels['back']             = 'Tilbage';
+$labels['options']          = 'Indstillinger';
+
 $labels['select'] = 'Vælg';
 $labels['all'] = 'Alle';
 $labels['none'] = 'Ingen';
-$labels['nonesort'] = 'Ingen';
 $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';
 $labels['filter'] = 'Filtrer';
 $labels['list'] = 'Liste';
@@ -142,12 +173,14 @@ $labels['expand-all'] = 'Udfold alle';
 $labels['expand-unread'] = 'Udfold ulæste';
 $labels['collapse-all'] = 'Fold alle';
 $labels['threaded'] = 'Trådet';
+
 $labels['autoexpand_threads'] = 'Udfold besked tråde';
 $labels['do_expand'] = 'alle tråde';
 $labels['expand_only_unread'] = 'kun dem med ulæste beskeder';
 $labels['fromto'] = 'Afsender/Modtager';
 $labels['flag'] = 'Flag';
 $labels['attachment'] = 'Vedhæftning';
+$labels['nonesort'] = 'Ingen';
 $labels['sentdate'] = 'Sendt dato';
 $labels['arrival'] = 'Modtaget dato';
 $labels['asc'] = 'stigende';
@@ -156,175 +189,220 @@ $labels['listcolumns'] = 'Vist kolonne';
 $labels['listsorting'] = 'Sorteringskolonne';
 $labels['listorder'] = 'Sorter efter';
 $labels['listmode'] = 'Listevisningsmode';
+
 $labels['folderactions'] = 'Mappehandlinger...';
 $labels['compact'] = 'Ryd op';
 $labels['empty'] = 'Tøm';
+
 $labels['quota'] = 'Diskforbrug';
-$labels['unknown'] = 'ukendt';
-$labels['unlimited'] = 'ubegrænset';
-$labels['quicksearch'] = 'Hurtigsøg';
-$labels['resetsearch'] = 'Nulstil søgning';
-$labels['searchmod'] = 'Søgeparametre';
-$labels['msgtext'] = 'Hele beskeden';
+$labels['unknown']  = 'ukendt';
+$labels['unlimited']  = 'ubegrænset';
+
+$labels['quicksearch']  = 'Hurtigsøg';
+$labels['resetsearch']  = 'Nulstil søgning';
+$labels['searchmod']  = 'Søgeparametre';
+$labels['msgtext']  = 'Hele beskeden';
+$labels['body']  = 'Body';
+
 $labels['openinextwin'] = 'Åbn i nyt vindue';
 $labels['emlsave'] = 'Download (.eml)';
-$labels['editasnew'] = 'Redigér som ny';
-$labels['sendmessage'] = 'Send besked';
-$labels['savemessage'] = 'Gem som kladde';
-$labels['addattachment'] = 'Vedhæft en fil';
-$labels['charset'] = 'Tegnsæt';
-$labels['editortype'] = 'Tekstbehandler';
-$labels['returnreceipt'] = 'Anmod om kvittering ved læst';
-$labels['dsn'] = 'Anmod om leveringsstatus';
+$labels['changeformattext'] = 'Vis i ren tekst format';
+$labels['changeformathtml'] = 'Vis i HTML format';
+
+// message compose
+$labels['editasnew']      = 'Redigér som ny';
+$labels['send']           = 'Send';
+$labels['sendmessage']    = 'Send besked';
+$labels['savemessage']    = 'Gem som kladde';
+$labels['addattachment']  = 'Vedhæft en fil';
+$labels['charset']        = 'Tegnsæt';
+$labels['editortype']     = 'Tekstbehandler';
+$labels['returnreceipt']  = 'Anmod om kvittering ved læst';
+$labels['dsn']            = 'Anmod om leveringsstatus';
 $labels['mailreplyintro'] = '$sender skrev den $date:';
 $labels['originalmessage'] = 'Original besked';
-$labels['editidents'] = 'Ret identiteter';
-$labels['spellcheck'] = 'Stav';
+
+$labels['editidents']    = 'Ret identiteter';
+$labels['spellcheck']    = 'Stav';
 $labels['checkspelling'] = 'Stavekontrol';
 $labels['resumeediting'] = 'Genoptag redigering';
-$labels['revertto'] = 'Vend tilbage til';
+$labels['revertto']      = 'Vend tilbage til';
+
 $labels['attach'] = 'Vedhæft';
 $labels['attachments'] = 'Vedhæftninger';
 $labels['upload'] = 'Overfør';
 $labels['uploadprogress'] = '$percent ($current af $total)';
-$labels['close'] = 'Luk';
-$labels['messageoptions'] = 'Beskedmuligheder...';
-$labels['low'] = 'Lav';
-$labels['lowest'] = 'Lavest';
-$labels['normal'] = 'Normal';
-$labels['high'] = 'Høj';
+$labels['close']  = 'Luk';
+$labels['messageoptions']  = 'Beskedmuligheder...';
+
+$labels['low']     = 'Lav';
+$labels['lowest']  = 'Lavest';
+$labels['normal']  = 'Normal';
+$labels['high']    = 'Høj';
 $labels['highest'] = 'Højest';
-$labels['nosubject'] = '(intet emne)';
+
+$labels['nosubject']  = '(intet emne)';
 $labels['showimages'] = 'Vis billeder';
 $labels['alwaysshow'] = 'Vis altid billeder fra $sender';
-$labels['isdraft'] = 'Dette er en kladde.';
+$labels['isdraft']    = 'Dette er en kladde.';
+$labels['andnmore']   = '$nr yderligere...';
+$labels['togglemoreheaders'] = 'Vis yderligere headers';
+$labels['togglefullheaders'] = 'Ændre rå brevhoveder';
+
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Almindelig tekst';
 $labels['savesentmessagein'] = 'Gem afsendt besked i';
 $labels['dontsave'] = 'gem ikke';
 $labels['maxuploadsize'] = 'Maksimale tilladte filstørrelse er $size';
+
 $labels['addcc'] = 'Tilføj Cc';
 $labels['addbcc'] = 'Tilføj Bcc';
 $labels['addreplyto'] = 'Tilføj Svar-Til adresse';
 $labels['addfollowupto'] = 'Tilføj følg-op adresse';
+
+// mdn
 $labels['mdnrequest'] = 'Afsenderen af denne besked har bedt om at modtage en bekræftelse når du læser beskeden. Vil du sende kvittering for læsning?';
 $labels['receiptread'] = 'Send kvittering for læsning';
 $labels['yourmessage'] = 'Dette er en kvittering for at din besked er blevet vist';
 $labels['receiptnote'] = 'Bemærk: Denne kvittering bekræfter udelukkende at beskeden blev vist på modtagerens computer. Der er ingen garanti for at modtageren har læst eller forstået beskedens indhold.';
-$labels['name'] = 'Vist navn';
-$labels['firstname'] = 'Fornavn';
-$labels['surname'] = 'Efternavn';
-$labels['middlename'] = 'Mellemnavn';
-$labels['nameprefix'] = 'Præfiks';
-$labels['namesuffix'] = 'Suffiks';
-$labels['nickname'] = 'Alias/Kaldenavn';
-$labels['jobtitle'] = 'Jobtitel';
-$labels['department'] = 'Afdeling';
-$labels['gender'] = 'Køn';
-$labels['maidenname'] = 'Pigenavn';
-$labels['email'] = 'E-mail';
-$labels['phone'] = 'Telefon';
-$labels['address'] = 'Adresse';
-$labels['street'] = 'Vej';
-$labels['locality'] = 'By';
-$labels['zipcode'] = 'Postnr.';
-$labels['region'] = 'Område/region';
-$labels['country'] = 'Land';
-$labels['birthday'] = 'Fødselsdag';
-$labels['anniversary'] = 'Årsdag';
-$labels['website'] = 'Hjemmeside';
+
+// address boook
+$labels['name']         = 'Vist navn';
+$labels['firstname']    = 'Fornavn';
+$labels['surname']      = 'Efternavn';
+$labels['middlename']   = 'Mellemnavn';
+$labels['nameprefix']   = 'Præfiks';
+$labels['namesuffix']   = 'Suffiks';
+$labels['nickname']     = 'Alias/Kaldenavn';
+$labels['jobtitle']     = 'Jobtitel';
+$labels['department']   = 'Afdeling';
+$labels['gender']       = 'Køn';
+$labels['maidenname']   = 'Pigenavn';
+$labels['email']        = 'E-mail';
+$labels['phone']        = 'Telefon';
+$labels['address']      = 'Adresse';
+$labels['street']       = 'Vej';
+$labels['locality']     = 'By';
+$labels['zipcode']      = 'Postnr.';
+$labels['region']       = 'Område/region';
+$labels['country']      = 'Land';
+$labels['birthday']     = 'Fødselsdag';
+$labels['anniversary']  = 'Årsdag';
+$labels['website']      = 'Hjemmeside';
 $labels['instantmessenger'] = 'IM';
 $labels['notes'] = 'Noter';
-$labels['male'] = 'Mand';
+$labels['male']   = 'Mand';
 $labels['female'] = 'Kvinde';
 $labels['manager'] = 'Manager';
 $labels['assistant'] = 'Assistent';
-$labels['typeassistant'] = 'Assistent';
 $labels['spouse'] = 'Ægtefælle/partner';
 $labels['allfields'] = 'Alle felter';
 $labels['search'] = 'Søg';
 $labels['advsearch'] = 'Avanceret søg';
 $labels['advanced'] = 'Avanceret';
 $labels['other'] = 'Andet';
-$labels['typeother'] = 'Andet';
-$labels['typehome'] = 'Hjem';
-$labels['typework'] = 'Arbejde';
-$labels['typemobile'] = 'Mobil';
-$labels['typemain'] = 'Hovednr.';
-$labels['typehomefax'] = 'Hjemme - fax';
-$labels['typeworkfax'] = 'Arbejde - fax';
-$labels['typecar'] = 'Bil';
-$labels['typepager'] = 'Personsøger';
-$labels['typevideo'] = 'Video';
-$labels['typehomepage'] = 'Hjemmeside';
+
+$labels['typehome']   = 'Hjem';
+$labels['typework']   = 'Arbejde';
+$labels['typeother']  = 'Andet';
+$labels['typemobile']  = 'Mobil';
+$labels['typemain']  = 'Hovednr.';
+$labels['typehomefax']  = 'Hjemme - fax';
+$labels['typeworkfax']  = 'Arbejde - fax';
+$labels['typecar']  = 'Bil';
+$labels['typepager']  = 'Personsøger';
+$labels['typevideo']  = 'Video';
+$labels['typeassistant']  = 'Assistent';
+$labels['typehomepage']  = 'Hjemmeside';
 $labels['typeblog'] = 'Blog';
 $labels['typeprofile'] = 'Profil';
+
 $labels['addfield'] = 'Tilføj felt...';
 $labels['addcontact'] = 'Tilføj ny kontakt';
 $labels['editcontact'] = 'Redigér kontakt';
 $labels['contacts'] = 'Kontakter';
 $labels['contactproperties'] = 'Kontaktegenskaber';
 $labels['personalinfo'] = 'Personlig information';
-$labels['edit'] = 'Redigér';
+
+$labels['edit']   = 'Redigér';
 $labels['cancel'] = 'Annullér';
-$labels['save'] = 'Gem';
+$labels['save']   = 'Gem';
 $labels['delete'] = 'Slet';
 $labels['rename'] = 'Omdøb';
 $labels['addphoto'] = 'Tilføj';
 $labels['replacephoto'] = 'Erstat';
 $labels['uploadphoto'] = 'Overfør billede';
-$labels['newcontact'] = 'Opret nyt kontaktkort';
-$labels['deletecontact'] = 'Slet valgte kontakter';
-$labels['composeto'] = 'Skriv besked til';
+
+$labels['newcontact']     = 'Opret nyt kontaktkort';
+$labels['deletecontact']  = 'Slet valgte kontakter';
+$labels['composeto']      = 'Skriv besked til';
 $labels['contactsfromto'] = 'Kontakter $from til $to af $count';
-$labels['print'] = 'Udskriv';
-$labels['export'] = 'Eksportér';
-$labels['exportvcards'] = 'Eksportér kontakter i vCard format';
+$labels['print']          = 'Udskriv';
+$labels['export']         = 'Eksportér';
+$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';
-$labels['groupdelete'] = 'Slet gruppe';
+$labels['grouprename']    = 'Omdøb gruppe';
+$labels['groupdelete']    = 'Slet gruppe';
 $labels['groupremoveselected'] = 'Fjern markerede kontakter fra gruppen';
-$labels['previouspage'] = 'Vis den forrige side';
-$labels['firstpage'] = 'Vis første side';
-$labels['nextpage'] = 'Vis næste side';
-$labels['lastpage'] = 'Vis sidste side';
+
+$labels['previouspage']   = 'Vis den forrige side';
+$labels['firstpage']      = 'Vis første side';
+$labels['nextpage']       = 'Vis næste side';
+$labels['lastpage']       = 'Vis sidste side';
+
 $labels['group'] = 'Gruppe';
 $labels['groups'] = 'Grupper';
 $labels['personaladrbook'] = 'Personlige adresser';
+
 $labels['searchsave'] = 'Gem søgning';
 $labels['searchdelete'] = 'Slet søgning';
+
 $labels['import'] = 'Importér';
 $labels['importcontacts'] = 'Importér kontakter';
 $labels['importfromfile'] = 'Importér fra fil:';
 $labels['importtarget'] = 'Tilføj nye kontakter til adressebogen:';
 $labels['importreplace'] = 'Overskriv hele adressebogen';
+$labels['importdesc'] = 'Du kan uploade kontakter fra en eksisterende adressebog. <br/>I øjeblikket supportere vi import af adresser fra <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> og CSV (komma-separeret) data format.';
 $labels['done'] = 'Færdig';
+
+// settings
 $labels['settingsfor'] = 'Indstillinger for';
 $labels['about'] = 'Om';
 $labels['preferences'] = 'Indstillinger';
 $labels['userpreferences'] = 'Brugerindstillinger';
 $labels['editpreferences'] = 'Redigér brugerindstillinger';
+
 $labels['identities'] = 'Identiteter';
 $labels['manageidentities'] = 'Styr identiteterne for denne konto';
 $labels['newidentity'] = 'Ny identitet';
+
 $labels['newitem'] = 'Nyt punkt';
 $labels['edititem'] = 'Redigér punkt';
+
 $labels['preferhtml'] = 'Vis HTML';
 $labels['defaultcharset'] = 'Standard tegnkodning';
 $labels['htmlmessage'] = 'HTML-besked';
+$labels['messagepart'] = 'Del';
+$labels['digitalsig'] = 'Digital signatur';
 $labels['dateformat'] = 'Datoformat';
 $labels['timeformat'] = 'Tidsformat';
 $labels['prettydate'] = 'Pæn datovisning';
-$labels['setdefault'] = 'Sæt standard';
-$labels['autodetect'] = 'Automatisk';
-$labels['language'] = 'Sprog';
-$labels['timezone'] = 'Tidszone';
-$labels['pagesize'] = 'Rækker pr. side';
+$labels['setdefault']  = 'Sæt standard';
+$labels['autodetect']  = 'Automatisk';
+$labels['language']  = 'Sprog';
+$labels['timezone']  = 'Tidszone';
+$labels['pagesize']  = 'Rækker pr. side';
 $labels['signature'] = 'Signatur';
-$labels['dstactive'] = 'Sommertid';
+$labels['dstactive']  = 'Sommertid';
+$labels['showinextwin'] = 'Åben besked i et nyt vindue';
+$labels['composeextwin'] = 'Opret besked i et nyt vindue';
 $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';
@@ -347,10 +425,11 @@ $labels['showremoteimages'] = 'Vis eksterne indlejrede billeder';
 $labels['fromknownsenders'] = 'fra kendte afsendere';
 $labels['always'] = 'altid';
 $labels['showinlineimages'] = 'Vis vedhæftede billeder under beskeden';
-$labels['autosavedraft'] = 'Gem kladde automatisk';
-$labels['everynminutes'] = 'hver $n. minut';
-$labels['never'] = 'aldrig';
-$labels['immediately'] = 'straks';
+$labels['autosavedraft']  = 'Gem kladde automatisk';
+$labels['everynminutes']  = 'hver $n. minut';
+$labels['refreshinterval']  = 'Opdater (tjek for nye beskeder m.v.)';
+$labels['never']  = 'aldrig';
+$labels['immediately']  = 'straks';
 $labels['messagesdisplaying'] = 'Viser beskeder';
 $labels['messagescomposition'] = 'Skriver nye beskeder';
 $labels['mimeparamfolding'] = 'Navne på vedhæftninger';
@@ -370,22 +449,20 @@ $labels['maintenance'] = 'Vedligeholdelse';
 $labels['newmessage'] = 'Ny besked';
 $labels['signatureoptions'] = 'Signatur-indstillinger';
 $labels['whenreplying'] = 'Når der svares';
+$labels['replyempty'] = 'Citer ikke den originale besked';
 $labels['replytopposting'] = 'begynd svar over originalen';
 $labels['replybottomposting'] = 'begynd svar under originalen';
 $labels['replyremovesignature'] = 'Fjern original signatur fra besked, når der svares';
 $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';
+$labels['previewpanemarkread']  = 'Markér forhåndsviste beskeder som læst';
+$labels['afternseconds']  = 'efter $n sekunder';
 $labels['reqmdn'] = 'Anmod altid om kvittering for læsning';
 $labels['reqdsn'] = 'Anmod altid om at leveringsstatus';
 $labels['replysamefolder'] = 'Placer svar til en besked i samme mappe som beskeden der besvares';
-$labels['defaultaddressbook'] = 'Tilføj nye kontakter til den valgte adressebog';
+$labels['defaultabook'] = 'Standard adressebog';
 $labels['autocompletesingle'] = 'Undgå alternative emailadresser under autofuldførelse';
 $labels['listnamedisplay'] = 'Vis kontakter som';
 $labels['spellcheckbeforesend'] = 'Tjek stavning inden beskeden sendes';
@@ -395,13 +472,18 @@ $labels['spellcheckignorenums'] = 'Ignorer ord med tal';
 $labels['spellcheckignorecaps'] = 'Ignorer ord hvor alle bogstaver er versaler';
 $labels['addtodict'] = 'Tilføj til ordbog';
 $labels['mailtoprotohandler'] = 'Registrer håndtering af \'mailto:\' links';
-$labels['folder'] = 'Mappe';
-$labels['foldername'] = 'Mappenavn';
-$labels['subscribed'] = 'Abonneret';
+$labels['forwardmode'] = 'Videresendelse af besked';
+$labels['inline'] = 'inline';
+$labels['asattachment'] = 'som vedhæftning';
+
+$labels['folder']  = 'Mappe';
+$labels['folders']  = 'Mapper';
+$labels['foldername']  = 'Mappenavn';
+$labels['subscribed']  = 'Abonneret';
 $labels['messagecount'] = 'Beskeder';
-$labels['create'] = 'Opret';
-$labels['createfolder'] = 'Opret ny mappe';
-$labels['managefolders'] = 'Administrér mapper';
+$labels['create']  = 'Opret';
+$labels['createfolder']  = 'Opret ny mappe';
+$labels['managefolders']  = 'Administrér mapper';
 $labels['specialfolders'] = 'Specielle mapper';
 $labels['properties'] = 'Egenskaber';
 $labels['folderproperties'] = 'Mappeegenskaber';
@@ -411,22 +493,29 @@ $labels['info'] = 'Information';
 $labels['getfoldersize'] = 'Klik for at tjekke mappestørrelse';
 $labels['changesubscription'] = 'Klik for at ændre abonnement';
 $labels['foldertype'] = 'Mappetype';
-$labels['personalfolder'] = 'Privat mappe';
-$labels['otherfolder'] = 'Anden brugers mappe';
-$labels['sharedfolder'] = 'Offentlig mappe';
+$labels['personalfolder']  = 'Privat mappe';
+$labels['otherfolder']  = 'Anden brugers mappe';
+$labels['sharedfolder']  = 'Offentlig mappe';
+
 $labels['sortby'] = 'Sortér efter';
-$labels['sortasc'] = 'Ældste først';
+$labels['sortasc']  = 'Ældste først';
 $labels['sortdesc'] = 'Nyeste først';
 $labels['undo'] = 'Fortryd';
+
+$labels['installedplugins'] = 'Installerede udvidelser';
 $labels['plugin'] = 'Plugin';
 $labels['version'] = 'Version';
 $labels['source'] = 'Kilde';
 $labels['license'] = 'Licens';
 $labels['support'] = 'Få support';
+
+// units
 $labels['B'] = 'B';
 $labels['KB'] = 'kB';
 $labels['MB'] = 'MB';
 $labels['GB'] = 'GB';
+
+// character sets
 $labels['unicode'] = 'Unicode';
 $labels['english'] = 'Engelsk';
 $labels['westerneuropean'] = 'Vesteuropæisk';
@@ -446,3 +535,4 @@ $labels['japanese'] = 'Japansk';
 $labels['korean'] = 'Koreansk';
 $labels['chinese'] = 'Kinesisk';
 
+?>
diff --git a/program/localization/da_DK/messages.inc b/program/localization/da_DK/messages.inc
index bb9038fe6..9a0b8e4a5 100644
--- a/program/localization/da_DK/messages.inc
+++ b/program/localization/da_DK/messages.inc
@@ -2,20 +2,23 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/da_DK/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Johannes Hessellund <osos@openeyes.dk>                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['errortitle'] = 'Der opstod en fejl!';
-$messages['loginfailed'] = 'Det lykkedes ikke at logge på.';
+$messages['errortitle']  = 'Der opstod en fejl!';
+$messages['loginfailed']  = 'Det lykkedes ikke at logge på.';
 $messages['cookiesdisabled'] = 'Din browser accepterer ikke cookies.';
 $messages['sessionerror'] = 'Din session er ugyldig eller udløbet.';
 $messages['storageerror'] = 'Forbindelse til e-mailserveren fejlede.';
@@ -25,10 +28,14 @@ $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.';
 $messages['loggedout'] = 'Du er nu logget af webmail. Farvel så længe!';
 $messages['mailboxempty'] = 'Postkassen er tom.';
+$messages['refreshing'] = 'Opdaterer...';
 $messages['loading'] = 'Indlæser...';
 $messages['uploading'] = 'Uploader fil...';
 $messages['uploadingmany'] = 'Uploader filer...';
@@ -55,11 +62,11 @@ $messages['errormoving'] = 'Beskeden kunne ikke flyttes.';
 $messages['errorcopying'] = 'Beskeden kunne ikke kopieres.';
 $messages['errordeleting'] = 'Beskeden kunne ikke slettes.';
 $messages['errormarking'] = 'Beskeden kunne ikke markeres.';
-$messages['deletecontactconfirm'] = 'Vil du virkelig slette den/de valgte kontakt(er)?';
-$messages['deletegroupconfirm'] = 'Vil du virkelig slette den/de valgte gruppe(r)?';
+$messages['deletecontactconfirm']  = 'Vil du virkelig slette den/de valgte kontakt(er)?';
+$messages['deletegroupconfirm']  = 'Vil du virkelig slette den/de valgte gruppe(r)?';
 $messages['deletemessagesconfirm'] = 'Vil du virkelig slette den/de valgte besked(er)?';
-$messages['deletefolderconfirm'] = 'Vil du virkelig slette den valgte mappe?';
-$messages['purgefolderconfirm'] = 'Vil du virkelig slette alle beskeder i denne mappe?';
+$messages['deletefolderconfirm']  = 'Vil du virkelig slette den valgte mappe?';
+$messages['purgefolderconfirm']  = 'Vil du virkelig slette alle beskeder i denne mappe?';
 $messages['contactdeleting'] = 'Sletter kontakt(er)...';
 $messages['groupdeleting'] = 'Sletter gruppe...';
 $messages['folderdeleting'] = 'Sletter mappen...';
@@ -68,11 +75,11 @@ $messages['foldersubscribing'] = 'Abonnere på mappen...';
 $messages['folderunsubscribing'] = 'Fjerner abonnement på mappen...';
 $messages['formincomplete'] = 'Formularen var ikke fuldstændig fyldt ud.';
 $messages['noemailwarning'] = 'Indtast venligst en gyldig e-mailadresse.';
-$messages['nonamewarning'] = 'Angiv venligst et navn.';
+$messages['nonamewarning']  = 'Angiv venligst et navn.';
 $messages['nopagesizewarning'] = 'Angiv sidestørrelsen.';
 $messages['nosenderwarning'] = 'Indtast venligst afsenders e-mailadresse.';
 $messages['norecipientwarning'] = 'Indtast mindst én modtager.';
-$messages['nosubjectwarning'] = '\'Emne\'-feltet er tomt. Kunne du tænke dig at skrive et nu?';
+$messages['nosubjectwarning']  = '\'Emne\'-feltet er tomt. Kunne du tænke dig at skrive et nu?';
 $messages['nobodywarning'] = 'Send denne besked uden tekst?';
 $messages['notsentwarning'] = 'Beskeden er ikke sendt. Vil du kassere din besked?';
 $messages['noldapserver'] = 'Vælg venligst hvilken LDAP-server der skal søges i.';
@@ -114,8 +121,9 @@ $messages['selectimportfile'] = 'Vælg venligst den fil der skal overføres.';
 $messages['addresswriterror'] = 'Der kan ikke skrives i den valgte adressebog.';
 $messages['contactaddedtogroup'] = 'Succesfuldt tilføjet kontakten til denne gruppe';
 $messages['contactremovedfromgroup'] = 'Kontakten fjernet fra denne gruppe';
+$messages['nogroupassignmentschanged'] = 'Ingen gruppetildelinger ændret.';
 $messages['importwait'] = 'Importerer, vent venligst...';
-$messages['importerror'] = 'Fejl i importen! Den uploadede fil er ikke en gyldig vCard fil.';
+$messages['importformaterror'] = 'Importering mislykkedes! Den uploadede fil indeholder ikke gyldige data til importering.';
 $messages['importconfirm'] = '<b>Importerede $inserted kontakter</b>';
 $messages['importconfirmskipped'] = '<b>Sprang over $skipped eksisterende kontakter</b>';
 $messages['opnotpermitted'] = 'Handlingen er ikke tilladt!';
@@ -157,4 +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'] = '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 443ae81f4..e64859d2c 100644
--- a/program/localization/de_CH/labels.inc
+++ b/program/localization/de_CH/labels.inc
@@ -5,7 +5,7 @@
  | localization/<lang>/labels.inc                                        |
  |                                                                       |
  | Localization file of the Roundcube Webmail client                     |
- | Copyright (C) 2005-2012, The Roundcube Dev Team                       |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -40,9 +40,9 @@ $labels['junk']   = 'Spam';
 
 // message listing
 $labels['subject'] = 'Betreff';
-$labels['from']    = 'Absender';
+$labels['from']    = 'Von';
 $labels['sender']  = 'Absender';
-$labels['to']      = 'Empfänger';
+$labels['to']      = 'An';
 $labels['cc']      = 'Kopie (CC)';
 $labels['bcc']     = 'Blind-Kopie';
 $labels['replyto'] = 'Antwort an';
@@ -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';
@@ -175,7 +177,7 @@ $labels['threaded'] = 'Gruppiert';
 $labels['autoexpand_threads'] = 'Konversationen aufklappen';
 $labels['do_expand'] = 'alle';
 $labels['expand_only_unread'] = 'nur ungelesene';
-$labels['fromto'] = 'Sender/Empfänger';
+$labels['fromto'] = 'Von/An';
 $labels['flag'] = 'Markierung';
 $labels['attachment'] = 'Anhang';
 $labels['nonesort'] = 'Keine';
@@ -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';
@@ -335,6 +339,8 @@ $labels['composeto']      = 'Nachricht verfassen';
 $labels['contactsfromto'] = 'Kontakte $from bis $to von $count';
 $labels['print']          = 'Drucken';
 $labels['export']         = 'Exportieren';
+$labels['exportall']      = 'Alle exportieren';
+$labels['exportsel']      = 'Ausgewählte exportieren';
 $labels['exportvcards']   = 'Kontakte im vCard-Format exportieren';
 $labels['newcontactgroup'] = 'Neue Adressgruppe erstellen';
 $labels['grouprename']    = 'Gruppe umbenennen';
@@ -396,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';
@@ -449,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 f9253bc08..f3697a825 100644
--- a/program/localization/de_CH/messages.inc
+++ b/program/localization/de_CH/messages.inc
@@ -5,7 +5,7 @@
  | localization/<lang>/messages.inc                                      |
  |                                                                       |
  | Localization file of the Roundcube Webmail client                     |
- | Copyright (C) 2005-2012, The Roundcube Dev Team                       |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -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 689392bab..d497a6bc6 100644
--- a/program/localization/de_DE/labels.inc
+++ b/program/localization/de_DE/labels.inc
@@ -2,60 +2,78 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/de_DE/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Arnd <bla@espenfeld.de>                                       |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = 'Willkommen bei $product';
-$labels['username'] = 'Benutzername';
-$labels['password'] = 'Passwort';
-$labels['server'] = 'Server';
-$labels['login'] = 'Anmelden';
-$labels['logout'] = 'Abmelden';
-$labels['mail'] = 'E-Mail';
+
+// login page
+$labels['welcome']   = 'Willkommen bei $product';
+$labels['username']  = 'Benutzername';
+$labels['password']  = 'Passwort';
+$labels['server']    = 'Server';
+$labels['login']     = 'Anmelden';
+
+// taskbar
+$labels['logout']   = 'Abmelden';
+$labels['mail']     = 'E-Mail';
 $labels['settings'] = 'Einstellungen';
 $labels['addressbook'] = 'Adressbuch';
-$labels['inbox'] = 'Posteingang';
+
+// mailbox names
+$labels['inbox']  = 'Posteingang';
 $labels['drafts'] = 'Entwürfe';
-$labels['sent'] = 'Gesendet';
-$labels['trash'] = 'Gelöscht';
-$labels['junk'] = 'Spam';
+$labels['sent']   = 'Gesendet';
+$labels['trash']  = 'Gelöscht';
+$labels['junk']   = 'Spam';
+
+// message listing
 $labels['subject'] = 'Betreff';
-$labels['from'] = 'Absender';
-$labels['to'] = 'Empfänger';
-$labels['cc'] = 'Kopie';
-$labels['bcc'] = 'Blindkopie';
+$labels['from']    = 'Von';
+$labels['sender']  = 'Absender';
+$labels['to']      = 'An';
+$labels['cc']      = 'Kopie';
+$labels['bcc']     = 'Blindkopie';
 $labels['replyto'] = 'Antwort an';
 $labels['followupto'] = 'Followup-To';
-$labels['date'] = 'Datum';
-$labels['size'] = 'Größe';
+$labels['date']    = 'Datum';
+$labels['size']    = 'Größe';
 $labels['priority'] = 'Priorität';
 $labels['organization'] = 'Organisation';
 $labels['readstatus'] = 'Gelesen/Ungelesen';
 $labels['listoptions'] = 'Listenoptionen...';
+
 $labels['mailboxlist'] = 'Ordner';
-$labels['folders'] = 'Ordner';
 $labels['messagesfromto'] = 'Nachrichten $from bis $to von $count';
 $labels['threadsfromto'] = 'Konversationen $from bis $to von $count';
 $labels['messagenrof'] = 'Nachricht $nr von $count';
 $labels['fromtoshort'] = '$from – $to von $count';
-$labels['copy'] = 'Kopieren';
-$labels['move'] = 'Verschieben';
-$labels['moveto'] = 'Verschieben nach...';
+
+$labels['copy']     = 'Kopieren';
+$labels['move']     = 'Verschieben';
+$labels['moveto']   = 'Verschieben nach...';
 $labels['download'] = 'Herunterladen';
+$labels['open']     = 'Offen';
 $labels['showattachment'] = 'Anzeigen';
 $labels['showanyway'] = 'Trotzdem anzeigen';
+
 $labels['filename'] = 'Dateiname';
 $labels['filesize'] = 'Dateigröße';
+
 $labels['addtoaddressbook'] = 'Ins Adressbuch übernehmen';
+
+// weekdays short
 $labels['sun'] = 'So';
 $labels['mon'] = 'Mo';
 $labels['tue'] = 'Di';
@@ -63,78 +81,88 @@ $labels['wed'] = 'Mi';
 $labels['thu'] = 'Do';
 $labels['fri'] = 'Fr';
 $labels['sat'] = 'Sa';
-$labels['sunday'] = 'Sonntag';
-$labels['monday'] = 'Montag';
-$labels['tuesday'] = 'Dienstag';
+
+// weekdays long
+$labels['sunday']    = 'Sonntag';
+$labels['monday']    = 'Montag';
+$labels['tuesday']   = 'Dienstag';
 $labels['wednesday'] = 'Mittwoch';
-$labels['thursday'] = 'Donnerstag';
-$labels['friday'] = 'Freitag';
-$labels['saturday'] = 'Samstag';
-$labels['jan'] = 'Jan';
-$labels['feb'] = 'Feb';
-$labels['mar'] = 'Mär';
-$labels['apr'] = 'Apr';
-$labels['may'] = 'Mai';
-$labels['longmay'] = 'Mai';
-$labels['jun'] = 'Jun';
-$labels['jul'] = 'Jul';
-$labels['aug'] = 'Aug';
-$labels['sep'] = 'Sep';
-$labels['oct'] = 'Okt';
-$labels['nov'] = 'Nov';
-$labels['dec'] = 'Dez';
-$labels['longjan'] = 'Januar';
-$labels['longfeb'] = 'Februar';
-$labels['longmar'] = 'März';
-$labels['longapr'] = 'April';
-$labels['longjun'] = 'Juni';
-$labels['longjul'] = 'Juli';
-$labels['longaug'] = 'August';
-$labels['longsep'] = 'September';
-$labels['longoct'] = 'Oktober';
-$labels['longnov'] = 'November';
-$labels['longdec'] = 'Dezember';
+$labels['thursday']  = 'Donnerstag';
+$labels['friday']    = 'Freitag';
+$labels['saturday']  = 'Samstag';
+
+// months short
+$labels['jan']	= 'Jan';
+$labels['feb']	= 'Feb';
+$labels['mar']	= 'Mär';
+$labels['apr']	= 'Apr';
+$labels['may']	= 'Mai';
+$labels['jun']	= 'Jun';
+$labels['jul'] 	= 'Jul';
+$labels['aug']	= 'Aug';
+$labels['sep']	= 'Sep';
+$labels['oct']	= 'Okt';
+$labels['nov']	= 'Nov';
+$labels['dec']	= 'Dez';
+
+// months long
+$labels['longjan']	= 'Januar';
+$labels['longfeb']	= 'Februar';
+$labels['longmar']	= 'März';
+$labels['longapr']	= 'April';
+$labels['longmay']	= 'Mai';
+$labels['longjun']	= 'Juni';
+$labels['longjul']	= 'Juli';
+$labels['longaug']	= 'August';
+$labels['longsep']	= 'September';
+$labels['longoct']	= 'Oktober';
+$labels['longnov']	= 'November';
+$labels['longdec']	= 'Dezember';
+
 $labels['today'] = 'Heute';
-$labels['refresh'] = 'Aktualisieren';
-$labels['checkmail'] = 'Auf neue Nachrichten überprüfen';
-$labels['compose'] = 'Schreiben';
-$labels['writenewmessage'] = 'Neue Nachricht schreiben';
-$labels['reply'] = 'Antworten';
-$labels['replytomessage'] = 'Antwort verfassen';
+
+// toolbar buttons
+$labels['refresh']          = 'Aktualisieren';
+$labels['checkmail']        = 'Auf neue Nachrichten überprüfen';
+$labels['compose']          = 'Schreiben';
+$labels['writenewmessage']  = 'Neue Nachricht schreiben';
+$labels['reply']            = 'Antworten';
+$labels['replytomessage']   = 'Antwort verfassen';
 $labels['replytoallmessage'] = 'Antwort an Mailingliste oder an Absender und alle Empfänger verfassen';
-$labels['replyall'] = 'Allen antworten';
-$labels['replylist'] = 'Liste antworten';
-$labels['forward'] = 'Weiterleiten';
-$labels['forwardinline'] = 'innerhalb der Nachricht';
+$labels['replyall']         = 'Allen antworten';
+$labels['replylist']        = 'Liste antworten';
+$labels['forward']          = 'Weiterleiten';
+$labels['forwardinline']    = 'innerhalb der Nachricht';
 $labels['forwardattachment'] = 'als Dateianhang';
-$labels['forwardmessage'] = 'Nachricht weiterleiten';
-$labels['deletemessage'] = 'Nachricht löschen';
+$labels['forwardmessage']   = 'Nachricht weiterleiten';
+$labels['deletemessage']    = 'Nachricht löschen';
 $labels['movemessagetotrash'] = 'Nachricht in den Papierkorb verschieben';
-$labels['printmessage'] = 'Nachricht drucken';
-$labels['previousmessage'] = 'Vorherige Nachricht anzeigen';
-$labels['firstmessage'] = 'Die erste Nachricht anzeigen';
-$labels['nextmessage'] = 'Nächste Nachricht anzeigen';
-$labels['lastmessage'] = 'Die letzte Nachricht anzeigen';
-$labels['backtolist'] = 'Zurück zur Liste';
-$labels['viewsource'] = 'Quelltext anzeigen';
-$labels['mark'] = 'Markieren';
-$labels['markmessages'] = 'Nachrichten markieren';
-$labels['markread'] = 'Als gelesen';
-$labels['markunread'] = 'Als ungelesen';
-$labels['markflagged'] = 'Markierung hinzufügen';
-$labels['markunflagged'] = 'Markierung entfernen';
-$labels['moreactions'] = 'Mehr...';
-$labels['more'] = 'Mehr';
-$labels['back'] = 'Zurück';
-$labels['options'] = 'Optionen';
+$labels['printmessage']     = 'Nachricht drucken';
+$labels['previousmessage']  = 'Vorherige Nachricht anzeigen';
+$labels['firstmessage']     = 'Die erste Nachricht anzeigen';
+$labels['nextmessage']      = 'Nächste Nachricht anzeigen';
+$labels['lastmessage']      = 'Die letzte Nachricht anzeigen';
+$labels['backtolist']       = 'Zurück zur Liste';
+$labels['viewsource']       = 'Quelltext anzeigen';
+$labels['mark']             = 'Markieren';
+$labels['markmessages']     = 'Nachrichten markieren';
+$labels['markread']         = 'Als gelesen';
+$labels['markunread']       = 'Als ungelesen';
+$labels['markflagged']      = 'Markierung hinzufügen';
+$labels['markunflagged']    = 'Markierung entfernen';
+$labels['moreactions']      = 'Mehr...';
+$labels['more']             = 'Mehr';
+$labels['back']             = 'Zurück';
+$labels['options']          = 'Optionen';
+
 $labels['select'] = 'Auswahl';
 $labels['all'] = 'Alle';
 $labels['none'] = 'Keine';
-$labels['nonesort'] = 'Keine';
 $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';
@@ -145,12 +173,14 @@ $labels['expand-all'] = 'Alle aufklappen';
 $labels['expand-unread'] = 'Ungelesene aufklappen';
 $labels['collapse-all'] = 'Alle zuklappen';
 $labels['threaded'] = 'Gruppiert';
+
 $labels['autoexpand_threads'] = 'Konversationen aufklappen';
 $labels['do_expand'] = 'alle';
 $labels['expand_only_unread'] = 'nur ungelesene';
-$labels['fromto'] = 'Sender/Empfänger';
+$labels['fromto'] = 'Von/An';
 $labels['flag'] = 'Markierung';
 $labels['attachment'] = 'Anhang';
+$labels['nonesort'] = 'Keine';
 $labels['sentdate'] = 'Sendedatum';
 $labels['arrival'] = 'Empfangsdatum';
 $labels['asc'] = 'aufsteigend';
@@ -159,147 +189,176 @@ $labels['listcolumns'] = 'Spalten';
 $labels['listsorting'] = 'Sortierung';
 $labels['listorder'] = 'Ordnung';
 $labels['listmode'] = 'Anzeigemodus';
+
 $labels['folderactions'] = 'Ordneraktionen...';
 $labels['compact'] = 'Packen';
 $labels['empty'] = 'Leeren';
+
 $labels['quota'] = 'Speicherplatz';
-$labels['unknown'] = 'unbekannt';
-$labels['unlimited'] = 'unbegrenzt';
-$labels['quicksearch'] = 'Schnellsuche';
-$labels['resetsearch'] = 'Suche zurücksetzen';
-$labels['searchmod'] = 'Suchkriterien ändern';
-$labels['msgtext'] = 'Nachricht';
+$labels['unknown']  = 'unbekannt';
+$labels['unlimited']  = 'unbegrenzt';
+
+$labels['quicksearch']  = 'Schnellsuche';
+$labels['resetsearch']  = 'Suche zurücksetzen';
+$labels['searchmod']  = 'Suchkriterien ändern';
+$labels['msgtext']  = 'Nachricht';
+$labels['body']  = 'Inhalt';
+
 $labels['openinextwin'] = 'In neuem Fenster öffnen';
 $labels['emlsave'] = 'Lokal speichern (.eml)';
-$labels['editasnew'] = 'Als neue Nachricht öffnen';
-$labels['send'] = 'Senden';
-$labels['sendmessage'] = 'Nachricht jetzt senden';
-$labels['savemessage'] = 'Nachricht speichern';
-$labels['addattachment'] = 'Datei anfügen';
-$labels['charset'] = 'Zeichensatz';
-$labels['editortype'] = 'Editor Typ';
-$labels['returnreceipt'] = 'Empfangsbestätigung (MDN)';
-$labels['dsn'] = 'Übermittlungsbestätigung (DSN)';
+$labels['changeformattext'] = 'Als reiner Text anzeigen';
+$labels['changeformathtml'] = 'Als original HTML anzeigen';
+
+// message compose
+$labels['editasnew']      = 'Als neue Nachricht öffnen';
+$labels['send']           = 'Senden';
+$labels['sendmessage']    = 'Nachricht jetzt senden';
+$labels['savemessage']    = 'Nachricht speichern';
+$labels['addattachment']  = 'Datei anfügen';
+$labels['charset']        = 'Zeichensatz';
+$labels['editortype']     = 'Editor Typ';
+$labels['returnreceipt']  = 'Empfangsbestätigung (MDN)';
+$labels['dsn']            = 'Übermittlungsbestätigung (DSN)';
 $labels['mailreplyintro'] = 'Am $date, schrieb $sender:';
 $labels['originalmessage'] = 'Originalnachricht';
-$labels['editidents'] = 'Absender ändern';
-$labels['spellcheck'] = 'Rechtschreibung';
+
+$labels['editidents']    = 'Absender ändern';
+$labels['spellcheck']    = 'Rechtschreibung';
 $labels['checkspelling'] = 'Rechtschreibung prüfen';
 $labels['resumeediting'] = 'Bearbeitung fortsetzen';
-$labels['revertto'] = 'Zurück zu';
+$labels['revertto']      = 'Zurück zu';
+
 $labels['attach'] = 'Anhängen';
 $labels['attachments'] = 'Anhänge';
 $labels['upload'] = 'Hochladen';
 $labels['uploadprogress'] = '$percent ($current von $total)';
-$labels['close'] = 'Schließen';
-$labels['messageoptions'] = 'Optionen...';
-$labels['low'] = 'Niedrig';
-$labels['lowest'] = 'Niedrigste';
-$labels['normal'] = 'Normal';
-$labels['high'] = 'Hoch';
+$labels['close']  = 'Schließen';
+$labels['messageoptions']  = 'Optionen...';
+
+$labels['low']     = 'Niedrig';
+$labels['lowest']  = 'Niedrigste';
+$labels['normal']  = 'Normal';
+$labels['high']    = 'Hoch';
 $labels['highest'] = 'Höchste';
-$labels['nosubject'] = '(kein Betreff)';
+
+$labels['nosubject']  = '(kein Betreff)';
 $labels['showimages'] = 'Bilder anzeigen';
 $labels['alwaysshow'] = 'Bilder von $sender immer zeigen';
-$labels['isdraft'] = 'Dies ist ein Entwurf';
-$labels['andnmore'] = '$nr weitere';
+$labels['isdraft']    = 'Dies ist ein Entwurf';
+$labels['andnmore']   = '$nr weitere';
 $labels['togglemoreheaders'] = 'Zeige weitere Nachrichten-Header';
 $labels['togglefullheaders'] = 'Original-Kopfzeilen ein-/ausblenden';
+
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Nur-Text';
 $labels['savesentmessagein'] = 'Nachricht speichern in';
 $labels['dontsave'] = 'nicht speichern';
 $labels['maxuploadsize'] = 'Maximal erlaubte Dateigröße ist $size';
+
 $labels['addcc'] = 'Cc hinzufügen';
 $labels['addbcc'] = 'Bcc hinzufügen';
 $labels['addreplyto'] = 'Antwortadresse hinzufügen';
 $labels['addfollowupto'] = 'Followup-To hinzufügen';
+
+// mdn
 $labels['mdnrequest'] = 'Der Sender dieser Nachricht möchte gerne eine Lesebestätigung. Wollen Sie dieses bestätigen?';
 $labels['receiptread'] = 'Empfangsbestätigung (gelesen)';
 $labels['yourmessage'] = 'Dies ist eine Empfangsbestätigung für Ihre Nachricht';
 $labels['receiptnote'] = 'Hinweis: Der Empfänger hat den Empfang der Nachricht bestätigt. Dies ist keine Garantie, dass die Nachricht gelesen und verstanden wurde.';
-$labels['name'] = 'Angezeigter Name';
-$labels['firstname'] = 'Vorname';
-$labels['surname'] = 'Nachname';
-$labels['middlename'] = 'zweiter  Vorname';
-$labels['nameprefix'] = 'Anrede';
-$labels['namesuffix'] = 'Namenszusatz';
-$labels['nickname'] = 'Spitzname';
-$labels['jobtitle'] = 'Berufsbezeichnung';
-$labels['department'] = 'Firma';
-$labels['gender'] = 'Geschlecht';
-$labels['maidenname'] = 'Mädchenname';
-$labels['email'] = 'E-Mail';
-$labels['phone'] = 'Telefon';
-$labels['address'] = 'Adresse';
-$labels['street'] = 'Straße';
-$labels['locality'] = 'Ort';
-$labels['zipcode'] = 'PLZ';
-$labels['region'] = 'Region';
-$labels['country'] = 'Land';
-$labels['birthday'] = 'Geburtstag';
-$labels['anniversary'] = 'Jahrestag';
-$labels['website'] = 'Webseite';
+
+// address boook
+$labels['name']         = 'Angezeigter Name';
+$labels['firstname']    = 'Vorname';
+$labels['surname']      = 'Nachname';
+$labels['middlename']   = 'zweiter  Vorname';
+$labels['nameprefix']   = 'Anrede';
+$labels['namesuffix']   = 'Namenszusatz';
+$labels['nickname']     = 'Spitzname';
+$labels['jobtitle']     = 'Berufsbezeichnung';
+$labels['department']   = 'Firma';
+$labels['gender']       = 'Geschlecht';
+$labels['maidenname']   = 'Mädchenname';
+$labels['email']        = 'E-Mail';
+$labels['phone']        = 'Telefon';
+$labels['address']      = 'Adresse';
+$labels['street']       = 'Straße';
+$labels['locality']     = 'Ort';
+$labels['zipcode']      = 'PLZ';
+$labels['region']       = 'Region';
+$labels['country']      = 'Land';
+$labels['birthday']     = 'Geburtstag';
+$labels['anniversary']  = 'Jahrestag';
+$labels['website']      = 'Webseite';
 $labels['instantmessenger'] = 'IM-Adresse';
 $labels['notes'] = 'Notizen';
-$labels['male'] = 'männlich';
+$labels['male']   = 'männlich';
 $labels['female'] = 'weiblich';
 $labels['manager'] = 'Vorgesetze(r)';
 $labels['assistant'] = 'Assistenz';
-$labels['typeassistant'] = 'Assistenz';
 $labels['spouse'] = 'Partner/in';
 $labels['allfields'] = 'Alle Felder';
 $labels['search'] = 'Suche';
 $labels['advsearch'] = 'Detaillierte Suche';
 $labels['advanced'] = 'Erweitert';
 $labels['other'] = 'Andere';
-$labels['typeother'] = 'Andere';
-$labels['typehome'] = 'Privat';
-$labels['typework'] = 'Dienstlich';
-$labels['typemobile'] = 'Mobil';
-$labels['typemain'] = 'Hauptnummer';
-$labels['typehomefax'] = 'Fax Privat';
-$labels['typeworkfax'] = 'Fax Dienst';
-$labels['typecar'] = 'Auto';
-$labels['typepager'] = 'Pager';
-$labels['typevideo'] = 'Video';
-$labels['typehomepage'] = 'Internet';
+
+$labels['typehome']   = 'Privat';
+$labels['typework']   = 'Dienstlich';
+$labels['typeother']  = 'Andere';
+$labels['typemobile']  = 'Mobil';
+$labels['typemain']  = 'Hauptnummer';
+$labels['typehomefax']  = 'Fax Privat';
+$labels['typeworkfax']  = 'Fax Dienst';
+$labels['typecar']  = 'Auto';
+$labels['typepager']  = 'Pager';
+$labels['typevideo']  = 'Video';
+$labels['typeassistant']  = 'Assistenz';
+$labels['typehomepage']  = 'Internet';
 $labels['typeblog'] = 'Blog';
 $labels['typeprofile'] = 'Profil';
+
 $labels['addfield'] = 'Feld hinzufügen...';
 $labels['addcontact'] = 'Kontakt hinzufügen';
 $labels['editcontact'] = 'Kontakt bearbeiten';
 $labels['contacts'] = 'Kontakte';
 $labels['contactproperties'] = 'Kontaktdaten';
 $labels['personalinfo'] = 'Persönliche Informationen';
-$labels['edit'] = 'Bearbeiten';
+
+$labels['edit']   = 'Bearbeiten';
 $labels['cancel'] = 'Abbrechen';
-$labels['save'] = 'Speichern';
+$labels['save']   = 'Speichern';
 $labels['delete'] = 'Löschen';
 $labels['rename'] = 'Umbenennen';
 $labels['addphoto'] = 'Kontaktbild hinzufügen';
 $labels['replacephoto'] = 'Bild ändern';
 $labels['uploadphoto'] = 'Bild hochladen';
-$labels['newcontact'] = 'Neuen Kontakt erstellen';
-$labels['deletecontact'] = 'Gewählte Kontakte löschen';
-$labels['composeto'] = 'Nachricht verfassen';
+
+$labels['newcontact']     = 'Neuen Kontakt erstellen';
+$labels['deletecontact']  = 'Gewählte Kontakte löschen';
+$labels['composeto']      = 'Nachricht verfassen';
 $labels['contactsfromto'] = 'Kontakte $from bis $to von $count';
-$labels['print'] = 'Drucken';
-$labels['export'] = 'Exportieren';
-$labels['exportvcards'] = 'Kontakte im vCard-Format exportieren';
+$labels['print']          = 'Drucken';
+$labels['export']         = 'Exportieren';
+$labels['exportall']      = 'Alles exportieren';
+$labels['exportsel']      = 'Auswahl exportieren';
+$labels['exportvcards']   = 'Kontakte im vCard-Format exportieren';
 $labels['newcontactgroup'] = 'Neue Kontaktgruppe erstellen';
-$labels['grouprename'] = 'Gruppe umbenennen';
-$labels['groupdelete'] = 'Gruppe löschen';
+$labels['grouprename']    = 'Gruppe umbenennen';
+$labels['groupdelete']    = 'Gruppe löschen';
 $labels['groupremoveselected'] = 'Gewählte Kontakte aus Gruppe entfernen';
-$labels['previouspage'] = 'Seite zurück';
-$labels['firstpage'] = 'Erste Seite';
-$labels['nextpage'] = 'Nächste Seite';
-$labels['lastpage'] = 'Letzte Seite';
+
+$labels['previouspage']   = 'Seite zurück';
+$labels['firstpage']      = 'Erste Seite';
+$labels['nextpage']       = 'Nächste Seite';
+$labels['lastpage']       = 'Letzte Seite';
+
 $labels['group'] = 'Gruppe';
 $labels['groups'] = 'Gruppen';
 $labels['personaladrbook'] = 'Persönliches Adressbuch';
+
 $labels['searchsave'] = 'Suchergebnisse speichern';
 $labels['searchdelete'] = 'Suchergebnisse löschen';
+
 $labels['import'] = 'Importieren';
 $labels['importcontacts'] = 'Kontakte importieren';
 $labels['importfromfile'] = 'Import aus Datei:';
@@ -307,35 +366,43 @@ $labels['importtarget'] = 'Einen neuen Kontakt hinzufügen:';
 $labels['importreplace'] = 'Bestehendes Adressbuch komplett ersetzen';
 $labels['importdesc'] = 'Sie können Kontakte von einem vorhandenen Adressbuch hochladen.<br/>Zur Zeit wird der Import von Adressen im <a href="http://de.wikipedia.org/wiki/VCard">vCard</a> oder <a href="http://de.wikipedia.org/wiki/CSV_(Dateiformat)">CSV</a>Format unterstützt.';
 $labels['done'] = 'Fertig';
+
+// settings
 $labels['settingsfor'] = 'Einstellungen für';
 $labels['about'] = 'Über';
 $labels['preferences'] = 'Einstellungen';
 $labels['userpreferences'] = 'Benutzereinstellungen';
 $labels['editpreferences'] = 'Benutzereinstellungen bearbeiten';
+
 $labels['identities'] = 'Identitäten';
 $labels['manageidentities'] = 'Absender für dieses Konto verwalten';
 $labels['newidentity'] = 'Neuer Absender';
+
 $labels['newitem'] = 'Neuer Eintrag';
 $labels['edititem'] = 'Eintrag bearbeiten';
+
 $labels['preferhtml'] = 'HTML anzeigen';
 $labels['defaultcharset'] = 'Standard Zeichensatz';
 $labels['htmlmessage'] = 'HTML-Nachricht';
+$labels['messagepart'] = 'Teilstück';
+$labels['digitalsig'] = 'Digitale Signatur';
 $labels['dateformat'] = 'Datumsformatierung';
 $labels['timeformat'] = 'Zeitformatierung';
 $labels['prettydate'] = 'Kurze Datumsanzeige';
-$labels['setdefault'] = 'Als Standard';
-$labels['autodetect'] = 'Automatisch';
-$labels['language'] = 'Sprache';
-$labels['timezone'] = 'Zeitzone';
-$labels['pagesize'] = 'Einträge pro Seite';
+$labels['setdefault']  = 'Als Standard';
+$labels['autodetect']  = 'Automatisch';
+$labels['language']  = 'Sprache';
+$labels['timezone']  = 'Zeitzone';
+$labels['pagesize']  = 'Einträge pro Seite';
 $labels['signature'] = 'Signatur';
-$labels['dstactive'] = 'Sommerzeit';
+$labels['dstactive']  = 'Sommerzeit';
 $labels['showinextwin'] = 'Nachrichten in neuem Fenster öffnen';
 $labels['composeextwin'] = 'Nachrichten in neuem Fenster verfassen';
 $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';
@@ -358,11 +425,11 @@ $labels['showremoteimages'] = 'Eingebettete Bilder vom Internet laden';
 $labels['fromknownsenders'] = 'bei bekannten Absendern';
 $labels['always'] = 'immer';
 $labels['showinlineimages'] = 'Angehängte Bilder unter der Nachricht anzeigen';
-$labels['autosavedraft'] = 'Entwurf automatisch speichern';
-$labels['everynminutes'] = '$n Minute(n)';
-$labels['refreshinterval'] = 'Aktualisieren (auf neue Nachrichten prüfen, etc.)';
-$labels['never'] = 'nie';
-$labels['immediately'] = 'sofort';
+$labels['autosavedraft']  = 'Entwurf automatisch speichern';
+$labels['everynminutes']  = '$n Minute(n)';
+$labels['refreshinterval']  = 'Aktualisieren (auf neue Nachrichten prüfen, etc.)';
+$labels['never']  = 'nie';
+$labels['immediately']  = 'sofort';
 $labels['messagesdisplaying'] = 'Nachrichtendarstellung';
 $labels['messagescomposition'] = 'Nachrichtenerstellung';
 $labels['mimeparamfolding'] = 'Namen der Dateianhänge';
@@ -389,12 +456,9 @@ $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';
+$labels['previewpanemarkread']  = 'Nachricht in Vorschau als gelesen markieren';
+$labels['afternseconds']  = 'nach $n Sekunden';
 $labels['reqmdn'] = 'Empfangsbestätigung (MDN) immer anfordern';
 $labels['reqdsn'] = 'Übermittlungsbestätigung (DSN) immer anfordern';
 $labels['replysamefolder'] = 'Antworten im selben Ordner wie Original speichern';
@@ -411,13 +475,15 @@ $labels['mailtoprotohandler'] = 'Als Empfänger für mailto: Links einrichten';
 $labels['forwardmode'] = 'Nachrichtenweiterleitung';
 $labels['inline'] = 'eingebettet';
 $labels['asattachment'] = 'als Anhang';
-$labels['folder'] = 'Ordner';
-$labels['foldername'] = 'Ordnername';
-$labels['subscribed'] = 'Abonniert';
+
+$labels['folder']  = 'Ordner';
+$labels['folders']  = 'Ordner';
+$labels['foldername']  = 'Ordnername';
+$labels['subscribed']  = 'Abonniert';
 $labels['messagecount'] = 'Nachrichten';
-$labels['create'] = 'Erstellen';
-$labels['createfolder'] = 'Neuen Ordner erstellen';
-$labels['managefolders'] = 'Ordner verwalten';
+$labels['create']  = 'Erstellen';
+$labels['createfolder']  = 'Neuen Ordner erstellen';
+$labels['managefolders']  = 'Ordner verwalten';
 $labels['specialfolders'] = 'Spezialordner';
 $labels['properties'] = 'Eigenschaften';
 $labels['folderproperties'] = 'Ordnereigenschaften';
@@ -427,23 +493,29 @@ $labels['info'] = 'Informationen';
 $labels['getfoldersize'] = 'Ordnergröße anzeigen';
 $labels['changesubscription'] = 'Abonnieren';
 $labels['foldertype'] = 'Ordnertyp';
-$labels['personalfolder'] = 'Privater Ordner';
-$labels['otherfolder'] = 'Ordner eines anderen Benutzers';
-$labels['sharedfolder'] = 'Öffentlicher Ordner';
+$labels['personalfolder']  = 'Privater Ordner';
+$labels['otherfolder']  = 'Ordner eines anderen Benutzers';
+$labels['sharedfolder']  = 'Öffentlicher Ordner';
+
 $labels['sortby'] = 'Sortieren nach';
-$labels['sortasc'] = 'Aufsteigend sortieren';
+$labels['sortasc']  = 'Aufsteigend sortieren';
 $labels['sortdesc'] = 'Absteigend sortieren';
 $labels['undo'] = 'Rückgängig machen';
+
 $labels['installedplugins'] = 'Installierte Plugins';
 $labels['plugin'] = 'Erweiterung';
 $labels['version'] = 'Version';
 $labels['source'] = 'Quellcode';
 $labels['license'] = 'Lizenz';
 $labels['support'] = 'Support';
+
+// units
 $labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
 $labels['GB'] = 'GB';
+
+// character sets
 $labels['unicode'] = 'Unicode';
 $labels['english'] = 'Englisch';
 $labels['westerneuropean'] = 'West Europäisch';
@@ -463,3 +535,4 @@ $labels['japanese'] = 'Japanisch';
 $labels['korean'] = 'Koreanisch';
 $labels['chinese'] = 'Chinesisch';
 
+?>
diff --git a/program/localization/de_DE/messages.inc b/program/localization/de_DE/messages.inc
index 9374c4b0c..ba0936d28 100644
--- a/program/localization/de_DE/messages.inc
+++ b/program/localization/de_DE/messages.inc
@@ -2,20 +2,23 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/de_DE/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Arnd <bla@espenfeld.de>                                       |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['errortitle'] = 'Ein Fehler ist aufgetreten!';
-$messages['loginfailed'] = 'Die Anmeldung ist fehlgeschlagen.';
+$messages['errortitle']  = 'Ein Fehler ist aufgetreten!';
+$messages['loginfailed']  = 'Die Anmeldung ist fehlgeschlagen.';
 $messages['cookiesdisabled'] = 'Ihr Browser akzeptiert keine Cookies.';
 $messages['sessionerror'] = 'Ihre Sitzung ist ungültig oder abgelaufen.';
 $messages['storageerror'] = 'Verbindung zum Speicherserver fehlgeschlagen.';
@@ -25,13 +28,15 @@ $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.';
 $messages['loggedout'] = 'Sie haben Ihre Sitzung erfolgreich beendet. Auf Wiedersehen!';
 $messages['mailboxempty'] = 'Mailbox ist leer.';
-$messages['refreshing'] = 'Aktualisieren …';
-$messages['loading'] = 'Wird geladen ...';
+$messages['refreshing'] = 'Aktualisieren…';
+$messages['loading'] = 'Wird geladen...';
 $messages['uploading'] = 'Datei wird hochgeladen...';
 $messages['uploadingmany'] = 'Dateien werden hochgeladen...';
 $messages['loadingdata'] = 'Daten werden geladen...';
@@ -57,11 +62,11 @@ $messages['errormoving'] = 'Nachricht(en) konnte(n) nicht verschoben werden.';
 $messages['errorcopying'] = 'Nachticht(en) konnte(n) nicht kopiert werden.';
 $messages['errordeleting'] = 'Nachricht(en) konnte(n) nicht gelöscht werden.';
 $messages['errormarking'] = 'Nachricht(en) konnte(n) nicht markiert werden.';
-$messages['deletecontactconfirm'] = 'Wollen Sie die ausgewählten Kontakte wirklich löschen?';
-$messages['deletegroupconfirm'] = 'Wollen Sie die gewählte Gruppe wirklich löschen?';
+$messages['deletecontactconfirm']  = 'Wollen Sie die ausgewählten Kontakte wirklich löschen?';
+$messages['deletegroupconfirm']  = 'Wollen Sie die gewählte Gruppe wirklich löschen?';
 $messages['deletemessagesconfirm'] = 'Wollen Sie die ausgewählten Nachrichten wirklich löschen?';
-$messages['deletefolderconfirm'] = 'Wollen Sie diesen Ordner wirklich löschen?';
-$messages['purgefolderconfirm'] = 'Wollen Sie diesen Ordner wirklich leeren?';
+$messages['deletefolderconfirm']  = 'Wollen Sie diesen Ordner wirklich löschen?';
+$messages['purgefolderconfirm']  = 'Wollen Sie diesen Ordner wirklich leeren?';
 $messages['contactdeleting'] = 'Lösche Kontakt(e)...';
 $messages['groupdeleting'] = 'Gruppe wird gelöscht...';
 $messages['folderdeleting'] = 'Lösche Ordner...';
@@ -70,11 +75,11 @@ $messages['foldersubscribing'] = 'Abonniere Ordner...';
 $messages['folderunsubscribing'] = 'Ordner abbstellen...';
 $messages['formincomplete'] = 'Das Formular wurde nicht vollständig ausgefüllt.';
 $messages['noemailwarning'] = 'Bitte geben Sie eine gültige E-Mail-Adresse ein.';
-$messages['nonamewarning'] = 'Bitte geben Sie einen Namen ein.';
+$messages['nonamewarning']  = 'Bitte geben Sie einen Namen ein.';
 $messages['nopagesizewarning'] = 'Bitte geben Sie die Einträge pro Seite an.';
 $messages['nosenderwarning'] = 'Bitte geben Sie die E-Mail-Adresse des Senders an.';
 $messages['norecipientwarning'] = 'Bitte geben Sie mindestens einen Empfänger an.';
-$messages['nosubjectwarning'] = 'Die Betreffzeile ist leer. Möchten Sie jetzt einen Betreff eingeben?';
+$messages['nosubjectwarning']  = 'Die Betreffzeile ist leer. Möchten Sie jetzt einen Betreff eingeben?';
 $messages['nobodywarning'] = 'Diese Nachricht ohne Inhalt senden?';
 $messages['notsentwarning'] = 'Ihre Nachricht wurde nicht gesendet. Wollen Sie die Nachricht verwerfen?';
 $messages['noldapserver'] = 'Bitte wählen Sie einen LDAP-Server aus.';
@@ -163,3 +168,4 @@ $messages['messagetoobig'] = 'Die Nachricht ist zu gross und kann nicht verarbei
 $messages['attachmentvalidationerror'] = 'WARNUNG! Dieser Anhang ist verdächtig, weil sein Typ nicht dem in der Nachricht deklarierten Typ entspricht. Wenn Sie dem Sender nicht trauen, sollten Sie den Anhang nicht öffnen, weil er schadhaften Inhalte beinhalten könnte.<br/><br/><em>Erwartet: $expected; gefunden: $detected</em>';
 $messages['noscriptwarning'] = 'Warnung: Dieser Webmail-Service erfordert Javascript. Um ihn zu benutzten aktivieren Sie Javascript in ihren Browser-Einstellungen.';
 
+?>
diff --git a/program/localization/el_GR/labels.inc b/program/localization/el_GR/labels.inc
index 2f0ca0bf5..9f5d81839 100644
--- a/program/localization/el_GR/labels.inc
+++ b/program/localization/el_GR/labels.inc
@@ -2,58 +2,78 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/el_GR/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = 'Καλώς ήρθατε στο $product';
-$labels['username'] = 'Όνομα Χρήστη';
-$labels['password'] = 'Κωδικός Πρόσβασης';
-$labels['server'] = 'Διακομιστής';
-$labels['login'] = 'Σύνδεση';
-$labels['logout'] = 'Αποσύνδεση';
-$labels['mail'] = 'E-Mail';
+
+// login page
+$labels['welcome']   = 'Καλώς ήρθατε στο $product';
+$labels['username']  = 'Όνομα Χρήστη';
+$labels['password']  = 'Κωδικός Πρόσβασης';
+$labels['server']    = 'Εξυπηρετητής';
+$labels['login']     = 'Σύνδεση';
+
+// taskbar
+$labels['logout']   = 'Αποσύνδεση';
+$labels['mail']     = 'E-Mail';
 $labels['settings'] = 'Ρυθμίσεις';
 $labels['addressbook'] = 'Επαφές';
-$labels['inbox'] = 'Εισερχόμενα';
+
+// mailbox names
+$labels['inbox']  = 'Εισερχόμενα';
 $labels['drafts'] = 'Πρόχειρα';
-$labels['sent'] = 'Απεσταλμένα';
-$labels['trash'] = 'Κάδος Απορριμάτων';
-$labels['junk'] = 'Ανεπιθύμητα';
+$labels['sent']   = 'Απεσταλμένα';
+$labels['trash']  = 'Κάδος Απορριμάτων';
+$labels['junk']   = 'Ανεπιθύμητα';
+
+// message listing
 $labels['subject'] = 'Θέμα';
-$labels['from'] = 'Αποστολέας';
-$labels['to'] = 'Παραλήπτης';
-$labels['cc'] = 'Κοινοποίηση';
-$labels['bcc'] = 'Κρυφή κοινοποίηση';
+$labels['from']    = 'Αποστολέας';
+$labels['sender']  = 'Αποστολέας';
+$labels['to']      = 'Παραλήπτης';
+$labels['cc']      = 'Κοινοποίηση';
+$labels['bcc']     = 'Κρυφή κοινοποίηση';
 $labels['replyto'] = 'Απάντηση στο';
 $labels['followupto'] = 'Σε συνέχεια';
-$labels['date'] = 'Ημερομηνία';
-$labels['size'] = 'Μέγεθος';
+$labels['date']    = 'Ημερομηνία';
+$labels['size']    = 'Μέγεθος';
 $labels['priority'] = 'Πρoτεραιότητα';
 $labels['organization'] = 'Οργανισμός';
 $labels['readstatus'] = 'Κατάσταση ανάγνωσης';
 $labels['listoptions'] = 'Κατάλογος επιλογών';
+
 $labels['mailboxlist'] = 'Φάκελοι';
-$labels['folders'] = 'Φάκελοι';
 $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['copy']     = 'Αντιγραφή';
+$labels['move']     = 'Μετακίνηση';
+$labels['moveto']   = 'Μετακίνηση σε...';
 $labels['download'] = 'Λήψη';
+$labels['open']     = 'Ανοιγμα';
+$labels['showattachment'] = 'Εμφάνιση';
+$labels['showanyway'] = 'Εμφάνιση';
+
 $labels['filename'] = 'Όνομα αρχείου';
 $labels['filesize'] = 'Μέγεθος αρχείου';
+
 $labels['addtoaddressbook'] = 'Προσθήκη στο βιβλίο διευθύνσεων';
+
+// weekdays short
 $labels['sun'] = 'Κυρ';
 $labels['mon'] = 'Δευτ';
 $labels['tue'] = 'Τρι';
@@ -61,79 +81,90 @@ $labels['wed'] = 'Τετ';
 $labels['thu'] = 'Πεμπ';
 $labels['fri'] = 'Παρ';
 $labels['sat'] = 'Σαβ';
-$labels['sunday'] = 'Κυριακή';
-$labels['monday'] = 'Δευτέρα';
-$labels['tuesday'] = 'Τρίτη';
+
+// weekdays long
+$labels['sunday']    = 'Κυριακή';
+$labels['monday']    = 'Δευτέρα';
+$labels['tuesday']   = 'Τρίτη';
 $labels['wednesday'] = 'Τετάρτη';
-$labels['thursday'] = 'Πέμπτη';
-$labels['friday'] = 'Παρασκευή';
-$labels['saturday'] = 'Σάββατο';
-$labels['jan'] = 'Ιαν';
-$labels['feb'] = 'Φεβ';
-$labels['mar'] = 'Μαρ';
-$labels['apr'] = 'Απρ';
-$labels['may'] = 'Μαι';
-$labels['longmay'] = 'Μαι';
-$labels['jun'] = 'Ιουν';
-$labels['jul'] = 'Ιουλ';
-$labels['aug'] = 'Αυγ';
-$labels['sep'] = 'Σεπ';
-$labels['oct'] = 'Οκτ';
-$labels['nov'] = 'Νοε';
-$labels['dec'] = 'Δεκ';
-$labels['longjan'] = 'Ιανουάριος';
-$labels['longfeb'] = 'Φεβρουάριος';
-$labels['longmar'] = 'Μάρτιος';
-$labels['longapr'] = 'Απρίλιος';
-$labels['longjun'] = 'Ιούνιος';
-$labels['longjul'] = 'Ιούλιος';
-$labels['longaug'] = 'Αύγουστος';
-$labels['longsep'] = 'Σεπτέμβριος';
-$labels['longoct'] = 'Οκτώβριος';
-$labels['longnov'] = 'Νοέμβριος';
-$labels['longdec'] = 'Δεκέμβριος';
+$labels['thursday']  = 'Πέμπτη';
+$labels['friday']    = 'Παρασκευή';
+$labels['saturday']  = 'Σάββατο';
+
+// months short
+$labels['jan']	= 'Ιαν';
+$labels['feb']	= 'Φεβ';
+$labels['mar']	= 'Μαρ';
+$labels['apr']	= 'Απρ';
+$labels['may']	= 'Μαι';
+$labels['jun']	= 'Ιουν';
+$labels['jul'] 	= 'Ιουλ';
+$labels['aug']	= 'Αυγ';
+$labels['sep']	= 'Σεπ';
+$labels['oct']	= 'Οκτ';
+$labels['nov']	= 'Νοε';
+$labels['dec']	= 'Δεκ';
+
+// months long
+$labels['longjan']	= 'Ιανουάριος';
+$labels['longfeb']	= 'Φεβρουάριος';
+$labels['longmar']	= 'Μάρτιος';
+$labels['longapr']	= 'Απρίλιος';
+$labels['longmay']	= 'Μαι';
+$labels['longjun']	= 'Ιούνιος';
+$labels['longjul']	= 'Ιούλιος';
+$labels['longaug']	= 'Αύγουστος';
+$labels['longsep']	= 'Σεπτέμβριος';
+$labels['longoct']	= 'Οκτώβριος';
+$labels['longnov']	= 'Νοέμβριος';
+$labels['longdec']	= 'Δεκέμβριος';
+
 $labels['today'] = 'Σήμερα';
-$labels['refresh'] = 'Ανανέωση';
-$labels['checkmail'] = 'Έλεγχος για νέα μηνύματα';
-$labels['compose'] = 'Δημιουργία μηνύματος';
-$labels['writenewmessage'] = 'Δημιουργία νέου μηνύματος';
-$labels['reply'] = 'Απάντηση';
-$labels['replytomessage'] = 'Απάντηση στον αποστολέα';
+
+// toolbar buttons
+$labels['refresh']          = 'Ανανέωση';
+$labels['checkmail']        = 'Έλεγχος για νέα μηνύματα';
+$labels['compose']          = 'Δημιουργία μηνύματος';
+$labels['writenewmessage']  = 'Δημιουργία νέου μηνύματος';
+$labels['reply']            = 'Απάντηση';
+$labels['replytomessage']   = 'Απάντηση στον αποστολέα';
 $labels['replytoallmessage'] = 'Απάντηση στη λίστα ή στον αποστολέα και όλους τους παραλήπτες';
-$labels['replyall'] = 'Απάντηση όλων';
-$labels['replylist'] = 'Λίστα παραληπτών απάντησης';
-$labels['forward'] = 'Προώθηση';
-$labels['forwardinline'] = 'Forward inline';
+$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['viewsource'] = 'Προβολή πηγαίου κώδικα';
-$labels['mark'] = 'Μαρκάρισμα';
-$labels['markmessages'] = 'Μαρκάρισμα μηνυμάτων';
-$labels['markread'] = 'ως αναγνωσμένα';
-$labels['markunread'] = 'ως μη-αναγνωσμένα';
-$labels['markflagged'] = 'ως με σήμανση';
-$labels['markunflagged'] = 'ως Χωρίς σήμανση';
-$labels['moreactions'] = 'Περισσότερες ενέργειες...';
-$labels['more'] = 'Περισσότερα';
-$labels['back'] = 'Επιστροφή';
-$labels['options'] = 'Επιλογές';
+$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['more']             = 'Περισσότερα';
+$labels['back']             = 'Επιστροφή';
+$labels['options']          = 'Επιλογές';
+
 $labels['select'] = 'Επιλέξτε';
 $labels['all'] = 'Όλα';
 $labels['none'] = 'Κανένα';
-$labels['nonesort'] = 'Κανένα';
 $labels['currpage'] = 'Τρέχουσα σελίδα';
 $labels['unread'] = 'Μη αναγνωσμένο';
 $labels['flagged'] = 'Σημειωμένο';
 $labels['unanswered'] = 'Αναπάντητο';
+$labels['withattachment'] = 'Με επισύναψη';
 $labels['deleted'] = 'Διεγραμμένο';
+$labels['undeleted'] = 'Μη διεγραμμένο';
 $labels['invert'] = 'Αναστροφή';
 $labels['filter'] = 'Φίλτρο';
 $labels['list'] = 'Λίστα';
@@ -142,12 +173,14 @@ $labels['expand-all'] = 'Ανάπτυξη όλων';
 $labels['expand-unread'] = 'Ανάπτυξη των μη αναγνωσμένων';
 $labels['collapse-all'] = 'Σύμπτυξη όλων';
 $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['asc'] = 'αύξουσα';
@@ -156,174 +189,220 @@ $labels['listcolumns'] = 'Στήλες';
 $labels['listsorting'] = 'Ταξινόμηση στηλών';
 $labels['listorder'] = 'Σειρά ταξινόμησης';
 $labels['listmode'] = 'Προβολή σε λίστα';
+
 $labels['folderactions'] = 'Ενέργειες στους φακέλους';
 $labels['compact'] = 'Συμπίεση';
 $labels['empty'] = 'Άδειασμα';
+
 $labels['quota'] = 'Χρήση δίσκου';
-$labels['unknown'] = 'άγνωστο';
-$labels['unlimited'] = 'απεριόριστο';
-$labels['quicksearch'] = 'Γρήγορη Αναζήτηση';
-$labels['resetsearch'] = 'Επαναφορά Αναζήτησης';
-$labels['searchmod'] = 'Search modifiers';
-$labels['msgtext'] = 'Σε όλο το μήνυμα';
+$labels['unknown']  = 'άγνωστο';
+$labels['unlimited']  = 'απεριόριστο';
+
+$labels['quicksearch']  = 'Γρήγορη Αναζήτηση';
+$labels['resetsearch']  = 'Επαναφορά Αναζήτησης';
+$labels['searchmod']  = 'Aλλαγή αναζήτησης';
+$labels['msgtext']  = 'Σε όλο το μήνυμα';
+$labels['body']  = 'Σώμα';
+
 $labels['openinextwin'] = 'Άνοιγμα σε νέο παράθυρο';
 $labels['emlsave'] = 'Λήψη αρχείου (.eml)';
-$labels['editasnew'] = 'Επεξεργασία σαν νέο';
-$labels['sendmessage'] = 'Αποστολή μηνύματος';
-$labels['savemessage'] = 'Αποθήκευση ως πρόχειρο';
-$labels['addattachment'] = 'Επισύναψη αρχείου';
-$labels['charset'] = 'Κωδικοποίηση χαρακτήρων';
-$labels['editortype'] = 'Είδος επεξεργαστή κειμένου';
-$labels['returnreceipt'] = 'Αναφορά Παράδοσης';
-$labels['dsn'] = 'Κατάσταση αναφοράς παράδοσης';
+$labels['changeformattext'] = 'Εμφάνιση σε μορφή απλού κειμένου';
+$labels['changeformathtml'] = 'Εμφάνιση σε μορφή HTML';
+
+// message compose
+$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['editidents'] = 'Επεξεργασία ταυτοτήτων';
-$labels['spellcheck'] = 'Συλλαβισμός';
+
+$labels['editidents']    = 'Επεξεργασία ταυτοτήτων';
+$labels['spellcheck']    = 'Συλλαβισμός';
 $labels['checkspelling'] = 'Έλεγχος ορθογραφίας';
 $labels['resumeediting'] = 'Συνέχεια επεξεργασίας';
-$labels['revertto'] = 'Επαναφορά στο';
+$labels['revertto']      = 'Επαναφορά στο';
+
 $labels['attach'] = 'Επισύναψη';
 $labels['attachments'] = 'Συνημμένα';
-$labels['upload'] = 'Αποστολή';
+$labels['upload'] = 'Φόρτωση';
 $labels['uploadprogress'] = '$percent ($current από $total)';
-$labels['close'] = 'Κλείσιμο';
-$labels['messageoptions'] = 'Επιλογές μηνύματος';
-$labels['low'] = 'Χαμηλή';
-$labels['lowest'] = 'Χαμηλότερη';
-$labels['normal'] = 'Κανονική';
-$labels['high'] = 'Υψηλή';
+$labels['close']  = 'Κλείσιμο';
+$labels['messageoptions']  = 'Επιλογές μηνύματος';
+
+$labels['low']     = 'Χαμηλή';
+$labels['lowest']  = 'Χαμηλότερη';
+$labels['normal']  = 'Κανονική';
+$labels['high']    = 'Υψηλή';
 $labels['highest'] = 'Μέγιστη δυνατή';
-$labels['nosubject'] = '(χωρίς θέμα)';
+
+$labels['nosubject']  = '(χωρίς θέμα)';
 $labels['showimages'] = 'Προβολή εικόνων';
 $labels['alwaysshow'] = 'Να προβάλλονται πάντα οι εικόνες που αποστέλλονται από τον $sender';
-$labels['isdraft'] = 'Αυτό το μήνυμα έχει σημανθεί σαν πρόχειρο';
+$labels['isdraft']    = 'Αυτό το μήνυμα έχει σημανθεί σαν πρόχειρο';
+$labels['andnmore']   = '$nr περισσότερα...';
+$labels['togglemoreheaders'] = 'Εμφάνιση περισσότερων κεφαλίδων';
+$labels['togglefullheaders'] = 'Εμφάνιση ακατέργαστων κεφαλίδων μηνύματος';
+
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Απλό κείμενο';
 $labels['savesentmessagein'] = 'Αποθήκευση απεσταλμένου στο φάκελο';
 $labels['dontsave'] = 'να μην αποθηκευθεί';
 $labels['maxuploadsize'] = 'Το μέγιστο επιτρεπόμενο μέγεθος αρχείου είναι $size';
+
 $labels['addcc'] = 'Προσθήκη Παραλήπτη Κοινοποίησης';
 $labels['addbcc'] = 'Προσθήκη Παραλήπτη Κρυφής Κοινοποίησης';
 $labels['addreplyto'] = 'Προσθήκη Απάντησης-Στο';
 $labels['addfollowupto'] = 'Προσθήκη Σε συνέχεια του';
+
+// mdn
 $labels['mdnrequest'] = 'Ο αποστολέας αυτού του μηνύματος, έχει ζητήσει να ειδοποιηθεί όταν θα το διαβάσετε. Θέλετε να επιτρέψετε την ενημέρωσή του;';
 $labels['receiptread'] = 'Αναφορά παράδοσης (διαβάστε την)';
 $labels['yourmessage'] = 'Αυτό είναι μια αναφορά παράδοσης για το μήνυμά σας';
 $labels['receiptnote'] = 'Σημείωση: Αυτή η αναφορά επιβεβαιώνει μόνο ότι το μήνυμά σας εμφανίστηκε στον υπολογιστή του παραλήπτη. Δεν επιβεβαιώνει ότι ο παραλήπτης έχει διαβάσει ή έχει κατανοήσει το περιεχόμενό του.';
-$labels['name'] = 'Εμφανιζόμενο όνομα';
-$labels['firstname'] = 'Όνομα';
-$labels['surname'] = 'Επώνυμο';
-$labels['middlename'] = 'Πατρώνυμο';
-$labels['nameprefix'] = 'Πρόθεμα';
-$labels['namesuffix'] = 'Κατάληξη';
-$labels['nickname'] = 'Ψευδώνυμο';
-$labels['jobtitle'] = 'Τίτλος εργασίας';
-$labels['department'] = 'Τμήμα';
-$labels['gender'] = 'Φύλο';
-$labels['maidenname'] = 'Πατρώνυμο';
-$labels['email'] = 'E-Mail';
-$labels['phone'] = 'Τηλέφωνο';
-$labels['address'] = 'Διεύθυνση';
-$labels['street'] = 'Οδός';
-$labels['locality'] = 'Πόλη';
-$labels['zipcode'] = 'ΤΚ';
-$labels['region'] = 'Νομός';
-$labels['country'] = 'Χώρα';
-$labels['birthday'] = 'Ημερ/νία Γέννησης';
-$labels['anniversary'] = 'Επέτειος';
-$labels['website'] = 'Ιστοσελίδα';
+
+// address boook
+$labels['name']         = 'Εμφανιζόμενο όνομα';
+$labels['firstname']    = 'Όνομα';
+$labels['surname']      = 'Επώνυμο';
+$labels['middlename']   = 'Πατρώνυμο';
+$labels['nameprefix']   = 'Πρόθεμα';
+$labels['namesuffix']   = 'Κατάληξη';
+$labels['nickname']     = 'Ψευδώνυμο';
+$labels['jobtitle']     = 'Τίτλος εργασίας';
+$labels['department']   = 'Τμήμα';
+$labels['gender']       = 'Φύλο';
+$labels['maidenname']   = 'Πατρώνυμο';
+$labels['email']        = 'E-Mail';
+$labels['phone']        = 'Τηλέφωνο';
+$labels['address']      = 'Διεύθυνση';
+$labels['street']       = 'Οδός';
+$labels['locality']     = 'Πόλη';
+$labels['zipcode']      = 'ΤΚ';
+$labels['region']       = 'Νομός';
+$labels['country']      = 'Χώρα';
+$labels['birthday']     = 'Ημερ/νία Γέννησης';
+$labels['anniversary']  = 'Επέτειος';
+$labels['website']      = 'Ιστοσελίδα';
 $labels['instantmessenger'] = 'IM';
 $labels['notes'] = 'Σημειώσεις';
-$labels['male'] = 'άνδρας';
+$labels['male']   = 'άνδρας';
 $labels['female'] = 'γυναίκα';
 $labels['manager'] = 'Υπεύθυνος';
 $labels['assistant'] = 'Υπάλληλος';
-$labels['typeassistant'] = 'Υπάλληλος';
 $labels['spouse'] = 'Σύζυγος';
 $labels['allfields'] = 'Όλα τα πεδία';
 $labels['search'] = 'Αναζήτηση';
 $labels['advsearch'] = 'Προηγμένη Αναζήτηση';
 $labels['advanced'] = 'Προχωρημένες ρυθμίσεις';
 $labels['other'] = 'Άλλα';
-$labels['typeother'] = 'Άλλα';
-$labels['typehome'] = 'Οικία';
-$labels['typework'] = 'Εργασία';
-$labels['typemobile'] = 'Κινητό';
-$labels['typemain'] = 'Κύρια';
-$labels['typehomefax'] = 'Φαξ οικίας';
-$labels['typeworkfax'] = 'Φαξ εργασίας';
-$labels['typecar'] = 'Αυτοκίνητο';
-$labels['typepager'] = 'Βομβητής';
-$labels['typevideo'] = 'Βίντεο';
-$labels['typehomepage'] = 'Αρχική Σελίδα';
+
+$labels['typehome']   = 'Οικία';
+$labels['typework']   = 'Εργασία';
+$labels['typeother']  = 'Άλλα';
+$labels['typemobile']  = 'Κινητό';
+$labels['typemain']  = 'Κύρια';
+$labels['typehomefax']  = 'Φαξ οικίας';
+$labels['typeworkfax']  = 'Φαξ εργασίας';
+$labels['typecar']  = 'Αυτοκίνητο';
+$labels['typepager']  = 'Βομβητής';
+$labels['typevideo']  = 'Βίντεο';
+$labels['typeassistant']  = 'Υπάλληλος';
+$labels['typehomepage']  = 'Αρχική Σελίδα';
 $labels['typeblog'] = 'Ιστολόγιο';
 $labels['typeprofile'] = 'Προφίλ';
+
 $labels['addfield'] = 'Προσθήκη πεδίου...';
 $labels['addcontact'] = 'Προσθήκη νέας επαφής';
 $labels['editcontact'] = 'Επεξεργασία επαφής';
 $labels['contacts'] = 'Επαφές';
 $labels['contactproperties'] = 'Ιδιότητες επαφών';
 $labels['personalinfo'] = 'Προσωπικές πληροφορίες';
-$labels['edit'] = 'Επεξεργασία';
+
+$labels['edit']   = 'Επεξεργασία';
 $labels['cancel'] = 'Ακύρωση';
-$labels['save'] = 'Αποθήκευση';
+$labels['save']   = 'Αποθήκευση';
 $labels['delete'] = 'Διαγραφή';
 $labels['rename'] = 'Μετονομασία';
 $labels['addphoto'] = 'Προσθήκη';
 $labels['replacephoto'] = 'Αντικατάσταση';
 $labels['uploadphoto'] = 'Φόρτωση εικόνας';
-$labels['newcontact'] = 'Δημιουργία νέας κάρτας επαφής';
-$labels['deletecontact'] = 'Διαγραφή επιλεγμένων επαφών';
-$labels['composeto'] = 'Σύνθεση μηνύματος προς';
+
+$labels['newcontact']     = 'Δημιουργία νέας κάρτας επαφής';
+$labels['deletecontact']  = 'Διαγραφή επιλεγμένων επαφών';
+$labels['composeto']      = 'Σύνθεση μηνύματος προς';
 $labels['contactsfromto'] = 'Επαφή $from από $to έως $count';
-$labels['print'] = 'Εκτύπωση';
-$labels['export'] = 'Εξαγωγή';
-$labels['exportvcards'] = 'Εξαγωγή επαφών σε vCard';
+$labels['print']          = 'Εκτύπωση';
+$labels['export']         = 'Εξαγωγή';
+$labels['exportall']      = 'Εξαγωγή όλων';
+$labels['exportsel']      = 'Εξαγωγή επιλεγμένων';
+$labels['exportvcards']   = 'Εξαγωγή επαφών σε vCard';
 $labels['newcontactgroup'] = 'Δημιουργία νέας Ομάδας επαφών';
-$labels['grouprename'] = 'Μετονομασία ομάδας';
-$labels['groupdelete'] = 'Διαγραφή ομάδας';
-$labels['previouspage'] = 'Εμφάνιση προηγούμενης σελίδας';
-$labels['firstpage'] = 'Εμφάνιση της πρώτης σελίδας';
-$labels['nextpage'] = 'Εμφάνιση επόμενης σελίδας';
-$labels['lastpage'] = 'Εμφάνιση της τελευταίας σελίδας';
+$labels['grouprename']    = 'Μετονομασία ομάδας';
+$labels['groupdelete']    = 'Διαγραφή ομάδας';
+$labels['groupremoveselected'] = 'Αφαίρεση επιλεγμένων επαφών από την ομάδα';
+
+$labels['previouspage']   = 'Εμφάνιση προηγούμενης σελίδας';
+$labels['firstpage']      = 'Εμφάνιση της πρώτης σελίδας';
+$labels['nextpage']       = 'Εμφάνιση επόμενης σελίδας';
+$labels['lastpage']       = 'Εμφάνιση της τελευταίας σελίδας';
+
 $labels['group'] = 'Ομάδα';
 $labels['groups'] = 'Ομάδες';
 $labels['personaladrbook'] = 'Προσωπικές Διυθύνσεις';
+
 $labels['searchsave'] = 'Αποθήκευση αναζήτησης';
 $labels['searchdelete'] = 'Διαγραφή αποθηκευμένης αναζήτησης';
+
 $labels['import'] = 'Εισαγωγή';
 $labels['importcontacts'] = 'Εισαγωγή επαφών';
 $labels['importfromfile'] = 'Εισαγωγή από το αρχείο:';
 $labels['importtarget'] = 'Προσθήκη νέων επαφών στο βιβλίο διευθύνσεων:';
 $labels['importreplace'] = 'Αντικατάσταση όλου του βιβλίου διευθύνσεων';
+$labels['importdesc'] = 'Μπορείτε να ανεβάσετε επαφές από ένα υπάρχον βιβλίο διευθύνσεων.<br/>Υποστηρίζεται η εισαγωγή διευθύνσεων από αρχεία τύπου <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['identities'] = 'Ταυτότητες';
 $labels['manageidentities'] = 'Διαχείριση ταυτοτήτων για αυτόν το λογαριασμό';
 $labels['newidentity'] = 'Νέα ταυτότητα';
+
 $labels['newitem'] = 'Νέο αντικείμενο';
 $labels['edititem'] = 'Επεξεργασία αντικειμένου';
+
 $labels['preferhtml'] = 'Προβολή σε HTML';
 $labels['defaultcharset'] = 'Προεπιλεγμένη κωδικοποίηση χαρακτήρων';
 $labels['htmlmessage'] = 'Μήνυμα σε μορφή HTML';
+$labels['messagepart'] = 'Μέρος';
+$labels['digitalsig'] = 'Ψηφιακή Υπογραφή';
 $labels['dateformat'] = 'Μορφή ημερομηνίας';
 $labels['timeformat'] = 'Μορφή ώρας';
 $labels['prettydate'] = 'Κομψή ημερ/νία';
-$labels['setdefault'] = 'Ορισμός ως προεπιλογή';
-$labels['autodetect'] = 'Αυτόματα';
-$labels['language'] = 'Γλώσσα';
-$labels['timezone'] = 'Ζώνη Ώρας';
-$labels['pagesize'] = 'Γραμμές ανά σελίδα';
+$labels['setdefault']  = 'Ορισμός ως προεπιλογή';
+$labels['autodetect']  = 'Αυτόματα';
+$labels['language']  = 'Γλώσσα';
+$labels['timezone']  = 'Ζώνη Ώρας';
+$labels['pagesize']  = 'Γραμμές ανά σελίδα';
 $labels['signature'] = 'Υπογραφή';
-$labels['dstactive'] = 'Θερινή ώρα';
+$labels['dstactive']  = 'Θερινή ώρα';
+$labels['showinextwin'] = 'Άνοιγμα μηνύματος σε νέο παράθυρο';
+$labels['composeextwin'] = 'Σύνθεση μηνύματος σε νέο παράθυρο';
 $labels['htmleditor'] = 'Δημιουργία μηνύματος σε μορφή HTML';
 $labels['htmlonreply'] = 'μόνο σε απάντηση μηνύματος μορφής HTML';
+$labels['htmlonreplyandforward'] = 'σε προώθηση ή σε απάντηση σε HTML μήνυμα';
 $labels['htmlsignature'] = 'Υπογραφή HTML';
+$labels['showemail'] = 'Εμφάνιση διεύθυνσης e-mail με το εμφανιζόμενο όνομα';
 $labels['previewpane'] = 'Εμφάνιση προεπισκόπησης';
 $labels['skin'] = 'Θέμα εμφάνισης';
 $labels['logoutclear'] = 'Άδειασμα του κάδου στην έξοδο';
@@ -341,14 +420,16 @@ $labels['readwhendeleted'] = 'Κατά τη διαγραφή του μηνύμα
 $labels['flagfordeletion'] = 'Αντί να το διαγράψεις, απλά και μόνο σημείωσέ το';
 $labels['skipdeleted'] = 'Να μην εμφανίζονται τα διαγραμμένα μηνύματα';
 $labels['deletealways'] = 'αν η μετακίνηση στον κάδο αποτύχει, διέγραψέ τα';
+$labels['deletejunk'] = 'Άμεση διαγραφή μηνυμάτων στα Ανεπιθύμητα';
 $labels['showremoteimages'] = 'Να εμφανίζονται οι εικόνες που έχουν αποσταλεί σε συνδέσμους';
 $labels['fromknownsenders'] = 'από γνωστούς αποστολείς';
 $labels['always'] = 'πάντα';
 $labels['showinlineimages'] = 'Οι συνημμένες εικόνες να προβάλλονται στο τέλος του μηνήματος';
-$labels['autosavedraft'] = 'Να γίνεται αυτόματη αποθήκευση σαν πρόχειρο';
-$labels['everynminutes'] = 'κάθε $n λεπτό/α';
-$labels['never'] = 'ποτέ';
-$labels['immediately'] = 'άμεσα';
+$labels['autosavedraft']  = 'Να γίνεται αυτόματη αποθήκευση σαν πρόχειρο';
+$labels['everynminutes']  = 'κάθε $n λεπτό/α';
+$labels['refreshinterval']  = 'Επαναφόρτωση (έλεγχος για νέα μηνύματα, κλπ.)';
+$labels['never']  = 'ποτέ';
+$labels['immediately']  = 'άμεσα';
 $labels['messagesdisplaying'] = 'Προβολή Μηνυμάτων';
 $labels['messagescomposition'] = 'Δημιουργία Μηνυμάτων';
 $labels['mimeparamfolding'] = 'Ονόματα συνημμένων αρχείων';
@@ -368,22 +449,20 @@ $labels['maintenance'] = 'Συντήρηση';
 $labels['newmessage'] = 'Νέο Μήνυμα';
 $labels['signatureoptions'] = 'Επιλογές υπογραφής';
 $labels['whenreplying'] = 'Στις απαντήσεις';
+$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 δευτερόλεπτα';
+$labels['previewpanemarkread']  = 'Στα μηνύματα που έγινε προεπισκόπηση να μαρκάρονται σαν αναγνωσμένα';
+$labels['afternseconds']  = 'μετά από $n δευτερόλεπτα';
 $labels['reqmdn'] = 'Να γίνεται πάντα αίτηση για αναφορά απάντησης';
 $labels['reqdsn'] = 'Να γίνεται πάντα αίτηση για αναφορά παράδοσης';
 $labels['replysamefolder'] = 'Τα μηνύματα που είναι απαντήσεις να τοποθετούνται σε ξεχωριστό φάκελο';
-$labels['defaultaddressbook'] = 'Οι νέες επαφές να αποθηκεύονται στο επιλεγμένο βιβλίο διευθύνσεων';
+$labels['defaultabook'] = 'Προκαθορισμένο βιβλίο διευθύνσεων';
 $labels['autocompletesingle'] = 'Να μην χρησιμοποιούνται οι εναλλακτικές διευθύνσεις κατά την αυτόματη συμπλήρωση';
 $labels['listnamedisplay'] = 'Εμφάνιση επαφών ως';
 $labels['spellcheckbeforesend'] = 'Να γίνεται πάντα έλεγχος ορθογραφίας πριν την αποστολή του μηνύματος';
@@ -393,13 +472,18 @@ $labels['spellcheckignorenums'] = 'Οι λέξεις που περιέχουν �
 $labels['spellcheckignorecaps'] = 'Οι λέξεις γραμμένες με ΚΕΦΑΛΑΙΑ να αγνοούνται';
 $labels['addtodict'] = 'Προσθήκη στο λεξικό';
 $labels['mailtoprotohandler'] = 'Καταχώρηση διαχείρισης πρωτοκόλλου δεσμών mailto:';
-$labels['folder'] = 'Φάκελος';
-$labels['foldername'] = 'Όνομα φακέλου';
-$labels['subscribed'] = 'Εγγεγραμμένος';
+$labels['forwardmode'] = 'Προώθηση μηνυμάτων';
+$labels['inline'] = 'με εσνωμάτωση';
+$labels['asattachment'] = 'σαν επισύναψη';
+
+$labels['folder']  = 'Φάκελος';
+$labels['folders']  = 'Φάκελοι';
+$labels['foldername']  = 'Όνομα φακέλου';
+$labels['subscribed']  = 'Εγγεγραμμένος';
 $labels['messagecount'] = 'Μηνύματα';
-$labels['create'] = 'Δημιουργία';
-$labels['createfolder'] = 'Δημιουργία νέου φακέλου';
-$labels['managefolders'] = 'Διαχείριση φακέλων';
+$labels['create']  = 'Δημιουργία';
+$labels['createfolder']  = 'Δημιουργία νέου φακέλου';
+$labels['managefolders']  = 'Διαχείριση φακέλων';
 $labels['specialfolders'] = 'Ειδικοί Φάκελοι';
 $labels['properties'] = 'Ιδιότητες';
 $labels['folderproperties'] = 'Ιδιότητες φακέλου';
@@ -409,22 +493,29 @@ $labels['info'] = 'Πληροφορίες';
 $labels['getfoldersize'] = 'Κάντε κλικ εδώ για να δείτε το μέγεθος του φακέλου';
 $labels['changesubscription'] = 'Κάντε κλικ εδώ για να αλλάξετε τη συνδρομή σας';
 $labels['foldertype'] = 'Τύπος φακέλου';
-$labels['personalfolder'] = 'Προσωπικός φάκελος';
-$labels['otherfolder'] = 'Φάκελοι άλλων χρηστών';
-$labels['sharedfolder'] = 'Κοινόχρηστος φάκελος';
+$labels['personalfolder']  = 'Προσωπικός φάκελος';
+$labels['otherfolder']  = 'Φάκελοι άλλων χρηστών';
+$labels['sharedfolder']  = 'Κοινόχρηστος φάκελος';
+
 $labels['sortby'] = 'Ταξινόμηση κατά';
-$labels['sortasc'] = 'Αύξουσα ταξινόμηση';
+$labels['sortasc']  = 'Αύξουσα ταξινόμηση';
 $labels['sortdesc'] = 'Φθίνουσα ταξινόμηση';
 $labels['undo'] = 'Αναίρεση';
+
+$labels['installedplugins'] = 'Εγκατεστημένα πρόσθετα';
 $labels['plugin'] = 'Πρόσθετο';
 $labels['version'] = 'Έκδοση';
 $labels['source'] = 'Προέλευση';
 $labels['license'] = 'Άδεια χρήσης';
 $labels['support'] = 'Υποστήριξη';
+
+// units
 $labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
 $labels['GB'] = 'GB';
+
+// character sets
 $labels['unicode'] = 'Unicode';
 $labels['english'] = 'Αγγλικά';
 $labels['westerneuropean'] = 'Δυτικής Ευρώπης';
@@ -444,3 +535,4 @@ $labels['japanese'] = 'Ιαπωνικά';
 $labels['korean'] = 'Κορεατικά';
 $labels['chinese'] = 'Κινεζικά';
 
+?>
diff --git a/program/localization/el_GR/messages.inc b/program/localization/el_GR/messages.inc
index de447af53..dc2499d8b 100644
--- a/program/localization/el_GR/messages.inc
+++ b/program/localization/el_GR/messages.inc
@@ -2,33 +2,40 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/el_GR/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Nikos Keramidis <info@torus.gr>                               |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['errortitle'] = 'Έχει προκύψει κάποιο σφάλμα!';
-$messages['loginfailed'] = 'Είσοδος απέτυχε';
+$messages['errortitle']  = 'Έχει προκύψει κάποιο σφάλμα!';
+$messages['loginfailed']  = 'Είσοδος απέτυχε';
 $messages['cookiesdisabled'] = 'Ο περιηγητής σας (browser) δεν αποδέχεται cookies';
 $messages['sessionerror'] = 'Η συνεδρία σας είναι άκυρη ή έχει λήξει';
 $messages['storageerror'] = 'Η σύνδεση με το διακομιστή IMAP απέτυχε';
 $messages['servererror'] = 'Σφάλμα του εξυπηρετητή!';
 $messages['servererrormsg'] = 'Σφάλμα εξυπηρετητή: $msg';
 $messages['dberror'] = 'Σφάλμα βάσης δεδομένων!';
+$messages['requesttimedout'] = 'Το αίτημα εξέπνευσε χρονικά';
 $messages['errorreadonly'] = 'Η διαδικασία δεν μπορεί να ολοκληρωθεί. Ο φάκελος είναι μόνο για ανάγνωση.';
 $messages['errornoperm'] = 'Η διαδικασία δεν μπορεί να ολοκληρωθεί. Άρνηση άδειας';
+$messages['erroroverquota'] = 'Δεν είναι δυνατή η εκτέλεση της λειτουργίας. Δεν υπάρχει ελεύθερος χώρος στο δίσκο. ';
+$messages['erroroverquotadelete'] = 'Δεν υπάρχει ελεύθερος χώρος στο δίσκο. Χρησιμοποιήστε το συνδυασμό πλήκτρων SHIFT DEL για να διαγράψετε ένα μήνυμα.';
 $messages['invalidrequest'] = 'Λανθασμένο αίτημα! Δεν αποθηκεύτηκαν δεδομένα.';
+$messages['invalidhost'] = 'Άκυρο όνομα εξυπηρετητή.';
 $messages['nomessagesfound'] = 'Δε βρέθηκαν μηνύματα σε αυτή τη θυρίδα';
 $messages['loggedout'] = 'Έχετε τερματίσει επιτυχώς τη συνεδρία. Αντίο!';
 $messages['mailboxempty'] = 'Η θυρίδα είναι άδεια';
+$messages['refreshing'] = 'Ανανέωση....';
 $messages['loading'] = 'Φόρτωση...';
 $messages['uploading'] = 'Το αρχείο φορτώνεται...';
 $messages['uploadingmany'] = 'Φόρτωση αρχείων...';
@@ -55,22 +62,24 @@ $messages['errormoving'] = 'Το μήνυμα δε μπορούσε να μετ�
 $messages['errorcopying'] = 'Δεν είναι δυνατή η αντιγραφή του μηνύματος/των';
 $messages['errordeleting'] = 'Το μήνυμα δε μπορούσε να διαγραφεί';
 $messages['errormarking'] = 'Δεν έγινε επισήμανση στο μύνημα';
-$messages['deletecontactconfirm'] = 'Θέλετε να διαγράψετε τη συγκεκριμένη επαφή/ές;';
-$messages['deletegroupconfirm'] = 'Είστε βέβαιοι πως θέλετε να διαγράψετε την επιλεγμένη ομάδα;';
+$messages['deletecontactconfirm']  = 'Θέλετε να διαγράψετε τη συγκεκριμένη επαφή/ές;';
+$messages['deletegroupconfirm']  = 'Είστε βέβαιοι πως θέλετε να διαγράψετε την επιλεγμένη ομάδα;';
 $messages['deletemessagesconfirm'] = 'Θέλετε να διαγράψετε το συγκεκριμένο μήνυμα/τα;';
-$messages['deletefolderconfirm'] = 'Θέλετε να διαγράψετε το συγκεκριμένο φάκελο;';
-$messages['purgefolderconfirm'] = 'Θέλετε να διαγράψετε όλα τα μηνύματα στο συγκεκριμένο φάκελο;';
+$messages['deletefolderconfirm']  = 'Θέλετε να διαγράψετε το συγκεκριμένο φάκελο;';
+$messages['purgefolderconfirm']  = 'Θέλετε να διαγράψετε όλα τα μηνύματα στο συγκεκριμένο φάκελο;';
 $messages['contactdeleting'] = 'Διαγραφή επαφών...';
 $messages['groupdeleting'] = 'Διαγραφή ομάδας...';
 $messages['folderdeleting'] = 'Διαγραφή φακέλου';
 $messages['foldermoving'] = 'Μεταφορά φακέλου';
+$messages['foldersubscribing'] = 'Εγγραφή φακέλου...';
+$messages['folderunsubscribing'] = 'Απεγγραφή φακέλου...';
 $messages['formincomplete'] = 'Η φόρμα δεν έχει συμπληρωθεί πλήρως';
 $messages['noemailwarning'] = 'Παρακαλώ εισάγετε έγκυρη διεύθυνση email';
-$messages['nonamewarning'] = 'Παρακαλώ εισάγετε όνομα';
+$messages['nonamewarning']  = 'Παρακαλώ εισάγετε όνομα';
 $messages['nopagesizewarning'] = 'Παρακαλώ εισάγετε μέγεθος σελίδας';
 $messages['nosenderwarning'] = 'Παρακαλώ εισάγετε την email διεύθυνση αποστολέα';
 $messages['norecipientwarning'] = 'Παρακαλώ εισάγεται τουλάχιστον έναν παραλήπτη';
-$messages['nosubjectwarning'] = 'Το πεδίο "Θέμα" είναι άδειο. Θέλετε να εισάγεται ένα τώρα;';
+$messages['nosubjectwarning']  = 'Το πεδίο "Θέμα" είναι άδειο. Θέλετε να εισάγεται ένα τώρα;';
 $messages['nobodywarning'] = 'Αποστολή μηνύματος χωρίς κείμενο;';
 $messages['notsentwarning'] = 'Το μήνυμα δεν έχει σταλεί. Θέλετε να το απορρίψετε;';
 $messages['noldapserver'] = 'Παρακαλώ επιλέξτε έναν LDAP διακομιστή για αναζήτηση';
@@ -83,6 +92,8 @@ $messages['searching'] = 'Αναζήτηση...';
 $messages['checking'] = 'Έλεγχος...';
 $messages['nospellerrors'] = 'Δε βρέθηκαν ορθογραφικά λάθη';
 $messages['folderdeleted'] = 'Ο φάκελος διαγράφηκε επιτυχώς';
+$messages['foldersubscribed'] = 'Ο φάκελος εχει εγγραφεί με επιτυχία.';
+$messages['folderunsubscribed'] = 'Ο φάκελος διαγράφηκε επιτυχώς';
 $messages['folderpurged'] = 'Ο φάκελος καθαρίστηκε με επιτυχία.';
 $messages['folderexpunged'] = 'Ο φάκελος συμπιέστηκε με επιτυχία.';
 $messages['deletedsuccessfully'] = 'Διαγραφή Επιτυχώς';
@@ -110,8 +121,9 @@ $messages['selectimportfile'] = 'Επιλέξτε αρχείο για ανέβα
 $messages['addresswriterror'] = 'Η επιλεγμένη ατζέντα διευθύνσεων δεν είνα εγγράψιμη';
 $messages['contactaddedtogroup'] = 'Οι επαφές προστέθηκαν στην ομάδα με επιτυχία.';
 $messages['contactremovedfromgroup'] = 'Οι επαφές αφαιρέθηκαν από την ομάδα με επιτυχία.';
+$messages['nogroupassignmentschanged'] = 'Οι αναθεσεις της ομαδας δεν αλλαξαν.';
 $messages['importwait'] = 'Εισαγωγή, παρακαλώ περιμένετε...';
-$messages['importerror'] = 'Η εισαγωγή απέτυχε! Το αρχείο δεν είναι έγκυρο vcard αρχείο.';
+$messages['importformaterror'] = 'Η εισαγωγή απέτυχε! Το αρχείο δεν είναι έγκυρο εισαγωγής δεδομένων.';
 $messages['importconfirm'] = '<b>Εισήχθησαν $inserted επαφές με επιτυχία</b>';
 $messages['importconfirmskipped'] = '<b>Παραλήφθηκαν $skipped υπάρχοντα αντικείμενα</b>';
 $messages['opnotpermitted'] = 'Η λειτουργία δεν επιτρέπεται!';
@@ -130,4 +142,30 @@ $messages['maxgroupmembersreached'] = 'Ο αριθμός των μελών τη�
 $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: $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 50b4769ae..88e4cfd9c 100644
--- a/program/localization/en_GB/labels.inc
+++ b/program/localization/en_GB/labels.inc
@@ -2,60 +2,79 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/en_GB/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Lazlo                                                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = 'Welcome to $product';
-$labels['username'] = 'Username';
-$labels['password'] = 'Password';
-$labels['server'] = 'Server';
-$labels['login'] = 'Login';
-$labels['logout'] = 'Logout';
-$labels['mail'] = 'Mail';
+
+// login page
+$labels['welcome']   = 'Welcome to $product';
+$labels['username']  = 'Username';
+$labels['password']  = 'Password';
+$labels['server']    = 'Server';
+$labels['login']     = 'Login';
+
+// taskbar
+$labels['logout']   = 'Logout';
+$labels['mail']     = 'Mail';
 $labels['settings'] = 'Settings';
 $labels['addressbook'] = 'Address Book';
-$labels['inbox'] = 'Inbox';
+
+// mailbox names
+$labels['inbox']  = 'Inbox';
 $labels['drafts'] = 'Drafts';
-$labels['sent'] = 'Sent';
-$labels['trash'] = 'Deleted Items';
-$labels['junk'] = 'Junk';
+$labels['sent']   = 'Sent';
+$labels['trash']  = 'Deleted Items';
+$labels['junk']   = 'Junk';
+$labels['show_real_foldernames'] = 'Show real names for special folders';
+
+// message listing
 $labels['subject'] = 'Subject';
-$labels['from'] = 'From';
-$labels['to'] = 'To';
-$labels['cc'] = 'Copy';
-$labels['bcc'] = 'Bcc';
+$labels['from']    = 'From';
+$labels['sender']  = 'Sender';
+$labels['to']      = 'To';
+$labels['cc']      = 'Copy';
+$labels['bcc']     = 'Bcc';
 $labels['replyto'] = 'Reply-To';
 $labels['followupto'] = 'Followup-To';
-$labels['date'] = 'Date';
-$labels['size'] = 'Size';
+$labels['date']    = 'Date';
+$labels['size']    = 'Size';
 $labels['priority'] = 'Priority';
 $labels['organization'] = 'Company';
 $labels['readstatus'] = 'Read status';
 $labels['listoptions'] = 'List options...';
+
 $labels['mailboxlist'] = 'Folders';
-$labels['folders'] = 'Folders';
 $labels['messagesfromto'] = 'Messages $from to $to of $count';
 $labels['threadsfromto'] = 'Threads $from to $to of $count';
 $labels['messagenrof'] = 'Message $nr of $count';
 $labels['fromtoshort'] = '$from – $to of $count';
-$labels['copy'] = 'Copy';
-$labels['move'] = 'Move';
-$labels['moveto'] = 'Move to...';
+
+$labels['copy']     = 'Copy';
+$labels['move']     = 'Move';
+$labels['moveto']   = 'Move to...';
 $labels['download'] = 'Download';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'Show';
 $labels['showanyway'] = 'Show it anyway';
+
 $labels['filename'] = 'File name';
 $labels['filesize'] = 'File size';
+
 $labels['addtoaddressbook'] = 'Add to address book';
+
+// weekdays short
 $labels['sun'] = 'Sun';
 $labels['mon'] = 'Mon';
 $labels['tue'] = 'Tue';
@@ -63,78 +82,88 @@ $labels['wed'] = 'Wed';
 $labels['thu'] = 'Thu';
 $labels['fri'] = 'Fri';
 $labels['sat'] = 'Sat';
-$labels['sunday'] = 'Sunday';
-$labels['monday'] = 'Monday';
-$labels['tuesday'] = 'Tuesday';
+
+// weekdays long
+$labels['sunday']    = 'Sunday';
+$labels['monday']    = 'Monday';
+$labels['tuesday']   = 'Tuesday';
 $labels['wednesday'] = 'Wednesday';
-$labels['thursday'] = 'Thursday';
-$labels['friday'] = 'Friday';
-$labels['saturday'] = 'Saturday';
-$labels['jan'] = 'Jan';
-$labels['feb'] = 'Feb';
-$labels['mar'] = 'Mar';
-$labels['apr'] = 'Apr';
-$labels['may'] = 'May';
-$labels['longmay'] = 'May';
-$labels['jun'] = 'Jun';
-$labels['jul'] = 'Jul';
-$labels['aug'] = 'Aug';
-$labels['sep'] = 'Sep';
-$labels['oct'] = 'Oct';
-$labels['nov'] = 'Nov';
-$labels['dec'] = 'Dec';
-$labels['longjan'] = 'January';
-$labels['longfeb'] = 'February';
-$labels['longmar'] = 'March';
-$labels['longapr'] = 'April';
-$labels['longjun'] = 'June';
-$labels['longjul'] = 'July';
-$labels['longaug'] = 'August';
-$labels['longsep'] = 'September';
-$labels['longoct'] = 'October';
-$labels['longnov'] = 'November';
-$labels['longdec'] = 'December';
+$labels['thursday']  = 'Thursday';
+$labels['friday']    = 'Friday';
+$labels['saturday']  = 'Saturday';
+
+// months short
+$labels['jan']	= 'Jan';
+$labels['feb']	= 'Feb';
+$labels['mar']	= 'Mar';
+$labels['apr']	= 'Apr';
+$labels['may']	= 'May';
+$labels['jun']	= 'Jun';
+$labels['jul'] 	= 'Jul';
+$labels['aug']	= 'Aug';
+$labels['sep']	= 'Sep';
+$labels['oct']	= 'Oct';
+$labels['nov']	= 'Nov';
+$labels['dec']	= 'Dec';
+
+// months long
+$labels['longjan']	= 'January';
+$labels['longfeb']	= 'February';
+$labels['longmar']	= 'March';
+$labels['longapr']	= 'April';
+$labels['longmay']	= 'May';
+$labels['longjun']	= 'June';
+$labels['longjul']	= 'July';
+$labels['longaug']	= 'August';
+$labels['longsep']	= 'September';
+$labels['longoct']	= 'October';
+$labels['longnov']	= 'November';
+$labels['longdec']	= 'December';
+
 $labels['today'] = 'Today';
-$labels['refresh'] = 'Refresh';
-$labels['checkmail'] = 'Check for new messages';
-$labels['compose'] = 'Compose';
-$labels['writenewmessage'] = 'Create a new message';
-$labels['reply'] = 'Reply';
-$labels['replytomessage'] = 'Reply to sender';
+
+// toolbar buttons
+$labels['refresh']          = 'Refresh';
+$labels['checkmail']        = 'Check for new messages';
+$labels['compose']          = 'Compose';
+$labels['writenewmessage']  = 'Create a new message';
+$labels['reply']            = 'Reply';
+$labels['replytomessage']   = 'Reply to sender';
 $labels['replytoallmessage'] = 'Reply to list or to sender and all recipients';
-$labels['replyall'] = 'Reply all';
-$labels['replylist'] = 'Reply list';
-$labels['forward'] = 'Forward';
-$labels['forwardinline'] = 'Forward inline';
+$labels['replyall']         = 'Reply all';
+$labels['replylist']        = 'Reply list';
+$labels['forward']          = 'Forward';
+$labels['forwardinline']    = 'Forward inline';
 $labels['forwardattachment'] = 'Forward as attachment';
-$labels['forwardmessage'] = 'Forward the message';
-$labels['deletemessage'] = 'Delete message';
+$labels['forwardmessage']   = 'Forward the message';
+$labels['deletemessage']    = 'Delete message';
 $labels['movemessagetotrash'] = 'Move message to "Deleted Items';
-$labels['printmessage'] = 'Print this message';
-$labels['previousmessage'] = 'Show the previous message';
-$labels['firstmessage'] = 'Show the first message';
-$labels['nextmessage'] = 'Show the next message';
-$labels['lastmessage'] = 'Show the last message';
-$labels['backtolist'] = 'Back to message list';
-$labels['viewsource'] = 'Show source';
-$labels['mark'] = 'Mark';
-$labels['markmessages'] = 'Mark messages';
-$labels['markread'] = 'As read';
-$labels['markunread'] = 'As unread';
-$labels['markflagged'] = 'As flagged';
-$labels['markunflagged'] = 'As unflagged';
-$labels['moreactions'] = 'More actions...';
-$labels['more'] = 'More';
-$labels['back'] = 'Back';
-$labels['options'] = 'Options';
+$labels['printmessage']     = 'Print this message';
+$labels['previousmessage']  = 'Show the previous message';
+$labels['firstmessage']     = 'Show the first message';
+$labels['nextmessage']      = 'Show the next message';
+$labels['lastmessage']      = 'Show the last message';
+$labels['backtolist']       = 'Back to message list';
+$labels['viewsource']       = 'Show source';
+$labels['mark']             = 'Mark';
+$labels['markmessages']     = 'Mark messages';
+$labels['markread']         = 'As read';
+$labels['markunread']       = 'As unread';
+$labels['markflagged']      = 'As flagged';
+$labels['markunflagged']    = 'As unflagged';
+$labels['moreactions']      = 'More actions...';
+$labels['more']             = 'More';
+$labels['back']             = 'Back';
+$labels['options']          = 'Options';
+
 $labels['select'] = 'Select';
 $labels['all'] = 'All';
 $labels['none'] = 'None';
-$labels['nonesort'] = 'None';
 $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';
@@ -145,12 +174,14 @@ $labels['expand-all'] = 'Expand All';
 $labels['expand-unread'] = 'Expand Unread';
 $labels['collapse-all'] = 'Collapse All';
 $labels['threaded'] = 'Threaded';
+
 $labels['autoexpand_threads'] = 'Expand message threads';
 $labels['do_expand'] = 'all threads';
 $labels['expand_only_unread'] = 'only with unread messages';
 $labels['fromto'] = 'From/To';
 $labels['flag'] = 'Flag';
 $labels['attachment'] = 'Attachment';
+$labels['nonesort'] = 'None';
 $labels['sentdate'] = 'Sent date';
 $labels['arrival'] = 'Arrival date';
 $labels['asc'] = 'ascending';
@@ -159,147 +190,176 @@ $labels['listcolumns'] = 'List columns';
 $labels['listsorting'] = 'Sorting column';
 $labels['listorder'] = 'Sorting order';
 $labels['listmode'] = 'List view mode';
+
 $labels['folderactions'] = 'Folder actions...';
 $labels['compact'] = 'Compact';
 $labels['empty'] = 'Empty';
+
 $labels['quota'] = 'Disk usage';
-$labels['unknown'] = 'unknown';
-$labels['unlimited'] = 'unlimited';
-$labels['quicksearch'] = 'Quick search';
-$labels['resetsearch'] = 'Reset search';
-$labels['searchmod'] = 'Search modifiers';
-$labels['msgtext'] = 'Entire message';
+$labels['unknown']  = 'unknown';
+$labels['unlimited']  = 'unlimited';
+
+$labels['quicksearch']  = 'Quick search';
+$labels['resetsearch']  = 'Reset search';
+$labels['searchmod']  = 'Search modifiers';
+$labels['msgtext']  = 'Entire message';
+$labels['body']  = 'Body';
+
 $labels['openinextwin'] = 'Open in new window';
 $labels['emlsave'] = 'Download (.eml)';
-$labels['editasnew'] = 'Edit as new';
-$labels['send'] = 'Send';
-$labels['sendmessage'] = 'Send now';
-$labels['savemessage'] = 'Save this draft';
-$labels['addattachment'] = 'Attach a file';
-$labels['charset'] = 'Charset';
-$labels['editortype'] = 'Editor type';
-$labels['returnreceipt'] = 'Return receipt';
-$labels['dsn'] = 'Delivery status notification';
+$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']    = 'Send now';
+$labels['savemessage']    = 'Save this draft';
+$labels['addattachment']  = 'Attach a file';
+$labels['charset']        = 'Charset';
+$labels['editortype']     = 'Editor type';
+$labels['returnreceipt']  = 'Return receipt';
+$labels['dsn']            = 'Delivery status notification';
 $labels['mailreplyintro'] = 'On $date, $sender wrote:';
 $labels['originalmessage'] = 'Original Message';
-$labels['editidents'] = 'Edit identities';
-$labels['spellcheck'] = 'Spell';
+
+$labels['editidents']    = 'Edit identities';
+$labels['spellcheck']    = 'Spell';
 $labels['checkspelling'] = 'Check spelling';
 $labels['resumeediting'] = 'Resume editing';
-$labels['revertto'] = 'Revert to';
+$labels['revertto']      = 'Revert to';
+
 $labels['attach'] = 'Attach';
 $labels['attachments'] = 'Attachments';
 $labels['upload'] = 'Upload';
 $labels['uploadprogress'] = '$percent ($current from $total)';
-$labels['close'] = 'Close';
-$labels['messageoptions'] = 'Message options...';
-$labels['low'] = 'Low';
-$labels['lowest'] = 'Lowest';
-$labels['normal'] = 'Normal';
-$labels['high'] = 'High';
+$labels['close']  = 'Close';
+$labels['messageoptions']  = 'Message options...';
+
+$labels['low']     = 'Low';
+$labels['lowest']  = 'Lowest';
+$labels['normal']  = 'Normal';
+$labels['high']    = 'High';
 $labels['highest'] = 'Highest';
-$labels['nosubject'] = '(no subject)';
+
+$labels['nosubject']  = '(no subject)';
 $labels['showimages'] = 'Display images';
 $labels['alwaysshow'] = 'Always show images from $sender';
-$labels['isdraft'] = 'This is a draft message.';
-$labels['andnmore'] = '$nr more...';
+$labels['isdraft']    = 'This is a draft message.';
+$labels['andnmore']   = '$nr more...';
 $labels['togglemoreheaders'] = 'Show more message headers';
 $labels['togglefullheaders'] = 'Toggle raw message headers';
+
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Plain text';
 $labels['savesentmessagein'] = 'Save sent message in';
 $labels['dontsave'] = 'don\'t save';
 $labels['maxuploadsize'] = 'Maximum allowed file size is $size';
+
 $labels['addcc'] = 'Add Cc';
 $labels['addbcc'] = 'Add Bcc';
 $labels['addreplyto'] = 'Add Reply-To';
 $labels['addfollowupto'] = 'Add Followup-To';
+
+// mdn
 $labels['mdnrequest'] = 'The sender of this message has asked to be notified when you read this message. Do you wish to notify the sender?';
 $labels['receiptread'] = 'Return Receipt (read)';
 $labels['yourmessage'] = 'This is a Return Receipt for your message';
 $labels['receiptnote'] = 'Note: This receipt only acknowledges that the message was displayed on the recipient\'s computer. There is no guarantee that the recipient has read or understood the message contents.';
-$labels['name'] = 'Display Name';
-$labels['firstname'] = 'First Name';
-$labels['surname'] = 'Last Name';
-$labels['middlename'] = 'Middle Name';
-$labels['nameprefix'] = 'Title';
-$labels['namesuffix'] = 'Suffix';
-$labels['nickname'] = 'Nickname';
-$labels['jobtitle'] = 'Job Title';
-$labels['department'] = 'Department';
-$labels['gender'] = 'Gender';
-$labels['maidenname'] = 'Maiden Name';
-$labels['email'] = 'Email';
-$labels['phone'] = 'Phone';
-$labels['address'] = 'Address';
-$labels['street'] = 'Street';
-$labels['locality'] = 'City';
-$labels['zipcode'] = 'Post Code';
-$labels['region'] = 'State/Province';
-$labels['country'] = 'Country';
-$labels['birthday'] = 'Birthday';
-$labels['anniversary'] = 'Anniversary';
-$labels['website'] = 'Website';
+
+// address boook
+$labels['name']         = 'Display Name';
+$labels['firstname']    = 'First Name';
+$labels['surname']      = 'Last Name';
+$labels['middlename']   = 'Middle Name';
+$labels['nameprefix']   = 'Title';
+$labels['namesuffix']   = 'Suffix';
+$labels['nickname']     = 'Nickname';
+$labels['jobtitle']     = 'Job Title';
+$labels['department']   = 'Department';
+$labels['gender']       = 'Gender';
+$labels['maidenname']   = 'Maiden Name';
+$labels['email']        = 'Email';
+$labels['phone']        = 'Phone';
+$labels['address']      = 'Address';
+$labels['street']       = 'Street';
+$labels['locality']     = 'City';
+$labels['zipcode']      = 'Post 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['male']   = 'male';
 $labels['female'] = 'female';
 $labels['manager'] = 'Manager';
 $labels['assistant'] = 'Assistant';
-$labels['typeassistant'] = 'Assistant';
 $labels['spouse'] = 'Spouse';
 $labels['allfields'] = 'All fields';
 $labels['search'] = 'Search';
 $labels['advsearch'] = 'Advanced Search';
 $labels['advanced'] = 'Advanced';
 $labels['other'] = 'Other';
-$labels['typeother'] = 'Other';
-$labels['typehome'] = 'Home';
-$labels['typework'] = 'Work';
-$labels['typemobile'] = 'Mobile';
-$labels['typemain'] = 'Main';
-$labels['typehomefax'] = 'Home Fax';
-$labels['typeworkfax'] = 'Work Fax';
-$labels['typecar'] = 'Car';
-$labels['typepager'] = 'Pager';
-$labels['typevideo'] = 'Video';
-$labels['typehomepage'] = 'Home Page';
+
+$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['typepager']  = 'Pager';
+$labels['typevideo']  = 'Video';
+$labels['typeassistant']  = 'Assistant';
+$labels['typehomepage']  = 'Home Page';
 $labels['typeblog'] = 'Blog';
 $labels['typeprofile'] = 'Profile';
+
 $labels['addfield'] = 'Add field...';
 $labels['addcontact'] = 'Add new contact';
 $labels['editcontact'] = 'Edit contact';
 $labels['contacts'] = 'Contacts';
 $labels['contactproperties'] = 'Contact properties';
 $labels['personalinfo'] = 'Personal information';
-$labels['edit'] = 'Edit';
+
+$labels['edit']   = 'Edit';
 $labels['cancel'] = 'Cancel';
-$labels['save'] = 'Save';
+$labels['save']   = 'Save';
 $labels['delete'] = 'Delete';
 $labels['rename'] = 'Rename';
 $labels['addphoto'] = 'Add';
 $labels['replacephoto'] = 'Replace';
 $labels['uploadphoto'] = 'Upload photo';
-$labels['newcontact'] = 'Create new contact card';
-$labels['deletecontact'] = 'Delete selected contacts';
-$labels['composeto'] = 'Compose mail to';
+
+$labels['newcontact']     = 'Create new contact card';
+$labels['deletecontact']  = 'Delete selected contacts';
+$labels['composeto']      = 'Compose mail to';
 $labels['contactsfromto'] = 'Contacts $from to $to of $count';
-$labels['print'] = 'Print';
-$labels['export'] = 'Export';
-$labels['exportvcards'] = 'Export contacts in vCard format';
+$labels['print']          = 'Print';
+$labels['export']         = 'Export';
+$labels['exportall']      = 'Export all';
+$labels['exportsel']      = 'Export selected';
+$labels['exportvcards']   = 'Export contacts in vCard format';
 $labels['newcontactgroup'] = 'Create new contact group';
-$labels['grouprename'] = 'Rename group';
-$labels['groupdelete'] = 'Delete group';
+$labels['grouprename']    = 'Rename group';
+$labels['groupdelete']    = 'Delete group';
 $labels['groupremoveselected'] = 'Remove selected contacts from group';
-$labels['previouspage'] = 'Show previous set';
-$labels['firstpage'] = 'Show first set';
-$labels['nextpage'] = 'Show next set';
-$labels['lastpage'] = 'Show last set';
+
+$labels['previouspage']   = 'Show previous set';
+$labels['firstpage']      = 'Show first set';
+$labels['nextpage']       = 'Show next set';
+$labels['lastpage']       = 'Show last set';
+
 $labels['group'] = 'Group';
 $labels['groups'] = 'Groups';
 $labels['personaladrbook'] = 'Personal Addresses';
+
 $labels['searchsave'] = 'Save search';
 $labels['searchdelete'] = 'Delete search';
+
 $labels['import'] = 'Import';
 $labels['importcontacts'] = 'Import contacts';
 $labels['importfromfile'] = 'Import from file:';
@@ -307,35 +367,43 @@ $labels['importtarget'] = 'Add new contacts to address book:';
 $labels['importreplace'] = 'Replace the entire address book';
 $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['done'] = 'Done';
+
+// settings
 $labels['settingsfor'] = 'Settings for';
 $labels['about'] = 'About';
 $labels['preferences'] = 'Preferences';
 $labels['userpreferences'] = 'User preferences';
 $labels['editpreferences'] = 'Edit user preferences';
+
 $labels['identities'] = 'Identities';
 $labels['manageidentities'] = 'Manage identities for this account';
 $labels['newidentity'] = 'New identity';
+
 $labels['newitem'] = 'New item';
 $labels['edititem'] = 'Edit item';
+
 $labels['preferhtml'] = 'Display HTML';
 $labels['defaultcharset'] = 'Default Character Set';
 $labels['htmlmessage'] = 'HTML Message';
+$labels['messagepart'] = 'Part';
+$labels['digitalsig'] = 'Digital Signature';
 $labels['dateformat'] = 'Date format';
 $labels['timeformat'] = 'Time format';
 $labels['prettydate'] = 'Pretty dates';
-$labels['setdefault'] = 'Set default';
-$labels['autodetect'] = 'Auto';
-$labels['language'] = 'Language';
-$labels['timezone'] = 'Time zone';
-$labels['pagesize'] = 'Rows per page';
+$labels['setdefault']  = 'Set default';
+$labels['autodetect']  = 'Auto';
+$labels['language']  = 'Language';
+$labels['timezone']  = 'Time zone';
+$labels['pagesize']  = 'Rows per page';
 $labels['signature'] = 'Signature';
-$labels['dstactive'] = 'Summer time';
+$labels['dstactive']  = 'Summer time';
 $labels['showinextwin'] = 'Open message in a new window';
 $labels['composeextwin'] = 'Compose in a new window';
 $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';
@@ -358,11 +426,11 @@ $labels['showremoteimages'] = 'Display remote inline images';
 $labels['fromknownsenders'] = 'from known senders';
 $labels['always'] = 'always';
 $labels['showinlineimages'] = 'Display attached images below the message';
-$labels['autosavedraft'] = 'Automatically save draft';
-$labels['everynminutes'] = 'every $n minute(s)';
-$labels['refreshinterval'] = 'Refresh (check for new messages, etc.)';
-$labels['never'] = 'never';
-$labels['immediately'] = 'immediately';
+$labels['autosavedraft']  = 'Automatically save draft';
+$labels['everynminutes']  = 'every $n minute(s)';
+$labels['refreshinterval']  = 'Refresh (check for new messages, etc.)';
+$labels['never']  = 'never';
+$labels['immediately']  = 'immediately';
 $labels['messagesdisplaying'] = 'Displaying Messages';
 $labels['messagescomposition'] = 'Composing Messages';
 $labels['mimeparamfolding'] = 'Attachment names';
@@ -389,12 +457,9 @@ $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';
+$labels['previewpanemarkread']  = 'Mark previewed messages as read';
+$labels['afternseconds']  = 'after $n seconds';
 $labels['reqmdn'] = 'Always request a return receipt';
 $labels['reqdsn'] = 'Always request a delivery status notification';
 $labels['replysamefolder'] = 'Place replies in the folder of the message being replied to';
@@ -411,13 +476,15 @@ $labels['mailtoprotohandler'] = 'Register protocol handler for mailto: links';
 $labels['forwardmode'] = 'Messages forwarding';
 $labels['inline'] = 'inline';
 $labels['asattachment'] = 'as attachment';
-$labels['folder'] = 'Folder';
-$labels['foldername'] = 'Folder name';
-$labels['subscribed'] = 'Subscribed';
+
+$labels['folder']  = 'Folder';
+$labels['folders']  = 'Folders';
+$labels['foldername']  = 'Folder name';
+$labels['subscribed']  = 'Subscribed';
 $labels['messagecount'] = 'Messages';
-$labels['create'] = 'Create';
-$labels['createfolder'] = 'Create new folder';
-$labels['managefolders'] = 'Manage folders';
+$labels['create']  = 'Create';
+$labels['createfolder']  = 'Create new folder';
+$labels['managefolders']  = 'Manage folders';
 $labels['specialfolders'] = 'Special Folders';
 $labels['properties'] = 'Properties';
 $labels['folderproperties'] = 'Folder properties';
@@ -427,23 +494,29 @@ $labels['info'] = 'Information';
 $labels['getfoldersize'] = 'Click to get folder size';
 $labels['changesubscription'] = 'Click to change subscription';
 $labels['foldertype'] = 'Folder Type';
-$labels['personalfolder'] = 'Private Folder';
-$labels['otherfolder'] = 'Other User\'s Folder';
-$labels['sharedfolder'] = 'Public Folder';
+$labels['personalfolder']  = 'Private Folder';
+$labels['otherfolder']  = 'Other User\'s Folder';
+$labels['sharedfolder']  = 'Public Folder';
+
 $labels['sortby'] = 'Sort by';
-$labels['sortasc'] = 'Sort ascending';
+$labels['sortasc']  = 'Sort ascending';
 $labels['sortdesc'] = 'Sort descending';
 $labels['undo'] = 'Undo';
+
 $labels['installedplugins'] = 'Installed plugins';
 $labels['plugin'] = 'Plugin';
 $labels['version'] = 'Version';
 $labels['source'] = 'Source';
 $labels['license'] = 'Licence';
 $labels['support'] = 'Get support';
+
+// units
 $labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
 $labels['GB'] = 'GB';
+
+// character sets
 $labels['unicode'] = 'Unicode';
 $labels['english'] = 'English';
 $labels['westerneuropean'] = 'Western European';
@@ -463,3 +536,4 @@ $labels['japanese'] = 'Japanese';
 $labels['korean'] = 'Korean';
 $labels['chinese'] = 'Chinese';
 
+?>
diff --git a/program/localization/en_GB/messages.inc b/program/localization/en_GB/messages.inc
index fd7720748..21e7539b4 100644
--- a/program/localization/en_GB/messages.inc
+++ b/program/localization/en_GB/messages.inc
@@ -2,20 +2,23 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/en_GB/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Lazlo                                                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['errortitle'] = 'An error occured.';
-$messages['loginfailed'] = 'Login failed.';
+$messages['errortitle']  = 'An error occured.';
+$messages['loginfailed']  = 'Login failed.';
 $messages['cookiesdisabled'] = 'Your browser does not accept cookies.';
 $messages['sessionerror'] = 'Your session is invalid or has expired.';
 $messages['storageerror'] = 'Connection to IMAP server failed.';
@@ -25,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.';
@@ -57,11 +62,11 @@ $messages['errormoving'] = 'Could not move the message(s).';
 $messages['errorcopying'] = 'Could not copy the message(s).';
 $messages['errordeleting'] = 'Could not delete the message(s).';
 $messages['errormarking'] = 'Could not mark the message(s).';
-$messages['deletecontactconfirm'] = 'Do you really want to delete the selected contact(s)?';
-$messages['deletegroupconfirm'] = 'Do you really want to delete the selected group?';
+$messages['deletecontactconfirm']  = 'Do you really want to delete the selected contact(s)?';
+$messages['deletegroupconfirm']  = 'Do you really want to delete the selected group?';
 $messages['deletemessagesconfirm'] = 'Do you really want to delete the selected message(s)?';
-$messages['deletefolderconfirm'] = 'Do you really want to delete this folder?';
-$messages['purgefolderconfirm'] = 'Do you really want to delete all messages in this folder?';
+$messages['deletefolderconfirm']  = 'Do you really want to delete this folder?';
+$messages['purgefolderconfirm']  = 'Do you really want to delete all messages in this folder?';
 $messages['contactdeleting'] = 'Deleting contact(s)...';
 $messages['groupdeleting'] = 'Deleting group...';
 $messages['folderdeleting'] = 'Deleting folder...';
@@ -70,11 +75,11 @@ $messages['foldersubscribing'] = 'Subscribing to folder...';
 $messages['folderunsubscribing'] = 'Unsubscribing from folder...';
 $messages['formincomplete'] = 'The form was not completely filled out.';
 $messages['noemailwarning'] = 'Please enter a valid email address.';
-$messages['nonamewarning'] = 'Please enter a name.';
+$messages['nonamewarning']  = 'Please enter a name.';
 $messages['nopagesizewarning'] = 'Please enter a page size.';
 $messages['nosenderwarning'] = 'Please enter sender e-mail address.';
 $messages['norecipientwarning'] = 'Please enter at least one recipient.';
-$messages['nosubjectwarning'] = 'The "Subject" field is empty. Would you like to enter one now?';
+$messages['nosubjectwarning']  = 'The "Subject" field is empty. Would you like to enter one now?';
 $messages['nobodywarning'] = 'Send this message without any text?';
 $messages['notsentwarning'] = 'Your message has not been sent. Do you want to discard it?';
 $messages['noldapserver'] = 'Please select an LDAP server to search.';
@@ -163,3 +168,4 @@ $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.';
 
+?>
diff --git a/program/localization/en_US/csv2vcard.inc b/program/localization/en_US/csv2vcard.inc
index eb884f59a..e7b86795b 100644
--- a/program/localization/en_US/csv2vcard.inc
+++ b/program/localization/en_US/csv2vcard.inc
@@ -5,7 +5,7 @@
  | localization/<lang>/csv2vcard.inc                                     |
  |                                                                       |
  | Localization file of the Roundcube Webmail client                     |
- | Copyright (C) 2005-2012, The Roundcube Dev Team                       |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -91,3 +91,20 @@ $map['work_phone'] = "Work Phone";
 $map['work_address'] = "Work Address";
 $map['work_country'] = "Work Country";
 $map['work_zipcode'] = "Work ZipCode";
+
+// Atmail
+$map['date_of_birth'] = "Date of Birth";
+$map['email'] = "Email";
+$map['home_mobile'] = "Home Mobile";
+$map['home_zip'] = "Home Zip";
+$map['info'] = "Info";
+$map['user_photo'] = "User Photo";
+$map['url'] = "URL";
+$map['work_city'] = "Work City";
+$map['work_company'] = "Work Company";
+$map['work_dept'] = "Work Dept";
+$map['work_fax'] = "Work Fax";
+$map['work_mobile'] = "Work Mobile";
+$map['work_state'] = "Work State";
+$map['work_title'] = "Work Title";
+$map['work_zip'] = "Work Zip";
diff --git a/program/localization/en_US/labels.inc b/program/localization/en_US/labels.inc
index a0b6e6a31..c5e6cae4c 100644
--- a/program/localization/en_US/labels.inc
+++ b/program/localization/en_US/labels.inc
@@ -5,7 +5,7 @@
  | localization/<lang>/labels.inc                                        |
  |                                                                       |
  | Localization file of the Roundcube Webmail client                     |
- | Copyright (C) 2005-2012, The Roundcube Dev Team                       |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -37,6 +37,7 @@ $labels['drafts'] = 'Drafts';
 $labels['sent']   = 'Sent';
 $labels['trash']  = 'Trash';
 $labels['junk']   = 'Junk';
+$labels['show_real_foldernames'] = 'Show real names for special folders';
 
 // message listing
 $labels['subject'] = 'Subject';
@@ -64,6 +65,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 +163,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';
@@ -191,6 +194,7 @@ $labels['listmode'] = 'List view mode';
 $labels['folderactions'] = 'Folder actions...';
 $labels['compact'] = 'Compact';
 $labels['empty'] = 'Empty';
+$labels['importmessages'] = 'Import messages';
 
 $labels['quota'] = 'Disk usage';
 $labels['unknown']  = 'unknown';
@@ -204,6 +208,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 +404,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 +458,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';
@@ -470,6 +474,7 @@ $labels['spellcheckignorenums'] = 'Ignore words with numbers';
 $labels['spellcheckignorecaps'] = 'Ignore words with all letters capitalized';
 $labels['addtodict'] = 'Add to dictionary';
 $labels['mailtoprotohandler'] = 'Register protocol handler for mailto: links';
+$labels['standardwindows'] = 'Handle popups as standard windows';
 $labels['forwardmode'] = 'Messages forwarding';
 $labels['inline'] = 'inline';
 $labels['asattachment'] = 'as attachment';
diff --git a/program/localization/en_US/messages.inc b/program/localization/en_US/messages.inc
index f3d22e4ec..16f4c67bf 100644
--- a/program/localization/en_US/messages.inc
+++ b/program/localization/en_US/messages.inc
@@ -5,7 +5,7 @@
  | localization/<lang>/messages.inc                                      |
  |                                                                       |
  | Localization file of the Roundcube Webmail client                     |
- | Copyright (C) 2005-2012, The Roundcube Dev Team                       |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -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.';
@@ -124,6 +126,8 @@ $messages['importwait'] = 'Importing, please wait...';
 $messages['importformaterror'] = 'Import failed! The uploaded file is not a valid import data file.';
 $messages['importconfirm'] = '<b>Successfully imported $inserted contacts</b>';
 $messages['importconfirmskipped'] = '<b>Skipped $skipped existing entries</b>';
+$messages['importmessagesuccess'] = 'Successfully imported $nr messages';
+$messages['importmessageerror'] = 'Import failed! The uploaded file is not a valid message or mailbox file';
 $messages['opnotpermitted'] = 'Operation not permitted!';
 $messages['nofromaddress'] = 'Missing e-mail address in selected identity.';
 $messages['editorwarning'] = 'Switching to the plain text editor will cause all text formatting to be lost. Do you wish to continue?';
diff --git a/program/localization/eo/labels.inc b/program/localization/eo/labels.inc
index 001021263..c088fc50e 100644
--- a/program/localization/eo/labels.inc
+++ b/program/localization/eo/labels.inc
@@ -2,58 +2,78 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/eo/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Eliovir                                                       |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = 'Bonvenon al $product';
-$labels['username'] = 'Uzantnomo';
-$labels['password'] = 'Pasvorto';
-$labels['server'] = 'Servilo';
-$labels['login'] = 'Ensaluti';
-$labels['logout'] = 'Elsaluti';
-$labels['mail'] = 'Retpoŝto';
+
+// login page
+$labels['welcome']   = 'Bonvenon al $product';
+$labels['username']  = 'Uzantnomo';
+$labels['password']  = 'Pasvorto';
+$labels['server']    = 'Servilo';
+$labels['login']     = 'Ensaluti';
+
+// taskbar
+$labels['logout']   = 'Elsaluti';
+$labels['mail']     = 'Retpoŝto';
 $labels['settings'] = 'Agordoj';
 $labels['addressbook'] = 'Adresaro';
-$labels['inbox'] = 'Ricevitujo';
+
+// mailbox names
+$labels['inbox']  = 'Ricevitujo';
 $labels['drafts'] = 'Malnetujo';
-$labels['sent'] = 'Senditujo';
-$labels['trash'] = 'Rubujo';
-$labels['junk'] = 'Spamujo';
+$labels['sent']   = 'Senditujo';
+$labels['trash']  = 'Rubujo';
+$labels['junk']   = 'Spamujo';
+
+// message listing
 $labels['subject'] = 'Temo';
-$labels['from'] = 'Sendanto';
-$labels['to'] = 'Ricevanto';
-$labels['cc'] = 'Kopio';
-$labels['bcc'] = 'Blindkopio';
+$labels['from']    = 'Sendanto';
+$labels['sender']  = 'Sender';
+$labels['to']      = 'Ricevanto';
+$labels['cc']      = 'Kopio';
+$labels['bcc']     = 'Blindkopio';
 $labels['replyto'] = 'Respondu-Al';
 $labels['followupto'] = 'Respondo-Al';
-$labels['date'] = 'Dato';
-$labels['size'] = 'Grando';
+$labels['date']    = 'Dato';
+$labels['size']    = 'Grando';
 $labels['priority'] = 'Prioritato';
 $labels['organization'] = 'Organizo';
 $labels['readstatus'] = 'Legis statuson';
 $labels['listoptions'] = 'List-agordoj...';
+
 $labels['mailboxlist'] = 'Dosierujoj';
-$labels['folders'] = 'Dosierujoj';
 $labels['messagesfromto'] = 'Mesaĝoj ekde $from ĝis $to de $count';
 $labels['threadsfromto'] = 'Fadenoj $from al $to de $count';
 $labels['messagenrof'] = 'Mesaĝo $nr-a de $count';
 $labels['fromtoshort'] = '$from - $to de $count';
-$labels['copy'] = 'Kopii';
-$labels['move'] = 'Movi';
-$labels['moveto'] = 'transloku al...';
+
+$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';
+
 $labels['filename'] = 'Dosiernomo';
 $labels['filesize'] = 'Dosiergrando';
+
 $labels['addtoaddressbook'] = 'Aldonu al adresaro';
+
+// weekdays short
 $labels['sun'] = 'Dim';
 $labels['mon'] = 'Lun';
 $labels['tue'] = 'Mar';
@@ -61,79 +81,90 @@ $labels['wed'] = 'Mer';
 $labels['thu'] = 'Ĵaŭ';
 $labels['fri'] = 'Ven';
 $labels['sat'] = 'Sab';
-$labels['sunday'] = 'Dimanĉo';
-$labels['monday'] = 'Lundo';
-$labels['tuesday'] = 'Mardo';
+
+// weekdays long
+$labels['sunday']    = 'Dimanĉo';
+$labels['monday']    = 'Lundo';
+$labels['tuesday']   = 'Mardo';
 $labels['wednesday'] = 'Merkredo';
-$labels['thursday'] = 'Ĵaŭdo';
-$labels['friday'] = 'Vendredo';
-$labels['saturday'] = 'Sabato';
-$labels['jan'] = 'Jan';
-$labels['feb'] = 'Feb';
-$labels['mar'] = 'Mar';
-$labels['apr'] = 'Apr';
-$labels['may'] = 'Majo';
-$labels['longmay'] = 'Majo';
-$labels['jun'] = 'Jun';
-$labels['jul'] = 'Jul';
-$labels['aug'] = 'Aŭg';
-$labels['sep'] = 'Sep';
-$labels['oct'] = 'Okt';
-$labels['nov'] = 'Nov';
-$labels['dec'] = 'Dec';
-$labels['longjan'] = 'Januaro';
-$labels['longfeb'] = 'Februaro';
-$labels['longmar'] = 'Marto';
-$labels['longapr'] = 'Aprilo';
-$labels['longjun'] = 'Junio';
-$labels['longjul'] = 'Julio';
-$labels['longaug'] = 'Aŭgusto';
-$labels['longsep'] = 'Septembro';
-$labels['longoct'] = 'Oktobro';
-$labels['longnov'] = 'Novembro';
-$labels['longdec'] = 'Decembro';
+$labels['thursday']  = 'Ĵaŭdo';
+$labels['friday']    = 'Vendredo';
+$labels['saturday']  = 'Sabato';
+
+// months short
+$labels['jan']	= 'Jan';
+$labels['feb']	= 'Feb';
+$labels['mar']	= 'Mar';
+$labels['apr']	= 'Apr';
+$labels['may']	= 'Majo';
+$labels['jun']	= 'Jun';
+$labels['jul'] 	= 'Jul';
+$labels['aug']	= 'Aŭg';
+$labels['sep']	= 'Sep';
+$labels['oct']	= 'Okt';
+$labels['nov']	= 'Nov';
+$labels['dec']	= 'Dec';
+
+// months long
+$labels['longjan']	= 'Januaro';
+$labels['longfeb']	= 'Februaro';
+$labels['longmar']	= 'Marto';
+$labels['longapr']	= 'Aprilo';
+$labels['longmay']	= 'Majo';
+$labels['longjun']	= 'Junio';
+$labels['longjul']	= 'Julio';
+$labels['longaug']	= 'Aŭgusto';
+$labels['longsep']	= 'Septembro';
+$labels['longoct']	= 'Oktobro';
+$labels['longnov']	= 'Novembro';
+$labels['longdec']	= 'Decembro';
+
 $labels['today'] = 'Hodiaŭ';
-$labels['refresh'] = 'Aktualigi';
-$labels['checkmail'] = 'Kontroli por novaj mesaĝoj';
-$labels['compose'] = 'Verki';
-$labels['writenewmessage'] = 'Verki novan mesaĝon';
-$labels['reply'] = 'Respondi';
-$labels['replytomessage'] = 'Respondi al sendanto';
+
+// toolbar buttons
+$labels['refresh']          = 'Aktualigi';
+$labels['checkmail']        = 'Kontroli por novaj mesaĝoj';
+$labels['compose']          = 'Verki';
+$labels['writenewmessage']  = 'Verki novan mesaĝon';
+$labels['reply']            = 'Respondi';
+$labels['replytomessage']   = 'Respondi al sendanto';
 $labels['replytoallmessage'] = 'Respondi al listo aŭ al sendanto kaj al ĉiuj ricevintoj';
-$labels['replyall'] = 'Respondi al ĉiuj';
-$labels['replylist'] = 'Respondi al listo';
-$labels['forward'] = 'Plusendi';
-$labels['forwardinline'] = 'Plusendu enmesaĝe';
+$labels['replyall']         = 'Respondi al ĉiuj';
+$labels['replylist']        = 'Respondi al listo';
+$labels['forward']          = 'Plusendi';
+$labels['forwardinline']    = 'Plusendu enmesaĝe';
 $labels['forwardattachment'] = 'Plusendu alfikse';
-$labels['forwardmessage'] = 'Plusendu mesaĝon';
-$labels['deletemessage'] = 'Forigu mesaĝon';
+$labels['forwardmessage']   = 'Plusendu mesaĝon';
+$labels['deletemessage']    = 'Forigu mesaĝon';
 $labels['movemessagetotrash'] = 'Transloku mesaĝon al rubujo';
-$labels['printmessage'] = 'Printu ĉi tiun mesaĝon';
-$labels['previousmessage'] = 'Montru antaŭan mesaĝon';
-$labels['firstmessage'] = 'Montru unuan mesaĝon';
-$labels['nextmessage'] = 'Montru sekvan mesaĝon';
-$labels['lastmessage'] = 'Montru lastan mesaĝon';
-$labels['backtolist'] = 'Reen al mesaĝo-listo';
-$labels['viewsource'] = 'Montri fonton';
-$labels['mark'] = 'Marki';
-$labels['markmessages'] = 'Marki mesaĝojn';
-$labels['markread'] = 'Kiel legita';
-$labels['markunread'] = 'Kiel nelegita';
-$labels['markflagged'] = 'kiel markita';
-$labels['markunflagged'] = 'kiel nemarkita';
-$labels['moreactions'] = 'Pliaj agoj';
-$labels['more'] = 'Pli';
-$labels['back'] = 'Malantaŭen';
-$labels['options'] = 'Agordoj';
+$labels['printmessage']     = 'Printu ĉi tiun mesaĝon';
+$labels['previousmessage']  = 'Montru antaŭan mesaĝon';
+$labels['firstmessage']     = 'Montru unuan mesaĝon';
+$labels['nextmessage']      = 'Montru sekvan mesaĝon';
+$labels['lastmessage']      = 'Montru lastan mesaĝon';
+$labels['backtolist']       = 'Reen al mesaĝo-listo';
+$labels['viewsource']       = 'Montri fonton';
+$labels['mark']             = 'Marki';
+$labels['markmessages']     = 'Marki mesaĝojn';
+$labels['markread']         = 'Kiel legita';
+$labels['markunread']       = 'Kiel nelegita';
+$labels['markflagged']      = 'kiel markita';
+$labels['markunflagged']    = 'kiel nemarkita';
+$labels['moreactions']      = 'Pliaj agoj';
+$labels['more']             = 'Pli';
+$labels['back']             = 'Malantaŭen';
+$labels['options']          = 'Agordoj';
+
 $labels['select'] = 'Elektu';
 $labels['all'] = 'Ĉion';
 $labels['none'] = 'Nenion';
-$labels['nonesort'] = 'Nenion';
 $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';
 $labels['filter'] = 'Filtru';
 $labels['list'] = 'Listo';
@@ -142,12 +173,14 @@ $labels['expand-all'] = 'Malfaldi ĉion';
 $labels['expand-unread'] = 'Malfaldi Nelegitajn';
 $labels['collapse-all'] = 'Faldi ĉion';
 $labels['threaded'] = 'Fadenita';
+
 $labels['autoexpand_threads'] = 'Malfaldi mesaĝ-fadenojn';
 $labels['do_expand'] = 'Ĉiuj fadenoj';
 $labels['expand_only_unread'] = 'Nur kun nelegitaj mesaĝoj';
 $labels['fromto'] = 'De/Al';
 $labels['flag'] = 'Marko';
 $labels['attachment'] = 'Aldonaĵo';
+$labels['nonesort'] = 'Nenion';
 $labels['sentdate'] = 'Send-dato';
 $labels['arrival'] = 'Ricev-dato';
 $labels['asc'] = 'kreskante';
@@ -155,153 +188,221 @@ $labels['desc'] = 'malkreskante';
 $labels['listcolumns'] = 'List-rubrikoj';
 $labels['listsorting'] = 'Ordig-rubriko';
 $labels['listorder'] = 'Ordig-ordo';
+$labels['listmode'] = 'List view mode';
+
 $labels['folderactions'] = 'Dosierujo-agoj';
 $labels['compact'] = 'Kompakta';
 $labels['empty'] = 'Malplena';
+
 $labels['quota'] = 'Diskuzo';
-$labels['unknown'] = 'nekonata';
-$labels['unlimited'] = 'senlima';
-$labels['quicksearch'] = 'Rapida serĉo';
-$labels['resetsearch'] = 'Vakigu serĉon';
-$labels['searchmod'] = 'Serĉ-opcioj';
-$labels['msgtext'] = 'Tuta mesaĝo';
+$labels['unknown']  = 'nekonata';
+$labels['unlimited']  = 'senlima';
+
+$labels['quicksearch']  = 'Rapida serĉo';
+$labels['resetsearch']  = 'Vakigu serĉon';
+$labels['searchmod']  = 'Serĉ-opcioj';
+$labels['msgtext']  = 'Tuta mesaĝo';
+$labels['body']  = 'Body';
+
 $labels['openinextwin'] = 'Malfermu en nova fenestro';
 $labels['emlsave'] = 'Elŝutu (.eml)';
-$labels['editasnew'] = 'Redaktu kiel nova';
-$labels['sendmessage'] = 'Sendu mesaĝon';
-$labels['savemessage'] = 'Savu ĉi tiun malneton';
-$labels['addattachment'] = 'Alfiksu dosieron';
-$labels['charset'] = 'Karaktraro';
-$labels['editortype'] = 'Speco de redaktilo';
-$labels['returnreceipt'] = 'Return receipt';
-$labels['dsn'] = 'Ricev-status-konfirmo';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
+
+// message compose
+$labels['editasnew']      = 'Redaktu kiel nova';
+$labels['send']           = 'Send';
+$labels['sendmessage']    = 'Sendu mesaĝon';
+$labels['savemessage']    = 'Savu ĉi tiun malneton';
+$labels['addattachment']  = 'Alfiksu dosieron';
+$labels['charset']        = 'Karaktraro';
+$labels['editortype']     = 'Speco de redaktilo';
+$labels['returnreceipt']  = 'Return receipt';
+$labels['dsn']            = 'Ricev-status-konfirmo';
 $labels['mailreplyintro'] = 'Je $date, $sender skribis:';
 $labels['originalmessage'] = 'Originala mesaĝo';
-$labels['editidents'] = 'Redaktu identojn';
-$labels['spellcheck'] = 'Literumu';
+
+$labels['editidents']    = 'Redaktu identojn';
+$labels['spellcheck']    = 'Literumu';
 $labels['checkspelling'] = 'Kontrolu literumadon';
 $labels['resumeediting'] = 'Rekomencu redaktadon';
-$labels['revertto'] = 'Reiru al';
+$labels['revertto']      = 'Reiru al';
+
 $labels['attach'] = 'Alfiksu';
 $labels['attachments'] = 'Alfiksaĵoj';
 $labels['upload'] = 'Alŝutu';
 $labels['uploadprogress'] = '$percent ($current de $total)';
-$labels['close'] = 'Fermi';
-$labels['messageoptions'] = 'Mesaĝ-agordoj...';
-$labels['low'] = 'Malalta';
-$labels['lowest'] = 'Plej malalta';
-$labels['normal'] = 'Normala';
-$labels['high'] = 'Alta';
+$labels['close']  = 'Fermi';
+$labels['messageoptions']  = 'Mesaĝ-agordoj...';
+
+$labels['low']     = 'Malalta';
+$labels['lowest']  = 'Plej malalta';
+$labels['normal']  = 'Normala';
+$labels['high']    = 'Alta';
 $labels['highest'] = 'Plej alta';
-$labels['nosubject'] = '(sen temo)';
+
+$labels['nosubject']  = '(sen temo)';
 $labels['showimages'] = 'Montru bildojn';
 $labels['alwaysshow'] = 'Ĉiam montru bildojn de $sender';
-$labels['isdraft'] = 'Ĉi-mesaĝo estas malneto';
+$labels['isdraft']    = 'Ĉi-mesaĝo estas malneto';
+$labels['andnmore']   = '$nr more...';
+$labels['togglemoreheaders'] = 'Show more message headers';
+$labels['togglefullheaders'] = 'Toggle raw message headers';
+
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Plata teksto';
 $labels['savesentmessagein'] = 'Konservu senditan mesaĝon en';
 $labels['dontsave'] = 'Ne konservu';
 $labels['maxuploadsize'] = 'Maksimuma permesata dosier-grando estas $size';
+
 $labels['addcc'] = 'Aldonu kopi-ricevanton';
 $labels['addbcc'] = 'Aldonu blindan kopi-ricevanton';
 $labels['addreplyto'] = 'Aldonu Respondu-Al';
 $labels['addfollowupto'] = 'Aldonu Respondu-Al';
+
+// mdn
 $labels['mdnrequest'] = 'La sendinto de ĉi tiu mesaĝo petis sciigon de kiam vi legas ĝin. Ĉu volas sciigi la sendinton?';
 $labels['receiptread'] = 'Legokonfirmo';
 $labels['yourmessage'] = 'Jen estas legokonfirmo de via mesaĝo';
 $labels['receiptnote'] = 'Notu: Ĉi tiu konfirmo nur asertas ke la mesaĝo estis malfermita je la komputilo de la ricevinto. Ne estas garantio ke la ricevinto legis aŭ komprenis la enhavon.';
-$labels['name'] = 'Nomo';
-$labels['firstname'] = 'Antaŭnomo';
-$labels['surname'] = 'Familia nomo';
-$labels['middlename'] = 'Meza Nomo';
-$labels['nameprefix'] = 'Prefikso';
-$labels['namesuffix'] = 'Sufikso';
-$labels['nickname'] = 'Kromnomo';
-$labels['jobtitle'] = 'Postena titolo';
-$labels['department'] = 'Departemento';
-$labels['gender'] = 'Sekso';
-$labels['email'] = 'Retpoŝto';
-$labels['phone'] = 'Telefono';
-$labels['address'] = 'Adreso';
-$labels['street'] = 'Strato';
-$labels['locality'] = 'Urbo';
-$labels['zipcode'] = 'Poŝt-kodo';
-$labels['region'] = 'Ŝtato/Provinco';
-$labels['country'] = 'Lando';
-$labels['birthday'] = 'Naskiĝdato';
-$labels['anniversary'] = 'Datreveno';
-$labels['website'] = 'Retejo';
+
+// address boook
+$labels['name']         = 'Nomo';
+$labels['firstname']    = 'Antaŭnomo';
+$labels['surname']      = 'Familia nomo';
+$labels['middlename']   = 'Meza Nomo';
+$labels['nameprefix']   = 'Prefikso';
+$labels['namesuffix']   = 'Sufikso';
+$labels['nickname']     = 'Kromnomo';
+$labels['jobtitle']     = 'Postena titolo';
+$labels['department']   = 'Departemento';
+$labels['gender']       = 'Sekso';
+$labels['maidenname']   = 'Maiden Name';
+$labels['email']        = 'Retpoŝto';
+$labels['phone']        = 'Telefono';
+$labels['address']      = 'Adreso';
+$labels['street']       = 'Strato';
+$labels['locality']     = 'Urbo';
+$labels['zipcode']      = 'Poŝt-kodo';
+$labels['region']       = 'Ŝtato/Provinco';
+$labels['country']      = 'Lando';
+$labels['birthday']     = 'Naskiĝdato';
+$labels['anniversary']  = 'Datreveno';
+$labels['website']      = 'Retejo';
 $labels['instantmessenger'] = 'TM';
 $labels['notes'] = 'Notoj';
-$labels['male'] = 'viro';
+$labels['male']   = 'viro';
 $labels['female'] = 'virino';
 $labels['manager'] = 'Estro';
 $labels['assistant'] = 'Asistanto';
-$labels['typeassistant'] = 'Asistanto';
 $labels['spouse'] = 'Edz(in)o';
 $labels['allfields'] = 'Ĉiuj kampoj';
 $labels['search'] = 'Serĉu';
 $labels['advsearch'] = 'Detala sercô';
 $labels['advanced'] = 'Altnivela';
 $labels['other'] = 'Alia';
-$labels['typeother'] = 'Alia';
-$labels['typehome'] = 'Hejmo';
-$labels['typework'] = 'Laboro';
-$labels['typemobile'] = 'Poŝtelefono';
-$labels['typemain'] = 'Ĉefa';
-$labels['typehomefax'] = 'Hejma faksilo';
-$labels['typeworkfax'] = 'Laboreja faksilo';
-$labels['typecar'] = 'Aŭtomobilo';
-$labels['typepager'] = 'Televokilo';
-$labels['typehomepage'] = 'Hejmpaĝo';
+
+$labels['typehome']   = 'Hejmo';
+$labels['typework']   = 'Laboro';
+$labels['typeother']  = 'Alia';
+$labels['typemobile']  = 'Poŝtelefono';
+$labels['typemain']  = 'Ĉefa';
+$labels['typehomefax']  = 'Hejma faksilo';
+$labels['typeworkfax']  = 'Laboreja faksilo';
+$labels['typecar']  = 'Aŭtomobilo';
+$labels['typepager']  = 'Televokilo';
+$labels['typevideo']  = 'Video';
+$labels['typeassistant']  = 'Asistanto';
+$labels['typehomepage']  = 'Hejmpaĝo';
 $labels['typeblog'] = 'Blogo';
 $labels['typeprofile'] = 'Profilo';
+
 $labels['addfield'] = 'Aldonu kampon...';
 $labels['addcontact'] = 'Aldonu kontakton';
 $labels['editcontact'] = 'Redaktu kontakton';
 $labels['contacts'] = 'Kontaktoj';
 $labels['contactproperties'] = 'Kontakt-informoj';
 $labels['personalinfo'] = 'Personaj informoj';
-$labels['edit'] = 'Redaktu';
+
+$labels['edit']   = 'Redaktu';
 $labels['cancel'] = 'Nuligi';
-$labels['save'] = 'Konservi';
+$labels['save']   = 'Konservi';
 $labels['delete'] = 'Forigi';
 $labels['rename'] = 'Alinomu';
 $labels['addphoto'] = 'Aldonu';
 $labels['replacephoto'] = 'Anstataŭu';
 $labels['uploadphoto'] = 'Alŝutu bildon';
-$labels['newcontact'] = 'Kreu novan kontakton';
-$labels['deletecontact'] = 'Forigu elektatajn kontaktojn';
-$labels['composeto'] = 'Verku mesaĝon al';
+
+$labels['newcontact']     = 'Kreu novan kontakton';
+$labels['deletecontact']  = 'Forigu elektatajn kontaktojn';
+$labels['composeto']      = 'Verku mesaĝon al';
 $labels['contactsfromto'] = 'Kontaktoj ekde $from ĝis $to de $count';
-$labels['print'] = 'Presi';
-$labels['export'] = 'Elporti';
-$labels['previouspage'] = 'Montru auntaŭan';
-$labels['firstpage'] = 'Montru unuan';
-$labels['nextpage'] = 'Montru sekvan';
-$labels['lastpage'] = 'Montru lastan';
+$labels['print']          = 'Presi';
+$labels['export']         = 'Elporti';
+$labels['exportall']      = 'Export all';
+$labels['exportsel']      = 'Export selected';
+$labels['exportvcards']   = 'Export contacts in vCard format';
+$labels['newcontactgroup'] = 'Create new contact group';
+$labels['grouprename']    = 'Rename group';
+$labels['groupdelete']    = 'Delete group';
+$labels['groupremoveselected'] = 'Remove selected contacts from group';
+
+$labels['previouspage']   = 'Montru auntaŭan';
+$labels['firstpage']      = 'Montru unuan';
+$labels['nextpage']       = 'Montru sekvan';
+$labels['lastpage']       = 'Montru lastan';
+
+$labels['group'] = 'Group';
 $labels['groups'] = 'Grupoj';
 $labels['personaladrbook'] = 'Persona Adresoj';
+
+$labels['searchsave'] = 'Save search';
+$labels['searchdelete'] = 'Delete search';
+
+$labels['import'] = 'Import';
+$labels['importcontacts'] = 'Import contacts';
+$labels['importfromfile'] = 'Import from file:';
+$labels['importtarget'] = 'Add new contacts to address book:';
+$labels['importreplace'] = 'Replace the entire address book';
+$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['done'] = 'Done';
+
+// settings
 $labels['settingsfor'] = 'Preferoj de';
+$labels['about'] = 'About';
 $labels['preferences'] = 'Preferoj';
 $labels['userpreferences'] = 'Uzant-preferoj';
 $labels['editpreferences'] = 'Redaktu uzant-preferojn';
+
 $labels['identities'] = 'Identoj';
 $labels['manageidentities'] = 'Administru identojn de ĉi tiu konto';
 $labels['newidentity'] = 'Nova idento';
+
 $labels['newitem'] = 'Nova ero';
 $labels['edititem'] = 'Redaktu eron';
+
 $labels['preferhtml'] = 'Montru HTML';
+$labels['defaultcharset'] = 'Default Character Set';
 $labels['htmlmessage'] = 'HTML Mesaĝo';
+$labels['messagepart'] = 'Part';
+$labels['digitalsig'] = 'Digital Signature';
+$labels['dateformat'] = 'Date format';
+$labels['timeformat'] = 'Time format';
 $labels['prettydate'] = 'Agrablaj Datoj';
-$labels['setdefault'] = 'Agordu kiel norma';
-$labels['language'] = 'Lingvo';
-$labels['timezone'] = 'Tempzono';
-$labels['pagesize'] = 'Mesaĝoj po paĝo';
+$labels['setdefault']  = 'Agordu kiel norma';
+$labels['autodetect']  = 'Auto';
+$labels['language']  = 'Lingvo';
+$labels['timezone']  = 'Tempzono';
+$labels['pagesize']  = 'Mesaĝoj po paĝo';
 $labels['signature'] = 'Subskribo';
-$labels['dstactive'] = 'Taglumsavado';
+$labels['dstactive']  = 'Taglumsavado';
+$labels['showinextwin'] = 'Open message in a new window';
+$labels['composeextwin'] = 'Compose in a new window';
 $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';
@@ -312,22 +413,126 @@ $labels['mailboxview'] = 'Ricevitujo vido';
 $labels['mdnrequests'] = 'Sendanto-sciigoj';
 $labels['askuser'] = 'demandu';
 $labels['autosend'] = 'sendu aŭtomate';
+$labels['autosendknown'] = 'send receipt to my contacts, otherwise ask me';
+$labels['autosendknownignore'] = 'send receipt to my contacts, otherwise ignore';
 $labels['ignore'] = 'malatentu';
 $labels['readwhendeleted'] = 'Marku mesaĝon kiel legita kiam forigata';
 $labels['flagfordeletion'] = 'Marku mesaĝon kiel forigita anstataŭ forigi';
+$labels['skipdeleted'] = 'Do not show deleted messages';
+$labels['deletealways'] = 'If moving messages to Trash fails, delete them';
+$labels['deletejunk'] = 'Directly delete messages in Junk';
+$labels['showremoteimages'] = 'Display remote inline images';
+$labels['fromknownsenders'] = 'from known senders';
+$labels['always'] = 'always';
 $labels['showinlineimages'] = 'Montru alfiksitajn bildojn sub la mesaĝo';
-$labels['autosavedraft'] = 'Aŭtomate savu malneton';
-$labels['never'] = 'neniam';
+$labels['autosavedraft']  = 'Aŭtomate savu malneton';
+$labels['everynminutes']  = 'every $n minute(s)';
+$labels['refreshinterval']  = 'Refresh (check for new messages, etc.)';
+$labels['never']  = 'neniam';
+$labels['immediately']  = 'immediately';
 $labels['messagesdisplaying'] = 'Mesaĝoj vidigante';
 $labels['messagescomposition'] = 'Mesaĝo-verkado';
-$labels['folder'] = 'Dosierujo';
-$labels['foldername'] = 'Dosierujo-nomo';
-$labels['subscribed'] = 'Abonata';
+$labels['mimeparamfolding'] = 'Attachment names';
+$labels['2231folding'] = 'Full RFC 2231 (Thunderbird)';
+$labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
+$labels['2047folding'] = 'Full RFC 2047 (other)';
+$labels['force7bit'] = 'Use MIME encoding for 8-bit characters';
+$labels['advancedoptions'] = 'Advanced options';
+$labels['focusonnewmessage'] = 'Focus browser window on new message';
+$labels['checkallfolders'] = 'Check all folders for new messages';
+$labels['displaynext'] = 'After message delete/move display the next message';
+$labels['defaultfont'] = 'Default font of HTML message';
+$labels['mainoptions'] = 'Main Options';
+$labels['browseroptions'] = 'Browser Options';
+$labels['section'] = 'Section';
+$labels['maintenance'] = 'Maintenance';
+$labels['newmessage'] = 'New Message';
+$labels['signatureoptions'] = 'Signature Options';
+$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'] = 'Automatically add signature';
+$labels['newmessageonly'] = 'new message only';
+$labels['replyandforwardonly'] = 'replies and forwards only';
+$labels['insertsignature'] = 'Insert signature';
+$labels['previewpanemarkread']  = 'Mark previewed messages as read';
+$labels['afternseconds']  = 'after $n seconds';
+$labels['reqmdn'] = 'Always request a return receipt';
+$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'] = 'Check spelling before sending a message';
+$labels['spellcheckoptions'] = 'Spellcheck Options';
+$labels['spellcheckignoresyms'] = 'Ignore words with symbols';
+$labels['spellcheckignorenums'] = 'Ignore words with numbers';
+$labels['spellcheckignorecaps'] = 'Ignore words with all letters capitalized';
+$labels['addtodict'] = 'Add to dictionary';
+$labels['mailtoprotohandler'] = 'Register protocol handler for mailto: links';
+$labels['forwardmode'] = 'Messages forwarding';
+$labels['inline'] = 'inline';
+$labels['asattachment'] = 'as attachment';
+
+$labels['folder']  = 'Dosierujo';
+$labels['folders']  = 'Dosierujoj';
+$labels['foldername']  = 'Dosierujo-nomo';
+$labels['subscribed']  = 'Abonata';
 $labels['messagecount'] = 'Mesaĝoj';
-$labels['create'] = 'Krei';
-$labels['createfolder'] = 'Kreu novan dosierujon';
-$labels['managefolders'] = 'Administru dosierujon';
+$labels['create']  = 'Krei';
+$labels['createfolder']  = 'Kreu novan dosierujon';
+$labels['managefolders']  = 'Administru dosierujon';
+$labels['specialfolders'] = 'Special Folders';
+$labels['properties'] = 'Properties';
+$labels['folderproperties'] = 'Folder properties';
+$labels['parentfolder'] = 'Parent folder';
+$labels['location'] = 'Location';
+$labels['info'] = 'Information';
+$labels['getfoldersize'] = 'Click to get folder size';
+$labels['changesubscription'] = 'Click to change subscription';
+$labels['foldertype'] = 'Folder Type';
+$labels['personalfolder']  = 'Private Folder';
+$labels['otherfolder']  = 'Other User\'s Folder';
+$labels['sharedfolder']  = 'Public Folder';
+
 $labels['sortby'] = 'Ordigu per';
-$labels['sortasc'] = 'Ordigu kreskante';
+$labels['sortasc']  = 'Ordigu kreskante';
 $labels['sortdesc'] = 'Ordigu malkreskante';
+$labels['undo'] = 'Undo';
+
+$labels['installedplugins'] = 'Installed plugins';
+$labels['plugin'] = 'Plugin';
+$labels['version'] = 'Version';
+$labels['source'] = 'Source';
+$labels['license'] = 'License';
+$labels['support'] = 'Get support';
+
+// units
+$labels['B'] = 'B';
+$labels['KB'] = 'KB';
+$labels['MB'] = 'MB';
+$labels['GB'] = 'GB';
+
+// character sets
+$labels['unicode'] = 'Unicode';
+$labels['english'] = '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['turkish'] = 'Turkish';
+$labels['nordic'] = 'Nordic';
+$labels['thai'] = 'Thai';
+$labels['celtic'] = 'Celtic';
+$labels['vietnamese'] = 'Vietnamese';
+$labels['japanese'] = 'Japanese';
+$labels['korean'] = 'Korean';
+$labels['chinese'] = 'Chinese';
 
+?>
diff --git a/program/localization/eo/messages.inc b/program/localization/eo/messages.inc
index 038249fb0..4d72fe54b 100644
--- a/program/localization/eo/messages.inc
+++ b/program/localization/eo/messages.inc
@@ -2,33 +2,43 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/eo/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Andreas van Cranenburgh <andreas@unstable.nl>                 |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['errortitle'] = 'Eraro okazis!';
-$messages['loginfailed'] = 'Malsukcesis ensaluti';
+$messages['errortitle']  = 'Eraro okazis!';
+$messages['loginfailed']  = 'Malsukcesis ensaluti';
 $messages['cookiesdisabled'] = 'Via foliumilo ne akceptas kuketojn';
 $messages['sessionerror'] = 'Via seanco estas nevalida aŭ finita';
 $messages['storageerror'] = 'Konekto kun IMAP-servilo malsukcesis';
 $messages['servererror'] = 'Servil-eraro!';
 $messages['servererrormsg'] = 'Servil-eraro: $msg';
 $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';
 $messages['loggedout'] = 'Vi sukcese finis la seancon. Ĝis!';
 $messages['mailboxempty'] = 'Dosierujo estas malplena';
+$messages['refreshing'] = 'Refreshing...';
 $messages['loading'] = 'Ŝarganta...';
+$messages['uploading'] = 'Uploading file...';
+$messages['uploadingmany'] = 'Uploading files...';
 $messages['loadingdata'] = 'Ŝarganta datumojn...';
 $messages['checkingmail'] = 'Kontrolanta, ĉu  novaj mesaĝoj...';
 $messages['sendingmessage'] = 'Sedanta mesaĝon...';
@@ -38,34 +48,54 @@ $messages['messagesaved'] = 'Mesaĝo savita en Malnetujo';
 $messages['successfullysaved'] = 'Sukcese savis';
 $messages['addedsuccessfully'] = 'Sukcese aldonis kontakton al adresaro';
 $messages['contactexists'] = 'Kontakto kun ĉi tiu adreso jam ekzistas';
+$messages['contactnameexists'] = 'A contact with the same name already exists.';
 $messages['blockedimages'] = 'Por protekti vian privatecon, foraj bildoj estas blokitaj en ĉi tiu mesaĝo.';
 $messages['encryptedmessage'] = 'Ĉi tiu mesaĝo estas ĉifrata kaj ne estas montrebla. Pardonu!';
 $messages['nocontactsfound'] = 'Trovis neniun kontakton';
 $messages['contactnotfound'] = 'La petita kontakto ne trovis';
+$messages['contactsearchonly'] = 'Enter some search terms to find contacts';
 $messages['sendingfailed'] = 'Ne sukcesis sendi mesaĝon';
+$messages['senttooquickly'] = 'Please wait $sec sec(s). before sending this message.';
+$messages['errorsavingsent'] = 'An error occured while saving sent message.';
 $messages['errorsaving'] = 'Okazis eraro dum savo de mesaĝo';
 $messages['errormoving'] = 'Ne povis transloki mesaĝon';
+$messages['errorcopying'] = 'Could not copy the message(s).';
 $messages['errordeleting'] = 'Ne povis forigi mesaĝon';
-$messages['deletecontactconfirm'] = 'Ĉu vi vere volas forigi la elektata(j)n kontakto(j)n?';
+$messages['errormarking'] = 'Could not mark the message(s).';
+$messages['deletecontactconfirm']  = 'Ĉu vi vere volas forigi la elektata(j)n kontakto(j)n?';
+$messages['deletegroupconfirm']  = 'Do you really want to delete selected group?';
 $messages['deletemessagesconfirm'] = 'Ĉu vi vere volas forigi la elektata(j)n mesaĝo(j)n?';
-$messages['deletefolderconfirm'] = 'Ĉu vi vere volas forigi la elektatan dosierujon?';
-$messages['purgefolderconfirm'] = 'Ĉu vi vere volas forigi ĉiun mesaĝon el ĉi tiu dosierujo?';
+$messages['deletefolderconfirm']  = 'Ĉu vi vere volas forigi la elektatan dosierujon?';
+$messages['purgefolderconfirm']  = 'Ĉu vi vere volas forigi ĉiun mesaĝon el ĉi tiu dosierujo?';
+$messages['contactdeleting'] = 'Deleting contact(s)...';
+$messages['groupdeleting'] = 'Deleting group...';
+$messages['folderdeleting'] = 'Deleting folder...';
+$messages['foldermoving'] = 'Moving folder...';
+$messages['foldersubscribing'] = 'Subscribing folder...';
+$messages['folderunsubscribing'] = 'Unsubscribing folder...';
 $messages['formincomplete'] = 'La formularo ne estis kompletigita';
 $messages['noemailwarning'] = 'Bonvolu enmeti validan retpoŝt-adreson';
-$messages['nonamewarning'] = 'Bonvulu enmeti nomon';
+$messages['nonamewarning']  = 'Bonvulu enmeti nomon';
 $messages['nopagesizewarning'] = 'Bonvolu enmeti paĝ-grando';
+$messages['nosenderwarning'] = 'Please enter sender e-mail address.';
 $messages['norecipientwarning'] = 'Bonvolu enmeti minumume unu ricevonto';
-$messages['nosubjectwarning'] = 'La temkampo estas malplena. Ĉu vi volas skribi temon nun?';
+$messages['nosubjectwarning']  = 'La temkampo estas malplena. Ĉu vi volas skribi temon nun?';
 $messages['nobodywarning'] = 'Ĉu sendi ĉi tiun mesaĝon sen teksto?';
 $messages['notsentwarning'] = 'Mesaĝo ne estas sendita. Ĉu vi volas forigi vian mesaĝon?';
 $messages['noldapserver'] = 'Bonvolu elekti ldap-servilon por serĉado';
 $messages['nosearchname'] = 'Bonvolu enmeti kontakt-nomon aŭ retpoŝt-adreson.';
+$messages['notuploadedwarning'] = 'Not all attachments have been uploaded yet. Please wait or cancel the upload.';
 $messages['searchsuccessful'] = 'trovis $nr mesaĝojn';
+$messages['contactsearchsuccessful'] = '$nr contacts found.';
 $messages['searchnomatch'] = 'Serĉo donis nenion';
 $messages['searching'] = 'Serĉanta...';
 $messages['checking'] = 'Kontrolanta...';
 $messages['nospellerrors'] = 'Neniujn literumada eraro trovita';
 $messages['folderdeleted'] = 'Forigis dosierujon sukcese';
+$messages['foldersubscribed'] = 'Folder successfully subscribed.';
+$messages['folderunsubscribed'] = 'Folder successfully unsubscribed.';
+$messages['folderpurged'] = 'Folder has successfully been emptied.';
+$messages['folderexpunged'] = 'Folder has successfully been compacted.';
 $messages['deletedsuccessfully'] = 'Sukcese forigis';
 $messages['converting'] = 'Foriganta formatan de mesaĝo...';
 $messages['messageopenerror'] = 'Ne povis ŝargi mesaĝon de servilo';
@@ -76,8 +106,66 @@ $messages['copyerror'] = 'Ne povis kopii ajn adreson';
 $messages['sourceisreadonly'] = 'Ĉi tiu adres-fonto estas nurlegebla';
 $messages['errorsavingcontact'] = 'Ne povis savi la kontakt-adreson';
 $messages['movingmessage'] = 'Translokanta mesaĝon...';
+$messages['copyingmessage'] = 'Copying message(s)...';
+$messages['copyingcontact'] = 'Copying contact(s)...';
+$messages['deletingmessage'] = 'Deleting message(s)...';
+$messages['markingmessage'] = 'Marking message(s)...';
+$messages['addingmember'] = 'Adding contact(s) to the group...';
+$messages['removingmember'] = 'Removing contact(s) from the group...';
 $messages['receiptsent'] = 'Sukcese sendis konfirmon';
 $messages['errorsendingreceipt'] = 'Ne povis sendi konfirmon';
+$messages['deleteidentityconfirm'] = 'Do you really want to delete this identity?';
 $messages['nodeletelastidentity'] = 'Vi ne povas forigi ĉi tiun identon, ĉar ĝi estas la lasta';
 $messages['forbiddencharacter'] = 'Dosierujo-nomo enhavas malpermesitan karaktron';
+$messages['selectimportfile'] = 'Please select a file to upload.';
+$messages['addresswriterror'] = 'The selected address book is not writeable.';
+$messages['contactaddedtogroup'] = 'Successfully added the contacts to this group.';
+$messages['contactremovedfromgroup'] = 'Successfully removed contacts from this group.';
+$messages['nogroupassignmentschanged'] = 'No group assignments changed.';
+$messages['importwait'] = 'Importing, please wait...';
+$messages['importformaterror'] = 'Import failed! The uploaded file is not a valid import data file.';
+$messages['importconfirm'] = '<b>Successfully imported $inserted contacts</b>';
+$messages['importconfirmskipped'] = '<b>Skipped $skipped existing entries</b>';
+$messages['opnotpermitted'] = 'Operation not permitted!';
+$messages['nofromaddress'] = 'Missing e-mail address in selected identity.';
+$messages['editorwarning'] = 'Switching to the plain text editor will cause all text formatting to be lost. Do you wish to continue?';
+$messages['httpreceivedencrypterror'] = 'A fatal configuration error occurred. Contact your administrator immediately. <b>Your message can not be sent.</b>';
+$messages['smtpconnerror'] = 'SMTP Error ($code): Connection to server failed.';
+$messages['smtpautherror'] = 'SMTP Error ($code): Authentication failed.';
+$messages['smtpfromerror'] = 'SMTP Error ($code): Failed to set sender "$from" ($msg).';
+$messages['smtptoerror'] = 'SMTP Error ($code): Failed to add recipient "$to" ($msg).';
+$messages['smtprecipientserror'] = 'SMTP Error: Unable to parse recipients list.';
+$messages['smtperror'] = 'SMTP Error: $msg';
+$messages['emailformaterror'] = 'Invalid e-mail address: $email';
+$messages['toomanyrecipients'] = 'Too many recipients. Reduce the number of recipients to $max.';
+$messages['maxgroupmembersreached'] = 'The number of group members exceeds the maximum of $max.';
+$messages['internalerror'] = 'An internal error occured. Please try again.';
+$messages['contactdelerror'] = 'Could not delete contact(s).';
+$messages['contactdeleted'] = 'Contact(s) deleted successfully.';
+$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.';
 
+?>
diff --git a/program/localization/es_AR/labels.inc b/program/localization/es_AR/labels.inc
index 1f8324954..d9a83be75 100644
--- a/program/localization/es_AR/labels.inc
+++ b/program/localization/es_AR/labels.inc
@@ -2,53 +2,78 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/es_AR/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = 'Bienvenido a $product';
-$labels['username'] = 'Nombre de usuario';
-$labels['password'] = 'Contraseña';
-$labels['server'] = 'Servidor';
-$labels['login'] = 'Entrar';
-$labels['logout'] = 'Cerrar sesión';
-$labels['mail'] = 'Correo';
+
+// login page
+$labels['welcome']   = 'Bienvenido a $product';
+$labels['username']  = 'Nombre de usuario';
+$labels['password']  = 'Contraseña';
+$labels['server']    = 'Servidor';
+$labels['login']     = 'Entrar';
+
+// taskbar
+$labels['logout']   = 'Cerrar sesión';
+$labels['mail']     = 'Correo';
 $labels['settings'] = 'Configuración';
 $labels['addressbook'] = 'Contactos';
-$labels['inbox'] = 'Entrada';
+
+// mailbox names
+$labels['inbox']  = 'Entrada';
 $labels['drafts'] = 'Borradores';
-$labels['sent'] = 'Enviados';
-$labels['trash'] = 'Papelera';
-$labels['junk'] = 'Basura';
+$labels['sent']   = 'Enviados';
+$labels['trash']  = 'Papelera';
+$labels['junk']   = 'Basura';
+
+// message listing
 $labels['subject'] = 'Asunto';
-$labels['from'] = 'Remitente';
-$labels['to'] = 'Destinatario';
-$labels['cc'] = 'Copia';
-$labels['bcc'] = 'Cco';
+$labels['from']    = 'Remitente';
+$labels['sender']  = 'Remitente';
+$labels['to']      = 'Destinatario';
+$labels['cc']      = 'Copia';
+$labels['bcc']     = 'Cco';
 $labels['replyto'] = 'Responder a';
-$labels['date'] = 'Fecha';
-$labels['size'] = 'Tamaño';
+$labels['followupto'] = 'Followup-To';
+$labels['date']    = 'Fecha';
+$labels['size']    = 'Tamaño';
 $labels['priority'] = 'Prioridad';
 $labels['organization'] = 'Organización';
+$labels['readstatus'] = 'Read status';
+$labels['listoptions'] = 'Listar opciones...';
+
 $labels['mailboxlist'] = 'Carpetas';
-$labels['folders'] = 'Carpetas';
 $labels['messagesfromto'] = 'Mensajes $from a $to de $count';
+$labels['threadsfromto'] = '$from a $to de $count conversaciones';
 $labels['messagenrof'] = 'Mensaje $nr de $count';
-$labels['copy'] = 'Copiar';
-$labels['move'] = 'Mover';
-$labels['moveto'] = 'Mover a...';
+$labels['fromtoshort'] = '$from – $to de $count';
+
+$labels['copy']     = 'Copiar';
+$labels['move']     = 'Mover';
+$labels['moveto']   = 'Mover a...';
 $labels['download'] = 'Descargar';
+$labels['open']     = 'Open';
+$labels['showattachment'] = 'Mostrar';
+$labels['showanyway'] = 'Mostrar esto siempre';
+
 $labels['filename'] = 'Nombre del archivo';
 $labels['filesize'] = 'Tamaño del archivo';
+
 $labels['addtoaddressbook'] = 'Añadir a contactos';
+
+// weekdays short
 $labels['sun'] = 'Dom';
 $labels['mon'] = 'Lun';
 $labels['tue'] = 'Mar';
@@ -56,174 +81,328 @@ $labels['wed'] = 'Mié';
 $labels['thu'] = 'Jue';
 $labels['fri'] = 'Vie';
 $labels['sat'] = 'Sáb';
-$labels['sunday'] = 'Domingo';
-$labels['monday'] = 'Lunes';
-$labels['tuesday'] = 'Martes';
+
+// weekdays long
+$labels['sunday']    = 'Domingo';
+$labels['monday']    = 'Lunes';
+$labels['tuesday']   = 'Martes';
 $labels['wednesday'] = 'Miércoles';
-$labels['thursday'] = 'Jueves';
-$labels['friday'] = 'Viernes';
-$labels['saturday'] = 'Sábado';
-$labels['jan'] = 'Ene';
-$labels['feb'] = 'Feb';
-$labels['mar'] = 'Mar';
-$labels['apr'] = 'Abr';
-$labels['may'] = 'Mayo';
-$labels['longmay'] = 'Mayo';
-$labels['jun'] = 'Jun';
-$labels['jul'] = 'Jul';
-$labels['aug'] = 'Ago';
-$labels['sep'] = 'Sep';
-$labels['oct'] = 'Oct';
-$labels['nov'] = 'Nov';
-$labels['dec'] = 'Dic';
-$labels['longjan'] = 'Enero';
-$labels['longfeb'] = 'Febrero';
-$labels['longmar'] = 'Marzo';
-$labels['longapr'] = 'Abril';
-$labels['longjun'] = 'Junio';
-$labels['longjul'] = 'Julio';
-$labels['longaug'] = 'Agosto';
-$labels['longsep'] = 'Septiembre';
-$labels['longoct'] = 'Octubre';
-$labels['longnov'] = 'Noviembre';
-$labels['longdec'] = 'Diciembre';
+$labels['thursday']  = 'Jueves';
+$labels['friday']    = 'Viernes';
+$labels['saturday']  = 'Sábado';
+
+// months short
+$labels['jan']	= 'Ene';
+$labels['feb']	= 'Feb';
+$labels['mar']	= 'Mar';
+$labels['apr']	= 'Abr';
+$labels['may']	= 'Mayo';
+$labels['jun']	= 'Jun';
+$labels['jul'] 	= 'Jul';
+$labels['aug']	= 'Ago';
+$labels['sep']	= 'Sep';
+$labels['oct']	= 'Oct';
+$labels['nov']	= 'Nov';
+$labels['dec']	= 'Dic';
+
+// months long
+$labels['longjan']	= 'Enero';
+$labels['longfeb']	= 'Febrero';
+$labels['longmar']	= 'Marzo';
+$labels['longapr']	= 'Abril';
+$labels['longmay']	= 'Mayo';
+$labels['longjun']	= 'Junio';
+$labels['longjul']	= 'Julio';
+$labels['longaug']	= 'Agosto';
+$labels['longsep']	= 'Septiembre';
+$labels['longoct']	= 'Octubre';
+$labels['longnov']	= 'Noviembre';
+$labels['longdec']	= 'Diciembre';
+
 $labels['today'] = 'Hoy';
-$labels['checkmail'] = 'Revisar si hay nuevos mensajes';
-$labels['compose'] = 'Escribir un mensaje';
-$labels['writenewmessage'] = 'Crear nuevo mensaje';
-$labels['replytomessage'] = 'Responder mensaje';
+
+// toolbar buttons
+$labels['refresh']          = 'Actualizar';
+$labels['checkmail']        = 'Revisar si hay nuevos mensajes';
+$labels['compose']          = 'Escribir un mensaje';
+$labels['writenewmessage']  = 'Crear nuevo mensaje';
+$labels['reply']            = 'Responder';
+$labels['replytomessage']   = 'Responder mensaje';
 $labels['replytoallmessage'] = 'Responder al emisor y a todos los destinatarios';
-$labels['forwardmessage'] = 'Reenviar mensaje';
-$labels['deletemessage'] = 'Eliminar mensaje';
+$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';
-$labels['printmessage'] = 'Imprimir este mensaje';
-$labels['previousmessage'] = 'Mostrar mensaje anterior';
-$labels['firstmessage'] = 'Mostrar primer mensaje';
-$labels['nextmessage'] = 'Mostrar siguente mensaje';
-$labels['lastmessage'] = 'Mostrar último mensaje';
-$labels['backtolist'] = 'Volver a la lista de mensajes';
-$labels['viewsource'] = 'Mostrar código';
-$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['printmessage']     = 'Imprimir este mensaje';
+$labels['previousmessage']  = 'Mostrar mensaje anterior';
+$labels['firstmessage']     = 'Mostrar primer mensaje';
+$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']             = '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']      = 'Mas acciones...';
+$labels['more']             = 'Más';
+$labels['back']             = 'Atrás';
+$labels['options']          = 'Opciones';
+
 $labels['select'] = 'Elija';
 $labels['all'] = 'Todos';
 $labels['none'] = 'Ninguno';
-$labels['nonesort'] = 'Ninguno';
 $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'] = 'No eliminado';
 $labels['invert'] = 'Invertir';
 $labels['filter'] = 'Filtrar';
+$labels['list'] = 'Lista';
+$labels['threads'] = 'Conversaciones';
 $labels['expand-all'] = 'Expandir Todos';
 $labels['expand-unread'] = 'Expandir No Leidos';
 $labels['collapse-all'] = 'Colapsar Todos';
+$labels['threaded'] = 'Como conversaciones';
+
+$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'] = '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'] = 'Listar columnas';
+$labels['listsorting'] = 'Ordenar por';
+$labels['listorder'] = 'Ordenado por';
+$labels['listmode'] = 'List view mode';
+
+$labels['folderactions'] = 'Acciones de carpeta...';
 $labels['compact'] = 'Compactar';
 $labels['empty'] = 'Vaciar';
+
 $labels['quota'] = 'Uso de disco';
-$labels['unknown'] = 'desconocido';
-$labels['unlimited'] = 'sin límite';
-$labels['quicksearch'] = 'Búsqueda rápida';
-$labels['resetsearch'] = 'Reajustar la búsqueda';
-$labels['searchmod'] = 'Opciones de búsqueda';
-$labels['msgtext'] = 'Mensaje completo';
+$labels['unknown']  = 'desconocido';
+$labels['unlimited']  = 'sin límite';
+
+$labels['quicksearch']  = 'Búsqueda rápida';
+$labels['resetsearch']  = 'Reajustar la búsqueda';
+$labels['searchmod']  = 'Opciones de búsqueda';
+$labels['msgtext']  = 'Mensaje completo';
+$labels['body']  = 'Body';
+
 $labels['openinextwin'] = 'Abrir en ventana nueva';
 $labels['emlsave'] = 'Guardar (.eml)';
-$labels['editasnew'] = 'Editar como nuevo';
-$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['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
+
+// message compose
+$labels['editasnew']      = 'Editar como nuevo';
+$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']            = 'Notificación de estado del envío';
+$labels['mailreplyintro'] = 'El $date, $sender escribió:';
+$labels['originalmessage'] = 'Mensaje original';
+
+$labels['editidents']    = 'Editar identidades';
+$labels['spellcheck']    = 'Gramática';
 $labels['checkspelling'] = 'Revisar ortografía';
 $labels['resumeediting'] = 'Continuar edición';
-$labels['revertto'] = 'Revertir a';
+$labels['revertto']      = 'Revertir a';
+
+$labels['attach'] = 'Adjuntar';
 $labels['attachments'] = 'Adjuntos';
 $labels['upload'] = 'Agregar';
-$labels['close'] = 'Cerrar';
-$labels['low'] = 'Bajo';
-$labels['lowest'] = 'Bajísimo';
-$labels['normal'] = 'Normal';
-$labels['high'] = 'Alto';
+$labels['uploadprogress'] = '$percent ($current de $total)';
+$labels['close']  = 'Cerrar';
+$labels['messageoptions']  = 'Opciones de mensaje...';
+
+$labels['low']     = 'Bajo';
+$labels['lowest']  = 'Bajísimo';
+$labels['normal']  = 'Normal';
+$labels['high']    = 'Alto';
 $labels['highest'] = 'Altísimo';
-$labels['nosubject'] = '(sin asunto)';
+
+$labels['nosubject']  = '(sin asunto)';
 $labels['showimages'] = 'Mostrar imágenes';
 $labels['alwaysshow'] = 'Siempre mostrar imágenes de $sender';
+$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';
 $labels['plaintoggle'] = 'Texto';
 $labels['savesentmessagein'] = 'Guardar mensaje enviado en';
 $labels['dontsave'] = 'no guardar';
 $labels['maxuploadsize'] = 'El tamaño maximo permitido por archivo es $size';
+
 $labels['addcc'] = 'Añadir Cc';
 $labels['addbcc'] = 'Añadir Cco';
 $labels['addreplyto'] = 'Añadir Respuesta a';
+$labels['addfollowupto'] = 'Add Followup-To';
+
+// mdn
 $labels['mdnrequest'] = 'El emisor de este mensaje desea ser notificado cuando usted lo lea. ¿Quiere enviar esta notificación?';
 $labels['receiptread'] = 'Notificación de lectura';
 $labels['yourmessage'] = 'Esta es una notificación de lectura de su mensaje';
 $labels['receiptnote'] = 'Nota: Esta notificación sólo significa que su mensaje fue mostrado en la computadora del receptor. No hay garantía de que el receptor haya leído o entendido el contenido del mensaje.';
-$labels['name'] = 'Nombre completo';
-$labels['firstname'] = 'Nombre';
-$labels['surname'] = 'Apellido';
-$labels['email'] = 'Correo';
+
+// address boook
+$labels['name']         = 'Nombre completo';
+$labels['firstname']    = 'Nombre';
+$labels['surname']      = 'Apellido';
+$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']        = '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']  = 'Asistente';
+$labels['typehomepage']  = 'Página Personal';
+$labels['typeblog'] = 'Blog';
+$labels['typeprofile'] = 'Perfil';
+
+$labels['addfield'] = 'Agregar campo...';
 $labels['addcontact'] = 'Añadir nuevo contacto';
 $labels['editcontact'] = 'Editar contacto';
-$labels['edit'] = 'Editar';
+$labels['contacts'] = 'Contactos';
+$labels['contactproperties'] = 'Propiedades del contacto';
+$labels['personalinfo'] = 'Información personal';
+
+$labels['edit']   = 'Editar';
 $labels['cancel'] = 'Cancelar';
-$labels['save'] = 'Guardar';
+$labels['save']   = 'Guardar';
 $labels['delete'] = 'Eliminar';
-$labels['newcontact'] = 'Añadir nuevo contacto';
-$labels['deletecontact'] = 'Eliminar contactos seleccionados';
-$labels['composeto'] = 'Enviar mensaje a';
+$labels['rename'] = 'Renombrar';
+$labels['addphoto'] = 'Agregar';
+$labels['replacephoto'] = 'Reemplazar';
+$labels['uploadphoto'] = 'Subir foto';
+
+$labels['newcontact']     = 'Añadir nuevo contacto';
+$labels['deletecontact']  = 'Eliminar contactos seleccionados';
+$labels['composeto']      = 'Enviar mensaje a';
 $labels['contactsfromto'] = 'Contactos $from a $to de $count';
-$labels['print'] = 'Imprimir';
-$labels['export'] = 'Exportar';
-$labels['exportvcards'] = 'Exportar contactos en format vCard';
+$labels['print']          = 'Imprimir';
+$labels['export']         = 'Exportar';
+$labels['exportall']      = 'Export all';
+$labels['exportsel']      = 'Export selected';
+$labels['exportvcards']   = 'Exportar contactos en format vCard';
 $labels['newcontactgroup'] = 'Crear Nuevo Grupo de Contacto';
-$labels['previouspage'] = 'Mostrar grupo anterior';
-$labels['firstpage'] = 'Mostrar primer grupo';
-$labels['nextpage'] = 'Mostrar siguiente grupo';
-$labels['lastpage'] = 'Mostrar último grupo';
+$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';
+$labels['nextpage']       = 'Mostrar siguiente grupo';
+$labels['lastpage']       = 'Mostrar último grupo';
+
 $labels['group'] = 'Grupo';
 $labels['groups'] = 'Grupos';
 $labels['personaladrbook'] = 'Direcciones personales';
+
+$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'] = 'Agregar nuevos contactos a la libreta de direcciones:';
 $labels['importreplace'] = 'Reemplazar completamente la lista de contactos';
+$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'] = 'Acerca de';
 $labels['preferences'] = 'Preferencias';
 $labels['userpreferences'] = 'Preferencias de usuario';
 $labels['editpreferences'] = 'Editar preferencias de usuario';
+
 $labels['identities'] = 'Identidades';
 $labels['manageidentities'] = 'Gestionar identidades para esta cuenta';
 $labels['newidentity'] = 'Nueva identidad';
+
 $labels['newitem'] = 'Nuevo';
 $labels['edititem'] = 'Editar';
+
 $labels['preferhtml'] = 'Prefiero HTML';
 $labels['defaultcharset'] = 'Juego de Caracteres por Defecto';
 $labels['htmlmessage'] = 'Mensaje HTML';
+$labels['messagepart'] = 'Part';
+$labels['digitalsig'] = 'Digital Signature';
+$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';
-$labels['language'] = 'Idioma';
-$labels['timezone'] = 'Zona horaria';
-$labels['pagesize'] = 'Filas por página';
+$labels['setdefault']  = 'Seleccionar opción por defecto';
+$labels['autodetect']  = 'Automático';
+$labels['language']  = 'Idioma';
+$labels['timezone']  = 'Zona horaria';
+$labels['pagesize']  = 'Filas por página';
 $labels['signature'] = 'Firma';
-$labels['dstactive'] = 'Cambio de horario';
+$labels['dstactive']  = 'Cambio de horario';
+$labels['showinextwin'] = 'Abrir mensaje en nueva ventana';
+$labels['composeextwin'] = 'Redactar en nueva ventana';
 $labels['htmleditor'] = 'Componer mensaje en HTML';
+$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';
@@ -234,19 +413,23 @@ $labels['mailboxview'] = 'Vista de buzón';
 $labels['mdnrequests'] = 'Notificaciones de envío';
 $labels['askuser'] = 'preguntar al usuario';
 $labels['autosend'] = 'enviar automáticamente';
+$labels['autosendknown'] = 'send receipt to my contacts, otherwise ask me';
+$labels['autosendknownignore'] = 'send receipt to my contacts, otherwise ignore';
 $labels['ignore'] = 'ignorar';
 $labels['readwhendeleted'] = 'Marcar el mensage como leído al borrarlo';
 $labels['flagfordeletion'] = 'Marcar el mensage para borrarse en vez de borrarlo';
 $labels['skipdeleted'] = 'No mostrar mensajes eliminados';
 $labels['deletealways'] = 'Cuando no se pueda mover un mensaje a la papelera, eliminarlo';
+$labels['deletejunk'] = 'Directly delete messages in Junk';
 $labels['showremoteimages'] = 'Mostrar imágenes remotas';
 $labels['fromknownsenders'] = 'de remitentes conocidos';
 $labels['always'] = 'siempre';
 $labels['showinlineimages'] = 'Mostrar imágenes adjuntas debajo del mensaje';
-$labels['autosavedraft'] = 'Guardar borrador automáticamente';
-$labels['everynminutes'] = 'cada $n minuto(s)';
-$labels['never'] = 'nunca';
-$labels['immediately'] = 'inmediatamente';
+$labels['autosavedraft']  = 'Guardar borrador automáticamente';
+$labels['everynminutes']  = 'cada $n minuto(s)';
+$labels['refreshinterval']  = 'Refresh (check for new messages, etc.)';
+$labels['never']  = 'nunca';
+$labels['immediately']  = 'inmediatamente';
 $labels['messagesdisplaying'] = 'Vista de mensajes';
 $labels['messagescomposition'] = 'Composición de mensajes';
 $labels['mimeparamfolding'] = 'Nombre de adjuntos';
@@ -258,39 +441,81 @@ $labels['advancedoptions'] = 'Opciones Avanzadas';
 $labels['focusonnewmessage'] = 'Traer al frente la ventana del navegador cuando haya nuevos mensajes';
 $labels['checkallfolders'] = 'Verificar todas las carpetas por nuevos mensajes';
 $labels['displaynext'] = 'Luedo de eliminar/mover, mostrar el próximo mensaje';
+$labels['defaultfont'] = 'Default font of HTML message';
 $labels['mainoptions'] = 'Opciones Principales';
+$labels['browseroptions'] = 'Browser Options';
 $labels['section'] = 'Selección';
 $labels['maintenance'] = 'Mantenimiento';
 $labels['newmessage'] = 'Nuevo Mensaje';
 $labels['signatureoptions'] = 'Opciones de Firma';
 $labels['whenreplying'] = 'Al Responder';
+$labels['replyempty'] = 'do not quote the original message';
 $labels['replytopposting'] = 'iniciar el nuevo mensaje sobre el original';
 $labels['replybottomposting'] = 'iniciar el nuevo mensaje debajo del original';
 $labels['replyremovesignature'] = 'Al responder, eliminar la firma del mensaje original';
 $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';
-$labels['folder'] = 'Carpeta';
-$labels['foldername'] = 'Nombre de carpeta';
-$labels['subscribed'] = 'Suscripta';
+$labels['previewpanemarkread']  = 'Marcar mensajes previsualizados como leidos';
+$labels['afternseconds']  = 'despues de $n segundos';
+$labels['reqmdn'] = 'Always request a return receipt';
+$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'] = 'Check spelling before sending a message';
+$labels['spellcheckoptions'] = 'Spellcheck Options';
+$labels['spellcheckignoresyms'] = 'Ignore words with symbols';
+$labels['spellcheckignorenums'] = 'Ignore words with numbers';
+$labels['spellcheckignorecaps'] = 'Ignore words with all letters capitalized';
+$labels['addtodict'] = 'Add to dictionary';
+$labels['mailtoprotohandler'] = 'Register protocol handler for mailto: links';
+$labels['forwardmode'] = 'Messages forwarding';
+$labels['inline'] = 'inline';
+$labels['asattachment'] = 'as attachment';
+
+$labels['folder']  = 'Carpeta';
+$labels['folders']  = 'Carpetas';
+$labels['foldername']  = 'Nombre de carpeta';
+$labels['subscribed']  = 'Suscripta';
 $labels['messagecount'] = 'Mensajes';
-$labels['create'] = 'Crear';
-$labels['createfolder'] = 'Crear nueva carpeta';
-$labels['managefolders'] = 'Administrar carpetas';
+$labels['create']  = 'Crear';
+$labels['createfolder']  = 'Crear nueva carpeta';
+$labels['managefolders']  = 'Administrar carpetas';
 $labels['specialfolders'] = 'Carpetas Especiales';
+$labels['properties'] = 'Properties';
+$labels['folderproperties'] = 'Folder properties';
+$labels['parentfolder'] = 'Parent folder';
+$labels['location'] = 'Location';
+$labels['info'] = 'Information';
+$labels['getfoldersize'] = 'Click to get folder size';
+$labels['changesubscription'] = 'Click to change subscription';
+$labels['foldertype'] = 'Folder Type';
+$labels['personalfolder']  = 'Private Folder';
+$labels['otherfolder']  = 'Other User\'s Folder';
+$labels['sharedfolder']  = 'Public Folder';
+
 $labels['sortby'] = 'Ordenar por';
-$labels['sortasc'] = 'Orden ascendente';
+$labels['sortasc']  = 'Orden ascendente';
 $labels['sortdesc'] = 'Orden descendente';
+$labels['undo'] = 'Undo';
+
+$labels['installedplugins'] = 'Installed plugins';
+$labels['plugin'] = 'Plugin';
+$labels['version'] = 'Version';
+$labels['source'] = 'Source';
+$labels['license'] = 'License';
+$labels['support'] = 'Get support';
+
+// units
 $labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
 $labels['GB'] = 'GB';
+
+// character sets
 $labels['unicode'] = 'Unicode';
 $labels['english'] = 'Ingles';
 $labels['westerneuropean'] = 'Europa Occidental';
@@ -310,3 +535,4 @@ $labels['japanese'] = 'Japonés';
 $labels['korean'] = 'Coreano';
 $labels['chinese'] = 'Chino';
 
+?>
diff --git a/program/localization/es_AR/messages.inc b/program/localization/es_AR/messages.inc
index 76697fd61..1cec9f01d 100644
--- a/program/localization/es_AR/messages.inc
+++ b/program/localization/es_AR/messages.inc
@@ -2,30 +2,43 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/es_AR/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['loginfailed'] = 'Contraseña o nombre de usuario incorrecto';
+$messages['errortitle']  = 'Ha ocurrido un error!';
+$messages['loginfailed']  = 'Contraseña o nombre de usuario incorrecto';
 $messages['cookiesdisabled'] = 'Su navegador no acepta cookies';
 $messages['sessionerror'] = 'Su sesión no existe o ha expirado';
 $messages['storageerror'] = 'Error de conexión con el servidor IMAP';
 $messages['servererror'] = '¡Error en el servidor!';
+$messages['servererrormsg'] = 'Error en servidor: $msg';
+$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';
 $messages['loggedout'] = 'Ha cerrado la sesión. ¡Hasta pronto!';
 $messages['mailboxempty'] = 'La casilla está vacía';
+$messages['refreshing'] = 'Actualizando...';
 $messages['loading'] = 'Cargando...';
 $messages['uploading'] = 'Subiendo archivo...';
+$messages['uploadingmany'] = 'Subiendo archivos...';
 $messages['loadingdata'] = 'Cargando datos...';
 $messages['checkingmail'] = 'Verificando si hay nuevos mensajes...';
 $messages['sendingmessage'] = 'Enviando mensaje...';
@@ -35,10 +48,12 @@ $messages['messagesaved'] = 'Mensaje guardado en borradores';
 $messages['successfullysaved'] = 'Guardado correctamente';
 $messages['addedsuccessfully'] = 'Contacto añadido correctamente a la libreta de direcciones';
 $messages['contactexists'] = 'Ya existe un contacto con esta dirección de correo';
+$messages['contactnameexists'] = 'Ya existe un contacto con el mismo nombre.';
 $messages['blockedimages'] = 'Para proteger su privacidad, las imágenes externas han sido bloqueadas en este mensaje';
 $messages['encryptedmessage'] = 'Este es un mensaje cifrado y no puede ser mostrado. ¡Lo siento!';
 $messages['nocontactsfound'] = 'No hay contactos';
 $messages['contactnotfound'] = 'El contacto solicitado no existe';
+$messages['contactsearchonly'] = 'Ingresá algún término de búsqueda para encontrar contactos';
 $messages['sendingfailed'] = 'Error al enviar mensaje';
 $messages['senttooquickly'] = 'Por favor, espere $sec segundo(s) antes de enviar este mensaje';
 $messages['errorsavingsent'] = 'Ocurrió un error al guardar el mensaje enviado';
@@ -47,30 +62,40 @@ $messages['errormoving'] = 'No se pudo mover el mensaje';
 $messages['errorcopying'] = 'No se pudo copiar el mensaje';
 $messages['errordeleting'] = 'No se ha podido eliminar el mensaje';
 $messages['errormarking'] = 'No se puede marcar el mensaje.';
-$messages['deletecontactconfirm'] = '¿Realmente quiere eliminar los contactos seleccionados?';
+$messages['deletecontactconfirm']  = '¿Realmente quiere eliminar los contactos seleccionados?';
+$messages['deletegroupconfirm']  = 'Realmente deseas eliminar el grupo seleccionado?';
 $messages['deletemessagesconfirm'] = '¿Realmente quiere eliminar los mensajes seleccionados?';
-$messages['deletefolderconfirm'] = '¿Realmente quiere eliminar esta carpeta?';
-$messages['purgefolderconfirm'] = '¿Realmente quiere eliminar todos los mensajes de esta carpeta?';
+$messages['deletefolderconfirm']  = '¿Realmente quiere eliminar esta carpeta?';
+$messages['purgefolderconfirm']  = '¿Realmente quiere eliminar todos los mensajes de esta carpeta?';
+$messages['contactdeleting'] = 'Eliminando contacto(s)...';
+$messages['groupdeleting'] = 'Eliminando grupo...';
 $messages['folderdeleting'] = 'Eliminando carpeta...';
 $messages['foldermoving'] = 'Moviendo carpeta...';
+$messages['foldersubscribing'] = 'Suscribiendo a carpeta...';
+$messages['folderunsubscribing'] = 'Quitando suscripción a carpeta...';
 $messages['formincomplete'] = 'No se han llenado todos los campos del formulario';
 $messages['noemailwarning'] = 'Por favor, introduzca un e-mail válido';
-$messages['nonamewarning'] = 'Por favor, introduzca su nombre';
+$messages['nonamewarning']  = 'Por favor, introduzca su nombre';
 $messages['nopagesizewarning'] = 'Por favor, introduzca un tamaño de página';
 $messages['nosenderwarning'] = 'Por favor, introduzca el e-mail del emisor';
 $messages['norecipientwarning'] = 'Por favor, introduzca al menos un destinatario';
-$messages['nosubjectwarning'] = 'El campo "Asunto" esta vacío. ¿Desea completarlo en este momento?';
+$messages['nosubjectwarning']  = 'El campo "Asunto" esta vacío. ¿Desea completarlo en este momento?';
 $messages['nobodywarning'] = '¿Quiere enviar este mensaje sin texto?';
 $messages['notsentwarning'] = 'El mensaje no ha sido enviado. ¿Desea descartar su mensaje?';
 $messages['noldapserver'] = 'Por favor, seleccione un servidor LDAP para buscar';
 $messages['nosearchname'] = 'Por favor, introduzca un nombre o la dirección de e-mail';
 $messages['notuploadedwarning'] = 'Todavia no se subieron todos los archivos adjuntos. Por favor aguarde o cancele la subida.';
 $messages['searchsuccessful'] = 'Se encontraron $nr mensajes';
+$messages['contactsearchsuccessful'] = '$nr contactos encontrados.';
 $messages['searchnomatch'] = 'La búsqueda no obtuvo resultados';
 $messages['searching'] = 'Buscando...';
 $messages['checking'] = 'Revisando...';
 $messages['nospellerrors'] = 'No se encontraron errores ortográficos';
 $messages['folderdeleted'] = 'Carpeta eliminada exitosamente';
+$messages['foldersubscribed'] = 'Suscripción a carpeta exitosa.';
+$messages['folderunsubscribed'] = 'Suscripción a carpeta exitosamente eliminada.';
+$messages['folderpurged'] = 'La carpeta se vació correctamente.';
+$messages['folderexpunged'] = 'La carpeta se compactó correctamente.';
 $messages['deletedsuccessfully'] = 'Eliminado exitosamente';
 $messages['converting'] = 'Removiendo el formato del mensaje...';
 $messages['messageopenerror'] = 'No puedo descargar el mensaje del servidor';
@@ -82,17 +107,25 @@ $messages['sourceisreadonly'] = 'Esta dirección es de sólo-lectura';
 $messages['errorsavingcontact'] = 'No se pudo guardar la dirección de contacto';
 $messages['movingmessage'] = 'Moviendo mensaje...';
 $messages['copyingmessage'] = 'Copiando mensaje...';
+$messages['copyingcontact'] = 'Copiando contacto(s)...';
+$messages['deletingmessage'] = 'Eliminando contacto(s)...';
+$messages['markingmessage'] = 'Marcando mensaje(s)...';
+$messages['addingmember'] = 'Agregando contacto(s) al grupo...';
+$messages['removingmember'] = 'Quitando contacto(s) del grupo...';
 $messages['receiptsent'] = 'La notificación de lectura se ha enviado con éxito.';
 $messages['errorsendingreceipt'] = 'No se ha podido enviar la notificación de lectura.';
+$messages['deleteidentityconfirm'] = 'Realmente querés eliminar esta identidad?';
 $messages['nodeletelastidentity'] = 'No se puede borrar esta identidad puesto que es la última.';
 $messages['forbiddencharacter'] = 'El nombre de la carpeta contiene un carácter prohibido';
 $messages['selectimportfile'] = 'Por favor, seleccione el archivo a subir';
 $messages['addresswriterror'] = 'La libreta de direcciones seleccionada es de solo-lectura';
 $messages['contactaddedtogroup'] = 'Contactos agregados al grupo correctamente';
 $messages['contactremovedfromgroup'] = 'Contactos eliminados del grupo correctamente';
+$messages['nogroupassignmentschanged'] = 'Ninguna asiganción de grupo fue modificada.';
 $messages['importwait'] = 'Importando, aguarde por favor...';
-$messages['importerror'] = 'Falló la importación! El archivo seleccionado parece no ser un archivo del tipo vCard válido.';
+$messages['importformaterror'] = 'Importación fallida! El archivo subido no es un archivo de importación de datos válido.';
 $messages['importconfirm'] = '<b>Se importaron $inserted contactos correctamente. $skipped ya existentes fueron ignorados</b>:<p><em>$names</em></p>';
+$messages['importconfirmskipped'] = '<b>Se ignoraron $skipped entradas ya existentes</b>';
 $messages['opnotpermitted'] = 'Operación no permitida!';
 $messages['nofromaddress'] = 'El contacto seleccionado no tiene dirección de e-mail';
 $messages['editorwarning'] = 'Si cambia a texto plano se perderán todas las opciones de formato. ¿Desea continuar?';
@@ -106,4 +139,33 @@ $messages['smtperror'] = 'Error SMTP: $msg';
 $messages['emailformaterror'] = 'La dirección $email no es válida';
 $messages['toomanyrecipients'] = 'Demasiados destinatarios. Reduzca la cantidad a un máximo de $max.';
 $messages['maxgroupmembersreached'] = 'El número de miembros del grupo excede el máximo de $max';
+$messages['internalerror'] = 'Ocurrió un error interno. Por favor, intentá de nuevo.';
+$messages['contactdelerror'] = 'No se pudo eliminar el/los contactos(s).';
+$messages['contactdeleted'] = 'Contacto(s) eliminado/s exitosamente.';
+$messages['contactrestoreerror'] = 'No se pudo recuperar el/los contacto/s eliminado(s).';
+$messages['contactrestored'] = 'Contacto(s) recuperado/s satisfactoriamente.';
+$messages['groupdeleted'] = 'Grupo eliminado correctamente.';
+$messages['grouprenamed'] = 'Grupo renombrado satisfactoriamente.';
+$messages['groupcreated'] = 'Grupo creado satisfactoriamente.';
+$messages['savedsearchdeleted'] = 'Búsqueda guardada se eliminó satisfactoriamente.';
+$messages['savedsearchdeleteerror'] = 'No se pudo eliminar la búsqueda guardada.';
+$messages['savedsearchcreated'] = 'Búsqueda guardada exitosamente.';
+$messages['savedsearchcreateerror'] = 'No se pudo guardar la búsqueda.';
+$messages['messagedeleted'] = 'Mensaje(s) eliminado/s satisfactoriamente.';
+$messages['messagemoved'] = 'Mensaje(s) movidos correctamente.';
+$messages['messagecopied'] = 'Mensaje(s) copiados correctamente.';
+$messages['messagemarked'] = 'Mensaje(s) marcados satisfactoriamente.';
+$messages['autocompletechars'] = 'Ingresá por lo menos $min caracteres para autocompletar.';
+$messages['autocompletemore'] = 'Se encontraron mas coincidencias. Por favor, escribí mas caracteres.';
+$messages['namecannotbeempty'] = 'El nombre no puede estar vacio.';
+$messages['nametoolong'] = 'El nombre es demasiado largo.';
+$messages['folderupdated'] = 'Carpeta actualizada correctamente.';
+$messages['foldercreated'] = 'Carpeta creada satisfactoriamente.';
+$messages['invalidimageformat'] = 'No es un formato de imágen válido.';
+$messages['mispellingsfound'] = 'Errores de ortografía encontrados en el mensaje.';
+$messages['parentnotwritable'] = 'No se pudo crear/mover la carpeta dentro de la carpeta superior seleccionada. No tiene permiso para acceder a ella.';
+$messages['messagetoobig'] = 'El mensaje es demasiado grande para ser procesado.';
+$messages['attachmentvalidationerror'] = 'Advertencia! Este archivo adjunto es sospechoso porque su tipo no concuerda con el tipo declarado en el mensaje. Si no confias en el remitente, no deberías abrirlo en el navegador porque puede contener código malicioso.<br/><br/><em>Se esperaba: $expected; Se encontró: $detected</em>';
+$messages['noscriptwarning'] = 'Advertencia: Este servicio de webmail requiere Javascript! Para usarlo, por favor, habilite Javascript en las preferencia de tu navegador.';
 
+?>
diff --git a/program/localization/es_ES/labels.inc b/program/localization/es_ES/labels.inc
index 8133dada6..03f6b489a 100644
--- a/program/localization/es_ES/labels.inc
+++ b/program/localization/es_ES/labels.inc
@@ -2,60 +2,78 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/es_ES/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Adolfo Jayme Barrientos <fitoschido@gmail.com>                |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = 'Bienvenido a $product';
-$labels['username'] = 'Nombre de usuario';
-$labels['password'] = 'Contraseña';
-$labels['server'] = 'Servidor';
-$labels['login'] = 'Iniciar sesión';
-$labels['logout'] = 'Cerrar sesión';
-$labels['mail'] = 'Correo';
+
+// login page
+$labels['welcome']   = 'Bienvenido a $product';
+$labels['username']  = 'Nombre de usuario';
+$labels['password']  = 'Contraseña';
+$labels['server']    = 'Servidor';
+$labels['login']     = 'Iniciar sesión';
+
+// taskbar
+$labels['logout']   = 'Cerrar sesión';
+$labels['mail']     = 'Correo';
 $labels['settings'] = 'Configuración';
 $labels['addressbook'] = 'Contactos';
-$labels['inbox'] = 'Entrada';
+
+// mailbox names
+$labels['inbox']  = 'Entrada';
 $labels['drafts'] = 'Borradores';
-$labels['sent'] = 'Enviados';
-$labels['trash'] = 'Papelera';
-$labels['junk'] = 'Basura';
+$labels['sent']   = 'Enviados';
+$labels['trash']  = 'Papelera';
+$labels['junk']   = 'SPAM';
+
+// message listing
 $labels['subject'] = 'Asunto';
-$labels['from'] = 'Remitente';
-$labels['to'] = 'Destinatario';
-$labels['cc'] = 'Cc';
-$labels['bcc'] = 'Cco';
+$labels['from']    = 'Remitente';
+$labels['sender']  = 'Remitente';
+$labels['to']      = 'Destinatario';
+$labels['cc']      = 'Cc';
+$labels['bcc']     = 'Cco';
 $labels['replyto'] = 'Responder a';
 $labels['followupto'] = 'Responder-a';
-$labels['date'] = 'Fecha';
-$labels['size'] = 'Tamaño';
+$labels['date']    = 'Fecha';
+$labels['size']    = 'Tamaño';
 $labels['priority'] = 'Prioridad';
 $labels['organization'] = 'Organización';
 $labels['readstatus'] = 'Leer estado';
 $labels['listoptions'] = 'Lista de opciones...';
+
 $labels['mailboxlist'] = 'Carpetas';
-$labels['folders'] = 'Carpetas';
 $labels['messagesfromto'] = 'Mensajes $from a $to de $count';
 $labels['threadsfromto'] = 'Hilos $from a $to de $count';
 $labels['messagenrof'] = 'Mensaje $nr de $count';
 $labels['fromtoshort'] = '$from – $to de $count';
-$labels['copy'] = 'Copiar';
-$labels['move'] = 'Mover';
-$labels['moveto'] = 'Mover a…';
+
+$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';
+
 $labels['filename'] = 'Nombre del archivo';
 $labels['filesize'] = 'Tamaño del archivo';
+
 $labels['addtoaddressbook'] = 'Añadir a contactos';
+
+// weekdays short
 $labels['sun'] = 'Dom';
 $labels['mon'] = 'Lun';
 $labels['tue'] = 'Mar';
@@ -63,78 +81,88 @@ $labels['wed'] = 'Mié';
 $labels['thu'] = 'Jue';
 $labels['fri'] = 'Vie';
 $labels['sat'] = 'Sáb';
-$labels['sunday'] = 'Domingo';
-$labels['monday'] = 'Lunes';
-$labels['tuesday'] = 'Martes';
+
+// weekdays long
+$labels['sunday']    = 'Domingo';
+$labels['monday']    = 'Lunes';
+$labels['tuesday']   = 'Martes';
 $labels['wednesday'] = 'Miércoles';
-$labels['thursday'] = 'Jueves';
-$labels['friday'] = 'Viernes';
-$labels['saturday'] = 'Sábado';
-$labels['jan'] = 'Ene';
-$labels['feb'] = 'Feb';
-$labels['mar'] = 'Mar';
-$labels['apr'] = 'Abr';
-$labels['may'] = 'May';
-$labels['longmay'] = 'May';
-$labels['jun'] = 'Jun';
-$labels['jul'] = 'Jul';
-$labels['aug'] = 'Ago';
-$labels['sep'] = 'Sep';
-$labels['oct'] = 'Oct';
-$labels['nov'] = 'Nov';
-$labels['dec'] = 'Dic';
-$labels['longjan'] = 'Enero';
-$labels['longfeb'] = 'Febrero';
-$labels['longmar'] = 'Marzo';
-$labels['longapr'] = 'Abril';
-$labels['longjun'] = 'Junio';
-$labels['longjul'] = 'Julio';
-$labels['longaug'] = 'Agosto';
-$labels['longsep'] = 'Septiembre';
-$labels['longoct'] = 'Octubre';
-$labels['longnov'] = 'Noviembre';
-$labels['longdec'] = 'Diciembre';
+$labels['thursday']  = 'Jueves';
+$labels['friday']    = 'Viernes';
+$labels['saturday']  = 'Sábado';
+
+// months short
+$labels['jan']	= 'Ene';
+$labels['feb']	= 'Feb';
+$labels['mar']	= 'Mar';
+$labels['apr']	= 'Abr';
+$labels['may']	= 'May';
+$labels['jun']	= 'Jun';
+$labels['jul'] 	= 'Jul';
+$labels['aug']	= 'Ago';
+$labels['sep']	= 'Sep';
+$labels['oct']	= 'Oct';
+$labels['nov']	= 'Nov';
+$labels['dec']	= 'Dic';
+
+// months long
+$labels['longjan']	= 'Enero';
+$labels['longfeb']	= 'Febrero';
+$labels['longmar']	= 'Marzo';
+$labels['longapr']	= 'Abril';
+$labels['longmay']	= 'Mayo';
+$labels['longjun']	= 'Junio';
+$labels['longjul']	= 'Julio';
+$labels['longaug']	= 'Agosto';
+$labels['longsep']	= 'Septiembre';
+$labels['longoct']	= 'Octubre';
+$labels['longnov']	= 'Noviembre';
+$labels['longdec']	= 'Diciembre';
+
 $labels['today'] = 'Hoy';
-$labels['refresh'] = 'Actualizar';
-$labels['checkmail'] = 'Revisar si hay mensajes nuevos';
-$labels['compose'] = 'Redactar';
-$labels['writenewmessage'] = 'Crear un mensaje nuevo';
-$labels['reply'] = 'Responder';
-$labels['replytomessage'] = 'Responder mensaje';
+
+// toolbar buttons
+$labels['refresh']          = 'Actualizar';
+$labels['checkmail']        = 'Revisar si hay mensajes nuevos';
+$labels['compose']          = 'Redactar';
+$labels['writenewmessage']  = 'Crear un mensaje nuevo';
+$labels['reply']            = 'Responder';
+$labels['replytomessage']   = 'Responder mensaje';
 $labels['replytoallmessage'] = 'Responder al emisor y a todos los destinatarios';
-$labels['replyall'] = 'Responder a todos';
-$labels['replylist'] = 'Responder a la lista';
-$labels['forward'] = 'Reenviar';
-$labels['forwardinline'] = 'Reenviar directamente';
+$labels['replyall']         = 'Responder a todos';
+$labels['replylist']        = 'Responder a la lista';
+$labels['forward']          = 'Reenviar';
+$labels['forwardinline']    = 'Reenviar directamente';
 $labels['forwardattachment'] = 'Reenviar como adjunto';
-$labels['forwardmessage'] = 'Reenviar mensaje';
-$labels['deletemessage'] = 'Eliminar mensaje';
+$labels['forwardmessage']   = 'Reenviar mensaje';
+$labels['deletemessage']    = 'Eliminar mensaje';
 $labels['movemessagetotrash'] = 'Mover mensaje a la papelera';
-$labels['printmessage'] = 'Imprimir este mensaje';
-$labels['previousmessage'] = 'Mostrar mensaje anterior';
-$labels['firstmessage'] = 'Mostrar primer mensaje';
-$labels['nextmessage'] = 'Mostrar el siguiente mensaje';
-$labels['lastmessage'] = 'Mostrar el último mensaje';
-$labels['backtolist'] = 'Volver a la lista de mensajes';
-$labels['viewsource'] = 'Mostrar código';
-$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'] = 'Más acciones…';
-$labels['more'] = 'Más';
-$labels['back'] = 'Volver';
-$labels['options'] = 'Opciones';
+$labels['printmessage']     = 'Imprimir este mensaje';
+$labels['previousmessage']  = 'Mostrar mensaje anterior';
+$labels['firstmessage']     = 'Mostrar primer mensaje';
+$labels['nextmessage']      = 'Mostrar el siguiente mensaje';
+$labels['lastmessage']      = 'Mostrar el último mensaje';
+$labels['backtolist']       = 'Volver a la lista de mensajes';
+$labels['viewsource']       = 'Mostrar código';
+$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']      = 'Más acciones…';
+$labels['more']             = 'Más';
+$labels['back']             = 'Volver';
+$labels['options']          = 'Opciones';
+
 $labels['select'] = 'Elija';
 $labels['all'] = 'Todos';
 $labels['none'] = 'Ninguno';
-$labels['nonesort'] = 'Ninguno';
 $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';
@@ -145,12 +173,14 @@ $labels['expand-all'] = 'Expandir todos';
 $labels['expand-unread'] = 'Expandir no leídos';
 $labels['collapse-all'] = 'Colapsar todos';
 $labels['threaded'] = 'Encadenados';
+
 $labels['autoexpand_threads'] = 'Expandir hilos de mensajes';
 $labels['do_expand'] = 'todos los hilos';
 $labels['expand_only_unread'] = 'solo con mensajes no leídos';
 $labels['fromto'] = 'Remitente/Destinatario';
 $labels['flag'] = 'Marca';
 $labels['attachment'] = 'Adjunto';
+$labels['nonesort'] = 'Ninguno';
 $labels['sentdate'] = 'Fecha de envío';
 $labels['arrival'] = 'Fecha de llegada';
 $labels['asc'] = 'ascendente';
@@ -159,183 +189,220 @@ $labels['listcolumns'] = 'Listar columnas';
 $labels['listsorting'] = 'Columna de listado';
 $labels['listorder'] = 'Orden de listado';
 $labels['listmode'] = 'Modo de vista de lista';
+
 $labels['folderactions'] = 'Acciones de bandeja...';
 $labels['compact'] = 'Compactar';
 $labels['empty'] = 'Vaciar';
+
 $labels['quota'] = 'Uso de disco';
-$labels['unknown'] = 'desconocido';
-$labels['unlimited'] = 'sin límite';
-$labels['quicksearch'] = 'Búsqueda rápida';
-$labels['resetsearch'] = 'Reiniciar la búsqueda';
-$labels['searchmod'] = 'Opciones de búsqueda';
-$labels['msgtext'] = 'Mensaje completo';
+$labels['unknown']  = 'desconocido';
+$labels['unlimited']  = 'sin límite';
+
+$labels['quicksearch']  = 'Búsqueda rápida';
+$labels['resetsearch']  = 'Reiniciar la búsqueda';
+$labels['searchmod']  = 'Opciones de búsqueda';
+$labels['msgtext']  = 'Mensaje completo';
+$labels['body']  = 'Cuerpo';
+
 $labels['openinextwin'] = 'Abrir en nueva ventana';
 $labels['emlsave'] = 'Descargar (.eml)';
-$labels['editasnew'] = 'Editar como nuevo';
-$labels['send'] = 'Enviar';
-$labels['sendmessage'] = 'Enviar ahora el mensaje';
-$labels['savemessage'] = 'Guardar como borrador';
-$labels['addattachment'] = 'Adjuntar un archivo';
-$labels['charset'] = 'Codificación';
-$labels['editortype'] = 'Tipo de editor';
-$labels['returnreceipt'] = 'Acuse de recibo';
-$labels['dsn'] = 'Entrega de notificaciones de estado';
+$labels['changeformattext'] = 'Mostrar en formato de texto sencillo';
+$labels['changeformathtml'] = 'Mostrar en formato HTML';
+
+// message compose
+$labels['editasnew']      = 'Editar como nuevo';
+$labels['send']           = 'Enviar';
+$labels['sendmessage']    = 'Enviar ahora el mensaje';
+$labels['savemessage']    = 'Guardar como borrador';
+$labels['addattachment']  = 'Adjuntar un archivo';
+$labels['charset']        = 'Codificación';
+$labels['editortype']     = 'Tipo de editor';
+$labels['returnreceipt']  = 'Acuse de recibo';
+$labels['dsn']            = 'Entrega de notificaciones de estado';
 $labels['mailreplyintro'] = 'El $date, $sender escribió:';
 $labels['originalmessage'] = 'Mensaje original';
-$labels['editidents'] = 'Editar identidades';
-$labels['spellcheck'] = 'Corrector ortográfico';
+
+$labels['editidents']    = 'Editar identidades';
+$labels['spellcheck']    = 'Corrector ortográfico';
 $labels['checkspelling'] = 'Revisar ortografía';
 $labels['resumeediting'] = 'Continuar edición';
-$labels['revertto'] = 'Revertir a';
+$labels['revertto']      = 'Revertir a';
+
 $labels['attach'] = 'Adjuntar';
 $labels['attachments'] = 'Adjuntos';
 $labels['upload'] = 'Subir';
 $labels['uploadprogress'] = '$percent ($current de $total)';
-$labels['close'] = 'Cerrar';
-$labels['messageoptions'] = 'Opciones de mensaje...';
-$labels['low'] = 'Bajo';
-$labels['lowest'] = 'Bajísimo';
-$labels['normal'] = 'Normal';
-$labels['high'] = 'Alto';
+$labels['close']  = 'Cerrar';
+$labels['messageoptions']  = 'Opciones de mensaje...';
+
+$labels['low']     = 'Bajo';
+$labels['lowest']  = 'Bajísimo';
+$labels['normal']  = 'Normal';
+$labels['high']    = 'Alto';
 $labels['highest'] = 'Altísimo';
-$labels['nosubject'] = '(sin asunto)';
+
+$labels['nosubject']  = '(sin asunto)';
 $labels['showimages'] = 'Mostrar imágenes';
 $labels['alwaysshow'] = 'Mostrar siempre imágenes de $sender';
-$labels['isdraft'] = 'Este mensaje es un borrador';
-$labels['andnmore'] = '$nr más…';
+$labels['isdraft']    = 'Este mensaje es un borrador';
+$labels['andnmore']   = '$nr más…';
 $labels['togglemoreheaders'] = 'Mostrar más encabezados del mensaje';
 $labels['togglefullheaders'] = 'Mostrar u ocultar encabezados de mensajes';
+
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Sólo texto';
 $labels['savesentmessagein'] = 'Guardar mensaje enviado en';
 $labels['dontsave'] = 'No guardar';
 $labels['maxuploadsize'] = 'Tamaño de archivo máximo permitido: $size';
+
 $labels['addcc'] = 'Añadir Cc';
 $labels['addbcc'] = 'Añadir Cco';
 $labels['addreplyto'] = 'Añadir Responder a';
 $labels['addfollowupto'] = 'Añadir Seguir a';
+
+// mdn
 $labels['mdnrequest'] = 'El emisor de este mensaje desea ser notificado cuando usted lo lea. ¿Quiere enviar esta notificación?';
 $labels['receiptread'] = 'Notificación de lectura';
 $labels['yourmessage'] = 'Esto es un acuse de recibo de su mensaje';
 $labels['receiptnote'] = 'Nota: Esta notificación sólo significa que su mensaje fue abierto en el ordenador del destinatario. Eso no garantiza que el destinatario haya leído o entendido el contenido del mensaje.';
-$labels['name'] = 'Nombre para mostrar';
-$labels['firstname'] = 'Nombre';
-$labels['surname'] = 'Apellido';
-$labels['middlename'] = 'Segundo nombre';
-$labels['nameprefix'] = 'Prefijo';
-$labels['namesuffix'] = 'Sufijo';
-$labels['nickname'] = 'Alias';
-$labels['jobtitle'] = 'Tratamiento';
-$labels['department'] = 'Departamento';
-$labels['gender'] = 'Sexo';
-$labels['maidenname'] = 'Apellido de soltera';
-$labels['email'] = 'Correo';
-$labels['phone'] = 'Teléfono';
-$labels['address'] = 'Dirección';
-$labels['street'] = 'Calle';
-$labels['locality'] = 'Ciudad';
-$labels['zipcode'] = 'Código postal';
-$labels['region'] = 'Provincia';
-$labels['country'] = 'País';
-$labels['birthday'] = 'Cumpleaños';
-$labels['anniversary'] = 'Santo';
-$labels['website'] = 'Página web';
+
+// address boook
+$labels['name']         = 'Nombre para mostrar';
+$labels['firstname']    = 'Nombre';
+$labels['surname']      = 'Apellido';
+$labels['middlename']   = 'Segundo nombre';
+$labels['nameprefix']   = 'Prefijo';
+$labels['namesuffix']   = 'Sufijo';
+$labels['nickname']     = 'Alias';
+$labels['jobtitle']     = 'Tratamiento';
+$labels['department']   = 'Departamento';
+$labels['gender']       = 'Sexo';
+$labels['maidenname']   = 'Apellido de soltera';
+$labels['email']        = 'Correo';
+$labels['phone']        = 'Teléfono';
+$labels['address']      = 'Dirección';
+$labels['street']       = 'Calle';
+$labels['locality']     = 'Ciudad';
+$labels['zipcode']      = 'Código postal';
+$labels['region']       = 'Provincia';
+$labels['country']      = 'País';
+$labels['birthday']     = 'Cumpleaños';
+$labels['anniversary']  = 'Santo';
+$labels['website']      = 'Página web';
 $labels['instantmessenger'] = 'Mensajería instantánea';
 $labels['notes'] = 'Notas';
-$labels['male'] = 'Hombre';
+$labels['male']   = 'Hombre';
 $labels['female'] = 'Mujer';
 $labels['manager'] = 'Director';
 $labels['assistant'] = 'Auxiliar';
-$labels['typeassistant'] = 'Auxiliar';
 $labels['spouse'] = 'Cónyuge';
 $labels['allfields'] = 'Todos los campos';
 $labels['search'] = 'Buscar';
 $labels['advsearch'] = 'Búsqueda avanzada';
 $labels['advanced'] = 'Avanzadas';
 $labels['other'] = 'Otro';
-$labels['typeother'] = 'Otro';
-$labels['typehome'] = 'Casa';
-$labels['typework'] = 'Trabajo';
-$labels['typemobile'] = 'Móvil';
-$labels['typemain'] = 'Principal';
-$labels['typehomefax'] = 'Fax de casa';
-$labels['typeworkfax'] = 'Fax del trabajo';
-$labels['typecar'] = 'Coche';
-$labels['typepager'] = 'Busca';
-$labels['typevideo'] = 'Vídeo';
-$labels['typehomepage'] = 'Inicio';
+
+$labels['typehome']   = 'Casa';
+$labels['typework']   = 'Trabajo';
+$labels['typeother']  = 'Otro';
+$labels['typemobile']  = 'Móvil';
+$labels['typemain']  = 'Principal';
+$labels['typehomefax']  = 'Fax de casa';
+$labels['typeworkfax']  = 'Fax del trabajo';
+$labels['typecar']  = 'Coche';
+$labels['typepager']  = 'Busca';
+$labels['typevideo']  = 'Vídeo';
+$labels['typeassistant']  = 'Auxiliar';
+$labels['typehomepage']  = 'Inicio';
 $labels['typeblog'] = 'Blog';
 $labels['typeprofile'] = 'Perfil';
+
 $labels['addfield'] = 'Añadir campo...';
 $labels['addcontact'] = 'Añadir nuevo contacto';
 $labels['editcontact'] = 'Editar contacto';
 $labels['contacts'] = 'Contactos';
 $labels['contactproperties'] = 'Propiedades del contacto';
 $labels['personalinfo'] = 'Información personal';
-$labels['edit'] = 'Editar';
+
+$labels['edit']   = 'Editar';
 $labels['cancel'] = 'Cancelar';
-$labels['save'] = 'Guardar';
+$labels['save']   = 'Guardar';
 $labels['delete'] = 'Eliminar';
 $labels['rename'] = 'Renombrar';
 $labels['addphoto'] = 'Añadir';
 $labels['replacephoto'] = 'Reemplazar';
 $labels['uploadphoto'] = 'Subir foto';
-$labels['newcontact'] = 'Crear nueva tarjeta de contacto';
-$labels['deletecontact'] = 'Eliminar contactos seleccionados';
-$labels['composeto'] = 'Escribir mensaje a';
+
+$labels['newcontact']     = 'Crear nueva tarjeta de contacto';
+$labels['deletecontact']  = 'Eliminar contactos seleccionados';
+$labels['composeto']      = 'Escribir mensaje a';
 $labels['contactsfromto'] = 'Contactos $from a $to de $count';
-$labels['print'] = 'Imprimir';
-$labels['export'] = 'Exportar';
-$labels['exportvcards'] = 'Exportar contactos en formato vCard';
+$labels['print']          = 'Imprimir';
+$labels['export']         = 'Exportar';
+$labels['exportall']      = 'Exportar todo';
+$labels['exportsel']      = 'Exportar lo seleccionado';
+$labels['exportvcards']   = 'Exportar contactos en formato vCard';
 $labels['newcontactgroup'] = 'Crear un nuevo grupo de contactos';
-$labels['grouprename'] = 'Renombrar grupo';
-$labels['groupdelete'] = 'Borrar grupo';
+$labels['grouprename']    = 'Renombrar grupo';
+$labels['groupdelete']    = 'Borrar grupo';
 $labels['groupremoveselected'] = 'Eliminar los contactos seleccionados del grupo';
-$labels['previouspage'] = 'Mostrar grupo anterior';
-$labels['firstpage'] = 'Mostrar primer grupo';
-$labels['nextpage'] = 'Mostrar grupo siguiente';
-$labels['lastpage'] = 'Mostrar último grupo';
+
+$labels['previouspage']   = 'Mostrar grupo anterior';
+$labels['firstpage']      = 'Mostrar primer grupo';
+$labels['nextpage']       = 'Mostrar grupo siguiente';
+$labels['lastpage']       = 'Mostrar último grupo';
+
 $labels['group'] = 'Grupo';
 $labels['groups'] = 'Grupos';
 $labels['personaladrbook'] = 'Direcciones personales';
+
 $labels['searchsave'] = 'Guardar búsqueda';
 $labels['searchdelete'] = 'Borrar búsqueda';
+
 $labels['import'] = 'Importar';
 $labels['importcontacts'] = 'Importar contactos';
 $labels['importfromfile'] = 'Importar desde archivo:';
 $labels['importtarget'] = 'Añadir un nuevo contacto a la los contactos:';
 $labels['importreplace'] = 'Reemplazar toda la lista de contactos';
-$labels['importdesc'] = 'Puede subir contactos desde una libreta de direcciones existente.<br/>Actualmente permitimos la importación desde los formatos de datos <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> o CSV (separados por comas).';
+$labels['importdesc'] = 'Puede subir contactos desde una libreta de direcciones existente.<br/>Actualmente permitimos la importación desde los formatos de datos <a href="http://es.wikipedia.org/wiki/VCard">vCard</a> o CSV (separados por comas).';
 $labels['done'] = 'Hecho';
+
+// settings
 $labels['settingsfor'] = 'Configuración para';
 $labels['about'] = 'Acerca de';
 $labels['preferences'] = 'Preferencias';
 $labels['userpreferences'] = 'Preferencias de usuario';
 $labels['editpreferences'] = 'Editar preferencias de usuario';
+
 $labels['identities'] = 'Identidades';
 $labels['manageidentities'] = 'Gestionar identidades para esta cuenta';
 $labels['newidentity'] = 'Nueva identidad';
+
 $labels['newitem'] = 'Nuevo';
 $labels['edititem'] = 'Editar';
+
 $labels['preferhtml'] = 'Prefiero HTML';
-$labels['defaultcharset'] = 'Juego de caracteres por defecto';
+$labels['defaultcharset'] = 'Juego de caracteres predeterminado';
 $labels['htmlmessage'] = 'Mensaje HTML';
+$labels['messagepart'] = 'Parte';
+$labels['digitalsig'] = 'Firma digital';
 $labels['dateformat'] = 'Formato de fecha';
 $labels['timeformat'] = 'Formato de hora';
 $labels['prettydate'] = 'Fecha detallada';
-$labels['setdefault'] = 'Seleccionar opción por defecto';
-$labels['autodetect'] = 'Automático';
-$labels['language'] = 'Idioma';
-$labels['timezone'] = 'Zona horaria';
-$labels['pagesize'] = 'Filas por página';
+$labels['setdefault']  = 'Seleccionar opción predeterminada';
+$labels['autodetect']  = 'Automático';
+$labels['language']  = 'Idioma';
+$labels['timezone']  = 'Zona horaria';
+$labels['pagesize']  = 'Filas por página';
 $labels['signature'] = 'Firma';
-$labels['dstactive'] = 'Cambio de horario';
+$labels['dstactive']  = 'Cambio de horario';
 $labels['showinextwin'] = 'Abrir mensaje en una ventana nueva';
 $labels['composeextwin'] = 'Redactar en una ventana nueva';
 $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';
@@ -353,16 +420,16 @@ $labels['readwhendeleted'] = 'Marcar el mensaje como leído al borrarlo';
 $labels['flagfordeletion'] = 'Marcar el mensaje para borrarse en vez de borrarlo';
 $labels['skipdeleted'] = 'No mostrar mensajes borrados';
 $labels['deletealways'] = 'Cuando falle trasladar los mensajes a la papelera, borrarlos';
-$labels['deletejunk'] = 'Directamente eliminar mensajes de Correo no Deseado';
+$labels['deletejunk'] = 'Directamente eliminar mensajes en SPAM';
 $labels['showremoteimages'] = 'Mostrar las imágenes externas';
 $labels['fromknownsenders'] = 'de remitentes conocidos';
 $labels['always'] = 'siempre';
 $labels['showinlineimages'] = 'Mostrar imágenes adjuntas debajo del mensaje';
-$labels['autosavedraft'] = 'Guardar borrador automáticamente';
-$labels['everynminutes'] = 'cada $n minuto(s)';
-$labels['refreshinterval'] = 'Actualizar (comprobar mensajes nuevos, etc.)';
-$labels['never'] = 'nunca';
-$labels['immediately'] = 'inmediatamente';
+$labels['autosavedraft']  = 'Guardar borrador automáticamente';
+$labels['everynminutes']  = 'cada $n minuto(s)';
+$labels['refreshinterval']  = 'Actualizar (comprobar mensajes nuevos, etc.)';
+$labels['never']  = 'nunca';
+$labels['immediately']  = 'inmediatamente';
 $labels['messagesdisplaying'] = 'Vista de mensajes';
 $labels['messagescomposition'] = 'Composición de mensajes';
 $labels['mimeparamfolding'] = 'Nombres de archivos adjuntos';
@@ -389,12 +456,9 @@ $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';
+$labels['previewpanemarkread']  = 'Marcar mensaje previsualizado como leído';
+$labels['afternseconds']  = 'después de $n segundos';
 $labels['reqmdn'] = 'Solicitar siempre un acuse de recibo';
 $labels['reqdsn'] = 'Solicitar siempre la entrega de notificaciones de estado';
 $labels['replysamefolder'] = 'Coloque las respuestas en la bandeja del mensaje que se responde';
@@ -411,13 +475,15 @@ $labels['mailtoprotohandler'] = 'Registrar controlador de protocolo para enlaces
 $labels['forwardmode'] = 'Reenvío de mensajes';
 $labels['inline'] = 'en línea';
 $labels['asattachment'] = 'como adjunto';
-$labels['folder'] = 'Bandeja';
-$labels['foldername'] = 'Nombre de bandeja';
-$labels['subscribed'] = 'Suscrita';
+
+$labels['folder']  = 'Bandeja';
+$labels['folders']  = 'Carpetas';
+$labels['foldername']  = 'Nombre de bandeja';
+$labels['subscribed']  = 'Suscrita';
 $labels['messagecount'] = 'Mensajes';
-$labels['create'] = 'Crear';
-$labels['createfolder'] = 'Crear nueva bandeja';
-$labels['managefolders'] = 'Administrar bandejas';
+$labels['create']  = 'Crear';
+$labels['createfolder']  = 'Crear nueva bandeja';
+$labels['managefolders']  = 'Administrar bandejas';
 $labels['specialfolders'] = 'Bandejas especiales';
 $labels['properties'] = 'Propiedades';
 $labels['folderproperties'] = 'Propiedades de bandeja';
@@ -427,23 +493,29 @@ $labels['info'] = 'Información';
 $labels['getfoldersize'] = 'Clic para saber el tamaño de la bandeja';
 $labels['changesubscription'] = 'Clic para cambiar suscripción';
 $labels['foldertype'] = 'Tipo de bandeja';
-$labels['personalfolder'] = 'Bandeja privada';
-$labels['otherfolder'] = 'Bandeja de otro usuario';
-$labels['sharedfolder'] = 'Bandeja pública';
+$labels['personalfolder']  = 'Bandeja privada';
+$labels['otherfolder']  = 'Bandeja de otro usuario';
+$labels['sharedfolder']  = 'Bandeja pública';
+
 $labels['sortby'] = 'Ordenar por';
-$labels['sortasc'] = 'Orden ascendente';
+$labels['sortasc']  = 'Orden ascendente';
 $labels['sortdesc'] = 'Orden descendente';
 $labels['undo'] = 'Deshacer';
+
 $labels['installedplugins'] = 'Complementos instalados';
-$labels['plugin'] = 'Plugin';
+$labels['plugin'] = 'Complemento';
 $labels['version'] = 'Versión';
 $labels['source'] = 'Origen';
 $labels['license'] = 'Licencia';
 $labels['support'] = 'Obtener soporte';
+
+// units
 $labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
 $labels['GB'] = 'GB';
+
+// character sets
 $labels['unicode'] = 'Unicode';
 $labels['english'] = 'Inglés';
 $labels['westerneuropean'] = 'Europeo occidental';
@@ -463,3 +535,4 @@ $labels['japanese'] = 'Japonés';
 $labels['korean'] = 'Coreano';
 $labels['chinese'] = 'Chino';
 
+?>
diff --git a/program/localization/es_ES/messages.inc b/program/localization/es_ES/messages.inc
index 15269a18a..6c031df29 100644
--- a/program/localization/es_ES/messages.inc
+++ b/program/localization/es_ES/messages.inc
@@ -2,34 +2,39 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/es_ES/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Adolfo Jayme Barrientos <fitoschido@gmail.com>                |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['errortitle'] = '¡Ha ocurrido un error!';
-$messages['loginfailed'] = 'Contraseña o nombre de usuario incorrecto';
-$messages['cookiesdisabled'] = 'Su navegador no acepta cookies';
-$messages['sessionerror'] = 'Su sesión no es válida o ha expirado';
-$messages['storageerror'] = 'Error de conexión con el servidor IMAP';
+$messages['errortitle']  = '¡Ha ocurrido un error!';
+$messages['loginfailed']  = 'Contraseña o nombre de usuario incorrecto.';
+$messages['cookiesdisabled'] = 'Su navegador no acepta cookies.';
+$messages['sessionerror'] = 'Su sesión no es válida o ha expirado.';
+$messages['storageerror'] = 'Error de conexión con el servidor IMAP.';
 $messages['servererror'] = '¡Error del servidor!';
 $messages['servererrormsg'] = 'Error de servidor: $msg';
 $messages['dberror'] = '¡Error de base de datos!';
 $messages['requesttimedout'] = 'Ha expirado el tiempo de respuesta';
-$messages['errorreadonly'] = 'No se ha podido hacer. La bandeja es sólo de lectura';
-$messages['errornoperm'] = 'Imposible realizar la operación. Permiso denegado';
+$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';
+$messages['invalidhost'] = 'Nombre de servidor inválido.';
+$messages['nomessagesfound'] = 'No se han encontrado mensajes en esta casilla.';
 $messages['loggedout'] = 'Ha cerrado bien la sesión. ¡Hasta pronto!';
-$messages['mailboxempty'] = 'La casilla está vacía';
+$messages['mailboxempty'] = 'La casilla está vacía.';
 $messages['refreshing'] = 'Actualizando…';
 $messages['loading'] = 'Cargando...';
 $messages['uploading'] = 'Subiendo archivo...';
@@ -37,71 +42,71 @@ $messages['uploadingmany'] = 'Subiendo archivos…';
 $messages['loadingdata'] = 'Cargando datos...';
 $messages['checkingmail'] = 'Verificando si hay nuevos mensajes...';
 $messages['sendingmessage'] = 'Enviando mensaje...';
-$messages['messagesent'] = 'Mensaje enviado correctamente';
+$messages['messagesent'] = 'Mensaje enviado correctamente.';
 $messages['savingmessage'] = 'Guardando mensaje...';
-$messages['messagesaved'] = 'Mensaje guardado en borradores';
-$messages['successfullysaved'] = 'Guardado correctamente';
-$messages['addedsuccessfully'] = 'Contacto añadido correctamente a la libreta de direcciones';
-$messages['contactexists'] = 'Ya existe un contacto con esta dirección de correo';
+$messages['messagesaved'] = 'Mensaje guardado en borradores.';
+$messages['successfullysaved'] = 'Guardado correctamente.';
+$messages['addedsuccessfully'] = 'Contacto añadido correctamente a la libreta de direcciones.';
+$messages['contactexists'] = 'Ya existe un contacto con esta dirección de correo.';
 $messages['contactnameexists'] = 'Ya existe un contacto con el mismo nombre.';
 $messages['blockedimages'] = 'Para proteger su privacidad, las imágenes externas de este mensaje han sido bloqueadas.';
 $messages['encryptedmessage'] = 'Este es un mensaje cifrado y no puede ser mostrado. ¡Lo siento!';
 $messages['nocontactsfound'] = 'No se encontraron contactos.';
-$messages['contactnotfound'] = 'El contacto solicitado no existe';
+$messages['contactnotfound'] = 'El contacto solicitado no existe.';
 $messages['contactsearchonly'] = 'Ingrese algún criterio para buscar contactos';
-$messages['sendingfailed'] = 'Error al enviar mensaje';
-$messages['senttooquickly'] = 'Por favor, espere $sec segundo(s) antes de mandar este mensaje';
-$messages['errorsavingsent'] = 'Ha ocurrido un error al guardar el mensaje enviado';
-$messages['errorsaving'] = 'Ocurrió un error mientras se guardaba';
-$messages['errormoving'] = 'No se ha podido mover el mensaje';
-$messages['errorcopying'] = 'No se ha podido copiar el/los mensaje(s)';
-$messages['errordeleting'] = 'No se ha podido eliminar el mensaje';
-$messages['errormarking'] = 'No se ha podido marcar el mensaje';
-$messages['deletecontactconfirm'] = '¿Realmente quiere eliminar los contactos seleccionados?';
-$messages['deletegroupconfirm'] = '¿De verdad quiere borrar el grupo seleccionado?';
+$messages['sendingfailed'] = 'Error al enviar mensaje.';
+$messages['senttooquickly'] = 'Por favor, espere $sec segundo(s) antes de mandar este mensaje.';
+$messages['errorsavingsent'] = 'Ha ocurrido un error al guardar el mensaje enviado.';
+$messages['errorsaving'] = 'Ocurrió un error mientras se guardaba.';
+$messages['errormoving'] = 'No se ha podido mover el/los mensaje(s).';
+$messages['errorcopying'] = 'No se ha podido copiar el/los mensaje(s).';
+$messages['errordeleting'] = 'No se ha podido eliminar el/los mensaje(s).';
+$messages['errormarking'] = 'No se ha podido marcar el/los mensaje(s).';
+$messages['deletecontactconfirm']  = '¿Realmente quiere eliminar los contactos seleccionados?';
+$messages['deletegroupconfirm']  = '¿De verdad quiere borrar el grupo seleccionado?';
 $messages['deletemessagesconfirm'] = '¿Realmente quiere eliminar los mensajes seleccionados?';
-$messages['deletefolderconfirm'] = '¿Realmente quiere eliminar esta bandeja?';
-$messages['purgefolderconfirm'] = '¿Realmente quiere eliminar todos los mensajes de esta bandeja?';
-$messages['contactdeleting'] = 'Eliminando contacto(s)';
+$messages['deletefolderconfirm']  = '¿Realmente quiere eliminar esta bandeja?';
+$messages['purgefolderconfirm']  = '¿Realmente quiere eliminar todos los mensajes de esta bandeja?';
+$messages['contactdeleting'] = 'Eliminando contacto(s)...';
 $messages['groupdeleting'] = 'Borrando grupo…';
 $messages['folderdeleting'] = 'Borrando bandeja...';
 $messages['foldermoving'] = 'Moviendo bandeja...';
 $messages['foldersubscribing'] = 'Suscribiendo bandeja...';
 $messages['folderunsubscribing'] = 'Anulando suscripción a bandeja...';
-$messages['formincomplete'] = 'No ha rellenado todos los campos del formulario';
-$messages['noemailwarning'] = 'Por favor, introduzca un email válido';
-$messages['nonamewarning'] = 'Por favor, introduzca su nombre';
-$messages['nopagesizewarning'] = 'Por favor, introduzca un tamaño de página';
-$messages['nosenderwarning'] = 'Por favor, introduzca el email del emisor';
-$messages['norecipientwarning'] = 'Por favor, introduzca al menos un destinatario';
-$messages['nosubjectwarning'] = 'El campo "Asunto" está vacío. ¿Desea completarlo en este momento?';
+$messages['formincomplete'] = 'No ha rellenado todos los campos del formulario.';
+$messages['noemailwarning'] = 'Por favor, introduzca un email válido.';
+$messages['nonamewarning']  = 'Por favor, introduzca un nombre.';
+$messages['nopagesizewarning'] = 'Por favor, introduzca un tamaño de página.';
+$messages['nosenderwarning'] = 'Por favor, introduzca el email del emisor.';
+$messages['norecipientwarning'] = 'Por favor, introduzca al menos un destinatario.';
+$messages['nosubjectwarning']  = 'El campo "Asunto" está vacío. ¿Desea completarlo en este momento?';
 $messages['nobodywarning'] = '¿Quiere enviar este mensaje sin texto?';
 $messages['notsentwarning'] = 'El mensaje no ha sido enviado. ¿Desea descartar su mensaje?';
-$messages['noldapserver'] = 'Por favor, seleccione un servidor LDAP para buscar';
-$messages['nosearchname'] = 'Por favor, introduzca un nombre o la dirección de e-mail';
+$messages['noldapserver'] = 'Por favor, seleccione un servidor LDAP para buscar.';
+$messages['nosearchname'] = 'Por favor, introduzca un nombre o la dirección de e-mail.';
 $messages['notuploadedwarning'] = 'No se han subido aún todos los adjuntos. Por favor espere o cancele la subida.';
-$messages['searchsuccessful'] = 'Se encontraron $nr mensajes';
+$messages['searchsuccessful'] = 'Se encontraron $nr mensajes.';
 $messages['contactsearchsuccessful'] = 'Encontrados $nr contactos.';
-$messages['searchnomatch'] = 'No se obtuvieron resultados';
+$messages['searchnomatch'] = 'No se obtuvieron resultados.';
 $messages['searching'] = 'Buscando...';
 $messages['checking'] = 'Revisando...';
-$messages['nospellerrors'] = 'No se encontraron errores ortográficos';
-$messages['folderdeleted'] = 'Bandeja eliminada correctamente';
-$messages['foldersubscribed'] = 'Suscrito a bandeja correctamente';
-$messages['folderunsubscribed'] = 'Suscripción a bandeja anulada correctamente';
-$messages['folderpurged'] = 'Bandeja purgada correctamente';
-$messages['folderexpunged'] = 'Bandeja vaciada correctamente';
-$messages['deletedsuccessfully'] = 'Eliminado correctamente';
+$messages['nospellerrors'] = 'No se encontraron errores ortográficos.';
+$messages['folderdeleted'] = 'Bandeja eliminada correctamente.';
+$messages['foldersubscribed'] = 'Suscrito a bandeja correctamente.';
+$messages['folderunsubscribed'] = 'Suscripción a bandeja anulada correctamente.';
+$messages['folderpurged'] = 'Bandeja purgada correctamente.';
+$messages['folderexpunged'] = 'Bandeja compatada correctamente.';
+$messages['deletedsuccessfully'] = 'Eliminado correctamente.';
 $messages['converting'] = 'Quitando el formato del mensaje...';
-$messages['messageopenerror'] = 'No puedo descargar el mensaje del servidor';
-$messages['fileuploaderror'] = 'Error al subir archivos';
-$messages['filesizeerror'] = 'El archivo excede el tamaño máximo ($size)';
-$messages['copysuccess'] = '$nr direcciones copiadas correctamente';
-$messages['copyerror'] = 'No se pudo copiar ninguna dirección';
-$messages['sourceisreadonly'] = 'Esta dirección es de sólo lectura';
-$messages['errorsavingcontact'] = 'No se pudo guardar la dirección de contacto';
-$messages['movingmessage'] = 'Moviendo mensaje...';
-$messages['copyingmessage'] = 'Copiando mensaje...';
+$messages['messageopenerror'] = 'No puedo descargar el mensaje del servidor.';
+$messages['fileuploaderror'] = 'Error al subir archivos.';
+$messages['filesizeerror'] = 'El archivo excede el tamaño máximo ($size).';
+$messages['copysuccess'] = '$nr direcciones copiadas correctamente.';
+$messages['copyerror'] = 'No se pudo copiar ninguna dirección.';
+$messages['sourceisreadonly'] = 'Esta dirección es de sólo lectura.';
+$messages['errorsavingcontact'] = 'No se pudo guardar la dirección de contacto.';
+$messages['movingmessage'] = 'Moviendo mensaje(s)...';
+$messages['copyingmessage'] = 'Copiando mensaje(s)...';
 $messages['copyingcontact'] = 'Copiando contacto(s)…';
 $messages['deletingmessage'] = 'Eliminando mensaje(s)...';
 $messages['markingmessage'] = 'Marcando mensaje(s)...';
@@ -109,54 +114,58 @@ $messages['addingmember'] = 'Añadiendo contacto(s) al grupo…';
 $messages['removingmember'] = 'Quitando contacto(s) del grupo…';
 $messages['receiptsent'] = 'La notificación de lectura se ha enviado correctamente.';
 $messages['errorsendingreceipt'] = 'No se ha podido enviar la notificación de lectura.';
-$messages['deleteidentityconfirm'] = 'Realmente desea eliminar esta identidad?';
+$messages['deleteidentityconfirm'] = '¿Realmente desea eliminar esta identidad?';
 $messages['nodeletelastidentity'] = 'No se puede borrar esta identidad puesto que es la última.';
-$messages['forbiddencharacter'] = 'El nombre de la bandeja contiene un carácter prohibido';
-$messages['selectimportfile'] = 'Por favor, seleccione un archivo para subir';
-$messages['addresswriterror'] = 'No se puede escribir la dirección de contacto seleccionada';
+$messages['forbiddencharacter'] = 'El nombre de la bandeja contiene un carácter prohibido.';
+$messages['selectimportfile'] = 'Por favor, seleccione un archivo para subir.';
+$messages['addresswriterror'] = 'No se puede escribir en la libreta de direciones seleccionada.';
 $messages['contactaddedtogroup'] = 'Se han añadido correctamente los contactos a este grupo.';
 $messages['contactremovedfromgroup'] = 'Se han borrado correctamente los contactos de este grupo.';
-$messages['nogroupassignmentschanged'] = 'No hay cambios en la asgnación de grupos';
+$messages['nogroupassignmentschanged'] = 'No hay cambios en la asignación de grupos.';
 $messages['importwait'] = 'Importando, espere...';
-$messages['importconfirm'] = '<b>Se han insertado: $inserted contactos, y se han omitido: $skipped porque ya existían</b>:<p><em>$names</em></p>';
-$messages['importconfirmskipped'] = 'Ignorar $skipped entradas existentes';
+$messages['importformaterror'] = '¡La importación falló! El fichero enviado no es un fichero válido de importación de datos';
+$messages['importconfirm'] = '<b>Se han importado $inserted contactos correctamente</b>';
+$messages['importconfirmskipped'] = '<b>Ignoradas $skipped entradas existentes</b>';
 $messages['opnotpermitted'] = '¡Operación no permitida!';
 $messages['nofromaddress'] = 'El contacto seleccionado no tiene dirección de e-mail';
 $messages['editorwarning'] = 'Cambiando a texto plano perderá el formato del mensaje. ¿Desea continuar?';
 $messages['httpreceivedencrypterror'] = 'Ha ocurrido un error fatal de configuración. Contacte inmediatamente a su administrador. <b>Su mensaje no ha sido enviado.</b>';
-$messages['smtpconnerror'] = 'Error SMTP ($code): Ha fallado la conexión al servidor';
-$messages['smtpautherror'] = 'Error SMTP ($code): Error de autenticación';
-$messages['smtpfromerror'] = 'Error SMTP ($code): No se ha podido asignar el emisor "$from" ($msg)';
-$messages['smtptoerror'] = 'Error SMTP ($code): No se ha podido establecer remitente "$to" ($msg)';
-$messages['smtprecipientserror'] = 'Error SMTP: No es posible analizar la lista de destinatarios';
+$messages['smtpconnerror'] = 'Error SMTP ($code): Ha fallado la conexión al servidor.';
+$messages['smtpautherror'] = 'Error SMTP ($code): Error de autenticación.';
+$messages['smtpfromerror'] = 'Error SMTP ($code): No se ha podido asignar el emisor "$from" ($msg).';
+$messages['smtptoerror'] = 'Error SMTP ($code): No se ha podido establecer destinatario "$to" ($msg).';
+$messages['smtprecipientserror'] = 'Error SMTP: No es posible analizar la lista de destinatarios.';
 $messages['smtperror'] = 'Error SMTP: $msg';
 $messages['emailformaterror'] = 'Dirección e-mail incorrecta: $email';
 $messages['toomanyrecipients'] = 'Hay demasiados destinatarios. Reduzca el número de destinatarios a $max.';
 $messages['maxgroupmembersreached'] = 'El número de miembros del grupo excede el máximo de $max.';
-$messages['internalerror'] = 'Ocurrió un error interno. Por favor, inténtalo de nuevo';
-$messages['contactdelerror'] = 'No se ha podido eliminar el contacto(s)';
-$messages['contactdeleted'] = 'Contacto(s) eliminado(s) correctamente';
+$messages['internalerror'] = 'Ocurrió un error interno. Por favor, inténtelo de nuevo.';
+$messages['contactdelerror'] = 'No se ha podido eliminar el/los contacto(s).';
+$messages['contactdeleted'] = 'Contacto(s) eliminado(s) correctamente.';
 $messages['contactrestoreerror'] = 'No se han podido restaurar los contactos borrados.';
 $messages['contactrestored'] = 'Los contactos se han restaurado con éxito.';
-$messages['groupdeleted'] = 'Grupo eliminado correctamente';
-$messages['grouprenamed'] = 'Grupo renombrado correctamente';
-$messages['groupcreated'] = 'Grupo creado correctamente';
+$messages['groupdeleted'] = 'Grupo eliminado correctamente.';
+$messages['grouprenamed'] = 'Grupo renombrado correctamente.';
+$messages['groupcreated'] = 'Grupo creado correctamente.';
 $messages['savedsearchdeleted'] = 'La búsqueda guardada se ha borrado con éxito.';
 $messages['savedsearchdeleteerror'] = 'No se ha podido borrar la búsqueda guardada.';
 $messages['savedsearchcreated'] = 'Se ha guardado correctamente la búsqueda.';
 $messages['savedsearchcreateerror'] = 'No se ha podido guardar la búsqueda.';
-$messages['messagedeleted'] = 'Mensaje(s) eliminado(s) correctamente';
-$messages['messagemoved'] = 'Mensaje(s) movido(s) correctamente';
-$messages['messagecopied'] = 'Mensaje(s) copiado(s) correctamente';
-$messages['messagemarked'] = 'Mensaje(s) marcado(s) correctamente';
-$messages['autocompletechars'] = 'Introduce al menos $min caracteres para autocompletar';
-$messages['autocompletemore'] = 'Se encontraron mas coincidencias. Favor de ingresar mas caracteres';
-$messages['namecannotbeempty'] = 'Hay que poner el nombre';
-$messages['nametoolong'] = 'El nombre es demasiado largo';
-$messages['folderupdated'] = 'Bandeja actualizada correctamente';
-$messages['foldercreated'] = 'Bandeja creada correctamente';
-$messages['invalidimageformat'] = 'No es un formato de imagen válido';
+$messages['messagedeleted'] = 'Mensaje(s) eliminado(s) correctamente.';
+$messages['messagemoved'] = 'Mensaje(s) movido(s) correctamente.';
+$messages['messagecopied'] = 'Mensaje(s) copiado(s) correctamente.';
+$messages['messagemarked'] = 'Mensaje(s) marcado(s) correctamente.';
+$messages['autocompletechars'] = 'Introduce al menos $min caracteres para autocompletar.';
+$messages['autocompletemore'] = 'Se encontraron mas coincidencias. Favor de ingresar mas caracteres.';
+$messages['namecannotbeempty'] = 'Hay que poner el nombre.';
+$messages['nametoolong'] = 'El nombre es demasiado largo.';
+$messages['folderupdated'] = 'Bandeja actualizada correctamente.';
+$messages['foldercreated'] = '.';
+$messages['invalidimageformat'] = 'No es un formato de imagen válido.';
 $messages['mispellingsfound'] = 'Se han detectado errores ortográficos en el mensaje.';
 $messages['parentnotwritable'] = 'No se puede crear/mover la carpeta a la carpeta superior elegida. No tiene permisos de acceso.';
-$messages['messagetoobig'] = 'Esta parte del mensaje es demasiada grande para procesarla';
+$messages['messagetoobig'] = 'Esta parte del mensaje es demasiada grande para procesarla.';
+$messages['attachmentvalidationerror'] = '¡ATENCIÓN! Este adjunto es sospechoso porque su tipo no coincide con el tipo declarado en el mensaje. Si no confía en su remitente, no debería abrirlo en su navegador porque podría tener contenido malicioso.<br/<br/> <em>Esperado: $expected; encontrado: $detected</em>';
+$messages['noscriptwarning'] = 'Advertencia: ¡este servicio de webmail necesita Javascript! Para poder usarlo habilite el soporte de Javascript en su navegador, por favor.';
 
+?>
diff --git a/program/localization/et_EE/labels.inc b/program/localization/et_EE/labels.inc
index 9215c3d70..c3b3aa954 100644
--- a/program/localization/et_EE/labels.inc
+++ b/program/localization/et_EE/labels.inc
@@ -2,58 +2,78 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/et_EE/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: yllar                                                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = 'Tere tulemast! See on $product.';
-$labels['username'] = 'Kasutajanimi';
-$labels['password'] = 'Parool';
-$labels['server'] = 'Server';
-$labels['login'] = 'Logi sisse';
-$labels['logout'] = 'Logi välja';
-$labels['mail'] = 'Postkast';
+
+// login page
+$labels['welcome']   = 'Tere tulemast! See on $product.';
+$labels['username']  = 'Kasutajanimi';
+$labels['password']  = 'Parool';
+$labels['server']    = 'Server';
+$labels['login']     = 'Logi sisse';
+
+// taskbar
+$labels['logout']   = 'Logi välja';
+$labels['mail']     = 'Postkast';
 $labels['settings'] = 'Seaded';
 $labels['addressbook'] = 'Aadressiraamat';
-$labels['inbox'] = 'Saabuvad';
+
+// mailbox names
+$labels['inbox']  = 'Saabuvad';
 $labels['drafts'] = 'Mustandid';
-$labels['sent'] = 'Saadetud';
-$labels['trash'] = 'Prügikast';
-$labels['junk'] = 'Rämps';
+$labels['sent']   = 'Saadetud';
+$labels['trash']  = 'Prügikast';
+$labels['junk']   = 'Rämps';
+
+// message listing
 $labels['subject'] = 'Pealkiri';
-$labels['from'] = 'Saatja';
-$labels['to'] = 'Saaja';
-$labels['cc'] = 'Koopia';
-$labels['bcc'] = 'Pimekoopia';
+$labels['from']    = 'Saatja';
+$labels['sender']  = 'Saatja';
+$labels['to']      = 'Saaja';
+$labels['cc']      = 'Koopia';
+$labels['bcc']     = 'Pimekoopia';
 $labels['replyto'] = 'Vastus aadressile';
 $labels['followupto'] = 'Followup-To';
-$labels['date'] = 'Kuupäev';
-$labels['size'] = 'Suurus';
+$labels['date']    = 'Kuupäev';
+$labels['size']    = 'Suurus';
 $labels['priority'] = 'Tähtsus';
 $labels['organization'] = 'Organisatsioon';
 $labels['readstatus'] = 'Lugemise staatus';
 $labels['listoptions'] = 'Nimekirja valikud…';
+
 $labels['mailboxlist'] = 'Kaustad';
-$labels['folders'] = 'Kaustad';
 $labels['messagesfromto'] = 'Kirjed $from kuni $to, kokku $count';
 $labels['threadsfromto'] = 'Lõimed $from kuni $to, kokku $count';
 $labels['messagenrof'] = 'Kiri $nr, kokku $count';
 $labels['fromtoshort'] = '$from – $to kokku $count';
-$labels['copy'] = 'Kopeeri';
-$labels['move'] = 'Liiguta';
-$labels['moveto'] = 'liiguta kausta...';
+
+$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';
+
 $labels['filename'] = 'Faili nimi';
 $labels['filesize'] = 'Faili suurus';
+
 $labels['addtoaddressbook'] = 'Lisa aadressiraamatusse';
+
+// weekdays short
 $labels['sun'] = 'P';
 $labels['mon'] = 'E';
 $labels['tue'] = 'T';
@@ -61,78 +81,88 @@ $labels['wed'] = 'K';
 $labels['thu'] = 'N';
 $labels['fri'] = 'R';
 $labels['sat'] = 'L';
-$labels['sunday'] = 'Pühapäev';
-$labels['monday'] = 'Esmaspäev';
-$labels['tuesday'] = 'Teisipäev';
+
+// weekdays long
+$labels['sunday']    = 'Pühapäev';
+$labels['monday']    = 'Esmaspäev';
+$labels['tuesday']   = 'Teisipäev';
 $labels['wednesday'] = 'Kolmapäev';
-$labels['thursday'] = 'Neljapäev';
-$labels['friday'] = 'Reede';
-$labels['saturday'] = 'Laupäev';
-$labels['jan'] = 'jaan';
-$labels['feb'] = 'veebr';
-$labels['mar'] = 'märts';
-$labels['apr'] = 'apr';
-$labels['may'] = 'Mai';
-$labels['longmay'] = 'Mai';
-$labels['jun'] = 'juuni';
-$labels['jul'] = 'juuli';
-$labels['aug'] = 'aug';
-$labels['sep'] = 'sept';
-$labels['oct'] = 'okt';
-$labels['nov'] = 'nov';
-$labels['dec'] = 'dets';
-$labels['longjan'] = 'Jaanuar';
-$labels['longfeb'] = 'Veebruar';
-$labels['longmar'] = 'Märts';
-$labels['longapr'] = 'Aprill';
-$labels['longjun'] = 'Juuni';
-$labels['longjul'] = 'Juuli';
-$labels['longaug'] = 'August';
-$labels['longsep'] = 'September';
-$labels['longoct'] = 'Oktoober';
-$labels['longnov'] = 'November';
-$labels['longdec'] = 'Detsember';
+$labels['thursday']  = 'Neljapäev';
+$labels['friday']    = 'Reede';
+$labels['saturday']  = 'Laupäev';
+
+// months short
+$labels['jan']	= 'jaan';
+$labels['feb']	= 'veebr';
+$labels['mar']	= 'märts';
+$labels['apr']	= 'apr';
+$labels['may']	= 'Mai';
+$labels['jun']	= 'juuni';
+$labels['jul'] 	= 'juuli';
+$labels['aug']	= 'aug';
+$labels['sep']	= 'sept';
+$labels['oct']	= 'okt';
+$labels['nov']	= 'nov';
+$labels['dec']	= 'dets';
+
+// months long
+$labels['longjan']	= 'Jaanuar';
+$labels['longfeb']	= 'Veebruar';
+$labels['longmar']	= 'Märts';
+$labels['longapr']	= 'Aprill';
+$labels['longmay']	= 'Mai';
+$labels['longjun']	= 'Juuni';
+$labels['longjul']	= 'Juuli';
+$labels['longaug']	= 'August';
+$labels['longsep']	= 'September';
+$labels['longoct']	= 'Oktoober';
+$labels['longnov']	= 'November';
+$labels['longdec']	= 'Detsember';
+
 $labels['today'] = 'Täna';
-$labels['refresh'] = 'Värskenda';
-$labels['checkmail'] = 'Kontrolli uusi kirju';
-$labels['compose'] = 'Koosta kiri';
-$labels['writenewmessage'] = 'Kirjuta uus kiri';
-$labels['reply'] = 'Vasta';
-$labels['replytomessage'] = 'Vasta kirjale';
+
+// toolbar buttons
+$labels['refresh']          = 'Värskenda';
+$labels['checkmail']        = 'Kontrolli uusi kirju';
+$labels['compose']          = 'Koosta kiri';
+$labels['writenewmessage']  = 'Kirjuta uus kiri';
+$labels['reply']            = 'Vasta';
+$labels['replytomessage']   = 'Vasta kirjale';
 $labels['replytoallmessage'] = 'Vasta saatjale ja teistele kirja saanutele';
-$labels['replyall'] = 'Vasta kõigile';
-$labels['replylist'] = 'Vasta meilinglisti';
-$labels['forward'] = 'Edasta';
-$labels['forwardinline'] = 'Edasta kirja sees';
+$labels['replyall']         = 'Vasta kõigile';
+$labels['replylist']        = 'Vasta meilinglisti';
+$labels['forward']          = 'Edasta';
+$labels['forwardinline']    = 'Edasta kirja sees';
 $labels['forwardattachment'] = 'Edasta manusena';
-$labels['forwardmessage'] = 'Edasta see kiri';
-$labels['deletemessage'] = 'Kustuta kiri';
+$labels['forwardmessage']   = 'Edasta see kiri';
+$labels['deletemessage']    = 'Kustuta kiri';
 $labels['movemessagetotrash'] = 'Liiguta kiri prügikasti';
-$labels['printmessage'] = 'Trüki kiri';
-$labels['previousmessage'] = 'Näita eelmist kirja';
-$labels['firstmessage'] = 'Näita esimest kirja';
-$labels['nextmessage'] = 'Näita järgmist kirja';
-$labels['lastmessage'] = 'Näita viimast kirja';
-$labels['backtolist'] = 'Tagasi kirjade nimekirja';
-$labels['viewsource'] = 'Näita lähtekoodi';
-$labels['mark'] = 'Märgista';
-$labels['markmessages'] = 'Märgi kirjad';
-$labels['markread'] = 'Loetuks';
-$labels['markunread'] = 'Mitte loetuks';
-$labels['markflagged'] = 'Lisa lipik';
-$labels['markunflagged'] = 'Eemalda lipik';
-$labels['moreactions'] = 'Muud toimingud...';
-$labels['more'] = 'Rohkem';
-$labels['back'] = 'Tagasi';
-$labels['options'] = 'Valikud';
+$labels['printmessage']     = 'Trüki kiri';
+$labels['previousmessage']  = 'Näita eelmist kirja';
+$labels['firstmessage']     = 'Näita esimest kirja';
+$labels['nextmessage']      = 'Näita järgmist kirja';
+$labels['lastmessage']      = 'Näita viimast kirja';
+$labels['backtolist']       = 'Tagasi kirjade nimekirja';
+$labels['viewsource']       = 'Näita lähtekoodi';
+$labels['mark']             = 'Märgista';
+$labels['markmessages']     = 'Märgi kirjad';
+$labels['markread']         = 'Loetuks';
+$labels['markunread']       = 'Mitte loetuks';
+$labels['markflagged']      = 'Lisa lipik';
+$labels['markunflagged']    = 'Eemalda lipik';
+$labels['moreactions']      = 'Muud toimingud...';
+$labels['more']             = 'Rohkem';
+$labels['back']             = 'Tagasi';
+$labels['options']          = 'Valikud';
+
 $labels['select'] = 'Vali';
 $labels['all'] = 'kõik';
 $labels['none'] = 'Puudub';
-$labels['nonesort'] = 'Puudub';
 $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';
@@ -143,12 +173,14 @@ $labels['expand-all'] = 'Laienda kõik';
 $labels['expand-unread'] = 'Laienda lugemata';
 $labels['collapse-all'] = 'Pane kõik kokku';
 $labels['threaded'] = 'Lõimedena';
+
 $labels['autoexpand_threads'] = 'Laienda kirjade lõimed';
 $labels['do_expand'] = 'kõik lõimed';
 $labels['expand_only_unread'] = 'ainult lugemata kirjadega';
 $labels['fromto'] = 'Saatja/saaja';
 $labels['flag'] = 'Märgista';
 $labels['attachment'] = 'Manus';
+$labels['nonesort'] = 'Puudub';
 $labels['sentdate'] = 'Saatmise kuupäev';
 $labels['arrival'] = 'Saamise kuupäev';
 $labels['asc'] = 'kasvavalt';
@@ -157,182 +189,220 @@ $labels['listcolumns'] = 'Näita veerge';
 $labels['listsorting'] = 'Järjestus veerg';
 $labels['listorder'] = 'Järjestus suund';
 $labels['listmode'] = 'Nimekirja vaatamise režiim';
+
 $labels['folderactions'] = 'Kausta tegevused...';
 $labels['compact'] = 'Tihenda';
 $labels['empty'] = 'Tühjenda';
+
 $labels['quota'] = 'Kettakasutus';
-$labels['unknown'] = 'teadmata';
-$labels['unlimited'] = 'piiramatu';
-$labels['quicksearch'] = 'Kiirotsing';
-$labels['resetsearch'] = 'Lähtesta otsing';
-$labels['searchmod'] = 'Otsingu laiendid';
-$labels['msgtext'] = 'Kogu kirjast';
+$labels['unknown']  = 'teadmata';
+$labels['unlimited']  = 'piiramatu';
+
+$labels['quicksearch']  = 'Kiirotsing';
+$labels['resetsearch']  = 'Lähtesta otsing';
+$labels['searchmod']  = 'Otsingu laiendid';
+$labels['msgtext']  = 'Kogu kirjast';
+$labels['body']  = 'Keha';
+
 $labels['openinextwin'] = 'Ava uues aknas';
 $labels['emlsave'] = 'Salvesta (.eml)';
-$labels['editasnew'] = 'Kasuta uue kirja põhjana';
-$labels['send'] = 'Saada';
-$labels['sendmessage'] = 'Saada kiri kohe';
-$labels['savemessage'] = 'Salvesta mustand';
-$labels['addattachment'] = 'Lisa fail';
-$labels['charset'] = 'Märgistik';
-$labels['editortype'] = 'Redaktori tüüp';
-$labels['returnreceipt'] = 'Kättesaamiskinnitus';
-$labels['dsn'] = 'Kohalejõudmise teavitus';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
+
+// message compose
+$labels['editasnew']      = 'Kasuta uue kirja põhjana';
+$labels['send']           = 'Saada';
+$labels['sendmessage']    = 'Saada kiri kohe';
+$labels['savemessage']    = 'Salvesta mustand';
+$labels['addattachment']  = 'Lisa fail';
+$labels['charset']        = 'Märgistik';
+$labels['editortype']     = 'Redaktori tüüp';
+$labels['returnreceipt']  = 'Kättesaamiskinnitus';
+$labels['dsn']            = 'Kohalejõudmise teavitus';
 $labels['mailreplyintro'] = '$date kirjutas $sender:';
 $labels['originalmessage'] = 'Esialgne kiri';
-$labels['editidents'] = 'Muuda Identiteete';
-$labels['spellcheck'] = 'Õigekiri';
+
+$labels['editidents']    = 'Muuda Identiteete';
+$labels['spellcheck']    = 'Õigekiri';
 $labels['checkspelling'] = 'Kontrolli õigekirja';
 $labels['resumeediting'] = 'Jätka muutmist';
-$labels['revertto'] = 'Pööra tagasi';
+$labels['revertto']      = 'Pööra tagasi';
+
 $labels['attach'] = 'Manusta';
 $labels['attachments'] = 'Manused';
 $labels['upload'] = 'Kinnita manus';
 $labels['uploadprogress'] = '$percent ($current, kokku $total)';
-$labels['close'] = 'Sulge';
-$labels['messageoptions'] = 'Kirja valikud...';
-$labels['low'] = 'Madal';
-$labels['lowest'] = 'Madalaim';
-$labels['normal'] = 'Tavaline';
-$labels['high'] = 'Kõrge';
+$labels['close']  = 'Sulge';
+$labels['messageoptions']  = 'Kirja valikud...';
+
+$labels['low']     = 'Madal';
+$labels['lowest']  = 'Madalaim';
+$labels['normal']  = 'Tavaline';
+$labels['high']    = 'Kõrge';
 $labels['highest'] = 'Kõrgeim';
-$labels['nosubject'] = '(teema puudub)';
+
+$labels['nosubject']  = '(teema puudub)';
 $labels['showimages'] = 'Näita pilte';
 $labels['alwaysshow'] = 'Näita alati $sender saadetud pilte';
-$labels['isdraft'] = 'See on mustand.';
-$labels['andnmore'] = '$nr veel…';
+$labels['isdraft']    = 'See on mustand.';
+$labels['andnmore']   = '$nr veel…';
 $labels['togglemoreheaders'] = 'Näita rohkem kirja päiseid';
 $labels['togglefullheaders'] = 'Näita/peida algseid päiseid';
+
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Lihttekst';
 $labels['savesentmessagein'] = 'Salvesta saadetud kirjad kausta';
 $labels['dontsave'] = 'ära salvesta';
 $labels['maxuploadsize'] = 'Faili maksimaalne lubatud suurus on $size';
+
 $labels['addcc'] = 'Lisa koopia';
 $labels['addbcc'] = 'Lisa pimekoopia';
 $labels['addreplyto'] = 'Lisa vastus aadressile';
 $labels['addfollowupto'] = 'Lisa Followup-To';
+
+// mdn
 $labels['mdnrequest'] = 'Selle kirja saatja soovib saada kinnitust kirja lugemise kohta. Kas soovid kinnituse saata?';
 $labels['receiptread'] = 'Kättesaamiskinnitus (leotud)';
 $labels['yourmessage'] = 'See on sinu saadetud kirja kättesaamiskinnitus';
 $labels['receiptnote'] = 'Märkus: Kättesaamiskinnituse saamine tähendab ainult seda, et saaja on kirja avanud. Pole mingit garantiid, et ta kirja tegelikult luges ja selle sisust aru sai.';
-$labels['name'] = 'Näidatav nimi';
-$labels['firstname'] = 'Eesnimi';
-$labels['surname'] = 'Perekonnanimi';
-$labels['middlename'] = 'Keskmine nimi';
-$labels['nameprefix'] = 'Eesliide';
-$labels['namesuffix'] = 'Järelliide';
-$labels['nickname'] = 'Hüüdnimi';
-$labels['jobtitle'] = 'Töökoht';
-$labels['department'] = 'Osakond';
-$labels['gender'] = 'Sugu';
-$labels['maidenname'] = 'Neiupõlve nimi';
-$labels['email'] = 'E-post';
-$labels['phone'] = 'Telefon';
-$labels['address'] = 'Aadress';
-$labels['street'] = 'Tänav';
-$labels['locality'] = 'Linn';
-$labels['zipcode'] = 'Postiindeks';
-$labels['region'] = 'Piirkond';
-$labels['country'] = 'Riik';
-$labels['birthday'] = 'Sünnipäev';
-$labels['anniversary'] = 'Tähtpäev';
-$labels['website'] = 'Veebileht';
+
+// address boook
+$labels['name']         = 'Näidatav nimi';
+$labels['firstname']    = 'Eesnimi';
+$labels['surname']      = 'Perekonnanimi';
+$labels['middlename']   = 'Keskmine nimi';
+$labels['nameprefix']   = 'Eesliide';
+$labels['namesuffix']   = 'Järelliide';
+$labels['nickname']     = 'Hüüdnimi';
+$labels['jobtitle']     = 'Töökoht';
+$labels['department']   = 'Osakond';
+$labels['gender']       = 'Sugu';
+$labels['maidenname']   = 'Neiupõlve nimi';
+$labels['email']        = 'E-post';
+$labels['phone']        = 'Telefon';
+$labels['address']      = 'Aadress';
+$labels['street']       = 'Tänav';
+$labels['locality']     = 'Linn';
+$labels['zipcode']      = 'Postiindeks';
+$labels['region']       = 'Piirkond';
+$labels['country']      = 'Riik';
+$labels['birthday']     = 'Sünnipäev';
+$labels['anniversary']  = 'Tähtpäev';
+$labels['website']      = 'Veebileht';
 $labels['instantmessenger'] = 'Kiirsuhtlus';
 $labels['notes'] = 'Märkused';
-$labels['male'] = 'mees';
+$labels['male']   = 'mees';
 $labels['female'] = 'naine';
 $labels['manager'] = 'Juht';
 $labels['assistant'] = 'Assistent';
-$labels['typeassistant'] = 'Assistent';
 $labels['spouse'] = 'Abikaasa';
 $labels['allfields'] = 'Kõik väljad';
 $labels['search'] = 'Otsi';
 $labels['advsearch'] = 'Täpsem otsing';
 $labels['advanced'] = 'Edasijõudnutele';
 $labels['other'] = 'Muu';
-$labels['typeother'] = 'Muu';
-$labels['typehome'] = 'Kodu';
-$labels['typework'] = 'Töö';
-$labels['typemobile'] = 'Mobiil';
-$labels['typemain'] = 'Peamine';
-$labels['typehomefax'] = 'Kodune fax';
-$labels['typeworkfax'] = 'Töö fax';
-$labels['typecar'] = 'Auto';
-$labels['typepager'] = 'Piipar';
-$labels['typevideo'] = 'Video';
-$labels['typehomepage'] = 'Veebileht';
+
+$labels['typehome']   = 'Kodu';
+$labels['typework']   = 'Töö';
+$labels['typeother']  = 'Muu';
+$labels['typemobile']  = 'Mobiil';
+$labels['typemain']  = 'Peamine';
+$labels['typehomefax']  = 'Kodune fax';
+$labels['typeworkfax']  = 'Töö fax';
+$labels['typecar']  = 'Auto';
+$labels['typepager']  = 'Piipar';
+$labels['typevideo']  = 'Video';
+$labels['typeassistant']  = 'Assistent';
+$labels['typehomepage']  = 'Veebileht';
 $labels['typeblog'] = 'Ajaveeb';
 $labels['typeprofile'] = 'Profiil';
+
 $labels['addfield'] = 'Lisa väli...';
 $labels['addcontact'] = 'Uue kontakti lisamine';
 $labels['editcontact'] = 'Muuda kontakti';
 $labels['contacts'] = 'Kontaktid';
 $labels['contactproperties'] = 'Kontakti omadused';
 $labels['personalinfo'] = 'Isiklik info';
-$labels['edit'] = 'Muuda';
+
+$labels['edit']   = 'Muuda';
 $labels['cancel'] = 'Katkesta';
-$labels['save'] = 'Salvesta';
+$labels['save']   = 'Salvesta';
 $labels['delete'] = 'Kustuta';
 $labels['rename'] = 'Nimeta ümber';
 $labels['addphoto'] = 'Lisa';
 $labels['replacephoto'] = 'Asenda';
 $labels['uploadphoto'] = 'Lisa foto';
-$labels['newcontact'] = 'Uue sissekande loomine';
-$labels['deletecontact'] = 'Kustuta märgistatud kontaktid';
-$labels['composeto'] = 'Kirjuta kiri';
+
+$labels['newcontact']     = 'Uue sissekande loomine';
+$labels['deletecontact']  = 'Kustuta märgistatud kontaktid';
+$labels['composeto']      = 'Kirjuta kiri';
 $labels['contactsfromto'] = 'Kirjed $from kuni $to, kokku $count';
-$labels['print'] = 'Trüki';
-$labels['export'] = 'Ekspordi';
-$labels['exportvcards'] = 'Ekspordi kontaktid vCardi formaadis';
+$labels['print']          = 'Trüki';
+$labels['export']         = 'Ekspordi';
+$labels['exportall']      = 'Ekspordi kõik';
+$labels['exportsel']      = 'Ekspordi valitud';
+$labels['exportvcards']   = 'Ekspordi kontaktid vCardi formaadis';
 $labels['newcontactgroup'] = 'Loo uus kontaktigrupp';
-$labels['grouprename'] = 'Nimeta grupp ümber';
-$labels['groupdelete'] = 'Kustuta grupp';
+$labels['grouprename']    = 'Nimeta grupp ümber';
+$labels['groupdelete']    = 'Kustuta grupp';
 $labels['groupremoveselected'] = 'Eemalda valitud kontaktid grupist';
-$labels['previouspage'] = 'Näita eelmist lehte';
-$labels['firstpage'] = 'Näita esimest komplekti';
-$labels['nextpage'] = 'Näita järgmist lehte';
-$labels['lastpage'] = 'Näita viimast komplekti';
+
+$labels['previouspage']   = 'Näita eelmist lehte';
+$labels['firstpage']      = 'Näita esimest komplekti';
+$labels['nextpage']       = 'Näita järgmist lehte';
+$labels['lastpage']       = 'Näita viimast komplekti';
+
 $labels['group'] = 'Grupp';
 $labels['groups'] = 'Grupid';
 $labels['personaladrbook'] = 'Isiklikud aadressid';
+
 $labels['searchsave'] = 'Salvesta otsing';
 $labels['searchdelete'] = 'Kustuta otsing';
+
 $labels['import'] = 'Impordi';
 $labels['importcontacts'] = 'Impordi kontakte';
 $labels['importfromfile'] = 'Impordi failist:';
 $labels['importtarget'] = 'Lisa uued kontaktid aadressiraamatusse:';
 $labels['importreplace'] = 'Asenda kogu aadressiraamat';
+$labels['importdesc'] = 'Sa saad laadida kontakte olemasolevast aadressiraamatust.<br/>Praegu on võimalik importida <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> või CSV (komaga eraldatud) formaadis andmeid. ';
 $labels['done'] = 'Valmis';
+
+// settings
 $labels['settingsfor'] = 'Kasutajaeelistused kontole';
 $labels['about'] = 'Programmist lähemalt';
 $labels['preferences'] = 'Eelistused';
 $labels['userpreferences'] = 'Kasutaja eelistused';
 $labels['editpreferences'] = 'Muuda kasutaja eelistusi';
+
 $labels['identities'] = 'Identiteedid';
 $labels['manageidentities'] = 'Halda selle konto identiteete';
 $labels['newidentity'] = 'Uus identiteet';
+
 $labels['newitem'] = 'Uus sissekanne';
 $labels['edititem'] = 'Muuda sissekannet';
+
 $labels['preferhtml'] = 'Eelista HTMLi';
 $labels['defaultcharset'] = 'Vaikimisi märgistik';
 $labels['htmlmessage'] = 'HTML kirjad';
+$labels['messagepart'] = 'Osa';
+$labels['digitalsig'] = 'Digitaalne allkiri';
 $labels['dateformat'] = 'Kuupäeva vorming';
 $labels['timeformat'] = 'Aja vorming';
 $labels['prettydate'] = 'Kenad kuupäevad';
-$labels['setdefault'] = 'Muuda vaikeseadeks';
-$labels['autodetect'] = 'Automaatne';
-$labels['language'] = 'Keel';
-$labels['timezone'] = 'Ajavöönd';
-$labels['pagesize'] = 'Ridu lehe kohta';
+$labels['setdefault']  = 'Muuda vaikeseadeks';
+$labels['autodetect']  = 'Automaatne';
+$labels['language']  = 'Keel';
+$labels['timezone']  = 'Ajavöönd';
+$labels['pagesize']  = 'Ridu lehe kohta';
 $labels['signature'] = 'Allkiri';
-$labels['dstactive'] = 'Suveaeg';
+$labels['dstactive']  = 'Suveaeg';
 $labels['showinextwin'] = 'Ava kiri uues aknas';
 $labels['composeextwin'] = 'Koosta uues aknas';
 $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';
@@ -355,10 +425,11 @@ $labels['showremoteimages'] = 'Näita kirjas kaugelt kaasatud pilte';
 $labels['fromknownsenders'] = 'tuntud saatjatelt';
 $labels['always'] = 'alati';
 $labels['showinlineimages'] = 'Näita manustatud pilte kirja all';
-$labels['autosavedraft'] = 'Salvesta mustandid automaatselt';
-$labels['everynminutes'] = 'iga $n minuti tagant';
-$labels['never'] = 'mitte kunagi';
-$labels['immediately'] = 'otsekohe';
+$labels['autosavedraft']  = 'Salvesta mustandid automaatselt';
+$labels['everynminutes']  = 'iga $n minuti tagant';
+$labels['refreshinterval']  = 'Värskenda (kontrolli uusi kirju, jne.)';
+$labels['never']  = 'mitte kunagi';
+$labels['immediately']  = 'otsekohe';
 $labels['messagesdisplaying'] = 'Kirjade näitamine';
 $labels['messagescomposition'] = 'Kirja koostamine';
 $labels['mimeparamfolding'] = 'Manuste nimed';
@@ -385,16 +456,13 @@ $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';
+$labels['previewpanemarkread']  = 'Märgi eelvaadatud kirjad loetuks';
+$labels['afternseconds']  = '$n sekundi pärast';
 $labels['reqmdn'] = 'Nõua alati kättesaamiskinnitust';
 $labels['reqdsn'] = 'Nõua alati kohalejõudmisteavitust';
 $labels['replysamefolder'] = 'Paiguta vastused samasse kausta, millele vastatakse';
-$labels['defaultaddressbook'] = 'Lisa kontaktid valitud aadressiraamatusse';
+$labels['defaultabook'] = 'Vaikimisi aadressiraamat';
 $labels['autocompletesingle'] = 'Automaatlõpetuses jäta alternatiivne e-posti aadress vahele';
 $labels['listnamedisplay'] = 'Näita kontakte kui';
 $labels['spellcheckbeforesend'] = 'Kontrolli õigekirja enne saatmist';
@@ -407,13 +475,15 @@ $labels['mailtoprotohandler'] = 'Kasuta mailto: linkide avamisel';
 $labels['forwardmode'] = 'Kirja edastamine';
 $labels['inline'] = 'kirja sees';
 $labels['asattachment'] = 'manusena';
-$labels['folder'] = 'Kaust';
-$labels['foldername'] = 'Kausta nimi';
-$labels['subscribed'] = 'Näitan';
+
+$labels['folder']  = 'Kaust';
+$labels['folders']  = 'Kaustad';
+$labels['foldername']  = 'Kausta nimi';
+$labels['subscribed']  = 'Näitan';
 $labels['messagecount'] = 'Kirju';
-$labels['create'] = 'Loo';
-$labels['createfolder'] = 'Uue kausta loomine';
-$labels['managefolders'] = 'Halda kaustu';
+$labels['create']  = 'Loo';
+$labels['createfolder']  = 'Uue kausta loomine';
+$labels['managefolders']  = 'Halda kaustu';
 $labels['specialfolders'] = 'Erilised kaustad';
 $labels['properties'] = 'Omadused';
 $labels['folderproperties'] = 'Kausta omadused';
@@ -423,23 +493,29 @@ $labels['info'] = 'Teave';
 $labels['getfoldersize'] = 'Kliki kausta suuruse teadasaamiseks';
 $labels['changesubscription'] = 'Kliki kausta tellimuste muutmiseks';
 $labels['foldertype'] = 'Kausta tüüp';
-$labels['personalfolder'] = 'Isiklik kaust';
-$labels['otherfolder'] = 'Teiste kasutajate kaust';
-$labels['sharedfolder'] = 'Avalik kaust';
+$labels['personalfolder']  = 'Isiklik kaust';
+$labels['otherfolder']  = 'Teiste kasutajate kaust';
+$labels['sharedfolder']  = 'Avalik kaust';
+
 $labels['sortby'] = 'Järjesta';
-$labels['sortasc'] = 'Järjesta kasvavalt';
+$labels['sortasc']  = 'Järjesta kasvavalt';
 $labels['sortdesc'] = 'Järjesta kahanevalt';
 $labels['undo'] = 'Võta tagasi';
+
 $labels['installedplugins'] = 'Paigaldatud pluginad';
 $labels['plugin'] = 'Plugin';
 $labels['version'] = 'Versioon';
 $labels['source'] = 'Allikas';
 $labels['license'] = 'Litsents';
 $labels['support'] = 'Küsi abi';
+
+// units
 $labels['B'] = 'B';
 $labels['KB'] = 'KiB';
 $labels['MB'] = 'MiB';
 $labels['GB'] = 'GiB';
+
+// character sets
 $labels['unicode'] = 'Unicode';
 $labels['english'] = 'inglise';
 $labels['westerneuropean'] = 'Lääne-Euroopa';
@@ -459,3 +535,4 @@ $labels['japanese'] = 'jaapani';
 $labels['korean'] = 'korea';
 $labels['chinese'] = 'hiina';
 
+?>
diff --git a/program/localization/et_EE/messages.inc b/program/localization/et_EE/messages.inc
index 5a7916fb3..0064eaf9d 100644
--- a/program/localization/et_EE/messages.inc
+++ b/program/localization/et_EE/messages.inc
@@ -2,20 +2,23 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/et_EE/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: yllar                                                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['errortitle'] = 'Ilmnes tõrge!';
-$messages['loginfailed'] = 'Sisselogimine ebaõnnestus';
+$messages['errortitle']  = 'Ilmnes tõrge!';
+$messages['loginfailed']  = 'Sisselogimine ebaõnnestus';
 $messages['cookiesdisabled'] = 'Sinu veebilehitseja ei võta präänikuid vastu';
 $messages['sessionerror'] = 'Sinu seanss on aegunud või vigane';
 $messages['storageerror'] = 'Ei õnnestunud IMAP serveriga ühendust luua';
@@ -25,11 +28,14 @@ $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';
 $messages['loggedout'] = 'Sinu seanss on edukalt lõpetatud. Nägemiseni!';
 $messages['mailboxempty'] = 'Postkast on tühi';
+$messages['refreshing'] = 'Värskendamine…';
 $messages['loading'] = 'Laadin...';
 $messages['uploading'] = 'Laadin faili üles...';
 $messages['uploadingmany'] = 'Failide üleslaadimine...';
@@ -56,11 +62,11 @@ $messages['errormoving'] = 'Ei suutnud seda kirja liigutada';
 $messages['errorcopying'] = 'Kirju ei õnnestunud kopeerida';
 $messages['errordeleting'] = 'Ei suutnud seda kirja kustutada';
 $messages['errormarking'] = 'Kirja märkimine nurjus';
-$messages['deletecontactconfirm'] = 'Soovid valitud kontaktid kustutada?';
-$messages['deletegroupconfirm'] = 'Soovid valitud grupi kustutada?';
+$messages['deletecontactconfirm']  = 'Soovid valitud kontaktid kustutada?';
+$messages['deletegroupconfirm']  = 'Soovid valitud grupi kustutada?';
 $messages['deletemessagesconfirm'] = 'Soovid valitud kirja(d) kustutada?';
-$messages['deletefolderconfirm'] = 'Soovid selle kataloogi kindlasti kustutada?';
-$messages['purgefolderconfirm'] = 'Soovid sellest kaustast kõik kirjad kustutada?';
+$messages['deletefolderconfirm']  = 'Soovid selle kataloogi kindlasti kustutada?';
+$messages['purgefolderconfirm']  = 'Soovid sellest kaustast kõik kirjad kustutada?';
 $messages['contactdeleting'] = 'Kontakti(de) kustutamine…';
 $messages['groupdeleting'] = 'Grupi kustutamine…';
 $messages['folderdeleting'] = 'Kustutan kausta...';
@@ -69,11 +75,11 @@ $messages['foldersubscribing'] = 'Tellin kausta...';
 $messages['folderunsubscribing'] = 'Peatan kausta tellimuse...';
 $messages['formincomplete'] = 'Vormi kõik väljad ei ole täidetud';
 $messages['noemailwarning'] = 'Palun sisesta toimiv e-posti aadress';
-$messages['nonamewarning'] = 'Palun sisesta nimi';
+$messages['nonamewarning']  = 'Palun sisesta nimi';
 $messages['nopagesizewarning'] = 'Palun sisesta lehekülje suurus';
 $messages['nosenderwarning'] = 'Palun sisesta saatja e-posti aadress';
 $messages['norecipientwarning'] = 'Palun sisesta vähemalt üks adressaat';
-$messages['nosubjectwarning'] = 'Väli „Pealkiri“ on tühi. Soovid selle ära täita?';
+$messages['nosubjectwarning']  = 'Väli „Pealkiri“ on tühi. Soovid selle ära täita?';
 $messages['nobodywarning'] = 'Saadan selle kirja ilma tekstita?';
 $messages['notsentwarning'] = 'Kirja saatmine nurjus. Soovid selle ära visata?';
 $messages['noldapserver'] = 'Palun vali otsinguks LDAPi server';
@@ -117,6 +123,7 @@ $messages['contactaddedtogroup'] = 'Kontaktide lisamine gruppi õnnestus';
 $messages['contactremovedfromgroup'] = 'Kontaktide eemaldamine grupist õnnestus';
 $messages['nogroupassignmentschanged'] = 'Gruppide ülesandeid ei muudetud';
 $messages['importwait'] = 'Impordin, palun oota...';
+$messages['importformaterror'] = 'Import nurjus! Laaditud fail ei sisalda sobilikke andmeid.';
 $messages['importconfirm'] = '<b>Edukalt imporditud $inserted kontakti, $skipped olemasolevat sissekannet vahele jäetud</b>:<p><em>$names</em></p>';
 $messages['importconfirmskipped'] = '<b> $skipped olemasolevat kirjet jäeti vahele</b>';
 $messages['opnotpermitted'] = 'Tegevus pole lubatud!';
@@ -158,4 +165,7 @@ $messages['invalidimageformat'] = 'Pole õige pildi formaat';
 $messages['mispellingsfound'] = 'Kiri sisaldab õigekirjavigu';
 $messages['parentnotwritable'] = 'Kasuta loomine/liigutamine valitud kausta nurjus. Pole õigusi.';
 $messages['messagetoobig'] = 'Kiri on töötlemiseks liiga suur.';
+$messages['attachmentvalidationerror'] = 'HOIATUS! See manus on kahtlane, sest selle tüüp ei ole vastavuses kirjas määratuga. Kui sa ei usalda kirja saatjat, siis ei tohiks seda brauseris avada, sest see võib sisaldada pahavara.<br/><br/><em>Oodati: $expected; leiti: $detected</em>';
+$messages['noscriptwarning'] = 'Hoiatus: see veebimaili teenus vajab Javascripti! Teenuse kasutamiseks luba Javascript oma brauseri seadetes.';
 
+?>
diff --git a/program/localization/eu_ES/labels.inc b/program/localization/eu_ES/labels.inc
index 24ab8465c..8052d69e8 100644
--- a/program/localization/eu_ES/labels.inc
+++ b/program/localization/eu_ES/labels.inc
@@ -2,58 +2,78 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/eu_ES/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Asier Iturralde Sarasola                                      |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = 'Ongi etorri $product';
-$labels['username'] = 'Erabiltzailea';
-$labels['password'] = 'Pasahitza';
-$labels['server'] = 'Zerbitzaria';
-$labels['login'] = 'Saio hasiera';
-$labels['logout'] = 'Irten';
-$labels['mail'] = 'ePosta';
+
+// login page
+$labels['welcome']   = 'Ongi etorri $product';
+$labels['username']  = 'Erabiltzailea';
+$labels['password']  = 'Pasahitza';
+$labels['server']    = 'Zerbitzaria';
+$labels['login']     = 'Saio hasiera';
+
+// taskbar
+$labels['logout']   = 'Irten';
+$labels['mail']     = 'ePosta';
 $labels['settings'] = 'Ezarpen Pertsonalak';
 $labels['addressbook'] = 'Helbide Liburua';
-$labels['inbox'] = 'Sarrera';
+
+// mailbox names
+$labels['inbox']  = 'Sarrera';
 $labels['drafts'] = 'Zirriborroak';
-$labels['sent'] = 'Bidalitakoak';
-$labels['trash'] = 'Zakarrontzia';
-$labels['junk'] = 'Zabor-posta';
+$labels['sent']   = 'Bidalitakoak';
+$labels['trash']  = 'Zakarrontzia';
+$labels['junk']   = 'Zabor-posta';
+
+// message listing
 $labels['subject'] = 'Gaia';
-$labels['from'] = 'Nork';
-$labels['to'] = 'Nori';
-$labels['cc'] = 'Kopia';
-$labels['bcc'] = 'Bcc';
+$labels['from']    = 'Nork';
+$labels['sender']  = 'Igorlea';
+$labels['to']      = 'Nori';
+$labels['cc']      = 'Kopia';
+$labels['bcc']     = 'Bcc';
 $labels['replyto'] = 'Erantzun-Honi';
 $labels['followupto'] = 'Jarraipena honi';
-$labels['date'] = 'Data';
-$labels['size'] = 'Tamaina';
+$labels['date']    = 'Data';
+$labels['size']    = 'Tamaina';
 $labels['priority'] = 'Lehentasuna';
 $labels['organization'] = 'Erakundea';
 $labels['readstatus'] = 'Irakurketaren egoera';
 $labels['listoptions'] = 'Zerrendaren aukerak...';
+
 $labels['mailboxlist'] = 'Karpetak';
-$labels['folders'] = 'Karpetak';
 $labels['messagesfromto'] = '$from -tik $to -ra $count mezuetatik';
 $labels['threadsfromto'] = '$from -etik $to -rako gaiak (guztira $count)';
 $labels['messagenrof'] = '$nr mezua $count -tik';
 $labels['fromtoshort'] = '$from - $to , guztira $count';
-$labels['copy'] = 'Kopia';
-$labels['move'] = 'Mugitu';
-$labels['moveto'] = 'mugitu hona...';
+
+$labels['copy']     = 'Kopia';
+$labels['move']     = 'Mugitu';
+$labels['moveto']   = 'mugitu hona...';
 $labels['download'] = 'deskargatu';
+$labels['open']     = 'Open';
+$labels['showattachment'] = 'Show';
+$labels['showanyway'] = 'Show it anyway';
+
 $labels['filename'] = 'Fitxategi Izena';
 $labels['filesize'] = 'Fitxategi Tamaina';
+
 $labels['addtoaddressbook'] = 'Helbide liburura gehitu';
+
+// weekdays short
 $labels['sun'] = 'Iga';
 $labels['mon'] = 'Al';
 $labels['tue'] = 'As';
@@ -61,156 +81,328 @@ $labels['wed'] = 'Azt';
 $labels['thu'] = 'Og';
 $labels['fri'] = 'Or';
 $labels['sat'] = 'Lar';
-$labels['sunday'] = 'Igandea';
-$labels['monday'] = 'Astelehena';
-$labels['tuesday'] = 'Asteartea';
+
+// weekdays long
+$labels['sunday']    = 'Igandea';
+$labels['monday']    = 'Astelehena';
+$labels['tuesday']   = 'Asteartea';
 $labels['wednesday'] = 'Asteazkena';
-$labels['thursday'] = 'Osteguna';
-$labels['friday'] = 'Ostirala';
-$labels['saturday'] = 'Larunbata';
-$labels['jan'] = 'Urt';
-$labels['feb'] = 'Ots';
-$labels['mar'] = 'Mar';
-$labels['apr'] = 'Api';
-$labels['may'] = 'Maiatza';
-$labels['longmay'] = 'Maiatza';
-$labels['jun'] = 'Eka';
-$labels['jul'] = 'Uzt';
-$labels['aug'] = 'Abu';
-$labels['sep'] = 'Ira';
-$labels['oct'] = 'Urr';
-$labels['nov'] = 'Aza';
-$labels['dec'] = 'Abe';
-$labels['longjan'] = 'Urtarrila';
-$labels['longfeb'] = 'Otsaila';
-$labels['longmar'] = 'Martxoa';
-$labels['longapr'] = 'Apirila';
-$labels['longjun'] = 'Ekaina';
-$labels['longjul'] = 'Uztaila';
-$labels['longaug'] = 'Abuztua';
-$labels['longsep'] = 'Iraila';
-$labels['longoct'] = 'Urria';
-$labels['longnov'] = 'Azaroa';
-$labels['longdec'] = 'Abendua';
+$labels['thursday']  = 'Osteguna';
+$labels['friday']    = 'Ostirala';
+$labels['saturday']  = 'Larunbata';
+
+// months short
+$labels['jan']	= 'Urt';
+$labels['feb']	= 'Ots';
+$labels['mar']	= 'Mar';
+$labels['apr']	= 'Api';
+$labels['may']	= 'Maiatza';
+$labels['jun']	= 'Eka';
+$labels['jul'] 	= 'Uzt';
+$labels['aug']	= 'Abu';
+$labels['sep']	= 'Ira';
+$labels['oct']	= 'Urr';
+$labels['nov']	= 'Aza';
+$labels['dec']	= 'Abe';
+
+// months long
+$labels['longjan']	= 'Urtarrila';
+$labels['longfeb']	= 'Otsaila';
+$labels['longmar']	= 'Martxoa';
+$labels['longapr']	= 'Apirila';
+$labels['longmay']	= 'Maiatza';
+$labels['longjun']	= 'Ekaina';
+$labels['longjul']	= 'Uztaila';
+$labels['longaug']	= 'Abuztua';
+$labels['longsep']	= 'Iraila';
+$labels['longoct']	= 'Urria';
+$labels['longnov']	= 'Azaroa';
+$labels['longdec']	= 'Abendua';
+
 $labels['today'] = 'Gaur';
-$labels['refresh'] = 'Eguneratu';
-$labels['checkmail'] = 'Mezu berrien bila arakatu';
-$labels['compose'] = 'Mezu bat sortu';
-$labels['writenewmessage'] = 'Mezu berri bat sortu';
-$labels['reply'] = 'Erantzun';
-$labels['replytomessage'] = 'Mezuari erantzun';
+
+// toolbar buttons
+$labels['refresh']          = 'Eguneratu';
+$labels['checkmail']        = 'Mezu berrien bila arakatu';
+$labels['compose']          = 'Mezu bat sortu';
+$labels['writenewmessage']  = 'Mezu berri bat sortu';
+$labels['reply']            = 'Erantzun';
+$labels['replytomessage']   = 'Mezuari erantzun';
 $labels['replytoallmessage'] = 'Bidaltzaile eta hartzaile guztiei erantzun';
-$labels['replyall'] = 'Guztiei erantzun';
-$labels['replylist'] = 'Erantzun zerrenda';
-$labels['forward'] = 'Berbidali';
+$labels['replyall']         = 'Guztiei erantzun';
+$labels['replylist']        = 'Erantzun zerrenda';
+$labels['forward']          = 'Berbidali';
+$labels['forwardinline']    = 'Forward inline';
 $labels['forwardattachment'] = 'Erantsi gisa berbidali';
-$labels['forwardmessage'] = 'Mezua Birbidali';
-$labels['deletemessage'] = 'Mezua ezabatu';
+$labels['forwardmessage']   = 'Mezua Birbidali';
+$labels['deletemessage']    = 'Mezua ezabatu';
 $labels['movemessagetotrash'] = 'Mezua zakarrontzira mugitu';
-$labels['printmessage'] = 'Mezu hau inprimatu';
-$labels['previousmessage'] = 'Aurreko mezua ikusi';
-$labels['firstmessage'] = 'Lehenengo mezua ikusi';
-$labels['nextmessage'] = 'Hurrengo mezua ikusi';
-$labels['lastmessage'] = 'Azken mezua ikusi';
-$labels['backtolist'] = 'Mezu zerrendara itzuli';
-$labels['viewsource'] = 'Jatorria bistarazi';
-$labels['mark'] = 'Markatu';
-$labels['markmessages'] = 'Markatu mezuak';
-$labels['markread'] = 'Irakurria bezala';
-$labels['markunread'] = 'Ez-irakurria bezala';
-$labels['markflagged'] = 'Markatua bezala';
-$labels['markunflagged'] = 'Ez-markatua bezala';
-$labels['moreactions'] = 'Ekintza gehiago...';
-$labels['more'] = 'Gehiago';
-$labels['back'] = 'Atzera';
-$labels['options'] = 'Aukerak';
+$labels['printmessage']     = 'Mezu hau inprimatu';
+$labels['previousmessage']  = 'Aurreko mezua ikusi';
+$labels['firstmessage']     = 'Lehenengo mezua ikusi';
+$labels['nextmessage']      = 'Hurrengo mezua ikusi';
+$labels['lastmessage']      = 'Azken mezua ikusi';
+$labels['backtolist']       = 'Mezu zerrendara itzuli';
+$labels['viewsource']       = 'Jatorria bistarazi';
+$labels['mark']             = 'Markatu';
+$labels['markmessages']     = 'Markatu mezuak';
+$labels['markread']         = 'Irakurria bezala';
+$labels['markunread']       = 'Ez-irakurria bezala';
+$labels['markflagged']      = 'Markatua bezala';
+$labels['markunflagged']    = 'Ez-markatua bezala';
+$labels['moreactions']      = 'Ekintza gehiago...';
+$labels['more']             = 'Gehiago';
+$labels['back']             = 'Atzera';
+$labels['options']          = 'Aukerak';
+
 $labels['select'] = 'Hautatu';
 $labels['all'] = 'Denak';
 $labels['none'] = 'Bat ere ez';
-$labels['nonesort'] = 'Bat ere ez';
 $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';
+$labels['filter'] = 'Filter';
+$labels['list'] = 'List';
+$labels['threads'] = 'Threads';
+$labels['expand-all'] = 'Expand All';
+$labels['expand-unread'] = 'Expand Unread';
+$labels['collapse-all'] = 'Collapse All';
+$labels['threaded'] = 'Threaded';
+
+$labels['autoexpand_threads'] = 'Expand message threads';
+$labels['do_expand'] = 'all threads';
+$labels['expand_only_unread'] = 'only with unread messages';
+$labels['fromto'] = 'Nork/Nori';
+$labels['flag'] = 'Flag';
+$labels['attachment'] = 'Attachment';
+$labels['nonesort'] = 'Bat ere ez';
+$labels['sentdate'] = 'Sent date';
+$labels['arrival'] = 'Arrival date';
+$labels['asc'] = 'ascending';
+$labels['desc'] = 'descending';
+$labels['listcolumns'] = 'List columns';
+$labels['listsorting'] = 'Sorting column';
+$labels['listorder'] = 'Sorting order';
+$labels['listmode'] = 'List view mode';
+
+$labels['folderactions'] = 'Folder actions...';
 $labels['compact'] = 'Trinkotu';
 $labels['empty'] = 'Hustu';
+
 $labels['quota'] = 'Disko erabilera';
-$labels['unknown'] = 'ezezaguna';
-$labels['unlimited'] = 'mugagabea';
-$labels['quicksearch'] = 'Bilaketa azkarra';
-$labels['resetsearch'] = 'Bilaketa berrabiarazi';
-$labels['sendmessage'] = 'Mezua orain bidali';
-$labels['savemessage'] = 'Zirriborro hau gorde';
-$labels['addattachment'] = 'Fitxategia erantsi';
-$labels['charset'] = 'Karaktere jokoa';
-$labels['editortype'] = 'Editore mota';
-$labels['returnreceipt'] = 'Bidaltzaileari itzuli';
+$labels['unknown']  = 'ezezaguna';
+$labels['unlimited']  = 'mugagabea';
+
+$labels['quicksearch']  = 'Bilaketa azkarra';
+$labels['resetsearch']  = 'Bilaketa berrabiarazi';
+$labels['searchmod']  = 'Search modifiers';
+$labels['msgtext']  = 'Entire message';
+$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';
+$labels['send']           = 'Send';
+$labels['sendmessage']    = 'Mezua orain bidali';
+$labels['savemessage']    = 'Zirriborro hau gorde';
+$labels['addattachment']  = 'Fitxategia erantsi';
+$labels['charset']        = 'Karaktere jokoa';
+$labels['editortype']     = 'Editore mota';
+$labels['returnreceipt']  = 'Bidaltzaileari itzuli';
+$labels['dsn']            = 'Delivery status notification';
+$labels['mailreplyintro'] = 'On $date, $sender wrote:';
+$labels['originalmessage'] = 'Jatorrizko mezua';
+
+$labels['editidents']    = 'Edit identities';
+$labels['spellcheck']    = 'Spell';
 $labels['checkspelling'] = 'Egiaztaketa ortografikoa';
 $labels['resumeediting'] = 'Editatzen jarraitu';
-$labels['revertto'] = 'Itzuli hona';
+$labels['revertto']      = 'Itzuli hona';
+
+$labels['attach'] = 'Attach';
 $labels['attachments'] = 'Eranskinak';
 $labels['upload'] = 'Igo';
-$labels['close'] = 'Itxi';
-$labels['low'] = 'Baxua';
-$labels['lowest'] = 'Baxuena';
-$labels['normal'] = 'Normala';
-$labels['high'] = 'Altua';
+$labels['uploadprogress'] = '$percent ($current from $total)';
+$labels['close']  = 'Itxi';
+$labels['messageoptions']  = 'Message options...';
+
+$labels['low']     = 'Baxua';
+$labels['lowest']  = 'Baxuena';
+$labels['normal']  = 'Normala';
+$labels['high']    = 'Altua';
 $labels['highest'] = 'Altuena';
-$labels['nosubject'] = '(gairik gabea)';
+
+$labels['nosubject']  = '(gairik gabea)';
 $labels['showimages'] = 'Irudiak bistarazi';
 $labels['alwaysshow'] = 'Beti ikusi $sender -en irudiak';
+$labels['isdraft']    = 'This is a draft message.';
+$labels['andnmore']   = '$nr more...';
+$labels['togglemoreheaders'] = 'Show more message headers';
+$labels['togglefullheaders'] = 'Toggle raw message headers';
+
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Testu laua';
 $labels['savesentmessagein'] = 'Gorde mezua hemen';
 $labels['dontsave'] = 'ez gorde';
+$labels['maxuploadsize'] = 'Maximum allowed file size is $size';
+
 $labels['addcc'] = 'Gehitu Cc (kopia)';
 $labels['addbcc'] = 'Gehitu Bcc (kopia ezkutua)';
 $labels['addreplyto'] = 'Gehitu erantzun-honi';
+$labels['addfollowupto'] = 'Add Followup-To';
+
+// mdn
 $labels['mdnrequest'] = 'Mezu honen bidaltzaileak mezua irakurtzen duzunean jakinaraztea eskatu du. Bidaltzailea ohartu nahi duzu?';
 $labels['receiptread'] = 'Itzulketa agiria (irakurria)';
 $labels['yourmessage'] = 'Hau zure mezuaren Itzulketa Agiria da';
 $labels['receiptnote'] = 'Oharra: Agiri honek hartzailearen ordenagailuan mezua ikusi dala adierazten du besterik gabe. Honek ez du esan nahi hartzaileak mezua irakurri edo/eta ulertu duenik:';
-$labels['name'] = 'Izena bistarazi';
-$labels['firstname'] = 'Izena';
-$labels['surname'] = 'Abizena';
-$labels['email'] = 'ePosta';
+
+// address boook
+$labels['name']         = 'Izena bistarazi';
+$labels['firstname']    = 'Izena';
+$labels['surname']      = 'Abizena';
+$labels['middlename']   = 'Middle Name';
+$labels['nameprefix']   = 'Prefix';
+$labels['namesuffix']   = 'Suffix';
+$labels['nickname']     = 'Ezizena';
+$labels['jobtitle']     = 'Job Title';
+$labels['department']   = 'Department';
+$labels['gender']       = 'Gender';
+$labels['maidenname']   = 'Maiden Name';
+$labels['email']        = 'ePosta';
+$labels['phone']        = 'Phone';
+$labels['address']      = 'Helbidea';
+$labels['street']       = 'Kalea';
+$labels['locality']     = 'City';
+$labels['zipcode']      = 'Posta kodea';
+$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']  = 'Mugikorra';
+$labels['typemain']  = 'Main';
+$labels['typehomefax']  = 'Home Fax';
+$labels['typeworkfax']  = 'Work Fax';
+$labels['typecar']  = 'Car';
+$labels['typepager']  = 'Pager';
+$labels['typevideo']  = 'Video';
+$labels['typeassistant']  = 'Assistant';
+$labels['typehomepage']  = 'Home Page';
+$labels['typeblog'] = 'Blog';
+$labels['typeprofile'] = 'Profile';
+
+$labels['addfield'] = 'Add field...';
 $labels['addcontact'] = 'Txartel berria gehitu';
 $labels['editcontact'] = 'Txartela editatu';
-$labels['edit'] = 'Editatu';
+$labels['contacts'] = 'Contacts';
+$labels['contactproperties'] = 'Contact properties';
+$labels['personalinfo'] = 'Informazio pertsonala';
+
+$labels['edit']   = 'Editatu';
 $labels['cancel'] = 'Utzi';
-$labels['save'] = 'Gorde';
+$labels['save']   = 'Gorde';
 $labels['delete'] = 'Ezabatu';
-$labels['newcontact'] = 'Helbide liburu txartel berria sortu';
-$labels['deletecontact'] = 'Aukeraturiko txartelak ezabatu';
-$labels['composeto'] = 'Bidali mezua honi:';
+$labels['rename'] = 'Rename';
+$labels['addphoto'] = 'Add';
+$labels['replacephoto'] = 'Replace';
+$labels['uploadphoto'] = 'Upload photo';
+
+$labels['newcontact']     = 'Helbide liburu txartel berria sortu';
+$labels['deletecontact']  = 'Aukeraturiko txartelak ezabatu';
+$labels['composeto']      = 'Bidali mezua honi:';
 $labels['contactsfromto'] = '$from -tik $to -ra $count txarteletatik';
-$labels['print'] = 'Inprimatu';
-$labels['export'] = 'Esportatu';
-$labels['previouspage'] = 'Aurreko sorta ikusi';
-$labels['firstpage'] = 'Lehenengo sorta ikusi';
-$labels['nextpage'] = 'Hurrengo sorta ikusi';
-$labels['lastpage'] = 'Azken sorta ikusi';
+$labels['print']          = 'Inprimatu';
+$labels['export']         = 'Esportatu';
+$labels['exportall']      = 'Export all';
+$labels['exportsel']      = 'Export selected';
+$labels['exportvcards']   = 'Export contacts in vCard format';
+$labels['newcontactgroup'] = 'Create new contact group';
+$labels['grouprename']    = 'Rename group';
+$labels['groupdelete']    = 'Delete group';
+$labels['groupremoveselected'] = 'Remove selected contacts from group';
+
+$labels['previouspage']   = 'Aurreko sorta ikusi';
+$labels['firstpage']      = 'Lehenengo sorta ikusi';
+$labels['nextpage']       = 'Hurrengo sorta ikusi';
+$labels['lastpage']       = 'Azken sorta ikusi';
+
+$labels['group'] = 'Group';
 $labels['groups'] = 'Taldeak';
 $labels['personaladrbook'] = 'Helbide pertsonalak';
+
+$labels['searchsave'] = 'Save search';
+$labels['searchdelete'] = 'Delete search';
+
+$labels['import'] = 'Import';
+$labels['importcontacts'] = 'Import contacts';
+$labels['importfromfile'] = 'Import from file:';
+$labels['importtarget'] = 'Add new contacts to address book:';
+$labels['importreplace'] = 'Replace the entire address book';
+$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['done'] = 'Done';
+
+// settings
 $labels['settingsfor'] = 'Honen ezarpenak:';
+$labels['about'] = 'About';
 $labels['preferences'] = 'Hobespenak';
 $labels['userpreferences'] = 'Erabiltzaile hobespenak';
 $labels['editpreferences'] = 'Erabiltzaile hobespenak editatu';
+
 $labels['identities'] = 'Identitateak';
 $labels['manageidentities'] = 'Kontu honetako identitateak kudeatu';
 $labels['newidentity'] = 'Identitate berria';
+
 $labels['newitem'] = 'Elementu berria';
 $labels['edititem'] = 'Elementua Editatu';
+
 $labels['preferhtml'] = 'HTML nahiago';
+$labels['defaultcharset'] = 'Default Character Set';
 $labels['htmlmessage'] = 'HTML Mezua';
+$labels['messagepart'] = 'Part';
+$labels['digitalsig'] = 'Digital Signature';
+$labels['dateformat'] = 'Date format';
+$labels['timeformat'] = 'Time format';
 $labels['prettydate'] = 'Data politak';
-$labels['setdefault'] = 'Lehenespenak ezarri';
-$labels['language'] = 'Hizkuntza';
-$labels['timezone'] = 'Ordu zonaldea';
-$labels['pagesize'] = 'Lerro orrialdeko';
+$labels['setdefault']  = 'Lehenespenak ezarri';
+$labels['autodetect']  = 'Auto';
+$labels['language']  = 'Hizkuntza';
+$labels['timezone']  = 'Ordu zonaldea';
+$labels['pagesize']  = 'Lerro orrialdeko';
 $labels['signature'] = 'Sinadura';
-$labels['dstactive'] = 'Eguneko gordeketak';
+$labels['dstactive']  = 'Eguneko gordeketak';
+$labels['showinextwin'] = 'Open message in a new window';
+$labels['composeextwin'] = 'Compose in a new window';
 $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';
@@ -221,23 +413,126 @@ $labels['mailboxview'] = 'Postakutxatilaren ikuspegia';
 $labels['mdnrequests'] = 'Bidaltzailearen jakinarazpena';
 $labels['askuser'] = 'galdetu erabiltzaileari';
 $labels['autosend'] = 'bidali automatikoki';
+$labels['autosendknown'] = 'send receipt to my contacts, otherwise ask me';
+$labels['autosendknownignore'] = 'send receipt to my contacts, otherwise ignore';
 $labels['ignore'] = 'ezikusi';
 $labels['readwhendeleted'] = 'Markatu mezua irakurrita bezala ezabatzerakoan';
 $labels['flagfordeletion'] = 'Markatu mezua ezabatzeko ezabatu beharrean';
+$labels['skipdeleted'] = 'Do not show deleted messages';
+$labels['deletealways'] = 'If moving messages to Trash fails, delete them';
+$labels['deletejunk'] = 'Directly delete messages in Junk';
+$labels['showremoteimages'] = 'Display remote inline images';
+$labels['fromknownsenders'] = 'from known senders';
+$labels['always'] = 'always';
 $labels['showinlineimages'] = 'Erakutsi erantzitako irudiak mezuaren azpian';
-$labels['autosavedraft'] = 'Zirriborroa automatikoki gorde';
-$labels['never'] = 'inoiz ez';
+$labels['autosavedraft']  = 'Zirriborroa automatikoki gorde';
+$labels['everynminutes']  = 'every $n minute(s)';
+$labels['refreshinterval']  = 'Refresh (check for new messages, etc.)';
+$labels['never']  = 'inoiz ez';
+$labels['immediately']  = 'immediately';
 $labels['messagesdisplaying'] = 'Mezuak ikusi';
 $labels['messagescomposition'] = 'Mezuak sortu';
-$labels['folder'] = 'Karpeta';
-$labels['foldername'] = 'Karpeta izena';
-$labels['subscribed'] = 'Harpideturik';
+$labels['mimeparamfolding'] = 'Attachment names';
+$labels['2231folding'] = 'Full RFC 2231 (Thunderbird)';
+$labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
+$labels['2047folding'] = 'Full RFC 2047 (other)';
+$labels['force7bit'] = 'Use MIME encoding for 8-bit characters';
+$labels['advancedoptions'] = 'Advanced options';
+$labels['focusonnewmessage'] = 'Focus browser window on new message';
+$labels['checkallfolders'] = 'Check all folders for new messages';
+$labels['displaynext'] = 'After message delete/move display the next message';
+$labels['defaultfont'] = 'Default font of HTML message';
+$labels['mainoptions'] = 'Main Options';
+$labels['browseroptions'] = 'Browser Options';
+$labels['section'] = 'Section';
+$labels['maintenance'] = 'Maintenance';
+$labels['newmessage'] = 'New Message';
+$labels['signatureoptions'] = 'Signature Options';
+$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'] = 'Automatically add signature';
+$labels['newmessageonly'] = 'new message only';
+$labels['replyandforwardonly'] = 'replies and forwards only';
+$labels['insertsignature'] = 'Insert signature';
+$labels['previewpanemarkread']  = 'Mark previewed messages as read';
+$labels['afternseconds']  = 'after $n seconds';
+$labels['reqmdn'] = 'Always request a return receipt';
+$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'] = 'Check spelling before sending a message';
+$labels['spellcheckoptions'] = 'Spellcheck Options';
+$labels['spellcheckignoresyms'] = 'Ignore words with symbols';
+$labels['spellcheckignorenums'] = 'Ignore words with numbers';
+$labels['spellcheckignorecaps'] = 'Ignore words with all letters capitalized';
+$labels['addtodict'] = 'Add to dictionary';
+$labels['mailtoprotohandler'] = 'Register protocol handler for mailto: links';
+$labels['forwardmode'] = 'Messages forwarding';
+$labels['inline'] = 'inline';
+$labels['asattachment'] = 'as attachment';
+
+$labels['folder']  = 'Karpeta';
+$labels['folders']  = 'Karpetak';
+$labels['foldername']  = 'Karpeta izena';
+$labels['subscribed']  = 'Harpideturik';
 $labels['messagecount'] = 'Mezuak';
-$labels['create'] = 'Sortu';
-$labels['createfolder'] = 'Karpeta berria sortu';
-$labels['managefolders'] = 'Karpeta kudeaketa';
+$labels['create']  = 'Sortu';
+$labels['createfolder']  = 'Karpeta berria sortu';
+$labels['managefolders']  = 'Karpeta kudeaketa';
 $labels['specialfolders'] = 'Karpeta bereziak';
+$labels['properties'] = 'Properties';
+$labels['folderproperties'] = 'Folder properties';
+$labels['parentfolder'] = 'Parent folder';
+$labels['location'] = 'Location';
+$labels['info'] = 'Information';
+$labels['getfoldersize'] = 'Click to get folder size';
+$labels['changesubscription'] = 'Click to change subscription';
+$labels['foldertype'] = 'Folder Type';
+$labels['personalfolder']  = 'Private Folder';
+$labels['otherfolder']  = 'Other User\'s Folder';
+$labels['sharedfolder']  = 'Public Folder';
+
 $labels['sortby'] = 'Honela ordenatu';
-$labels['sortasc'] = 'Goraka ordenatu';
+$labels['sortasc']  = 'Goraka ordenatu';
 $labels['sortdesc'] = 'Beheraka ordenatu';
+$labels['undo'] = 'Undo';
+
+$labels['installedplugins'] = 'Installed plugins';
+$labels['plugin'] = 'Plugin';
+$labels['version'] = 'Version';
+$labels['source'] = 'Source';
+$labels['license'] = 'License';
+$labels['support'] = 'Get support';
+
+// units
+$labels['B'] = 'B';
+$labels['KB'] = 'KB';
+$labels['MB'] = 'MB';
+$labels['GB'] = 'GB';
+
+// character sets
+$labels['unicode'] = 'Unicode';
+$labels['english'] = '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['turkish'] = 'Turkish';
+$labels['nordic'] = 'Nordic';
+$labels['thai'] = 'Thai';
+$labels['celtic'] = 'Celtic';
+$labels['vietnamese'] = 'Vietnamese';
+$labels['japanese'] = 'Japanese';
+$labels['korean'] = 'Korean';
+$labels['chinese'] = 'Chinese';
 
+?>
diff --git a/program/localization/eu_ES/messages.inc b/program/localization/eu_ES/messages.inc
index cbfe908bb..a3985b233 100644
--- a/program/localization/eu_ES/messages.inc
+++ b/program/localization/eu_ES/messages.inc
@@ -2,27 +2,43 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/eu_ES/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['loginfailed'] = 'Saio sarrerak huts egin du';
+$messages['errortitle']  = 'An error occurred!';
+$messages['loginfailed']  = 'Saio sarrerak huts egin du';
 $messages['cookiesdisabled'] = 'Zure nabigatzaileak ez ditu cookie-ak onartzen';
 $messages['sessionerror'] = 'Zure saioa baliogabea da edo iraungita dago';
 $messages['storageerror'] = 'Huts IMAP zerbitzarira konektatzean';
+$messages['servererror'] = 'Server Error!';
+$messages['servererrormsg'] = 'Server Error: $msg';
+$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';
 $messages['loggedout'] = 'Saioa behar bezala amaitu duzu. Agur!';
 $messages['mailboxempty'] = 'Posta kutxa hutsik dago';
+$messages['refreshing'] = 'Refreshing...';
 $messages['loading'] = 'Kargatzen...';
+$messages['uploading'] = 'Uploading file...';
+$messages['uploadingmany'] = 'Uploading files...';
 $messages['loadingdata'] = 'Datuak kargatzen...';
 $messages['checkingmail'] = 'Mezu berrien bila arakatzen...';
 $messages['sendingmessage'] = 'Mezua bidaltzen...';
@@ -32,35 +48,54 @@ $messages['messagesaved'] = 'Mezua zirriborroetan gordea';
 $messages['successfullysaved'] = 'Behar bezala gorde da';
 $messages['addedsuccessfully'] = 'Txartela behar bezala gehitu da helbide liburura';
 $messages['contactexists'] = 'ePosta honetako txartel bat badago dagoeneko';
+$messages['contactnameexists'] = 'A contact with the same name already exists.';
 $messages['blockedimages'] = 'Zure pribazitatea mantentzeko urruneko irudiak blokeatu egin dira.';
 $messages['encryptedmessage'] = 'Hau enkriptaturiko mezu bat da eta ezin da bistarazi. Barkatu!';
 $messages['nocontactsfound'] = 'Ez da txartelik aurkitu';
 $messages['contactnotfound'] = 'Eskatutako txartela ez da aurkitu';
+$messages['contactsearchonly'] = 'Enter some search terms to find contacts';
 $messages['sendingfailed'] = 'Huts mezua bidaltzerakoan';
+$messages['senttooquickly'] = 'Please wait $sec sec(s). before sending this message.';
 $messages['errorsavingsent'] = 'Errorea gertatu da bidalitako mezua gordetzean';
 $messages['errorsaving'] = 'Errore bat gertatu da gordetzean';
 $messages['errormoving'] = 'Ezin da mezua mugitu';
+$messages['errorcopying'] = 'Could not copy the message(s).';
 $messages['errordeleting'] = 'Ezin da mezua ezabatu';
-$messages['deletecontactconfirm'] = 'Benetan hautaturiko kontaktuak ezabatu nahi dituzula?';
+$messages['errormarking'] = 'Could not mark the message(s).';
+$messages['deletecontactconfirm']  = 'Benetan hautaturiko kontaktuak ezabatu nahi dituzula?';
+$messages['deletegroupconfirm']  = 'Do you really want to delete selected group?';
 $messages['deletemessagesconfirm'] = 'Benetan hautaturiko mezuak ezabatu nahi dituzula?';
-$messages['deletefolderconfirm'] = 'Benetan Karpeta hau ezabatu nahi duzu?';
-$messages['purgefolderconfirm'] = 'Benetan karpeta honetako mezu guziak ezabatu nahi dituzu?';
+$messages['deletefolderconfirm']  = 'Benetan Karpeta hau ezabatu nahi duzu?';
+$messages['purgefolderconfirm']  = 'Benetan karpeta honetako mezu guziak ezabatu nahi dituzu?';
+$messages['contactdeleting'] = 'Deleting contact(s)...';
+$messages['groupdeleting'] = 'Deleting group...';
+$messages['folderdeleting'] = 'Deleting folder...';
+$messages['foldermoving'] = 'Moving folder...';
+$messages['foldersubscribing'] = 'Subscribing folder...';
+$messages['folderunsubscribing'] = 'Unsubscribing folder...';
 $messages['formincomplete'] = 'Inprimakia ez guztiz bete';
 $messages['noemailwarning'] = 'Mesedez idatzi baliozko eposta helbide bat';
-$messages['nonamewarning'] = 'Mesedez izen bat idatzi';
+$messages['nonamewarning']  = 'Mesedez izen bat idatzi';
 $messages['nopagesizewarning'] = 'Mesedez paper tamaina idatzi';
+$messages['nosenderwarning'] = 'Please enter sender e-mail address.';
 $messages['norecipientwarning'] = 'Mesedez behintzat hartzaile bat idatzi';
-$messages['nosubjectwarning'] = '"Gaia" eremua hutsik dago. Bat idatzi nahi al duzu?';
+$messages['nosubjectwarning']  = '"Gaia" eremua hutsik dago. Bat idatzi nahi al duzu?';
 $messages['nobodywarning'] = 'Testu gabeko mezu hau bidali?';
 $messages['notsentwarning'] = 'Mezua ez da bidali. Mezua ezeztatu nahi al duzu?';
 $messages['noldapserver'] = 'Mesedez hautatu bilaketa egiteko LDAP zerbitzari bat';
 $messages['nosearchname'] = 'Mesedez idatzi kontaktu izen bat edo eposta helbide bat';
+$messages['notuploadedwarning'] = 'Not all attachments have been uploaded yet. Please wait or cancel the upload.';
 $messages['searchsuccessful'] = '$nr mezu aurkiturik';
+$messages['contactsearchsuccessful'] = '$nr contacts found.';
 $messages['searchnomatch'] = 'Bilaketak ez du emaitzarik itzuli';
 $messages['searching'] = 'Bilatzen...';
 $messages['checking'] = 'Arakatzen...';
 $messages['nospellerrors'] = 'Ez da ortografia errorerik aurkitu';
 $messages['folderdeleted'] = 'Karpeta behar bezala ezabatu da';
+$messages['foldersubscribed'] = 'Folder successfully subscribed.';
+$messages['folderunsubscribed'] = 'Folder successfully unsubscribed.';
+$messages['folderpurged'] = 'Folder has successfully been emptied.';
+$messages['folderexpunged'] = 'Folder has successfully been compacted.';
 $messages['deletedsuccessfully'] = 'Behar bezala ezabatu da';
 $messages['converting'] = 'Mezuaren formatua ezabatzen';
 $messages['messageopenerror'] = 'Ezin da zerbitzaritik mezua kargatu';
@@ -71,8 +106,66 @@ $messages['copyerror'] = 'Ezin da helbiderik kopiatu';
 $messages['sourceisreadonly'] = 'Helbide iturburua irakurtzeko soilik da';
 $messages['errorsavingcontact'] = 'Ezin da kontaktuaren helbidea gorde';
 $messages['movingmessage'] = 'Mezua mugitzen...';
+$messages['copyingmessage'] = 'Copying message(s)...';
+$messages['copyingcontact'] = 'Copying contact(s)...';
+$messages['deletingmessage'] = 'Deleting message(s)...';
+$messages['markingmessage'] = 'Marking message(s)...';
+$messages['addingmember'] = 'Adding contact(s) to the group...';
+$messages['removingmember'] = 'Removing contact(s) from the group...';
 $messages['receiptsent'] = 'Ondo bidalia irakurritako agiria';
 $messages['errorsendingreceipt'] = 'Ezin da agiria bidali';
+$messages['deleteidentityconfirm'] = 'Do you really want to delete this identity?';
 $messages['nodeletelastidentity'] = 'Ezin da izaera hau ezabatu, zure bakarra da';
 $messages['forbiddencharacter'] = 'Karpeta izenak debekatutako karaktereak ditu';
+$messages['selectimportfile'] = 'Please select a file to upload.';
+$messages['addresswriterror'] = 'The selected address book is not writeable.';
+$messages['contactaddedtogroup'] = 'Successfully added the contacts to this group.';
+$messages['contactremovedfromgroup'] = 'Successfully removed contacts from this group.';
+$messages['nogroupassignmentschanged'] = 'No group assignments changed.';
+$messages['importwait'] = 'Importing, please wait...';
+$messages['importformaterror'] = 'Import failed! The uploaded file is not a valid import data file.';
+$messages['importconfirm'] = '<b>Successfully imported $inserted contacts</b>';
+$messages['importconfirmskipped'] = '<b>Skipped $skipped existing entries</b>';
+$messages['opnotpermitted'] = 'Operation not permitted!';
+$messages['nofromaddress'] = 'Missing e-mail address in selected identity.';
+$messages['editorwarning'] = 'Switching to the plain text editor will cause all text formatting to be lost. Do you wish to continue?';
+$messages['httpreceivedencrypterror'] = 'A fatal configuration error occurred. Contact your administrator immediately. <b>Your message can not be sent.</b>';
+$messages['smtpconnerror'] = 'SMTP Error ($code): Connection to server failed.';
+$messages['smtpautherror'] = 'SMTP Error ($code): Authentication failed.';
+$messages['smtpfromerror'] = 'SMTP Error ($code): Failed to set sender "$from" ($msg).';
+$messages['smtptoerror'] = 'SMTP Error ($code): Failed to add recipient "$to" ($msg).';
+$messages['smtprecipientserror'] = 'SMTP Error: Unable to parse recipients list.';
+$messages['smtperror'] = 'SMTP Error: $msg';
+$messages['emailformaterror'] = 'Invalid e-mail address: $email';
+$messages['toomanyrecipients'] = 'Too many recipients. Reduce the number of recipients to $max.';
+$messages['maxgroupmembersreached'] = 'The number of group members exceeds the maximum of $max.';
+$messages['internalerror'] = 'An internal error occured. Please try again.';
+$messages['contactdelerror'] = 'Could not delete contact(s).';
+$messages['contactdeleted'] = 'Contact(s) deleted successfully.';
+$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.';
 
+?>
diff --git a/program/localization/fa_AF/labels.inc b/program/localization/fa_AF/labels.inc
index 09f672134..70113bc49 100644
--- a/program/localization/fa_AF/labels.inc
+++ b/program/localization/fa_AF/labels.inc
@@ -2,52 +2,78 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/fa_AF/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = 'به اين پروژه خوش امديد';
-$labels['username'] = 'نام کاربر';
-$labels['password'] = 'شفر';
-$labels['server'] = 'سرور';
-$labels['login'] = 'داخل شدن';
-$labels['logout'] = 'خروج';
-$labels['mail'] = 'ايميل';
+
+// login page
+$labels['welcome']   = 'به اين پروژه خوش امديد';
+$labels['username']  = 'نام کاربر';
+$labels['password']  = 'شفر';
+$labels['server']    = 'سرور';
+$labels['login']     = 'داخل شدن';
+
+// taskbar
+$labels['logout']   = 'خروج';
+$labels['mail']     = 'ايميل';
 $labels['settings'] = 'تنظیمات شخصی';
 $labels['addressbook'] = 'کتاب ادرس';
-$labels['inbox'] = 'نامه های ارسالي';
+
+// mailbox names
+$labels['inbox']  = 'نامه های ارسالي';
 $labels['drafts'] = 'نامه های ناتکمیل';
-$labels['sent'] = 'ارسال شده';
-$labels['trash'] = 'اشغال دانی';
-$labels['junk'] = 'بیکاره';
+$labels['sent']   = 'ارسال شده';
+$labels['trash']  = 'اشغال دانی';
+$labels['junk']   = 'بیکاره';
+
+// message listing
 $labels['subject'] = 'مضمون';
-$labels['from'] = 'ارسال کننده';
-$labels['to'] = 'ګيرينده';
-$labels['cc'] = 'تکثیر';
-$labels['bcc'] = 'تکثیر پنهان';
+$labels['from']    = 'ارسال کننده';
+$labels['sender']  = 'Sender';
+$labels['to']      = 'ګيرينده';
+$labels['cc']      = 'تکثیر';
+$labels['bcc']     = 'تکثیر پنهان';
 $labels['replyto'] = 'جواب نامه';
-$labels['date'] = 'تاريخ';
-$labels['size'] = 'اندازه';
+$labels['followupto'] = 'Followup-To';
+$labels['date']    = 'تاريخ';
+$labels['size']    = 'اندازه';
 $labels['priority'] = 'اولویت';
 $labels['organization'] = 'تنظیمات';
+$labels['readstatus'] = 'Read status';
+$labels['listoptions'] = 'List options...';
+
 $labels['mailboxlist'] = 'پوشه ها';
-$labels['folders'] = 'پوشه ها';
 $labels['messagesfromto'] = 'از  مقدار پيغام به مقدار حساب شده';
+$labels['threadsfromto'] = 'Threads $from to $to of $count';
 $labels['messagenrof'] = 'از شمار پيغام های حساب شده';
-$labels['copy'] = 'تکثیر';
-$labels['moveto'] = 'انتقال بدهید به ...';
+$labels['fromtoshort'] = '$from – $to of $count';
+
+$labels['copy']     = 'تکثیر';
+$labels['move']     = 'Move';
+$labels['moveto']   = 'انتقال بدهید به ...';
 $labels['download'] = 'داونلود کردن';
+$labels['open']     = 'Open';
+$labels['showattachment'] = 'Show';
+$labels['showanyway'] = 'Show it anyway';
+
 $labels['filename'] = 'نام فايل';
 $labels['filesize'] = 'اندازه فايل';
+
 $labels['addtoaddressbook'] = 'در کتاب ادرس علاوه نماييد';
+
+// weekdays short
 $labels['sun'] = 'يکشنپبه';
 $labels['mon'] = 'دوشنبه';
 $labels['tue'] = 'سه شنبه';
@@ -55,155 +81,328 @@ $labels['wed'] = 'چهارشنبه';
 $labels['thu'] = 'پنج شنبه';
 $labels['fri'] = 'جمعه';
 $labels['sat'] = 'شنبه';
-$labels['sunday'] = 'يکشنبه';
-$labels['monday'] = 'دوشنبه';
-$labels['tuesday'] = 'سه شنبه';
+
+// weekdays long
+$labels['sunday']    = 'يکشنبه';
+$labels['monday']    = 'دوشنبه';
+$labels['tuesday']   = 'سه شنبه';
 $labels['wednesday'] = 'چهارشنبه';
-$labels['thursday'] = 'پنج شنبه';
-$labels['friday'] = 'جمعه';
-$labels['saturday'] = 'شنبه';
-$labels['jan'] = 'جنوری';
-$labels['feb'] = 'فبروری';
-$labels['mar'] = 'مارچ';
-$labels['apr'] = 'اپریل';
-$labels['may'] = 'می';
-$labels['longmay'] = 'می';
-$labels['jun'] = 'جون';
-$labels['jul'] = 'جولایی';
-$labels['aug'] = 'آگست';
-$labels['sep'] = 'سپتمبر';
-$labels['oct'] = 'اکتوبر';
-$labels['nov'] = 'نومبر';
-$labels['dec'] = 'دسمبر';
-$labels['longjan'] = 'جنوری';
-$labels['longfeb'] = 'فبروری';
-$labels['longmar'] = 'مارچ';
-$labels['longapr'] = 'اپریل';
-$labels['longjun'] = 'جون';
-$labels['longjul'] = 'جولایی';
-$labels['longaug'] = 'آگست';
-$labels['longsep'] = 'سپتمبر';
-$labels['longoct'] = 'اکتوبر';
-$labels['longnov'] = 'نومبر';
-$labels['longdec'] = 'دسمبر';
+$labels['thursday']  = 'پنج شنبه';
+$labels['friday']    = 'جمعه';
+$labels['saturday']  = 'شنبه';
+
+// months short
+$labels['jan']	= 'جنوری';
+$labels['feb']	= 'فبروری';
+$labels['mar']	= 'مارچ';
+$labels['apr']	= 'اپریل';
+$labels['may']	= 'می';
+$labels['jun']	= 'جون';
+$labels['jul'] 	= 'جولایی';
+$labels['aug']	= 'آگست';
+$labels['sep']	= 'سپتمبر';
+$labels['oct']	= 'اکتوبر';
+$labels['nov']	= 'نومبر';
+$labels['dec']	= 'دسمبر';
+
+// months long
+$labels['longjan']	= 'جنوری';
+$labels['longfeb']	= 'فبروری';
+$labels['longmar']	= 'مارچ';
+$labels['longapr']	= 'اپریل';
+$labels['longmay']	= 'می';
+$labels['longjun']	= 'جون';
+$labels['longjul']	= 'جولایی';
+$labels['longaug']	= 'آگست';
+$labels['longsep']	= 'سپتمبر';
+$labels['longoct']	= 'اکتوبر';
+$labels['longnov']	= 'نومبر';
+$labels['longdec']	= 'دسمبر';
+
 $labels['today'] = 'امروز';
-$labels['checkmail'] = 'بررسي کردن پيغام های جديد';
-$labels['compose'] = 'نوشتن پیام حدید';
-$labels['writenewmessage'] = 'ساختن پيغام جديد';
-$labels['replytomessage'] = 'جواب دادن به پيغام';
+
+// toolbar buttons
+$labels['refresh']          = 'Refresh';
+$labels['checkmail']        = 'بررسي کردن پيغام های جديد';
+$labels['compose']          = 'نوشتن پیام حدید';
+$labels['writenewmessage']  = 'ساختن پيغام جديد';
+$labels['reply']            = 'Reply';
+$labels['replytomessage']   = 'جواب دادن به پيغام';
 $labels['replytoallmessage'] = 'به فرستنده و تمام گيرينده ها جواب بدهيد';
-$labels['forwardmessage'] = 'فرستادن این پیام به دیگران / فارورد';
-$labels['deletemessage'] = 'حذف کردن پيغام';
+$labels['replyall']         = 'Reply all';
+$labels['replylist']        = 'Reply list';
+$labels['forward']          = 'Forward';
+$labels['forwardinline']    = 'Forward inline';
+$labels['forwardattachment'] = 'Forward as attachment';
+$labels['forwardmessage']   = 'فرستادن این پیام به دیگران / فارورد';
+$labels['deletemessage']    = 'حذف کردن پيغام';
 $labels['movemessagetotrash'] = 'پيغام را به اشيآيي حذف شده منتقل نماييد';
-$labels['printmessage'] = 'اين پيغام را چاپ کنيد';
-$labels['previousmessage'] = 'پيغام قبلي را نشان دهيد';
-$labels['firstmessage'] = 'پيغام اولي را نشان دهيد';
-$labels['nextmessage'] = 'پيغام بعدي رانشان دهيد';
-$labels['lastmessage'] = 'پيغام اخير را نشان دهيد';
-$labels['backtolist'] = 'بازگشتن به لست پيغام';
-$labels['viewsource'] = 'منبع / کود را نشان دهيد';
-$labels['markmessages'] = 'پيغام ها را نشاني کنيد';
-$labels['markread'] = 'مانند خوانده شده';
-$labels['markunread'] = 'مانند خوانده نشده';
-$labels['markflagged'] = 'مانند نشانی شده';
-$labels['markunflagged'] = 'مانند نشانی ناشده';
+$labels['printmessage']     = 'اين پيغام را چاپ کنيد';
+$labels['previousmessage']  = 'پيغام قبلي را نشان دهيد';
+$labels['firstmessage']     = 'پيغام اولي را نشان دهيد';
+$labels['nextmessage']      = 'پيغام بعدي رانشان دهيد';
+$labels['lastmessage']      = 'پيغام اخير را نشان دهيد';
+$labels['backtolist']       = 'بازگشتن به لست پيغام';
+$labels['viewsource']       = 'منبع / کود را نشان دهيد';
+$labels['mark']             = 'Mark';
+$labels['markmessages']     = 'پيغام ها را نشاني کنيد';
+$labels['markread']         = 'مانند خوانده شده';
+$labels['markunread']       = 'مانند خوانده نشده';
+$labels['markflagged']      = 'مانند نشانی شده';
+$labels['markunflagged']    = 'مانند نشانی ناشده';
+$labels['moreactions']      = 'More actions...';
+$labels['more']             = 'More';
+$labels['back']             = 'Back';
+$labels['options']          = 'Options';
+
 $labels['select'] = 'انتخاب کردن';
 $labels['all'] = 'تمام';
 $labels['none'] = 'هيچ کدام';
-$labels['nonesort'] = 'هيچ کدام';
+$labels['currpage'] = 'Current page';
 $labels['unread'] = 'ناخوانده';
 $labels['flagged'] = 'نشانی شده';
 $labels['unanswered'] = 'پیامهای جواب نداده شده';
+$labels['withattachment'] = 'With attachment';
+$labels['deleted'] = 'Deleted';
+$labels['undeleted'] = 'Not deleted';
+$labels['invert'] = 'Invert';
 $labels['filter'] = 'تصفیه کردن';
+$labels['list'] = 'List';
+$labels['threads'] = 'Threads';
+$labels['expand-all'] = 'Expand All';
+$labels['expand-unread'] = 'Expand Unread';
+$labels['collapse-all'] = 'Collapse All';
+$labels['threaded'] = 'Threaded';
+
+$labels['autoexpand_threads'] = 'Expand message threads';
+$labels['do_expand'] = 'all threads';
+$labels['expand_only_unread'] = 'only with unread messages';
+$labels['fromto'] = 'From/To';
+$labels['flag'] = 'Flag';
+$labels['attachment'] = 'Attachment';
+$labels['nonesort'] = 'هيچ کدام';
+$labels['sentdate'] = 'Sent date';
+$labels['arrival'] = 'Arrival date';
+$labels['asc'] = 'ascending';
+$labels['desc'] = 'descending';
+$labels['listcolumns'] = 'List columns';
+$labels['listsorting'] = 'Sorting column';
+$labels['listorder'] = 'Sorting order';
+$labels['listmode'] = 'List view mode';
+
+$labels['folderactions'] = 'Folder actions...';
 $labels['compact'] = 'خلاصه';
 $labels['empty'] = 'خالي';
+
 $labels['quota'] = '‌طريقه استعمال ديسک';
-$labels['unknown'] = 'نامعلوم';
-$labels['unlimited'] = 'نامعين/ نامحدود';
-$labels['quicksearch'] = 'جستجوی سریع';
-$labels['resetsearch'] = 'بازنشاندن جستجو';
+$labels['unknown']  = 'نامعلوم';
+$labels['unlimited']  = 'نامعين/ نامحدود';
+
+$labels['quicksearch']  = 'جستجوی سریع';
+$labels['resetsearch']  = 'بازنشاندن جستجو';
+$labels['searchmod']  = 'Search modifiers';
+$labels['msgtext']  = 'Entire message';
+$labels['body']  = 'Body';
+
 $labels['openinextwin'] = 'در پینجره ای جدید باز کنید';
-$labels['sendmessage'] = 'پيغام را همين حالا ارسال کنيد';
-$labels['savemessage'] = 'این پیش نویس را حفظ نمایید';
-$labels['addattachment'] = 'ضميمه نمودن يک فايل';
-$labels['charset'] = 'ست کرکتر ها';
-$labels['editortype'] = 'روش تصحیح کننده / نوشتاری';
-$labels['returnreceipt'] = 'رسید برای مراجعت نامه';
+$labels['emlsave'] = 'Download (.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['addattachment']  = 'ضميمه نمودن يک فايل';
+$labels['charset']        = 'ست کرکتر ها';
+$labels['editortype']     = 'روش تصحیح کننده / نوشتاری';
+$labels['returnreceipt']  = 'رسید برای مراجعت نامه';
+$labels['dsn']            = 'Delivery status notification';
+$labels['mailreplyintro'] = 'On $date, $sender wrote:';
+$labels['originalmessage'] = 'Original Message';
+
+$labels['editidents']    = 'Edit identities';
+$labels['spellcheck']    = 'Spell';
 $labels['checkspelling'] = 'املا را بررسي کنيد';
 $labels['resumeediting'] = 'ادامه / بازگشت به تصحیی کردن / نوشتن';
-$labels['revertto'] = 'رجوع کردن به';
+$labels['revertto']      = 'رجوع کردن به';
+
+$labels['attach'] = 'Attach';
 $labels['attachments'] = 'ضميمه ها';
 $labels['upload'] = 'اپلود کردن';
-$labels['close'] = 'بستن';
-$labels['low'] = 'کم';
-$labels['lowest'] = 'کمترین';
-$labels['normal'] = 'عادی';
-$labels['high'] = 'عالي';
+$labels['uploadprogress'] = '$percent ($current from $total)';
+$labels['close']  = 'بستن';
+$labels['messageoptions']  = 'Message options...';
+
+$labels['low']     = 'کم';
+$labels['lowest']  = 'کمترین';
+$labels['normal']  = 'عادی';
+$labels['high']    = 'عالي';
 $labels['highest'] = 'عاليترين';
-$labels['nosubject'] = 'مضمون ندارد';
+
+$labels['nosubject']  = 'مضمون ندارد';
 $labels['showimages'] = 'نمايش دادن تصاوير';
 $labels['alwaysshow'] = 'همیشه نشان بده تصاویر را از این فرسیتنده﷼';
+$labels['isdraft']    = 'This is a draft message.';
+$labels['andnmore']   = '$nr more...';
+$labels['togglemoreheaders'] = 'Show more message headers';
+$labels['togglefullheaders'] = 'Toggle raw message headers';
+
 $labels['htmltoggle'] = 'ایچ تی ام ایل';
 $labels['plaintoggle'] = 'متن ساده';
 $labels['savesentmessagein'] = 'پیام ارسال شده را ذخیره کن در';
 $labels['dontsave'] = 'ذخیره نکنید';
 $labels['maxuploadsize'] = '$sizeزیاد ترین اندازه اجازه داده شده فایل عبارت است از';
+
 $labels['addcc'] = 'نسخیه دوم  را علاوه کنید';
 $labels['addbcc'] = 'نسخه پنهان را علاوه کنید';
 $labels['addreplyto'] = 'علاوه کردن';
+$labels['addfollowupto'] = 'Add Followup-To';
+
+// mdn
 $labels['mdnrequest'] = 'فرستانده این پیام خواهش نموده زمانیکه شما نامه را خواندید براش آگاهی داده شود آيا شما ميخواهيد که فرستنده را آګاه سازيد';
 $labels['receiptread'] = 'بازگشت رسید (خوانده شده)';
 $labels['yourmessage'] = 'برای پيغام شما اين يک رسید بازگشت است';
 $labels['receiptnote'] = 'يادداشت : اين رسيد شما را فقط اګاه ميسازد که پيغام به کامپیوتر گیرنده نمایش داده شده است  هیچ گارنتی وجود ندارد که گیرنده پیام این پیام را خوانده و یا مطالب آن را درک کرده باشد.';
-$labels['name'] = 'نشان دادن نام';
-$labels['firstname'] = 'اسم/ نام';
-$labels['surname'] = 'اسم فاميلي / تخلص';
-$labels['email'] = 'ايميل';
+
+// address boook
+$labels['name']         = 'نشان دادن نام';
+$labels['firstname']    = 'اسم/ نام';
+$labels['surname']      = 'اسم فاميلي / تخلص';
+$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['email']        = 'ايميل';
+$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['typepager']  = 'Pager';
+$labels['typevideo']  = 'Video';
+$labels['typeassistant']  = 'Assistant';
+$labels['typehomepage']  = 'Home Page';
+$labels['typeblog'] = 'Blog';
+$labels['typeprofile'] = 'Profile';
+
+$labels['addfield'] = 'Add field...';
 $labels['addcontact'] = 'آدرس جديد را علاوه کنيد';
 $labels['editcontact'] = 'آدرس جدید را تصحیح کنید';
-$labels['edit'] = 'تصحيح کردن';
+$labels['contacts'] = 'Contacts';
+$labels['contactproperties'] = 'Contact properties';
+$labels['personalinfo'] = 'Personal information';
+
+$labels['edit']   = 'تصحيح کردن';
 $labels['cancel'] = 'لغو کردن/ حذف کردن';
-$labels['save'] = 'حفظ کردن';
+$labels['save']   = 'حفظ کردن';
 $labels['delete'] = 'حذف کردن';
-$labels['newcontact'] = 'کارت تماس جديد را بسازيد';
-$labels['deletecontact'] = 'آدرس های انتخاب شده را حذف کنيد';
-$labels['composeto'] = 'ايمیل را نوشته کنيد به';
+$labels['rename'] = 'Rename';
+$labels['addphoto'] = 'Add';
+$labels['replacephoto'] = 'Replace';
+$labels['uploadphoto'] = 'Upload photo';
+
+$labels['newcontact']     = 'کارت تماس جديد را بسازيد';
+$labels['deletecontact']  = 'آدرس های انتخاب شده را حذف کنيد';
+$labels['composeto']      = 'ايمیل را نوشته کنيد به';
 $labels['contactsfromto'] = 'از$count$to به $from آدرس ها از';
-$labels['print'] = 'چاپ کردن';
-$labels['export'] = 'صادر کردن';
-$labels['exportvcards'] = 'صادر نماییدVcardآدرس ها را به فرمت';
-$labels['previouspage'] = 'بسته قبلي را نشان دهيد';
-$labels['firstpage'] = 'بسته اولي را نشان دهيد';
-$labels['nextpage'] = 'بسته بعدي را نشان دهيد';
-$labels['lastpage'] = 'بسته اخير را نشان دهيد';
+$labels['print']          = 'چاپ کردن';
+$labels['export']         = 'صادر کردن';
+$labels['exportall']      = 'Export all';
+$labels['exportsel']      = 'Export selected';
+$labels['exportvcards']   = 'صادر نماییدVcardآدرس ها را به فرمت';
+$labels['newcontactgroup'] = 'Create new contact group';
+$labels['grouprename']    = 'Rename group';
+$labels['groupdelete']    = 'Delete group';
+$labels['groupremoveselected'] = 'Remove selected contacts from group';
+
+$labels['previouspage']   = 'بسته قبلي را نشان دهيد';
+$labels['firstpage']      = 'بسته اولي را نشان دهيد';
+$labels['nextpage']       = 'بسته بعدي را نشان دهيد';
+$labels['lastpage']       = 'بسته اخير را نشان دهيد';
+
+$labels['group'] = 'Group';
 $labels['groups'] = 'گروه ها';
 $labels['personaladrbook'] = 'ادرس های شخصي';
+
+$labels['searchsave'] = 'Save search';
+$labels['searchdelete'] = 'Delete search';
+
 $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['done'] = 'اجرا شد';
+
+// settings
 $labels['settingsfor'] = 'تنظیمات برای';
+$labels['about'] = 'About';
 $labels['preferences'] = 'ترجيحات';
 $labels['userpreferences'] = 'ترجيحات کاربر';
 $labels['editpreferences'] = 'تصحيح کردن ترجيحات  کاربر';
+
 $labels['identities'] = 'شناخت ها';
 $labels['manageidentities'] = 'اداره کردن شناسای ها برای اين آدرس';
 $labels['newidentity'] = 'شناخت جديد';
+
 $labels['newitem'] = 'فقره جديد';
 $labels['edititem'] = 'تصحيح کردن فقره';
+
 $labels['preferhtml'] = 'نشان دادن ايچ ټي ام ايل';
+$labels['defaultcharset'] = 'Default Character Set';
 $labels['htmlmessage'] = 'پيغام ايچ ټي‌ام ايل';
+$labels['messagepart'] = 'Part';
+$labels['digitalsig'] = 'Digital Signature';
+$labels['dateformat'] = 'Date format';
+$labels['timeformat'] = 'Time format';
 $labels['prettydate'] = 'تاريخ های مهم';
-$labels['setdefault'] = 'بطور همیشگی انتخاب نمایید';
-$labels['autodetect'] = 'اتومات';
-$labels['language'] = 'لسان';
-$labels['timezone'] = 'ناحيه زمانی';
-$labels['pagesize'] = 'تعداد سطر ها در صفحه';
+$labels['setdefault']  = 'بطور همیشگی انتخاب نمایید';
+$labels['autodetect']  = 'اتومات';
+$labels['language']  = 'لسان';
+$labels['timezone']  = 'ناحيه زمانی';
+$labels['pagesize']  = 'تعداد سطر ها در صفحه';
 $labels['signature'] = 'امضا';
-$labels['dstactive'] = 'Daylight saving time';
+$labels['dstactive']  = 'Daylight saving time';
+$labels['showinextwin'] = 'Open message in a new window';
+$labels['composeextwin'] = 'Compose in a new window';
 $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';
@@ -214,39 +413,126 @@ $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'] = 'Flag the message for deletion instead of delete';
 $labels['skipdeleted'] = 'پیام های حذف شده را نمایش ندهید';
+$labels['deletealways'] = 'If moving messages to Trash fails, delete them';
+$labels['deletejunk'] = 'Directly delete messages in Junk';
 $labels['showremoteimages'] = 'Display remote inline images';
 $labels['fromknownsenders'] = 'نامه های از آدرس های شناخته شده';
 $labels['always'] = 'همیشه';
 $labels['showinlineimages'] = 'تصاویر ضمیمه شده را در پایین پیام نشان دهید.';
-$labels['autosavedraft'] = 'بصورت خودکار پیش نويس را حفظ کنيد';
-$labels['everynminutes'] = 'دقیفه$n هر';
-$labels['never'] = 'هیچگاه';
+$labels['autosavedraft']  = 'بصورت خودکار پیش نويس را حفظ کنيد';
+$labels['everynminutes']  = 'دقیفه$n هر';
+$labels['refreshinterval']  = 'Refresh (check for new messages, etc.)';
+$labels['never']  = 'هیچگاه';
+$labels['immediately']  = 'immediately';
 $labels['messagesdisplaying'] = 'نمایش دادن پیام ها';
 $labels['messagescomposition'] = 'ایجاد کردن پیام جدید';
 $labels['mimeparamfolding'] = 'نام های ضمیمه ها';
 $labels['2231folding'] = 'Full RFC 2231 (Thunderbird)';
 $labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
 $labels['2047folding'] = 'Full RFC 2047 (دیگر ها)';
+$labels['force7bit'] = 'Use MIME encoding for 8-bit characters';
 $labels['advancedoptions'] = 'انتخاب های پیشرفته';
 $labels['focusonnewmessage'] = 'فوکس دادن پینجره مرورگر به پیام جدید';
 $labels['checkallfolders'] = 'تمام پوشه ها را بخاطر پیام های جدید بررسی کنید';
-$labels['folder'] = 'پوشه';
-$labels['foldername'] = 'نام پوشه';
-$labels['subscribed'] = 'مشترک';
+$labels['displaynext'] = 'After message delete/move display the next message';
+$labels['defaultfont'] = 'Default font of HTML message';
+$labels['mainoptions'] = 'Main Options';
+$labels['browseroptions'] = 'Browser Options';
+$labels['section'] = 'Section';
+$labels['maintenance'] = 'Maintenance';
+$labels['newmessage'] = 'New Message';
+$labels['signatureoptions'] = 'Signature Options';
+$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'] = 'Automatically add signature';
+$labels['newmessageonly'] = 'new message only';
+$labels['replyandforwardonly'] = 'replies and forwards only';
+$labels['insertsignature'] = 'Insert signature';
+$labels['previewpanemarkread']  = 'Mark previewed messages as read';
+$labels['afternseconds']  = 'after $n seconds';
+$labels['reqmdn'] = 'Always request a return receipt';
+$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'] = 'Check spelling before sending a message';
+$labels['spellcheckoptions'] = 'Spellcheck Options';
+$labels['spellcheckignoresyms'] = 'Ignore words with symbols';
+$labels['spellcheckignorenums'] = 'Ignore words with numbers';
+$labels['spellcheckignorecaps'] = 'Ignore words with all letters capitalized';
+$labels['addtodict'] = 'Add to dictionary';
+$labels['mailtoprotohandler'] = 'Register protocol handler for mailto: links';
+$labels['forwardmode'] = 'Messages forwarding';
+$labels['inline'] = 'inline';
+$labels['asattachment'] = 'as attachment';
+
+$labels['folder']  = 'پوشه';
+$labels['folders']  = 'پوشه ها';
+$labels['foldername']  = 'نام پوشه';
+$labels['subscribed']  = 'مشترک';
 $labels['messagecount'] = 'پيغام ها';
-$labels['create'] = 'ایجاد کردن';
-$labels['createfolder'] = 'ایجاد پوشه جدید';
-$labels['managefolders'] = 'اداره کردن پوشه ها';
+$labels['create']  = 'ایجاد کردن';
+$labels['createfolder']  = 'ایجاد پوشه جدید';
+$labels['managefolders']  = 'اداره کردن پوشه ها';
 $labels['specialfolders'] = 'پوشه های مخصوص';
+$labels['properties'] = 'Properties';
+$labels['folderproperties'] = 'Folder properties';
+$labels['parentfolder'] = 'Parent folder';
+$labels['location'] = 'Location';
+$labels['info'] = 'Information';
+$labels['getfoldersize'] = 'Click to get folder size';
+$labels['changesubscription'] = 'Click to change subscription';
+$labels['foldertype'] = 'Folder Type';
+$labels['personalfolder']  = 'Private Folder';
+$labels['otherfolder']  = 'Other User\'s Folder';
+$labels['sharedfolder']  = 'Public Folder';
+
 $labels['sortby'] = 'فهرست کردن توسط';
-$labels['sortasc'] = 'فهرست کردن از طرف بالا به پايين';
+$labels['sortasc']  = 'فهرست کردن از طرف بالا به پايين';
 $labels['sortdesc'] = 'فهرست کردن از طرف پايين به بالا';
+$labels['undo'] = 'Undo';
+
+$labels['installedplugins'] = 'Installed plugins';
+$labels['plugin'] = 'Plugin';
+$labels['version'] = 'Version';
+$labels['source'] = 'Source';
+$labels['license'] = 'License';
+$labels['support'] = 'Get support';
+
+// units
 $labels['B'] = 'بایت';
 $labels['KB'] = 'کیلو بایت';
 $labels['MB'] = 'میگا بایت';
 $labels['GB'] = 'گیگا بایت';
 
+// character sets
+$labels['unicode'] = 'Unicode';
+$labels['english'] = '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['turkish'] = 'Turkish';
+$labels['nordic'] = 'Nordic';
+$labels['thai'] = 'Thai';
+$labels['celtic'] = 'Celtic';
+$labels['vietnamese'] = 'Vietnamese';
+$labels['japanese'] = 'Japanese';
+$labels['korean'] = 'Korean';
+$labels['chinese'] = 'Chinese';
+
+?>
diff --git a/program/localization/fa_AF/messages.inc b/program/localization/fa_AF/messages.inc
index db3373958..4f3d4be55 100644
--- a/program/localization/fa_AF/messages.inc
+++ b/program/localization/fa_AF/messages.inc
@@ -2,27 +2,43 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/fa_AF/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['loginfailed'] = 'داخل شدن به سيستم موفق نه شد';
+$messages['errortitle']  = 'An error occurred!';
+$messages['loginfailed']  = 'داخل شدن به سيستم موفق نه شد';
 $messages['cookiesdisabled'] = 'جستجوگر شما  cookies را قبول نميکند';
 $messages['sessionerror'] = 'جلسه شما وجود ندارد و يا هم از زمان معين آن گذشته است';
 $messages['storageerror'] = 'وصل شدن به آیمیپ سرور موفق نشد';
+$messages['servererror'] = 'Server Error!';
+$messages['servererrormsg'] = 'Server Error: $msg';
+$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'] = 'هيچ پيغامی در اين صندوق پستي دريافت نه شد';
 $messages['loggedout'] = 'جلسه شما بصورت مکمل فسخ شده است  خدا حافظ';
 $messages['mailboxempty'] = 'صندوق پستي خالي است';
+$messages['refreshing'] = 'Refreshing...';
 $messages['loading'] = 'در حال باز شدن  ...';
+$messages['uploading'] = 'Uploading file...';
+$messages['uploadingmany'] = 'Uploading files...';
 $messages['loadingdata'] = 'در حال بار کردن دیتا';
 $messages['checkingmail'] = 'پيغام های جديد را بررسي ميکند';
 $messages['sendingmessage'] = 'پيغام ها را ارسال ميکند';
@@ -32,39 +48,54 @@ $messages['messagesaved'] = 'پيغام را به پیش نويس حفظ کرد'
 $messages['successfullysaved'] = 'حفظ پیام موفقانه صورت گرفت';
 $messages['addedsuccessfully'] = 'آدرس بصورت مکمل در کتاب ادرس علاوه شد';
 $messages['contactexists'] = 'يک آدرس همرا اين ايميل ادرس قبلاً وجود دارد';
+$messages['contactnameexists'] = 'A contact with the same name already exists.';
 $messages['blockedimages'] = 'برای حفظ استقلال پيغام شما، تصاویر اجنبی این پیام بلاک شده اند';
 $messages['encryptedmessage'] = 'اين يک پيغام مخفي است و اشکار شده نميتواند   معذرت ميخواهيم';
 $messages['nocontactsfound'] = 'هيچ آدرسی دريافت نه شد';
 $messages['contactnotfound'] = 'آدرس خواسته شده دريافت نه شد';
+$messages['contactsearchonly'] = 'Enter some search terms to find contacts';
 $messages['sendingfailed'] = 'فرستادن پيغام موفق نه شد';
 $messages['senttooquickly'] = 'ثانیه منتظر باشید$secلطفا مدت  قبل از ارسال این پیام';
 $messages['errorsavingsent'] = 'در جريان حفظ کردن پیام ارسال شده يکاشتباه به وجود امد';
 $messages['errorsaving'] = 'در جريان حفظ کردن يکاشتباه به وجود امد';
 $messages['errormoving'] = 'پيغام نقل مکان شده نتوانست';
+$messages['errorcopying'] = 'Could not copy the message(s).';
 $messages['errordeleting'] = 'پيغام حذف شده نتوانست';
-$messages['deletecontactconfirm'] = 'آيا واقعاً شما ميخواهيد که آدرس های انتخاب شده را حذف کنيد؟';
+$messages['errormarking'] = 'Could not mark the message(s).';
+$messages['deletecontactconfirm']  = 'آيا واقعاً شما ميخواهيد که آدرس های انتخاب شده را حذف کنيد؟';
+$messages['deletegroupconfirm']  = 'Do you really want to delete selected group?';
 $messages['deletemessagesconfirm'] = 'آيا واقعاً شما ميخواهيد که پيغام هاي انتخاب شده را حذف کنيد؟';
-$messages['deletefolderconfirm'] = 'آيا واقعاً شما ميخواهيد که اين پوشه را حذف کنيد؟';
-$messages['purgefolderconfirm'] = 'آيا واقعاً شما ميخواهيد  تمام پيغام های که  در اين پوشه وجود دارد حذف کنيد؟';
+$messages['deletefolderconfirm']  = 'آيا واقعاً شما ميخواهيد که اين پوشه را حذف کنيد؟';
+$messages['purgefolderconfirm']  = 'آيا واقعاً شما ميخواهيد  تمام پيغام های که  در اين پوشه وجود دارد حذف کنيد؟';
+$messages['contactdeleting'] = 'Deleting contact(s)...';
+$messages['groupdeleting'] = 'Deleting group...';
 $messages['folderdeleting'] = 'در حال حذف پوشه';
 $messages['foldermoving'] = 'در حال انتقال پوشه';
+$messages['foldersubscribing'] = 'Subscribing folder...';
+$messages['folderunsubscribing'] = 'Unsubscribing folder...';
 $messages['formincomplete'] = 'فورمه بصورت مکمل خانه پري نه شده است';
 $messages['noemailwarning'] = 'لطفاً يک ايميل ادرس موجود را داخل کنيد';
-$messages['nonamewarning'] = 'لطفاً يک نام را داخل کنيد';
+$messages['nonamewarning']  = 'لطفاً يک نام را داخل کنيد';
 $messages['nopagesizewarning'] = 'لطفاً اندازه يک صفحه را داخل کنيد';
 $messages['nosenderwarning'] = 'لطفاً ایمیل آدرس ارسال کننده را داخل کنید';
 $messages['norecipientwarning'] = 'لطفاً کم از کم يک آدرس گيرينده را نوشته / داخل کنيد';
-$messages['nosubjectwarning'] = 'بخش مضمون خالي است  آیا میخواهید که حالا یکی آنها را درج نمایید؟.';
+$messages['nosubjectwarning']  = 'بخش مضمون خالي است  آیا میخواهید که حالا یکی آنها را درج نمایید؟.';
 $messages['nobodywarning'] = 'اين پيغام را بدون متن بفرستیم؟';
 $messages['notsentwarning'] = 'پيغام ارسال نه شده است   آیا میخواهید که از این نامه صرف نظر نمایید';
 $messages['noldapserver'] = 'لطفاً يک ايل دپ سرور را بخاطر جستجو انتخاب کنيد';
 $messages['nosearchname'] = 'لطفاً يک نام تماس و يا هم يک ايميل ادرس را داخل کنيد';
+$messages['notuploadedwarning'] = 'Not all attachments have been uploaded yet. Please wait or cancel the upload.';
 $messages['searchsuccessful'] = '$nr پیام دریافت شد';
+$messages['contactsearchsuccessful'] = '$nr contacts found.';
 $messages['searchnomatch'] = 'جستجو گر موفق به دریافت هیچ گونه اثری نشد';
 $messages['searching'] = 'در حال جستجو';
 $messages['checking'] = 'در حال بررسی';
 $messages['nospellerrors'] = 'هيچ اشتباه املايي را دريافت نه کرد';
 $messages['folderdeleted'] = 'پوشه موفقانه از بين رفت/ حذف گرديد';
+$messages['foldersubscribed'] = 'Folder successfully subscribed.';
+$messages['folderunsubscribed'] = 'Folder successfully unsubscribed.';
+$messages['folderpurged'] = 'Folder has successfully been emptied.';
+$messages['folderexpunged'] = 'Folder has successfully been compacted.';
 $messages['deletedsuccessfully'] = 'موفقانه حذف شد';
 $messages['converting'] = 'در حال از بین بردن شکل دهی و ساختار (فرمت)';
 $messages['messageopenerror'] = 'پيغام از سرور جريان کرده نتوانست';
@@ -75,16 +106,66 @@ $messages['copyerror'] = 'هيچ يک از تماس ها را کاپي کرده
 $messages['sourceisreadonly'] = 'اجازه نمامه کود / منبع این آدرس قفط خواندنی است';
 $messages['errorsavingcontact'] = 'ادرس این پیام را حفظکرده نتوانست';
 $messages['movingmessage'] = 'ذر حال انتقال پیام...';
+$messages['copyingmessage'] = 'Copying message(s)...';
+$messages['copyingcontact'] = 'Copying contact(s)...';
+$messages['deletingmessage'] = 'Deleting message(s)...';
+$messages['markingmessage'] = 'Marking message(s)...';
+$messages['addingmember'] = 'Adding contact(s) to the group...';
+$messages['removingmember'] = 'Removing contact(s) from the group...';
 $messages['receiptsent'] = 'یک رسید برای ارسال کننده این پیام فرستاده شد.';
 $messages['errorsendingreceipt'] = 'رسيد ارسال شده نتوانست';
+$messages['deleteidentityconfirm'] = 'Do you really want to delete this identity?';
 $messages['nodeletelastidentity'] = 'شما این شناخت نامه را حذف کرده نمیتوانید. این آخرین شناخت نامه شما است.';
 $messages['forbiddencharacter'] = 'نام پوشه دارای یک کرکتر ممنوعه است.';
 $messages['selectimportfile'] = 'لطفاً یک فایل را برای آپلود کردن انتخاب نمایید.';
 $messages['addresswriterror'] = 'کتابچه آدرس انتخاب شده دارای اجازه نامه نوشتاری نیست.';
+$messages['contactaddedtogroup'] = 'Successfully added the contacts to this group.';
+$messages['contactremovedfromgroup'] = 'Successfully removed contacts from this group.';
+$messages['nogroupassignmentschanged'] = 'No group assignments changed.';
 $messages['importwait'] = 'در حال وارد کردن لطفا صبر کنید.';
-$messages['importerror'] = 'وارد نمودن (آدرس ها / فایل ها) موفق نشد. نیستvCard فایل آپلود شده فایل صحیح';
+$messages['importformaterror'] = 'Import failed! The uploaded file is not a valid import data file.';
 $messages['importconfirm'] = '<b>Successfully imported $inserted contacts, $skipped existing entries skipped</b>:<p><em>$names</em></p>';
+$messages['importconfirmskipped'] = '<b>Skipped $skipped existing entries</b>';
 $messages['opnotpermitted'] = 'اجازه این عملکرد را ندارید';
 $messages['nofromaddress'] = 'بخش ایمیل آدرس در شناخت نامه انتخاب شده مفقود است.';
 $messages['editorwarning'] = 'استفاده از تصحیح کننده متن ساده تمام فرمت و ساختار داده شده را از بین خواهد برد. آیا میخواهید که ادامه بدهید.';
+$messages['httpreceivedencrypterror'] = 'A fatal configuration error occurred. Contact your administrator immediately. <b>Your message can not be sent.</b>';
+$messages['smtpconnerror'] = 'SMTP Error ($code): Connection to server failed.';
+$messages['smtpautherror'] = 'SMTP Error ($code): Authentication failed.';
+$messages['smtpfromerror'] = 'SMTP Error ($code): Failed to set sender "$from" ($msg).';
+$messages['smtptoerror'] = 'SMTP Error ($code): Failed to add recipient "$to" ($msg).';
+$messages['smtprecipientserror'] = 'SMTP Error: Unable to parse recipients list.';
+$messages['smtperror'] = 'SMTP Error: $msg';
+$messages['emailformaterror'] = 'Invalid e-mail address: $email';
+$messages['toomanyrecipients'] = 'Too many recipients. Reduce the number of recipients to $max.';
+$messages['maxgroupmembersreached'] = 'The number of group members exceeds the maximum of $max.';
+$messages['internalerror'] = 'An internal error occured. Please try again.';
+$messages['contactdelerror'] = 'Could not delete contact(s).';
+$messages['contactdeleted'] = 'Contact(s) deleted successfully.';
+$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.';
 
+?>
diff --git a/program/localization/fa_IR/labels.inc b/program/localization/fa_IR/labels.inc
index da4a06761..221e4b891 100644
--- a/program/localization/fa_IR/labels.inc
+++ b/program/localization/fa_IR/labels.inc
@@ -2,60 +2,78 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/fa_IR/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Hamid <abbaszadeh.h@gmail.com>                                |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = 'به $product خوش آمدید';
-$labels['username'] = 'نام‌کاربری';
-$labels['password'] = 'گذرواژه';
-$labels['server'] = 'سرور';
-$labels['login'] = 'ورود';
-$labels['logout'] = 'خروج';
-$labels['mail'] = 'نامه';
+
+// login page
+$labels['welcome']   = 'به $product خوش آمدید';
+$labels['username']  = 'نام کاربری';
+$labels['password']  = 'گذرواژه';
+$labels['server']    = 'سرویس‌دهنده';
+$labels['login']     = 'ورود';
+
+// taskbar
+$labels['logout']   = 'برون‌رفت';
+$labels['mail']     = 'نامه';
 $labels['settings'] = 'تنظیمات';
 $labels['addressbook'] = 'دفتر نشانی';
-$labels['inbox'] = 'صندوق ورودی';
+
+// mailbox names
+$labels['inbox']  = 'صندوق ورودی';
 $labels['drafts'] = 'پیش‌نویس‌ها';
-$labels['sent'] = 'ارسال شده';
-$labels['trash'] = 'زباله‌دان';
-$labels['junk'] = 'بنجل';
+$labels['sent']   = 'فرستاده شده';
+$labels['trash']  = 'سطل آشغال';
+$labels['junk']   = 'بنجل';
+
+// message listing
 $labels['subject'] = 'موضوع';
-$labels['from'] = 'از';
-$labels['to'] = 'به';
-$labels['cc'] = 'رونوشت';
-$labels['bcc'] = 'رونوشت مخفی';
+$labels['from']    = 'از';
+$labels['sender']  = 'فرستنده';
+$labels['to']      = 'به';
+$labels['cc']      = 'رونوشت';
+$labels['bcc']     = 'رونوشت مخفی';
 $labels['replyto'] = 'پاسخ-به';
 $labels['followupto'] = 'پیگیری-در';
-$labels['date'] = 'تاریخ';
-$labels['size'] = 'اندازه';
+$labels['date']    = 'تاریخ';
+$labels['size']    = 'اندازه';
 $labels['priority'] = 'اولویت';
 $labels['organization'] = 'سازمان';
 $labels['readstatus'] = 'وضعیت خوانده شدن';
 $labels['listoptions'] = 'فهرست گزینه‌ها...';
+
 $labels['mailboxlist'] = 'پوشه‌ها';
-$labels['folders'] = 'پوشه‌ها';
 $labels['messagesfromto'] = 'پیغام‌ها $from تا $to از $count';
 $labels['threadsfromto'] = 'رشته‌ها $from تا $to از $count';
 $labels['messagenrof'] = 'پیغام $nr از $count';
-$labels['fromtoshort'] = '$from - $to از $cound';
-$labels['copy'] = 'رونوشت';
-$labels['move'] = 'انتقال';
-$labels['moveto'] = 'انتقال به...';
+$labels['fromtoshort'] = '$from - $to از $count';
+
+$labels['copy']     = 'رونوشت';
+$labels['move']     = 'انتقال';
+$labels['moveto']   = 'انتقال به...';
 $labels['download'] = 'بارگیری';
+$labels['open']     = 'باز کردن';
 $labels['showattachment'] = 'نمایش';
 $labels['showanyway'] = 'نمایش آن در هر صورت';
+
 $labels['filename'] = 'نام پرونده';
 $labels['filesize'] = 'اندازه پرونده';
+
 $labels['addtoaddressbook'] = 'افزودن به دفتر نشانی‌ها';
+
+// weekdays short
 $labels['sun'] = '۱ش';
 $labels['mon'] = '۲ش';
 $labels['tue'] = '۳ش';
@@ -63,78 +81,88 @@ $labels['wed'] = '۴ش';
 $labels['thu'] = '۵ش';
 $labels['fri'] = 'جم';
 $labels['sat'] = 'ش';
-$labels['sunday'] = 'یک‌شنبه';
-$labels['monday'] = 'دوشنبه';
-$labels['tuesday'] = 'سه‌شنبه';
+
+// weekdays long
+$labels['sunday']    = 'یک‌شنبه';
+$labels['monday']    = 'دوشنبه';
+$labels['tuesday']   = 'سه‌شنبه';
 $labels['wednesday'] = 'چهارشنبه';
-$labels['thursday'] = 'پنج‌شنبه';
-$labels['friday'] = 'جمعه';
-$labels['saturday'] = 'شنبه';
-$labels['jan'] = 'ژان';
-$labels['feb'] = 'فور';
-$labels['mar'] = 'مار';
-$labels['apr'] = 'آور';
-$labels['may'] = 'مه';
-$labels['longmay'] = 'مه';
-$labels['jun'] = 'ژون';
-$labels['jul'] = 'ژوی';
-$labels['aug'] = 'اوت';
-$labels['sep'] = 'سپت';
-$labels['oct'] = 'اُکت';
-$labels['nov'] = 'نوا';
-$labels['dec'] = 'دسا';
-$labels['longjan'] = 'ژانویه';
-$labels['longfeb'] = 'فوریه';
-$labels['longmar'] = 'مارس';
-$labels['longapr'] = 'آوریل';
-$labels['longjun'] = 'ژوئن';
-$labels['longjul'] = 'جولای';
-$labels['longaug'] = 'آگوست';
-$labels['longsep'] = 'سپتامبر';
-$labels['longoct'] = 'اکتبر';
-$labels['longnov'] = 'نوامبر';
-$labels['longdec'] = 'دسامبر';
+$labels['thursday']  = 'پنج‌شنبه';
+$labels['friday']    = 'جمعه';
+$labels['saturday']  = 'شنبه';
+
+// months short
+$labels['jan']	= 'ژان';
+$labels['feb']	= 'فور';
+$labels['mar']	= 'مار';
+$labels['apr']	= 'آور';
+$labels['may']	= 'مه';
+$labels['jun']	= 'ژون';
+$labels['jul'] 	= 'ژوی';
+$labels['aug']	= 'اوت';
+$labels['sep']	= 'سپت';
+$labels['oct']	= 'اُکت';
+$labels['nov']	= 'نوا';
+$labels['dec']	= 'دسا';
+
+// months long
+$labels['longjan']	= 'ژانویه';
+$labels['longfeb']	= 'فوریه';
+$labels['longmar']	= 'مارس';
+$labels['longapr']	= 'آوریل';
+$labels['longmay']	= 'مه';
+$labels['longjun']	= 'ژوئن';
+$labels['longjul']	= 'جولای';
+$labels['longaug']	= 'آگوست';
+$labels['longsep']	= 'سپتامبر';
+$labels['longoct']	= 'اکتبر';
+$labels['longnov']	= 'نوامبر';
+$labels['longdec']	= 'دسامبر';
+
 $labels['today'] = 'امروز';
-$labels['refresh'] = 'نوسازی';
-$labels['checkmail'] = 'بررسی پیغام‌های جدید';
-$labels['compose'] = 'نوشتن پیغام';
-$labels['writenewmessage'] = 'ایجاد پیغام جدید';
-$labels['reply'] = 'پاسخ';
-$labels['replytomessage'] = 'پاسخ به فرستنده';
+
+// toolbar buttons
+$labels['refresh']          = 'نوسازی';
+$labels['checkmail']        = 'بررسی پیغام‌های جدید';
+$labels['compose']          = 'نوشتن پیغام';
+$labels['writenewmessage']  = 'ایجاد پیغام جدید';
+$labels['reply']            = 'پاسخ';
+$labels['replytomessage']   = 'پاسخ به فرستنده';
 $labels['replytoallmessage'] = 'پاسخ به فهرست یا به فرستنده و تمام گیرنده‌ها';
-$labels['replyall'] = 'پاسخ به همه';
-$labels['replylist'] = 'پاسخ به فهرست';
-$labels['forward'] = 'ارجاع';
-$labels['forwardinline'] = 'ارجاع خطی';
+$labels['replyall']         = 'پاسخ به همه';
+$labels['replylist']        = 'پاسخ به فهرست';
+$labels['forward']          = 'ارجاع';
+$labels['forwardinline']    = 'ارجاع خطی';
 $labels['forwardattachment'] = 'ارجاع به صورت پیوست';
-$labels['forwardmessage'] = 'ارجاع پیغام';
-$labels['deletemessage'] = 'حذف پیغام';
+$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['more'] = 'بيشتر';
-$labels['back'] = 'بازگشت';
-$labels['options'] = 'تنظیمات';
+$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['more']             = 'بيشتر';
+$labels['back']             = 'بازگشت';
+$labels['options']          = 'تنظیمات';
+
 $labels['select'] = 'انتخاب';
 $labels['all'] = 'همه';
 $labels['none'] = 'هیچ‌کدام';
-$labels['nonesort'] = 'هیچ‌کدام';
 $labels['currpage'] = 'صفحه جاری';
 $labels['unread'] = 'خوانده‌نشده';
 $labels['flagged'] = 'پرچم‌دار';
 $labels['unanswered'] = 'پاسخ داده نشده';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'حذف شده';
 $labels['undeleted'] = 'حذف نشده';
 $labels['invert'] = 'وارونه';
@@ -145,12 +173,14 @@ $labels['expand-all'] = 'باز کردن همه';
 $labels['expand-unread'] = 'بازکردن خوانده نشده‌ها';
 $labels['collapse-all'] = 'جمع کردن همه';
 $labels['threaded'] = 'رشته شده';
+
 $labels['autoexpand_threads'] = 'باز کردن رشته‌های پیغام';
 $labels['do_expand'] = 'همه رشته‌ها';
 $labels['expand_only_unread'] = 'فقط با پیغام‌های خوانده نشده';
-$labels['fromto'] = 'فرستنده/گیرنده';
+$labels['fromto'] = 'از/به';
 $labels['flag'] = 'پرچم';
 $labels['attachment'] = 'پیوست';
+$labels['nonesort'] = 'هیچ‌کدام';
 $labels['sentdate'] = 'تاریخ ارسال';
 $labels['arrival'] = 'تاریخ ورود';
 $labels['asc'] = 'صعودی';
@@ -159,182 +189,223 @@ $labels['listcolumns'] = 'ستون‌های فهرست';
 $labels['listsorting'] = 'ستون مرتب‌سازی';
 $labels['listorder'] = 'ترتیب مرتب‌سازی';
 $labels['listmode'] = 'نوع مشاهده فهرست';
+
 $labels['folderactions'] = 'اعمال پوشه...';
 $labels['compact'] = 'فشرده';
 $labels['empty'] = 'خالی';
+
 $labels['quota'] = 'فضای استفاده شده';
-$labels['unknown'] = 'ناشناخته';
-$labels['unlimited'] = 'نامحدود';
-$labels['quicksearch'] = 'جستجوی سریع';
-$labels['resetsearch'] = 'جستجوی دوباره';
-$labels['searchmod'] = 'اصلاحات جستجو';
-$labels['msgtext'] = 'کل پیغام';
+$labels['unknown']  = 'ناشناخته';
+$labels['unlimited']  = 'نامحدود';
+
+$labels['quicksearch']  = 'جستجوی سریع';
+$labels['resetsearch']  = 'جستجوی دوباره';
+$labels['searchmod']  = 'اصلاحات جستجو';
+$labels['msgtext']  = 'کل پیغام';
+$labels['body']  = 'بدنه';
+
 $labels['openinextwin'] = 'باز کردن در پنجره‌ی جدید';
 $labels['emlsave'] = 'بارگیری (.eml)';
-$labels['editasnew'] = 'ویرایش به عنوان جدید';
-$labels['send'] = 'ارسال';
-$labels['sendmessage'] = 'ارسال پیغام';
-$labels['savemessage'] = 'ذخیره به عنوان پیش‌نویس';
-$labels['addattachment'] = 'پیوست کردن یک پرونده';
-$labels['charset'] = 'مجموعه‌نمایه';
-$labels['editortype'] = 'نوع ویرایش‌گر';
-$labels['returnreceipt'] = 'رسید دریافت';
-$labels['dsn'] = 'اعلام وضعیت دریافت';
+$labels['changeformattext'] = 'نمایش در قالب متنی';
+$labels['changeformathtml'] = 'نمایش در قالب اچ‌تی‌ام‌ال';
+
+// message compose
+$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['editidents'] = 'ویرایش شنانه‌ها';
-$labels['spellcheck'] = 'املاء';
+
+$labels['editidents']    = 'ویرایش شناسه‌ها';
+$labels['spellcheck']    = 'املاء';
 $labels['checkspelling'] = 'بررسی املایی';
 $labels['resumeediting'] = 'ادامه‌ی ویرایش';
-$labels['revertto'] = 'برگرداندن به';
+$labels['revertto']      = 'برگرداندن به';
+
 $labels['attach'] = 'پیوست کردن';
 $labels['attachments'] = 'پیوست‌ها';
 $labels['upload'] = 'بارگذاری';
 $labels['uploadprogress'] = '$percent ($current از$total)';
-$labels['close'] = 'بستن';
-$labels['messageoptions'] = 'گزینه‌های پیغام...';
-$labels['low'] = 'کم';
-$labels['lowest'] = 'کم‌ترین';
-$labels['normal'] = 'معمولی';
-$labels['high'] = 'زیاد';
+$labels['close']  = 'بستن';
+$labels['messageoptions']  = 'گزینه‌های پیغام...';
+
+$labels['low']     = 'کم';
+$labels['lowest']  = 'کم‌ترین';
+$labels['normal']  = 'معمولی';
+$labels['high']    = 'زیاد';
 $labels['highest'] = 'بیش‌ترین';
-$labels['nosubject'] = '(بدون موضوع)';
+
+$labels['nosubject']  = '(بدون موضوع)';
 $labels['showimages'] = 'نمایش عکس‌ها';
 $labels['alwaysshow'] = 'همیشه عکس‌های دریافتی از $sender را نمایش داده شود';
-$labels['isdraft'] = 'این یک پیغام پیش‌نویس است.';
-$labels['andnmore'] = '$nr بیشتر...';
+$labels['isdraft']    = 'این یک پیغام پیش‌نویس است.';
+$labels['andnmore']   = '$nr بیشتر...';
 $labels['togglemoreheaders'] = 'نمایش سربرگ‌های بیشتر پیغام';
+$labels['togglefullheaders'] = 'تعویض سربرگ‌های پیغام خام';
+
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'متن ساده';
 $labels['savesentmessagein'] = 'ذخیره پیغام ارسالی در';
 $labels['dontsave'] = 'ذخیره نکن';
-$labels['maxuploadsize'] = 'حجم فایل حداکثر تا میزان $size می‌باشد';
+$labels['maxuploadsize'] = 'حجم پرونده حداکثر تا میزان $size می‌باشد';
+
 $labels['addcc'] = 'افزودن رونوشت';
 $labels['addbcc'] = 'افزودن رونوشت مخفی';
 $labels['addreplyto'] = 'افزودن پاسخ-به';
 $labels['addfollowupto'] = 'افزودن پیگیری-به';
-$labels['mdnrequest'] = 'فرستندهٔ این پیغام خواسته است که وقتی شما این پیغام را می‌خوانید، آگاه شود. آیا مایلید فرستنده را آگاه کنید؟';
+
+// mdn
+$labels['mdnrequest'] = 'فرستنده‌ی این پیغام خواسته است که وقتی شما این پیغام را می‌خوانید، آگاه شود. آیا مایلید فرستنده را آگاه سازید؟';
 $labels['receiptread'] = 'رسید دریافت (خواندن)';
 $labels['yourmessage'] = 'این یک رسید دریافت برای پیغام شماست';
 $labels['receiptnote'] = 'تذکر: این رسید فقط تصدیق می‌کند که پیغام، روی رایانه گیرنده نمایش داده شده است. هیچ تضمینی نیست که گیرنده، محتوای پیغام را خوانده یا فهمیده باشد.';
-$labels['name'] = 'نمایش نام';
-$labels['firstname'] = 'نام';
-$labels['surname'] = 'نام خانوادگی';
-$labels['middlename'] = 'نام وسط';
-$labels['nameprefix'] = 'پیشوند';
-$labels['namesuffix'] = 'پسوند';
-$labels['nickname'] = 'نام مستعار';
-$labels['jobtitle'] = 'عنوان شغل';
-$labels['department'] = 'بخش';
-$labels['gender'] = 'جنسیت';
-$labels['maidenname'] = 'نام خانوادگی زن قبل از ازدواج';
-$labels['email'] = 'پست‌الکترونیکی';
-$labels['phone'] = 'تلفن';
-$labels['address'] = 'نشانی';
-$labels['street'] = 'خیابان';
-$labels['locality'] = 'شهر';
-$labels['zipcode'] = 'کدپستی';
-$labels['region'] = 'ایالت/استان';
-$labels['country'] = 'کشور';
-$labels['birthday'] = 'زادروز';
-$labels['anniversary'] = 'سالگرد';
-$labels['website'] = 'وب سایت';
+
+// address boook
+$labels['name']         = 'نمایش نام';
+$labels['firstname']    = 'نام';
+$labels['surname']      = 'نام خانوادگی';
+$labels['middlename']   = 'نام وسط';
+$labels['nameprefix']   = 'پیشوند';
+$labels['namesuffix']   = 'پسوند';
+$labels['nickname']     = 'نام مستعار';
+$labels['jobtitle']     = 'عنوان شغل';
+$labels['department']   = 'بخش';
+$labels['gender']       = 'جنسیت';
+$labels['maidenname']   = 'نام خانوادگی زن قبل از ازدواج';
+$labels['email']        = 'پست‌الکترونیکی';
+$labels['phone']        = 'تلفن';
+$labels['address']      = 'نشانی';
+$labels['street']       = 'خیابان';
+$labels['locality']     = 'شهر';
+$labels['zipcode']      = 'کدپستی';
+$labels['region']       = 'ایالت/استان';
+$labels['country']      = 'کشور';
+$labels['birthday']     = 'زادروز';
+$labels['anniversary']  = 'سالگرد';
+$labels['website']      = 'وب‌سایت';
 $labels['instantmessenger'] = 'IM';
 $labels['notes'] = 'یادداشت‌ها';
-$labels['male'] = 'مرد';
+$labels['male']   = 'مرد';
 $labels['female'] = 'زن';
 $labels['manager'] = 'مدیر';
 $labels['assistant'] = 'دستیار';
-$labels['typeassistant'] = 'دستیار';
 $labels['spouse'] = 'همسر';
 $labels['allfields'] = 'همه زمینه‌ها';
 $labels['search'] = 'جستجو';
 $labels['advsearch'] = 'جستجوی پیشرفته';
 $labels['advanced'] = 'پیشرفته';
 $labels['other'] = 'سایر';
-$labels['typeother'] = 'سایر';
-$labels['typehome'] = 'منزل';
-$labels['typework'] = 'کار';
-$labels['typemobile'] = 'تلفن همراه';
-$labels['typemain'] = 'اصلی';
-$labels['typehomefax'] = 'فکس خانگی';
-$labels['typeworkfax'] = 'فکس کاری';
-$labels['typecar'] = 'ماشین';
-$labels['typepager'] = 'پیجر';
-$labels['typevideo'] = 'ویدئو';
-$labels['typehomepage'] = 'صفحه خانگی';
+
+$labels['typehome']   = 'منزل';
+$labels['typework']   = 'کار';
+$labels['typeother']  = 'سایر';
+$labels['typemobile']  = 'تلفن همراه';
+$labels['typemain']  = 'اصلی';
+$labels['typehomefax']  = 'فاکس خانگی';
+$labels['typeworkfax']  = 'فاکس کاری';
+$labels['typecar']  = 'اتومبیل';
+$labels['typepager']  = 'پیجر';
+$labels['typevideo']  = 'ویدئو';
+$labels['typeassistant']  = 'دستیار';
+$labels['typehomepage']  = 'صفحه خانگی';
 $labels['typeblog'] = 'بلاگ';
 $labels['typeprofile'] = 'نمایه';
+
 $labels['addfield'] = 'افزودن زمینه...';
 $labels['addcontact'] = 'افزودن تماس جدید';
 $labels['editcontact'] = 'ویرایش تماس';
 $labels['contacts'] = 'تماس‌ها';
 $labels['contactproperties'] = 'خصوصیات تماس';
 $labels['personalinfo'] = 'اطلاعات شخصی';
-$labels['edit'] = 'ویرایش';
+
+$labels['edit']   = 'ویرایش';
 $labels['cancel'] = 'لغو';
-$labels['save'] = 'ذخیره';
+$labels['save']   = 'ذخیره';
 $labels['delete'] = 'حذف';
 $labels['rename'] = 'تغییر نام';
 $labels['addphoto'] = 'افزودن';
 $labels['replacephoto'] = 'جایگزینی';
 $labels['uploadphoto'] = 'بارگذاری تصویر';
-$labels['newcontact'] = 'ایجاد کارت تماس جدید';
-$labels['deletecontact'] = 'حذف تماس‌های انتخاب شده';
-$labels['composeto'] = 'نوشتن پیغام به';
+
+$labels['newcontact']     = 'ایجاد کارت تماس جدید';
+$labels['deletecontact']  = 'حذف تماس‌های انتخاب شده';
+$labels['composeto']      = 'نوشتن پیغام به';
 $labels['contactsfromto'] = 'تماس‌های $from تا $to از $count';
-$labels['print'] = 'چاپ';
-$labels['export'] = 'صدور';
-$labels['exportvcards'] = 'صدور اطلاعات تماس‌ها با فرمت Vcard';
+$labels['print']          = 'چاپ';
+$labels['export']         = 'صدور';
+$labels['exportall']      = 'خارج کردن همه';
+$labels['exportsel']      = 'خارج کردن انتخاب شده‌ها';
+$labels['exportvcards']   = 'صدور اطلاعات تماس‌ها با فرمت vCard';
 $labels['newcontactgroup'] = 'افزودن گروه تماس جدید';
-$labels['grouprename'] = 'تغییر نام گروه';
-$labels['groupdelete'] = 'حذف گروه';
+$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'] = 'ذخیره جستجو';
 $labels['searchdelete'] = 'حذف جستجو';
+
 $labels['import'] = 'وارد کردن';
 $labels['importcontacts'] = 'وارد کردن تماس‌ها';
 $labels['importfromfile'] = 'وارد کردن از پرونده‌ی:';
 $labels['importtarget'] = 'افزودن تماس‌های جدید به دفتر نشانی:';
 $labels['importreplace'] = 'جایگیزینی کامل دفتر نشانی';
+$labels['importdesc'] = 'شما می‌توانید تماس‌ها را از یک دفتر نشانی موجود بارگذاری نمایید.<br/> هم اکنون ما وارد کردن آدرس‌ها را از <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> یا قالب داده CVS (جدا شده با کاما) پشتیبانی می‌کنیم.';
 $labels['done'] = 'انجام شد';
+
+// settings
 $labels['settingsfor'] = 'تنظیمات برای';
 $labels['about'] = 'درباره';
 $labels['preferences'] = 'ترجیحات';
 $labels['userpreferences'] = 'ترجیحات کاربر';
 $labels['editpreferences'] = 'ویرایش ترجیحات کاربر';
+
 $labels['identities'] = 'شناسه‌ها';
 $labels['manageidentities'] = 'مدیریت شناسه‌ها برای این حساب';
 $labels['newidentity'] = 'شناسه جدید';
+
 $labels['newitem'] = 'مورد جدید';
 $labels['edititem'] = 'ویرایش مورد';
+
 $labels['preferhtml'] = 'HTML نمایش';
 $labels['defaultcharset'] = 'مجموعه نمایه پیش‌فرض';
 $labels['htmlmessage'] = 'HTML پیغام';
+$labels['messagepart'] = 'قسمت';
+$labels['digitalsig'] = 'امضای دیجیتال';
 $labels['dateformat'] = 'قالب تاریخ';
 $labels['timeformat'] = 'قالب زمان';
 $labels['prettydate'] = 'تاریخ‌های زیبا';
-$labels['setdefault'] = 'پیش‌فرض کن';
-$labels['autodetect'] = 'خودکار';
-$labels['language'] = 'زبان';
-$labels['timezone'] = 'محدوده‌ی زمانی';
-$labels['pagesize'] = 'سطر در صفحه';
+$labels['setdefault']  = 'پیش‌فرض کن';
+$labels['autodetect']  = 'خودکار';
+$labels['language']  = 'زبان';
+$labels['timezone']  = 'محدوده‌ی زمانی';
+$labels['pagesize']  = 'سطر در صفحه';
 $labels['signature'] = 'امضاء';
-$labels['dstactive'] = 'ساعت تابستانی';
+$labels['dstactive']  = 'ساعت تابستانی';
+$labels['showinextwin'] = 'نمایش پیغام در پنجره جدید';
 $labels['composeextwin'] = 'نوشتن پیغام  در پنجره جدید';
 $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'] = 'تمیز کردن زباله دان در هنگام خروچ';
+$labels['logoutclear'] = 'تمیز کردن زباله دان هنگام برون‌رفت';
 $labels['logoutcompact'] = 'فشرده‌سازی صندوق در هنگام خروچ';
 $labels['uisettings'] = 'محیط کاربری';
 $labels['serversettings'] = 'تنظیمات سرور';
@@ -349,15 +420,16 @@ $labels['readwhendeleted'] = 'در هنگام پاک کردن، پیغام را
 $labels['flagfordeletion'] = 'پیغام را به جای پاک کردن، با پرچم نشانه‌گذاری کن';
 $labels['skipdeleted'] = 'پیغام‌های حذف شده را نمایش نده';
 $labels['deletealways'] = 'اگر انتقال پیغام به زباله‌دان ناموفق بود، آن‌ها را حذف کن';
-$labels['deletejunk'] = 'حذف مستقیم پیغام‌ها در Junk';
-$labels['showremoteimages'] = 'تصاویر لینک شده را نمایش بده';
+$labels['deletejunk'] = 'حذف مستقیم پیغام‌های زباله';
+$labels['showremoteimages'] = 'تصاویر پیوند شده را نمایش بده';
 $labels['fromknownsenders'] = 'از فرستنده شناس';
 $labels['always'] = 'همواره';
 $labels['showinlineimages'] = 'نمایش عکس‌های پیوست شده در پایین پیغام';
-$labels['autosavedraft'] = 'ذخیره‌ی خودکار پیش‌نویس';
-$labels['everynminutes'] = 'در هر $n دقیقه';
-$labels['never'] = 'هرگز';
-$labels['immediately'] = 'بلافاصله';
+$labels['autosavedraft']  = 'ذخیره‌ی خودکار پیش‌نویس';
+$labels['everynminutes']  = 'در هر $n دقیقه';
+$labels['refreshinterval']  = 'تازه کردن (بررسی برای پیغام‌های جدید، مثلا)';
+$labels['never']  = 'هرگز';
+$labels['immediately']  = 'بلافاصله';
 $labels['messagesdisplaying'] = 'نمایش دادن پیغام‌ها';
 $labels['messagescomposition'] = 'نوشتن پیغام‌ها';
 $labels['mimeparamfolding'] = 'عناوین پیوستی';
@@ -371,27 +443,26 @@ $labels['checkallfolders'] = 'همه پوشه‌ها را برای مشاهده
 $labels['displaynext'] = 'بعد از انتقال/حذف پیغام، پیغام بعدی نمایش داده شود';
 $labels['defaultfont'] = 'فونت پیش فرض برای پیغام HTML';
 $labels['mainoptions'] = 'گزینه‌های اصلی';
-$labels['browseroptions'] = 'گزینه‌ های مرورگر';
+$labels['browseroptions'] = 'گزینه‌‌های مرورگر';
 $labels['section'] = 'بخش';
-$labels['maintenance'] = 'نگهداری';
+$labels['maintenance'] = 'نگهداشت';
 $labels['newmessage'] = 'پیغام جدید';
 $labels['signatureoptions'] = 'گزینه‌های امضاء';
 $labels['whenreplying'] = 'هنگام پاسخ';
+$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'] = 'بعد از $s ثانیه';
+$labels['previewpanemarkread']  = 'نشانه‌گذاری پیغام‌های پیش مرور شده به عنوان خوانده شده';
+$labels['afternseconds']  = 'بعد از $s ثانیه';
 $labels['reqmdn'] = 'درخواست همیشگی رسید برگشت';
 $labels['reqdsn'] = 'درخواست همیشگی تذکر وضعیت تحویل';
 $labels['replysamefolder'] = 'پاسخ‌ها را در پوشه‌ای پیغام‌هایی که باید پاسخ داده شود گرفته بده.';
+$labels['defaultabook'] = 'دفترچه آدرس پیش‌فرض';
 $labels['autocompletesingle'] = 'رد کردن نشانی‌های پست الکترونیک دیگر در تکمیل خودکار';
 $labels['listnamedisplay'] = 'فهرست تماس‌ها به عنوان';
 $labels['spellcheckbeforesend'] = 'بررسی املایی قبل از ارسال پیغام';
@@ -401,14 +472,18 @@ $labels['spellcheckignorenums'] = 'نادیده گرفتن کلمات دارای
 $labels['spellcheckignorecaps'] = 'نادیده گرفتن کلمات با حروف بزرگ';
 $labels['addtodict'] = 'اضافه کردن به واژه‌نامه';
 $labels['mailtoprotohandler'] = 'ثبت نگه‌دارنده پروتوکل برای mailto: پیوندها';
+$labels['forwardmode'] = 'بازگردانی پیغام';
 $labels['inline'] = 'خطی';
-$labels['folder'] = 'پوشه';
-$labels['foldername'] = 'نام پوشه';
-$labels['subscribed'] = 'مشترک شد';
+$labels['asattachment'] = 'به عنوان پیوست';
+
+$labels['folder']  = 'پوشه';
+$labels['folders']  = 'پوشه‌ها';
+$labels['foldername']  = 'نام پوشه';
+$labels['subscribed']  = 'مشترک شد';
 $labels['messagecount'] = 'پیغام‌ها';
-$labels['create'] = 'ایجاد';
-$labels['createfolder'] = 'ایجاد پوشه‌ی جدید';
-$labels['managefolders'] = 'مدیریت پوشه‌ها';
+$labels['create']  = 'ایجاد';
+$labels['createfolder']  = 'ایجاد پوشه‌ی جدید';
+$labels['managefolders']  = 'مدیریت پوشه‌ها';
 $labels['specialfolders'] = 'پوشه‌های ویژه';
 $labels['properties'] = 'خصوصیات';
 $labels['folderproperties'] = 'خصوصیات پوشه';
@@ -418,22 +493,29 @@ $labels['info'] = 'اطلاعات';
 $labels['getfoldersize'] = 'برای فهمیدن حجم پوشه کلیک کنید';
 $labels['changesubscription'] = 'برای تغییر اشتراک کلیک کنید';
 $labels['foldertype'] = 'نوع پوشه';
-$labels['personalfolder'] = 'پوشه خصوصی';
-$labels['otherfolder'] = 'پوشه کاربران دیگر';
-$labels['sharedfolder'] = 'پوشه عمومی';
+$labels['personalfolder']  = 'پوشه خصوصی';
+$labels['otherfolder']  = 'پوشه کاربران دیگر';
+$labels['sharedfolder']  = 'پوشه عمومی';
+
 $labels['sortby'] = 'مرتب‌سازی بر اساس';
-$labels['sortasc'] = 'مرتب‌سازی صعودی';
+$labels['sortasc']  = 'مرتب‌سازی صعودی';
 $labels['sortdesc'] = 'مرتب‌سازی نزولی';
 $labels['undo'] = 'برگردان';
+
+$labels['installedplugins'] = 'افزونه‌های نصب شده';
 $labels['plugin'] = 'افزونه';
-$labels['version'] = 'نسخه‌';
+$labels['version'] = 'نسخه';
 $labels['source'] = 'منبع';
 $labels['license'] = 'گواهینامه';
-$labels['support'] = 'گرفتن پشتیبانی';
+$labels['support'] = 'پشتیبانی';
+
+// units
 $labels['B'] = 'بایت';
 $labels['KB'] = 'کیلوبایت';
 $labels['MB'] = 'مگابایت';
 $labels['GB'] = 'گیگابایت';
+
+// character sets
 $labels['unicode'] = 'یونیکد';
 $labels['english'] = 'انگلیسی';
 $labels['westerneuropean'] = 'اروپای غربی';
@@ -453,3 +535,4 @@ $labels['japanese'] = 'ژاپنی';
 $labels['korean'] = 'کره‌ای';
 $labels['chinese'] = 'چینی';
 
+?>
diff --git a/program/localization/fa_IR/messages.inc b/program/localization/fa_IR/messages.inc
index 640876d1d..ff53c650e 100644
--- a/program/localization/fa_IR/messages.inc
+++ b/program/localization/fa_IR/messages.inc
@@ -2,20 +2,23 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/fa_IR/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Hamid <abbaszadeh.h@gmail.com>                                |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['errortitle'] = 'خطایی رخ داد!';
-$messages['loginfailed'] = 'ورود ناموفق بود.';
+$messages['errortitle']  = 'خطایی رخ داد!';
+$messages['loginfailed']  = 'ورود ناموفق بود.';
 $messages['cookiesdisabled'] = 'مرورگر شما کوکی‌ها را قبول نمی‌کند.';
 $messages['sessionerror'] = 'نشست شما معتبر نیست، یا منقضی شده است.';
 $messages['storageerror'] = 'اتصال به سرور انباره ناموفق بود.';
@@ -25,6 +28,8 @@ $messages['dberror'] = 'خطای پایگاه‌داده';
 $messages['requesttimedout'] = 'زمان درخواست تمام شد';
 $messages['errorreadonly'] = 'ناتوانی در انجام عملیات. پوشه فقط خواندنی است.';
 $messages['errornoperm'] = 'ناتوانی در انجام عملیات. دسترسی وجود ندارد.';
+$messages['erroroverquota'] = 'ناتوانی در انجام عملیات. فضای دیسک خالی نیست.';
+$messages['erroroverquotadelete'] = 'فضای دیسک خالی نیست. برای حذف پیغام از SHIFT+DEL استفاده کنید.';
 $messages['invalidrequest'] = 'درخواست نامعتبر! هیچ داده‌ای ذخیره نشد.';
 $messages['invalidhost'] = 'نام سرور غیرمعتبر.';
 $messages['nomessagesfound'] = 'هیچ پیغامی در این صندوق پیدا نشد.';
@@ -57,11 +62,11 @@ $messages['errormoving'] = 'ناتوان در انتقال پیغام(ها).';
 $messages['errorcopying'] = 'ناتوان در رونوشت پیغام(ها).';
 $messages['errordeleting'] = 'ناتوان در حذف پیغام(ها).';
 $messages['errormarking'] = 'ناتوان در نشانه گذاری پیغام(ها).';
-$messages['deletecontactconfirm'] = 'آیا واقعاً می‌خواهید تماس(های) انتخاب شده را حذف کنید؟';
-$messages['deletegroupconfirm'] = 'آیا واقعا می‌خواهید گروه انتخاب شده را حذف کنید؟';
+$messages['deletecontactconfirm']  = 'آیا واقعاً می‌خواهید تماس(های) انتخاب شده را حذف کنید؟';
+$messages['deletegroupconfirm']  = 'آیا واقعا می‌خواهید گروه انتخاب شده را حذف کنید؟';
 $messages['deletemessagesconfirm'] = 'آیا واقعاً می‌خواهید پیغام(های) انتخاب شده را حذف کنید؟';
-$messages['deletefolderconfirm'] = 'آیا واقعاً می‌خواهید این پوشه را حذف کنید؟';
-$messages['purgefolderconfirm'] = 'آیا واقعاً می‌خواهید همه‌ی پیغام‌های داخل این پوشه را حذف کنید؟';
+$messages['deletefolderconfirm']  = 'آیا واقعاً می‌خواهید این پوشه را حذف کنید؟';
+$messages['purgefolderconfirm']  = 'آیا واقعاً می‌خواهید همه‌ی پیغام‌های داخل این پوشه را حذف کنید؟';
 $messages['contactdeleting'] = 'حذف تماس(ها)...';
 $messages['groupdeleting'] = 'حذف گروه...';
 $messages['folderdeleting'] = 'حذف پوشه...';
@@ -70,11 +75,11 @@ $messages['foldersubscribing'] = 'اشتراک پوشه...';
 $messages['folderunsubscribing'] = 'لغو اشتراک پوشه...';
 $messages['formincomplete'] = 'فرم کاملاً پر نشده بود.';
 $messages['noemailwarning'] = 'لطفا یک نشانی پست الکترونیکی معتبر وارد کنید.';
-$messages['nonamewarning'] = 'لطفا یک نام وارد کنید.';
+$messages['nonamewarning']  = 'لطفا یک نام وارد کنید.';
 $messages['nopagesizewarning'] = 'لطفا اندازه ی صفحه را وارد کنید.';
 $messages['nosenderwarning'] = 'لطفا آدرس پست الکترونیکی فرستنده را وارد کنید.';
 $messages['norecipientwarning'] = 'لطفاً حداقل یک گیرنده وارد کنید.';
-$messages['nosubjectwarning'] = 'قسمت "موضوع" خالی است. آیا می‌خواهید اکنون وارد کنید؟';
+$messages['nosubjectwarning']  = 'قسمت "موضوع" خالی است. آیا می‌خواهید اکنون وارد کنید؟';
 $messages['nobodywarning'] = 'این پیغام بدون متن ارسال شود؟';
 $messages['notsentwarning'] = 'پیغام ارسال نشده است. آیا می‌خواهید پیغام را از بین ببرید؟';
 $messages['noldapserver'] = 'برای جست و جو انتخاب کنید LDAP لطفا یک سرور.';
@@ -160,4 +165,7 @@ $messages['invalidimageformat'] = 'فرمت تصویر نامعتبر.';
 $messages['mispellingsfound'] = 'خطای املایی در پیغام شناسایی شد.';
 $messages['parentnotwritable'] = 'ناتوانی در ایجاد/انتقال پوشه به پوشه والد انتخاب شده. بدون حق دسترسی.';
 $messages['messagetoobig'] = 'بخش پیغام برای اجرای آن خیلی بزرگ است.';
+$messages['attachmentvalidationerror'] = 'هشدار! این پیوست مشکوک است زیرا نوع آن با نوعی که در پیغام اشاره شده مطابقت ندارد. اگر شما فرستنده را تایید نمی‌کنید، شما نباید آن را در مرورگر باز نمایید زیرا ممکن است که شامل محتوای مخرب باشد.<br/><br/><em>مورد انتظار: $expected; یافت شده: $detected</em>';
+$messages['noscriptwarning'] = 'هشدار: این برنامه به جاوااسکریپت نیاز دارد! برای استفاده از این لطفا جاوااسکریپت را در تنظیمات مرورگر خود فعال نمایید.';
 
+?>
diff --git a/program/localization/fi_FI/labels.inc b/program/localization/fi_FI/labels.inc
index c64662dd5..006f62947 100644
--- a/program/localization/fi_FI/labels.inc
+++ b/program/localization/fi_FI/labels.inc
@@ -2,58 +2,78 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/fi_FI/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = 'Tervetuloa $product -käyttäjäksi';
-$labels['username'] = 'Käyttäjätunnus';
-$labels['password'] = 'Salasana';
-$labels['server'] = 'Palvelin';
-$labels['login'] = 'Kirjaudu';
-$labels['logout'] = 'Kirjaudu ulos';
-$labels['mail'] = 'Sähköposti';
+
+// login page
+$labels['welcome']   = 'Tervetuloa $product -käyttäjäksi';
+$labels['username']  = 'Käyttäjätunnus';
+$labels['password']  = 'Salasana';
+$labels['server']    = 'Palvelin';
+$labels['login']     = 'Kirjaudu';
+
+// taskbar
+$labels['logout']   = 'Kirjaudu ulos';
+$labels['mail']     = 'Sähköposti';
 $labels['settings'] = 'Asetukset';
 $labels['addressbook'] = 'Osoitekirja';
-$labels['inbox'] = 'Saapuneet';
+
+// mailbox names
+$labels['inbox']  = 'Saapuneet';
 $labels['drafts'] = 'Luonnokset';
-$labels['sent'] = 'Lähetetyt';
-$labels['trash'] = 'Roskakori';
-$labels['junk'] = 'Roskaposti';
+$labels['sent']   = 'Lähetetyt';
+$labels['trash']  = 'Roskakori';
+$labels['junk']   = 'Roskaposti';
+
+// message listing
 $labels['subject'] = 'Aihe';
-$labels['from'] = 'Lähettäjä';
-$labels['to'] = 'Vastaanottaja';
-$labels['cc'] = 'Kopio';
-$labels['bcc'] = 'Piilokopio';
+$labels['from']    = 'Lähettäjä';
+$labels['sender']  = 'Lähettäjä';
+$labels['to']      = 'Vastaanottaja';
+$labels['cc']      = 'Kopio';
+$labels['bcc']     = 'Piilokopio';
 $labels['replyto'] = 'Vastaus osoitteeseen';
 $labels['followupto'] = 'Keskustelunsiirto';
-$labels['date'] = 'Päiväys';
-$labels['size'] = 'Koko';
+$labels['date']    = 'Päiväys';
+$labels['size']    = 'Koko';
 $labels['priority'] = 'Tärkeys';
 $labels['organization'] = 'Organisaatio';
 $labels['readstatus'] = 'Luettu';
 $labels['listoptions'] = 'Listaa valinnat...';
+
 $labels['mailboxlist'] = 'Kansiot';
-$labels['folders'] = 'Kansiot';
 $labels['messagesfromto'] = 'Viestit $from-$to/$count';
 $labels['threadsfromto'] = 'Viestiketjut $from-$to/$count';
 $labels['messagenrof'] = 'Viesti $nr/$count';
 $labels['fromtoshort'] = '$from - $to (yhteensä $count)';
-$labels['copy'] = 'Kopioi';
-$labels['move'] = 'Siirrä';
-$labels['moveto'] = 'siirrä kansioon...';
+
+$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';
+
 $labels['filename'] = 'Tiedoston nimi';
 $labels['filesize'] = 'Tiedoston koko';
+
 $labels['addtoaddressbook'] = 'Lisää osoitekirjaan';
+
+// weekdays short
 $labels['sun'] = 'Su';
 $labels['mon'] = 'Ma';
 $labels['tue'] = 'Ti';
@@ -61,79 +81,90 @@ $labels['wed'] = 'Ke';
 $labels['thu'] = 'To';
 $labels['fri'] = 'Pe';
 $labels['sat'] = 'La';
-$labels['sunday'] = 'Sunnuntai';
-$labels['monday'] = 'Maanantai';
-$labels['tuesday'] = 'Tiistai';
+
+// weekdays long
+$labels['sunday']    = 'Sunnuntai';
+$labels['monday']    = 'Maanantai';
+$labels['tuesday']   = 'Tiistai';
 $labels['wednesday'] = 'Keskiviikko';
-$labels['thursday'] = 'Torstai';
-$labels['friday'] = 'Perjantai';
-$labels['saturday'] = 'Lauantai';
-$labels['jan'] = 'Tammi';
-$labels['feb'] = 'Helmi';
-$labels['mar'] = 'Maalis';
-$labels['apr'] = 'Huhti';
-$labels['may'] = 'Touko';
-$labels['longmay'] = 'Touko';
-$labels['jun'] = 'Kesä';
-$labels['jul'] = 'Heinä';
-$labels['aug'] = 'Elo';
-$labels['sep'] = 'Syys';
-$labels['oct'] = 'Loka';
-$labels['nov'] = 'Marras';
-$labels['dec'] = 'Joulu';
-$labels['longjan'] = 'Tammikuu';
-$labels['longfeb'] = 'Helmikuu';
-$labels['longmar'] = 'Maaliskuu';
-$labels['longapr'] = 'Huhtikuu';
-$labels['longjun'] = 'Kesäkuu';
-$labels['longjul'] = 'Heinäkuu';
-$labels['longaug'] = 'Elokuu';
-$labels['longsep'] = 'Syyskuu';
-$labels['longoct'] = 'Lokakuu';
-$labels['longnov'] = 'Marraskuu';
-$labels['longdec'] = 'Joulukuu';
+$labels['thursday']  = 'Torstai';
+$labels['friday']    = 'Perjantai';
+$labels['saturday']  = 'Lauantai';
+
+// months short
+$labels['jan']	= 'Tammi';
+$labels['feb']	= 'Helmi';
+$labels['mar']	= 'Maalis';
+$labels['apr']	= 'Huhti';
+$labels['may']	= 'Touko';
+$labels['jun']	= 'Kesä';
+$labels['jul'] 	= 'Heinä';
+$labels['aug']	= 'Elo';
+$labels['sep']	= 'Syys';
+$labels['oct']	= 'Loka';
+$labels['nov']	= 'Marras';
+$labels['dec']	= 'Joulu';
+
+// months long
+$labels['longjan']	= 'Tammikuu';
+$labels['longfeb']	= 'Helmikuu';
+$labels['longmar']	= 'Maaliskuu';
+$labels['longapr']	= 'Huhtikuu';
+$labels['longmay']	= 'Touko';
+$labels['longjun']	= 'Kesäkuu';
+$labels['longjul']	= 'Heinäkuu';
+$labels['longaug']	= 'Elokuu';
+$labels['longsep']	= 'Syyskuu';
+$labels['longoct']	= 'Lokakuu';
+$labels['longnov']	= 'Marraskuu';
+$labels['longdec']	= 'Joulukuu';
+
 $labels['today'] = 'Tänään';
-$labels['refresh'] = 'Päivitä';
-$labels['checkmail'] = 'Tarkista saapuneet viestit';
-$labels['compose'] = 'Viestin kirjoitus';
-$labels['writenewmessage'] = 'Kirjoita uusi viesti';
-$labels['reply'] = 'Vastaa';
-$labels['replytomessage'] = 'Vastaa viestiin';
+
+// toolbar buttons
+$labels['refresh']          = 'Päivitä';
+$labels['checkmail']        = 'Tarkista saapuneet viestit';
+$labels['compose']          = 'Viestin kirjoitus';
+$labels['writenewmessage']  = 'Kirjoita uusi viesti';
+$labels['reply']            = 'Vastaa';
+$labels['replytomessage']   = 'Vastaa viestiin';
 $labels['replytoallmessage'] = 'Vastaa kaikille';
-$labels['replyall'] = 'Vastaa kaikille';
-$labels['replylist'] = 'Vastaa listalle';
-$labels['forward'] = 'Välitä eteenpäin';
-$labels['forwardinline'] = 'Välitä viesti';
+$labels['replyall']         = 'Vastaa kaikille';
+$labels['replylist']        = 'Vastaa listalle';
+$labels['forward']          = 'Välitä eteenpäin';
+$labels['forwardinline']    = 'Välitä viesti';
 $labels['forwardattachment'] = 'Välitä viesti liitteenä';
-$labels['forwardmessage'] = 'Välitä viesti';
-$labels['deletemessage'] = 'Poista viesti';
+$labels['forwardmessage']   = 'Välitä viesti';
+$labels['deletemessage']    = 'Poista viesti';
 $labels['movemessagetotrash'] = 'Siirrä viesti roskakoriin';
-$labels['printmessage'] = 'Tulosta viesti';
-$labels['previousmessage'] = 'Näytä edellinen viesti';
-$labels['firstmessage'] = 'Näytä ensimmäinen viesti';
-$labels['nextmessage'] = 'Näytä edellinen viesti';
-$labels['lastmessage'] = 'Näytä viimeinen viesti';
-$labels['backtolist'] = 'Takaisin viesteihin';
-$labels['viewsource'] = 'Näytä lähdekoodi';
-$labels['mark'] = 'Merkitse';
-$labels['markmessages'] = 'Merkitse viestit';
-$labels['markread'] = 'luetuiksi';
-$labels['markunread'] = 'ei-luetuiksi';
-$labels['markflagged'] = 'korostetuiksi';
-$labels['markunflagged'] = 'ei-korostetuiksi';
-$labels['moreactions'] = 'Lisää toimintoja...';
-$labels['more'] = 'Lisää';
-$labels['back'] = 'Takaisin';
-$labels['options'] = 'Asetukset';
+$labels['printmessage']     = 'Tulosta viesti';
+$labels['previousmessage']  = 'Näytä edellinen viesti';
+$labels['firstmessage']     = 'Näytä ensimmäinen viesti';
+$labels['nextmessage']      = 'Näytä edellinen viesti';
+$labels['lastmessage']      = 'Näytä viimeinen viesti';
+$labels['backtolist']       = 'Takaisin viesteihin';
+$labels['viewsource']       = 'Näytä lähdekoodi';
+$labels['mark']             = 'Merkitse';
+$labels['markmessages']     = 'Merkitse viestit';
+$labels['markread']         = 'luetuiksi';
+$labels['markunread']       = 'ei-luetuiksi';
+$labels['markflagged']      = 'korostetuiksi';
+$labels['markunflagged']    = 'ei-korostetuiksi';
+$labels['moreactions']      = 'Lisää toimintoja...';
+$labels['more']             = 'Lisää';
+$labels['back']             = 'Takaisin';
+$labels['options']          = 'Asetukset';
+
 $labels['select'] = 'Valitse';
 $labels['all'] = 'Kaikki';
 $labels['none'] = 'Ei mikään';
-$labels['nonesort'] = 'Ei mikään';
 $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ä';
 $labels['filter'] = 'Suodin';
 $labels['list'] = 'Listaus';
@@ -142,12 +173,14 @@ $labels['expand-all'] = 'Laajenna kaikki';
 $labels['expand-unread'] = 'Laajenna lukemattomat';
 $labels['collapse-all'] = 'Kutista kaikki';
 $labels['threaded'] = 'Säikeet';
+
 $labels['autoexpand_threads'] = 'Laajenna viestiketjut automaattisesti';
 $labels['do_expand'] = 'kaikki viestiketjut';
 $labels['expand_only_unread'] = 'vain ne joissa lukemattomia viestejä';
 $labels['fromto'] = 'Lähettäjä/Vastaanottaja';
 $labels['flag'] = 'Merkitse';
 $labels['attachment'] = 'Liite';
+$labels['nonesort'] = 'Ei mikään';
 $labels['sentdate'] = 'Lähetysaika';
 $labels['arrival'] = 'Saapumisaika';
 $labels['asc'] = 'nouseva';
@@ -156,175 +189,220 @@ $labels['listcolumns'] = 'Näkyvät kentät';
 $labels['listsorting'] = 'Lajittelu kenttä';
 $labels['listorder'] = 'Lajittelu järjestys';
 $labels['listmode'] = 'Listausnäkymä';
+
 $labels['folderactions'] = 'Kansiotoiminnot...';
 $labels['compact'] = 'Tiivistä';
 $labels['empty'] = 'Tyhjennä';
+
 $labels['quota'] = 'Levytila';
-$labels['unknown'] = 'tuntematon';
-$labels['unlimited'] = 'rajoittamaton';
-$labels['quicksearch'] = 'Pikahaku';
-$labels['resetsearch'] = 'Nollaa haku';
-$labels['searchmod'] = 'Hakukriteerit';
-$labels['msgtext'] = 'Koko viesti';
+$labels['unknown']  = 'tuntematon';
+$labels['unlimited']  = 'rajoittamaton';
+
+$labels['quicksearch']  = 'Pikahaku';
+$labels['resetsearch']  = 'Nollaa haku';
+$labels['searchmod']  = 'Hakukriteerit';
+$labels['msgtext']  = 'Koko viesti';
+$labels['body']  = 'Runko';
+
 $labels['openinextwin'] = 'Avaa uudessa ikkunassa';
 $labels['emlsave'] = 'Tallenna (.eml)';
-$labels['editasnew'] = 'Muokkaa uutena';
-$labels['sendmessage'] = 'Lähetä viesti';
-$labels['savemessage'] = 'Tallenna tämä luonnos';
-$labels['addattachment'] = 'Liitetiedosto';
-$labels['charset'] = 'Merkistö';
-$labels['editortype'] = 'Editorin tyyppi';
-$labels['returnreceipt'] = 'Perillesaapumisilmoitus';
-$labels['dsn'] = 'Toimituksen tilailmoitus';
+$labels['changeformattext'] = 'Näytä raakatekstimuodossa';
+$labels['changeformathtml'] = 'Näytä HTML-muodossa';
+
+// message compose
+$labels['editasnew']      = 'Muokkaa uutena';
+$labels['send']           = 'Lähetä';
+$labels['sendmessage']    = 'Lähetä viesti';
+$labels['savemessage']    = 'Tallenna tämä luonnos';
+$labels['addattachment']  = 'Liitetiedosto';
+$labels['charset']        = 'Merkistö';
+$labels['editortype']     = 'Editorin tyyppi';
+$labels['returnreceipt']  = 'Perillesaapumisilmoitus';
+$labels['dsn']            = 'Toimituksen tilailmoitus';
 $labels['mailreplyintro'] = '$sender kirjoitti $date:';
 $labels['originalmessage'] = 'Alkuperäinen viesti';
-$labels['editidents'] = 'Muokkaa identiteettejä';
-$labels['spellcheck'] = 'Oikeinkirjoitus';
+
+$labels['editidents']    = 'Muokkaa identiteettejä';
+$labels['spellcheck']    = 'Oikeinkirjoitus';
 $labels['checkspelling'] = 'Tarkista oikeinkirjoitus';
 $labels['resumeediting'] = 'Jatka muokkausta';
-$labels['revertto'] = 'Muuta takaisin';
+$labels['revertto']      = 'Muuta takaisin';
+
 $labels['attach'] = 'Liitä';
 $labels['attachments'] = 'Liitetiedostot';
 $labels['upload'] = 'Lisää';
 $labels['uploadprogress'] = '$percent ($current, yhteensä $total)';
-$labels['close'] = 'Sulje';
-$labels['messageoptions'] = 'Viestin asetukset...';
-$labels['low'] = 'Matala';
-$labels['lowest'] = 'Matalin';
-$labels['normal'] = 'Normaali';
-$labels['high'] = 'Korkea';
+$labels['close']  = 'Sulje';
+$labels['messageoptions']  = 'Viestin asetukset...';
+
+$labels['low']     = 'Matala';
+$labels['lowest']  = 'Matalin';
+$labels['normal']  = 'Normaali';
+$labels['high']    = 'Korkea';
 $labels['highest'] = 'Korkein';
-$labels['nosubject'] = '(ei otsikkoa)';
+
+$labels['nosubject']  = '(ei otsikkoa)';
 $labels['showimages'] = 'Näytä kuvat';
 $labels['alwaysshow'] = 'Näytä aina lähettäjältä $sender saapuneet kuvat';
-$labels['isdraft'] = 'Tämä on luonnosviesti.';
+$labels['isdraft']    = 'Tämä on luonnosviesti.';
+$labels['andnmore']   = '$nr more...';
+$labels['togglemoreheaders'] = 'Näytä lisää viestiotsakkeita';
+$labels['togglefullheaders'] = 'Toggle raw message headers';
+
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Tavallinen teksti';
 $labels['savesentmessagein'] = 'Tallenna lähetetty viesti kansioon';
 $labels['dontsave'] = 'Älä tallenna';
 $labels['maxuploadsize'] = 'Suurin sallittu tiedostokoko on $size';
+
 $labels['addcc'] = 'Lisää kopio';
 $labels['addbcc'] = 'Lisää piilokopio';
 $labels['addreplyto'] = 'Lisää vastausosoite';
 $labels['addfollowupto'] = 'Lisää keskustelunsiirto';
+
+// mdn
 $labels['mdnrequest'] = 'Viestin lähettäjä on pyytänyt kuittauksen siitä että olet lukenut viestin. Haluatko lähettää kuittauksen?';
 $labels['receiptread'] = 'Lukukuittaus';
 $labels['yourmessage'] = 'Tämä viesti on kuittaus lähettämällesi viestille';
 $labels['receiptnote'] = 'Huom! Kuittaus tarkoittaa vain sitä, että viesti on avattu vastaanottajan tietokoneella. Se ei tarkoita että vastaanottaja on myös lukenut tai ymmärtänyt viestin.';
-$labels['name'] = 'Näkyvä nimi';
-$labels['firstname'] = 'Etunimi';
-$labels['surname'] = 'Sukunimi';
-$labels['middlename'] = 'Toinen nimi';
-$labels['nameprefix'] = 'Etuliite';
-$labels['namesuffix'] = 'Jälkiliite';
-$labels['nickname'] = 'Lempinimi';
-$labels['jobtitle'] = 'Titteli';
-$labels['department'] = 'Osasto';
-$labels['gender'] = 'Sukupuoli';
-$labels['maidenname'] = 'Tyttönimi';
-$labels['email'] = 'Sähköposti';
-$labels['phone'] = 'Puhelin';
-$labels['address'] = 'Osoite';
-$labels['street'] = 'Katu';
-$labels['locality'] = 'Kaupunki';
-$labels['zipcode'] = 'Postinumero';
-$labels['region'] = 'Osavaltio tai lääni';
-$labels['country'] = 'Maa';
-$labels['birthday'] = 'Syntymäpäivä';
-$labels['anniversary'] = 'Vuosipäivä';
-$labels['website'] = 'Verkkosivu';
+
+// address boook
+$labels['name']         = 'Näkyvä nimi';
+$labels['firstname']    = 'Etunimi';
+$labels['surname']      = 'Sukunimi';
+$labels['middlename']   = 'Toinen nimi';
+$labels['nameprefix']   = 'Etuliite';
+$labels['namesuffix']   = 'Jälkiliite';
+$labels['nickname']     = 'Lempinimi';
+$labels['jobtitle']     = 'Titteli';
+$labels['department']   = 'Osasto';
+$labels['gender']       = 'Sukupuoli';
+$labels['maidenname']   = 'Tyttönimi';
+$labels['email']        = 'Sähköposti';
+$labels['phone']        = 'Puhelin';
+$labels['address']      = 'Osoite';
+$labels['street']       = 'Katu';
+$labels['locality']     = 'Kaupunki';
+$labels['zipcode']      = 'Postinumero';
+$labels['region']       = 'Osavaltio tai lääni';
+$labels['country']      = 'Maa';
+$labels['birthday']     = 'Syntymäpäivä';
+$labels['anniversary']  = 'Vuosipäivä';
+$labels['website']      = 'Verkkosivu';
 $labels['instantmessenger'] = 'Pikaviestin';
 $labels['notes'] = 'Muistiinpanot';
-$labels['male'] = 'mies';
+$labels['male']   = 'mies';
 $labels['female'] = 'nainen';
 $labels['manager'] = 'Päällikkö';
 $labels['assistant'] = 'Avustaja';
-$labels['typeassistant'] = 'Avustaja';
 $labels['spouse'] = 'Puoliso';
 $labels['allfields'] = 'Kaikki kentät';
 $labels['search'] = 'Haku';
 $labels['advsearch'] = 'Tarkennettu haku';
 $labels['advanced'] = 'Lisäasetukset';
 $labels['other'] = 'Muu';
-$labels['typeother'] = 'Muu';
-$labels['typehome'] = 'Koti';
-$labels['typework'] = 'Työ';
-$labels['typemobile'] = 'Matkapuhelin';
-$labels['typemain'] = 'Oma';
-$labels['typehomefax'] = 'Kotifaksi';
-$labels['typeworkfax'] = 'Työfaksi';
-$labels['typecar'] = 'Auto';
-$labels['typepager'] = 'Hakulaite';
-$labels['typevideo'] = 'Video';
-$labels['typehomepage'] = 'Kotisivu';
+
+$labels['typehome']   = 'Koti';
+$labels['typework']   = 'Työ';
+$labels['typeother']  = 'Muu';
+$labels['typemobile']  = 'Matkapuhelin';
+$labels['typemain']  = 'Oma';
+$labels['typehomefax']  = 'Kotifaksi';
+$labels['typeworkfax']  = 'Työfaksi';
+$labels['typecar']  = 'Auto';
+$labels['typepager']  = 'Hakulaite';
+$labels['typevideo']  = 'Video';
+$labels['typeassistant']  = 'Avustaja';
+$labels['typehomepage']  = 'Kotisivu';
 $labels['typeblog'] = 'Blogi';
 $labels['typeprofile'] = 'Profiili';
+
 $labels['addfield'] = 'Lisää kenttä...';
 $labels['addcontact'] = 'Lisää uusi yhteystieto';
 $labels['editcontact'] = 'Muokkaa yhteystietoa';
 $labels['contacts'] = 'Yhteystiedot';
 $labels['contactproperties'] = 'Yhteystiedon ominaisuudet';
 $labels['personalinfo'] = 'Henkilökohtaiset tiedot';
-$labels['edit'] = 'Muokkaa';
+
+$labels['edit']   = 'Muokkaa';
 $labels['cancel'] = 'Peruuta';
-$labels['save'] = 'Tallenna';
+$labels['save']   = 'Tallenna';
 $labels['delete'] = 'Poista';
 $labels['rename'] = 'Nimeä uudelleen';
 $labels['addphoto'] = 'Lisää';
 $labels['replacephoto'] = 'Korvaa';
 $labels['uploadphoto'] = 'Lähetä kuva';
-$labels['newcontact'] = 'Luo uusi yhteystieto';
-$labels['deletecontact'] = 'Poista valitut yhteystiedot';
-$labels['composeto'] = 'Kirjoita viesti yhteystiedolle';
+
+$labels['newcontact']     = 'Luo uusi yhteystieto';
+$labels['deletecontact']  = 'Poista valitut yhteystiedot';
+$labels['composeto']      = 'Kirjoita viesti yhteystiedolle';
 $labels['contactsfromto'] = 'Yhteystiedot $from-$to/$count';
-$labels['print'] = 'Tulosta';
-$labels['export'] = 'Vie (export)';
-$labels['exportvcards'] = 'Vie yhteystiedot vCard-muodossa';
+$labels['print']          = 'Tulosta';
+$labels['export']         = 'Vie (export)';
+$labels['exportall']      = 'Vie kaikki';
+$labels['exportsel']      = 'Vie valitut';
+$labels['exportvcards']   = 'Vie yhteystiedot vCard-muodossa';
 $labels['newcontactgroup'] = 'Luo uusi yhteystietoryhmä';
-$labels['grouprename'] = 'Nimeä ryhmä uudelleen';
-$labels['groupdelete'] = 'Poista ryhmä';
+$labels['grouprename']    = 'Nimeä ryhmä uudelleen';
+$labels['groupdelete']    = 'Poista ryhmä';
 $labels['groupremoveselected'] = 'Poista valitut yhteystiedot ryhmästä';
-$labels['previouspage'] = 'Näytä edellinen luettelo';
-$labels['firstpage'] = 'Näytä ensimmäinen luettelo';
-$labels['nextpage'] = 'Näytä seuraava luettelo';
-$labels['lastpage'] = 'Näytä viimeinen luettelo';
+
+$labels['previouspage']   = 'Näytä edellinen luettelo';
+$labels['firstpage']      = 'Näytä ensimmäinen luettelo';
+$labels['nextpage']       = 'Näytä seuraava luettelo';
+$labels['lastpage']       = 'Näytä viimeinen luettelo';
+
 $labels['group'] = 'Ryhmä';
 $labels['groups'] = 'Ryhmät';
 $labels['personaladrbook'] = 'Henkilökohtaiset osoitteet';
+
 $labels['searchsave'] = 'Tallenna haku';
 $labels['searchdelete'] = 'Poista haku';
+
 $labels['import'] = 'Tuo';
 $labels['importcontacts'] = 'Tuo yhteystiedot';
 $labels['importfromfile'] = 'Tuo tiedostosta:';
 $labels['importtarget'] = 'Lisää uudet yhteystiedot osoitekirjaan:';
 $labels['importreplace'] = 'Korvaa koko osoitekirja';
+$labels['importdesc'] = 'Voit tuoda yhteystietoja olemassa olevasta osoitekirjasta.<br/>Tuettuja muotoja ovat <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> ja CSV (pilkuin erotetut arvot).';
 $labels['done'] = 'Valmis';
+
+// settings
 $labels['settingsfor'] = 'Asetukset';
 $labels['about'] = 'Tietoja';
 $labels['preferences'] = 'Asetukset';
 $labels['userpreferences'] = 'Käyttäjän asetukset';
 $labels['editpreferences'] = 'Muokkaa käyttäjän asetuksia';
+
 $labels['identities'] = 'Identiteetit';
 $labels['manageidentities'] = 'Muokkaa tunnuksen identiteettejä';
 $labels['newidentity'] = 'Uusi identiteetti';
+
 $labels['newitem'] = 'Uusi';
 $labels['edititem'] = 'Muokkaa';
+
 $labels['preferhtml'] = 'Käytä HTML:aa';
 $labels['defaultcharset'] = 'Oletusmerkistökoodaus';
 $labels['htmlmessage'] = 'HTML-viesti';
+$labels['messagepart'] = 'Part';
+$labels['digitalsig'] = 'Digitaalinen allekirjoitus';
 $labels['dateformat'] = 'Päiväyksen muoto';
 $labels['timeformat'] = 'Ajan muoto';
 $labels['prettydate'] = 'Nätit päiväykset';
-$labels['setdefault'] = 'Aseta vakioksi';
-$labels['autodetect'] = 'Automaattinen';
-$labels['language'] = 'Kieli';
-$labels['timezone'] = 'Aikavyöhyke';
-$labels['pagesize'] = 'Rivejä sivulla';
+$labels['setdefault']  = 'Aseta vakioksi';
+$labels['autodetect']  = 'Automaattinen';
+$labels['language']  = 'Kieli';
+$labels['timezone']  = 'Aikavyöhyke';
+$labels['pagesize']  = 'Rivejä sivulla';
 $labels['signature'] = 'Allekirjoitus';
-$labels['dstactive'] = 'Kesäaika';
+$labels['dstactive']  = 'Kesäaika';
+$labels['showinextwin'] = 'Avaa viesti uudessa ikkunassa';
+$labels['composeextwin'] = 'Lähetä viesti uudessa ikkunassa';
 $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';
@@ -347,10 +425,11 @@ $labels['showremoteimages'] = 'Näytä ulkopuoliset kuvat viestissä';
 $labels['fromknownsenders'] = 'tunnetuilta lähettäjiltä';
 $labels['always'] = 'aina';
 $labels['showinlineimages'] = 'Näytä liitekuvat viestin jälkeen';
-$labels['autosavedraft'] = 'Tallenna luonnos automaattisesti';
-$labels['everynminutes'] = 'joka $n. minuutti';
-$labels['never'] = 'ei koskaan';
-$labels['immediately'] = 'välittömästi';
+$labels['autosavedraft']  = 'Tallenna luonnos automaattisesti';
+$labels['everynminutes']  = 'joka $n. minuutti';
+$labels['refreshinterval']  = 'Päivitä (tarkista uudet viestit jne.)';
+$labels['never']  = 'ei koskaan';
+$labels['immediately']  = 'välittömästi';
 $labels['messagesdisplaying'] = 'Viestien näyttäminen';
 $labels['messagescomposition'] = 'Viestien kirjoittaminen';
 $labels['mimeparamfolding'] = 'Liitetiedostojen nimet';
@@ -370,22 +449,20 @@ $labels['maintenance'] = 'Huolto';
 $labels['newmessage'] = 'Uusi viesti';
 $labels['signatureoptions'] = 'Allekirjoituksen asetukset';
 $labels['whenreplying'] = 'Vastattaessa';
+$labels['replyempty'] = 'älä lainaa alkuperäistä viestiä';
 $labels['replytopposting'] = 'aloita uusi viesti alkuperäisen yläpuolelle';
 $labels['replybottomposting'] = 'aloita uusi viesti alkuperäisen alapuolelle';
 $labels['replyremovesignature'] = 'Vastattaessa poista alkuperäinen allekirjoitus viestistä';
 $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';
+$labels['previewpanemarkread']  = 'Merkitse esikatsellut viestit luetuiksi';
+$labels['afternseconds']  = '$n sekunnin jälkeen';
 $labels['reqmdn'] = 'Pyydä aina kuittausviestiä';
 $labels['reqdsn'] = 'Pyydä aina toimituksen tilailmoitus';
 $labels['replysamefolder'] = 'Laita vastaukseni samaan hakemistoon alkuperäisen viestin kanssa';
-$labels['defaultaddressbook'] = 'Lisää uudet kontaktit valittuun osoitekirjaan';
+$labels['defaultabook'] = 'Oletusarvoinen osoitekirja';
 $labels['autocompletesingle'] = 'Älä huomioi vaihtoehtoisia sähköpostiosoitteita automaattisessa täydennyksessä';
 $labels['listnamedisplay'] = 'Listaa yhteystiedot';
 $labels['spellcheckbeforesend'] = 'Tarkista oikeinkirjoitus ennen viestin lähetystä';
@@ -395,13 +472,18 @@ $labels['spellcheckignorenums'] = 'Jätä huomiotta sanat, joissa on numeroita';
 $labels['spellcheckignorecaps'] = 'Jätä huomiotta sanat, joissa kaikki kirjaimet on isoja';
 $labels['addtodict'] = 'Lisää sanakirjaan';
 $labels['mailtoprotohandler'] = 'Rekisteröi mailto:-linkkien protokollakäsitteljä';
-$labels['folder'] = 'Kansio';
-$labels['foldername'] = 'Kansion nimi';
-$labels['subscribed'] = 'Näytetään';
+$labels['forwardmode'] = 'Viestin välitys';
+$labels['inline'] = 'inline';
+$labels['asattachment'] = 'liitteenä';
+
+$labels['folder']  = 'Kansio';
+$labels['folders']  = 'Kansiot';
+$labels['foldername']  = 'Kansion nimi';
+$labels['subscribed']  = 'Näytetään';
 $labels['messagecount'] = 'Viestejä';
-$labels['create'] = 'Luo uusi';
-$labels['createfolder'] = 'Luo uusi kansio';
-$labels['managefolders'] = 'Kansioiden hallinta';
+$labels['create']  = 'Luo uusi';
+$labels['createfolder']  = 'Luo uusi kansio';
+$labels['managefolders']  = 'Kansioiden hallinta';
 $labels['specialfolders'] = 'Erikoiskansiot';
 $labels['properties'] = 'Ominaisuudet';
 $labels['folderproperties'] = 'Kansion ominaisuudet';
@@ -411,22 +493,29 @@ $labels['info'] = 'Tietoja';
 $labels['getfoldersize'] = 'Napsauta saadaksesi kansion koon';
 $labels['changesubscription'] = 'Klikkaa muuttaaksesi tilausta';
 $labels['foldertype'] = 'Kansion tyyppi';
-$labels['personalfolder'] = 'Yksityinen kansio';
-$labels['otherfolder'] = 'Toisen käyttäjän kansio';
-$labels['sharedfolder'] = 'Julkinen kansio';
+$labels['personalfolder']  = 'Yksityinen kansio';
+$labels['otherfolder']  = 'Toisen käyttäjän kansio';
+$labels['sharedfolder']  = 'Julkinen kansio';
+
 $labels['sortby'] = 'Järjestä';
-$labels['sortasc'] = 'Järjestä nousevasti (a-ö)';
+$labels['sortasc']  = 'Järjestä nousevasti (a-ö)';
 $labels['sortdesc'] = 'Järjestä laskevasti (ö-a)';
 $labels['undo'] = 'Kumoa';
+
+$labels['installedplugins'] = 'Asennetut lisäosat';
 $labels['plugin'] = 'Liitännäinen';
 $labels['version'] = 'Versio';
 $labels['source'] = 'Lähde';
 $labels['license'] = 'Lisenssi';
 $labels['support'] = 'Hanki tukea';
+
+// units
 $labels['B'] = 't';
 $labels['KB'] = 'Kt';
 $labels['MB'] = 'Mt';
 $labels['GB'] = 'Gt';
+
+// character sets
 $labels['unicode'] = 'Unicode';
 $labels['english'] = 'Englantilainen';
 $labels['westerneuropean'] = 'Länsieurooppalainen';
@@ -446,3 +535,4 @@ $labels['japanese'] = 'Japanilainen';
 $labels['korean'] = 'Korealainen';
 $labels['chinese'] = 'Kiinalainen';
 
+?>
diff --git a/program/localization/fi_FI/messages.inc b/program/localization/fi_FI/messages.inc
index cfaa623b2..adcb36607 100644
--- a/program/localization/fi_FI/messages.inc
+++ b/program/localization/fi_FI/messages.inc
@@ -2,20 +2,23 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/fi_FI/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Jiri Grönroos                                                |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['errortitle'] = 'Virhe havaittu.';
-$messages['loginfailed'] = 'Sisäänkirjautuminen epäonnistui';
+$messages['errortitle']  = 'Virhe havaittu.';
+$messages['loginfailed']  = 'Sisäänkirjautuminen epäonnistui';
 $messages['cookiesdisabled'] = 'Selaimesi ei hyväksy evästeitä';
 $messages['sessionerror'] = 'Sessio ei kelpaa tai ei ole enää voimassa';
 $messages['storageerror'] = 'Yhteys IMAP-palvelimeen epäonnistui';
@@ -26,9 +29,11 @@ $messages['requesttimedout'] = 'Pyyntö aikakatkaistiin';
 $messages['errorreadonly'] = 'Toiminnon suoritus ei onnistu, koska hakemisto on vain lukutilassa.';
 $messages['errornoperm'] = 'Toimintoa ei voitu suorittaa. Ei oikeuksia.';
 $messages['invalidrequest'] = 'Virheellinen pyyntö! Tietoa ei tallennettu.';
+$messages['invalidhost'] = 'Virheellinen palvelinnimi.';
 $messages['nomessagesfound'] = 'Kansiossa ei ole sähköpostiviestejä';
 $messages['loggedout'] = 'Sinut on kirjattu ulos järjestelmästä.';
 $messages['mailboxempty'] = 'Kansio on tyhjä';
+$messages['refreshing'] = 'Päivitetään...';
 $messages['loading'] = 'Ladataan...';
 $messages['uploading'] = 'Ladataan tiedostoa palvelimelle...';
 $messages['uploadingmany'] = 'Ladataan tiedostoja...';
@@ -55,11 +60,11 @@ $messages['errormoving'] = 'Viestiä ei voitu siirtää';
 $messages['errorcopying'] = 'Viestiä ei voitu kopioida';
 $messages['errordeleting'] = 'Viestiä ei voitu poistaa';
 $messages['errormarking'] = 'Viestiä ei voitu merkiä';
-$messages['deletecontactconfirm'] = 'Haluatko varmasti poistaa valitut yhteystiedot?';
-$messages['deletegroupconfirm'] = 'Haluatko varmasti poistaa valitun ryhmän?';
+$messages['deletecontactconfirm']  = 'Haluatko varmasti poistaa valitut yhteystiedot?';
+$messages['deletegroupconfirm']  = 'Haluatko varmasti poistaa valitun ryhmän?';
 $messages['deletemessagesconfirm'] = 'Haluatko varmasti poistaa valitut viestit?';
-$messages['deletefolderconfirm'] = 'Haluatko varmasti poistaa kansion?';
-$messages['purgefolderconfirm'] = 'Haluatko varmasti poistaa kaikki viestit kansiosta?';
+$messages['deletefolderconfirm']  = 'Haluatko varmasti poistaa kansion?';
+$messages['purgefolderconfirm']  = 'Haluatko varmasti poistaa kaikki viestit kansiosta?';
 $messages['contactdeleting'] = 'Poistetaan yhteystietoja...';
 $messages['groupdeleting'] = 'Poistetaan ryhmää...';
 $messages['folderdeleting'] = 'Poistetaan kansiota...';
@@ -68,11 +73,11 @@ $messages['foldersubscribing'] = 'Tilataan kansio...';
 $messages['folderunsubscribing'] = 'Perutaan kansio tilaus...';
 $messages['formincomplete'] = 'Lomakkeen tiedot olivat puutteelliset';
 $messages['noemailwarning'] = 'Anna sähköpostiosoite';
-$messages['nonamewarning'] = 'Anna nimi';
+$messages['nonamewarning']  = 'Anna nimi';
 $messages['nopagesizewarning'] = 'Anna sivukoko';
 $messages['nosenderwarning'] = 'Anna lähettäjän sähköpostiosoite';
 $messages['norecipientwarning'] = 'Anna ainakin yksi vastaanottaja';
-$messages['nosubjectwarning'] = '"Otsikko"-kenttä on tyhjä. Haluatko kirjoittaa viestillesi otsikon?';
+$messages['nosubjectwarning']  = '"Otsikko"-kenttä on tyhjä. Haluatko kirjoittaa viestillesi otsikon?';
 $messages['nobodywarning'] = 'Lähetetäänkö viesti ilman tekstiä?';
 $messages['notsentwarning'] = 'Viestiä ei lähetetty. Haluatko poistaa viestin?';
 $messages['noldapserver'] = 'Valitse LDAP-palvelin';
@@ -114,8 +119,9 @@ $messages['selectimportfile'] = 'Valitse lähetettävä tiedosto';
 $messages['addresswriterror'] = 'Valittuun osoitekirjaan ei voi kirjoittaa';
 $messages['contactaddedtogroup'] = 'Yhteystiedot lisätty ryhmään';
 $messages['contactremovedfromgroup'] = 'Yhteystiedot poistettu ryhmästä';
+$messages['nogroupassignmentschanged'] = 'No group assignments changed.';
 $messages['importwait'] = 'Tuodaan, odota...';
-$messages['importerror'] = 'Tuonti epäonnistui! Lähetetty tiedosto ei ole vCard-muodossa.';
+$messages['importformaterror'] = 'Tuonti epäonnistui! Lähetetty tiedosto ei ole kelvollinen tuontitiedosto.';
 $messages['importconfirm'] = '<b>$inserted yhteystietoa tuotu onnistuneesti</b>';
 $messages['importconfirmskipped'] = '<b>Ohitettu $skipped  olemassa olevaa merkintää</b>';
 $messages['opnotpermitted'] = 'Toiminto ei ole sallittu!';
@@ -157,4 +163,7 @@ $messages['invalidimageformat'] = 'Virheellinen kuvamuoto.';
 $messages['mispellingsfound'] = 'Viestissä havaittiin kielioppivirheitä.';
 $messages['parentnotwritable'] = 'Kansiota ei voitu siirtää tai luoda valittuun yläkansioon. Ei käyttöoikeutta.';
 $messages['messagetoobig'] = 'Viestiosa on liian suuri prosessoitavaksi.';
+$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'] = 'Varoitus: Tämä verkkopohjainen sähköpostipalvelu vaatii Javascriptin toimiakseen. Ota Javascript käyttöön selaimesi asetuksista.';
 
+?>
diff --git a/program/localization/fr_FR/csv2vcard.inc b/program/localization/fr_FR/csv2vcard.inc
new file mode 100644
index 000000000..bb77001b5
--- /dev/null
+++ b/program/localization/fr_FR/csv2vcard.inc
@@ -0,0 +1,96 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/<lang>/csv2vcard.inc                                     |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Aleksander Machniak <alec@alec.pl>                            |
+ +-----------------------------------------------------------------------+
+*/
+
+// This is a list of CSV column names specified in CSV file header
+// These must be original texts used in Outlook/Thunderbird exported csv files
+// Encoding UTF-8
+
+$map = array();
+
+// MS Outlook 2010
+$map['anniversary'] = "Anniversaire de mariage ou fête";
+$map['assistants_name'] = "Nom de l''assistant(e)";
+$map['assistants_phone'] = "Téléphone de l''assistant(e)";
+$map['birthday'] = "Anniversaire";
+$map['business_city'] = "Ville (bureau)";
+$map['business_countryregion'] = "Pays/Région (bureau)";
+$map['business_fax'] = "Télécopie (bureau)";
+$map['business_phone'] = "Téléphone (bureau)";
+$map['business_phone_2'] = "Téléphone 2 (bureau)";
+$map['business_postal_code'] = "Code postal (bureau)";
+$map['business_state'] = "Dép/Région (bureau)";
+$map['business_street'] = "Rue (bureau)";
+$map['car_phone'] = "Téléphone (voiture)";
+$map['categories'] = "Catégories";
+$map['company'] = "Société";
+$map['department'] = "Service";
+$map['email_address'] = "Adresse de messagerie";
+$map['first_name'] = "Prénom";
+$map['gender'] = "Sexe";
+$map['home_city'] = "Ville (domicile)";
+$map['home_countryregion'] = "Pays/Région (domicile)";
+$map['home_fax'] = "Télécopie (domicile)";
+$map['home_phone'] = "Téléphone (domicile)";
+$map['home_phone_2'] = "Téléphone 2 (domicile)";
+$map['home_postal_code'] = "Code postal (domicile)";
+$map['home_state'] = "Dép/Région (domicile)";
+$map['home_street'] = "Rue (domicile)";
+$map['job_title'] = "Profession";
+$map['last_name'] = "Nom";
+$map['managers_name'] = "Manager's Name";
+$map['middle_name'] = "Deuxième prénom";
+$map['mobile_phone'] = "Tél. mobile";
+$map['notes'] = "Notes";
+$map['other_city'] = "Ville (autre)";
+$map['other_countryregion'] = "Pays/Région (autre)";
+$map['other_fax'] = "Télécopie (autre)";
+$map['other_phone'] = "Téléphone (autre)";
+$map['other_postal_code'] = "Code postal (autre)";
+$map['other_state'] = "Dép/Région (autre)";
+$map['other_street'] = "Rue (autre)";
+$map['pager'] = "Récepteur de radiomessagerie";
+$map['primary_phone'] = "Téléphone principal";
+$map['spouse'] = "Conjoint(e)";
+$map['suffix'] = "Suffixe";
+$map['title'] = "Titre";
+$map['web_page'] = "Page Web";
+
+// Thunderbird
+$map['birth_day'] = "Jour";
+$map['birth_month'] = "Mois";
+$map['birth_year'] = "Année de naissance";
+$map['display_name'] = "Nom à afficher";
+$map['fax_number'] = "Fax";
+$map['home_address'] = "Adresse privée";
+$map['home_country'] = "Région";
+$map['home_zipcode'] = "Code postal";
+$map['mobile_number'] = "Portable";
+$map['nickname'] = "Surnom";
+$map['organization'] = "Société";
+$map['pager_number'] = "Pager";
+$map['primary_email'] = "Adresse électronique principale";
+$map['secondary_email'] = "Adresse électronique secondaire";
+$map['web_page_1'] = "Site Web 1";
+$map['web_page_2'] = "Site Web 2";
+$map['work_phone'] = "Tél. professionnel";
+$map['work_address'] = "Adresse professionnelle";
+$map['work_country'] = "Région";
+$map['work_zipcode'] = "Code postal";
+
+// Other
+$map['_home_city'] = "Ville";
diff --git a/program/localization/fr_FR/labels.inc b/program/localization/fr_FR/labels.inc
index b608b1626..6731ecc3f 100644
--- a/program/localization/fr_FR/labels.inc
+++ b/program/localization/fr_FR/labels.inc
@@ -2,60 +2,78 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/fr_FR/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Sébastien BLAISOT <sebastien@blaisot.org>                    |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = 'Bienvenue sur $product';
-$labels['username'] = 'Utilisateur';
-$labels['password'] = 'Mot de passe';
-$labels['server'] = 'Serveur';
-$labels['login'] = 'Connexion';
-$labels['logout'] = 'Quitter';
-$labels['mail'] = 'Courriel';
+
+// login page
+$labels['welcome']   = 'Bienvenue sur $product';
+$labels['username']  = 'Utilisateur';
+$labels['password']  = 'Mot de passe';
+$labels['server']    = 'Serveur';
+$labels['login']     = 'Connexion';
+
+// taskbar
+$labels['logout']   = 'Quitter';
+$labels['mail']     = 'Courriel';
 $labels['settings'] = 'Préférences';
 $labels['addressbook'] = 'Carnet d\'adresses';
-$labels['inbox'] = 'Messages reçus';
+
+// mailbox names
+$labels['inbox']  = 'Messages reçus';
 $labels['drafts'] = 'Brouillons';
-$labels['sent'] = 'Messages envoyés';
-$labels['trash'] = 'Corbeille';
-$labels['junk'] = 'Indésirables';
+$labels['sent']   = 'Messages envoyés';
+$labels['trash']  = 'Corbeille';
+$labels['junk']   = 'Indésirables';
+
+// message listing
 $labels['subject'] = 'Objet';
-$labels['from'] = 'De';
-$labels['to'] = 'À';
-$labels['cc'] = 'Cc';
-$labels['bcc'] = 'Cci';
+$labels['from']    = 'De';
+$labels['sender']  = 'Expéditeur';
+$labels['to']      = 'À';
+$labels['cc']      = 'Cc';
+$labels['bcc']     = 'Cci';
 $labels['replyto'] = 'Répondre à';
 $labels['followupto'] = 'Faire suivre à';
-$labels['date'] = 'Date';
-$labels['size'] = 'Taille';
+$labels['date']    = 'Date';
+$labels['size']    = 'Taille';
 $labels['priority'] = 'Priorité';
 $labels['organization'] = 'Organisation';
 $labels['readstatus'] = 'Statut de lecture';
 $labels['listoptions'] = 'Lister les options...';
+
 $labels['mailboxlist'] = 'Dossiers';
-$labels['folders'] = 'Dossiers';
 $labels['messagesfromto'] = 'Messages de $from à $to sur $count';
 $labels['threadsfromto'] = 'Fil de $from à $to sur $count';
 $labels['messagenrof'] = 'Message $nr sur $count';
 $labels['fromtoshort'] = '$from – $to de $count';
-$labels['copy'] = 'Copier';
-$labels['move'] = 'Déplacer';
-$labels['moveto'] = 'Déplacer vers...';
+
+$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';
+
 $labels['filename'] = 'Nom du fichier';
 $labels['filesize'] = 'Taille du fichier';
+
 $labels['addtoaddressbook'] = 'Ajouter au carnet d\'adresses';
+
+// weekdays short
 $labels['sun'] = 'Dim';
 $labels['mon'] = 'Lun';
 $labels['tue'] = 'Mar';
@@ -63,78 +81,88 @@ $labels['wed'] = 'Mer';
 $labels['thu'] = 'Jeu';
 $labels['fri'] = 'Ven';
 $labels['sat'] = 'Sam';
-$labels['sunday'] = 'Dimanche';
-$labels['monday'] = 'Lundi';
-$labels['tuesday'] = 'Mardi';
+
+// weekdays long
+$labels['sunday']    = 'Dimanche';
+$labels['monday']    = 'Lundi';
+$labels['tuesday']   = 'Mardi';
 $labels['wednesday'] = 'Mercredi';
-$labels['thursday'] = 'Jeudi';
-$labels['friday'] = 'Vendredi';
-$labels['saturday'] = 'Samedi';
-$labels['jan'] = 'Jan';
-$labels['feb'] = 'Fév';
-$labels['mar'] = 'Mar';
-$labels['apr'] = 'Avr';
-$labels['may'] = 'Mai';
-$labels['longmay'] = 'Mai';
-$labels['jun'] = 'Jun';
-$labels['jul'] = 'Jul';
-$labels['aug'] = 'Aoû';
-$labels['sep'] = 'Sep';
-$labels['oct'] = 'Oct';
-$labels['nov'] = 'Nov';
-$labels['dec'] = 'Déc';
-$labels['longjan'] = 'Janvier';
-$labels['longfeb'] = 'Février';
-$labels['longmar'] = 'Mars';
-$labels['longapr'] = 'Avril';
-$labels['longjun'] = 'Juin';
-$labels['longjul'] = 'Juillet';
-$labels['longaug'] = 'Août';
-$labels['longsep'] = 'Septembre';
-$labels['longoct'] = 'Octobre';
-$labels['longnov'] = 'Novembre';
-$labels['longdec'] = 'Décembre';
+$labels['thursday']  = 'Jeudi';
+$labels['friday']    = 'Vendredi';
+$labels['saturday']  = 'Samedi';
+
+// months short
+$labels['jan']	= 'Jan';
+$labels['feb']	= 'Fév';
+$labels['mar']	= 'Mar';
+$labels['apr']	= 'Avr';
+$labels['may']	= 'Mai';
+$labels['jun']	= 'Jun';
+$labels['jul'] 	= 'Jul';
+$labels['aug']	= 'Aoû';
+$labels['sep']	= 'Sep';
+$labels['oct']	= 'Oct';
+$labels['nov']	= 'Nov';
+$labels['dec']	= 'Déc';
+
+// months long
+$labels['longjan']	= 'Janvier';
+$labels['longfeb']	= 'Février';
+$labels['longmar']	= 'Mars';
+$labels['longapr']	= 'Avril';
+$labels['longmay']	= 'Mai';
+$labels['longjun']	= 'Juin';
+$labels['longjul']	= 'Juillet';
+$labels['longaug']	= 'Août';
+$labels['longsep']	= 'Septembre';
+$labels['longoct']	= 'Octobre';
+$labels['longnov']	= 'Novembre';
+$labels['longdec']	= 'Décembre';
+
 $labels['today'] = 'Aujourd\'hui';
-$labels['refresh'] = 'Actualiser';
-$labels['checkmail'] = 'Vérification des nouveaux messages';
-$labels['compose'] = 'Composer un nouveau message';
-$labels['writenewmessage'] = 'Écrire un nouveau message';
-$labels['reply'] = 'Répondre';
-$labels['replytomessage'] = 'Répondre au message';
+
+// toolbar buttons
+$labels['refresh']          = 'Actualiser';
+$labels['checkmail']        = 'Vérification des nouveaux messages';
+$labels['compose']          = 'Composer un nouveau message';
+$labels['writenewmessage']  = 'Écrire un nouveau message';
+$labels['reply']            = 'Répondre';
+$labels['replytomessage']   = 'Répondre au message';
 $labels['replytoallmessage'] = 'Répondre à tous';
-$labels['replyall'] = 'Répondre à tous';
-$labels['replylist'] = 'Répondre à la liste';
-$labels['forward'] = 'Transférer';
-$labels['forwardinline'] = 'Transférer dans le corps du message';
+$labels['replyall']         = 'Répondre à tous';
+$labels['replylist']        = 'Répondre à la liste';
+$labels['forward']          = 'Transférer';
+$labels['forwardinline']    = 'Transférer dans le corps du message';
 $labels['forwardattachment'] = 'Transférer en pièce-jointe';
-$labels['forwardmessage'] = 'Transmettre le message';
-$labels['deletemessage'] = 'Supprimer le message';
+$labels['forwardmessage']   = 'Transmettre le message';
+$labels['deletemessage']    = 'Supprimer le message';
 $labels['movemessagetotrash'] = 'Déplacer le message dans la corbeille';
-$labels['printmessage'] = 'Imprimer ce message';
-$labels['previousmessage'] = 'Voir le message précédent';
-$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['mark'] = 'Marquer';
-$labels['markmessages'] = 'Marquer les messages';
-$labels['markread'] = 'Comme lus';
-$labels['markunread'] = 'Comme non lus';
-$labels['markflagged'] = 'Comme suivi';
-$labels['markunflagged'] = 'Comme non-suivi';
-$labels['moreactions'] = 'Plus d\'actions...';
-$labels['more'] = 'Plus';
-$labels['back'] = 'Retour';
-$labels['options'] = 'Paramètres';
+$labels['printmessage']     = 'Imprimer ce message';
+$labels['previousmessage']  = 'Voir le message précédent';
+$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 la source';
+$labels['mark']             = 'Marquer';
+$labels['markmessages']     = 'Marquer les messages';
+$labels['markread']         = 'Comme lus';
+$labels['markunread']       = 'Comme non lus';
+$labels['markflagged']      = 'Comme suivi';
+$labels['markunflagged']    = 'Comme non-suivi';
+$labels['moreactions']      = 'Plus d\'actions...';
+$labels['more']             = 'Plus';
+$labels['back']             = 'Retour';
+$labels['options']          = 'Paramètres';
+
 $labels['select'] = 'Sélectionner';
 $labels['all'] = 'Tous';
 $labels['none'] = 'Aucun';
-$labels['nonesort'] = 'Aucun';
 $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';
@@ -145,12 +173,14 @@ $labels['expand-all'] = 'Afficher Tous';
 $labels['expand-unread'] = 'Afficher Non-lus';
 $labels['collapse-all'] = 'Fermer Tous';
 $labels['threaded'] = 'Par sujet';
+
 $labels['autoexpand_threads'] = 'Développer les sujets';
 $labels['do_expand'] = 'Tous les sujets';
 $labels['expand_only_unread'] = 'uniquement avec des messages non-lus';
 $labels['fromto'] = 'Expéditeur/Destinataire';
 $labels['flag'] = 'Drapeau';
 $labels['attachment'] = 'Pièce jointe';
+$labels['nonesort'] = 'Aucun';
 $labels['sentdate'] = 'Date d\'envoi';
 $labels['arrival'] = 'Date d\'arrivée';
 $labels['asc'] = 'Ascendant';
@@ -159,182 +189,220 @@ $labels['listcolumns'] = 'Lister les colonnes';
 $labels['listsorting'] = 'Colonne de tri';
 $labels['listorder'] = 'Ordre de tri';
 $labels['listmode'] = 'Mode d\'affichage de la liste';
+
 $labels['folderactions'] = 'Actions du dossier';
 $labels['compact'] = 'Compacter';
 $labels['empty'] = 'Vider';
+
 $labels['quota'] = 'Occupation disque';
-$labels['unknown'] = 'inconnue';
-$labels['unlimited'] = 'illimitée';
-$labels['quicksearch'] = 'Recherche rapide';
-$labels['resetsearch'] = 'Réinitialiser la recherche';
-$labels['searchmod'] = 'Portée de la recherche';
-$labels['msgtext'] = 'Message entier';
+$labels['unknown']  = 'inconnue';
+$labels['unlimited']  = 'illimitée';
+
+$labels['quicksearch']  = 'Recherche rapide';
+$labels['resetsearch']  = 'Réinitialiser la recherche';
+$labels['searchmod']  = 'Portée de la recherche';
+$labels['msgtext']  = 'Message entier';
+$labels['body']  = 'Corps';
+
 $labels['openinextwin'] = 'Ouvrir dans une nouvelle fenêtre';
 $labels['emlsave'] = 'Télécharger (.eml)';
-$labels['editasnew'] = 'Éditer en tant que nouveau message';
-$labels['send'] = 'Envoyer';
-$labels['sendmessage'] = 'Envoyer';
-$labels['savemessage'] = 'Enregistrer';
-$labels['addattachment'] = 'Joindre un fichier';
-$labels['charset'] = 'Encodage';
-$labels['editortype'] = 'Type d\'éditeur';
-$labels['returnreceipt'] = 'Accusé de réception';
-$labels['dsn'] = 'Notification d\'état de distribution';
+$labels['changeformattext'] = 'Afficher au format texte';
+$labels['changeformathtml'] = 'Afficher au format HTML';
+
+// message compose
+$labels['editasnew']      = 'Éditer en tant que nouveau message';
+$labels['send']           = 'Envoyer';
+$labels['sendmessage']    = 'Envoyer';
+$labels['savemessage']    = 'Enregistrer';
+$labels['addattachment']  = 'Joindre un fichier';
+$labels['charset']        = 'Encodage';
+$labels['editortype']     = 'Type d\'éditeur';
+$labels['returnreceipt']  = 'Accusé de réception';
+$labels['dsn']            = 'Notification d\'état de distribution';
 $labels['mailreplyintro'] = 'Le $date, $sender a écrit :';
 $labels['originalmessage'] = 'Message original';
-$labels['editidents'] = 'Modifier les identités';
-$labels['spellcheck'] = 'Vérifier l\'orthographe';
+
+$labels['editidents']    = 'Modifier les identités';
+$labels['spellcheck']    = 'Vérifier l\'orthographe';
 $labels['checkspelling'] = 'Vérifier l\'orthographe';
 $labels['resumeediting'] = 'Retourner à l\'édition';
-$labels['revertto'] = 'Revenir à';
+$labels['revertto']      = 'Revenir à';
+
 $labels['attach'] = 'Joindre';
 $labels['attachments'] = 'Fichiers joints';
 $labels['upload'] = 'Joindre';
 $labels['uploadprogress'] = '$percent ($current sur $total)';
-$labels['close'] = 'Fermer';
-$labels['messageoptions'] = 'Options du message';
-$labels['low'] = 'Basse';
-$labels['lowest'] = 'La plus basse';
-$labels['normal'] = 'Normale';
-$labels['high'] = 'Élevée';
+$labels['close']  = 'Fermer';
+$labels['messageoptions']  = 'Options du message';
+
+$labels['low']     = 'Basse';
+$labels['lowest']  = 'La plus basse';
+$labels['normal']  = 'Normale';
+$labels['high']    = 'Élevée';
 $labels['highest'] = 'La plus élevée';
-$labels['nosubject'] = '(pas de sujet)';
+
+$labels['nosubject']  = '(pas de sujet)';
 $labels['showimages'] = 'Afficher les images';
 $labels['alwaysshow'] = 'Toujours afficher les images de $sender';
-$labels['isdraft'] = 'Ceci est un brouillon.';
-$labels['andnmore'] = 'Plus de $nr...';
+$labels['isdraft']    = 'Ceci est un brouillon.';
+$labels['andnmore']   = 'Plus de $nr...';
 $labels['togglemoreheaders'] = 'Afficher plus d\'en-têtes du message';
 $labels['togglefullheaders'] = 'Afficher/Cacher l\'entête du message';
+
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'texte brut';
 $labels['savesentmessagein'] = 'Enregistrer le message envoyé dans';
 $labels['dontsave'] = 'ne pas enregistrer';
 $labels['maxuploadsize'] = 'La taille maximum autorisée pour un fichier est $size';
+
 $labels['addcc'] = 'Ajouter Cc';
 $labels['addbcc'] = 'Ajouter Cci';
 $labels['addreplyto'] = 'Ajouter Répondre à';
 $labels['addfollowupto'] = 'Ajouter Faire suivre à';
+
+// mdn
 $labels['mdnrequest'] = 'L\'expéditeur de ce message a demandé d\'être prévenu quand vous lirez ce message. Souhaitez-vous prévenir l\'expéditeur ?';
 $labels['receiptread'] = 'Accusé de réception (lu)';
 $labels['yourmessage'] = 'Ceci est un accusé de réception pour votre message';
 $labels['receiptnote'] = 'Note : Cet accusé de réception indique seulement que le message a été affiché sur l\'ordinateur du destinataire. Il n\'y a aucune garantie que le destinataire a lu ou compris le contenu du message.';
-$labels['name'] = 'Nom à afficher';
-$labels['firstname'] = 'Prénom';
-$labels['surname'] = 'Nom';
-$labels['middlename'] = 'Nom du milieu (US)';
-$labels['nameprefix'] = 'Préfixe';
-$labels['namesuffix'] = 'Suffixe';
-$labels['nickname'] = 'Surnom';
-$labels['jobtitle'] = 'Fonction';
-$labels['department'] = 'Département';
-$labels['gender'] = 'Sexe';
-$labels['maidenname'] = 'Nom de naissance';
-$labels['email'] = 'Courriel';
-$labels['phone'] = 'Téléphone';
-$labels['address'] = 'Adresse';
-$labels['street'] = 'Rue';
-$labels['locality'] = 'Ville';
-$labels['zipcode'] = 'Code postal';
-$labels['region'] = 'Région';
-$labels['country'] = 'Pays';
-$labels['birthday'] = 'Date de naissance';
-$labels['anniversary'] = 'Anniversaire';
-$labels['website'] = 'Site Web';
+
+// address boook
+$labels['name']         = 'Nom à afficher';
+$labels['firstname']    = 'Prénom';
+$labels['surname']      = 'Nom';
+$labels['middlename']   = 'Nom du milieu (US)';
+$labels['nameprefix']   = 'Préfixe';
+$labels['namesuffix']   = 'Suffixe';
+$labels['nickname']     = 'Surnom';
+$labels['jobtitle']     = 'Fonction';
+$labels['department']   = 'Département';
+$labels['gender']       = 'Sexe';
+$labels['maidenname']   = 'Nom de naissance';
+$labels['email']        = 'Courriel';
+$labels['phone']        = 'Téléphone';
+$labels['address']      = 'Adresse';
+$labels['street']       = 'Rue';
+$labels['locality']     = 'Ville';
+$labels['zipcode']      = 'Code postal';
+$labels['region']       = 'Région';
+$labels['country']      = 'Pays';
+$labels['birthday']     = 'Date de naissance';
+$labels['anniversary']  = 'Anniversaire';
+$labels['website']      = 'Site Web';
 $labels['instantmessenger'] = 'Messagerie instantanée';
 $labels['notes'] = 'Notes';
-$labels['male'] = 'Homme';
+$labels['male']   = 'Homme';
 $labels['female'] = 'Femme';
 $labels['manager'] = 'Manager';
 $labels['assistant'] = 'Assistante';
-$labels['typeassistant'] = 'Assistante';
 $labels['spouse'] = 'Épouse';
 $labels['allfields'] = 'Tous les champs';
 $labels['search'] = 'Rechercher';
 $labels['advsearch'] = 'Recherche avancée';
 $labels['advanced'] = 'Détails';
 $labels['other'] = 'Autre';
-$labels['typeother'] = 'Autre';
-$labels['typehome'] = 'Domicile';
-$labels['typework'] = 'Travail';
-$labels['typemobile'] = 'Mobile';
-$labels['typemain'] = 'Principale';
-$labels['typehomefax'] = 'Fax personnel';
-$labels['typeworkfax'] = 'Fax professionnel';
-$labels['typecar'] = 'Voiture';
-$labels['typepager'] = 'Pager';
-$labels['typevideo'] = 'Vidéo';
-$labels['typehomepage'] = 'Accueil';
+
+$labels['typehome']   = 'Domicile';
+$labels['typework']   = 'Travail';
+$labels['typeother']  = 'Autre';
+$labels['typemobile']  = 'Mobile';
+$labels['typemain']  = 'Principale';
+$labels['typehomefax']  = 'Fax personnel';
+$labels['typeworkfax']  = 'Fax professionnel';
+$labels['typecar']  = 'Voiture';
+$labels['typepager']  = 'Pager';
+$labels['typevideo']  = 'Vidéo';
+$labels['typeassistant']  = 'Assistante';
+$labels['typehomepage']  = 'Accueil';
 $labels['typeblog'] = 'Blog';
 $labels['typeprofile'] = 'Profil';
+
 $labels['addfield'] = 'Ajouter un champ...';
 $labels['addcontact'] = 'Ajouter le contact sélectionné à votre Carnet d\'adresses';
 $labels['editcontact'] = 'Modifier le contact';
 $labels['contacts'] = 'Contacts';
 $labels['contactproperties'] = 'Propriétés du contact';
 $labels['personalinfo'] = 'Informations personnelles';
-$labels['edit'] = 'Modifier';
+
+$labels['edit']   = 'Modifier';
 $labels['cancel'] = 'Annuler';
-$labels['save'] = 'Enregistrer';
+$labels['save']   = 'Enregistrer';
 $labels['delete'] = 'Supprimer';
 $labels['rename'] = 'Renommer';
 $labels['addphoto'] = 'Ajouter';
 $labels['replacephoto'] = 'Remplacer';
 $labels['uploadphoto'] = 'Envoyer une photo';
-$labels['newcontact'] = 'Créer un nouveau contact';
-$labels['deletecontact'] = 'Supprimer les contacts sélectionnés';
-$labels['composeto'] = 'Écrire un message à';
+
+$labels['newcontact']     = 'Créer un nouveau contact';
+$labels['deletecontact']  = 'Supprimer les contacts sélectionnés';
+$labels['composeto']      = 'Écrire un message à';
 $labels['contactsfromto'] = 'Contacts de $from à $to sur $count';
-$labels['print'] = 'Imprimer';
-$labels['export'] = 'Exporter';
-$labels['exportvcards'] = 'Exporter les contacts au format vCard';
+$labels['print']          = 'Imprimer';
+$labels['export']         = 'Exporter';
+$labels['exportall']      = 'Exporter tout';
+$labels['exportsel']      = 'Exporter la sélection';
+$labels['exportvcards']   = 'Exporter les contacts au format vCard';
 $labels['newcontactgroup'] = 'Créer un nouveau groupe de contacts';
-$labels['grouprename'] = 'Renommer le groupe';
-$labels['groupdelete'] = 'Supprimer le groupe';
+$labels['grouprename']    = 'Renommer le groupe';
+$labels['groupdelete']    = 'Supprimer le groupe';
 $labels['groupremoveselected'] = 'Retiré les contacts sélectionnés du groupe';
-$labels['previouspage'] = 'Montrer page précédente';
-$labels['firstpage'] = 'Voir la première page';
-$labels['nextpage'] = 'Montrer page suivante';
-$labels['lastpage'] = 'Voir la dernière page';
+
+$labels['previouspage']   = 'Montrer page précédente';
+$labels['firstpage']      = 'Voir la première page';
+$labels['nextpage']       = 'Montrer page suivante';
+$labels['lastpage']       = 'Voir la dernière page';
+
 $labels['group'] = 'Groupe';
 $labels['groups'] = 'Groupes';
 $labels['personaladrbook'] = 'Adresses personnelles';
+
 $labels['searchsave'] = 'Enregistrer la recherche';
 $labels['searchdelete'] = 'Supprimer la recherche';
+
 $labels['import'] = 'Importer';
 $labels['importcontacts'] = 'Importer les contacts';
 $labels['importfromfile'] = 'Importer depuis un fichier :';
 $labels['importtarget'] = 'Ajouter de nouveaux contact au carnet d’adresse :';
 $labels['importreplace'] = 'Remplacer le carnet d\'adresse entier';
+$labels['importdesc'] = 'Vous pouvez télécharger des contacts à partir d\'un carnet d\'adresses existant.<br/>Nous supportons actuellement l\'importation d\'adresses à partir des format de données <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> ou CSV (comma -séparés).';
 $labels['done'] = 'Terminé';
+
+// settings
 $labels['settingsfor'] = 'Paramètres pour';
 $labels['about'] = 'A propos';
 $labels['preferences'] = 'Préférences';
 $labels['userpreferences'] = 'Préférences utilisateur';
 $labels['editpreferences'] = 'Modifier les préférences utilisateur';
+
 $labels['identities'] = 'Identités';
 $labels['manageidentities'] = 'Gérer les identités pour ce compte';
 $labels['newidentity'] = 'Nouvelle identité';
+
 $labels['newitem'] = 'Nouvel élément';
 $labels['edititem'] = 'Modifier l\'élément';
+
 $labels['preferhtml'] = 'Afficher en HTML';
 $labels['defaultcharset'] = 'Encodage par défaut';
 $labels['htmlmessage'] = 'Message en HTML';
+$labels['messagepart'] = 'Partie';
+$labels['digitalsig'] = 'Signature numérique';
 $labels['dateformat'] = 'Format de la date';
 $labels['timeformat'] = 'Format de l\'heure';
 $labels['prettydate'] = 'Affichage court des dates';
-$labels['setdefault'] = 'Paramètres par défaut';
-$labels['autodetect'] = 'Automatique';
-$labels['language'] = 'Langue';
-$labels['timezone'] = 'Fuseau horaire';
-$labels['pagesize'] = 'Nombre de lignes par page';
+$labels['setdefault']  = 'Paramètres par défaut';
+$labels['autodetect']  = 'Automatique';
+$labels['language']  = 'Langue';
+$labels['timezone']  = 'Fuseau horaire';
+$labels['pagesize']  = 'Nombre de lignes par page';
 $labels['signature'] = 'Signature';
-$labels['dstactive'] = 'Heure d\'été';
+$labels['dstactive']  = 'Heure d\'été';
 $labels['showinextwin'] = 'Ouvrir le message dans une nouvelle fenêtre';
 $labels['composeextwin'] = 'Écrire dans une nouvelle fenêtre';
 $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';
@@ -357,11 +425,11 @@ $labels['showremoteimages'] = 'Afficher les images distantes';
 $labels['fromknownsenders'] = 'venant d\'expéditeurs connus';
 $labels['always'] = 'toujours';
 $labels['showinlineimages'] = 'Afficher les images attachées après le message';
-$labels['autosavedraft'] = 'Enregistrement automatique des brouillons';
-$labels['everynminutes'] = 'toutes les $n minute(s)';
-$labels['refreshinterval'] = 'Rafraîchir (Vérifier les nouveaux messages, etc.)';
-$labels['never'] = 'jamais';
-$labels['immediately'] = 'Immédiatement';
+$labels['autosavedraft']  = 'Enregistrement automatique des brouillons';
+$labels['everynminutes']  = 'toutes les $n minute(s)';
+$labels['refreshinterval']  = 'Rafraîchir (Vérifier les nouveaux messages, etc.)';
+$labels['never']  = 'jamais';
+$labels['immediately']  = 'Immédiatement';
 $labels['messagesdisplaying'] = 'Affichage des messages';
 $labels['messagescomposition'] = 'Écriture des messages';
 $labels['mimeparamfolding'] = 'Nom du fichier attaché';
@@ -388,12 +456,9 @@ $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';
+$labels['previewpanemarkread']  = 'Marquer les messages prévisualisés comme lus';
+$labels['afternseconds']  = 'après $n secondes';
 $labels['reqmdn'] = 'Toujours demander un avis de réception';
 $labels['reqdsn'] = 'Toujours demander une notification d\'état de distribution';
 $labels['replysamefolder'] = 'Placer les réponses dans le dossier du message auquel il est répondu';
@@ -410,13 +475,15 @@ $labels['mailtoprotohandler'] = 'Enregistrer le gestionnaire de protocole pour l
 $labels['forwardmode'] = 'Transfert des messages';
 $labels['inline'] = 'dans le corps';
 $labels['asattachment'] = 'en pièce jointe';
-$labels['folder'] = 'Dossier';
-$labels['foldername'] = 'Nom du dossier';
-$labels['subscribed'] = 'Abonné';
+
+$labels['folder']  = 'Dossier';
+$labels['folders']  = 'Dossiers';
+$labels['foldername']  = 'Nom du dossier';
+$labels['subscribed']  = 'Abonné';
 $labels['messagecount'] = 'Messages';
-$labels['create'] = 'Créer';
-$labels['createfolder'] = 'Créer un nouveau dossier';
-$labels['managefolders'] = 'Organiser les dossiers';
+$labels['create']  = 'Créer';
+$labels['createfolder']  = 'Créer un nouveau dossier';
+$labels['managefolders']  = 'Organiser les dossiers';
 $labels['specialfolders'] = 'Dossiers spéciaux';
 $labels['properties'] = 'Propriétés';
 $labels['folderproperties'] = 'Propriétés du dossier';
@@ -426,23 +493,29 @@ $labels['info'] = 'Information';
 $labels['getfoldersize'] = 'Cliquer pour obtenir la taille de dossier';
 $labels['changesubscription'] = 'Cliquer pour modifier l\'inscription';
 $labels['foldertype'] = 'Type de répertoire';
-$labels['personalfolder'] = 'Répertoire privé';
-$labels['otherfolder'] = 'Répertoire d\'autres utilisateurs';
-$labels['sharedfolder'] = 'Répertoire public';
+$labels['personalfolder']  = 'Répertoire privé';
+$labels['otherfolder']  = 'Répertoire d\'autres utilisateurs';
+$labels['sharedfolder']  = 'Répertoire public';
+
 $labels['sortby'] = 'Trier par';
-$labels['sortasc'] = 'Tri ascendant';
+$labels['sortasc']  = 'Tri ascendant';
 $labels['sortdesc'] = 'Tri descendant';
 $labels['undo'] = 'Annuler';
+
 $labels['installedplugins'] = 'Extensions installées';
 $labels['plugin'] = 'Plugin';
 $labels['version'] = 'Version';
 $labels['source'] = 'Source';
 $labels['license'] = 'Licence';
 $labels['support'] = 'Support';
+
+// units
 $labels['B'] = 'o';
 $labels['KB'] = 'ko';
 $labels['MB'] = 'Mo';
 $labels['GB'] = 'Go';
+
+// character sets
 $labels['unicode'] = 'Unicode';
 $labels['english'] = 'Anglais';
 $labels['westerneuropean'] = 'Europe de l\'Ouest';
@@ -462,3 +535,4 @@ $labels['japanese'] = 'Japonais';
 $labels['korean'] = 'Coréen';
 $labels['chinese'] = 'Chinois';
 
+?>
diff --git a/program/localization/fr_FR/messages.inc b/program/localization/fr_FR/messages.inc
index b1fe1c362..a736e103e 100644
--- a/program/localization/fr_FR/messages.inc
+++ b/program/localization/fr_FR/messages.inc
@@ -2,20 +2,23 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/fr_FR/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Sébastien BLAISOT <sebastien@blaisot.org>                    |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['errortitle'] = 'Une erreur est survenue !';
-$messages['loginfailed'] = 'L\'authentification a échoué';
+$messages['errortitle']  = 'Une erreur est survenue !';
+$messages['loginfailed']  = 'L\'authentification a échoué';
 $messages['cookiesdisabled'] = 'Votre navigateur n\'accepte pas les cookies';
 $messages['sessionerror'] = 'Votre session est invalide ou a expiré';
 $messages['storageerror'] = 'Erreur de connexion au serveur IMAP';
@@ -25,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.';
@@ -57,11 +62,11 @@ $messages['errormoving'] = 'Impossible de déplacer le message';
 $messages['errorcopying'] = 'La copie de ce(s) message(s) a échoué.';
 $messages['errordeleting'] = 'Impossible d\'effacer le message';
 $messages['errormarking'] = 'Impossible de marquer le message';
-$messages['deletecontactconfirm'] = 'Êtes-vous sûr de vouloir supprimer le(s) contact(s) sélectionné(s) ?';
-$messages['deletegroupconfirm'] = 'Êtes-vous sûr de vouloir supprimer le groupe sélectionné ?';
+$messages['deletecontactconfirm']  = 'Êtes-vous sûr de vouloir supprimer le(s) contact(s) sélectionné(s) ?';
+$messages['deletegroupconfirm']  = 'Êtes-vous sûr de vouloir supprimer le groupe sélectionné ?';
 $messages['deletemessagesconfirm'] = 'Êtes-vous sûr de vouloir supprimer le(s) message(s) sélectionné(s) ?';
-$messages['deletefolderconfirm'] = 'Êtes-vous sûr de vouloir supprimer ce dossier ?';
-$messages['purgefolderconfirm'] = 'Êtes-vous sûr de vouloir supprimer tous les messages de ce dossier ?';
+$messages['deletefolderconfirm']  = 'Êtes-vous sûr de vouloir supprimer ce dossier ?';
+$messages['purgefolderconfirm']  = 'Êtes-vous sûr de vouloir supprimer tous les messages de ce dossier ?';
 $messages['contactdeleting'] = 'Suppression de contact(s)...';
 $messages['groupdeleting'] = 'Suppression du groupe ...';
 $messages['folderdeleting'] = 'Suppression du dossier...';
@@ -70,11 +75,11 @@ $messages['foldersubscribing'] = 'Inscription du dossier...';
 $messages['folderunsubscribing'] = 'Désinscription du dossier...';
 $messages['formincomplete'] = 'Le formulaire n\'a pas été entièrement rempli';
 $messages['noemailwarning'] = 'Veuillez spécifier un courriel valide';
-$messages['nonamewarning'] = 'Veuillez fournir un nom';
+$messages['nonamewarning']  = 'Veuillez fournir un nom';
 $messages['nopagesizewarning'] = 'Veuillez indiquer une taille de page';
 $messages['nosenderwarning'] = 'Veuillez renseigner l\'adresse d\'expéditeur';
 $messages['norecipientwarning'] = 'Veuillez ajouter au moins un destinataire';
-$messages['nosubjectwarning'] = 'Le champ «Objet» est vide. Souhaitez-vous le renseigner maintenant ?';
+$messages['nosubjectwarning']  = 'Le champ «Objet» est vide. Souhaitez-vous le renseigner maintenant ?';
 $messages['nobodywarning'] = 'Envoyer ce message sans texte ?';
 $messages['notsentwarning'] = 'Le message n\'a pas été envoyé. Voulez-vous abandonner ce message ?';
 $messages['noldapserver'] = 'Choisissez un serveur LDAP pour la recherche';
@@ -160,5 +165,7 @@ $messages['invalidimageformat'] = 'Format d\'image invalide';
 $messages['mispellingsfound'] = 'Des fautes d\'orthographe ont été détectées dans le message.';
 $messages['parentnotwritable'] = 'Impossible de créer/déplacer le dossier dans le dossier parent sélectionné. Aucun droit d\'accès.';
 $messages['messagetoobig'] = 'Le message est trop gros pour être traité.';
+$messages['attachmentvalidationerror'] = 'ATTENTION ! Cette pièce jointe est suspecte car son type ne correspond pas au type déclaré dans ce message. Si vous ne faites pas confiance à l\'expéditeur, vous ne devriez pas l\'ouvrir dans le navigateur, car il peut contenir des contenus malveillants.<br/><br/><em>Attendu : $expected; trouvé : $detected</em>';
 $messages['noscriptwarning'] = 'Atention : Ce service de webmail nécessite Javascript ! Pour pouvoir l\'utiliser, merci d\'activer Javascript dans les préférences de votre navigateur.';
 
+?>
diff --git a/program/localization/fy_NL/labels.inc b/program/localization/fy_NL/labels.inc
index c92c2d9b0..891371f58 100644
--- a/program/localization/fy_NL/labels.inc
+++ b/program/localization/fy_NL/labels.inc
@@ -2,45 +2,78 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/fy_NL/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Lazlo                                                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['username'] = 'Brûkersnamme';
-$labels['password'] = 'Wachtwurd';
-$labels['server'] = 'Server';
-$labels['login'] = 'Ynlogge';
-$labels['logout'] = 'Ôfmelde';
-$labels['mail'] = 'Mail';
+
+// login page
+$labels['welcome']   = 'Welcome to $product';
+$labels['username']  = 'Brûkersnamme';
+$labels['password']  = 'Wachtwurd';
+$labels['server']    = 'Server';
+$labels['login']     = 'Ynlogge';
+
+// taskbar
+$labels['logout']   = 'Ôfmelde';
+$labels['mail']     = 'Mail';
 $labels['settings'] = 'Ynstellingen';
 $labels['addressbook'] = 'Adresboek';
+
+// mailbox names
+$labels['inbox']  = 'Inbox';
 $labels['drafts'] = 'Konsepten';
-$labels['sent'] = 'Stjoerd';
-$labels['trash'] = 'Jiskefet';
+$labels['sent']   = 'Stjoerd';
+$labels['trash']  = 'Jiskefet';
+$labels['junk']   = 'Junk';
+
+// message listing
 $labels['subject'] = 'Ûnderwerp';
-$labels['from'] = 'Fan';
-$labels['to'] = 'Oan';
-$labels['cc'] = 'Cc';
-$labels['bcc'] = 'Bcc';
+$labels['from']    = 'Fan';
+$labels['sender']  = 'Sender';
+$labels['to']      = 'Oan';
+$labels['cc']      = 'Cc';
+$labels['bcc']     = 'Bcc';
 $labels['replyto'] = 'Antwurd oan';
 $labels['followupto'] = 'Oanslutend oan';
-$labels['date'] = 'Datum';
+$labels['date']    = 'Datum';
+$labels['size']    = 'Size';
+$labels['priority'] = 'Priority';
 $labels['organization'] = 'Organisaasje';
+$labels['readstatus'] = 'Read status';
+$labels['listoptions'] = 'List options...';
+
 $labels['mailboxlist'] = 'Mappen';
-$labels['folders'] = 'Mappen';
-$labels['copy'] = 'Kopieare';
-$labels['move'] = 'Ferplaatse';
+$labels['messagesfromto'] = 'Messages $from to $to of $count';
+$labels['threadsfromto'] = 'Threads $from to $to of $count';
+$labels['messagenrof'] = 'Message $nr of $count';
+$labels['fromtoshort'] = '$from – $to of $count';
+
+$labels['copy']     = 'Kopieare';
+$labels['move']     = 'Ferplaatse';
+$labels['moveto']   = 'Move to...';
 $labels['download'] = 'Delhelje';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'Toane';
+$labels['showanyway'] = 'Show it anyway';
+
+$labels['filename'] = 'File name';
 $labels['filesize'] = 'Triemgrutte';
+
+$labels['addtoaddressbook'] = 'Add to address book';
+
+// weekdays short
 $labels['sun'] = 'sne';
 $labels['mon'] = 'moa';
 $labels['tue'] = 'tii';
@@ -48,38 +81,458 @@ $labels['wed'] = 'woa';
 $labels['thu'] = 'toa';
 $labels['fri'] = 'fre';
 $labels['sat'] = 'sno';
-$labels['sunday'] = 'snein';
-$labels['monday'] = 'moandei';
-$labels['tuesday'] = 'tiisdei';
+
+// weekdays long
+$labels['sunday']    = 'snein';
+$labels['monday']    = 'moandei';
+$labels['tuesday']   = 'tiisdei';
 $labels['wednesday'] = 'woansdei';
-$labels['thursday'] = 'tongersdei';
-$labels['friday'] = 'freed';
-$labels['saturday'] = 'sneon';
-$labels['jan'] = 'jan';
-$labels['feb'] = 'feb';
-$labels['mar'] = 'mrt';
-$labels['apr'] = 'apr';
-$labels['may'] = 'maaie';
-$labels['longmay'] = 'maaie';
-$labels['jun'] = 'jun';
-$labels['jul'] = 'jul';
-$labels['aug'] = 'aug';
-$labels['sep'] = 'sep';
-$labels['oct'] = 'okt';
-$labels['nov'] = 'nov';
-$labels['dec'] = 'des';
-$labels['longjan'] = 'jannewaris';
-$labels['longfeb'] = 'febrewaris';
-$labels['longmar'] = 'maart';
-$labels['longapr'] = 'april';
-$labels['longjun'] = 'juny';
-$labels['longjul'] = 'july';
-$labels['longaug'] = 'augustus';
-$labels['longsep'] = 'septimber';
-$labels['longoct'] = 'oktober';
-$labels['longnov'] = 'novimber';
-$labels['longdec'] = 'desimber';
+$labels['thursday']  = 'tongersdei';
+$labels['friday']    = 'freed';
+$labels['saturday']  = 'sneon';
+
+// months short
+$labels['jan']	= 'jan';
+$labels['feb']	= 'feb';
+$labels['mar']	= 'mrt';
+$labels['apr']	= 'apr';
+$labels['may']	= 'maaie';
+$labels['jun']	= 'jun';
+$labels['jul'] 	= 'jul';
+$labels['aug']	= 'aug';
+$labels['sep']	= 'sep';
+$labels['oct']	= 'okt';
+$labels['nov']	= 'nov';
+$labels['dec']	= 'des';
+
+// months long
+$labels['longjan']	= 'jannewaris';
+$labels['longfeb']	= 'febrewaris';
+$labels['longmar']	= 'maart';
+$labels['longapr']	= 'april';
+$labels['longmay']	= 'maaie';
+$labels['longjun']	= 'juny';
+$labels['longjul']	= 'july';
+$labels['longaug']	= 'augustus';
+$labels['longsep']	= 'septimber';
+$labels['longoct']	= 'oktober';
+$labels['longnov']	= 'novimber';
+$labels['longdec']	= 'desimber';
+
 $labels['today'] = 'Hjoed';
-$labels['refresh'] = 'Ferfarskje';
-$labels['reply'] = 'Beäntwurdzje';
 
+// toolbar buttons
+$labels['refresh']          = 'Ferfarskje';
+$labels['checkmail']        = 'Check for new messages';
+$labels['compose']          = 'Compose';
+$labels['writenewmessage']  = 'Create a new message';
+$labels['reply']            = 'Beäntwurdzje';
+$labels['replytomessage']   = 'Reply to sender';
+$labels['replytoallmessage'] = 'Reply to list or to sender and all recipients';
+$labels['replyall']         = 'Reply all';
+$labels['replylist']        = 'Reply list';
+$labels['forward']          = 'Forward';
+$labels['forwardinline']    = 'Forward inline';
+$labels['forwardattachment'] = 'Forward as attachment';
+$labels['forwardmessage']   = 'Forward the message';
+$labels['deletemessage']    = 'Delete message';
+$labels['movemessagetotrash'] = 'Move message to trash';
+$labels['printmessage']     = 'Print this message';
+$labels['previousmessage']  = 'Show previous message';
+$labels['firstmessage']     = 'Show first message';
+$labels['nextmessage']      = 'Show next message';
+$labels['lastmessage']      = 'Show last message';
+$labels['backtolist']       = 'Back to message list';
+$labels['viewsource']       = 'Show source';
+$labels['mark']             = 'Mark';
+$labels['markmessages']     = 'Mark messages';
+$labels['markread']         = 'As read';
+$labels['markunread']       = 'As unread';
+$labels['markflagged']      = 'As flagged';
+$labels['markunflagged']    = 'As unflagged';
+$labels['moreactions']      = 'More actions...';
+$labels['more']             = 'More';
+$labels['back']             = 'Back';
+$labels['options']          = 'Options';
+
+$labels['select'] = 'Select';
+$labels['all'] = 'All';
+$labels['none'] = 'None';
+$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';
+$labels['filter'] = 'Filter';
+$labels['list'] = 'List';
+$labels['threads'] = 'Threads';
+$labels['expand-all'] = 'Expand All';
+$labels['expand-unread'] = 'Expand Unread';
+$labels['collapse-all'] = 'Collapse All';
+$labels['threaded'] = 'Threaded';
+
+$labels['autoexpand_threads'] = 'Expand message threads';
+$labels['do_expand'] = 'all threads';
+$labels['expand_only_unread'] = 'only with unread messages';
+$labels['fromto'] = 'From/To';
+$labels['flag'] = 'Flag';
+$labels['attachment'] = 'Attachment';
+$labels['nonesort'] = 'None';
+$labels['sentdate'] = 'Sent date';
+$labels['arrival'] = 'Arrival date';
+$labels['asc'] = 'ascending';
+$labels['desc'] = 'descending';
+$labels['listcolumns'] = 'List columns';
+$labels['listsorting'] = 'Sorting column';
+$labels['listorder'] = 'Sorting order';
+$labels['listmode'] = 'List view mode';
+
+$labels['folderactions'] = 'Folder actions...';
+$labels['compact'] = 'Compact';
+$labels['empty'] = 'Empty';
+
+$labels['quota'] = 'Disk usage';
+$labels['unknown']  = 'unknown';
+$labels['unlimited']  = 'unlimited';
+
+$labels['quicksearch']  = 'Quick search';
+$labels['resetsearch']  = 'Reset search';
+$labels['searchmod']  = 'Search modifiers';
+$labels['msgtext']  = 'Entire message';
+$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';
+$labels['send']           = 'Send';
+$labels['sendmessage']    = 'Send message';
+$labels['savemessage']    = 'Save as draft';
+$labels['addattachment']  = 'Attach a file';
+$labels['charset']        = 'Charset';
+$labels['editortype']     = 'Editor type';
+$labels['returnreceipt']  = 'Return receipt';
+$labels['dsn']            = 'Delivery status notification';
+$labels['mailreplyintro'] = 'On $date, $sender wrote:';
+$labels['originalmessage'] = 'Original Message';
+
+$labels['editidents']    = 'Edit identities';
+$labels['spellcheck']    = 'Spell';
+$labels['checkspelling'] = 'Check spelling';
+$labels['resumeediting'] = 'Resume editing';
+$labels['revertto']      = 'Revert to';
+
+$labels['attach'] = 'Attach';
+$labels['attachments'] = 'Attachments';
+$labels['upload'] = 'Upload';
+$labels['uploadprogress'] = '$percent ($current from $total)';
+$labels['close']  = 'Close';
+$labels['messageoptions']  = 'Message options...';
+
+$labels['low']     = 'Low';
+$labels['lowest']  = 'Lowest';
+$labels['normal']  = 'Normal';
+$labels['high']    = 'High';
+$labels['highest'] = 'Highest';
+
+$labels['nosubject']  = '(no subject)';
+$labels['showimages'] = 'Display images';
+$labels['alwaysshow'] = 'Always show images from $sender';
+$labels['isdraft']    = 'This is a draft message.';
+$labels['andnmore']   = '$nr more...';
+$labels['togglemoreheaders'] = 'Show more message headers';
+$labels['togglefullheaders'] = 'Toggle raw message headers';
+
+$labels['htmltoggle'] = 'HTML';
+$labels['plaintoggle'] = 'Plain text';
+$labels['savesentmessagein'] = 'Save sent message in';
+$labels['dontsave'] = 'don\'t save';
+$labels['maxuploadsize'] = 'Maximum allowed file size is $size';
+
+$labels['addcc'] = 'Add Cc';
+$labels['addbcc'] = 'Add Bcc';
+$labels['addreplyto'] = 'Add Reply-To';
+$labels['addfollowupto'] = 'Add Followup-To';
+
+// mdn
+$labels['mdnrequest'] = 'The sender of this message has asked to be notified when you read this message. Do you wish to notify the sender?';
+$labels['receiptread'] = 'Return Receipt (read)';
+$labels['yourmessage'] = 'This is a Return Receipt for your message';
+$labels['receiptnote'] = 'Note: This receipt only acknowledges that the message was displayed on the recipient\'s computer. There is no guarantee that the recipient has read or understood the message contents.';
+
+// address boook
+$labels['name']         = 'Display Name';
+$labels['firstname']    = 'First Name';
+$labels['surname']      = 'Last Name';
+$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['email']        = 'Email';
+$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['typepager']  = 'Pager';
+$labels['typevideo']  = 'Video';
+$labels['typeassistant']  = 'Assistant';
+$labels['typehomepage']  = 'Home Page';
+$labels['typeblog'] = 'Blog';
+$labels['typeprofile'] = 'Profile';
+
+$labels['addfield'] = 'Add field...';
+$labels['addcontact'] = 'Add new contact';
+$labels['editcontact'] = 'Edit contact';
+$labels['contacts'] = 'Contacts';
+$labels['contactproperties'] = 'Contact properties';
+$labels['personalinfo'] = 'Personal information';
+
+$labels['edit']   = 'Edit';
+$labels['cancel'] = 'Cancel';
+$labels['save']   = 'Save';
+$labels['delete'] = 'Delete';
+$labels['rename'] = 'Rename';
+$labels['addphoto'] = 'Add';
+$labels['replacephoto'] = 'Replace';
+$labels['uploadphoto'] = 'Upload photo';
+
+$labels['newcontact']     = 'Create new contact card';
+$labels['deletecontact']  = 'Delete selected contacts';
+$labels['composeto']      = 'Compose mail to';
+$labels['contactsfromto'] = 'Contacts $from to $to of $count';
+$labels['print']          = 'Print';
+$labels['export']         = 'Export';
+$labels['exportall']      = 'Export all';
+$labels['exportsel']      = 'Export selected';
+$labels['exportvcards']   = 'Export contacts in vCard format';
+$labels['newcontactgroup'] = 'Create new contact group';
+$labels['grouprename']    = 'Rename group';
+$labels['groupdelete']    = 'Delete group';
+$labels['groupremoveselected'] = 'Remove selected contacts from group';
+
+$labels['previouspage']   = 'Show previous page';
+$labels['firstpage']      = 'Show first page';
+$labels['nextpage']       = 'Show next page';
+$labels['lastpage']       = 'Show last page';
+
+$labels['group'] = 'Group';
+$labels['groups'] = 'Groups';
+$labels['personaladrbook'] = 'Personal Addresses';
+
+$labels['searchsave'] = 'Save search';
+$labels['searchdelete'] = 'Delete search';
+
+$labels['import'] = 'Import';
+$labels['importcontacts'] = 'Import contacts';
+$labels['importfromfile'] = 'Import from file:';
+$labels['importtarget'] = 'Add new contacts to address book:';
+$labels['importreplace'] = 'Replace the entire address book';
+$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['done'] = 'Done';
+
+// settings
+$labels['settingsfor'] = 'Settings for';
+$labels['about'] = 'About';
+$labels['preferences'] = 'Preferences';
+$labels['userpreferences'] = 'User preferences';
+$labels['editpreferences'] = 'Edit user preferences';
+
+$labels['identities'] = 'Identities';
+$labels['manageidentities'] = 'Manage identities for this account';
+$labels['newidentity'] = 'New identity';
+
+$labels['newitem'] = 'New item';
+$labels['edititem'] = 'Edit item';
+
+$labels['preferhtml'] = 'Display HTML';
+$labels['defaultcharset'] = 'Default Character Set';
+$labels['htmlmessage'] = 'HTML Message';
+$labels['messagepart'] = 'Part';
+$labels['digitalsig'] = 'Digital Signature';
+$labels['dateformat'] = 'Date format';
+$labels['timeformat'] = 'Time format';
+$labels['prettydate'] = 'Pretty dates';
+$labels['setdefault']  = 'Set default';
+$labels['autodetect']  = 'Auto';
+$labels['language']  = 'Language';
+$labels['timezone']  = 'Time zone';
+$labels['pagesize']  = 'Rows per page';
+$labels['signature'] = 'Signature';
+$labels['dstactive']  = 'Daylight saving time';
+$labels['showinextwin'] = 'Open message in a new window';
+$labels['composeextwin'] = 'Compose in a new window';
+$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';
+$labels['logoutcompact'] = 'Compact Inbox on logout';
+$labels['uisettings'] = 'User Interface';
+$labels['serversettings'] = 'Server Settings';
+$labels['mailboxview'] = 'Mailbox View';
+$labels['mdnrequests'] = 'On request for return receipt';
+$labels['askuser'] = 'ask me';
+$labels['autosend'] = 'send receipt';
+$labels['autosendknown'] = 'send receipt to my contacts, otherwise ask me';
+$labels['autosendknownignore'] = 'send receipt to my contacts, otherwise ignore';
+$labels['ignore'] = 'ignore';
+$labels['readwhendeleted'] = 'Mark the message as read on delete';
+$labels['flagfordeletion'] = 'Flag the message for deletion instead of delete';
+$labels['skipdeleted'] = 'Do not show deleted messages';
+$labels['deletealways'] = 'If moving messages to Trash fails, delete them';
+$labels['deletejunk'] = 'Directly delete messages in Junk';
+$labels['showremoteimages'] = 'Display remote inline images';
+$labels['fromknownsenders'] = 'from known senders';
+$labels['always'] = 'always';
+$labels['showinlineimages'] = 'Display attached images below the message';
+$labels['autosavedraft']  = 'Automatically save draft';
+$labels['everynminutes']  = 'every $n minute(s)';
+$labels['refreshinterval']  = 'Refresh (check for new messages, etc.)';
+$labels['never']  = 'never';
+$labels['immediately']  = 'immediately';
+$labels['messagesdisplaying'] = 'Displaying Messages';
+$labels['messagescomposition'] = 'Composing Messages';
+$labels['mimeparamfolding'] = 'Attachment names';
+$labels['2231folding'] = 'Full RFC 2231 (Thunderbird)';
+$labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
+$labels['2047folding'] = 'Full RFC 2047 (other)';
+$labels['force7bit'] = 'Use MIME encoding for 8-bit characters';
+$labels['advancedoptions'] = 'Advanced options';
+$labels['focusonnewmessage'] = 'Focus browser window on new message';
+$labels['checkallfolders'] = 'Check all folders for new messages';
+$labels['displaynext'] = 'After message delete/move display the next message';
+$labels['defaultfont'] = 'Default font of HTML message';
+$labels['mainoptions'] = 'Main Options';
+$labels['browseroptions'] = 'Browser Options';
+$labels['section'] = 'Section';
+$labels['maintenance'] = 'Maintenance';
+$labels['newmessage'] = 'New Message';
+$labels['signatureoptions'] = 'Signature Options';
+$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'] = 'Automatically add signature';
+$labels['newmessageonly'] = 'new message only';
+$labels['replyandforwardonly'] = 'replies and forwards only';
+$labels['insertsignature'] = 'Insert signature';
+$labels['previewpanemarkread']  = 'Mark previewed messages as read';
+$labels['afternseconds']  = 'after $n seconds';
+$labels['reqmdn'] = 'Always request a return receipt';
+$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'] = 'Check spelling before sending a message';
+$labels['spellcheckoptions'] = 'Spellcheck Options';
+$labels['spellcheckignoresyms'] = 'Ignore words with symbols';
+$labels['spellcheckignorenums'] = 'Ignore words with numbers';
+$labels['spellcheckignorecaps'] = 'Ignore words with all letters capitalized';
+$labels['addtodict'] = 'Add to dictionary';
+$labels['mailtoprotohandler'] = 'Register protocol handler for mailto: links';
+$labels['forwardmode'] = 'Messages forwarding';
+$labels['inline'] = 'inline';
+$labels['asattachment'] = 'as attachment';
+
+$labels['folder']  = 'Folder';
+$labels['folders']  = 'Mappen';
+$labels['foldername']  = 'Folder name';
+$labels['subscribed']  = 'Subscribed';
+$labels['messagecount'] = 'Messages';
+$labels['create']  = 'Create';
+$labels['createfolder']  = 'Create new folder';
+$labels['managefolders']  = 'Manage folders';
+$labels['specialfolders'] = 'Special Folders';
+$labels['properties'] = 'Properties';
+$labels['folderproperties'] = 'Folder properties';
+$labels['parentfolder'] = 'Parent folder';
+$labels['location'] = 'Location';
+$labels['info'] = 'Information';
+$labels['getfoldersize'] = 'Click to get folder size';
+$labels['changesubscription'] = 'Click to change subscription';
+$labels['foldertype'] = 'Folder Type';
+$labels['personalfolder']  = 'Private Folder';
+$labels['otherfolder']  = 'Other User\'s Folder';
+$labels['sharedfolder']  = 'Public Folder';
+
+$labels['sortby'] = 'Sort by';
+$labels['sortasc']  = 'Sort ascending';
+$labels['sortdesc'] = 'Sort descending';
+$labels['undo'] = 'Undo';
+
+$labels['installedplugins'] = 'Installed plugins';
+$labels['plugin'] = 'Plugin';
+$labels['version'] = 'Version';
+$labels['source'] = 'Source';
+$labels['license'] = 'License';
+$labels['support'] = 'Get support';
+
+// units
+$labels['B'] = 'B';
+$labels['KB'] = 'KB';
+$labels['MB'] = 'MB';
+$labels['GB'] = 'GB';
+
+// character sets
+$labels['unicode'] = 'Unicode';
+$labels['english'] = '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['turkish'] = 'Turkish';
+$labels['nordic'] = 'Nordic';
+$labels['thai'] = 'Thai';
+$labels['celtic'] = 'Celtic';
+$labels['vietnamese'] = 'Vietnamese';
+$labels['japanese'] = 'Japanese';
+$labels['korean'] = 'Korean';
+$labels['chinese'] = 'Chinese';
+
+?>
diff --git a/program/localization/ga_IE/labels.inc b/program/localization/ga_IE/labels.inc
index 14a5cd1b4..9f0da6550 100755
--- a/program/localization/ga_IE/labels.inc
+++ b/program/localization/ga_IE/labels.inc
@@ -2,53 +2,78 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ga_IE/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = 'Fáilte go $product';
-$labels['username'] = 'Úsáideoir';
-$labels['password'] = 'Pasfhocal';
-$labels['server'] = 'Freastalaí';
-$labels['login'] = 'Logáil isteach';
-$labels['logout'] = 'Logáil amach';
-$labels['mail'] = 'Postas';
+
+// login page
+$labels['welcome']   = 'Fáilte go $product';
+$labels['username']  = 'Úsáideoir';
+$labels['password']  = 'Pasfhocal';
+$labels['server']    = 'Freastalaí';
+$labels['login']     = 'Logáil isteach';
+
+// taskbar
+$labels['logout']   = 'Logáil amach';
+$labels['mail']     = 'Postas';
 $labels['settings'] = 'Socruithe Pearsanta';
 $labels['addressbook'] = 'Leabhair Seoltaí';
-$labels['inbox'] = 'Isteach';
+
+// mailbox names
+$labels['inbox']  = 'Isteach';
 $labels['drafts'] = 'Dréachtaí';
-$labels['sent'] = 'Amach';
-$labels['trash'] = 'Bosca bruscair';
-$labels['junk'] = 'Dramhaíl';
+$labels['sent']   = 'Amach';
+$labels['trash']  = 'Bosca bruscair';
+$labels['junk']   = 'Dramhaíl';
+
+// message listing
 $labels['subject'] = 'Ábhair';
-$labels['from'] = 'Seolaí';
-$labels['to'] = 'Faighteoir';
-$labels['cc'] = 'Cóipeáil';
-$labels['bcc'] = 'Cóip cheilte';
+$labels['from']    = 'Seolaí';
+$labels['sender']  = 'Sender';
+$labels['to']      = 'Faighteoir';
+$labels['cc']      = 'Cóipeáil';
+$labels['bcc']     = 'Cóip cheilte';
 $labels['replyto'] = 'Freagair go';
-$labels['date'] = 'Dáta';
-$labels['size'] = 'Méid';
+$labels['followupto'] = 'Followup-To';
+$labels['date']    = 'Dáta';
+$labels['size']    = 'Méid';
 $labels['priority'] = 'Tosaíocht';
 $labels['organization'] = 'Eagraíocht';
+$labels['readstatus'] = 'Read status';
+$labels['listoptions'] = 'List options...';
+
 $labels['mailboxlist'] = 'Fillteán';
-$labels['folders'] = 'Fillteán';
 $labels['messagesfromto'] = 'Teachtaireachta as $from go $to as $count';
+$labels['threadsfromto'] = 'Threads $from to $to of $count';
 $labels['messagenrof'] = 'Teachtaireacht $nr as $count';
-$labels['copy'] = 'Cóipeáil';
-$labels['move'] = 'Bog';
-$labels['moveto'] = 'bog go...';
+$labels['fromtoshort'] = '$from – $to of $count';
+
+$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';
+
 $labels['filename'] = 'Comhad';
 $labels['filesize'] = 'Toirt';
+
 $labels['addtoaddressbook'] = 'Sábháil i mo leabhair seoltaí';
+
+// weekdays short
 $labels['sun'] = 'Do';
 $labels['mon'] = 'Lu';
 $labels['tue'] = 'Mh';
@@ -56,136 +81,458 @@ $labels['wed'] = 'Ch';
 $labels['thu'] = 'Dé';
 $labels['fri'] = 'Ao';
 $labels['sat'] = 'Sa';
-$labels['sunday'] = 'Domhnach';
-$labels['monday'] = 'An Luan';
-$labels['tuesday'] = 'An Mháirt';
+
+// weekdays long
+$labels['sunday']    = 'Domhnach';
+$labels['monday']    = 'An Luan';
+$labels['tuesday']   = 'An Mháirt';
 $labels['wednesday'] = 'An Chéadaoin';
-$labels['thursday'] = 'An Déardaoin';
-$labels['friday'] = 'Aoine';
-$labels['saturday'] = 'An Satharn';
-$labels['jan'] = 'Ean';
-$labels['feb'] = 'Fea';
-$labels['mar'] = 'Már';
-$labels['apr'] = 'Aib';
-$labels['may'] = 'Bea';
-$labels['longmay'] = 'Bea';
-$labels['jun'] = 'Mei';
-$labels['jul'] = 'Iúi';
-$labels['aug'] = 'Lún';
-$labels['nov'] = 'Sam';
-$labels['dec'] = 'Nol';
-$labels['longjan'] = 'Eanáir';
-$labels['longfeb'] = 'Feabhra';
-$labels['longmar'] = 'Márta';
-$labels['longapr'] = 'Aibreán';
-$labels['longjun'] = 'Meitheamh';
-$labels['longjul'] = 'Iúil';
-$labels['longaug'] = 'Lúnasa';
-$labels['longsep'] = 'Meán Fómhair';
-$labels['longoct'] = 'Deireadh Fómhair';
-$labels['longnov'] = 'Samhain';
-$labels['longdec'] = 'Nollag';
+$labels['thursday']  = 'An Déardaoin';
+$labels['friday']    = 'Aoine';
+$labels['saturday']  = 'An Satharn';
+
+// months short
+$labels['jan']	= 'Ean';
+$labels['feb']	= 'Fea';
+$labels['mar']	= 'Már';
+$labels['apr']	= 'Aib';
+$labels['may']	= 'Bea';
+$labels['jun']	= 'Mei';
+$labels['jul'] 	= 'Iúi';
+$labels['aug']	= 'Lún';
+$labels['sep']	= 'Sep';
+$labels['oct']	= 'Oct';
+$labels['nov']	= 'Sam';
+$labels['dec']	= 'Nol';
+
+// months long
+$labels['longjan']	= 'Eanáir';
+$labels['longfeb']	= 'Feabhra';
+$labels['longmar']	= 'Márta';
+$labels['longapr']	= 'Aibreán';
+$labels['longmay']	= 'Bea';
+$labels['longjun']	= 'Meitheamh';
+$labels['longjul']	= 'Iúil';
+$labels['longaug']	= 'Lúnasa';
+$labels['longsep']	= 'Meán Fómhair';
+$labels['longoct']	= 'Deireadh Fómhair';
+$labels['longnov']	= 'Samhain';
+$labels['longdec']	= 'Nollag';
+
 $labels['today'] = 'Inniu';
-$labels['checkmail'] = 'Seiceáil chun teachtaireacht nua';
-$labels['compose'] = 'Scríobh teachtaireacht';
-$labels['writenewmessage'] = 'Scríobh teachtaireacht nua';
-$labels['replytomessage'] = 'Scríobh freagra chun an seolaí';
+
+// toolbar buttons
+$labels['refresh']          = 'Refresh';
+$labels['checkmail']        = 'Seiceáil chun teachtaireacht nua';
+$labels['compose']          = 'Scríobh teachtaireacht';
+$labels['writenewmessage']  = 'Scríobh teachtaireacht nua';
+$labels['reply']            = 'Reply';
+$labels['replytomessage']   = 'Scríobh freagra chun an seolaí';
 $labels['replytoallmessage'] = 'Scríobh freagra chun an seolaí agus na faighteoir';
-$labels['replyall'] = 'Freagra gach';
-$labels['forwardmessage'] = 'Seol ar aghaidh an teachtaireacht';
-$labels['deletemessage'] = 'Chuir an teachtaireacht i mo bosca bruscair';
-$labels['printmessage'] = 'Priontáil an teachtaireacht seo';
-$labels['previousmessage'] = 'Taispeáin an teachtaireacht roimhe seo';
-$labels['firstmessage'] = 'Taispeáin an cead teachtaireacht';
-$labels['nextmessage'] = 'Taispeáin an teachtaireacht ina dhiaidh sin';
-$labels['lastmessage'] = 'Taispeáin an teachtaireacht deireanach';
-$labels['backtolist'] = 'Téigh ar ais go dtí an liosta teachtaireachta';
-$labels['viewsource'] = 'Éiriú bunchód';
+$labels['replyall']         = 'Freagra gach';
+$labels['replylist']        = 'Reply list';
+$labels['forward']          = 'Forward';
+$labels['forwardinline']    = 'Forward inline';
+$labels['forwardattachment'] = 'Forward as attachment';
+$labels['forwardmessage']   = 'Seol ar aghaidh an teachtaireacht';
+$labels['deletemessage']    = 'Chuir an teachtaireacht i mo bosca bruscair';
+$labels['movemessagetotrash'] = 'Move message to trash';
+$labels['printmessage']     = 'Priontáil an teachtaireacht seo';
+$labels['previousmessage']  = 'Taispeáin an teachtaireacht roimhe seo';
+$labels['firstmessage']     = 'Taispeáin an cead teachtaireacht';
+$labels['nextmessage']      = 'Taispeáin an teachtaireacht ina dhiaidh sin';
+$labels['lastmessage']      = 'Taispeáin an teachtaireacht deireanach';
+$labels['backtolist']       = 'Téigh ar ais go dtí an liosta teachtaireachta';
+$labels['viewsource']       = 'Éiriú bunchód';
+$labels['mark']             = 'Mark';
+$labels['markmessages']     = 'Mark messages';
+$labels['markread']         = 'As read';
+$labels['markunread']       = 'As unread';
+$labels['markflagged']      = 'As flagged';
+$labels['markunflagged']    = 'As unflagged';
+$labels['moreactions']      = 'More actions...';
+$labels['more']             = 'More';
+$labels['back']             = 'Back';
+$labels['options']          = 'Options';
+
 $labels['select'] = 'Togh';
 $labels['all'] = 'An uile';
 $labels['none'] = 'Aon cheann';
-$labels['nonesort'] = 'Aon cheann';
+$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';
+$labels['filter'] = 'Filter';
+$labels['list'] = 'List';
+$labels['threads'] = 'Threads';
+$labels['expand-all'] = 'Expand All';
+$labels['expand-unread'] = 'Expand Unread';
+$labels['collapse-all'] = 'Collapse All';
+$labels['threaded'] = 'Threaded';
+
+$labels['autoexpand_threads'] = 'Expand message threads';
+$labels['do_expand'] = 'all threads';
+$labels['expand_only_unread'] = 'only with unread messages';
+$labels['fromto'] = 'From/To';
+$labels['flag'] = 'Flag';
+$labels['attachment'] = 'Attachment';
+$labels['nonesort'] = 'Aon cheann';
+$labels['sentdate'] = 'Sent date';
+$labels['arrival'] = 'Arrival date';
+$labels['asc'] = 'ascending';
+$labels['desc'] = 'descending';
+$labels['listcolumns'] = 'List columns';
+$labels['listsorting'] = 'Sorting column';
+$labels['listorder'] = 'Sorting order';
+$labels['listmode'] = 'List view mode';
+
+$labels['folderactions'] = 'Folder actions...';
 $labels['compact'] = 'Comhbhrúigh';
 $labels['empty'] = 'Folmhaigh';
+
 $labels['quota'] = 'Toilleadh diosca atá athláimhe';
-$labels['unknown'] = 'gan aithne';
-$labels['unlimited'] = 'gan teorainn';
-$labels['quicksearch'] = 'Mearcuardaigh';
-$labels['resetsearch'] = 'Athshocraigh an cuardach';
-$labels['sendmessage'] = 'Seol mo teachtaireacht láithreach bonn';
-$labels['savemessage'] = 'Sábháil an dréachta seo';
-$labels['addattachment'] = 'Suimigh Iatán';
-$labels['charset'] = 'Foireann carachtar';
-$labels['editortype'] = 'Sort eagarthóir';
-$labels['returnreceipt'] = 'Admháil léite';
+$labels['unknown']  = 'gan aithne';
+$labels['unlimited']  = 'gan teorainn';
+
+$labels['quicksearch']  = 'Mearcuardaigh';
+$labels['resetsearch']  = 'Athshocraigh an cuardach';
+$labels['searchmod']  = 'Search modifiers';
+$labels['msgtext']  = 'Entire message';
+$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';
+$labels['send']           = 'Send';
+$labels['sendmessage']    = 'Seol mo teachtaireacht láithreach bonn';
+$labels['savemessage']    = 'Sábháil an dréachta seo';
+$labels['addattachment']  = 'Suimigh Iatán';
+$labels['charset']        = 'Foireann carachtar';
+$labels['editortype']     = 'Sort eagarthóir';
+$labels['returnreceipt']  = 'Admháil léite';
+$labels['dsn']            = 'Delivery status notification';
+$labels['mailreplyintro'] = 'On $date, $sender wrote:';
+$labels['originalmessage'] = 'Original Message';
+
+$labels['editidents']    = 'Edit identities';
+$labels['spellcheck']    = 'Spell';
 $labels['checkspelling'] = 'Fiosrú ar mo litriú';
 $labels['resumeediting'] = 'Athdhúisigh eagarthóireacht';
-$labels['revertto'] = 'Filleadh ar';
+$labels['revertto']      = 'Filleadh ar';
+
+$labels['attach'] = 'Attach';
 $labels['attachments'] = 'Iatání';
 $labels['upload'] = 'Aistriú suas';
-$labels['close'] = 'Dún';
-$labels['low'] = 'Íseal';
-$labels['lowest'] = 'Is Ísle';
-$labels['normal'] = 'Gnách';
-$labels['high'] = 'Ard';
+$labels['uploadprogress'] = '$percent ($current from $total)';
+$labels['close']  = 'Dún';
+$labels['messageoptions']  = 'Message options...';
+
+$labels['low']     = 'Íseal';
+$labels['lowest']  = 'Is Ísle';
+$labels['normal']  = 'Gnách';
+$labels['high']    = 'Ard';
 $labels['highest'] = 'Is Airde';
-$labels['nosubject'] = '(Níl aon Ábhair)';
+
+$labels['nosubject']  = '(Níl aon Ábhair)';
 $labels['showimages'] = 'Taispeáin na híomhánna';
+$labels['alwaysshow'] = 'Always show images from $sender';
+$labels['isdraft']    = 'This is a draft message.';
+$labels['andnmore']   = '$nr more...';
+$labels['togglemoreheaders'] = 'Show more message headers';
+$labels['togglefullheaders'] = 'Toggle raw message headers';
+
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Téacs amháin';
-$labels['name'] = 'Leasainm';
-$labels['firstname'] = 'Ainm baiste';
-$labels['surname'] = 'Sloinne';
-$labels['email'] = 'Ríomhphost';
+$labels['savesentmessagein'] = 'Save sent message in';
+$labels['dontsave'] = 'don\'t save';
+$labels['maxuploadsize'] = 'Maximum allowed file size is $size';
+
+$labels['addcc'] = 'Add Cc';
+$labels['addbcc'] = 'Add Bcc';
+$labels['addreplyto'] = 'Add Reply-To';
+$labels['addfollowupto'] = 'Add Followup-To';
+
+// mdn
+$labels['mdnrequest'] = 'The sender of this message has asked to be notified when you read this message. Do you wish to notify the sender?';
+$labels['receiptread'] = 'Return Receipt (read)';
+$labels['yourmessage'] = 'This is a Return Receipt for your message';
+$labels['receiptnote'] = 'Note: This receipt only acknowledges that the message was displayed on the recipient\'s computer. There is no guarantee that the recipient has read or understood the message contents.';
+
+// address boook
+$labels['name']         = 'Leasainm';
+$labels['firstname']    = 'Ainm baiste';
+$labels['surname']      = 'Sloinne';
+$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['email']        = 'Ríomhphost';
+$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['typepager']  = 'Pager';
+$labels['typevideo']  = 'Video';
+$labels['typeassistant']  = 'Assistant';
+$labels['typehomepage']  = 'Home Page';
+$labels['typeblog'] = 'Blog';
+$labels['typeprofile'] = 'Profile';
+
+$labels['addfield'] = 'Add field...';
 $labels['addcontact'] = 'Sábháil duine nua';
 $labels['editcontact'] = 'Chuir chara in eagar';
-$labels['edit'] = 'Athraigh';
+$labels['contacts'] = 'Contacts';
+$labels['contactproperties'] = 'Contact properties';
+$labels['personalinfo'] = 'Personal information';
+
+$labels['edit']   = 'Athraigh';
 $labels['cancel'] = 'Cealaigh';
-$labels['save'] = 'Sábháil';
+$labels['save']   = 'Sábháil';
 $labels['delete'] = 'Scrios';
-$labels['newcontact'] = 'Scríobh carta teagmháil nua';
-$labels['deletecontact'] = 'Scrios na daoine seo';
-$labels['composeto'] = 'Scríobh teachtaireacht go';
+$labels['rename'] = 'Rename';
+$labels['addphoto'] = 'Add';
+$labels['replacephoto'] = 'Replace';
+$labels['uploadphoto'] = 'Upload photo';
+
+$labels['newcontact']     = 'Scríobh carta teagmháil nua';
+$labels['deletecontact']  = 'Scrios na daoine seo';
+$labels['composeto']      = 'Scríobh teachtaireacht go';
 $labels['contactsfromto'] = 'Daoine as $from to $to as $count';
-$labels['print'] = 'Priontáil';
-$labels['export'] = 'Easportáil';
-$labels['previouspage'] = 'Taispeáin an foireann roimhe seo';
-$labels['firstpage'] = 'Taispeáin an céad foireann';
-$labels['nextpage'] = 'Taispeáin an foireann ina dhiaidh sin';
-$labels['lastpage'] = 'Taispeáin an foireann deireanach';
+$labels['print']          = 'Priontáil';
+$labels['export']         = 'Easportáil';
+$labels['exportall']      = 'Export all';
+$labels['exportsel']      = 'Export selected';
+$labels['exportvcards']   = 'Export contacts in vCard format';
+$labels['newcontactgroup'] = 'Create new contact group';
+$labels['grouprename']    = 'Rename group';
+$labels['groupdelete']    = 'Delete group';
+$labels['groupremoveselected'] = 'Remove selected contacts from group';
+
+$labels['previouspage']   = 'Taispeáin an foireann roimhe seo';
+$labels['firstpage']      = 'Taispeáin an céad foireann';
+$labels['nextpage']       = 'Taispeáin an foireann ina dhiaidh sin';
+$labels['lastpage']       = 'Taispeáin an foireann deireanach';
+
+$labels['group'] = 'Group';
 $labels['groups'] = 'Grúpaí';
 $labels['personaladrbook'] = 'Seoltaí Pearsanta';
+
+$labels['searchsave'] = 'Save search';
+$labels['searchdelete'] = 'Delete search';
+
+$labels['import'] = 'Import';
+$labels['importcontacts'] = 'Import contacts';
+$labels['importfromfile'] = 'Import from file:';
+$labels['importtarget'] = 'Add new contacts to address book:';
+$labels['importreplace'] = 'Replace the entire address book';
+$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['done'] = 'Done';
+
+// settings
 $labels['settingsfor'] = 'Socruithe chun';
+$labels['about'] = 'About';
 $labels['preferences'] = 'Tosaíocht';
 $labels['userpreferences'] = 'Tosaíocht Pearsanta';
 $labels['editpreferences'] = 'Athraigh tosaíocht pearsanta';
+
 $labels['identities'] = 'Céannachtaí';
 $labels['manageidentities'] = 'Stiúir céannachtaí i cuntas seo';
 $labels['newidentity'] = 'Céannacht nua';
+
 $labels['newitem'] = 'Mír nua';
 $labels['edititem'] = 'Athraigh mhír';
+
 $labels['preferhtml'] = 'Taispeáin an HTML';
+$labels['defaultcharset'] = 'Default Character Set';
 $labels['htmlmessage'] = 'Teachtaireacht HTML';
+$labels['messagepart'] = 'Part';
+$labels['digitalsig'] = 'Digital Signature';
+$labels['dateformat'] = 'Date format';
+$labels['timeformat'] = 'Time format';
 $labels['prettydate'] = 'Dátaí Dheas';
-$labels['setdefault'] = 'Socraigh an réamhshocraithe';
-$labels['language'] = 'Teanga';
-$labels['timezone'] = 'Crios ama';
-$labels['pagesize'] = 'Rónna in aghaidh gach leathanach';
+$labels['setdefault']  = 'Socraigh an réamhshocraithe';
+$labels['autodetect']  = 'Auto';
+$labels['language']  = 'Teanga';
+$labels['timezone']  = 'Crios ama';
+$labels['pagesize']  = 'Rónna in aghaidh gach leathanach';
 $labels['signature'] = 'Mana clabhsúir';
-$labels['dstactive'] = 'Laethúil um shamhradh';
+$labels['dstactive']  = 'Laethúil um shamhradh';
+$labels['showinextwin'] = 'Open message in a new window';
+$labels['composeextwin'] = 'Compose in a new window';
 $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['autosavedraft'] = 'Sábháil dréachta go huathoibríoch';
-$labels['never'] = 'riamh';
-$labels['folder'] = 'Fillteán';
-$labels['foldername'] = 'Ainm fillteán';
-$labels['subscribed'] = 'Síntiú';
-$labels['create'] = 'Cruthaigh';
-$labels['createfolder'] = 'Cruthaigh fillteán nua';
-$labels['managefolders'] = 'Stiúir na fillteán';
+$labels['skin'] = 'Interface skin';
+$labels['logoutclear'] = 'Clear Trash on logout';
+$labels['logoutcompact'] = 'Compact Inbox on logout';
+$labels['uisettings'] = 'User Interface';
+$labels['serversettings'] = 'Server Settings';
+$labels['mailboxview'] = 'Mailbox View';
+$labels['mdnrequests'] = 'On request for return receipt';
+$labels['askuser'] = 'ask me';
+$labels['autosend'] = 'send receipt';
+$labels['autosendknown'] = 'send receipt to my contacts, otherwise ask me';
+$labels['autosendknownignore'] = 'send receipt to my contacts, otherwise ignore';
+$labels['ignore'] = 'ignore';
+$labels['readwhendeleted'] = 'Mark the message as read on delete';
+$labels['flagfordeletion'] = 'Flag the message for deletion instead of delete';
+$labels['skipdeleted'] = 'Do not show deleted messages';
+$labels['deletealways'] = 'If moving messages to Trash fails, delete them';
+$labels['deletejunk'] = 'Directly delete messages in Junk';
+$labels['showremoteimages'] = 'Display remote inline images';
+$labels['fromknownsenders'] = 'from known senders';
+$labels['always'] = 'always';
+$labels['showinlineimages'] = 'Display attached images below the message';
+$labels['autosavedraft']  = 'Sábháil dréachta go huathoibríoch';
+$labels['everynminutes']  = 'every $n minute(s)';
+$labels['refreshinterval']  = 'Refresh (check for new messages, etc.)';
+$labels['never']  = 'riamh';
+$labels['immediately']  = 'immediately';
+$labels['messagesdisplaying'] = 'Displaying Messages';
+$labels['messagescomposition'] = 'Composing Messages';
+$labels['mimeparamfolding'] = 'Attachment names';
+$labels['2231folding'] = 'Full RFC 2231 (Thunderbird)';
+$labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
+$labels['2047folding'] = 'Full RFC 2047 (other)';
+$labels['force7bit'] = 'Use MIME encoding for 8-bit characters';
+$labels['advancedoptions'] = 'Advanced options';
+$labels['focusonnewmessage'] = 'Focus browser window on new message';
+$labels['checkallfolders'] = 'Check all folders for new messages';
+$labels['displaynext'] = 'After message delete/move display the next message';
+$labels['defaultfont'] = 'Default font of HTML message';
+$labels['mainoptions'] = 'Main Options';
+$labels['browseroptions'] = 'Browser Options';
+$labels['section'] = 'Section';
+$labels['maintenance'] = 'Maintenance';
+$labels['newmessage'] = 'New Message';
+$labels['signatureoptions'] = 'Signature Options';
+$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'] = 'Automatically add signature';
+$labels['newmessageonly'] = 'new message only';
+$labels['replyandforwardonly'] = 'replies and forwards only';
+$labels['insertsignature'] = 'Insert signature';
+$labels['previewpanemarkread']  = 'Mark previewed messages as read';
+$labels['afternseconds']  = 'after $n seconds';
+$labels['reqmdn'] = 'Always request a return receipt';
+$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'] = 'Check spelling before sending a message';
+$labels['spellcheckoptions'] = 'Spellcheck Options';
+$labels['spellcheckignoresyms'] = 'Ignore words with symbols';
+$labels['spellcheckignorenums'] = 'Ignore words with numbers';
+$labels['spellcheckignorecaps'] = 'Ignore words with all letters capitalized';
+$labels['addtodict'] = 'Add to dictionary';
+$labels['mailtoprotohandler'] = 'Register protocol handler for mailto: links';
+$labels['forwardmode'] = 'Messages forwarding';
+$labels['inline'] = 'inline';
+$labels['asattachment'] = 'as attachment';
+
+$labels['folder']  = 'Fillteán';
+$labels['folders']  = 'Fillteán';
+$labels['foldername']  = 'Ainm fillteán';
+$labels['subscribed']  = 'Síntiú';
+$labels['messagecount'] = 'Messages';
+$labels['create']  = 'Cruthaigh';
+$labels['createfolder']  = 'Cruthaigh fillteán nua';
+$labels['managefolders']  = 'Stiúir na fillteán';
+$labels['specialfolders'] = 'Special Folders';
+$labels['properties'] = 'Properties';
+$labels['folderproperties'] = 'Folder properties';
+$labels['parentfolder'] = 'Parent folder';
+$labels['location'] = 'Location';
+$labels['info'] = 'Information';
+$labels['getfoldersize'] = 'Click to get folder size';
+$labels['changesubscription'] = 'Click to change subscription';
+$labels['foldertype'] = 'Folder Type';
+$labels['personalfolder']  = 'Private Folder';
+$labels['otherfolder']  = 'Other User\'s Folder';
+$labels['sharedfolder']  = 'Public Folder';
+
 $labels['sortby'] = 'Sórtáil trí';
-$labels['sortasc'] = 'Sórtáil in ord méadaitheach';
+$labels['sortasc']  = 'Sórtáil in ord méadaitheach';
 $labels['sortdesc'] = 'Sórtáil in ord neartaitheach';
+$labels['undo'] = 'Undo';
+
+$labels['installedplugins'] = 'Installed plugins';
+$labels['plugin'] = 'Plugin';
+$labels['version'] = 'Version';
+$labels['source'] = 'Source';
+$labels['license'] = 'License';
+$labels['support'] = 'Get support';
+
+// units
+$labels['B'] = 'B';
+$labels['KB'] = 'KB';
+$labels['MB'] = 'MB';
+$labels['GB'] = 'GB';
+
+// character sets
+$labels['unicode'] = 'Unicode';
+$labels['english'] = '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['turkish'] = 'Turkish';
+$labels['nordic'] = 'Nordic';
+$labels['thai'] = 'Thai';
+$labels['celtic'] = 'Celtic';
+$labels['vietnamese'] = 'Vietnamese';
+$labels['japanese'] = 'Japanese';
+$labels['korean'] = 'Korean';
+$labels['chinese'] = 'Chinese';
 
+?>
diff --git a/program/localization/ga_IE/messages.inc b/program/localization/ga_IE/messages.inc
index 986385496..70aa28a36 100755
--- a/program/localization/ga_IE/messages.inc
+++ b/program/localization/ga_IE/messages.inc
@@ -2,27 +2,43 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ga_IE/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['loginfailed'] = 'Theip an iarraidh chun logáil tú isteach';
+$messages['errortitle']  = 'An error occurred!';
+$messages['loginfailed']  = 'Theip an iarraidh chun logáil tú isteach';
 $messages['cookiesdisabled'] = 'Níor glac do sracléitheoir an fianán seisiúin';
 $messages['sessionerror'] = 'Tá an seisiúin neamhbhailí nó as feidhm';
 $messages['storageerror'] = 'Theip an iarraidh chun nasc go dtí an freastalaí Prótacal Rochtana Teachtaireachtaí Idirlín (IMAP)';
+$messages['servererror'] = 'Server Error!';
+$messages['servererrormsg'] = 'Server Error: $msg';
+$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';
 $messages['loggedout'] = 'D\'éirigh tú logáil amach. Slán Leat!';
 $messages['mailboxempty'] = 'Tá an bosca postas folamh';
+$messages['refreshing'] = 'Refreshing...';
 $messages['loading'] = 'Fan nóiméad, ag lódáil...';
+$messages['uploading'] = 'Uploading file...';
+$messages['uploadingmany'] = 'Uploading files...';
 $messages['loadingdata'] = 'Ag lódáil sonraí...';
 $messages['checkingmail'] = 'Ag seiceáil chun teachtaireacht nua...';
 $messages['sendingmessage'] = 'Ag seol mo teachtaireacht láithreach bonn...';
@@ -32,34 +48,54 @@ $messages['messagesaved'] = 'Sábháil mé an teachtaireacht i dréachtaí';
 $messages['successfullysaved'] = 'D\'éirigh mé agus sábháil mé';
 $messages['addedsuccessfully'] = 'D\'éirigh mé agus shábháil mé duine nua go dtí an Leabhair Seoltaí';
 $messages['contactexists'] = 'Tá duine i do Leabhair Seoltaí agus tá an seoladh ríomhphost seo aige';
+$messages['contactnameexists'] = 'A contact with the same name already exists.';
 $messages['blockedimages'] = 'Chun do príobháide a cosain, choiscinn na híomhánna san teachtaireacht seo';
 $messages['encryptedmessage'] = 'Tá an teachtaireacht seo i criptiúchán, Níl an cumas agam chun é a tionscail';
 $messages['nocontactsfound'] = 'Ní raibh aon buine san Leabhair Seoltaí seo';
 $messages['contactnotfound'] = 'Ní bhfuair mé an duine seo';
+$messages['contactsearchonly'] = 'Enter some search terms to find contacts';
 $messages['sendingfailed'] = 'Theip an iarraidh chun an teachtaireacht a seol';
+$messages['senttooquickly'] = 'Please wait $sec sec(s). before sending this message.';
+$messages['errorsavingsent'] = 'An error occured while saving sent message.';
 $messages['errorsaving'] = 'Theip mé agus ní shábháil';
 $messages['errormoving'] = 'Theip mé agus ní bog an teachtaireacht';
+$messages['errorcopying'] = 'Could not copy the message(s).';
 $messages['errordeleting'] = 'Theip mé agus níor scrios me an teachtaireacht';
-$messages['deletecontactconfirm'] = 'Ar mhaith leat scrios na daoine seo?';
+$messages['errormarking'] = 'Could not mark the message(s).';
+$messages['deletecontactconfirm']  = 'Ar mhaith leat scrios na daoine seo?';
+$messages['deletegroupconfirm']  = 'Do you really want to delete selected group?';
 $messages['deletemessagesconfirm'] = 'Ar mhaith leat scrios na teachtaireacht seo?';
-$messages['deletefolderconfirm'] = 'Ar mhaith leat scrios an fillteán seo?';
-$messages['purgefolderconfirm'] = 'Ar mhaith leat scrios gach teachtaireacht san fillteán seo?';
+$messages['deletefolderconfirm']  = 'Ar mhaith leat scrios an fillteán seo?';
+$messages['purgefolderconfirm']  = 'Ar mhaith leat scrios gach teachtaireacht san fillteán seo?';
+$messages['contactdeleting'] = 'Deleting contact(s)...';
+$messages['groupdeleting'] = 'Deleting group...';
+$messages['folderdeleting'] = 'Deleting folder...';
+$messages['foldermoving'] = 'Moving folder...';
+$messages['foldersubscribing'] = 'Subscribing folder...';
+$messages['folderunsubscribing'] = 'Unsubscribing folder...';
 $messages['formincomplete'] = 'Níor chríochnaigh tú an foirm';
 $messages['noemailwarning'] = 'Abair liom seoladh ríomhphost nach bfhuil neamhbhaillí';
-$messages['nonamewarning'] = 'Abair liom do ainm';
+$messages['nonamewarning']  = 'Abair liom do ainm';
 $messages['nopagesizewarning'] = 'Abair liom saghas leathanaigh';
+$messages['nosenderwarning'] = 'Please enter sender e-mail address.';
 $messages['norecipientwarning'] = 'Abair liom faighteoir amhain ar a laghad';
-$messages['nosubjectwarning'] = 'Níl aon ábhair ar an teachtaireacht, ba mhaith tú déarfaidh mé ábair?';
+$messages['nosubjectwarning']  = 'Níl aon ábhair ar an teachtaireacht, ba mhaith tú déarfaidh mé ábair?';
 $messages['nobodywarning'] = 'Níl aon teacs san teachtaireacht, ba mhaith tú déarfaidh mé teachtaireacht ar bith?';
 $messages['notsentwarning'] = 'Theip an iarraidh chun an teachtaireacht a seo. ba mhaith tú scrios do teachtaireacht?';
 $messages['noldapserver'] = 'Abair liom eolaire LDAP chun é a cuardaigh';
 $messages['nosearchname'] = 'Abair liom ainm duine nó seoladh ríomhphost';
+$messages['notuploadedwarning'] = 'Not all attachments have been uploaded yet. Please wait or cancel the upload.';
 $messages['searchsuccessful'] = 'Fuair mé $n teachtaireacht';
+$messages['contactsearchsuccessful'] = '$nr contacts found.';
 $messages['searchnomatch'] = 'Ní bhfuair mé aon rud as an ceist seo';
 $messages['searching'] = 'Ag tástáil...';
 $messages['checking'] = 'Bím ag dhéanamh na mhaoirseachtí...';
 $messages['nospellerrors'] = 'Ní bhfuair mé aon earráidí i teachtaireacht seo';
 $messages['folderdeleted'] = 'D\'éirigh mé, Scrios mé an fillteán';
+$messages['foldersubscribed'] = 'Folder successfully subscribed.';
+$messages['folderunsubscribed'] = 'Folder successfully unsubscribed.';
+$messages['folderpurged'] = 'Folder has successfully been emptied.';
+$messages['folderexpunged'] = 'Folder has successfully been compacted.';
 $messages['deletedsuccessfully'] = 'D\'éirigh mé, Scrios mé';
 $messages['converting'] = 'Scrios mé formáidithe as an teachtaireacht seo';
 $messages['messageopenerror'] = 'Theip orm chun an teachtaireacht seo a tarrtháil as an freastalaí';
@@ -69,4 +105,67 @@ $messages['copysuccess'] = 'D\'éirigh mé agus chuir mé $nr seolagh i do Leabh
 $messages['copyerror'] = 'Theip mé agus níor dfhag mé aon seolagh';
 $messages['sourceisreadonly'] = 'Tá an foinse seolaigh seo inléite amháin';
 $messages['errorsavingcontact'] = 'Theip mé, Níl an cumas agam an seolagh seo a sábháil';
+$messages['movingmessage'] = 'Moving message(s)...';
+$messages['copyingmessage'] = 'Copying message(s)...';
+$messages['copyingcontact'] = 'Copying contact(s)...';
+$messages['deletingmessage'] = 'Deleting message(s)...';
+$messages['markingmessage'] = 'Marking message(s)...';
+$messages['addingmember'] = 'Adding contact(s) to the group...';
+$messages['removingmember'] = 'Removing contact(s) from the group...';
+$messages['receiptsent'] = 'Successfully sent a read receipt.';
+$messages['errorsendingreceipt'] = 'Could not send the receipt.';
+$messages['deleteidentityconfirm'] = 'Do you really want to delete this identity?';
+$messages['nodeletelastidentity'] = 'You cannot delete this identity, it\'s your last one.';
+$messages['forbiddencharacter'] = 'Folder name contains a forbidden character.';
+$messages['selectimportfile'] = 'Please select a file to upload.';
+$messages['addresswriterror'] = 'The selected address book is not writeable.';
+$messages['contactaddedtogroup'] = 'Successfully added the contacts to this group.';
+$messages['contactremovedfromgroup'] = 'Successfully removed contacts from this group.';
+$messages['nogroupassignmentschanged'] = 'No group assignments changed.';
+$messages['importwait'] = 'Importing, please wait...';
+$messages['importformaterror'] = 'Import failed! The uploaded file is not a valid import data file.';
+$messages['importconfirm'] = '<b>Successfully imported $inserted contacts</b>';
+$messages['importconfirmskipped'] = '<b>Skipped $skipped existing entries</b>';
+$messages['opnotpermitted'] = 'Operation not permitted!';
+$messages['nofromaddress'] = 'Missing e-mail address in selected identity.';
+$messages['editorwarning'] = 'Switching to the plain text editor will cause all text formatting to be lost. Do you wish to continue?';
+$messages['httpreceivedencrypterror'] = 'A fatal configuration error occurred. Contact your administrator immediately. <b>Your message can not be sent.</b>';
+$messages['smtpconnerror'] = 'SMTP Error ($code): Connection to server failed.';
+$messages['smtpautherror'] = 'SMTP Error ($code): Authentication failed.';
+$messages['smtpfromerror'] = 'SMTP Error ($code): Failed to set sender "$from" ($msg).';
+$messages['smtptoerror'] = 'SMTP Error ($code): Failed to add recipient "$to" ($msg).';
+$messages['smtprecipientserror'] = 'SMTP Error: Unable to parse recipients list.';
+$messages['smtperror'] = 'SMTP Error: $msg';
+$messages['emailformaterror'] = 'Invalid e-mail address: $email';
+$messages['toomanyrecipients'] = 'Too many recipients. Reduce the number of recipients to $max.';
+$messages['maxgroupmembersreached'] = 'The number of group members exceeds the maximum of $max.';
+$messages['internalerror'] = 'An internal error occured. Please try again.';
+$messages['contactdelerror'] = 'Could not delete contact(s).';
+$messages['contactdeleted'] = 'Contact(s) deleted successfully.';
+$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.';
 
+?>
diff --git a/program/localization/gl_ES/labels.inc b/program/localization/gl_ES/labels.inc
index 976590ba8..5905ea4b9 100644
--- a/program/localization/gl_ES/labels.inc
+++ b/program/localization/gl_ES/labels.inc
@@ -2,57 +2,78 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/gl_ES/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = 'Benvido a $product';
-$labels['username'] = 'Nome de usuario';
-$labels['password'] = 'Contrasinal';
-$labels['server'] = 'Servidor';
-$labels['login'] = 'Acceder';
-$labels['logout'] = 'Saír';
-$labels['mail'] = 'Caixa de entrada';
+
+// login page
+$labels['welcome']   = 'Benvido a $product';
+$labels['username']  = 'Nome de usuario';
+$labels['password']  = 'Contrasinal';
+$labels['server']    = 'Servidor';
+$labels['login']     = 'Acceder';
+
+// taskbar
+$labels['logout']   = 'Saír';
+$labels['mail']     = 'Caixa de entrada';
 $labels['settings'] = 'Axustes persoais';
 $labels['addressbook'] = 'Caderno de enderezos';
-$labels['inbox'] = 'Caixa de entrada';
+
+// mailbox names
+$labels['inbox']  = 'Caixa de entrada';
 $labels['drafts'] = 'Borradores';
-$labels['sent'] = 'Enviados';
-$labels['trash'] = 'Cubo do lixo';
-$labels['junk'] = 'Correo lixo';
+$labels['sent']   = 'Enviados';
+$labels['trash']  = 'Cubo do lixo';
+$labels['junk']   = 'Correo lixo';
+
+// message listing
 $labels['subject'] = 'Asunto';
-$labels['from'] = 'Remitente';
-$labels['to'] = 'Destinatario';
-$labels['cc'] = 'Copia (Cc)';
-$labels['bcc'] = 'Copia oculta (Cco)';
+$labels['from']    = 'Remitente';
+$labels['sender']  = 'Remitente';
+$labels['to']      = 'Destinatario';
+$labels['cc']      = 'Copia (Cc)';
+$labels['bcc']     = 'Copia oculta (Cco)';
 $labels['replyto'] = 'Respostar a (Reply-To)';
 $labels['followupto'] = 'Respostar a todos (Followup-To)';
-$labels['date'] = 'Data';
-$labels['size'] = 'Tamaño';
+$labels['date']    = 'Data';
+$labels['size']    = 'Tamaño';
 $labels['priority'] = 'Prioridade';
 $labels['organization'] = 'Organización';
 $labels['readstatus'] = 'Estado da lectura';
 $labels['listoptions'] = 'Opcións de lista...';
+
 $labels['mailboxlist'] = 'Cartafoles';
-$labels['folders'] = '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['copy'] = 'Copiar';
-$labels['move'] = 'Mover';
-$labels['moveto'] = 'Mover a...';
+$labels['fromtoshort'] = '$from - $to de $count';
+
+$labels['copy']     = 'Copiar';
+$labels['move']     = 'Mover';
+$labels['moveto']   = 'Mover a...';
 $labels['download'] = 'Descargar';
+$labels['open']     = 'Abrir';
+$labels['showattachment'] = 'Amosar';
+$labels['showanyway'] = 'Amosala de tódolos xeitos';
+
 $labels['filename'] = 'Nome de ficheiro';
 $labels['filesize'] = 'Tamaño de ficheiro';
+
 $labels['addtoaddressbook'] = 'Engadir ao caderno de enderezos';
+
+// weekdays short
 $labels['sun'] = 'Dom';
 $labels['mon'] = 'Lun';
 $labels['tue'] = 'Mar';
@@ -60,77 +81,90 @@ $labels['wed'] = 'Mér';
 $labels['thu'] = 'Xov';
 $labels['fri'] = 'Ven';
 $labels['sat'] = 'Sáb';
-$labels['sunday'] = 'Domingo';
-$labels['monday'] = 'Luns';
-$labels['tuesday'] = 'Martes';
+
+// weekdays long
+$labels['sunday']    = 'Domingo';
+$labels['monday']    = 'Luns';
+$labels['tuesday']   = 'Martes';
 $labels['wednesday'] = 'Mércores';
-$labels['thursday'] = 'Xoves';
-$labels['friday'] = 'Venres';
-$labels['saturday'] = 'Sábado';
-$labels['jan'] = 'Xan';
-$labels['feb'] = 'Feb';
-$labels['mar'] = 'Mar';
-$labels['apr'] = 'Abr';
-$labels['may'] = 'Maio';
-$labels['longmay'] = 'Maio';
-$labels['jun'] = 'Xuñ';
-$labels['jul'] = 'Xul';
-$labels['aug'] = 'Ago';
-$labels['sep'] = 'Set';
-$labels['oct'] = 'Out';
-$labels['nov'] = 'Nov';
-$labels['dec'] = 'Dec';
-$labels['longjan'] = 'Xaneiro';
-$labels['longfeb'] = 'Febreiro';
-$labels['longmar'] = 'Marzo';
-$labels['longapr'] = 'Abril';
-$labels['longjun'] = 'Xuño';
-$labels['longjul'] = 'Xullo';
-$labels['longaug'] = 'Agosto';
-$labels['longsep'] = 'Setembro';
-$labels['longoct'] = 'Outubro';
-$labels['longnov'] = 'Novembro';
-$labels['longdec'] = 'Decembro';
+$labels['thursday']  = 'Xoves';
+$labels['friday']    = 'Venres';
+$labels['saturday']  = 'Sábado';
+
+// months short
+$labels['jan']	= 'Xan';
+$labels['feb']	= 'Feb';
+$labels['mar']	= 'Mar';
+$labels['apr']	= 'Abr';
+$labels['may']	= 'Maio';
+$labels['jun']	= 'Xuñ';
+$labels['jul'] 	= 'Xul';
+$labels['aug']	= 'Ago';
+$labels['sep']	= 'Set';
+$labels['oct']	= 'Out';
+$labels['nov']	= 'Nov';
+$labels['dec']	= 'Dec';
+
+// months long
+$labels['longjan']	= 'Xaneiro';
+$labels['longfeb']	= 'Febreiro';
+$labels['longmar']	= 'Marzo';
+$labels['longapr']	= 'Abril';
+$labels['longmay']	= 'Maio';
+$labels['longjun']	= 'Xuño';
+$labels['longjul']	= 'Xullo';
+$labels['longaug']	= 'Agosto';
+$labels['longsep']	= 'Setembro';
+$labels['longoct']	= 'Outubro';
+$labels['longnov']	= 'Novembro';
+$labels['longdec']	= 'Decembro';
+
 $labels['today'] = 'Hoxe';
-$labels['refresh'] = 'Actualizar';
-$labels['checkmail'] = 'Procurar novas mensaxes';
-$labels['compose'] = 'Redactar unha mensaxe';
-$labels['writenewmessage'] = 'Redactar unha mensaxe nova';
-$labels['reply'] = 'Responder';
-$labels['replytomessage'] = 'Respostar a mensaxe';
+
+// toolbar buttons
+$labels['refresh']          = 'Actualizar';
+$labels['checkmail']        = 'Procurar novas mensaxes';
+$labels['compose']          = 'Redactar unha mensaxe';
+$labels['writenewmessage']  = 'Redactar unha mensaxe nova';
+$labels['reply']            = 'Responder';
+$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['forwardinline'] = 'Reenviar inserido';
+$labels['replyall']         = 'Respostar a todos';
+$labels['replylist']        = 'Respostar á lista de correo';
+$labels['forward']          = 'Reenviar';
+$labels['forwardinline']    = 'Reenviar inserido';
 $labels['forwardattachment'] = 'Reenviar como anexo';
-$labels['forwardmessage'] = 'Reenviar a mensaxe';
-$labels['deletemessage'] = 'Eliminar a mensaxe';
+$labels['forwardmessage']   = 'Reenviar a mensaxe';
+$labels['deletemessage']    = 'Eliminar a mensaxe';
 $labels['movemessagetotrash'] = 'Mover a mensaxe ao cubo do lixo';
-$labels['printmessage'] = 'Imprimir esta mensaxe';
-$labels['previousmessage'] = 'Amosar a mensaxe anterior';
-$labels['firstmessage'] = 'Amosar a primeira mensaxe';
-$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['markmessages'] = 'Marcar mensaxes';
-$labels['markread'] = 'Como lidas';
-$labels['markunread'] = 'Como non lidas';
-$labels['markflagged'] = 'Como marcadas';
-$labels['markunflagged'] = 'Como non marcadas';
-$labels['moreactions'] = 'Máis accións...';
-$labels['more'] = 'Máis';
-$labels['back'] = 'Atrás';
-$labels['options'] = 'Opcións';
+$labels['printmessage']     = 'Imprimir esta mensaxe';
+$labels['previousmessage']  = 'Amosar a mensaxe anterior';
+$labels['firstmessage']     = 'Amosar a primeira mensaxe';
+$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']             = 'Marcar';
+$labels['markmessages']     = 'Marcar mensaxes';
+$labels['markread']         = 'Como lidas';
+$labels['markunread']       = 'Como non lidas';
+$labels['markflagged']      = 'Como marcadas';
+$labels['markunflagged']    = 'Como non marcadas';
+$labels['moreactions']      = 'Máis accións...';
+$labels['more']             = 'Máis';
+$labels['back']             = 'Atrás';
+$labels['options']          = 'Opcións';
+
 $labels['select'] = 'Seleccionar';
 $labels['all'] = 'Todas';
 $labels['none'] = 'Ningunha';
-$labels['nonesort'] = 'Ningunha';
 $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'] = 'Non borradas';
 $labels['invert'] = 'Inverter';
 $labels['filter'] = 'Filtrar';
 $labels['list'] = 'Lista';
@@ -139,12 +173,14 @@ $labels['expand-all'] = 'Expandir todos';
 $labels['expand-unread'] = 'Expandir os non lidos';
 $labels['collapse-all'] = 'Contraer todos';
 $labels['threaded'] = 'Agrupar conversas';
+
 $labels['autoexpand_threads'] = 'Expandir os fíos de mensaxes';
 $labels['do_expand'] = 'tódolos fíos';
 $labels['expand_only_unread'] = 'só con mensaxes non lidas';
 $labels['fromto'] = 'Remitente/Destinatario';
 $labels['flag'] = 'Marca';
 $labels['attachment'] = 'Anexo';
+$labels['nonesort'] = 'Ningunha';
 $labels['sentdate'] = 'Data de envío';
 $labels['arrival'] = 'Data de chegada';
 $labels['asc'] = 'ascendente';
@@ -153,172 +189,220 @@ $labels['listcolumns'] = 'Enumerar columnas';
 $labels['listsorting'] = 'Ordenar pola columna';
 $labels['listorder'] = 'Ordenación';
 $labels['listmode'] = 'Modo de vista da lista';
+
 $labels['folderactions'] = 'Accións cos cartafoles';
 $labels['compact'] = 'Compactar';
 $labels['empty'] = 'Baleirar';
+
 $labels['quota'] = 'Uso de disco';
-$labels['unknown'] = 'descoñecido';
-$labels['unlimited'] = 'ilimitado';
-$labels['quicksearch'] = 'Busca rápida';
-$labels['resetsearch'] = 'Restablecer a busca';
-$labels['searchmod'] = 'Modificadores de busca';
-$labels['msgtext'] = 'Mensaxe enteira';
+$labels['unknown']  = 'descoñecido';
+$labels['unlimited']  = 'ilimitado';
+
+$labels['quicksearch']  = 'Busca rápida';
+$labels['resetsearch']  = 'Restablecer a busca';
+$labels['searchmod']  = 'Modificadores de busca';
+$labels['msgtext']  = 'Mensaxe enteira';
+$labels['body']  = 'Corpo';
+
 $labels['openinextwin'] = 'Abrir nunha nova fiestra';
 $labels['emlsave'] = 'Gardar (.eml)';
-$labels['editasnew'] = 'Editar como nova';
-$labels['sendmessage'] = 'Enviar a mensaxe agora';
-$labels['savemessage'] = 'Gardar a mensaxe como borrador';
-$labels['addattachment'] = 'Anexar un ficheiro';
-$labels['charset'] = 'Codificación';
-$labels['editortype'] = 'Tipo de editor';
-$labels['returnreceipt'] = 'Notificación da entrega';
-$labels['dsn'] = 'Notificación do estado de envío (DSN)';
+$labels['changeformattext'] = 'Amosar en texto plano';
+$labels['changeformathtml'] = 'Amosar en HTML';
+
+// message compose
+$labels['editasnew']      = 'Editar como nova';
+$labels['send']           = 'Enviar';
+$labels['sendmessage']    = 'Enviar a mensaxe agora';
+$labels['savemessage']    = 'Gardar a mensaxe como borrador';
+$labels['addattachment']  = 'Anexar un ficheiro';
+$labels['charset']        = 'Codificación';
+$labels['editortype']     = 'Tipo de editor';
+$labels['returnreceipt']  = 'Notificación da entrega';
+$labels['dsn']            = 'Notificación do estado de envío (DSN)';
 $labels['mailreplyintro'] = 'O $date, $sender escribiu:';
 $labels['originalmessage'] = 'Mensaxe orixinal';
-$labels['editidents'] = 'Modificar identidades';
+
+$labels['editidents']    = 'Modificar identidades';
+$labels['spellcheck']    = 'Ortografía';
 $labels['checkspelling'] = 'Revisar a ortografía';
 $labels['resumeediting'] = 'Voltar á edición';
-$labels['revertto'] = 'Voltar a';
+$labels['revertto']      = 'Voltar a';
+
+$labels['attach'] = 'Anexar';
 $labels['attachments'] = 'Ficheiros anexos';
 $labels['upload'] = 'Cargar';
 $labels['uploadprogress'] = '$percent ($current de $total)';
-$labels['close'] = 'Pechar';
-$labels['messageoptions'] = 'Opcións da mensaxe...';
-$labels['low'] = 'Baixa';
-$labels['lowest'] = 'A máis baixa';
-$labels['normal'] = 'Normal';
-$labels['high'] = 'Alta';
+$labels['close']  = 'Pechar';
+$labels['messageoptions']  = 'Opcións da mensaxe...';
+
+$labels['low']     = 'Baixa';
+$labels['lowest']  = 'A máis baixa';
+$labels['normal']  = 'Normal';
+$labels['high']    = 'Alta';
 $labels['highest'] = 'A máis alta';
-$labels['nosubject'] = '(Sen asunto)';
+
+$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['isdraft']    = 'Esta mensaxe é un borrador';
+$labels['andnmore']   = '$nr máis...';
+$labels['togglemoreheaders'] = 'Amosar máis cabecerias';
+$labels['togglefullheaders'] = 'Conmutar cabeceiras en bruto';
+
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Só texto';
 $labels['savesentmessagein'] = 'Gardar a mensaxe enviada en';
 $labels['dontsave'] = 'non gardar';
 $labels['maxuploadsize'] = 'O tamaño máximo permitido por ficheiro é de $size';
+
 $labels['addcc'] = 'Engadir copia (CC)';
 $labels['addbcc'] = 'Engadir copia oculta (BCC)';
 $labels['addreplyto'] = 'Engadir respostar a (Reply-To)';
 $labels['addfollowupto'] = 'Engadir respostar a todos (Followup-To)';
+
+// mdn
 $labels['mdnrequest'] = 'O remitente desta mensaxe pediu ser notificado cando vostede a lea. Quere notificar ao remitente?';
 $labels['receiptread'] = 'Notificación da entrega da mensaxe (lectura)';
 $labels['yourmessage'] = 'Esta é unha notificación da entrega da súa mensaxe';
 $labels['receiptnote'] = 'Nota: Esta notificación só confirma que a mensaxe se abriu no computador do destinatario. Non asegura que o destinatario a lera ou entendera o seu contido.';
-$labels['name'] = 'Nome completo';
-$labels['firstname'] = 'Nome';
-$labels['surname'] = 'Apelidos';
-$labels['middlename'] = 'Segundo nome';
-$labels['nameprefix'] = 'Prefixo';
-$labels['namesuffix'] = 'Sufixo';
-$labels['nickname'] = 'Alcume';
-$labels['jobtitle'] = 'Titulación';
-$labels['department'] = 'Departamento';
-$labels['gender'] = 'Xénero';
-$labels['maidenname'] = 'Nome de solteira';
-$labels['email'] = 'Correo Electrónico';
-$labels['phone'] = 'Teléfono';
-$labels['address'] = 'Enderezo';
-$labels['street'] = 'Rúa';
-$labels['locality'] = 'Poboación';
-$labels['zipcode'] = 'Código postal';
-$labels['region'] = 'Provincia';
-$labels['country'] = 'País';
-$labels['birthday'] = 'Aniversario';
-$labels['anniversary'] = 'Aniversario';
-$labels['website'] = 'Sitio web';
+
+// address boook
+$labels['name']         = 'Nome completo';
+$labels['firstname']    = 'Nome';
+$labels['surname']      = 'Apelidos';
+$labels['middlename']   = 'Segundo nome';
+$labels['nameprefix']   = 'Prefixo';
+$labels['namesuffix']   = 'Sufixo';
+$labels['nickname']     = 'Alcume';
+$labels['jobtitle']     = 'Titulación';
+$labels['department']   = 'Departamento';
+$labels['gender']       = 'Xénero';
+$labels['maidenname']   = 'Nome de solteira';
+$labels['email']        = 'Correo Electrónico';
+$labels['phone']        = 'Teléfono';
+$labels['address']      = 'Enderezo';
+$labels['street']       = 'Rúa';
+$labels['locality']     = 'Poboación';
+$labels['zipcode']      = 'Código postal';
+$labels['region']       = 'Provincia';
+$labels['country']      = 'País';
+$labels['birthday']     = 'Aniversario';
+$labels['anniversary']  = 'Aniversario';
+$labels['website']      = 'Sitio web';
 $labels['instantmessenger'] = 'Mensaxería instantánea';
 $labels['notes'] = 'Notes';
-$labels['male'] = 'home';
+$labels['male']   = 'home';
 $labels['female'] = 'muller';
 $labels['manager'] = 'Xerente';
 $labels['assistant'] = 'Asistente';
-$labels['typeassistant'] = 'Asistente';
 $labels['spouse'] = 'Cónxuxe';
 $labels['allfields'] = 'Tódolos campos';
 $labels['search'] = 'Procurar';
 $labels['advsearch'] = 'Procura avanzada';
 $labels['advanced'] = 'Avanzado';
 $labels['other'] = 'Outro';
-$labels['typeother'] = 'Outro';
-$labels['typehome'] = 'Casa';
-$labels['typework'] = 'Traballo';
-$labels['typemobile'] = 'Móbil';
-$labels['typemain'] = 'Principal';
-$labels['typehomefax'] = 'Fax da casa';
-$labels['typeworkfax'] = 'Fax do traballo';
-$labels['typecar'] = 'Coche';
-$labels['typepager'] = 'Buscapersonas';
-$labels['typevideo'] = 'Vídeo';
-$labels['typehomepage'] = 'Páxina principal';
+
+$labels['typehome']   = 'Casa';
+$labels['typework']   = 'Traballo';
+$labels['typeother']  = 'Outro';
+$labels['typemobile']  = 'Móbil';
+$labels['typemain']  = 'Principal';
+$labels['typehomefax']  = 'Fax da casa';
+$labels['typeworkfax']  = 'Fax do traballo';
+$labels['typecar']  = 'Coche';
+$labels['typepager']  = 'Buscapersonas';
+$labels['typevideo']  = 'Vídeo';
+$labels['typeassistant']  = 'Asistente';
+$labels['typehomepage']  = 'Páxina principal';
 $labels['typeblog'] = 'Blogue';
 $labels['typeprofile'] = 'Perfil';
+
 $labels['addfield'] = 'Engadir campo';
 $labels['addcontact'] = 'Engadir novo contacto';
 $labels['editcontact'] = 'Modificar este contacto';
 $labels['contacts'] = 'Contactos';
 $labels['contactproperties'] = 'Propiedades do contacto';
 $labels['personalinfo'] = 'Información persoal';
-$labels['edit'] = 'Editar';
+
+$labels['edit']   = 'Editar';
 $labels['cancel'] = 'Cancelar';
-$labels['save'] = 'Gardar';
+$labels['save']   = 'Gardar';
 $labels['delete'] = 'Eliminar';
 $labels['rename'] = 'Mudar o nome';
 $labels['addphoto'] = 'Engadir';
 $labels['replacephoto'] = 'Substituír';
 $labels['uploadphoto'] = 'Subir foto';
-$labels['newcontact'] = 'Novo contacto';
-$labels['deletecontact'] = 'Eliminar os contactos seleccionados';
-$labels['composeto'] = 'Redactar mensaxe para';
+
+$labels['newcontact']     = 'Novo contacto';
+$labels['deletecontact']  = 'Eliminar os contactos seleccionados';
+$labels['composeto']      = 'Redactar mensaxe para';
 $labels['contactsfromto'] = 'Contactos do $from ao $to de $count';
-$labels['print'] = 'Imprimir';
-$labels['export'] = 'Exportar';
-$labels['exportvcards'] = 'Exportar os contactos en formato vCard';
+$labels['print']          = 'Imprimir';
+$labels['export']         = 'Exportar';
+$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['previouspage'] = 'Amosar o grupo anterior';
-$labels['firstpage'] = 'Amosar o primeiro grupo';
-$labels['nextpage'] = 'Amosar o seguinte grupo';
-$labels['lastpage'] = 'Amosar o último grupo';
+$labels['grouprename']    = 'Mudar o nome do grupo';
+$labels['groupdelete']    = 'Borrar o grupo';
+$labels['groupremoveselected'] = 'Eliminar do grupo os contactos seleccionados';
+
+$labels['previouspage']   = 'Amosar o grupo anterior';
+$labels['firstpage']      = 'Amosar o primeiro grupo';
+$labels['nextpage']       = 'Amosar o seguinte grupo';
+$labels['lastpage']       = 'Amosar o último grupo';
+
 $labels['group'] = 'Grupo';
 $labels['groups'] = 'Grupos';
 $labels['personaladrbook'] = 'Enderezos persoais';
+
 $labels['searchsave'] = 'Gardar procura';
 $labels['searchdelete'] = 'Eliminar procura';
+
 $labels['import'] = 'Importar';
 $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'] = '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
 $labels['settingsfor'] = 'Axustes de';
 $labels['about'] = 'Acerca de';
 $labels['preferences'] = 'Preferencias';
 $labels['userpreferences'] = 'Preferencias de usuario';
 $labels['editpreferences'] = 'Editar preferencias de usuario';
+
 $labels['identities'] = 'Identidades';
 $labels['manageidentities'] = 'Administrar as identidades desta conta';
 $labels['newidentity'] = 'Nova identidade';
+
 $labels['newitem'] = 'Novo';
 $labels['edititem'] = 'Editar';
+
 $labels['preferhtml'] = 'Prefiro HTML';
 $labels['defaultcharset'] = 'Xogo de caracteres por omisión';
 $labels['htmlmessage'] = 'Mensaxe HTML';
+$labels['messagepart'] = 'Parte';
+$labels['digitalsig'] = 'Sinatura dixital';
 $labels['dateformat'] = 'Formato da data';
 $labels['timeformat'] = 'Formato da hora';
 $labels['prettydate'] = 'Data decorada';
-$labels['setdefault'] = 'Usar como predeterminada';
-$labels['autodetect'] = 'Detectar automáticamente';
-$labels['language'] = 'Linguaxe';
-$labels['timezone'] = 'Zona horaria';
-$labels['pagesize'] = 'Liñas por páxina';
+$labels['setdefault']  = 'Usar como predeterminada';
+$labels['autodetect']  = 'Detectar automáticamente';
+$labels['language']  = 'Linguaxe';
+$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['dstactive']  = 'Cambio de hora según horario de verán';
+$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'] = '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';
@@ -336,14 +420,16 @@ $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'] = '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['never'] = 'nunca';
-$labels['immediately'] = 'de inmediato';
+$labels['autosavedraft']  = 'Gardar borrador automáticamente';
+$labels['everynminutes']  = 'cada $n minuto(s)';
+$labels['refreshinterval']  = 'Refrescar (buscar novas mensaxes, etc)';
+$labels['never']  = 'nunca';
+$labels['immediately']  = 'de inmediato';
 $labels['messagesdisplaying'] = 'Visualización das mensaxes';
 $labels['messagescomposition'] = 'Composición das mensaxes';
 $labels['mimeparamfolding'] = 'Nomes dos ficheiros anexos';
@@ -363,36 +449,41 @@ $labels['maintenance'] = 'Mantemento';
 $labels['newmessage'] = 'Mensaxes novas';
 $labels['signatureoptions'] = 'Opcións da firma';
 $labels['whenreplying'] = 'Ao respostar';
+$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['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['defaultaddressbook'] = 'Engadir contactos ao caderno de enderezos seleccionado';
+$labels['defaultabook'] = 'Caderno de enderezos por defecto';
 $labels['autocompletesingle'] = 'Ignorar as direccións alternativas no autocompletado';
+$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['folder'] = 'Cartafol';
-$labels['foldername'] = 'Nome do cartafol';
-$labels['subscribed'] = 'Subscrito';
+$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';
+$labels['foldername']  = 'Nome do cartafol';
+$labels['subscribed']  = 'Subscrito';
 $labels['messagecount'] = 'Mensaxes';
-$labels['create'] = 'Crear';
-$labels['createfolder'] = 'Crear un novo cartafol';
-$labels['managefolders'] = 'Xestionar cartafoles';
+$labels['create']  = 'Crear';
+$labels['createfolder']  = 'Crear un novo cartafol';
+$labels['managefolders']  = 'Xestionar cartafoles';
 $labels['specialfolders'] = 'Cartafoles especiais';
 $labels['properties'] = 'Propiedades';
 $labels['folderproperties'] = 'Propiedades do cartafol';
@@ -402,22 +493,29 @@ $labels['info'] = 'Información';
 $labels['getfoldersize'] = 'Prema para calcular o tamaño do cartafol';
 $labels['changesubscription'] = 'Prema para trocar a subscrición';
 $labels['foldertype'] = 'Tipo do cartafol';
-$labels['personalfolder'] = 'Cartafol privado';
-$labels['otherfolder'] = 'Cartafol de outro usuario';
-$labels['sharedfolder'] = 'Cartafol público';
+$labels['personalfolder']  = 'Cartafol privado';
+$labels['otherfolder']  = 'Cartafol de outro usuario';
+$labels['sharedfolder']  = 'Cartafol público';
+
 $labels['sortby'] = 'Ordenar por';
-$labels['sortasc'] = 'Orde ascendente';
+$labels['sortasc']  = 'Orde ascendente';
 $labels['sortdesc'] = 'Orde descendente';
 $labels['undo'] = 'Desfacer';
+
+$labels['installedplugins'] = 'Complementos instalados';
 $labels['plugin'] = 'Complemento';
 $labels['version'] = 'Versión';
 $labels['source'] = 'Fonte';
 $labels['license'] = 'Licenza';
 $labels['support'] = 'Obter axuda';
+
+// units
 $labels['B'] = 'B';
 $labels['KB'] = 'KiB';
 $labels['MB'] = 'MiB';
 $labels['GB'] = 'GiB';
+
+// character sets
 $labels['unicode'] = 'Unicode';
 $labels['english'] = 'Inglés';
 $labels['westerneuropean'] = 'Europeo Occidental';
@@ -437,3 +535,4 @@ $labels['japanese'] = 'Xaponés';
 $labels['korean'] = 'Coreano';
 $labels['chinese'] = 'Chinés';
 
+?>
diff --git a/program/localization/gl_ES/messages.inc b/program/localization/gl_ES/messages.inc
index 5eb9a7359..207a016a1 100644
--- a/program/localization/gl_ES/messages.inc
+++ b/program/localization/gl_ES/messages.inc
@@ -2,32 +2,40 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/gl_ES/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['loginfailed'] = 'O contrasinal ou o nome de usuario son incorrectos.';
+$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.';
 $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'] = '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'] = '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'] = 'A refrescar...';
 $messages['loading'] = 'Cargando...';
 $messages['uploading'] = 'Cargando ficheiro...';
 $messages['uploadingmany'] = 'Cargando ficheiros...';
@@ -54,11 +62,11 @@ $messages['errormoving'] = 'Non foi posible mover a(s) mensaxe(s).';
 $messages['errorcopying'] = 'Non foi posible copiar a(s) mensaxe(s).';
 $messages['errordeleting'] = 'Non foi posible eliminar a(s) mensaxe(s).';
 $messages['errormarking'] = 'Non foi posible marcar a(s) mensaxe(s).';
-$messages['deletecontactconfirm'] = 'Quere eliminar o(s) contacto(s) seleccionado(s)?';
-$messages['deletegroupconfirm'] = 'Quere eliminar o grupo seleccionado?';
+$messages['deletecontactconfirm']  = 'Quere eliminar o(s) contacto(s) seleccionado(s)?';
+$messages['deletegroupconfirm']  = 'Quere eliminar o grupo seleccionado?';
 $messages['deletemessagesconfirm'] = 'Quere eliminar a(s) mensaxe(s) seleccionadas?';
-$messages['deletefolderconfirm'] = 'Quere eliminar este cartafol?';
-$messages['purgefolderconfirm'] = 'Quere eliminar tódalas mensaxes neste cartafol?';
+$messages['deletefolderconfirm']  = 'Quere eliminar este cartafol?';
+$messages['purgefolderconfirm']  = 'Quere eliminar tódalas mensaxes neste cartafol?';
 $messages['contactdeleting'] = 'Eliminando o(s) contacto(s)...';
 $messages['groupdeleting'] = 'Eliminando o grupo...';
 $messages['folderdeleting'] = 'Eliminando o cartafol...';
@@ -67,11 +75,11 @@ $messages['foldersubscribing'] = 'Subscribindo o cartafol...';
 $messages['folderunsubscribing'] = 'Desubscribindo o cartafol...';
 $messages['formincomplete'] = 'Non se cumprimentou completamente o formulario.';
 $messages['noemailwarning'] = 'Por favor, introduza un enderezo de correo electrónico válido.';
-$messages['nonamewarning'] = 'Por favor, introduza un nome.';
+$messages['nonamewarning']  = 'Por favor, introduza un nome.';
 $messages['nopagesizewarning'] = 'Por favor, introduza un tamaño de páxina.';
 $messages['nosenderwarning'] = 'Por favor, introduza o enderezo de correo electrónico do remitente.';
 $messages['norecipientwarning'] = 'Por favor, introduza polo menos un destinatario.';
-$messages['nosubjectwarning'] = 'O campo "Asunto" está baleiro. Desexa completalo?';
+$messages['nosubjectwarning']  = 'O campo "Asunto" está baleiro. Desexa completalo?';
 $messages['nobodywarning'] = 'Quere enviar esta mensaxe sen texto?';
 $messages['notsentwarning'] = 'A mensaxe non se enviou. Quere descartala?';
 $messages['noldapserver'] = 'Por favor, elixa un servidor LDAP para buscar.';
@@ -106,14 +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'] = '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'] = 'Non cambiou ningunha asignación de grupo.';
 $messages['importwait'] = 'A importar. Por favor, agarde...';
-$messages['importerror'] = 'Produciuse un erro na importación. O ficheiro que cargou non é un vCard correcto.';
+$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!';
@@ -154,4 +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'] = '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 22a163cd6..bfb9e2fef 100644
--- a/program/localization/he_IL/labels.inc
+++ b/program/localization/he_IL/labels.inc
@@ -2,58 +2,78 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/he_IL/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Moshe Leibovitch <moish@mln.co.il>                            |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = 'ברוך בואך אל $product';
-$labels['username'] = 'שם משתמש';
-$labels['password'] = 'סיסמה';
-$labels['server'] = 'שרת';
-$labels['login'] = 'כניסה';
-$labels['logout'] = 'יציאה';
-$labels['mail'] = 'רשימת הודעות';
+
+// login page
+$labels['welcome']   = 'ברוך בואך אל $product';
+$labels['username']  = 'שם משתמש';
+$labels['password']  = 'סיסמה';
+$labels['server']    = 'שרת';
+$labels['login']     = 'כניסה';
+
+// taskbar
+$labels['logout']   = 'יציאה';
+$labels['mail']     = 'רשימת הודעות';
 $labels['settings'] = 'הגדרות אישיות';
 $labels['addressbook'] = 'פנקס כתובות';
-$labels['inbox'] = 'נכנס';
+
+// mailbox names
+$labels['inbox']  = 'נכנס';
 $labels['drafts'] = 'טיוטות';
-$labels['sent'] = 'נשלח';
-$labels['trash'] = 'אשפה';
-$labels['junk'] = 'זבל';
+$labels['sent']   = 'נשלח';
+$labels['trash']  = 'אשפה';
+$labels['junk']   = 'זבל';
+
+// message listing
 $labels['subject'] = 'נושא';
-$labels['from'] = 'מאת';
-$labels['to'] = 'אל';
-$labels['cc'] = 'לידיעה';
-$labels['bcc'] = 'מכותב מוסתר';
+$labels['from']    = 'מאת';
+$labels['sender']  = 'השולח';
+$labels['to']      = 'אל';
+$labels['cc']      = 'לידיעה';
+$labels['bcc']     = 'מכותב מוסתר';
 $labels['replyto'] = 'כתובת למענה';
 $labels['followupto'] = 'כתובת להעברת הודעה';
-$labels['date'] = 'תאריך';
-$labels['size'] = 'גודל';
+$labels['date']    = 'תאריך';
+$labels['size']    = 'גודל';
 $labels['priority'] = 'עדיפות';
 $labels['organization'] = 'ארגון';
 $labels['readstatus'] = 'נקרא';
 $labels['listoptions'] = 'הצגת אפשרויות...';
+
 $labels['mailboxlist'] = 'תיקיות';
-$labels['folders'] = 'תיקיות';
 $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['copy']     = 'העתק';
+$labels['move']     = 'העבר';
+$labels['moveto']   = 'תיוק ב...';
 $labels['download'] = 'הורדה';
+$labels['open']     = 'לפתוח';
+$labels['showattachment'] = 'הצגה';
+$labels['showanyway'] = 'להציג בכל מקרה';
+
 $labels['filename'] = 'שם קובץ';
 $labels['filesize'] = 'גודל קובץ';
+
 $labels['addtoaddressbook'] = 'הוספה לפנקס כתובות';
+
+// weekdays short
 $labels['sun'] = 'יום א';
 $labels['mon'] = 'יום ב';
 $labels['tue'] = 'יום ג';
@@ -61,78 +81,88 @@ $labels['wed'] = 'יום ד';
 $labels['thu'] = 'יום ה';
 $labels['fri'] = 'יום ו';
 $labels['sat'] = 'יום ש';
-$labels['sunday'] = 'ראשון';
-$labels['monday'] = 'שני';
-$labels['tuesday'] = 'שלישי';
+
+// weekdays long
+$labels['sunday']    = 'ראשון';
+$labels['monday']    = 'שני';
+$labels['tuesday']   = 'שלישי';
 $labels['wednesday'] = 'רביעי';
-$labels['thursday'] = 'חמישי';
-$labels['friday'] = 'ששי';
-$labels['saturday'] = 'שבת';
-$labels['jan'] = 'ינו';
-$labels['feb'] = 'פבר';
-$labels['mar'] = 'מרץ';
-$labels['apr'] = 'אפר';
-$labels['may'] = 'מאי';
-$labels['longmay'] = 'מאי';
-$labels['jun'] = 'יונ';
-$labels['jul'] = 'יול';
-$labels['aug'] = 'אוג';
-$labels['sep'] = 'ספט';
-$labels['oct'] = 'אוק';
-$labels['nov'] = 'נוב';
-$labels['dec'] = 'דצמ';
-$labels['longjan'] = 'ינואר';
-$labels['longfeb'] = 'פברואר';
-$labels['longmar'] = 'מרץ';
-$labels['longapr'] = 'אפריל';
-$labels['longjun'] = 'יוני';
-$labels['longjul'] = 'יולי';
-$labels['longaug'] = 'אוגוסט';
-$labels['longsep'] = 'ספטמבר';
-$labels['longoct'] = 'אוקטובר';
-$labels['longnov'] = 'נובמבר';
-$labels['longdec'] = 'דצמבר';
+$labels['thursday']  = 'חמישי';
+$labels['friday']    = 'ששי';
+$labels['saturday']  = 'שבת';
+
+// months short
+$labels['jan']	= 'ינו';
+$labels['feb']	= 'פבר';
+$labels['mar']	= 'מרץ';
+$labels['apr']	= 'אפר';
+$labels['may']	= 'מאי';
+$labels['jun']	= 'יונ';
+$labels['jul'] 	= 'יול';
+$labels['aug']	= 'אוג';
+$labels['sep']	= 'ספט';
+$labels['oct']	= 'אוק';
+$labels['nov']	= 'נוב';
+$labels['dec']	= 'דצמ';
+
+// months long
+$labels['longjan']	= 'ינואר';
+$labels['longfeb']	= 'פברואר';
+$labels['longmar']	= 'מרץ';
+$labels['longapr']	= 'אפריל';
+$labels['longmay']	= 'מאי';
+$labels['longjun']	= 'יוני';
+$labels['longjul']	= 'יולי';
+$labels['longaug']	= 'אוגוסט';
+$labels['longsep']	= 'ספטמבר';
+$labels['longoct']	= 'אוקטובר';
+$labels['longnov']	= 'נובמבר';
+$labels['longdec']	= 'דצמבר';
+
 $labels['today'] = 'היום';
-$labels['refresh'] = 'רענון';
-$labels['checkmail'] = 'משיכת הודעות חדשות';
-$labels['compose'] = 'כתיבת הודעה';
-$labels['writenewmessage'] = 'יצירת הודעה חדשה';
-$labels['reply'] = 'תגובה';
-$labels['replytomessage'] = 'מענה לשולח';
+
+// toolbar buttons
+$labels['refresh']          = 'רענון';
+$labels['checkmail']        = 'משיכת הודעות חדשות';
+$labels['compose']          = 'כתיבת הודעה';
+$labels['writenewmessage']  = 'יצירת הודעה חדשה';
+$labels['reply']            = 'תגובה';
+$labels['replytomessage']   = 'מענה לשולח';
 $labels['replytoallmessage'] = 'מענה לשולח ולכל הנמענים';
-$labels['replyall'] = 'מענה לכולם';
-$labels['replylist'] = 'מענה לרשימת תפוצה';
-$labels['forward'] = 'העברה';
-$labels['forwardinline'] = 'העבר בגוף ההודעה';
-$labels['forwardattachment'] = 'העבר כקובץ מצורף';
-$labels['forwardmessage'] = 'העבר הודעה';
-$labels['deletemessage'] = 'מחיקה';
+$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['viewsource'] = 'הצגת קוד מקור';
-$labels['mark'] = 'סימון';
-$labels['markmessages'] = 'סימון הודעות';
-$labels['markread'] = 'כנקראו';
-$labels['markunread'] = 'כלא נקראו';
-$labels['markflagged'] = 'כמסומן';
-$labels['markunflagged'] = 'כלא מסומן';
-$labels['moreactions'] = 'פעולות נוספות...';
-$labels['more'] = 'עוד';
-$labels['back'] = 'חזרה';
-$labels['options'] = 'אפשרויות';
+$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['more']             = 'עוד';
+$labels['back']             = 'חזרה';
+$labels['options']          = 'אפשרויות';
+
 $labels['select'] = 'בחירה';
 $labels['all'] = 'הכל';
 $labels['none'] = 'כלום';
-$labels['nonesort'] = 'כלום';
 $labels['currpage'] = 'דף נוכחי';
 $labels['unread'] = 'לא נקראו';
 $labels['flagged'] = 'מסומן';
 $labels['unanswered'] = 'לא נענה';
+$labels['withattachment'] = 'עם צרופה';
 $labels['deleted'] = 'נמחק';
 $labels['undeleted'] = 'לא נמחק';
 $labels['invert'] = 'היפוך הסימון';
@@ -143,12 +173,14 @@ $labels['expand-all'] = 'הרחבה כלית';
 $labels['expand-unread'] = 'הרחבה טרם נקרא';
 $labels['collapse-all'] = 'כינוס כללי';
 $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['asc'] = 'בסדר עולה';
@@ -157,182 +189,222 @@ $labels['listcolumns'] = 'רשימת עמודות';
 $labels['listsorting'] = 'המיון לפי העמודה';
 $labels['listorder'] = 'סדר מיון';
 $labels['listmode'] = 'אופן הצגת רשימה';
+
 $labels['folderactions'] = 'פעולות על תיקים';
 $labels['compact'] = 'פינוי שטח לא מנוצל';
 $labels['empty'] = 'ריקון';
+
 $labels['quota'] = 'ניצול קיבולת';
-$labels['unknown'] = 'לא ידוע';
-$labels['unlimited'] = 'ללא הגבלה';
-$labels['quicksearch'] = 'חיפוש מהיר';
-$labels['resetsearch'] = 'ניקוי תיבת החיפוש';
-$labels['searchmod'] = 'מאפייני חיפוש';
-$labels['msgtext'] = 'כל ההודעה';
+$labels['unknown']  = 'לא ידוע';
+$labels['unlimited']  = 'ללא הגבלה';
+
+$labels['quicksearch']  = 'חיפוש מהיר';
+$labels['resetsearch']  = 'ניקוי תיבת החיפוש';
+$labels['searchmod']  = 'מאפייני חיפוש';
+$labels['msgtext']  = 'כל ההודעה';
+$labels['body']  = 'גוף ההודעה';
+
 $labels['openinextwin'] = 'פתיחה בחלון חדש';
 $labels['emlsave'] = 'הורדת הודעה בפורמט  EML';
-$labels['editasnew'] = 'עריכת ההודעה כחדשה';
-$labels['send'] = 'שלח';
-$labels['sendmessage'] = 'משלוח מיידי';
-$labels['savemessage'] = 'שמירת טיוטה';
-$labels['addattachment'] = 'צירוף קובץ';
-$labels['charset'] = 'קידוד';
-$labels['editortype'] = 'סוג עורך';
-$labels['returnreceipt'] = 'אישור קבלה';
-$labels['dsn'] = 'הודעה על מצב המסירה';
+$labels['changeformattext'] = 'הצגה בפורמט לא מעוצב';
+$labels['changeformathtml'] = 'הצגה בפורמט HTML';
+
+// message compose
+$labels['editasnew']      = 'עריכת ההודעה כחדשה';
+$labels['send']           = 'שלח';
+$labels['sendmessage']    = 'משלוח מיידי';
+$labels['savemessage']    = 'שמירת טיוטה';
+$labels['addattachment']  = 'צירוף קובץ';
+$labels['charset']        = 'קידוד';
+$labels['editortype']     = 'סוג עורך';
+$labels['returnreceipt']  = 'אישור קבלה';
+$labels['dsn']            = 'הודעה על מצב המסירה';
 $labels['mailreplyintro'] = ':כתב $sender, $date בתאריך';
 $labels['originalmessage'] = 'הודעה מקורית';
-$labels['editidents'] = 'עריכת זהויות';
-$labels['spellcheck'] = 'איות';
+
+$labels['editidents']    = 'עריכת זהויות';
+$labels['spellcheck']    = 'איות';
 $labels['checkspelling'] = 'בדיקת איות';
 $labels['resumeediting'] = 'המשך עריכה';
-$labels['revertto'] = 'חזור למצב קודם';
+$labels['revertto']      = 'חזור למצב קודם';
+
 $labels['attach'] = 'צירוף';
-$labels['attachments'] = 'קבצים מצורפים';
+$labels['attachments'] = 'צרופות';
 $labels['upload'] = 'העלאה';
 $labels['uploadprogress'] = '( $total  מתוך  $current )  $percent';
-$labels['close'] = 'סגירה';
-$labels['messageoptions'] = 'אפשרויות הודעה...';
-$labels['low'] = 'נמוך';
-$labels['lowest'] = 'נמוך ביותר';
-$labels['normal'] = 'רגיל';
-$labels['high'] = 'גבוה';
+$labels['close']  = 'סגירה';
+$labels['messageoptions']  = 'אפשרויות הודעה...';
+
+$labels['low']     = 'נמוך';
+$labels['lowest']  = 'נמוך ביותר';
+$labels['normal']  = 'רגיל';
+$labels['high']    = 'גבוה';
 $labels['highest'] = 'גבוה ביותר';
-$labels['nosubject'] = '(ללא נושא)';
+
+$labels['nosubject']  = '(ללא נושא)';
 $labels['showimages'] = 'הצגת תמונות';
 $labels['alwaysshow'] = '$sender תמיד להציג תמונות מאת';
-$labels['isdraft'] = 'זו טיוטה של הודעה';
-$labels['andnmore'] = 'עוד  $nr';
+$labels['isdraft']    = 'זו טיוטה של הודעה';
+$labels['andnmore']   = 'עוד  $nr';
 $labels['togglemoreheaders'] = 'הראה נתוני מערכת נוספים של ההודעה';
 $labels['togglefullheaders'] = 'הראה / בטל צפיה בנתוני מערכת של ההודעה';
+
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'ללא עיצוב';
 $labels['savesentmessagein'] = 'היכן לשמור ההודעה?';
 $labels['dontsave'] = 'ללא שמירה';
 $labels['maxuploadsize'] = 'גודל מקסימלי לקובץ הוא  $size';
+
 $labels['addcc'] = 'הוספת מכותב לידיעה';
 $labels['addbcc'] = 'הוספת מכותב נסתר';
 $labels['addreplyto'] = 'הוספת כתובת למענה';
 $labels['addfollowupto'] = 'הוספת כתובת להעברת הודעה';
+
+// mdn
 $labels['mdnrequest'] = 'השולח ביקש לדעת אם ההודעה נקראה. האם להודיע לשולח?';
 $labels['receiptread'] = 'אישור קבלה (נקרא)';
 $labels['yourmessage'] = 'אישור קבלה להודעתך';
 $labels['receiptnote'] = 'הערה: האישור אינו מבטיח שהנמען קרא או הבין את תוכן ההודעה.';
-$labels['name'] = 'שם להצגה';
-$labels['firstname'] = 'שם פרטי';
-$labels['surname'] = 'שם משפחה';
-$labels['middlename'] = 'שם אמצעי';
-$labels['nameprefix'] = 'קידומת';
-$labels['namesuffix'] = 'סיומת';
-$labels['nickname'] = 'שם חיבה';
-$labels['jobtitle'] = 'תפקיד באירגון';
-$labels['department'] = 'מחלקה';
-$labels['gender'] = 'מגדר';
-$labels['maidenname'] = 'שם משפחה לפני נישואין';
-$labels['email'] = 'כתובת דוא"ל';
-$labels['phone'] = 'מספר טלפון';
-$labels['address'] = 'כתובת';
-$labels['street'] = 'רחוב';
-$labels['locality'] = 'עיר';
-$labels['zipcode'] = 'מיקוד';
-$labels['region'] = 'אישור';
-$labels['country'] = 'מדינה';
-$labels['birthday'] = 'יום הולדת';
-$labels['anniversary'] = 'יום נישואין';
-$labels['website'] = 'אתר אינטרנט';
+
+// address boook
+$labels['name']         = 'שם להצגה';
+$labels['firstname']    = 'שם פרטי';
+$labels['surname']      = 'שם משפחה';
+$labels['middlename']   = 'שם אמצעי';
+$labels['nameprefix']   = 'קידומת';
+$labels['namesuffix']   = 'סיומת';
+$labels['nickname']     = 'שם חיבה';
+$labels['jobtitle']     = 'תפקיד באירגון';
+$labels['department']   = 'מחלקה';
+$labels['gender']       = 'מגדר';
+$labels['maidenname']   = 'שם משפחה לפני נישואין';
+$labels['email']        = 'כתובת דוא"ל';
+$labels['phone']        = 'מספר טלפון';
+$labels['address']      = 'כתובת';
+$labels['street']       = 'רחוב';
+$labels['locality']     = 'עיר';
+$labels['zipcode']      = 'מיקוד';
+$labels['region']       = 'אישור';
+$labels['country']      = 'מדינה';
+$labels['birthday']     = 'יום הולדת';
+$labels['anniversary']  = 'יום נישואין';
+$labels['website']      = 'אתר אינטרנט';
 $labels['instantmessenger'] = 'כינוי בצ\'ט';
 $labels['notes'] = 'הערות';
-$labels['male'] = 'זכר';
+$labels['male']   = 'זכר';
 $labels['female'] = 'נקבה';
 $labels['manager'] = 'מנהל/ת';
 $labels['assistant'] = 'עוזר/ת';
-$labels['typeassistant'] = 'עוזר/ת';
 $labels['spouse'] = 'בן/בת זוג';
 $labels['allfields'] = 'כל השדות';
 $labels['search'] = 'חיפוש';
 $labels['advsearch'] = 'חיםוש מתקדם';
 $labels['advanced'] = 'מתקדם';
 $labels['other'] = 'אחר';
-$labels['typeother'] = 'אחר';
-$labels['typehome'] = 'בית';
-$labels['typework'] = 'עבודה';
-$labels['typemobile'] = 'נייד';
-$labels['typemain'] = 'עיקרי';
-$labels['typehomefax'] = 'פקס בית';
-$labels['typeworkfax'] = 'פקס עבודה';
-$labels['typecar'] = 'מכונית';
-$labels['typepager'] = 'זימונית';
-$labels['typevideo'] = 'וידאו';
-$labels['typehomepage'] = 'דף הבית';
+
+$labels['typehome']   = 'בית';
+$labels['typework']   = 'עבודה';
+$labels['typeother']  = 'אחר';
+$labels['typemobile']  = 'נייד';
+$labels['typemain']  = 'עיקרי';
+$labels['typehomefax']  = 'פקס בית';
+$labels['typeworkfax']  = 'פקס עבודה';
+$labels['typecar']  = 'מכונית';
+$labels['typepager']  = 'זימונית';
+$labels['typevideo']  = 'וידאו';
+$labels['typeassistant']  = 'עוזר/ת';
+$labels['typehomepage']  = 'דף הבית';
 $labels['typeblog'] = 'יומן רשת';
 $labels['typeprofile'] = 'פרופיל';
+
 $labels['addfield'] = 'הוסף שדה';
 $labels['addcontact'] = 'הוספת איש קשר';
 $labels['editcontact'] = 'עריכת איש קשר';
 $labels['contacts'] = 'אנשי קשר';
 $labels['contactproperties'] = 'מאפייני איש קשר';
 $labels['personalinfo'] = 'מידע אישי';
-$labels['edit'] = 'עריכה';
+
+$labels['edit']   = 'עריכה';
 $labels['cancel'] = 'ביטול';
-$labels['save'] = 'שמירה';
+$labels['save']   = 'שמירה';
 $labels['delete'] = 'מחיקה';
 $labels['rename'] = 'שינוי שם';
 $labels['addphoto'] = 'הוספה';
 $labels['replacephoto'] = 'החלפה';
 $labels['uploadphoto'] = 'העלאת תמונה';
-$labels['newcontact'] = 'איש קשר חדש';
-$labels['deletecontact'] = 'מחיקת אנשי קשר מסומנים';
-$labels['composeto'] = 'יצירת הודעה אל';
+
+$labels['newcontact']     = 'איש קשר חדש';
+$labels['deletecontact']  = 'מחיקת אנשי קשר מסומנים';
+$labels['composeto']      = 'יצירת הודעה אל';
 $labels['contactsfromto'] = 'אנשי קשר $from עד $to מתוך $count';
-$labels['print'] = 'הדפסה';
-$labels['export'] = 'ייצוא';
-$labels['exportvcards'] = 'ייצוא אנשי קשר בפורמט  vCard';
+$labels['print']          = 'הדפסה';
+$labels['export']         = 'ייצוא';
+$labels['exportall']      = 'יצוא של כל הרשומות';
+$labels['exportsel']      = 'צוא של רשומות נבחרות';
+$labels['exportvcards']   = 'ייצוא אנשי קשר בפורמט  vCard';
 $labels['newcontactgroup'] = 'יצירת קבוצה חדשה של אנשי קשר';
-$labels['grouprename'] = 'שינוי שם קבוצה';
-$labels['groupdelete'] = 'מחיקת קבוצה';
+$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'] = 'שמירת החיפוש';
 $labels['searchdelete'] = 'מחיקת החיפוש';
+
 $labels['import'] = 'ייבוא';
 $labels['importcontacts'] = 'ייבוא אנשי קשר';
 $labels['importfromfile'] = 'ייבוא מקובץ';
 $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['identities'] = 'זהויות';
 $labels['manageidentities'] = 'ניהול זהויות לחשבון זה';
 $labels['newidentity'] = 'זהות חדשה';
+
 $labels['newitem'] = 'רשומה חדשה';
 $labels['edititem'] = 'עריכת רשומה';
+
 $labels['preferhtml'] = 'הצגת HTML';
 $labels['defaultcharset'] = 'ברירת מחדל של תווים';
 $labels['htmlmessage'] = 'תוכן HTML';
+$labels['messagepart'] = 'גוף ההודעה';
+$labels['digitalsig'] = 'חתימה דיגיטלית';
 $labels['dateformat'] = 'פורמט התאריך';
 $labels['timeformat'] = 'פורמט השעה';
 $labels['prettydate'] = 'תאריכים מעוצבים';
-$labels['setdefault'] = 'קביעה כברירת מחדל';
-$labels['autodetect'] = 'אוטומטי';
-$labels['language'] = 'שפה';
-$labels['timezone'] = 'איזור זמן';
-$labels['pagesize'] = 'מספר שורות בדף';
+$labels['setdefault']  = 'קביעה כברירת מחדל';
+$labels['autodetect']  = 'אוטומטי';
+$labels['language']  = 'שפה';
+$labels['timezone']  = 'איזור זמן';
+$labels['pagesize']  = 'מספר שורות בדף';
 $labels['signature'] = 'חתימה';
-$labels['dstactive'] = 'שעון קיץ';
+$labels['dstactive']  = 'שעון קיץ';
 $labels['showinextwin'] = 'צפיה בהודעה בחלון חדש';
 $labels['composeextwin'] = 'יצירת הודעה בחלון חדש';
 $labels['htmleditor'] = 'יצירת הודעה מעוצבת';
 $labels['htmlonreply'] = 'רק במענה להודעת HTML';
 $labels['htmlonreplyandforward'] = 'להעביר או להשיב להודעה שהגיעה בפורמט HTML';
 $labels['htmlsignature'] = 'חתימה מעוצבת';
+$labels['showemail'] = 'הצגת כתובת דוא"ל עם שם השולח';
 $labels['previewpane'] = 'תצוגה מוקדמת';
 $labels['skin'] = 'ערכת מראה';
 $labels['logoutclear'] = 'ריקון סל אשפה ביציאה';
@@ -355,10 +427,11 @@ $labels['showremoteimages'] = 'הצגת תמונות משרת מרוחק בגו�
 $labels['fromknownsenders'] = 'משולחים מוכרים';
 $labels['always'] = 'תמיד';
 $labels['showinlineimages'] = 'הצגת תמונות מצורפות בתחתית ההודעה';
-$labels['autosavedraft'] = 'שמירה אוטומטית של טיוטה';
-$labels['everynminutes'] = 'כל $n דקות';
-$labels['never'] = 'אף פעם';
-$labels['immediately'] = 'מיידית';
+$labels['autosavedraft']  = 'שמירה אוטומטית של טיוטה';
+$labels['everynminutes']  = 'כל $n דקות';
+$labels['refreshinterval']  = 'רענון (בדיקת קיום של הודעות חדשות וכו\')';
+$labels['never']  = 'אף פעם';
+$labels['immediately']  = 'מיידית';
 $labels['messagesdisplaying'] = 'הצגת הודעות';
 $labels['messagescomposition'] = 'כתיבת הודעות';
 $labels['mimeparamfolding'] = 'שמות קבצים מצורפים';
@@ -385,16 +458,13 @@ $labels['replyremovesignature'] = 'החתימה תוסר מההודעה המקו
 $labels['autoaddsignature'] = 'הוספה אוטומטית של חתימה';
 $labels['newmessageonly'] = 'הודעה חדשה בלבד';
 $labels['replyandforwardonly'] = 'מענה והעברת הודעה בלבד';
-$labels['replysignaturepos'] = 'במענה או בהעברת הודעה, החתימה תופיע';
-$labels['belowquote'] = 'בסוף ההודעה המקורית';
-$labels['abovequote'] = 'בתחילת ההודעה המקורית';
 $labels['insertsignature'] = 'שיבוץ חתימה';
-$labels['previewpanemarkread'] = 'סימון הודעה שנצפתה כנקראה';
-$labels['afternseconds'] = 'לאחר $n שניות';
+$labels['previewpanemarkread']  = 'סימון הודעה שנצפתה כנקראה';
+$labels['afternseconds']  = 'לאחר $n שניות';
 $labels['reqmdn'] = 'תמיד יש לדרוש אישור קבלה';
 $labels['reqdsn'] = 'תמיד לבקש הודעה על מצב המסירה';
 $labels['replysamefolder'] = 'המענה ישמר בתיקיה של ההודעה המקורית';
-$labels['defaultaddressbook'] = 'הוספת אנשי קשר לספר הכתובות שנבחר';
+$labels['defaultabook'] = 'ברירת המחדל של רשימת כתובות';
 $labels['autocompletesingle'] = 'לדלג על כתובת דואר חילופית בעת שימוש בהשלמה אוטומטית של הקלדה';
 $labels['listnamedisplay'] = 'הצגת איש הקשר בתור';
 $labels['spellcheckbeforesend'] = 'בדיקת איות לפני המשלוח';
@@ -407,13 +477,15 @@ $labels['mailtoprotohandler'] = 'קביעת הפרוטוקול לטיפול בק
 $labels['forwardmode'] = 'הפנית הודעות';
 $labels['inline'] = 'חלק מההודעה';
 $labels['asattachment'] = 'כצרופה';
-$labels['folder'] = 'תיק';
-$labels['foldername'] = 'שם תיק';
-$labels['subscribed'] = 'מנוי';
+
+$labels['folder']  = 'תיק';
+$labels['folders']  = 'תיקיות';
+$labels['foldername']  = 'שם תיק';
+$labels['subscribed']  = 'מנוי';
 $labels['messagecount'] = 'הודעות';
-$labels['create'] = 'יצירה';
-$labels['createfolder'] = 'יצירת תיק חדש';
-$labels['managefolders'] = 'ניהול תיקים';
+$labels['create']  = 'יצירה';
+$labels['createfolder']  = 'יצירת תיק חדש';
+$labels['managefolders']  = 'ניהול תיקים';
 $labels['specialfolders'] = 'תיקים מיוחדים';
 $labels['properties'] = 'מאפיינים';
 $labels['folderproperties'] = 'מאפייני תיק';
@@ -423,23 +495,29 @@ $labels['info'] = 'מידע';
 $labels['getfoldersize'] = 'הקשה להצגה של גודל תיק';
 $labels['changesubscription'] = 'הקשה לשינוי הרשמה';
 $labels['foldertype'] = 'סוג תיקיה';
-$labels['personalfolder'] = 'תיקיה פרטית';
-$labels['otherfolder'] = 'תיקית משתמש נוספת';
-$labels['sharedfolder'] = 'תיקיה ציבורית';
+$labels['personalfolder']  = 'תיקיה פרטית';
+$labels['otherfolder']  = 'תיקית משתמש נוספת';
+$labels['sharedfolder']  = 'תיקיה ציבורית';
+
 $labels['sortby'] = 'מיון לפי';
-$labels['sortasc'] = 'מיון בסדר עולה';
+$labels['sortasc']  = 'מיון בסדר עולה';
 $labels['sortdesc'] = 'מיון בסדר יורד';
 $labels['undo'] = 'ביטול שינוי';
+
 $labels['installedplugins'] = 'תוספים מותקנים';
 $labels['plugin'] = 'תוסף תוכנה';
 $labels['version'] = 'גירסה';
 $labels['source'] = 'מקור';
 $labels['license'] = 'רשיון';
 $labels['support'] = 'קבלת תמיכה';
+
+// units
 $labels['B'] = 'בייט';
 $labels['KB'] = 'ק"ב';
 $labels['MB'] = 'מ"ב';
 $labels['GB'] = 'ג"ב';
+
+// character sets
 $labels['unicode'] = 'יוניקוד';
 $labels['english'] = 'אנגלית';
 $labels['westerneuropean'] = 'מערב אירופי';
@@ -459,3 +537,4 @@ $labels['japanese'] = 'יפני';
 $labels['korean'] = 'קוריאני';
 $labels['chinese'] = 'סיני';
 
+?>
diff --git a/program/localization/he_IL/messages.inc b/program/localization/he_IL/messages.inc
index 4d669b462..7d9b87c06 100644
--- a/program/localization/he_IL/messages.inc
+++ b/program/localization/he_IL/messages.inc
@@ -2,20 +2,23 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/he_IL/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Moshe Leibovitch <moish@mln.co.il>                            |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['errortitle'] = 'קרתה שגיאה !';
-$messages['loginfailed'] = 'הכניסה נכשלה';
+$messages['errortitle']  = 'קרתה שגיאה !';
+$messages['loginfailed']  = 'הכניסה נכשלה';
 $messages['cookiesdisabled'] = 'הדפדפן אינו מקבל עוגיות';
 $messages['sessionerror'] = 'כניסתך למערכת אינה חוקית או שפג תוקפה';
 $messages['storageerror'] = 'הקשר לשרת הדואר נכשל';
@@ -25,11 +28,14 @@ $messages['dberror'] = '! שגיאה במסד הנתונים';
 $messages['requesttimedout'] = 'תם הזמן המוקצב לבקשה';
 $messages['errorreadonly'] = 'לא ניתן לבצע הפעולה כי התיק ניתן לקריאה בלבד';
 $messages['errornoperm'] = 'לא ניתן לבצע הפעולה כי אין הרשאה לבצעה';
+$messages['erroroverquota'] = 'לא ניתן לבצע הפעולה כי לא מקום פנוי על הדיסק';
+$messages['erroroverquotadelete'] = 'אין מקום פנוי על הדיסק. יש להשתמש ב SHIFT+DELETE כדי למחוק ההודעה';
 $messages['invalidrequest'] = 'בקשה לא חוקית. המידע לא נשמר';
 $messages['invalidhost'] = 'שם שרת לא חוקי';
 $messages['nomessagesfound'] = 'לא נמצאו הודעות בתיבה זו';
 $messages['loggedout'] = 'הקשר הסתיים. להתראות!';
 $messages['mailboxempty'] = 'רשימת ההודעות ריקה';
+$messages['refreshing'] = 'מרענן...';
 $messages['loading'] = 'טעינה...';
 $messages['uploading'] = 'קובץ עולה...';
 $messages['uploadingmany'] = 'מעלה קבצים...';
@@ -56,11 +62,11 @@ $messages['errormoving'] = 'לא ניתן לתייק את ההודעה';
 $messages['errorcopying'] = 'העתקת ההודעות נכשלה';
 $messages['errordeleting'] = 'לא ניתן למחוק את ההודעה';
 $messages['errormarking'] = 'לא ניתן לסמן ההודעה';
-$messages['deletecontactconfirm'] = 'האם למחוק את איש הקשר?';
-$messages['deletegroupconfirm'] = 'האם אכן ברצונך למחוק את הקבוצה שנבחרה?';
+$messages['deletecontactconfirm']  = 'האם למחוק את איש הקשר?';
+$messages['deletegroupconfirm']  = 'האם אכן ברצונך למחוק את הקבוצה שנבחרה?';
 $messages['deletemessagesconfirm'] = 'האם למחוק את ההודעות המסומנות?';
-$messages['deletefolderconfirm'] = 'האם למחוק תיק זה?';
-$messages['purgefolderconfirm'] = 'האם למחוק את כל ההודעות בתיק זה?';
+$messages['deletefolderconfirm']  = 'האם למחוק תיק זה?';
+$messages['purgefolderconfirm']  = 'האם למחוק את כל ההודעות בתיק זה?';
 $messages['contactdeleting'] = 'אנשי קשר נמחקים...';
 $messages['groupdeleting'] = 'מחיקת קבוצה...';
 $messages['folderdeleting'] = 'התיקיה נמחקת...';
@@ -69,11 +75,11 @@ $messages['foldersubscribing'] = 'התיק נרשם...';
 $messages['folderunsubscribing'] = 'רישום התיק בוטל...';
 $messages['formincomplete'] = 'לא הוזנו כל השדות בטופס זה';
 $messages['noemailwarning'] = 'נא להוסיף כתובת דוא"ל חוקית';
-$messages['nonamewarning'] = 'נא להוסיף שם';
+$messages['nonamewarning']  = 'נא להוסיף שם';
 $messages['nopagesizewarning'] = 'נא להוסיף גודל דף';
 $messages['nosenderwarning'] = 'נא להוסיף כתובת השולח';
 $messages['norecipientwarning'] = 'נא להוסיף לפחות נמען אחד';
-$messages['nosubjectwarning'] = 'שורת הנושא ריקה. האם ברצונך להוסיף נושא כעת?';
+$messages['nosubjectwarning']  = 'שורת הנושא ריקה. האם ברצונך להוסיף נושא כעת?';
 $messages['nobodywarning'] = 'האם לשלוח הודעה ללא תוכן?';
 $messages['notsentwarning'] = 'ההודעה לא נשלחה. האם לבטל?';
 $messages['noldapserver'] = 'נא לבחור שרת כתובות לחיפוש';
@@ -117,6 +123,7 @@ $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'] = 'פעולה אסורה!';
@@ -158,4 +165,7 @@ $messages['invalidimageformat'] = 'פורמט תמונה לא חוקי';
 $messages['mispellingsfound'] = 'התגלו שגיאות כתיב בהודעה';
 $messages['parentnotwritable'] = 'לא ניתן ליצור/להעביר תיקיה לתוך תיקית האב שנבחרה. אין הרשאה לגישה.';
 $messages['messagetoobig'] = 'ההודעה גדולה מעבר ליכולת העיבוד של התוכנה';
+$messages['attachmentvalidationerror'] = 'זהירות ! הצרופה חשודה כי אינה מהסוג שצוין בהודעה. אם לא ניתן לבטוח בשולח אזי להמנע מלפתוח את הקובץ בדפדפן כי הקובץ יכול להכיל קוד זדוני.<br/><br/><em>Expected: $expected; found: $detected</em>';
+$messages['noscriptwarning'] = 'זהירות! תוכנה זו דורשת שימוש בג\'אווהסקריפט! כדי להשתמש בכלי, יש לבחור באפשרות זו בהגדרות הדפדפן.';
 
+?>
diff --git a/program/localization/hi_IN/labels.inc b/program/localization/hi_IN/labels.inc
index 74e4b74cd..3b8279f71 100644
--- a/program/localization/hi_IN/labels.inc
+++ b/program/localization/hi_IN/labels.inc
@@ -2,54 +2,78 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/hi_IN/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = '$product में स्वागत है';
-$labels['username'] = 'यूसरनाम';
-$labels['password'] = 'पासवर्ड';
-$labels['server'] = 'सर्वर';
-$labels['login'] = 'लॉगिन';
-$labels['logout'] = 'लॉगआऊट';
-$labels['mail'] = 'ई-मेल';
+
+// login page
+$labels['welcome']   = '$product में स्वागत है';
+$labels['username']  = 'यूसरनाम';
+$labels['password']  = 'पासवर्ड';
+$labels['server']    = 'सर्वर';
+$labels['login']     = 'लॉगिन';
+
+// taskbar
+$labels['logout']   = 'लॉगआऊट';
+$labels['mail']     = 'ई-मेल';
 $labels['settings'] = 'निजी सैटिंग';
 $labels['addressbook'] = 'पता खाता';
-$labels['inbox'] = 'इनबॉक्स';
+
+// mailbox names
+$labels['inbox']  = 'इनबॉक्स';
 $labels['drafts'] = 'ड्राफ़ट';
-$labels['sent'] = 'भेजा गया';
-$labels['trash'] = 'रद्दी';
-$labels['junk'] = 'स्पैम';
+$labels['sent']   = 'भेजा गया';
+$labels['trash']  = 'रद्दी';
+$labels['junk']   = 'स्पैम';
+
+// message listing
 $labels['subject'] = 'विशय';
-$labels['from'] = 'भेजने वाला';
-$labels['to'] = 'पाने वाला';
-$labels['cc'] = 'कार्बन';
-$labels['bcc'] = 'अंधा कार्बन';
+$labels['from']    = 'भेजने वाला';
+$labels['sender']  = 'Sender';
+$labels['to']      = 'पाने वाला';
+$labels['cc']      = 'कार्बन';
+$labels['bcc']     = 'अंधा कार्बन';
 $labels['replyto'] = 'जवाब यहाँ';
 $labels['followupto'] = 'को- फॉलोअप';
-$labels['date'] = 'तारीख';
-$labels['size'] = 'माप';
+$labels['date']    = 'तारीख';
+$labels['size']    = 'माप';
 $labels['priority'] = 'मेल की महत्वपूर्णता';
 $labels['organization'] = 'संस्था';
+$labels['readstatus'] = 'Read status';
+$labels['listoptions'] = 'List options...';
+
 $labels['mailboxlist'] = 'फ़ोल्डर';
-$labels['folders'] = 'फ़ोल्डर';
 $labels['messagesfromto'] = '$from से ले कर $to, $count मेल में से';
+$labels['threadsfromto'] = 'Threads $from to $to of $count';
 $labels['messagenrof'] = '$nr नम्बर मेल, $count में से';
-$labels['copy'] = 'कार्बन';
-$labels['move'] = 'स्थानांतरित करें';
-$labels['moveto'] = 'खीस्काऐं...';
+$labels['fromtoshort'] = '$from – $to of $count';
+
+$labels['copy']     = 'कार्बन';
+$labels['move']     = 'स्थानांतरित करें';
+$labels['moveto']   = 'खीस्काऐं...';
 $labels['download'] = 'डाऊनलोड';
+$labels['open']     = 'Open';
+$labels['showattachment'] = 'Show';
+$labels['showanyway'] = 'Show it anyway';
+
 $labels['filename'] = 'फ़ाईल नाम';
 $labels['filesize'] = 'फ़ाईल माप';
+
 $labels['addtoaddressbook'] = 'पता खाते में जोडें';
+
+// weekdays short
 $labels['sun'] = 'रवि';
 $labels['mon'] = 'सोम';
 $labels['tue'] = 'मंग';
@@ -57,134 +81,458 @@ $labels['wed'] = 'बुध';
 $labels['thu'] = 'गुरु';
 $labels['fri'] = 'शुक्र';
 $labels['sat'] = 'शनि';
-$labels['sunday'] = 'रविवार';
-$labels['monday'] = 'सोमवार';
-$labels['tuesday'] = 'मंगलवार';
+
+// weekdays long
+$labels['sunday']    = 'रविवार';
+$labels['monday']    = 'सोमवार';
+$labels['tuesday']   = 'मंगलवार';
 $labels['wednesday'] = 'बुधवार';
-$labels['thursday'] = 'गुरुवार';
-$labels['friday'] = 'शुक्रवार';
-$labels['saturday'] = 'शनिवार';
-$labels['jan'] = 'जनवरी';
-$labels['feb'] = 'फ़रवरी';
-$labels['mar'] = 'मार्च';
-$labels['apr'] = 'अप्रेल';
-$labels['may'] = 'मई';
-$labels['longmay'] = 'मई';
-$labels['jun'] = 'जून';
-$labels['jul'] = 'जुलाई';
-$labels['longjan'] = 'जनवरी';
-$labels['longfeb'] = 'फ़रवरी';
-$labels['longmar'] = 'मार्च';
-$labels['longapr'] = 'अप्रैल';
-$labels['longjun'] = 'जून';
-$labels['longjul'] = 'जुलाई';
-$labels['longaug'] = 'अगस्त';
-$labels['longsep'] = 'सितंबर';
-$labels['longoct'] = 'अक्टूबर';
-$labels['longnov'] = 'नवम्बर';
-$labels['longdec'] = 'दिसंबर';
+$labels['thursday']  = 'गुरुवार';
+$labels['friday']    = 'शुक्रवार';
+$labels['saturday']  = 'शनिवार';
+
+// months short
+$labels['jan']	= 'जनवरी';
+$labels['feb']	= 'फ़रवरी';
+$labels['mar']	= 'मार्च';
+$labels['apr']	= 'अप्रेल';
+$labels['may']	= 'मई';
+$labels['jun']	= 'जून';
+$labels['jul'] 	= 'जुलाई';
+$labels['aug']	= 'Aug';
+$labels['sep']	= 'Sep';
+$labels['oct']	= 'Oct';
+$labels['nov']	= 'Nov';
+$labels['dec']	= 'Dec';
+
+// months long
+$labels['longjan']	= 'जनवरी';
+$labels['longfeb']	= 'फ़रवरी';
+$labels['longmar']	= 'मार्च';
+$labels['longapr']	= 'अप्रैल';
+$labels['longmay']	= 'मई';
+$labels['longjun']	= 'जून';
+$labels['longjul']	= 'जुलाई';
+$labels['longaug']	= 'अगस्त';
+$labels['longsep']	= 'सितंबर';
+$labels['longoct']	= 'अक्टूबर';
+$labels['longnov']	= 'नवम्बर';
+$labels['longdec']	= 'दिसंबर';
+
 $labels['today'] = 'आज';
-$labels['refresh'] = 'ताज़ा करें';
-$labels['checkmail'] = 'नये मेल लाऐं';
-$labels['compose'] = 'मेल लिखें';
-$labels['writenewmessage'] = 'मेल लिखें';
-$labels['reply'] = 'जवाब';
-$labels['replytomessage'] = 'मेल का जवाब दें';
+
+// toolbar buttons
+$labels['refresh']          = 'ताज़ा करें';
+$labels['checkmail']        = 'नये मेल लाऐं';
+$labels['compose']          = 'मेल लिखें';
+$labels['writenewmessage']  = 'मेल लिखें';
+$labels['reply']            = 'जवाब';
+$labels['replytomessage']   = 'मेल का जवाब दें';
 $labels['replytoallmessage'] = 'सभी को जवाब लिखें';
-$labels['forward'] = 'अग्रेषित करें';
-$labels['forwardmessage'] = 'आगे भेजें';
-$labels['deletemessage'] = 'रद्द करें';
-$labels['printmessage'] = 'मेल छापें';
-$labels['previousmessage'] = 'पीछे के मेल दिखाऐं';
-$labels['firstmessage'] = 'पहला मेल दिखाऐं';
-$labels['nextmessage'] = 'अगला मेल दिखाऐं';
-$labels['lastmessage'] = 'आखीरी मेल दिखाऐं';
-$labels['backtolist'] = 'मेल सूची देखें';
-$labels['viewsource'] = 'सोर्स दिखाऐं';
-$labels['mark'] = 'चिह्नित';
+$labels['replyall']         = 'Reply all';
+$labels['replylist']        = 'Reply list';
+$labels['forward']          = 'अग्रेषित करें';
+$labels['forwardinline']    = 'Forward inline';
+$labels['forwardattachment'] = 'Forward as attachment';
+$labels['forwardmessage']   = 'आगे भेजें';
+$labels['deletemessage']    = 'रद्द करें';
+$labels['movemessagetotrash'] = 'Move message to trash';
+$labels['printmessage']     = 'मेल छापें';
+$labels['previousmessage']  = 'पीछे के मेल दिखाऐं';
+$labels['firstmessage']     = 'पहला मेल दिखाऐं';
+$labels['nextmessage']      = 'अगला मेल दिखाऐं';
+$labels['lastmessage']      = 'आखीरी मेल दिखाऐं';
+$labels['backtolist']       = 'मेल सूची देखें';
+$labels['viewsource']       = 'सोर्स दिखाऐं';
+$labels['mark']             = 'चिह्नित';
+$labels['markmessages']     = 'Mark messages';
+$labels['markread']         = 'As read';
+$labels['markunread']       = 'As unread';
+$labels['markflagged']      = 'As flagged';
+$labels['markunflagged']    = 'As unflagged';
+$labels['moreactions']      = 'More actions...';
+$labels['more']             = 'More';
+$labels['back']             = 'Back';
+$labels['options']          = 'Options';
+
 $labels['select'] = 'चुनें';
 $labels['all'] = 'सभी';
 $labels['none'] = 'कोई नहीं';
-$labels['nonesort'] = 'कोई नहीं';
+$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';
+$labels['filter'] = 'Filter';
+$labels['list'] = 'List';
+$labels['threads'] = 'Threads';
+$labels['expand-all'] = 'Expand All';
+$labels['expand-unread'] = 'Expand Unread';
+$labels['collapse-all'] = 'Collapse All';
+$labels['threaded'] = 'Threaded';
+
+$labels['autoexpand_threads'] = 'Expand message threads';
+$labels['do_expand'] = 'all threads';
+$labels['expand_only_unread'] = 'only with unread messages';
+$labels['fromto'] = 'From/To';
+$labels['flag'] = 'Flag';
+$labels['attachment'] = 'Attachment';
+$labels['nonesort'] = 'कोई नहीं';
+$labels['sentdate'] = 'Sent date';
+$labels['arrival'] = 'Arrival date';
+$labels['asc'] = 'ascending';
+$labels['desc'] = 'descending';
+$labels['listcolumns'] = 'List columns';
+$labels['listsorting'] = 'Sorting column';
+$labels['listorder'] = 'Sorting order';
+$labels['listmode'] = 'List view mode';
+
+$labels['folderactions'] = 'Folder actions...';
 $labels['compact'] = 'छोटा करें';
 $labels['empty'] = 'मेल रद्दी में डालें';
+
 $labels['quota'] = 'डिस्क उपयोग';
-$labels['unknown'] = 'अज्ञात';
-$labels['unlimited'] = 'असीम';
-$labels['quicksearch'] = 'तेज़ खोज';
-$labels['resetsearch'] = 'खोज खाली करें';
-$labels['sendmessage'] = 'मेल भेजें';
-$labels['savemessage'] = 'ड्राफ़ट सहेजें';
-$labels['addattachment'] = 'फ़ाईल जोडें';
-$labels['charset'] = 'कैरेक्टर सैट';
-$labels['editortype'] = 'सम्पादक प्राकार';
-$labels['returnreceipt'] = 'मेल रसीद';
+$labels['unknown']  = 'अज्ञात';
+$labels['unlimited']  = 'असीम';
+
+$labels['quicksearch']  = 'तेज़ खोज';
+$labels['resetsearch']  = 'खोज खाली करें';
+$labels['searchmod']  = 'Search modifiers';
+$labels['msgtext']  = 'Entire message';
+$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';
+$labels['send']           = 'Send';
+$labels['sendmessage']    = 'मेल भेजें';
+$labels['savemessage']    = 'ड्राफ़ट सहेजें';
+$labels['addattachment']  = 'फ़ाईल जोडें';
+$labels['charset']        = 'कैरेक्टर सैट';
+$labels['editortype']     = 'सम्पादक प्राकार';
+$labels['returnreceipt']  = 'मेल रसीद';
+$labels['dsn']            = 'Delivery status notification';
+$labels['mailreplyintro'] = 'On $date, $sender wrote:';
+$labels['originalmessage'] = 'Original Message';
+
+$labels['editidents']    = 'Edit identities';
+$labels['spellcheck']    = 'Spell';
 $labels['checkspelling'] = 'स्पैलिंग जाँचें';
 $labels['resumeediting'] = 'सम्पादन फिर शुरू करें';
-$labels['revertto'] = 'पहले की स्थिती पर जाऐं';
+$labels['revertto']      = 'पहले की स्थिती पर जाऐं';
+
+$labels['attach'] = 'Attach';
 $labels['attachments'] = 'जुडे फाईल';
 $labels['upload'] = 'अपलोड';
-$labels['close'] = 'बंद';
-$labels['low'] = 'कम';
-$labels['lowest'] = 'सबसे कम';
-$labels['normal'] = 'साधारण';
-$labels['high'] = 'उच्च';
+$labels['uploadprogress'] = '$percent ($current from $total)';
+$labels['close']  = 'बंद';
+$labels['messageoptions']  = 'Message options...';
+
+$labels['low']     = 'कम';
+$labels['lowest']  = 'सबसे कम';
+$labels['normal']  = 'साधारण';
+$labels['high']    = 'उच्च';
 $labels['highest'] = 'उच्चतम';
-$labels['nosubject'] = '(कोई विशय नहीं)';
+
+$labels['nosubject']  = '(कोई विशय नहीं)';
 $labels['showimages'] = 'चित्र दिखाऐं';
+$labels['alwaysshow'] = 'Always show images from $sender';
+$labels['isdraft']    = 'This is a draft message.';
+$labels['andnmore']   = '$nr more...';
+$labels['togglemoreheaders'] = 'Show more message headers';
+$labels['togglefullheaders'] = 'Toggle raw message headers';
+
 $labels['htmltoggle'] = 'ऐच-टी-ऐम-एल (HTML)';
 $labels['plaintoggle'] = 'सादा पाठ';
-$labels['name'] = 'दिखने वाला नाम';
-$labels['firstname'] = 'पहला नाम';
-$labels['surname'] = 'उपनाम';
-$labels['email'] = 'मेल';
+$labels['savesentmessagein'] = 'Save sent message in';
+$labels['dontsave'] = 'don\'t save';
+$labels['maxuploadsize'] = 'Maximum allowed file size is $size';
+
+$labels['addcc'] = 'Add Cc';
+$labels['addbcc'] = 'Add Bcc';
+$labels['addreplyto'] = 'Add Reply-To';
+$labels['addfollowupto'] = 'Add Followup-To';
+
+// mdn
+$labels['mdnrequest'] = 'The sender of this message has asked to be notified when you read this message. Do you wish to notify the sender?';
+$labels['receiptread'] = 'Return Receipt (read)';
+$labels['yourmessage'] = 'This is a Return Receipt for your message';
+$labels['receiptnote'] = 'Note: This receipt only acknowledges that the message was displayed on the recipient\'s computer. There is no guarantee that the recipient has read or understood the message contents.';
+
+// address boook
+$labels['name']         = 'दिखने वाला नाम';
+$labels['firstname']    = 'पहला नाम';
+$labels['surname']      = 'उपनाम';
+$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['email']        = 'मेल';
+$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['typepager']  = 'Pager';
+$labels['typevideo']  = 'Video';
+$labels['typeassistant']  = 'Assistant';
+$labels['typehomepage']  = 'Home Page';
+$labels['typeblog'] = 'Blog';
+$labels['typeprofile'] = 'Profile';
+
+$labels['addfield'] = 'Add field...';
 $labels['addcontact'] = 'नया पता जोडें';
 $labels['editcontact'] = 'पता सम्पाद';
-$labels['edit'] = 'सम्पाद';
+$labels['contacts'] = 'Contacts';
+$labels['contactproperties'] = 'Contact properties';
+$labels['personalinfo'] = 'Personal information';
+
+$labels['edit']   = 'सम्पाद';
 $labels['cancel'] = 'रद्द';
-$labels['save'] = 'सहेज';
+$labels['save']   = 'सहेज';
 $labels['delete'] = 'मिटा';
-$labels['newcontact'] = 'नया पता कार्ड बनाऐं';
-$labels['deletecontact'] = 'चुने पते मिटाऐं';
-$labels['composeto'] = 'को मेल भेजें';
+$labels['rename'] = 'Rename';
+$labels['addphoto'] = 'Add';
+$labels['replacephoto'] = 'Replace';
+$labels['uploadphoto'] = 'Upload photo';
+
+$labels['newcontact']     = 'नया पता कार्ड बनाऐं';
+$labels['deletecontact']  = 'चुने पते मिटाऐं';
+$labels['composeto']      = 'को मेल भेजें';
 $labels['contactsfromto'] = '$from से ले कर $to, $count पते में से';
-$labels['print'] = 'छापें';
-$labels['export'] = 'ऐक्स्पोर्ट';
-$labels['previouspage'] = 'इससे पहले के बन्डल को दिखाऐं';
-$labels['firstpage'] = 'पहला बन्डल दिखाऐं';
-$labels['nextpage'] = 'अगला बन्डल दिखाऐं';
-$labels['lastpage'] = 'आखिरी बन्डल दिखाऐं';
+$labels['print']          = 'छापें';
+$labels['export']         = 'ऐक्स्पोर्ट';
+$labels['exportall']      = 'Export all';
+$labels['exportsel']      = 'Export selected';
+$labels['exportvcards']   = 'Export contacts in vCard format';
+$labels['newcontactgroup'] = 'Create new contact group';
+$labels['grouprename']    = 'Rename group';
+$labels['groupdelete']    = 'Delete group';
+$labels['groupremoveselected'] = 'Remove selected contacts from group';
+
+$labels['previouspage']   = 'इससे पहले के बन्डल को दिखाऐं';
+$labels['firstpage']      = 'पहला बन्डल दिखाऐं';
+$labels['nextpage']       = 'अगला बन्डल दिखाऐं';
+$labels['lastpage']       = 'आखिरी बन्डल दिखाऐं';
+
+$labels['group'] = 'Group';
+$labels['groups'] = 'Groups';
+$labels['personaladrbook'] = 'Personal Addresses';
+
+$labels['searchsave'] = 'Save search';
+$labels['searchdelete'] = 'Delete search';
+
+$labels['import'] = 'Import';
+$labels['importcontacts'] = 'Import contacts';
+$labels['importfromfile'] = 'Import from file:';
+$labels['importtarget'] = 'Add new contacts to address book:';
+$labels['importreplace'] = 'Replace the entire address book';
+$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['done'] = 'Done';
+
+// settings
 $labels['settingsfor'] = 'इनके विन्यास:';
+$labels['about'] = 'About';
 $labels['preferences'] = 'पसंद';
 $labels['userpreferences'] = 'यूसर पसंद';
 $labels['editpreferences'] = 'यूसर पसंद सम्पादें';
+
 $labels['identities'] = 'पहचान';
 $labels['manageidentities'] = 'इस खाते के पहचान व्यवस्थित करें';
 $labels['newidentity'] = 'नया पहचान';
+
 $labels['newitem'] = 'नया चीज़';
 $labels['edititem'] = 'चीज़ सम्पादें';
+
 $labels['preferhtml'] = 'ऐच-टी-ऐम-ऐल(HTML) दिखाऐं';
+$labels['defaultcharset'] = 'Default Character Set';
 $labels['htmlmessage'] = 'ऐच-टी-ऐम-ऐल (HTML) रूप मेल करें';
+$labels['messagepart'] = 'Part';
+$labels['digitalsig'] = 'Digital Signature';
+$labels['dateformat'] = 'Date format';
+$labels['timeformat'] = 'Time format';
 $labels['prettydate'] = 'सुनदर तारीखें';
-$labels['setdefault'] = 'तयशुदा चुनें';
-$labels['language'] = 'भाषा';
-$labels['timezone'] = 'समय क्षेत्र';
-$labels['pagesize'] = 'हर पन्ने पर इतने';
+$labels['setdefault']  = 'तयशुदा चुनें';
+$labels['autodetect']  = 'Auto';
+$labels['language']  = 'भाषा';
+$labels['timezone']  = 'समय क्षेत्र';
+$labels['pagesize']  = 'हर पन्ने पर इतने';
 $labels['signature'] = 'दस्तखत';
-$labels['dstactive'] = 'रौशनी बचाव';
+$labels['dstactive']  = 'रौशनी बचाव';
+$labels['showinextwin'] = 'Open message in a new window';
+$labels['composeextwin'] = 'Compose in a new window';
 $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['autosavedraft'] = 'ड्राफ़ट अपने आप सहेजते जाऐं';
-$labels['never'] = 'कभी नहाीं';
-$labels['folder'] = 'फ़ोल्डर';
-$labels['foldername'] = 'फ़ोल्डर नाम';
-$labels['subscribed'] = 'सबस्क्राईब किया गया';
-$labels['create'] = 'बनाऐं';
-$labels['createfolder'] = 'फ़ोलडर बनाऐं';
-$labels['managefolders'] = 'फ़ोलडर को व्यवस्थित करें';
+$labels['skin'] = 'Interface skin';
+$labels['logoutclear'] = 'Clear Trash on logout';
+$labels['logoutcompact'] = 'Compact Inbox on logout';
+$labels['uisettings'] = 'User Interface';
+$labels['serversettings'] = 'Server Settings';
+$labels['mailboxview'] = 'Mailbox View';
+$labels['mdnrequests'] = 'On request for return receipt';
+$labels['askuser'] = 'ask me';
+$labels['autosend'] = 'send receipt';
+$labels['autosendknown'] = 'send receipt to my contacts, otherwise ask me';
+$labels['autosendknownignore'] = 'send receipt to my contacts, otherwise ignore';
+$labels['ignore'] = 'ignore';
+$labels['readwhendeleted'] = 'Mark the message as read on delete';
+$labels['flagfordeletion'] = 'Flag the message for deletion instead of delete';
+$labels['skipdeleted'] = 'Do not show deleted messages';
+$labels['deletealways'] = 'If moving messages to Trash fails, delete them';
+$labels['deletejunk'] = 'Directly delete messages in Junk';
+$labels['showremoteimages'] = 'Display remote inline images';
+$labels['fromknownsenders'] = 'from known senders';
+$labels['always'] = 'always';
+$labels['showinlineimages'] = 'Display attached images below the message';
+$labels['autosavedraft']  = 'ड्राफ़ट अपने आप सहेजते जाऐं';
+$labels['everynminutes']  = 'every $n minute(s)';
+$labels['refreshinterval']  = 'Refresh (check for new messages, etc.)';
+$labels['never']  = 'कभी नहाीं';
+$labels['immediately']  = 'immediately';
+$labels['messagesdisplaying'] = 'Displaying Messages';
+$labels['messagescomposition'] = 'Composing Messages';
+$labels['mimeparamfolding'] = 'Attachment names';
+$labels['2231folding'] = 'Full RFC 2231 (Thunderbird)';
+$labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
+$labels['2047folding'] = 'Full RFC 2047 (other)';
+$labels['force7bit'] = 'Use MIME encoding for 8-bit characters';
+$labels['advancedoptions'] = 'Advanced options';
+$labels['focusonnewmessage'] = 'Focus browser window on new message';
+$labels['checkallfolders'] = 'Check all folders for new messages';
+$labels['displaynext'] = 'After message delete/move display the next message';
+$labels['defaultfont'] = 'Default font of HTML message';
+$labels['mainoptions'] = 'Main Options';
+$labels['browseroptions'] = 'Browser Options';
+$labels['section'] = 'Section';
+$labels['maintenance'] = 'Maintenance';
+$labels['newmessage'] = 'New Message';
+$labels['signatureoptions'] = 'Signature Options';
+$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'] = 'Automatically add signature';
+$labels['newmessageonly'] = 'new message only';
+$labels['replyandforwardonly'] = 'replies and forwards only';
+$labels['insertsignature'] = 'Insert signature';
+$labels['previewpanemarkread']  = 'Mark previewed messages as read';
+$labels['afternseconds']  = 'after $n seconds';
+$labels['reqmdn'] = 'Always request a return receipt';
+$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'] = 'Check spelling before sending a message';
+$labels['spellcheckoptions'] = 'Spellcheck Options';
+$labels['spellcheckignoresyms'] = 'Ignore words with symbols';
+$labels['spellcheckignorenums'] = 'Ignore words with numbers';
+$labels['spellcheckignorecaps'] = 'Ignore words with all letters capitalized';
+$labels['addtodict'] = 'Add to dictionary';
+$labels['mailtoprotohandler'] = 'Register protocol handler for mailto: links';
+$labels['forwardmode'] = 'Messages forwarding';
+$labels['inline'] = 'inline';
+$labels['asattachment'] = 'as attachment';
+
+$labels['folder']  = 'फ़ोल्डर';
+$labels['folders']  = 'फ़ोल्डर';
+$labels['foldername']  = 'फ़ोल्डर नाम';
+$labels['subscribed']  = 'सबस्क्राईब किया गया';
+$labels['messagecount'] = 'Messages';
+$labels['create']  = 'बनाऐं';
+$labels['createfolder']  = 'फ़ोलडर बनाऐं';
+$labels['managefolders']  = 'फ़ोलडर को व्यवस्थित करें';
+$labels['specialfolders'] = 'Special Folders';
+$labels['properties'] = 'Properties';
+$labels['folderproperties'] = 'Folder properties';
+$labels['parentfolder'] = 'Parent folder';
+$labels['location'] = 'Location';
+$labels['info'] = 'Information';
+$labels['getfoldersize'] = 'Click to get folder size';
+$labels['changesubscription'] = 'Click to change subscription';
+$labels['foldertype'] = 'Folder Type';
+$labels['personalfolder']  = 'Private Folder';
+$labels['otherfolder']  = 'Other User\'s Folder';
+$labels['sharedfolder']  = 'Public Folder';
+
 $labels['sortby'] = 'ऐसे तय करें';
-$labels['sortasc'] = 'पहले से आखीरी तय करें';
+$labels['sortasc']  = 'पहले से आखीरी तय करें';
 $labels['sortdesc'] = 'आखीरी से पहले तय करें';
+$labels['undo'] = 'Undo';
+
+$labels['installedplugins'] = 'Installed plugins';
+$labels['plugin'] = 'Plugin';
+$labels['version'] = 'Version';
+$labels['source'] = 'Source';
+$labels['license'] = 'License';
+$labels['support'] = 'Get support';
+
+// units
+$labels['B'] = 'B';
+$labels['KB'] = 'KB';
+$labels['MB'] = 'MB';
+$labels['GB'] = 'GB';
+
+// character sets
+$labels['unicode'] = 'Unicode';
+$labels['english'] = '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['turkish'] = 'Turkish';
+$labels['nordic'] = 'Nordic';
+$labels['thai'] = 'Thai';
+$labels['celtic'] = 'Celtic';
+$labels['vietnamese'] = 'Vietnamese';
+$labels['japanese'] = 'Japanese';
+$labels['korean'] = 'Korean';
+$labels['chinese'] = 'Chinese';
 
+?>
diff --git a/program/localization/hi_IN/messages.inc b/program/localization/hi_IN/messages.inc
index 13714330e..1d55f5c48 100644
--- a/program/localization/hi_IN/messages.inc
+++ b/program/localization/hi_IN/messages.inc
@@ -2,27 +2,43 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/hi_IN/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['loginfailed'] = 'लॉगिन नहीं हो पाया';
+$messages['errortitle']  = 'An error occurred!';
+$messages['loginfailed']  = 'लॉगिन नहीं हो पाया';
 $messages['cookiesdisabled'] = 'आपका ब्राऊसर कुकी स्वीकार नहीं कर रहा है';
 $messages['sessionerror'] = 'सत्र समाप्त या अवैद्य';
 $messages['storageerror'] = 'आईमैप (IMAP) सर्वर से सम्पर्क नहीं हो पाया';
+$messages['servererror'] = 'Server Error!';
+$messages['servererrormsg'] = 'Server Error: $msg';
+$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'] = 'इस मेलबॉक्स में कोई मेल नहीं है';
 $messages['loggedout'] = 'सत्र समाप्त. टा टा!';
 $messages['mailboxempty'] = 'मेलबॉक्स खाली है';
+$messages['refreshing'] = 'Refreshing...';
 $messages['loading'] = 'लोड हो रहा है';
+$messages['uploading'] = 'Uploading file...';
+$messages['uploadingmany'] = 'Uploading files...';
 $messages['loadingdata'] = 'डाटा लोड हो रहा है...';
 $messages['checkingmail'] = 'क्या नया मेल है?...';
 $messages['sendingmessage'] = 'मेल भेजा जा रहा है...';
@@ -32,36 +48,124 @@ $messages['messagesaved'] = 'मेल ड्राफ़्ट फोल्ड�
 $messages['successfullysaved'] = 'सहेजा गया है';
 $messages['addedsuccessfully'] = 'पता खाते में पता जोडा गया है';
 $messages['contactexists'] = 'इस ई-मेल पता से एक पता पेहले से है';
+$messages['contactnameexists'] = 'A contact with the same name already exists.';
 $messages['blockedimages'] = 'आप के प्राईवेसी के लिये और स्पैम से बचने के लिये इस मेल में सदूर चित्र नहीं दिखाये गये हैं।';
 $messages['encryptedmessage'] = 'माफ़ कीजिये, यह मेल कूट रूप में है, इस कारण दिखाया नहीं जा सकता।';
 $messages['nocontactsfound'] = 'कोई पता नहीं मिला';
+$messages['contactnotfound'] = 'The requested contact was not found.';
+$messages['contactsearchonly'] = 'Enter some search terms to find contacts';
 $messages['sendingfailed'] = 'मेल नहीं भिज पाया';
+$messages['senttooquickly'] = 'Please wait $sec sec(s). before sending this message.';
+$messages['errorsavingsent'] = 'An error occured while saving sent message.';
 $messages['errorsaving'] = 'सहेजते-सहेजते गडबड हो गया';
 $messages['errormoving'] = 'मेल खिस्का नहीं';
+$messages['errorcopying'] = 'Could not copy the message(s).';
 $messages['errordeleting'] = 'मेल मिटा नहीं';
-$messages['deletecontactconfirm'] = 'चुने गये पते को सचमुच मिटाना है ?';
+$messages['errormarking'] = 'Could not mark the message(s).';
+$messages['deletecontactconfirm']  = 'चुने गये पते को सचमुच मिटाना है ?';
+$messages['deletegroupconfirm']  = 'Do you really want to delete selected group?';
 $messages['deletemessagesconfirm'] = 'चुने गये मेल को सचमुच मिटाना है ?';
-$messages['deletefolderconfirm'] = 'फ़ोल्डर को सचमुच मिटाऐं ?';
-$messages['purgefolderconfirm'] = 'फ़ोल्डर में पडे सारे मेल को सचमुच मिटाना है?';
+$messages['deletefolderconfirm']  = 'फ़ोल्डर को सचमुच मिटाऐं ?';
+$messages['purgefolderconfirm']  = 'फ़ोल्डर में पडे सारे मेल को सचमुच मिटाना है?';
+$messages['contactdeleting'] = 'Deleting contact(s)...';
+$messages['groupdeleting'] = 'Deleting group...';
+$messages['folderdeleting'] = 'Deleting folder...';
+$messages['foldermoving'] = 'Moving folder...';
+$messages['foldersubscribing'] = 'Subscribing folder...';
+$messages['folderunsubscribing'] = 'Unsubscribing folder...';
 $messages['formincomplete'] = 'फ़ॉर्म पूरी तरह से भरा नहीं';
 $messages['noemailwarning'] = 'वैद्य मेल पता भरें';
-$messages['nonamewarning'] = 'नाम भरें';
+$messages['nonamewarning']  = 'नाम भरें';
 $messages['nopagesizewarning'] = 'पन्ना माप भरें';
+$messages['nosenderwarning'] = 'Please enter sender e-mail address.';
 $messages['norecipientwarning'] = 'कम-से-कम एक पाने वाले का पता भरें';
-$messages['nosubjectwarning'] = 'मेल का कोई विशय नहीं बताया गया है। क्या आप विशय डालना चाहते हैं ?';
+$messages['nosubjectwarning']  = 'मेल का कोई विशय नहीं बताया गया है। क्या आप विशय डालना चाहते हैं ?';
 $messages['nobodywarning'] = 'बिना कुछ लिखे मेल भेजें?';
 $messages['notsentwarning'] = 'मेल भिजा नहीं. मेल रद्द करें ?';
 $messages['noldapserver'] = 'खोज के लिये एक ऐलडैप सर्वर चुनें';
 $messages['nosearchname'] = 'पता या पते का नाम भरें';
+$messages['notuploadedwarning'] = 'Not all attachments have been uploaded yet. Please wait or cancel the upload.';
 $messages['searchsuccessful'] = '$nr मेल मिले';
+$messages['contactsearchsuccessful'] = '$nr contacts found.';
 $messages['searchnomatch'] = 'खोज असफ़ल';
 $messages['searching'] = 'खोजा रहे हैं...';
 $messages['checking'] = 'चाँचा चा रहा है...';
 $messages['nospellerrors'] = 'कोई स्पैलिंग गलती नहीं मिली';
 $messages['folderdeleted'] = 'फ़ोल्डर मिट गया';
+$messages['foldersubscribed'] = 'Folder successfully subscribed.';
+$messages['folderunsubscribed'] = 'Folder successfully unsubscribed.';
+$messages['folderpurged'] = 'Folder has successfully been emptied.';
+$messages['folderexpunged'] = 'Folder has successfully been compacted.';
 $messages['deletedsuccessfully'] = 'मिट गया';
 $messages['converting'] = 'मेल से फ़ॉर्मैटिंग निकाला जा रहा है...';
 $messages['messageopenerror'] = 'सर्वर से मेल लोड नहीं हो पाया';
 $messages['fileuploaderror'] = 'फ़ाईल अपलोड नहीं हो पाया';
 $messages['filesizeerror'] = 'अपलोड के लिये फ़ाईल हद $size से बड़ा है';
+$messages['copysuccess'] = 'Successfully copied $nr addresses.';
+$messages['copyerror'] = 'Could not copy any addresses.';
+$messages['sourceisreadonly'] = 'This address source is read only.';
+$messages['errorsavingcontact'] = 'Could not save the contact address.';
+$messages['movingmessage'] = 'Moving message(s)...';
+$messages['copyingmessage'] = 'Copying message(s)...';
+$messages['copyingcontact'] = 'Copying contact(s)...';
+$messages['deletingmessage'] = 'Deleting message(s)...';
+$messages['markingmessage'] = 'Marking message(s)...';
+$messages['addingmember'] = 'Adding contact(s) to the group...';
+$messages['removingmember'] = 'Removing contact(s) from the group...';
+$messages['receiptsent'] = 'Successfully sent a read receipt.';
+$messages['errorsendingreceipt'] = 'Could not send the receipt.';
+$messages['deleteidentityconfirm'] = 'Do you really want to delete this identity?';
+$messages['nodeletelastidentity'] = 'You cannot delete this identity, it\'s your last one.';
+$messages['forbiddencharacter'] = 'Folder name contains a forbidden character.';
+$messages['selectimportfile'] = 'Please select a file to upload.';
+$messages['addresswriterror'] = 'The selected address book is not writeable.';
+$messages['contactaddedtogroup'] = 'Successfully added the contacts to this group.';
+$messages['contactremovedfromgroup'] = 'Successfully removed contacts from this group.';
+$messages['nogroupassignmentschanged'] = 'No group assignments changed.';
+$messages['importwait'] = 'Importing, please wait...';
+$messages['importformaterror'] = 'Import failed! The uploaded file is not a valid import data file.';
+$messages['importconfirm'] = '<b>Successfully imported $inserted contacts</b>';
+$messages['importconfirmskipped'] = '<b>Skipped $skipped existing entries</b>';
+$messages['opnotpermitted'] = 'Operation not permitted!';
+$messages['nofromaddress'] = 'Missing e-mail address in selected identity.';
+$messages['editorwarning'] = 'Switching to the plain text editor will cause all text formatting to be lost. Do you wish to continue?';
+$messages['httpreceivedencrypterror'] = 'A fatal configuration error occurred. Contact your administrator immediately. <b>Your message can not be sent.</b>';
+$messages['smtpconnerror'] = 'SMTP Error ($code): Connection to server failed.';
+$messages['smtpautherror'] = 'SMTP Error ($code): Authentication failed.';
+$messages['smtpfromerror'] = 'SMTP Error ($code): Failed to set sender "$from" ($msg).';
+$messages['smtptoerror'] = 'SMTP Error ($code): Failed to add recipient "$to" ($msg).';
+$messages['smtprecipientserror'] = 'SMTP Error: Unable to parse recipients list.';
+$messages['smtperror'] = 'SMTP Error: $msg';
+$messages['emailformaterror'] = 'Invalid e-mail address: $email';
+$messages['toomanyrecipients'] = 'Too many recipients. Reduce the number of recipients to $max.';
+$messages['maxgroupmembersreached'] = 'The number of group members exceeds the maximum of $max.';
+$messages['internalerror'] = 'An internal error occured. Please try again.';
+$messages['contactdelerror'] = 'Could not delete contact(s).';
+$messages['contactdeleted'] = 'Contact(s) deleted successfully.';
+$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.';
 
+?>
diff --git a/program/localization/hr_HR/labels.inc b/program/localization/hr_HR/labels.inc
index 5ea86d96a..506d50f1f 100644
--- a/program/localization/hr_HR/labels.inc
+++ b/program/localization/hr_HR/labels.inc
@@ -2,57 +2,78 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/hr_HR/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = 'Dobrodošli na $product';
-$labels['username'] = 'Korisničko ime';
-$labels['password'] = 'Lozinka';
-$labels['server'] = 'Poslužitelj';
-$labels['login'] = 'Prijava';
-$labels['logout'] = 'Odjava';
-$labels['mail'] = 'Pošta';
+
+// login page
+$labels['welcome']   = 'Dobrodošli na $product';
+$labels['username']  = 'Korisničko ime';
+$labels['password']  = 'Lozinka';
+$labels['server']    = 'Poslužitelj';
+$labels['login']     = 'Prijava';
+
+// taskbar
+$labels['logout']   = 'Odjava';
+$labels['mail']     = 'Pošta';
 $labels['settings'] = 'Postavke';
 $labels['addressbook'] = 'Imenik';
-$labels['inbox'] = 'Pristigla pošta';
+
+// mailbox names
+$labels['inbox']  = 'Pristigla pošta';
 $labels['drafts'] = 'Predlošci';
-$labels['sent'] = 'Poslano';
-$labels['trash'] = 'Smeće';
-$labels['junk'] = 'Spam';
+$labels['sent']   = 'Poslano';
+$labels['trash']  = 'Smeće';
+$labels['junk']   = 'Spam';
+
+// message listing
 $labels['subject'] = 'Naslov';
-$labels['from'] = 'Od';
-$labels['to'] = 'Za';
-$labels['cc'] = 'Cc';
-$labels['bcc'] = 'Bcc';
+$labels['from']    = 'Od';
+$labels['sender']  = 'Sender';
+$labels['to']      = 'Za';
+$labels['cc']      = 'Cc';
+$labels['bcc']     = 'Bcc';
 $labels['replyto'] = 'Odgovori';
 $labels['followupto'] = 'Nastavi-na';
-$labels['date'] = 'Datum';
-$labels['size'] = 'Veličina';
+$labels['date']    = 'Datum';
+$labels['size']    = 'Veličina';
 $labels['priority'] = 'Prioritet';
 $labels['organization'] = 'Organizacija';
 $labels['readstatus'] = 'Pročitano';
+$labels['listoptions'] = 'List options...';
+
 $labels['mailboxlist'] = 'Mape';
-$labels['folders'] = 'Mape';
 $labels['messagesfromto'] = 'Poruke od $from do $to od ukupno $count';
 $labels['threadsfromto'] = 'Teme od $from do $to od ukupno $count';
 $labels['messagenrof'] = 'Poruka broj $nr od $count';
 $labels['fromtoshort'] = '$from - $to od $count';
-$labels['copy'] = 'Kopiraj';
-$labels['move'] = 'Premjesti';
-$labels['moveto'] = 'Premjesti u...';
+
+$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';
+
 $labels['filename'] = 'Ime datoteke';
 $labels['filesize'] = 'Veličina datoteke';
+
 $labels['addtoaddressbook'] = 'Dodaj u imenik';
+
+// weekdays short
 $labels['sun'] = 'Ned';
 $labels['mon'] = 'Pon';
 $labels['tue'] = 'Uto';
@@ -60,79 +81,90 @@ $labels['wed'] = 'Sri';
 $labels['thu'] = 'Čet';
 $labels['fri'] = 'Pet';
 $labels['sat'] = 'Sub';
-$labels['sunday'] = 'Nedjelja';
-$labels['monday'] = 'Ponedjeljak';
-$labels['tuesday'] = 'Utorak';
+
+// weekdays long
+$labels['sunday']    = 'Nedjelja';
+$labels['monday']    = 'Ponedjeljak';
+$labels['tuesday']   = 'Utorak';
 $labels['wednesday'] = 'Srijeda';
-$labels['thursday'] = 'Četvrtak';
-$labels['friday'] = 'Petak';
-$labels['saturday'] = 'Subota';
-$labels['jan'] = 'Sij';
-$labels['feb'] = 'Velj';
-$labels['mar'] = 'Ožu';
-$labels['apr'] = 'Tra';
-$labels['may'] = 'Svibanj';
-$labels['longmay'] = 'Svibanj';
-$labels['jun'] = 'Lip';
-$labels['jul'] = 'Srp';
-$labels['aug'] = 'Kol';
-$labels['sep'] = 'Ruj';
-$labels['oct'] = 'Lis';
-$labels['nov'] = 'Stu';
-$labels['dec'] = 'Pro';
-$labels['longjan'] = 'Siječanj';
-$labels['longfeb'] = 'Veljača';
-$labels['longmar'] = 'Ožujak';
-$labels['longapr'] = 'Travanj';
-$labels['longjun'] = 'Lipanj';
-$labels['longjul'] = 'Srpanj';
-$labels['longaug'] = 'Kolovoz';
-$labels['longsep'] = 'Rujan';
-$labels['longoct'] = 'Listopad';
-$labels['longnov'] = 'Studeni';
-$labels['longdec'] = 'Prosinac';
+$labels['thursday']  = 'Četvrtak';
+$labels['friday']    = 'Petak';
+$labels['saturday']  = 'Subota';
+
+// months short
+$labels['jan']	= 'Sij';
+$labels['feb']	= 'Velj';
+$labels['mar']	= 'Ožu';
+$labels['apr']	= 'Tra';
+$labels['may']	= 'Svibanj';
+$labels['jun']	= 'Lip';
+$labels['jul'] 	= 'Srp';
+$labels['aug']	= 'Kol';
+$labels['sep']	= 'Ruj';
+$labels['oct']	= 'Lis';
+$labels['nov']	= 'Stu';
+$labels['dec']	= 'Pro';
+
+// months long
+$labels['longjan']	= 'Siječanj';
+$labels['longfeb']	= 'Veljača';
+$labels['longmar']	= 'Ožujak';
+$labels['longapr']	= 'Travanj';
+$labels['longmay']	= 'Svibanj';
+$labels['longjun']	= 'Lipanj';
+$labels['longjul']	= 'Srpanj';
+$labels['longaug']	= 'Kolovoz';
+$labels['longsep']	= 'Rujan';
+$labels['longoct']	= 'Listopad';
+$labels['longnov']	= 'Studeni';
+$labels['longdec']	= 'Prosinac';
+
 $labels['today'] = 'Danas';
-$labels['refresh'] = 'Osvježi';
-$labels['checkmail'] = 'Provjera novih poruka';
-$labels['compose'] = 'Nova poruka';
-$labels['writenewmessage'] = 'Stvori novu poruku';
-$labels['reply'] = 'Odgovori';
-$labels['replytomessage'] = 'Odgovori na poruku';
+
+// toolbar buttons
+$labels['refresh']          = 'Osvježi';
+$labels['checkmail']        = 'Provjera novih poruka';
+$labels['compose']          = 'Nova poruka';
+$labels['writenewmessage']  = 'Stvori novu poruku';
+$labels['reply']            = 'Odgovori';
+$labels['replytomessage']   = 'Odgovori na poruku';
 $labels['replytoallmessage'] = 'Odgovori pošiljaocu i svim primateljima';
-$labels['replyall'] = 'Odgovori svima';
-$labels['replylist'] = 'Odgovori listi';
-$labels['forward'] = 'Proslijedi';
-$labels['forwardinline'] = 'Proslijedi citirano';
+$labels['replyall']         = 'Odgovori svima';
+$labels['replylist']        = 'Odgovori listi';
+$labels['forward']          = 'Proslijedi';
+$labels['forwardinline']    = 'Proslijedi citirano';
 $labels['forwardattachment'] = 'Proslijedi kao privitak';
-$labels['forwardmessage'] = 'Prosljedi poruku';
-$labels['deletemessage'] = 'Obriši poruku';
+$labels['forwardmessage']   = 'Prosljedi poruku';
+$labels['deletemessage']    = 'Obriši poruku';
 $labels['movemessagetotrash'] = 'Preseli poruke u smeće';
-$labels['printmessage'] = 'Ispiši ovu poruku';
-$labels['previousmessage'] = 'Prikaži prethodnu poruku';
-$labels['firstmessage'] = 'Prikaži prvu poruku';
-$labels['nextmessage'] = 'Prikaži slijedeću poruku';
-$labels['lastmessage'] = 'Prikaži zadnju poruku';
-$labels['backtolist'] = 'Povratak na listu poruka';
-$labels['viewsource'] = 'Prikaži poruku u izvornom obliku';
-$labels['mark'] = 'Označi';
-$labels['markmessages'] = 'Označi poruke';
-$labels['markread'] = 'Kao pročitano';
-$labels['markunread'] = 'Kao nepročitano';
-$labels['markflagged'] = 'Kao označenu';
-$labels['markunflagged'] = 'Kao neoznačenu';
-$labels['moreactions'] = 'Više akcija';
-$labels['more'] = 'Više';
-$labels['back'] = 'Natrag';
-$labels['options'] = 'Postavke';
+$labels['printmessage']     = 'Ispiši ovu poruku';
+$labels['previousmessage']  = 'Prikaži prethodnu poruku';
+$labels['firstmessage']     = 'Prikaži prvu poruku';
+$labels['nextmessage']      = 'Prikaži slijedeću poruku';
+$labels['lastmessage']      = 'Prikaži zadnju poruku';
+$labels['backtolist']       = 'Povratak na listu poruka';
+$labels['viewsource']       = 'Prikaži poruku u izvornom obliku';
+$labels['mark']             = 'Označi';
+$labels['markmessages']     = 'Označi poruke';
+$labels['markread']         = 'Kao pročitano';
+$labels['markunread']       = 'Kao nepročitano';
+$labels['markflagged']      = 'Kao označenu';
+$labels['markunflagged']    = 'Kao neoznačenu';
+$labels['moreactions']      = 'Više akcija';
+$labels['more']             = 'Više';
+$labels['back']             = 'Natrag';
+$labels['options']          = 'Postavke';
+
 $labels['select'] = 'Odaberi';
 $labels['all'] = 'Sve';
 $labels['none'] = 'Ništa';
-$labels['nonesort'] = 'Ništa';
 $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';
 $labels['filter'] = 'Filtriraj';
 $labels['list'] = 'Lista';
@@ -141,12 +173,14 @@ $labels['expand-all'] = 'Proširi sve';
 $labels['expand-unread'] = 'Proširi nepročitane';
 $labels['collapse-all'] = 'Zatvori sve';
 $labels['threaded'] = 'Tematski prikaz';
+
 $labels['autoexpand_threads'] = 'Proširi teme poruka';
 $labels['do_expand'] = 'Sve teme';
 $labels['expand_only_unread'] = 'samo s nepročitanim porukama';
 $labels['fromto'] = 'Pošiljatelj/Primatelj';
 $labels['flag'] = 'Oznaka';
 $labels['attachment'] = 'Privitak';
+$labels['nonesort'] = 'Ništa';
 $labels['sentdate'] = 'Datum slanja';
 $labels['arrival'] = 'Datum primanja';
 $labels['asc'] = 'uzlazno';
@@ -155,173 +189,220 @@ $labels['listcolumns'] = 'Kolone';
 $labels['listsorting'] = 'Sortirajuća kolona';
 $labels['listorder'] = 'Sortirajući redoslijed';
 $labels['listmode'] = 'Model pregleda listi';
+
 $labels['folderactions'] = 'Akcije mapa';
 $labels['compact'] = 'Kompresiranje';
 $labels['empty'] = 'Isprazni';
+
 $labels['quota'] = 'Kvota';
-$labels['unknown'] = 'nepoznato';
-$labels['unlimited'] = 'beskonačna';
-$labels['quicksearch'] = 'Brza pretraga';
-$labels['resetsearch'] = 'Prikaži sve poruke';
-$labels['searchmod'] = 'Postavke pretrage';
-$labels['msgtext'] = 'Cijela poruka';
+$labels['unknown']  = 'nepoznato';
+$labels['unlimited']  = 'beskonačna';
+
+$labels['quicksearch']  = 'Brza pretraga';
+$labels['resetsearch']  = 'Prikaži sve poruke';
+$labels['searchmod']  = 'Postavke pretrage';
+$labels['msgtext']  = 'Cijela poruka';
+$labels['body']  = 'Body';
+
 $labels['openinextwin'] = 'Otvori u novom prozoru';
 $labels['emlsave'] = 'Download (.eml)';
-$labels['editasnew'] = 'Uredi kao novo';
-$labels['sendmessage'] = 'Pošalji poruku';
-$labels['savemessage'] = 'Spremi u \'Predlošci\'';
-$labels['addattachment'] = 'Priloži datoteku';
-$labels['charset'] = 'Charset';
-$labels['editortype'] = 'Tip editora';
-$labels['returnreceipt'] = 'Potvrda o primitku poruke';
-$labels['dsn'] = 'Potvrda o poslanoj poruci';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
+
+// message compose
+$labels['editasnew']      = 'Uredi kao novo';
+$labels['send']           = 'Send';
+$labels['sendmessage']    = 'Pošalji poruku';
+$labels['savemessage']    = 'Spremi u \'Predlošci\'';
+$labels['addattachment']  = 'Priloži datoteku';
+$labels['charset']        = 'Charset';
+$labels['editortype']     = 'Tip editora';
+$labels['returnreceipt']  = 'Potvrda o primitku poruke';
+$labels['dsn']            = 'Potvrda o poslanoj poruci';
 $labels['mailreplyintro'] = 'Dana $date, $sender je napisao(la):';
 $labels['originalmessage'] = 'Izvorna Poruka';
-$labels['editidents'] = 'Promijeni identitete';
-$labels['spellcheck'] = 'Piši';
+
+$labels['editidents']    = 'Promijeni identitete';
+$labels['spellcheck']    = 'Piši';
 $labels['checkspelling'] = 'Provjera pravopisa';
 $labels['resumeediting'] = 'Povratak u pisanje';
-$labels['revertto'] = 'Vrati na';
+$labels['revertto']      = 'Vrati na';
+
 $labels['attach'] = 'Priloži';
 $labels['attachments'] = 'Privitci (Attachments)';
 $labels['upload'] = 'Dodaj';
 $labels['uploadprogress'] = '$percent ($current od $total)';
-$labels['close'] = 'Zatvori';
-$labels['messageoptions'] = 'Opcije poruka...';
-$labels['low'] = 'Nizak';
-$labels['lowest'] = 'Najniži';
-$labels['normal'] = 'Srednji';
-$labels['high'] = 'Visok';
+$labels['close']  = 'Zatvori';
+$labels['messageoptions']  = 'Opcije poruka...';
+
+$labels['low']     = 'Nizak';
+$labels['lowest']  = 'Najniži';
+$labels['normal']  = 'Srednji';
+$labels['high']    = 'Visok';
 $labels['highest'] = 'Najviši';
-$labels['nosubject'] = '(bez naslova)';
+
+$labels['nosubject']  = '(bez naslova)';
 $labels['showimages'] = 'Prikaži slike';
 $labels['alwaysshow'] = 'Uvijek prikaži slike od $sender';
-$labels['isdraft'] = 'Ova poruka je skica (draft)';
+$labels['isdraft']    = 'Ova poruka je skica (draft)';
+$labels['andnmore']   = '$nr more...';
+$labels['togglemoreheaders'] = 'Show more message headers';
+$labels['togglefullheaders'] = 'Toggle raw message headers';
+
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Samo tekst';
 $labels['savesentmessagein'] = 'Spremi poslane poruke u';
 $labels['dontsave'] = 'ne spremaj';
 $labels['maxuploadsize'] = 'Maksimalna dozvoljena velicina datoteke je $size';
+
 $labels['addcc'] = 'Dodaj Cc';
 $labels['addbcc'] = 'Dodaj Bcc';
 $labels['addreplyto'] = 'Dodaj Odgovori-na';
 $labels['addfollowupto'] = 'Dodaj Nastavak-na';
+
+// mdn
 $labels['mdnrequest'] = 'Pošiljaoc ove poruke je tražio da bude obaviješten o njenom primitku. Želite li obavijestiti pošiljaoca?';
 $labels['receiptread'] = 'Vrati potvrdu (pročitano)';
 $labels['yourmessage'] = 'Ovo je vraćena potvrda vaše poruke';
 $labels['receiptnote'] = 'Info: Ova poruka samo potvrđuje da se poruka prikazala na računalu primaoca. Nema garancije da je primaoc pročitao ili razumio sadržaj poruke.';
-$labels['name'] = 'Puno ime';
-$labels['firstname'] = 'Ime';
-$labels['surname'] = 'Prezime';
-$labels['middlename'] = 'Srednje ime';
-$labels['nameprefix'] = 'Prefiks';
-$labels['namesuffix'] = 'Sufiks';
-$labels['nickname'] = 'Nadimak';
-$labels['jobtitle'] = 'Titula';
-$labels['department'] = 'Odjel';
-$labels['gender'] = 'Rod';
-$labels['maidenname'] = 'Djevojačko ime';
-$labels['email'] = 'E-Mail';
-$labels['phone'] = 'Telefon';
-$labels['address'] = 'Adresa';
-$labels['street'] = 'Ulica';
-$labels['locality'] = 'Grad';
-$labels['zipcode'] = 'Poštanski broj';
-$labels['region'] = 'Oblast';
-$labels['country'] = 'Zemlja';
-$labels['birthday'] = 'Rođendan';
-$labels['anniversary'] = 'Jubilej';
-$labels['website'] = 'Web stranica';
+
+// address boook
+$labels['name']         = 'Puno ime';
+$labels['firstname']    = 'Ime';
+$labels['surname']      = 'Prezime';
+$labels['middlename']   = 'Srednje ime';
+$labels['nameprefix']   = 'Prefiks';
+$labels['namesuffix']   = 'Sufiks';
+$labels['nickname']     = 'Nadimak';
+$labels['jobtitle']     = 'Titula';
+$labels['department']   = 'Odjel';
+$labels['gender']       = 'Rod';
+$labels['maidenname']   = 'Djevojačko ime';
+$labels['email']        = 'E-Mail';
+$labels['phone']        = 'Telefon';
+$labels['address']      = 'Adresa';
+$labels['street']       = 'Ulica';
+$labels['locality']     = 'Grad';
+$labels['zipcode']      = 'Poštanski broj';
+$labels['region']       = 'Oblast';
+$labels['country']      = 'Zemlja';
+$labels['birthday']     = 'Rođendan';
+$labels['anniversary']  = 'Jubilej';
+$labels['website']      = 'Web stranica';
 $labels['instantmessenger'] = 'IM';
 $labels['notes'] = 'Bilješke';
-$labels['male'] = 'muško';
+$labels['male']   = 'muško';
 $labels['female'] = 'žensko';
 $labels['manager'] = 'Menadžer';
 $labels['assistant'] = 'Asistent';
-$labels['typeassistant'] = 'Asistent';
 $labels['spouse'] = 'Suprug/a';
 $labels['allfields'] = 'Sva polja';
 $labels['search'] = 'Pretraga';
 $labels['advsearch'] = 'Napredna Pretraga';
 $labels['advanced'] = 'Napredno';
 $labels['other'] = 'Ostalo';
-$labels['typeother'] = 'Ostalo';
-$labels['typehome'] = 'Kućni broj';
-$labels['typework'] = 'Poslovni broj';
-$labels['typemobile'] = 'Mobitel';
-$labels['typemain'] = 'Glavni broj';
-$labels['typehomefax'] = 'Fax kuća';
-$labels['typeworkfax'] = 'Fax posao';
-$labels['typecar'] = 'Auto';
-$labels['typepager'] = 'Pejdžer';
-$labels['typevideo'] = 'Video';
-$labels['typehomepage'] = 'Početna stranica';
+
+$labels['typehome']   = 'Kućni broj';
+$labels['typework']   = 'Poslovni broj';
+$labels['typeother']  = 'Ostalo';
+$labels['typemobile']  = 'Mobitel';
+$labels['typemain']  = 'Glavni broj';
+$labels['typehomefax']  = 'Fax kuća';
+$labels['typeworkfax']  = 'Fax posao';
+$labels['typecar']  = 'Auto';
+$labels['typepager']  = 'Pejdžer';
+$labels['typevideo']  = 'Video';
+$labels['typeassistant']  = 'Asistent';
+$labels['typehomepage']  = 'Početna stranica';
 $labels['typeblog'] = 'Blog';
 $labels['typeprofile'] = 'Profil';
+
 $labels['addfield'] = 'Dodaj polje...';
 $labels['addcontact'] = 'Dodaj novi kontakt';
 $labels['editcontact'] = 'Izmjeni kontakt';
 $labels['contacts'] = 'Kontakti';
 $labels['contactproperties'] = 'Svojstva kontakta';
 $labels['personalinfo'] = 'Osobni podaci';
-$labels['edit'] = 'Izmjeni';
+
+$labels['edit']   = 'Izmjeni';
 $labels['cancel'] = 'Odustani';
-$labels['save'] = 'Spremi';
+$labels['save']   = 'Spremi';
 $labels['delete'] = 'Obriši';
 $labels['rename'] = 'Preimenuj';
 $labels['addphoto'] = 'Dodaj';
 $labels['replacephoto'] = 'Smijeniti';
-$labels['newcontact'] = 'Dodaj novi kontakt';
-$labels['deletecontact'] = 'Obriši odabrane kontakte';
-$labels['composeto'] = 'Napiši mail...';
+$labels['uploadphoto'] = 'Upload photo';
+
+$labels['newcontact']     = 'Dodaj novi kontakt';
+$labels['deletecontact']  = 'Obriši odabrane kontakte';
+$labels['composeto']      = 'Napiši mail...';
 $labels['contactsfromto'] = 'Kontakti od $from do $to od ukupno $count';
-$labels['print'] = 'Print';
-$labels['export'] = 'Export';
-$labels['exportvcards'] = 'Izvezi kontakte u vCard formatu';
+$labels['print']          = 'Print';
+$labels['export']         = 'Export';
+$labels['exportall']      = 'Export all';
+$labels['exportsel']      = 'Export selected';
+$labels['exportvcards']   = 'Izvezi kontakte u vCard formatu';
 $labels['newcontactgroup'] = 'Napravi novu kontaktnu grupu';
-$labels['grouprename'] = 'Promijeni ime grupe';
-$labels['groupdelete'] = 'Izbriši grupu';
-$labels['previouspage'] = 'Prethodna strana';
-$labels['firstpage'] = 'Prva strana';
-$labels['nextpage'] = 'Slijedeća strana';
-$labels['lastpage'] = 'Zadnja strana';
+$labels['grouprename']    = 'Promijeni ime grupe';
+$labels['groupdelete']    = 'Izbriši grupu';
+$labels['groupremoveselected'] = 'Remove selected contacts from group';
+
+$labels['previouspage']   = 'Prethodna strana';
+$labels['firstpage']      = 'Prva strana';
+$labels['nextpage']       = 'Slijedeća strana';
+$labels['lastpage']       = 'Zadnja strana';
+
 $labels['group'] = 'Grupa';
 $labels['groups'] = 'Grupe';
 $labels['personaladrbook'] = 'Privatna adresa';
+
 $labels['searchsave'] = 'Pohrani pretragu';
 $labels['searchdelete'] = 'Obriši pretragu';
+
 $labels['import'] = 'Uvoz';
 $labels['importcontacts'] = 'Uvoz kontakta';
 $labels['importfromfile'] = 'Uvezi iz datoteke:';
 $labels['importtarget'] = 'Dodaj nove kontakte u imenik:';
 $labels['importreplace'] = 'Prepiši cijeli adresar';
+$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['done'] = 'Završeno';
+
+// settings
 $labels['settingsfor'] = 'Postavke za';
 $labels['about'] = 'O programu';
 $labels['preferences'] = 'Postavke';
 $labels['userpreferences'] = 'Korisničke postavke';
 $labels['editpreferences'] = 'Izmjena postavki';
+
 $labels['identities'] = 'Identiteti';
 $labels['manageidentities'] = 'Podesi identitete za ovaj nalog';
 $labels['newidentity'] = 'Dodaj identitet';
+
 $labels['newitem'] = 'Novo';
 $labels['edititem'] = 'Uredi';
+
 $labels['preferhtml'] = 'HTML format u prednosti';
 $labels['defaultcharset'] = 'Zadani skup znakova';
 $labels['htmlmessage'] = 'HTML format poruke';
+$labels['messagepart'] = 'Part';
+$labels['digitalsig'] = 'Digital Signature';
 $labels['dateformat'] = 'Format datuma';
 $labels['timeformat'] = 'Format vremena';
 $labels['prettydate'] = 'Formatiran datum';
-$labels['setdefault'] = 'Postavi predodređeno';
-$labels['autodetect'] = 'Auto';
-$labels['language'] = 'Jezik';
-$labels['timezone'] = 'Vremenska zona';
-$labels['pagesize'] = 'Redova po stranici';
+$labels['setdefault']  = 'Postavi predodređeno';
+$labels['autodetect']  = 'Auto';
+$labels['language']  = 'Jezik';
+$labels['timezone']  = 'Vremenska zona';
+$labels['pagesize']  = 'Redova po stranici';
 $labels['signature'] = 'Potpis';
-$labels['dstactive'] = 'Automatska promjena vremena';
+$labels['dstactive']  = 'Automatska promjena vremena';
+$labels['showinextwin'] = 'Open message in a new window';
+$labels['composeextwin'] = 'Compose in a new window';
 $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';
@@ -339,14 +420,16 @@ $labels['readwhendeleted'] = 'Označi poruku kao pročitanu pri brisanju';
 $labels['flagfordeletion'] = 'Označi poruku za brisanje umjesto brisanja';
 $labels['skipdeleted'] = 'Ne prikazivaj pobrisane poruke';
 $labels['deletealways'] = 'Ukoliko premještanje poruka u mapu otpad ne uspije, izbrši poruku';
+$labels['deletejunk'] = 'Directly delete messages in Junk';
 $labels['showremoteimages'] = 'Prikaži slike s interneta';
 $labels['fromknownsenders'] = 'od poznatih pošiljatelja';
 $labels['always'] = 'uvijek';
 $labels['showinlineimages'] = 'Prikaži slike ispod poruke';
-$labels['autosavedraft'] = 'Automatski spremi draft';
-$labels['everynminutes'] = 'svakih $n minuta';
-$labels['never'] = 'nikada';
-$labels['immediately'] = 'odmah';
+$labels['autosavedraft']  = 'Automatski spremi draft';
+$labels['everynminutes']  = 'svakih $n minuta';
+$labels['refreshinterval']  = 'Refresh (check for new messages, etc.)';
+$labels['never']  = 'nikada';
+$labels['immediately']  = 'odmah';
 $labels['messagesdisplaying'] = 'Prikazujem poruke';
 $labels['messagescomposition'] = 'Komponiram poruke';
 $labels['mimeparamfolding'] = 'Nazivi privitaka';
@@ -360,41 +443,47 @@ $labels['checkallfolders'] = 'Provjeri nove poruke u svim mapama';
 $labels['displaynext'] = 'Nakon brisanja/micanja poruke, prikaži slijedeću';
 $labels['defaultfont'] = 'Predodređeni font HTML poruke';
 $labels['mainoptions'] = 'Glavne postavke';
+$labels['browseroptions'] = 'Browser Options';
 $labels['section'] = 'Sekcija';
 $labels['maintenance'] = 'Održavanje';
 $labels['newmessage'] = 'Nova poruka';
 $labels['signatureoptions'] = 'Postavke potpisa';
 $labels['whenreplying'] = 'Prilikom odgovora';
+$labels['replyempty'] = 'do not quote the original message';
 $labels['replytopposting'] = 'započni novu poruku iznad originala';
 $labels['replybottomposting'] = 'započni novu poruku ispod originala';
 $labels['replyremovesignature'] = 'Kod odgovaranja, makni originalni potpis iz poruke';
 $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';
+$labels['previewpanemarkread']  = 'Obilježi pregledane poruke kao pročitane';
+$labels['afternseconds']  = 'nakon $n sekundi';
 $labels['reqmdn'] = 'Uvijek zatraži potvrdu o primitku poruke';
 $labels['reqdsn'] = 'Uvijek zatraži potvrdu o slanju poruke';
 $labels['replysamefolder'] = 'Spremi odgovore u mapu gdje se nalazi poruka';
-$labels['defaultaddressbook'] = 'Dodaj nove kontakte u odabrani imenik';
+$labels['defaultabook'] = 'Default address book';
 $labels['autocompletesingle'] = 'Preskoči alternativne email adrese u autocomplete prijedlozima';
+$labels['listnamedisplay'] = 'List contacts as';
 $labels['spellcheckbeforesend'] = 'Provjeri pravopis prije slanja poruke';
 $labels['spellcheckoptions'] = 'Postavke provjere pravopisa';
 $labels['spellcheckignoresyms'] = 'Ignoriraj riječi koje sadrže simbole';
 $labels['spellcheckignorenums'] = 'Ignoriraj riječi koje sadrže brojeve';
 $labels['spellcheckignorecaps'] = 'Ignoriraj riječi sa sa svim velikim slovima';
 $labels['addtodict'] = 'Dodaj u rječnik';
-$labels['folder'] = 'Mapa';
-$labels['foldername'] = 'Ime mape';
-$labels['subscribed'] = 'Pretplata';
+$labels['mailtoprotohandler'] = 'Register protocol handler for mailto: links';
+$labels['forwardmode'] = 'Messages forwarding';
+$labels['inline'] = 'inline';
+$labels['asattachment'] = 'as attachment';
+
+$labels['folder']  = 'Mapa';
+$labels['folders']  = 'Mape';
+$labels['foldername']  = 'Ime mape';
+$labels['subscribed']  = 'Pretplata';
 $labels['messagecount'] = 'Poruke';
-$labels['create'] = 'Napravi';
-$labels['createfolder'] = 'Napravi novu mapu';
-$labels['managefolders'] = 'Podesi mapu';
+$labels['create']  = 'Napravi';
+$labels['createfolder']  = 'Napravi novu mapu';
+$labels['managefolders']  = 'Podesi mapu';
 $labels['specialfolders'] = 'Specijalna mapa';
 $labels['properties'] = 'Svojstva';
 $labels['folderproperties'] = 'Svojstva mape';
@@ -404,22 +493,29 @@ $labels['info'] = 'Informacija';
 $labels['getfoldersize'] = 'Kliknite da biste dobili veličinu mape';
 $labels['changesubscription'] = 'Kliknite da biste promjenili pretplatu';
 $labels['foldertype'] = 'Vrsta mape';
-$labels['personalfolder'] = 'Privatna mapa';
-$labels['otherfolder'] = 'Mapa drugih korisnika';
-$labels['sharedfolder'] = 'Javna mapa';
+$labels['personalfolder']  = 'Privatna mapa';
+$labels['otherfolder']  = 'Mapa drugih korisnika';
+$labels['sharedfolder']  = 'Javna mapa';
+
 $labels['sortby'] = 'Sortiraj po';
-$labels['sortasc'] = 'Sortiraj rastućim nizom';
+$labels['sortasc']  = 'Sortiraj rastućim nizom';
 $labels['sortdesc'] = 'Sortiraj opadajućim nizom';
 $labels['undo'] = 'Poništi';
+
+$labels['installedplugins'] = 'Installed plugins';
 $labels['plugin'] = 'Plugin';
 $labels['version'] = 'Inačica';
 $labels['source'] = 'Izvor';
 $labels['license'] = 'Licenca';
 $labels['support'] = 'Podrška';
+
+// units
 $labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
 $labels['GB'] = 'GB';
+
+// character sets
 $labels['unicode'] = 'Unicode';
 $labels['english'] = 'Engleski';
 $labels['westerneuropean'] = 'Zapadno Evropski';
@@ -439,3 +535,4 @@ $labels['japanese'] = 'Japanski';
 $labels['korean'] = 'Korejski';
 $labels['chinese'] = 'Kineski';
 
+?>
diff --git a/program/localization/hr_HR/messages.inc b/program/localization/hr_HR/messages.inc
index 354365db8..3e6cc6daf 100644
--- a/program/localization/hr_HR/messages.inc
+++ b/program/localization/hr_HR/messages.inc
@@ -2,32 +2,40 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/hr_HR/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['loginfailed'] = 'Prijava neuspješna';
+$messages['errortitle']  = 'An error occurred!';
+$messages['loginfailed']  = 'Prijava neuspješna';
 $messages['cookiesdisabled'] = 'Vaš Web preglednik ne podržava kolačiće (cookies)';
 $messages['sessionerror'] = 'Morate se ponovno ulogirati';
 $messages['storageerror'] = 'Neuspješna veza na IMAP server';
 $messages['servererror'] = 'Greška poslužitelja';
 $messages['servererrormsg'] = 'Greška na serveru: $msg';
 $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';
 $messages['loggedout'] = 'Uspješno ste se odjavili. Zbogom!';
 $messages['mailboxempty'] = 'Sandučuć je prazan';
+$messages['refreshing'] = 'Refreshing...';
 $messages['loading'] = 'Učitavanje...';
 $messages['uploading'] = 'Prenosim datoteku...';
 $messages['uploadingmany'] = 'Prenosim datoteke...';
@@ -54,11 +62,11 @@ $messages['errormoving'] = 'Greška pri premještanju poruke';
 $messages['errorcopying'] = 'Greška pri kopiranju poruke';
 $messages['errordeleting'] = 'Greška pri brisanju poruke';
 $messages['errormarking'] = 'Nije moguće označiti poruku';
-$messages['deletecontactconfirm'] = 'Želite li obrisati izabrane kontakte?';
-$messages['deletegroupconfirm'] = 'Jeste li sigurni da želite obrisati odabranu grupu?';
+$messages['deletecontactconfirm']  = 'Želite li obrisati izabrane kontakte?';
+$messages['deletegroupconfirm']  = 'Jeste li sigurni da želite obrisati odabranu grupu?';
 $messages['deletemessagesconfirm'] = 'Sigurno želite obrisati odabrane poruke?';
-$messages['deletefolderconfirm'] = 'Želite li obrisati ovu mapu?';
-$messages['purgefolderconfirm'] = 'Želite li obrisati sve poruke u mapi?';
+$messages['deletefolderconfirm']  = 'Želite li obrisati ovu mapu?';
+$messages['purgefolderconfirm']  = 'Želite li obrisati sve poruke u mapi?';
 $messages['contactdeleting'] = 'Brišem kontakt(e)...';
 $messages['groupdeleting'] = 'Brišem grupu...';
 $messages['folderdeleting'] = 'Brišem mapu...';
@@ -67,11 +75,11 @@ $messages['foldersubscribing'] = 'Pretplata na mapu...';
 $messages['folderunsubscribing'] = 'Poništavanje pretplate na mapu...';
 $messages['formincomplete'] = 'Obrazac nije u cjelosti popunjen';
 $messages['noemailwarning'] = 'Unesite valjanu e-mail adresu';
-$messages['nonamewarning'] = 'Unesite ime';
+$messages['nonamewarning']  = 'Unesite ime';
 $messages['nopagesizewarning'] = 'Unesite veličinu stranice';
 $messages['nosenderwarning'] = 'Unesite e-mail adresu pošiljatelja';
 $messages['norecipientwarning'] = 'Unesite primatelja (ZA)';
-$messages['nosubjectwarning'] = 'Polje \'Naslov\' je prazno. Želite li unijeti naslov?';
+$messages['nosubjectwarning']  = 'Polje \'Naslov\' je prazno. Želite li unijeti naslov?';
 $messages['nobodywarning'] = 'Želite li poslati poruku bez teksta?';
 $messages['notsentwarning'] = 'Poruka nije poslana. Želite li odbaciti ovu poruku?';
 $messages['noldapserver'] = 'Unesite LDAP poslužitelj za pretragu';
@@ -113,8 +121,9 @@ $messages['selectimportfile'] = 'Odaberite datoteku za prijenos';
 $messages['addresswriterror'] = 'U odabrani adresar nije moguće zapisivat...';
 $messages['contactaddedtogroup'] = 'Kontakti uspješno dodani ovoj grupi';
 $messages['contactremovedfromgroup'] = 'Kontakti uspješno izbrisani iz ove grupe';
+$messages['nogroupassignmentschanged'] = 'No group assignments changed.';
 $messages['importwait'] = 'Uvozim, molimo sačekajte...';
-$messages['importerror'] = 'Greška pri uvozu! Datoteka ne sadrži pravilan vCard format.';
+$messages['importformaterror'] = 'Import failed! The uploaded file is not a valid import data file.';
 $messages['importconfirm'] = '<b>Uspješno je uvezeno $inserted kontakt(a), preskočeno $skipped već postojećih</b>:<p><em>$names</em></p>';
 $messages['importconfirmskipped'] = '<b>Preskočeno $skipped postojećih unosa</b>';
 $messages['opnotpermitted'] = 'Operacija nije dozvoljena!';
@@ -156,4 +165,7 @@ $messages['invalidimageformat'] = 'Format slike nije ispravan.';
 $messages['mispellingsfound'] = 'Greške pravopisa su pronađene u poruci.';
 $messages['parentnotwritable'] = 'Nije moguće stvoriti/pomaknuti mapu u odabranu mapu. Nemate prava pristupa.';
 $messages['messagetoobig'] = 'Dio poruke je prevelik za procesiranje.';
+$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.';
 
+?>
diff --git a/program/localization/hu_HU/labels.inc b/program/localization/hu_HU/labels.inc
index 0208206e2..3cc5da1aa 100644
--- a/program/localization/hu_HU/labels.inc
+++ b/program/localization/hu_HU/labels.inc
@@ -2,60 +2,78 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/hu_HU/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: bela                                                          |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = 'Üdvözli a $product';
-$labels['username'] = 'Felhasználónév';
-$labels['password'] = 'Jelszó';
-$labels['server'] = 'Szerver';
-$labels['login'] = 'Bejelentkezés';
-$labels['logout'] = 'Kijelentkezés';
-$labels['mail'] = 'E-mail';
+
+// login page
+$labels['welcome']   = 'Üdvözli a $product';
+$labels['username']  = 'Felhasználónév';
+$labels['password']  = 'Jelszó';
+$labels['server']    = 'Szerver';
+$labels['login']     = 'Bejelentkezés';
+
+// taskbar
+$labels['logout']   = 'Kijelentkezés';
+$labels['mail']     = 'E-mail';
 $labels['settings'] = 'Beállítások';
 $labels['addressbook'] = 'Címjegyzék';
-$labels['inbox'] = 'Érkezett levelek';
+
+// mailbox names
+$labels['inbox']  = 'Érkezett levelek';
 $labels['drafts'] = 'Piszkozatok';
-$labels['sent'] = 'Küldött levelek';
-$labels['trash'] = 'Törölt elemek';
-$labels['junk'] = 'Kéretlen levelek';
+$labels['sent']   = 'Küldött levelek';
+$labels['trash']  = 'Törölt elemek';
+$labels['junk']   = 'Kéretlen levelek';
+
+// message listing
 $labels['subject'] = 'Tárgy';
-$labels['from'] = 'Feladó';
-$labels['to'] = 'Címzett';
-$labels['cc'] = 'Másolat';
-$labels['bcc'] = 'Titkos másolat';
+$labels['from']    = 'Feladó';
+$labels['sender']  = 'Feladó';
+$labels['to']      = 'Címzett';
+$labels['cc']      = 'Másolat';
+$labels['bcc']     = 'Titkos másolat';
 $labels['replyto'] = 'Válaszcím';
 $labels['followupto'] = 'Hírcsoport válasz';
-$labels['date'] = 'Dátum';
-$labels['size'] = 'Méret';
+$labels['date']    = 'Dátum';
+$labels['size']    = 'Méret';
 $labels['priority'] = 'Sürgősség';
 $labels['organization'] = 'Szervezet';
 $labels['readstatus'] = 'Olvasott';
 $labels['listoptions'] = 'Üzenetlista beállítások...';
+
 $labels['mailboxlist'] = 'Mappák';
-$labels['folders'] = 'Mappák';
 $labels['messagesfromto'] = 'Üzenetek: $from - $to / $count';
 $labels['threadsfromto'] = 'Témák ($from - $to, összesen $count)';
 $labels['messagenrof'] = '$nr / $count üzenet';
 $labels['fromtoshort'] = '$from – $to / $count';
-$labels['copy'] = 'Másolás';
-$labels['move'] = 'Áthelyezés';
-$labels['moveto'] = 'Áthelyezés...';
+
+$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';
+
 $labels['filename'] = 'Fájl neve';
 $labels['filesize'] = 'Fájl mérete';
+
 $labels['addtoaddressbook'] = 'Hozzáadás a címjegyzékhez';
+
+// weekdays short
 $labels['sun'] = 'Vas';
 $labels['mon'] = 'Hét';
 $labels['tue'] = 'Kedd';
@@ -63,78 +81,88 @@ $labels['wed'] = 'Szer';
 $labels['thu'] = 'Csüt';
 $labels['fri'] = 'Pén';
 $labels['sat'] = 'Szom';
-$labels['sunday'] = 'Vasárnap';
-$labels['monday'] = 'Hétfő';
-$labels['tuesday'] = 'Kedd';
+
+// weekdays long
+$labels['sunday']    = 'Vasárnap';
+$labels['monday']    = 'Hétfő';
+$labels['tuesday']   = 'Kedd';
 $labels['wednesday'] = 'Szerda';
-$labels['thursday'] = 'Csütörtök';
-$labels['friday'] = 'Péntek';
-$labels['saturday'] = 'Szombat';
-$labels['jan'] = 'Jan';
-$labels['feb'] = 'Febr';
-$labels['mar'] = 'Márc';
-$labels['apr'] = 'Ápr';
-$labels['may'] = 'Május';
-$labels['longmay'] = 'Május';
-$labels['jun'] = 'Jún';
-$labels['jul'] = 'Júl';
-$labels['aug'] = 'Aug';
-$labels['sep'] = 'Szept';
-$labels['oct'] = 'Okt';
-$labels['nov'] = 'Nov';
-$labels['dec'] = 'Dec';
-$labels['longjan'] = 'Január';
-$labels['longfeb'] = 'Február';
-$labels['longmar'] = 'Március';
-$labels['longapr'] = 'Április';
-$labels['longjun'] = 'Június';
-$labels['longjul'] = 'Július';
-$labels['longaug'] = 'Augusztus';
-$labels['longsep'] = 'Szeptember';
-$labels['longoct'] = 'Október';
-$labels['longnov'] = 'November';
-$labels['longdec'] = 'December';
+$labels['thursday']  = 'Csütörtök';
+$labels['friday']    = 'Péntek';
+$labels['saturday']  = 'Szombat';
+
+// months short
+$labels['jan']	= 'Jan';
+$labels['feb']	= 'Febr';
+$labels['mar']	= 'Márc';
+$labels['apr']	= 'Ápr';
+$labels['may']	= 'Május';
+$labels['jun']	= 'Jún';
+$labels['jul'] 	= 'Júl';
+$labels['aug']	= 'Aug';
+$labels['sep']	= 'Szept';
+$labels['oct']	= 'Okt';
+$labels['nov']	= 'Nov';
+$labels['dec']	= 'Dec';
+
+// months long
+$labels['longjan']	= 'Január';
+$labels['longfeb']	= 'Február';
+$labels['longmar']	= 'Március';
+$labels['longapr']	= 'Április';
+$labels['longmay']	= 'Május';
+$labels['longjun']	= 'Június';
+$labels['longjul']	= 'Július';
+$labels['longaug']	= 'Augusztus';
+$labels['longsep']	= 'Szeptember';
+$labels['longoct']	= 'Október';
+$labels['longnov']	= 'November';
+$labels['longdec']	= 'December';
+
 $labels['today'] = 'Ma';
-$labels['refresh'] = 'Frissítés';
-$labels['checkmail'] = 'Új üzenetek ellenőrzése';
-$labels['compose'] = 'Üzenet létrehozása';
-$labels['writenewmessage'] = 'Új üzenet';
-$labels['reply'] = 'Válasz';
-$labels['replytomessage'] = 'Válasz';
+
+// toolbar buttons
+$labels['refresh']          = 'Frissítés';
+$labels['checkmail']        = 'Új üzenetek ellenőrzése';
+$labels['compose']          = 'Üzenet létrehozása';
+$labels['writenewmessage']  = 'Új üzenet';
+$labels['reply']            = 'Válasz';
+$labels['replytomessage']   = 'Válasz';
 $labels['replytoallmessage'] = 'Válasz a listának vagy a feladónak és az összes címzettnek';
-$labels['replyall'] = 'Válasz mindenkinek';
-$labels['replylist'] = 'Válasz a listának';
-$labels['forward'] = 'Továbbítás';
-$labels['forwardinline'] = 'Továbbítás beágyazva';
+$labels['replyall']         = 'Válasz mindenkinek';
+$labels['replylist']        = 'Válasz a listának';
+$labels['forward']          = 'Továbbítás';
+$labels['forwardinline']    = 'Továbbítás beágyazva';
 $labels['forwardattachment'] = 'Továbbítás csatolmányként';
-$labels['forwardmessage'] = 'Továbbítás';
-$labels['deletemessage'] = 'Törlés';
+$labels['forwardmessage']   = 'Továbbítás';
+$labels['deletemessage']    = 'Törlés';
 $labels['movemessagetotrash'] = 'Üzenet törlése';
-$labels['printmessage'] = 'Nyomtatás';
-$labels['previousmessage'] = 'Előző levél mutatása';
-$labels['firstmessage'] = 'Első levél mutatása';
-$labels['nextmessage'] = 'Következő levél mutatása';
-$labels['lastmessage'] = 'Utolsó levél mutatása';
-$labels['backtolist'] = 'Vissza az üzenetekhez';
-$labels['viewsource'] = 'Forrás megtekintése';
-$labels['mark'] = 'Jelölés';
-$labels['markmessages'] = 'Üzenetek megjelölése';
-$labels['markread'] = 'Olvasottként';
-$labels['markunread'] = 'Olvasatlanként';
-$labels['markflagged'] = 'Jelöltként';
-$labels['markunflagged'] = 'Jelöletlenként';
-$labels['moreactions'] = 'További műveletek...';
-$labels['more'] = 'Még egy';
-$labels['back'] = 'Vissza';
-$labels['options'] = 'Beállítások';
+$labels['printmessage']     = 'Nyomtatás';
+$labels['previousmessage']  = 'Előző levél mutatása';
+$labels['firstmessage']     = 'Első levél mutatása';
+$labels['nextmessage']      = 'Következő levél mutatása';
+$labels['lastmessage']      = 'Utolsó levél mutatása';
+$labels['backtolist']       = 'Vissza az üzenetekhez';
+$labels['viewsource']       = 'Forrás megtekintése';
+$labels['mark']             = 'Jelölés';
+$labels['markmessages']     = 'Üzenetek megjelölése';
+$labels['markread']         = 'Olvasottként';
+$labels['markunread']       = 'Olvasatlanként';
+$labels['markflagged']      = 'Jelöltként';
+$labels['markunflagged']    = 'Jelöletlenként';
+$labels['moreactions']      = 'További műveletek...';
+$labels['more']             = 'Még egy';
+$labels['back']             = 'Vissza';
+$labels['options']          = 'Beállítások';
+
 $labels['select'] = 'Kijelölés';
 $labels['all'] = 'Összes';
 $labels['none'] = 'Nincs';
-$labels['nonesort'] = 'Nincs';
 $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';
@@ -145,12 +173,14 @@ $labels['expand-all'] = 'Összes kibontása';
 $labels['expand-unread'] = 'Olvasatlanok kibontása';
 $labels['collapse-all'] = 'Összes összecsukása';
 $labels['threaded'] = 'Téma nézet';
+
 $labels['autoexpand_threads'] = 'Témák kibontása';
 $labels['do_expand'] = 'minden téma';
 $labels['expand_only_unread'] = 'csak ahol van olvasatlan üzenet';
 $labels['fromto'] = 'Feladó/Címzett';
 $labels['flag'] = 'Megjelölés';
 $labels['attachment'] = 'Csatolmány';
+$labels['nonesort'] = 'Nincs';
 $labels['sentdate'] = 'Feladva';
 $labels['arrival'] = 'Kézbesítve';
 $labels['asc'] = 'Emelkedő';
@@ -159,147 +189,176 @@ $labels['listcolumns'] = 'Oszlopok listája';
 $labels['listsorting'] = 'Rendezés oszlopa';
 $labels['listorder'] = 'Rendezés sorrendje';
 $labels['listmode'] = 'Megjelenítési mód';
+
 $labels['folderactions'] = 'Mappaműveletek...';
 $labels['compact'] = 'Tömörítés';
 $labels['empty'] = 'Kiürítés';
+
 $labels['quota'] = 'Helyfoglalás';
-$labels['unknown'] = 'ismeretlen';
-$labels['unlimited'] = 'korlátlan';
-$labels['quicksearch'] = 'Gyorskeresés';
-$labels['resetsearch'] = 'Alapállapot';
-$labels['searchmod'] = 'Keresési opciók';
-$labels['msgtext'] = 'Teljes üzenet';
+$labels['unknown']  = 'ismeretlen';
+$labels['unlimited']  = 'korlátlan';
+
+$labels['quicksearch']  = 'Gyorskeresés';
+$labels['resetsearch']  = 'Alapállapot';
+$labels['searchmod']  = 'Keresési opciók';
+$labels['msgtext']  = 'Teljes üzenet';
+$labels['body']  = 'Törzs';
+
 $labels['openinextwin'] = 'Megnyitás új ablakban';
 $labels['emlsave'] = 'Letöltés (.eml)';
-$labels['editasnew'] = 'Szerkesztés újként';
-$labels['send'] = 'Küldés';
-$labels['sendmessage'] = 'Üzenet küldése';
-$labels['savemessage'] = 'Vázlat mentése';
-$labels['addattachment'] = 'Fájl csatolása';
-$labels['charset'] = 'Karakterkészlet';
-$labels['editortype'] = 'Szerkesztő típusa';
-$labels['returnreceipt'] = 'Olvasási visszaigazolás';
-$labels['dsn'] = 'Kézbesítési visszaigazolás';
+$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';
+$labels['send']           = 'Küldés';
+$labels['sendmessage']    = 'Üzenet küldése';
+$labels['savemessage']    = 'Vázlat mentése';
+$labels['addattachment']  = 'Fájl csatolása';
+$labels['charset']        = 'Karakterkészlet';
+$labels['editortype']     = 'Szerkesztő típusa';
+$labels['returnreceipt']  = 'Olvasási visszaigazolás';
+$labels['dsn']            = 'Kézbesítési visszaigazolás';
 $labels['mailreplyintro'] = '$date időpontban $sender ezt írta:';
 $labels['originalmessage'] = 'Eredeti üzenet';
-$labels['editidents'] = 'Azonosítók szerkesztése';
-$labels['spellcheck'] = 'Helyesírás ellenőrzés';
+
+$labels['editidents']    = 'Azonosítók szerkesztése';
+$labels['spellcheck']    = 'Helyesírás ellenőrzés';
 $labels['checkspelling'] = 'Helyesírás-ellenőrzés';
 $labels['resumeediting'] = 'Helyesírás-ellenőrzés vége';
-$labels['revertto'] = 'Visszaállítás erre';
+$labels['revertto']      = 'Visszaállítás erre';
+
 $labels['attach'] = 'Csatolás';
 $labels['attachments'] = 'Csatolmányok';
 $labels['upload'] = 'Feltöltés';
 $labels['uploadprogress'] = '$percent ($current / $total)';
-$labels['close'] = 'Bezárás';
-$labels['messageoptions'] = 'Üzenetbeállítások...';
-$labels['low'] = 'Alacsony';
-$labels['lowest'] = 'Legkisebb';
-$labels['normal'] = 'Normál';
-$labels['high'] = 'Magas';
+$labels['close']  = 'Bezárás';
+$labels['messageoptions']  = 'Üzenetbeállítások...';
+
+$labels['low']     = 'Alacsony';
+$labels['lowest']  = 'Legkisebb';
+$labels['normal']  = 'Normál';
+$labels['high']    = 'Magas';
 $labels['highest'] = 'Legmagasabb';
-$labels['nosubject'] = '(nincs tárgy)';
+
+$labels['nosubject']  = '(nincs tárgy)';
 $labels['showimages'] = 'Képek megjelenítése';
 $labels['alwaysshow'] = 'Képek megjelenítése mindig, ha a feladó $sender';
-$labels['isdraft'] = 'TRANSLATE!';
-$labels['andnmore'] = 'további $nr...';
+$labels['isdraft']    = 'Ez egy piszkozat.';
+$labels['andnmore']   = 'további $nr...';
 $labels['togglemoreheaders'] = 'Több üzenet fejrész(header) megjelenítése';
 $labels['togglefullheaders'] = 'Nyers üzenet fejléc megjelenítés- elrejtés';
+
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Egyszerű szöveg';
 $labels['savesentmessagein'] = 'Elküldött üzenet mentése ide';
 $labels['dontsave'] = 'nincs mentés';
 $labels['maxuploadsize'] = 'A maximális feltölthető fájl mérete $size';
+
 $labels['addcc'] = 'Cc (Másolati cím) hozzáadása';
 $labels['addbcc'] = 'Bcc (titkos másolati cím) hozzáadása';
 $labels['addreplyto'] = 'Válaszcím hozzáadása';
 $labels['addfollowupto'] = 'Hírcsoport válasz hozzáadása';
+
+// mdn
 $labels['mdnrequest'] = 'Az üzenet küldője értesítést kér arról, hogy elolvasta a levelet. El legyen küldve az olvasási visszaigazolás?';
 $labels['receiptread'] = 'Olvasási visszaigazolás (olvasott)';
 $labels['yourmessage'] = 'Ez az üzenete olvasási visszaigazolása';
 $labels['receiptnote'] = 'Megjegyzés: Ez az olvasási visszaigazolás csak azt igazolja, hogy az üzenet megjelenítésre került a címzett számítógépén. Nincs rá garancia, hogy a címzett elolvasta volna az üzenetet illetve megértette volna annak tartalmát.';
-$labels['name'] = 'Megjelenített név';
-$labels['firstname'] = 'Keresztnév';
-$labels['surname'] = 'Vezetéknév';
-$labels['middlename'] = 'Második keresztnév';
-$labels['nameprefix'] = 'Név-előtag';
-$labels['namesuffix'] = 'Név-utótag';
-$labels['nickname'] = 'Becenév';
-$labels['jobtitle'] = 'Beosztás';
-$labels['department'] = 'Részleg';
-$labels['gender'] = 'Nem';
-$labels['maidenname'] = 'Leánykori név';
-$labels['email'] = 'E-mail cím';
-$labels['phone'] = 'Telefonszám';
-$labels['address'] = 'Lakcím';
-$labels['street'] = 'Utca';
-$labels['locality'] = 'Város';
-$labels['zipcode'] = 'Irányítószám';
-$labels['region'] = 'Régió';
-$labels['country'] = 'Ország';
-$labels['birthday'] = 'Születésnap';
-$labels['anniversary'] = 'Évforduló';
-$labels['website'] = 'Weboldal';
+
+// address boook
+$labels['name']         = 'Megjelenített név';
+$labels['firstname']    = 'Keresztnév';
+$labels['surname']      = 'Vezetéknév';
+$labels['middlename']   = 'Második keresztnév';
+$labels['nameprefix']   = 'Név-előtag';
+$labels['namesuffix']   = 'Név-utótag';
+$labels['nickname']     = 'Becenév';
+$labels['jobtitle']     = 'Beosztás';
+$labels['department']   = 'Részleg';
+$labels['gender']       = 'Nem';
+$labels['maidenname']   = 'Leánykori név';
+$labels['email']        = 'E-mail cím';
+$labels['phone']        = 'Telefonszám';
+$labels['address']      = 'Lakcím';
+$labels['street']       = 'Utca';
+$labels['locality']     = 'Város';
+$labels['zipcode']      = 'Irányítószám';
+$labels['region']       = 'Régió';
+$labels['country']      = 'Ország';
+$labels['birthday']     = 'Születésnap';
+$labels['anniversary']  = 'Évforduló';
+$labels['website']      = 'Weboldal';
 $labels['instantmessenger'] = 'IM';
 $labels['notes'] = 'Megjegyzések';
-$labels['male'] = 'férfi';
+$labels['male']   = 'férfi';
 $labels['female'] = 'nő';
 $labels['manager'] = 'Menedzser';
 $labels['assistant'] = 'Asszisztens';
-$labels['typeassistant'] = 'Asszisztens';
 $labels['spouse'] = 'Házastárs';
 $labels['allfields'] = 'Összes mező';
 $labels['search'] = 'Keresés';
 $labels['advsearch'] = 'Részletes keresés';
 $labels['advanced'] = 'Haladó';
 $labels['other'] = 'Egyéb';
-$labels['typeother'] = 'Egyéb';
-$labels['typehome'] = 'Otthon';
-$labels['typework'] = 'Munkahely';
-$labels['typemobile'] = 'Mobil';
-$labels['typemain'] = 'Vezetékes';
-$labels['typehomefax'] = 'Otthoni fax';
-$labels['typeworkfax'] = 'Munkahelyi fax';
-$labels['typecar'] = 'Gépkocsi';
-$labels['typepager'] = 'Személyhívó';
-$labels['typevideo'] = 'Videó';
-$labels['typehomepage'] = 'Weboldal';
+
+$labels['typehome']   = 'Otthon';
+$labels['typework']   = 'Munkahely';
+$labels['typeother']  = 'Egyéb';
+$labels['typemobile']  = 'Mobil';
+$labels['typemain']  = 'Vezetékes';
+$labels['typehomefax']  = 'Otthoni fax';
+$labels['typeworkfax']  = 'Munkahelyi fax';
+$labels['typecar']  = 'Gépkocsi';
+$labels['typepager']  = 'Személyhívó';
+$labels['typevideo']  = 'Videó';
+$labels['typeassistant']  = 'Asszisztens';
+$labels['typehomepage']  = 'Weboldal';
 $labels['typeblog'] = 'Blog';
 $labels['typeprofile'] = 'Profil';
+
 $labels['addfield'] = 'Új mező hozzáadása...';
 $labels['addcontact'] = 'Új kapcsolat hozzáadása';
 $labels['editcontact'] = 'Kapcsolat szerkesztése';
 $labels['contacts'] = 'Kapcsolatok';
 $labels['contactproperties'] = 'Kapcsolat tulajdonságai';
 $labels['personalinfo'] = 'Személyes adatok';
-$labels['edit'] = 'Szerkesztés';
+
+$labels['edit']   = 'Szerkesztés';
 $labels['cancel'] = 'Mégsem';
-$labels['save'] = 'Mentés';
+$labels['save']   = 'Mentés';
 $labels['delete'] = 'Törlés';
 $labels['rename'] = 'Átnevezés';
 $labels['addphoto'] = 'Kép hozzáadása';
 $labels['replacephoto'] = 'Kép cseréje';
 $labels['uploadphoto'] = 'Fotó feltöltése';
-$labels['newcontact'] = 'Új kapcsolat létrehozása';
-$labels['deletecontact'] = 'Kijelölt kapcsolatok törlése';
-$labels['composeto'] = 'E-mail küldése erre a címre';
+
+$labels['newcontact']     = 'Új kapcsolat létrehozása';
+$labels['deletecontact']  = 'Kijelölt kapcsolatok törlése';
+$labels['composeto']      = 'E-mail küldése erre a címre';
 $labels['contactsfromto'] = 'Kapcsolatok: $from - $to / $count';
-$labels['print'] = 'Nyomtatás';
-$labels['export'] = 'Exportálás';
-$labels['exportvcards'] = 'Kapcsolatok exportálása vCard formátumban';
+$labels['print']          = 'Nyomtatás';
+$labels['export']         = 'Exportálás';
+$labels['exportall']      = 'Összes exportálása';
+$labels['exportsel']      = 'Kijelöltek exportálása';
+$labels['exportvcards']   = 'Kapcsolatok exportálása vCard formátumban';
 $labels['newcontactgroup'] = 'Új csoport';
-$labels['grouprename'] = 'Csoport átnevezése';
-$labels['groupdelete'] = 'Csoport törlése';
+$labels['grouprename']    = 'Csoport átnevezése';
+$labels['groupdelete']    = 'Csoport törlése';
 $labels['groupremoveselected'] = 'A kijelölt partnerek törlése a csopotból';
-$labels['previouspage'] = 'Előző oldal';
-$labels['firstpage'] = 'Első oldal';
-$labels['nextpage'] = 'Következő oldal';
-$labels['lastpage'] = 'Utolsó oldal';
+
+$labels['previouspage']   = 'Előző oldal';
+$labels['firstpage']      = 'Első oldal';
+$labels['nextpage']       = 'Következő oldal';
+$labels['lastpage']       = 'Utolsó oldal';
+
 $labels['group'] = 'Csoport';
 $labels['groups'] = 'Csoportok';
 $labels['personaladrbook'] = 'Személyes címjegyzék';
+
 $labels['searchsave'] = 'Keresés mentése';
 $labels['searchdelete'] = 'Keresés törlése';
+
 $labels['import'] = 'Importálás';
 $labels['importcontacts'] = 'Kapcsolatok importálása';
 $labels['importfromfile'] = 'Importálás fájlból:';
@@ -307,35 +366,43 @@ $labels['importtarget'] = 'Kapcsolatok hozzáadása a címjegyzékhez:';
 $labels['importreplace'] = 'A teljes címjegyzék cseréje';
 $labels['importdesc'] = 'Feltölthetsz partnereket egyébb már létező címjegyzékekből. <br/>Jelenleg a következő két tipusú címjegyzékek importálása lehetséges  <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> és a CSV (comma-separated/vesszővel tagolt) formátum.';
 $labels['done'] = 'Kész';
+
+// settings
 $labels['settingsfor'] = 'Beállítás';
 $labels['about'] = 'Névjegy';
 $labels['preferences'] = 'Beállítások';
 $labels['userpreferences'] = 'Felhasználói beállítások';
 $labels['editpreferences'] = 'Felhasználói beállítások szerkesztése';
+
 $labels['identities'] = 'Azonosítók';
 $labels['manageidentities'] = 'Hozzáférés azonosítóinak kezelése';
 $labels['newidentity'] = 'Új azonosító';
+
 $labels['newitem'] = 'Új elem';
 $labels['edititem'] = 'Elem szerkesztése';
+
 $labels['preferhtml'] = 'HTML megjelenítés';
 $labels['defaultcharset'] = 'Alapértelmezett karakterkódolás';
 $labels['htmlmessage'] = 'HTML üzenet';
+$labels['messagepart'] = 'Rész';
+$labels['digitalsig'] = 'Digitális aláírás';
 $labels['dateformat'] = 'Dátumformátum';
 $labels['timeformat'] = 'Időformátum';
 $labels['prettydate'] = 'Rövid dátumok';
-$labels['setdefault'] = 'Beállítás alapértelmezettnek';
-$labels['autodetect'] = 'Automatikus';
-$labels['language'] = 'Nyelv';
-$labels['timezone'] = 'Időzóna';
-$labels['pagesize'] = 'Sorok száma egy oldalon';
+$labels['setdefault']  = 'Beállítás alapértelmezettnek';
+$labels['autodetect']  = 'Automatikus';
+$labels['language']  = 'Nyelv';
+$labels['timezone']  = 'Időzóna';
+$labels['pagesize']  = 'Sorok száma egy oldalon';
 $labels['signature'] = 'Aláírás';
-$labels['dstactive'] = 'Nyári időszámítás';
+$labels['dstactive']  = 'Nyári időszámítás';
 $labels['showinextwin'] = 'Az üzenet megnyitása egy új ablakban';
 $labels['composeextwin'] = 'Űzenet írása új ablakban';
 $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';
@@ -353,16 +420,16 @@ $labels['readwhendeleted'] = 'Üzenet olvasottként jelölése törléskor';
 $labels['flagfordeletion'] = 'Üzenet törlendőnek jelölése törlés helyett';
 $labels['skipdeleted'] = 'Törölt üzenetek ne legyenek megjelenítve';
 $labels['deletealways'] = 'Üzenet törlése, ha nem sikerül áthelyezni a törölt elemek mappába';
-$labels['deletejunk'] = 'Közvetlen törlése az üzeneteknek a levélszemét mappában';
+$labels['deletejunk'] = 'Üzenetek közvetlen törlése a levélszemét mappából';
 $labels['showremoteimages'] = 'Távoli beágyazott képek megjelenítése';
 $labels['fromknownsenders'] = 'csak ismert feladóktól';
 $labels['always'] = 'mindig';
 $labels['showinlineimages'] = 'Csatolt képek megjelenítése az üzenet alatt';
-$labels['autosavedraft'] = 'Piszkozat automatikus mentése';
-$labels['everynminutes'] = 'minden $n percben';
-$labels['refreshinterval'] = 'Frissítés ( új üzenetek keresése, stb )';
-$labels['never'] = 'soha';
-$labels['immediately'] = 'azonnal';
+$labels['autosavedraft']  = 'Piszkozat automatikus mentése';
+$labels['everynminutes']  = 'minden $n percben';
+$labels['refreshinterval']  = 'Frissítés ( új üzenetek keresése, stb )';
+$labels['never']  = 'soha';
+$labels['immediately']  = 'azonnal';
 $labels['messagesdisplaying'] = 'Üzenetek megjelenítése';
 $labels['messagescomposition'] = 'Üzenetek írása';
 $labels['mimeparamfolding'] = 'Csatolt állományok nevei';
@@ -389,17 +456,14 @@ $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';
+$labels['previewpanemarkread']  = 'Előnézetben megjelent üzenetek megjelölése olvasottként';
+$labels['afternseconds']  = '$n másodperc elteltével';
 $labels['reqmdn'] = 'Olvasási visszaigazolás megkövetelése';
 $labels['reqdsn'] = 'Kézbesítési visszaigazolás megkövetelése';
 $labels['replysamefolder'] = 'Válaszok azonos mappába helyezése';
 $labels['defaultabook'] = 'Alapértelmezett címjegyzék';
-$labels['autocompletesingle'] = 'TRANSLATE!';
+$labels['autocompletesingle'] = 'Alternatív e-mail címek kihagyása automatikus kiegészítéskor';
 $labels['listnamedisplay'] = 'Névjegyek listázása';
 $labels['spellcheckbeforesend'] = 'Helyesírás-ellenőrzés az üzenet elküldése előtt';
 $labels['spellcheckoptions'] = 'Helyesírás-ellenőrzés opciók';
@@ -411,13 +475,15 @@ $labels['mailtoprotohandler'] = 'Beállítás a mailto: linkek kezelőjeként';
 $labels['forwardmode'] = 'Üzenet továbbítás';
 $labels['inline'] = 'beágyazott';
 $labels['asattachment'] = 'csatolmányként';
-$labels['folder'] = 'Mappa';
-$labels['foldername'] = 'Mappa neve';
-$labels['subscribed'] = 'Feliratkozva';
+
+$labels['folder']  = 'Mappa';
+$labels['folders']  = 'Mappák';
+$labels['foldername']  = 'Mappa neve';
+$labels['subscribed']  = 'Feliratkozva';
 $labels['messagecount'] = 'Üzenet';
-$labels['create'] = 'Létrehozás';
-$labels['createfolder'] = 'Új mappa létrehozása';
-$labels['managefolders'] = 'Mappák kezelése';
+$labels['create']  = 'Létrehozás';
+$labels['createfolder']  = 'Új mappa létrehozása';
+$labels['managefolders']  = 'Mappák kezelése';
 $labels['specialfolders'] = 'Különleges mappák';
 $labels['properties'] = 'Tulajdonságok';
 $labels['folderproperties'] = 'Mappa tulajdonságai';
@@ -427,23 +493,29 @@ $labels['info'] = 'Információk';
 $labels['getfoldersize'] = 'Mappa mérete';
 $labels['changesubscription'] = 'Feliratkozás megváltoztatása';
 $labels['foldertype'] = 'Mappa típusa';
-$labels['personalfolder'] = 'Privát mappa';
-$labels['otherfolder'] = 'Más felhasználó(k) mappája';
-$labels['sharedfolder'] = 'Megosztott mappa';
+$labels['personalfolder']  = 'Privát mappa';
+$labels['otherfolder']  = 'Más felhasználó(k) mappája';
+$labels['sharedfolder']  = 'Megosztott mappa';
+
 $labels['sortby'] = 'Rendezés';
-$labels['sortasc'] = 'növekvő';
+$labels['sortasc']  = 'növekvő';
 $labels['sortdesc'] = 'csökkenő';
 $labels['undo'] = 'Visszavonás';
+
 $labels['installedplugins'] = 'Telepített bővítmények';
 $labels['plugin'] = 'Bővítmény';
 $labels['version'] = 'Verzió';
 $labels['source'] = 'Forrás';
 $labels['license'] = 'Licensz';
 $labels['support'] = 'Támogatás';
+
+// units
 $labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
 $labels['GB'] = 'GB';
+
+// character sets
 $labels['unicode'] = 'Unicode';
 $labels['english'] = 'Angol';
 $labels['westerneuropean'] = 'Nyugat-európai';
@@ -463,3 +535,4 @@ $labels['japanese'] = 'Japán';
 $labels['korean'] = 'Koreai';
 $labels['chinese'] = 'Kínai';
 
+?>
diff --git a/program/localization/hu_HU/messages.inc b/program/localization/hu_HU/messages.inc
index c5afacf41..6528602a4 100644
--- a/program/localization/hu_HU/messages.inc
+++ b/program/localization/hu_HU/messages.inc
@@ -2,20 +2,23 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/hu_HU/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: bela                                                          |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['errortitle'] = 'Hiba történt';
-$messages['loginfailed'] = 'Sikertelen bejelentkezés.';
+$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';
 $messages['storageerror'] = 'Nem sikerült csatlakozni az IMAP szerverhez';
@@ -25,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';
@@ -57,11 +62,11 @@ $messages['errormoving'] = 'Az üzenet(ek)et nem sikerült áthelyezni';
 $messages['errorcopying'] = 'Az üzenet(ek)et nem sikerült másolni';
 $messages['errordeleting'] = 'Az üzenet(ek)et nem sikerült törölni';
 $messages['errormarking'] = 'Az üzenet(ek)et nem sikerült megjelölni';
-$messages['deletecontactconfirm'] = 'Biztos, hogy törölni szeretné a kijelölt kapcsolato(ka)t?';
-$messages['deletegroupconfirm'] = 'Biztos, hogy törölni szeretné a kijelölt csoportot?';
+$messages['deletecontactconfirm']  = 'Biztos, hogy törölni szeretné a kijelölt kapcsolato(ka)t?';
+$messages['deletegroupconfirm']  = 'Biztos, hogy törölni szeretné a kijelölt csoportot?';
 $messages['deletemessagesconfirm'] = 'Biztos, hogy törölni szeretné a kijelölt üzenete(ke)t?';
-$messages['deletefolderconfirm'] = 'Biztos, hogy törölni szeretné ezt a mappát?';
-$messages['purgefolderconfirm'] = 'Biztos benne, hogy az összes üzenet törölhető?';
+$messages['deletefolderconfirm']  = 'Biztos, hogy törölni szeretné ezt a mappát?';
+$messages['purgefolderconfirm']  = 'Biztos benne, hogy az összes üzenet törölhető?';
 $messages['contactdeleting'] = 'Kapcsolat(ok) törlése...';
 $messages['groupdeleting'] = 'Csoport törlése...';
 $messages['folderdeleting'] = 'Mappa törlése...';
@@ -70,11 +75,11 @@ $messages['foldersubscribing'] = 'Feliratkozás a mappára...';
 $messages['folderunsubscribing'] = 'Leiratkozás a mappáról...';
 $messages['formincomplete'] = 'Az űrlap hiányosan lett kitöltve';
 $messages['noemailwarning'] = 'Adjon meg egy valós e-mail címet';
-$messages['nonamewarning'] = 'Adjon meg egy nevet';
+$messages['nonamewarning']  = 'Adjon meg egy nevet';
 $messages['nopagesizewarning'] = 'Adja meg a papír méretét';
 $messages['nosenderwarning'] = 'Kérem adja meg a feladó e-mail címét';
 $messages['norecipientwarning'] = 'Legalább egy címzettet adjon meg';
-$messages['nosubjectwarning'] = 'A Tárgy mező üres. Szeretné most kitölteni?';
+$messages['nosubjectwarning']  = 'A Tárgy mező üres. Szeretné most kitölteni?';
 $messages['nobodywarning'] = 'Elküldi az üzenetet üresen?';
 $messages['notsentwarning'] = 'Az üzenet még nem lett elküldve. Eldobja az üzenetet?';
 $messages['noldapserver'] = 'Adjon meg egy LDAP szervert a kereséshez';
@@ -163,3 +168,4 @@ $messages['messagetoobig'] = 'Az üzenetrész túl nagy a feldolgozáshoz.';
 $messages['attachmentvalidationerror'] = 'FIGYELEM! A csatalmány veszélyes lehet, mert a típusa nem egyezik az üzenetben beállított típussal. Amennyiben nem megbizható az üzenet küldője, ne nyissa meg a csatolmányt a böngészőben mert ártalmas lehet a tartalma.<br/><br/><em>Üzenetben beállított tipus: $expected; az érzékelt típus: $detected</em>';
 $messages['noscriptwarning'] = 'FIGYELEM: Ez webmail szolgáltatása igényli a Javascript futtatásának a lehetőségét! Amennyiben használni szeretné, engedélyezze a JavaScript futtatását a böngészőjének a beállatásaiban.';
 
+?>
diff --git a/program/localization/hy_AM/labels.inc b/program/localization/hy_AM/labels.inc
index 56bf946d9..99cee4ab9 100644
--- a/program/localization/hy_AM/labels.inc
+++ b/program/localization/hy_AM/labels.inc
@@ -2,61 +2,78 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/hy_AM/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['preferences'] = 'Նախընտրանքներ';
-$labels['userpreferences'] = 'Օգտվողի նախընտրանքներ';
-$labels['editpreferences'] = 'Խմբագրել օգտվողի նախընտրանքները';
-$labels['welcome'] = 'Բարի գալուստ $product';
-$labels['username'] = 'Օգտվող';
-$labels['password'] = 'Գաղտնաբառ';
-$labels['server'] = 'Սերվեր';
-$labels['login'] = 'Մուտք';
-$labels['logout'] = 'Ելք';
-$labels['mail'] = 'Էլ–փոստ';
+
+// login page
+$labels['welcome']   = 'Բարի գալուստ $product';
+$labels['username']  = 'Օգտվող';
+$labels['password']  = 'Գաղտնաբառ';
+$labels['server']    = 'Սերվեր';
+$labels['login']     = 'Մուտք';
+
+// taskbar
+$labels['logout']   = 'Ելք';
+$labels['mail']     = 'Էլ–փոստ';
 $labels['settings'] = 'Նախասիրություններ';
 $labels['addressbook'] = 'Հասցեներ';
-$labels['inbox'] = 'Փոստարկղ';
+
+// mailbox names
+$labels['inbox']  = 'Փոստարկղ';
 $labels['drafts'] = 'Սևագրեր';
-$labels['sent'] = 'Ուղարկված';
-$labels['trash'] = 'Աղբարկղ';
-$labels['junk'] = 'Թափոն';
+$labels['sent']   = 'Ուղարկված';
+$labels['trash']  = 'Աղբարկղ';
+$labels['junk']   = 'Թափոն';
+
+// message listing
 $labels['subject'] = 'Վերնագիր';
-$labels['from'] = 'Ուղարկող';
-$labels['to'] = 'Ստացող';
-$labels['cc'] = 'Cc';
-$labels['bcc'] = 'Bcc';
+$labels['from']    = 'Ուղարկող';
+$labels['sender']  = 'Sender';
+$labels['to']      = 'Ստացող';
+$labels['cc']      = 'Cc';
+$labels['bcc']     = 'Bcc';
 $labels['replyto'] = 'Reply-To';
 $labels['followupto'] = 'Ի հավելում';
-$labels['date'] = 'Ամսաթիվ';
-$labels['size'] = 'Չափ';
+$labels['date']    = 'Ամսաթիվ';
+$labels['size']    = 'Չափ';
 $labels['priority'] = 'Առավելություն';
 $labels['organization'] = 'Կազմակերպություն';
 $labels['readstatus'] = 'Ընթերցման կարգավիճակ';
 $labels['listoptions'] = 'Ցուցակի ընտրանքներ…';
+
 $labels['mailboxlist'] = 'Դարակներ';
-$labels['folders'] = 'Դարակներ';
 $labels['messagesfromto'] = 'Նամակներ $from–ից $to–ը եղած $count–ից';
 $labels['threadsfromto'] = 'Թեմաներ $from-ից $to ընդհանուր $count-ից';
 $labels['messagenrof'] = 'Նամակ $nr եղած $count–ից';
 $labels['fromtoshort'] = '$from-ից $to ընդհանուր $count-ից';
-$labels['copy'] = 'Cc';
-$labels['move'] = 'Տեղափոխել';
-$labels['moveto'] = 'Տեղափոխել...';
+
+$labels['copy']     = 'Cc';
+$labels['move']     = 'Տեղափոխել';
+$labels['moveto']   = 'Տեղափոխել...';
 $labels['download'] = 'Քաշել';
+$labels['open']     = 'Open';
+$labels['showattachment'] = 'Show';
+$labels['showanyway'] = 'Show it anyway';
+
 $labels['filename'] = 'Ֆայլի անուն';
 $labels['filesize'] = 'Ֆայլի չափ';
+
 $labels['addtoaddressbook'] = 'Հիշել հասցեն';
+
+// weekdays short
 $labels['sun'] = 'Կիր';
 $labels['mon'] = 'Երկ';
 $labels['tue'] = 'Երք';
@@ -64,79 +81,90 @@ $labels['wed'] = 'Չրք';
 $labels['thu'] = 'Հնգ';
 $labels['fri'] = 'Ուրբ';
 $labels['sat'] = 'Շբթ';
-$labels['sunday'] = 'Կիրակի';
-$labels['monday'] = 'Երկուշաբթի';
-$labels['tuesday'] = 'Երեքշաբթի';
+
+// weekdays long
+$labels['sunday']    = 'Կիրակի';
+$labels['monday']    = 'Երկուշաբթի';
+$labels['tuesday']   = 'Երեքշաբթի';
 $labels['wednesday'] = 'Չորեքշաբթի';
-$labels['thursday'] = 'Հինգշաբթի';
-$labels['friday'] = 'Ուրբաթ';
-$labels['saturday'] = 'Շաբաթ';
-$labels['jan'] = 'Հնվ';
-$labels['feb'] = 'Փետ';
-$labels['mar'] = 'Մար';
-$labels['apr'] = 'Ապր';
-$labels['may'] = 'Մայիս';
-$labels['longmay'] = 'Մայիս';
-$labels['jun'] = 'Հուս';
-$labels['jul'] = 'Հուլ';
-$labels['aug'] = 'Օգս';
-$labels['sep'] = 'Սեպ';
-$labels['oct'] = 'Հոկ';
-$labels['nov'] = 'Նոյ';
-$labels['dec'] = 'Դեկ';
-$labels['longjan'] = 'Հունվար';
-$labels['longfeb'] = 'Փետրվար';
-$labels['longmar'] = 'Մարտ';
-$labels['longapr'] = 'Ապրիլ';
-$labels['longjun'] = 'Հունիս';
-$labels['longjul'] = 'Հուլիս';
-$labels['longaug'] = 'Օգոստոս';
-$labels['longsep'] = 'Սեպտեմբեր';
-$labels['longoct'] = 'Հոկտեմբեր';
-$labels['longnov'] = 'Նոյեմբեր';
-$labels['longdec'] = 'Դեկտեմբեր';
+$labels['thursday']  = 'Հինգշաբթի';
+$labels['friday']    = 'Ուրբաթ';
+$labels['saturday']  = 'Շաբաթ';
+
+// months short
+$labels['jan']	= 'Հնվ';
+$labels['feb']	= 'Փետ';
+$labels['mar']	= 'Մար';
+$labels['apr']	= 'Ապր';
+$labels['may']	= 'Մայիս';
+$labels['jun']	= 'Հուս';
+$labels['jul'] 	= 'Հուլ';
+$labels['aug']	= 'Օգս';
+$labels['sep']	= 'Սեպ';
+$labels['oct']	= 'Հոկ';
+$labels['nov']	= 'Նոյ';
+$labels['dec']	= 'Դեկ';
+
+// months long
+$labels['longjan']	= 'Հունվար';
+$labels['longfeb']	= 'Փետրվար';
+$labels['longmar']	= 'Մարտ';
+$labels['longapr']	= 'Ապրիլ';
+$labels['longmay']	= 'Մայիս';
+$labels['longjun']	= 'Հունիս';
+$labels['longjul']	= 'Հուլիս';
+$labels['longaug']	= 'Օգոստոս';
+$labels['longsep']	= 'Սեպտեմբեր';
+$labels['longoct']	= 'Հոկտեմբեր';
+$labels['longnov']	= 'Նոյեմբեր';
+$labels['longdec']	= 'Դեկտեմբեր';
+
 $labels['today'] = 'Այսօր';
-$labels['refresh'] = 'Թարմացնել';
-$labels['checkmail'] = 'Ստուգել նոր նամակները';
-$labels['compose'] = 'Գրել նամակ';
-$labels['writenewmessage'] = 'Նոր նամակ';
-$labels['reply'] = 'Պատասխանել';
-$labels['replytomessage'] = 'Պատասխանել նամակին';
+
+// toolbar buttons
+$labels['refresh']          = 'Թարմացնել';
+$labels['checkmail']        = 'Ստուգել նոր նամակները';
+$labels['compose']          = 'Գրել նամակ';
+$labels['writenewmessage']  = 'Նոր նամակ';
+$labels['reply']            = 'Պատասխանել';
+$labels['replytomessage']   = 'Պատասխանել նամակին';
 $labels['replytoallmessage'] = 'Պատասխանել բոլորին';
-$labels['replyall'] = 'Պատասխանել բոլորին';
-$labels['replylist'] = 'Պատասխանել ցուցակին';
-$labels['forward'] = 'Առաջ';
-$labels['forwardinline'] = 'Փոխանցել նամակի մեջ';
+$labels['replyall']         = 'Պատասխանել բոլորին';
+$labels['replylist']        = 'Պատասխանել ցուցակին';
+$labels['forward']          = 'Առաջ';
+$labels['forwardinline']    = 'Փոխանցել նամակի մեջ';
 $labels['forwardattachment'] = 'Փոխանցել կցված';
-$labels['forwardmessage'] = 'Փոխանցել նամակը';
-$labels['deletemessage'] = 'Ջնջել նամակը';
+$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['more'] = 'Ավելին';
-$labels['back'] = 'Ետ';
-$labels['options'] = 'Ընտրանքներ';
+$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['more']             = 'Ավելին';
+$labels['back']             = 'Ետ';
+$labels['options']          = 'Ընտրանքներ';
+
 $labels['select'] = 'Նշել';
 $labels['all'] = 'Բոլորը';
 $labels['none'] = 'Չնշել';
-$labels['nonesort'] = 'Չնշել';
 $labels['currpage'] = 'Առկա էջ';
 $labels['unread'] = 'Չկարդացածը';
 $labels['flagged'] = 'Նշված';
 $labels['unanswered'] = 'Անպատասխան';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Ջնջված';
+$labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'Փոխատեղել';
 $labels['filter'] = 'Զտիչ';
 $labels['list'] = 'Ցուցակ';
@@ -145,12 +173,14 @@ $labels['expand-all'] = 'Ընդլայնել բոլորը';
 $labels['expand-unread'] = 'Ընդլայնել չկարդացվածը';
 $labels['collapse-all'] = 'Փլչել բոլորը';
 $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['asc'] = 'ըստ աճման';
@@ -159,172 +189,220 @@ $labels['listcolumns'] = 'Ցուցակի սյունյակներ';
 $labels['listsorting'] = 'Տեսակավորման սյունյակ';
 $labels['listorder'] = 'Տեսակավորման կարգը';
 $labels['listmode'] = 'Ցուցակով տեսքի տարբերակը';
+
 $labels['folderactions'] = 'Պանակի գործողություններ…';
 $labels['compact'] = 'Սեղմել';
 $labels['empty'] = 'Դատարկել';
+
 $labels['quota'] = 'Դիսկային տարածք';
-$labels['unknown'] = 'անհայտ';
-$labels['unlimited'] = 'անսահմանափակ';
-$labels['quicksearch'] = 'Արագ որոնում';
-$labels['resetsearch'] = 'Վերսկսել որոնումը';
-$labels['searchmod'] = 'Որոնման փոփոխիչներ';
-$labels['msgtext'] = 'Ողջ հաղորդագրությունը';
+$labels['unknown']  = 'անհայտ';
+$labels['unlimited']  = 'անսահմանափակ';
+
+$labels['quicksearch']  = 'Արագ որոնում';
+$labels['resetsearch']  = 'Վերսկսել որոնումը';
+$labels['searchmod']  = 'Որոնման փոփոխիչներ';
+$labels['msgtext']  = 'Ողջ հաղորդագրությունը';
+$labels['body']  = 'Body';
+
 $labels['openinextwin'] = 'Բացել նոր պատուհանում';
 $labels['emlsave'] = 'Ներբեռնել (.eml)';
-$labels['editasnew'] = 'Խմբագրել որպես նոր';
-$labels['sendmessage'] = 'Ուղարկել';
-$labels['savemessage'] = 'Հիշել որպես սևագիր';
-$labels['addattachment'] = 'Կցել ֆայլ';
-$labels['charset'] = 'Տառաշար';
-$labels['editortype'] = 'Խմբագրի տիպը';
-$labels['returnreceipt'] = 'Ստացման հավաստագիր';
-$labels['dsn'] = 'Առաքման կարգավիճակի ծանուցում';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
+
+// message compose
+$labels['editasnew']      = 'Խմբագրել որպես նոր';
+$labels['send']           = 'Send';
+$labels['sendmessage']    = 'Ուղարկել';
+$labels['savemessage']    = 'Հիշել որպես սևագիր';
+$labels['addattachment']  = 'Կցել ֆայլ';
+$labels['charset']        = 'Տառաշար';
+$labels['editortype']     = 'Խմբագրի տիպը';
+$labels['returnreceipt']  = 'Ստացման հավաստագիր';
+$labels['dsn']            = 'Առաքման կարգավիճակի ծանուցում';
 $labels['mailreplyintro'] = '$date-ին, $sender-ը գրեց.';
 $labels['originalmessage'] = 'Առաջին հաղորդագրությունը';
-$labels['editidents'] = 'Խմբագրել ինքնությունները';
-$labels['spellcheck'] = 'Տառասխալներ';
+
+$labels['editidents']    = 'Խմբագրել ինքնությունները';
+$labels['spellcheck']    = 'Տառասխալներ';
 $labels['checkspelling'] = 'Ստուգել ուղագրությունը';
 $labels['resumeediting'] = 'Շարունակել խմբագրումը';
-$labels['revertto'] = 'Վերականգնել';
+$labels['revertto']      = 'Վերականգնել';
+
 $labels['attach'] = 'Կցել';
 $labels['attachments'] = 'Կցումներ';
 $labels['upload'] = 'Բեռնել';
 $labels['uploadprogress'] = '$percent ($current $total-ից)';
-$labels['close'] = 'Փակել';
-$labels['messageoptions'] = 'Հաղորդագրության ընտրանքներ…';
-$labels['low'] = 'Ցածր';
-$labels['lowest'] = 'Նվազագույն';
-$labels['normal'] = 'Նորմալ';
-$labels['high'] = 'Կարևոր';
+$labels['close']  = 'Փակել';
+$labels['messageoptions']  = 'Հաղորդագրության ընտրանքներ…';
+
+$labels['low']     = 'Ցածր';
+$labels['lowest']  = 'Նվազագույն';
+$labels['normal']  = 'Նորմալ';
+$labels['high']    = 'Կարևոր';
 $labels['highest'] = 'Կարևորագույն';
-$labels['nosubject'] = '(առանց վերնագրի)';
+
+$labels['nosubject']  = '(առանց վերնագրի)';
 $labels['showimages'] = 'Ցուցադրել նկարները';
 $labels['alwaysshow'] = 'Միշտ ցուցադրել պատկերները $sender–ից';
-$labels['isdraft'] = 'Սա հաղորդագրության սևագիր է';
+$labels['isdraft']    = 'Սա հաղորդագրության սևագիր է';
+$labels['andnmore']   = '$nr more...';
+$labels['togglemoreheaders'] = 'Show more message headers';
+$labels['togglefullheaders'] = 'Toggle raw message headers';
+
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Պարզ տեքստ';
 $labels['savesentmessagein'] = 'Գրանցել ուղարկված նամակը';
 $labels['dontsave'] = 'Չ՛գրանցել';
 $labels['maxuploadsize'] = 'Առավելագույն թույլատրելի ֆայլի չափը $size է';
+
 $labels['addcc'] = 'Ավելացնել Cc';
 $labels['addbcc'] = 'Ավելացնել Bcc';
 $labels['addreplyto'] = 'Ավելացնել Reply-To';
 $labels['addfollowupto'] = 'Ավելացնել հավելում';
+
+// mdn
 $labels['mdnrequest'] = 'Նամակի հեղինակը խնդրել է նամակը կարդալուն պես տեղեկացնել իրեն։ Ցանկանում էք Տեղեկացնե՞լ։';
 $labels['receiptread'] = 'Նամակի ընթերցման ծանուցագիր';
 $labels['yourmessage'] = 'Սա Ձեր նամակի ընթերցման ծանուցագիրն է';
 $labels['receiptnote'] = 'Նշում՝ Այս ծանուցագիրը ընդամենը տեղեկացնում է, որ նամակը ցուցադրվել է հասցեատիրոջ համակարչով։ Չկա որևիցե երաշխիք, որ հասցեատերը իսկապես կարդացել է նամակը։';
-$labels['name'] = 'Մականուն';
-$labels['firstname'] = 'Անուն';
-$labels['surname'] = 'Ազգանուն';
-$labels['middlename'] = 'Միջին անուն';
-$labels['nameprefix'] = 'Նախածանց';
-$labels['namesuffix'] = 'Վերջածանց';
-$labels['nickname'] = 'Մականուն';
-$labels['jobtitle'] = 'Պաշտոն';
-$labels['department'] = 'Բաժանմունք';
-$labels['gender'] = 'Սեռ';
-$labels['maidenname'] = 'Մինչամուսնական ազգանուն';
-$labels['email'] = 'Էկ–փոստ';
-$labels['phone'] = 'Հեռախոս';
-$labels['address'] = 'Հասցե';
-$labels['street'] = 'Փողոց';
-$labels['locality'] = 'Քաղաք';
-$labels['zipcode'] = 'Փոստային կոդ';
-$labels['region'] = 'Մարզ';
-$labels['country'] = 'Երկիր';
-$labels['birthday'] = 'Ծննդյան օր';
-$labels['anniversary'] = 'Տարեդարձ';
-$labels['website'] = 'Կայք';
+
+// address boook
+$labels['name']         = 'Մականուն';
+$labels['firstname']    = 'Անուն';
+$labels['surname']      = 'Ազգանուն';
+$labels['middlename']   = 'Միջին անուն';
+$labels['nameprefix']   = 'Նախածանց';
+$labels['namesuffix']   = 'Վերջածանց';
+$labels['nickname']     = 'Մականուն';
+$labels['jobtitle']     = 'Պաշտոն';
+$labels['department']   = 'Բաժանմունք';
+$labels['gender']       = 'Սեռ';
+$labels['maidenname']   = 'Մինչամուսնական ազգանուն';
+$labels['email']        = 'Էկ–փոստ';
+$labels['phone']        = 'Հեռախոս';
+$labels['address']      = 'Հասցե';
+$labels['street']       = 'Փողոց';
+$labels['locality']     = 'Քաղաք';
+$labels['zipcode']      = 'Փոստային կոդ';
+$labels['region']       = 'Մարզ';
+$labels['country']      = 'Երկիր';
+$labels['birthday']     = 'Ծննդյան օր';
+$labels['anniversary']  = 'Տարեդարձ';
+$labels['website']      = 'Կայք';
 $labels['instantmessenger'] = 'IM';
 $labels['notes'] = 'Նշումներ';
-$labels['male'] = 'արական';
+$labels['male']   = 'արական';
 $labels['female'] = 'իգական';
 $labels['manager'] = 'Մենեջեր';
 $labels['assistant'] = 'Օգնական';
-$labels['typeassistant'] = 'Օգնական';
 $labels['spouse'] = 'ամուսին';
 $labels['allfields'] = 'Բոլոր դաշտերը';
 $labels['search'] = 'Որոնում';
 $labels['advsearch'] = 'Խորացված որոնում';
 $labels['advanced'] = 'Խորացված';
 $labels['other'] = 'Այլ';
-$labels['typeother'] = 'Այլ';
-$labels['typehome'] = 'Տուն';
-$labels['typework'] = 'Աշխատանք';
-$labels['typemobile'] = 'Բջջային';
-$labels['typemain'] = 'Գլխավոր';
-$labels['typehomefax'] = 'Տան ֆաքս';
-$labels['typeworkfax'] = 'Աշտանանքային ֆաքս';
-$labels['typecar'] = 'Մեքենա';
-$labels['typepager'] = 'Փեյջեր';
-$labels['typevideo'] = 'Տեսանյութ';
-$labels['typehomepage'] = 'Սկիզբ';
+
+$labels['typehome']   = 'Տուն';
+$labels['typework']   = 'Աշխատանք';
+$labels['typeother']  = 'Այլ';
+$labels['typemobile']  = 'Բջջային';
+$labels['typemain']  = 'Գլխավոր';
+$labels['typehomefax']  = 'Տան ֆաքս';
+$labels['typeworkfax']  = 'Աշտանանքային ֆաքս';
+$labels['typecar']  = 'Մեքենա';
+$labels['typepager']  = 'Փեյջեր';
+$labels['typevideo']  = 'Տեսանյութ';
+$labels['typeassistant']  = 'Օգնական';
+$labels['typehomepage']  = 'Սկիզբ';
 $labels['typeblog'] = 'Բլոգ';
 $labels['typeprofile'] = 'Պրոֆայլ';
+
 $labels['addfield'] = 'Ավելացնել դաշտ…';
 $labels['addcontact'] = 'Գրանցել նշած հասցեն';
 $labels['editcontact'] = 'Խմբագրել հասցեն';
 $labels['contacts'] = 'Կապորդներ';
 $labels['contactproperties'] = 'Կապորդի հատկանիշներ';
 $labels['personalinfo'] = 'Անձնական տվյալներ';
-$labels['edit'] = 'Խմբագրել';
-$labels['cancel'] = 'Թարգել';
-$labels['save'] = 'Հիշել';
+
+$labels['edit']   = 'Խմբագրել';
+$labels['cancel'] = 'Չեղարկել';
+$labels['save']   = 'Հիշել';
 $labels['delete'] = 'Ջնջել';
 $labels['rename'] = 'Վերանվանել';
 $labels['addphoto'] = 'Ավելացնել';
 $labels['replacephoto'] = 'Փոխարինել';
 $labels['uploadphoto'] = 'Վերբեռնել լուսանկար';
-$labels['newcontact'] = 'Ստեղծել նոր հասցեքարտ';
-$labels['deletecontact'] = 'Ջնջել նշած նամակները';
-$labels['composeto'] = 'Գրել նամակ';
+
+$labels['newcontact']     = 'Ստեղծել նոր հասցեքարտ';
+$labels['deletecontact']  = 'Ջնջել նշած նամակները';
+$labels['composeto']      = 'Գրել նամակ';
 $labels['contactsfromto'] = 'Հասցեներ $from–ից $to–ը եղած $count–ից';
-$labels['print'] = 'Տպել';
-$labels['export'] = 'Արտահանել';
-$labels['exportvcards'] = 'Արտահանել հասցեները vCard չափաձևով';
+$labels['print']          = 'Տպել';
+$labels['export']         = 'Արտահանել';
+$labels['exportall']      = 'Export all';
+$labels['exportsel']      = 'Export selected';
+$labels['exportvcards']   = 'Արտահանել հասցեները vCard չափաձևով';
 $labels['newcontactgroup'] = 'Ստեղծել կապորդների նոր խումբ';
-$labels['grouprename'] = 'Վերանվանել խումբը';
-$labels['groupdelete'] = 'Ջնջել խումբը';
+$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'] = 'Պահպանել որոնումը';
 $labels['searchdelete'] = 'Ջնջել որոնումը';
+
 $labels['import'] = 'Ներկրել';
 $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['done'] = 'Ավարտված է';
+
+// settings
 $labels['settingsfor'] = 'Նախասիրություններ';
 $labels['about'] = 'Նկարագիր';
+$labels['preferences'] = 'Նախընտրանքներ';
+$labels['userpreferences'] = 'Օգտվողի նախընտրանքներ';
+$labels['editpreferences'] = 'Խմբագրել օգտվողի նախընտրանքները';
+
 $labels['identities'] = 'Անձիք';
 $labels['manageidentities'] = 'Կարգավորել անձանց';
 $labels['newidentity'] = 'Նոր անձ';
+
 $labels['newitem'] = 'Նոր իր';
 $labels['edititem'] = 'Խմբագրել իրը';
+
 $labels['preferhtml'] = 'Գերադասել HTML';
 $labels['defaultcharset'] = 'Լռելյալ տառաշար';
 $labels['htmlmessage'] = 'HTML նամակ';
+$labels['messagepart'] = 'Part';
+$labels['digitalsig'] = 'Digital Signature';
 $labels['dateformat'] = 'Ամսաթվի ձևաչափ';
 $labels['timeformat'] = 'Ժամանակի ձևաչափ';
 $labels['prettydate'] = 'Պարզ ամսաթվեր';
-$labels['setdefault'] = 'Հիմնական';
-$labels['autodetect'] = 'Ավտո';
-$labels['language'] = 'Լեզու';
-$labels['timezone'] = 'Ժամային գոտի';
-$labels['pagesize'] = 'Տողեր առ էջ';
+$labels['setdefault']  = 'Հիմնական';
+$labels['autodetect']  = 'Ավտո';
+$labels['language']  = 'Լեզուն';
+$labels['timezone']  = 'Ժամային գոտի';
+$labels['pagesize']  = 'Տողեր առ էջ';
 $labels['signature'] = 'Ստորագրություն';
-$labels['dstactive'] = 'Ամառային ժամանակ';
+$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['htmlsignature'] = 'HTML ստորագրություն';
+$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'Ցուցադրել պատուհանը';
 $labels['skin'] = 'Տեսքի տարբերակ';
 $labels['logoutclear'] = 'Դուրս գալուց դատարկել աղբարկղը';
@@ -347,10 +425,11 @@ $labels['showremoteimages'] = 'Ցույց տալ հեռակա պատկերներ
 $labels['fromknownsenders'] = 'հայտնի հասցեատերերից';
 $labels['always'] = 'միշտ';
 $labels['showinlineimages'] = 'Ցուցադրել կցված պատկերները հաղորդագրության տակ';
-$labels['autosavedraft'] = 'Սևագրի ավտոմատ գրանցում';
-$labels['everynminutes'] = 'ամեն $n րոպեն';
-$labels['never'] = 'երբեք';
-$labels['immediately'] = 'անմիջապես';
+$labels['autosavedraft']  = 'Սևագրի ավտոմատ գրանցում';
+$labels['everynminutes']  = 'ամեն $n րոպեն';
+$labels['refreshinterval']  = 'Refresh (check for new messages, etc.)';
+$labels['never']  = 'երբեք';
+$labels['immediately']  = 'անմիջապես';
 $labels['messagesdisplaying'] = 'նամակները ցուցադրելիս';
 $labels['messagescomposition'] = 'նամակ գրելիս';
 $labels['mimeparamfolding'] = 'Կցորդների անուններ';
@@ -370,22 +449,20 @@ $labels['maintenance'] = 'Սպասարկում';
 $labels['newmessage'] = 'Նոր հաղորդագրություն';
 $labels['signatureoptions'] = 'Ստորագրության ընտրանքներ';
 $labels['whenreplying'] = 'Պատասխանելիս';
+$labels['replyempty'] = 'do not quote the original message';
 $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 վարկյան հետո';
+$labels['previewpanemarkread']  = 'Նշել նախադիտված հաղորդագրությունները որպես ընթերցված';
+$labels['afternseconds']  = '$n վարկյան հետո';
 $labels['reqmdn'] = 'Միշտ պատվիրել ստացական';
 $labels['reqdsn'] = 'Միշտ պատվիրել առաքման կարգավիճակի ծանուցում';
 $labels['replysamefolder'] = 'Հաղորդագրության պատասխանները պահել նույն պանակում';
-$labels['defaultaddressbook'] = 'Ավելացնել նոր կապորդներ նշված հասցեագրքին';
+$labels['defaultabook'] = 'Default address book';
 $labels['autocompletesingle'] = 'Ավտոլրացման ժամանակ բացառել այլընտրանքային էլփոստի հասցեները';
 $labels['listnamedisplay'] = 'Ցուցադրել կապորդները որպես';
 $labels['spellcheckbeforesend'] = 'Ստուգել տառասխալները հաղորդագրությունը ուղարկելուց առաջ';
@@ -395,13 +472,18 @@ $labels['spellcheckignorenums'] = 'Անտեսել թվերով բառերը';
 $labels['spellcheckignorecaps'] = 'Անտեսել լրիվ մեծատառ բառերը';
 $labels['addtodict'] = 'Ավելացնել բառարանում';
 $labels['mailtoprotohandler'] = 'mailto: հղումների սպասարկող';
-$labels['folder'] = 'Դարակ';
-$labels['foldername'] = 'Դարակի անուն';
-$labels['subscribed'] = 'Բաժանորդագրված';
+$labels['forwardmode'] = 'Messages forwarding';
+$labels['inline'] = 'inline';
+$labels['asattachment'] = 'as attachment';
+
+$labels['folder']  = 'Դարակ';
+$labels['folders']  = 'Դարակներ';
+$labels['foldername']  = 'Դարակի անուն';
+$labels['subscribed']  = 'Բաժանորդագրված';
 $labels['messagecount'] = 'Նամակներ';
-$labels['create'] = 'Ստեղծել';
-$labels['createfolder'] = 'Բացել նոր դարակ';
-$labels['managefolders'] = 'Կարգավորել դարակները';
+$labels['create']  = 'Ստեղծել';
+$labels['createfolder']  = 'Բացել նոր դարակ';
+$labels['managefolders']  = 'Կարգավորել դարակները';
 $labels['specialfolders'] = 'Հատուկ դարակներ';
 $labels['properties'] = 'Հատկանիշներ';
 $labels['folderproperties'] = 'Պանակի հատկանիշներ';
@@ -411,22 +493,29 @@ $labels['info'] = 'Տեղեկություն';
 $labels['getfoldersize'] = 'Հպել պանակի չափը իմանալու համար';
 $labels['changesubscription'] = 'Հպել բաժանորդագրությունը փոխելու համար';
 $labels['foldertype'] = 'Պանակի տեսակ';
-$labels['personalfolder'] = 'Անձնական պանակ';
-$labels['otherfolder'] = 'Այլ օգտվողի պանակ';
-$labels['sharedfolder'] = 'Հանրային պանակ';
+$labels['personalfolder']  = 'Անձնական պանակ';
+$labels['otherfolder']  = 'Այլ օգտվողի պանակ';
+$labels['sharedfolder']  = 'Հանրային պանակ';
+
 $labels['sortby'] = 'Դասավորել';
-$labels['sortasc'] = 'ըստ աճման';
+$labels['sortasc']  = 'ըստ աճման';
 $labels['sortdesc'] = 'ըստ նվազման';
 $labels['undo'] = 'Ետարկել';
+
+$labels['installedplugins'] = 'Installed plugins';
 $labels['plugin'] = 'Խրիչ';
 $labels['version'] = 'Տարբերակ';
 $labels['source'] = 'Աղբյուր';
 $labels['license'] = 'Արտոնագիր';
 $labels['support'] = 'Ստանալ օգնություն';
+
+// units
 $labels['B'] = 'Բ';
 $labels['KB'] = 'ԿԲ';
 $labels['MB'] = 'ՄԲ';
 $labels['GB'] = 'ԳԲ';
+
+// character sets
 $labels['unicode'] = 'Յունիկոդ';
 $labels['english'] = 'Անգլերեն';
 $labels['westerneuropean'] = 'Արևմտա-Եվրոպական';
@@ -446,3 +535,4 @@ $labels['japanese'] = 'Ճապոնական';
 $labels['korean'] = 'Կորեական';
 $labels['chinese'] = 'Չինական';
 
+?>
diff --git a/program/localization/hy_AM/messages.inc b/program/localization/hy_AM/messages.inc
index dfb886c15..6b3f4ebe9 100644
--- a/program/localization/hy_AM/messages.inc
+++ b/program/localization/hy_AM/messages.inc
@@ -2,21 +2,23 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/hy_AM/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Vahan Yerkanian <vahan@yerkanian.com>                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['loading'] = 'Բեռնում...';
-$messages['errortitle'] = 'Սխա՛լ';
-$messages['loginfailed'] = 'Մուտքը ձախողվեց';
+$messages['errortitle']  = 'Սխա՛լ';
+$messages['loginfailed']  = 'Մուտքը ձախողվեց';
 $messages['cookiesdisabled'] = 'Сookies–ների ապահովվումը բացակայում է';
 $messages['sessionerror'] = 'Անվավեր կամ ժամկետանց սեսիա';
 $messages['storageerror'] = 'IMAP սերվերի հետ կապը ձախողվեց';
@@ -26,10 +28,15 @@ $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'] = 'Այս փոստարկղում նամակներ չկան';
 $messages['loggedout'] = 'Դուք բարեհաջող ավարտեցիք աշխատանքը։ Ցտեսություն…';
 $messages['mailboxempty'] = 'Փոստարկղը դատարկ է';
+$messages['refreshing'] = 'Refreshing...';
+$messages['loading'] = 'Բեռնում...';
 $messages['uploading'] = 'Ֆայլի վերբեռնում…';
 $messages['uploadingmany'] = 'Վերբեռնվում են ֆայլերը…';
 $messages['loadingdata'] = 'Տվյալների բեռնավորում…';
@@ -55,11 +62,11 @@ $messages['errormoving'] = 'Նամակի տեղափոխման ձախողում';
 $messages['errorcopying'] = 'Հաղորդագրության պատճենումը ձախողվեց։';
 $messages['errordeleting'] = 'Նամակի ջնջման ձախողում';
 $messages['errormarking'] = 'Հաղորդագրության նշումը ձախողվեց։';
-$messages['deletecontactconfirm'] = 'Ուզու՞մ էք ջնջել նշված անձերին';
-$messages['deletegroupconfirm'] = 'Դուք իսկապե՞ս ուզում եք ջնջել նշված խումբը։';
+$messages['deletecontactconfirm']  = 'Ուզու՞մ էք ջնջել նշված անձերին';
+$messages['deletegroupconfirm']  = 'Դուք իսկապե՞ս ուզում եք ջնջել նշված խումբը։';
 $messages['deletemessagesconfirm'] = 'Ուզու՞մ էք ջնջել նշված նամակները';
-$messages['deletefolderconfirm'] = 'Ուզու՞մ էք ջնջել այս դարակը';
-$messages['purgefolderconfirm'] = 'Ուզու՞մ էք ջնջել այս դարակի բոլոր նամակները';
+$messages['deletefolderconfirm']  = 'Ուզու՞մ էք ջնջել այս դարակը';
+$messages['purgefolderconfirm']  = 'Ուզու՞մ էք ջնջել այս դարակի բոլոր նամակները';
 $messages['contactdeleting'] = 'Անձի ջնջում…';
 $messages['groupdeleting'] = 'Խմբի ջնջում…';
 $messages['folderdeleting'] = 'Դարակը ջնջվում է…';
@@ -68,11 +75,11 @@ $messages['foldersubscribing'] = 'Պանակի բաժանորդագրում…';
 $messages['folderunsubscribing'] = 'Պանակի ապաբաժանորդագրում…';
 $messages['formincomplete'] = 'Ձևը թերի է լրացված';
 $messages['noemailwarning'] = 'Մուտքագրեք ճիշտ էլ. հասցե';
-$messages['nonamewarning'] = 'Մուտքագրեք անուն';
+$messages['nonamewarning']  = 'Մուտքագրեք անուն';
 $messages['nopagesizewarning'] = 'Մուտքագրեք էջի չափս';
 $messages['nosenderwarning'] = 'Մուտքագրեք հասցեատիրոջ հասցեն';
 $messages['norecipientwarning'] = 'Մուտքագրեք նվազագույնը մեկ հասցեատեր';
-$messages['nosubjectwarning'] = 'Վերնագիր բացակայում է, ցանկանո՞ւմ եք լրացնել';
+$messages['nosubjectwarning']  = 'Վերնագիր բացակայում է, ցանկանո՞ւմ եք լրացնել';
 $messages['nobodywarning'] = 'Ուղարկե՞լ այս նամակը դատարկ';
 $messages['notsentwarning'] = 'Նամակն ուղարկված չէ։ Ջնջե՞լ Ձեր նամակը';
 $messages['noldapserver'] = 'Ընտրեք ldap սերվեր որոնման համար';
@@ -114,8 +121,9 @@ $messages['selectimportfile'] = 'Ընտրեք ուղարկվող ֆայլը';
 $messages['addresswriterror'] = 'Ընտրված հասցեագիրքը ենթակա չէ փոփոխման';
 $messages['contactaddedtogroup'] = 'Անձինք բարեհաջող ավելացվեցին խմբին։';
 $messages['contactremovedfromgroup'] = 'Անձինք բարեհաջող հանվեցին խմբից։';
+$messages['nogroupassignmentschanged'] = 'No group assignments changed.';
 $messages['importwait'] = 'Ներկրումն ընթացքի մեջ է...';
-$messages['importerror'] = 'Ներկրումը խափանվեց։ Ներկրված ֆայլը vCard չափաձևի չէ։';
+$messages['importformaterror'] = 'Import failed! The uploaded file is not a valid import data file.';
 $messages['importconfirm'] = '$inserted նոր ներկրված հասցեներ, $skipped արդեն առկա հասցեներ՝ <p><em>$names</em></p>';
 $messages['importconfirmskipped'] = '<b>Բաց թողնվեց $skipped առկա գրառում</b>';
 $messages['opnotpermitted'] = 'Գործողությունը անթույլատրելի է։';
@@ -157,4 +165,7 @@ $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['noscriptwarning'] = 'Warning: This webmail service requires Javascript! In order to use it please enable Javascript in your browser\'s settings.';
 
+?>
diff --git a/program/localization/ia/labels.inc b/program/localization/ia/labels.inc
index cae533fe1..2a9501168 100644
--- a/program/localization/ia/labels.inc
+++ b/program/localization/ia/labels.inc
@@ -2,48 +2,78 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ia/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Emilio Sepulveda                                              |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = 'Benvenite a $product';
-$labels['username'] = 'Nomine de usator';
-$labels['password'] = 'Contrasigno';
-$labels['server'] = 'Servitor';
-$labels['login'] = 'Apertura de session';
-$labels['logout'] = 'Clauder session';
-$labels['mail'] = 'E-posta';
+
+// login page
+$labels['welcome']   = 'Benvenite a $product';
+$labels['username']  = 'Nomine de usator';
+$labels['password']  = 'Contrasigno';
+$labels['server']    = 'Servitor';
+$labels['login']     = 'Apertura de session';
+
+// taskbar
+$labels['logout']   = 'Clauder session';
+$labels['mail']     = 'E-posta';
 $labels['settings'] = 'Configurationes';
 $labels['addressbook'] = 'Adressario';
-$labels['inbox'] = 'Cassa de entrata';
-$labels['sent'] = 'Inviate';
+
+// mailbox names
+$labels['inbox']  = 'Cassa de entrata';
+$labels['drafts'] = 'Drafts';
+$labels['sent']   = 'Inviate';
+$labels['trash']  = 'Trash';
+$labels['junk']   = 'Junk';
+
+// message listing
 $labels['subject'] = 'Subjecto';
-$labels['from'] = 'Ex';
-$labels['to'] = 'A';
-$labels['cc'] = 'Cc';
-$labels['bcc'] = 'Bcc';
+$labels['from']    = 'Ex';
+$labels['sender']  = 'Expeditor';
+$labels['to']      = 'A';
+$labels['cc']      = 'Cc';
+$labels['bcc']     = 'Bcc';
 $labels['replyto'] = 'Responder a';
-$labels['date'] = 'Data';
-$labels['size'] = 'Dimension';
+$labels['followupto'] = 'Followup-To';
+$labels['date']    = 'Data';
+$labels['size']    = 'Dimension';
 $labels['priority'] = 'Prioritate';
 $labels['organization'] = 'Organisation';
+$labels['readstatus'] = 'Read status';
+$labels['listoptions'] = 'List options...';
+
 $labels['mailboxlist'] = 'Dossieres';
-$labels['folders'] = 'Dossieres';
-$labels['copy'] = 'Copiar';
-$labels['move'] = 'Mover';
-$labels['moveto'] = 'Mover a';
+$labels['messagesfromto'] = 'Messages $from to $to of $count';
+$labels['threadsfromto'] = 'Threads $from to $to of $count';
+$labels['messagenrof'] = 'Message $nr de $count';
+$labels['fromtoshort'] = '$from – $to de $count';
+
+$labels['copy']     = 'Copiar';
+$labels['move']     = 'Mover';
+$labels['moveto']   = 'Mover a';
 $labels['download'] = 'Discargar';
+$labels['open']     = 'Open';
+$labels['showattachment'] = 'Monstrar';
+$labels['showanyway'] = 'Show it anyway';
+
 $labels['filename'] = 'Nomine de file';
 $labels['filesize'] = 'Dimension del file';
+
 $labels['addtoaddressbook'] = 'Adder al adressario';
+
+// weekdays short
 $labels['sun'] = 'dom';
 $labels['mon'] = 'lun';
 $labels['tue'] = 'mar';
@@ -51,233 +81,458 @@ $labels['wed'] = 'mer';
 $labels['thu'] = 'jov';
 $labels['fri'] = 'ven';
 $labels['sat'] = 'sab';
-$labels['sunday'] = 'Dominica';
-$labels['monday'] = 'Lunedi';
-$labels['tuesday'] = 'Martedi';
+
+// weekdays long
+$labels['sunday']    = 'Dominica';
+$labels['monday']    = 'Lunedi';
+$labels['tuesday']   = 'Martedi';
 $labels['wednesday'] = 'Mercuridi';
-$labels['thursday'] = 'Jovedi';
-$labels['friday'] = 'Venerdi';
-$labels['saturday'] = 'Sabbato';
-$labels['jan'] = 'Jan';
-$labels['feb'] = 'Feb';
-$labels['mar'] = 'Mar';
-$labels['apr'] = 'Apr';
-$labels['may'] = 'Mai';
-$labels['longmay'] = 'Mai';
-$labels['jun'] = 'Jun';
-$labels['jul'] = 'Jul';
-$labels['aug'] = 'Aug';
-$labels['sep'] = 'Sep';
-$labels['oct'] = 'Oct';
-$labels['nov'] = 'Nov';
-$labels['dec'] = 'Dec';
-$labels['longjan'] = 'januario';
-$labels['longfeb'] = 'Februario';
-$labels['longmar'] = 'Martio';
-$labels['longapr'] = 'April';
-$labels['longjun'] = 'Junio';
-$labels['longjul'] = 'Julio';
-$labels['longaug'] = 'Augusto';
-$labels['longsep'] = 'Septembre';
-$labels['longoct'] = 'Octobre';
-$labels['longnov'] = 'Novembre';
-$labels['longdec'] = 'Decembre';
+$labels['thursday']  = 'Jovedi';
+$labels['friday']    = 'Venerdi';
+$labels['saturday']  = 'Sabbato';
+
+// months short
+$labels['jan']	= 'Jan';
+$labels['feb']	= 'Feb';
+$labels['mar']	= 'Mar';
+$labels['apr']	= 'Apr';
+$labels['may']	= 'Mai';
+$labels['jun']	= 'Jun';
+$labels['jul'] 	= 'Jul';
+$labels['aug']	= 'Aug';
+$labels['sep']	= 'Sep';
+$labels['oct']	= 'Oct';
+$labels['nov']	= 'Nov';
+$labels['dec']	= 'Dec';
+
+// months long
+$labels['longjan']	= 'januario';
+$labels['longfeb']	= 'Februario';
+$labels['longmar']	= 'Martio';
+$labels['longapr']	= 'April';
+$labels['longmay']	= 'Mai';
+$labels['longjun']	= 'Junio';
+$labels['longjul']	= 'Julio';
+$labels['longaug']	= 'Augusto';
+$labels['longsep']	= 'Septembre';
+$labels['longoct']	= 'Octobre';
+$labels['longnov']	= 'Novembre';
+$labels['longdec']	= 'Decembre';
+
 $labels['today'] = 'Hodie';
-$labels['refresh'] = 'Refrescar';
-$labels['checkmail'] = 'Verificar nove messages';
-$labels['writenewmessage'] = 'Crear un nove message';
-$labels['reply'] = 'Responder';
-$labels['replyall'] = 'Responder a totes';
-$labels['replylist'] = 'Responder a lista';
-$labels['deletemessage'] = 'Deler messsage';
-$labels['printmessage'] = 'Imprimer iste message';
-$labels['viewsource'] = 'Monstrar fonte';
-$labels['mark'] = 'Marcar';
-$labels['markmessages'] = 'Marcar messages';
-$labels['more'] = 'Plus';
-$labels['back'] = 'Retornar';
-$labels['options'] = 'Optiones';
+
+// toolbar buttons
+$labels['refresh']          = 'Refrescar';
+$labels['checkmail']        = 'Verificar nove messages';
+$labels['compose']          = 'Componer';
+$labels['writenewmessage']  = 'Crear un nove message';
+$labels['reply']            = 'Responder';
+$labels['replytomessage']   = 'Reply to sender';
+$labels['replytoallmessage'] = 'Reply to list or to sender and all recipients';
+$labels['replyall']         = 'Responder a totes';
+$labels['replylist']        = 'Responder a lista';
+$labels['forward']          = 'Forward';
+$labels['forwardinline']    = 'Forward inline';
+$labels['forwardattachment'] = 'Forward as attachment';
+$labels['forwardmessage']   = 'Forward the message';
+$labels['deletemessage']    = 'Deler messsage';
+$labels['movemessagetotrash'] = 'Move message to trash';
+$labels['printmessage']     = 'Imprimer iste message';
+$labels['previousmessage']  = 'Show previous message';
+$labels['firstmessage']     = 'Show first message';
+$labels['nextmessage']      = 'Show next message';
+$labels['lastmessage']      = 'Show last message';
+$labels['backtolist']       = 'Back to message list';
+$labels['viewsource']       = 'Monstrar fonte';
+$labels['mark']             = 'Marcar';
+$labels['markmessages']     = 'Marcar messages';
+$labels['markread']         = 'As read';
+$labels['markunread']       = 'As unread';
+$labels['markflagged']      = 'As flagged';
+$labels['markunflagged']    = 'As unflagged';
+$labels['moreactions']      = 'More actions...';
+$labels['more']             = 'Plus';
+$labels['back']             = 'Retornar';
+$labels['options']          = 'Optiones';
+
 $labels['select'] = 'Seliger';
 $labels['all'] = 'Totes';
 $labels['none'] = 'Necun';
-$labels['nonesort'] = 'Necun';
+$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';
 $labels['filter'] = 'Filtro';
 $labels['list'] = 'Lista';
 $labels['threads'] = 'Topicos';
+$labels['expand-all'] = 'Expand All';
+$labels['expand-unread'] = 'Expand Unread';
+$labels['collapse-all'] = 'Collapse All';
+$labels['threaded'] = 'Threaded';
+
+$labels['autoexpand_threads'] = 'Expand message threads';
+$labels['do_expand'] = 'all threads';
+$labels['expand_only_unread'] = 'only with unread messages';
+$labels['fromto'] = 'From/To';
 $labels['flag'] = 'Marcar';
 $labels['attachment'] = 'Attachamento';
+$labels['nonesort'] = 'Necun';
+$labels['sentdate'] = 'Sent date';
+$labels['arrival'] = 'Arrival date';
+$labels['asc'] = 'ascending';
+$labels['desc'] = 'descending';
+$labels['listcolumns'] = 'List columns';
+$labels['listsorting'] = 'Sorting column';
+$labels['listorder'] = 'Sorting order';
+$labels['listmode'] = 'List view mode';
+
 $labels['folderactions'] = 'Actiones de dossier...';
 $labels['compact'] = 'Compacte';
 $labels['empty'] = 'Vacue';
-$labels['unknown'] = 'incognite';
-$labels['quicksearch'] = 'Cerca rapide';
-$labels['resetsearch'] = 'Reinitialisar cerca';
-$labels['msgtext'] = 'Message complete';
+
+$labels['quota'] = 'Disk usage';
+$labels['unknown']  = 'incognite';
+$labels['unlimited']  = 'unlimited';
+
+$labels['quicksearch']  = 'Cerca rapide';
+$labels['resetsearch']  = 'Reinitialisar cerca';
+$labels['searchmod']  = 'Search modifiers';
+$labels['msgtext']  = 'Message complete';
+$labels['body']  = 'Body';
+
 $labels['openinextwin'] = 'Aperir in nove fenestra';
-$labels['editasnew'] = 'Modificar como nove';
-$labels['sendmessage'] = 'Inviar message';
-$labels['savemessage'] = 'Salveguardar como version provisori';
-$labels['addattachment'] = 'Attachar un file';
-$labels['charset'] = 'Insimul de Characteres';
-$labels['editortype'] = 'Typo de editor';
+$labels['emlsave'] = 'Download (.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
+
+// message compose
+$labels['editasnew']      = 'Modificar como nove';
+$labels['send']           = 'Send';
+$labels['sendmessage']    = 'Inviar message';
+$labels['savemessage']    = 'Salveguardar como version provisori';
+$labels['addattachment']  = 'Attachar un file';
+$labels['charset']        = 'Insimul de Characteres';
+$labels['editortype']     = 'Typo de editor';
+$labels['returnreceipt']  = 'Return receipt';
+$labels['dsn']            = 'Delivery status notification';
+$labels['mailreplyintro'] = 'On $date, $sender wrote:';
 $labels['originalmessage'] = 'Message original';
-$labels['editidents'] = 'Modificar identitates';
-$labels['spellcheck'] = 'Orthographia';
+
+$labels['editidents']    = 'Modificar identitates';
+$labels['spellcheck']    = 'Orthographia';
 $labels['checkspelling'] = 'Verificar orthographia';
+$labels['resumeediting'] = 'Resume editing';
+$labels['revertto']      = 'Revert to';
+
 $labels['attach'] = 'Attachar';
 $labels['attachments'] = 'Attachamentos';
 $labels['upload'] = 'Incargar';
-$labels['close'] = 'Clauder';
-$labels['messageoptions'] = 'Optiones de message...';
-$labels['low'] = 'Basse';
-$labels['lowest'] = 'Minimal';
-$labels['normal'] = 'Normal';
-$labels['high'] = 'Alte';
+$labels['uploadprogress'] = '$percent ($current from $total)';
+$labels['close']  = 'Clauder';
+$labels['messageoptions']  = 'Optiones de message...';
+
+$labels['low']     = 'Basse';
+$labels['lowest']  = 'Minimal';
+$labels['normal']  = 'Normal';
+$labels['high']    = 'Alte';
 $labels['highest'] = 'Maximal';
-$labels['nosubject'] = '(sin subjecto)';
+
+$labels['nosubject']  = '(sin subjecto)';
 $labels['showimages'] = 'Monstrar imagines';
+$labels['alwaysshow'] = 'Always show images from $sender';
+$labels['isdraft']    = 'This is a draft message.';
+$labels['andnmore']   = '$nr more...';
+$labels['togglemoreheaders'] = 'Show more message headers';
+$labels['togglefullheaders'] = 'Toggle raw message headers';
+
+$labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Texto plan';
 $labels['savesentmessagein'] = 'Salveguardar message inviate in';
 $labels['dontsave'] = 'non salveguardar';
 $labels['maxuploadsize'] = 'Le dimension maximal de iste file es $size';
+
 $labels['addcc'] = 'Adder Cc';
 $labels['addbcc'] = 'Adder Bcc';
-$labels['name'] = 'Monstrar nomine';
-$labels['firstname'] = 'Nomine';
-$labels['surname'] = 'Nomine de familia';
-$labels['nameprefix'] = 'Prefixo';
-$labels['nickname'] = 'Pseudonymo';
-$labels['department'] = 'Departimento';
-$labels['gender'] = 'Sexo:';
-$labels['email'] = 'E-posta';
-$labels['phone'] = 'Telephono';
-$labels['address'] = 'Adresse';
-$labels['street'] = 'Strata';
-$labels['locality'] = 'Citate';
-$labels['zipcode'] = 'Codice postal';
-$labels['region'] = 'Provincia o stato';
-$labels['country'] = 'Pais';
-$labels['birthday'] = 'Anniversario de nativitate';
-$labels['anniversary'] = 'Anniversario';
-$labels['website'] = 'Sito web';
+$labels['addreplyto'] = 'Add Reply-To';
+$labels['addfollowupto'] = 'Add Followup-To';
+
+// mdn
+$labels['mdnrequest'] = 'The sender of this message has asked to be notified when you read this message. Do you wish to notify the sender?';
+$labels['receiptread'] = 'Return Receipt (read)';
+$labels['yourmessage'] = 'This is a Return Receipt for your message';
+$labels['receiptnote'] = 'Note: This receipt only acknowledges that the message was displayed on the recipient\'s computer. There is no guarantee that the recipient has read or understood the message contents.';
+
+// address boook
+$labels['name']         = 'Monstrar nomine';
+$labels['firstname']    = 'Nomine';
+$labels['surname']      = 'Nomine de familia';
+$labels['middlename']   = 'Middle Name';
+$labels['nameprefix']   = 'Prefixo';
+$labels['namesuffix']   = 'Suffix';
+$labels['nickname']     = 'Pseudonymo';
+$labels['jobtitle']     = 'Job Title';
+$labels['department']   = 'Departimento';
+$labels['gender']       = 'Sexo:';
+$labels['maidenname']   = 'Maiden Name';
+$labels['email']        = 'E-posta';
+$labels['phone']        = 'Telephono';
+$labels['address']      = 'Adresse';
+$labels['street']       = 'Strata';
+$labels['locality']     = 'Citate';
+$labels['zipcode']      = 'Codice postal';
+$labels['region']       = 'Provincia o stato';
+$labels['country']      = 'Pais';
+$labels['birthday']     = 'Anniversario de nativitate';
+$labels['anniversary']  = 'Anniversario';
+$labels['website']      = 'Sito web';
 $labels['instantmessenger'] = 'MI';
 $labels['notes'] = 'Notas';
-$labels['male'] = 'masculin';
+$labels['male']   = 'masculin';
 $labels['female'] = 'feminin';
 $labels['manager'] = 'Gerente';
 $labels['assistant'] = 'Assistente';
-$labels['typeassistant'] = 'Assistente';
 $labels['spouse'] = 'Sposo/a';
 $labels['allfields'] = 'Omne campos';
 $labels['search'] = 'Cercar';
 $labels['advsearch'] = 'Cerca avantiate';
 $labels['advanced'] = 'Avantiate';
 $labels['other'] = 'Altere';
-$labels['typeother'] = 'Altere';
-$labels['typehome'] = 'Domo';
-$labels['typework'] = 'Labor';
-$labels['typemobile'] = 'Mobile';
-$labels['typemain'] = 'Principal';
-$labels['typehomefax'] = 'Fax de domo';
-$labels['typeworkfax'] = 'Fax de labor';
-$labels['typepager'] = 'Pager';
-$labels['typevideo'] = 'Video';
-$labels['typehomepage'] = 'Pagina principal';
+
+$labels['typehome']   = 'Domo';
+$labels['typework']   = 'Labor';
+$labels['typeother']  = 'Altere';
+$labels['typemobile']  = 'Mobile';
+$labels['typemain']  = 'Principal';
+$labels['typehomefax']  = 'Fax de domo';
+$labels['typeworkfax']  = 'Fax de labor';
+$labels['typecar']  = 'Car';
+$labels['typepager']  = 'Pager';
+$labels['typevideo']  = 'Video';
+$labels['typeassistant']  = 'Assistente';
+$labels['typehomepage']  = 'Pagina principal';
 $labels['typeblog'] = 'Blog';
 $labels['typeprofile'] = 'Profilo';
+
 $labels['addfield'] = 'Adder campo...';
 $labels['addcontact'] = 'Adder nove contacto';
 $labels['editcontact'] = 'Modificar contacto';
 $labels['contacts'] = 'Contactos';
 $labels['contactproperties'] = 'Proprietates de contacto';
 $labels['personalinfo'] = 'Information personal';
-$labels['edit'] = 'Modificar';
+
+$labels['edit']   = 'Modificar';
 $labels['cancel'] = 'Cancellar';
-$labels['save'] = 'Salveguardar';
+$labels['save']   = 'Salveguardar';
 $labels['delete'] = 'Deler';
 $labels['rename'] = 'Renominar';
 $labels['addphoto'] = 'Adder';
 $labels['replacephoto'] = 'Reimplaciar';
-$labels['newcontact'] = 'Crear un nove carta de contacto';
-$labels['deletecontact'] = 'Deler contactos seligite';
-$labels['print'] = 'Imprimer';
-$labels['export'] = 'Exportar';
+$labels['uploadphoto'] = 'Upload photo';
+
+$labels['newcontact']     = 'Crear un nove carta de contacto';
+$labels['deletecontact']  = 'Deler contactos seligite';
+$labels['composeto']      = 'Compose mail to';
+$labels['contactsfromto'] = 'Contacts $from to $to of $count';
+$labels['print']          = 'Imprimer';
+$labels['export']         = 'Exportar';
+$labels['exportall']      = 'Export all';
+$labels['exportsel']      = 'Export selected';
+$labels['exportvcards']   = 'Export contacts in vCard format';
 $labels['newcontactgroup'] = 'Crear un nove gruppo de contacto';
-$labels['grouprename'] = 'Renominar gruppo';
-$labels['groupdelete'] = 'Deler gruppo';
+$labels['grouprename']    = 'Renominar gruppo';
+$labels['groupdelete']    = 'Deler gruppo';
+$labels['groupremoveselected'] = 'Remove selected contacts from group';
+
+$labels['previouspage']   = 'Show previous page';
+$labels['firstpage']      = 'Show first page';
+$labels['nextpage']       = 'Show next page';
+$labels['lastpage']       = 'Show last page';
+
 $labels['group'] = 'Gruppo';
 $labels['groups'] = 'Gruppos';
 $labels['personaladrbook'] = 'Adresses personal';
+
 $labels['searchsave'] = 'Salveguardar cerca';
 $labels['searchdelete'] = 'Deler cerca';
+
 $labels['import'] = 'Importar';
 $labels['importcontacts'] = 'Importar contactos';
 $labels['importfromfile'] = 'Importar ex file:';
 $labels['importtarget'] = 'Adder nove contactos al adressario';
+$labels['importreplace'] = 'Replace the entire address book';
+$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['done'] = 'Facite';
+
+// settings
 $labels['settingsfor'] = 'Configurationes pro';
 $labels['about'] = 'A proposito';
 $labels['preferences'] = 'Preferentias';
 $labels['userpreferences'] = 'Preferentias de usator';
 $labels['editpreferences'] = 'Modificar preferentias de usator';
+
 $labels['identities'] = 'Identitates';
+$labels['manageidentities'] = 'Manage identities for this account';
 $labels['newidentity'] = 'Nove identitate';
+
 $labels['newitem'] = 'Nove elemento';
 $labels['edititem'] = 'Modificar elemento';
+
 $labels['preferhtml'] = 'Monstrar HTML';
+$labels['defaultcharset'] = 'Default Character Set';
 $labels['htmlmessage'] = 'Message HTML';
+$labels['messagepart'] = 'Part';
+$labels['digitalsig'] = 'Digital Signature';
 $labels['dateformat'] = 'Formato de data';
 $labels['timeformat'] = 'Formato de tempore';
-$labels['setdefault'] = 'Fixar predeterminate';
-$labels['autodetect'] = 'Auto';
-$labels['language'] = 'Lingua';
-$labels['timezone'] = 'Fuso horari';
+$labels['prettydate'] = 'Pretty dates';
+$labels['setdefault']  = 'Fixar predeterminate';
+$labels['autodetect']  = 'Auto';
+$labels['language']  = 'Lingua';
+$labels['timezone']  = 'Fuso horari';
+$labels['pagesize']  = 'Rows per page';
 $labels['signature'] = 'Signatura';
+$labels['dstactive']  = 'Daylight saving time';
+$labels['showinextwin'] = 'Open message in a new window';
+$labels['composeextwin'] = 'Compose in a new window';
+$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';
+$labels['logoutcompact'] = 'Compact Inbox on logout';
 $labels['uisettings'] = 'Interfacie de usator';
 $labels['serversettings'] = 'Configurationes de servitor';
+$labels['mailboxview'] = 'Mailbox View';
+$labels['mdnrequests'] = 'On request for return receipt';
+$labels['askuser'] = 'ask me';
+$labels['autosend'] = 'send receipt';
+$labels['autosendknown'] = 'send receipt to my contacts, otherwise ask me';
+$labels['autosendknownignore'] = 'send receipt to my contacts, otherwise ignore';
 $labels['ignore'] = 'ignorar';
+$labels['readwhendeleted'] = 'Mark the message as read on delete';
+$labels['flagfordeletion'] = 'Flag the message for deletion instead of delete';
+$labels['skipdeleted'] = 'Do not show deleted messages';
+$labels['deletealways'] = 'If moving messages to Trash fails, delete them';
+$labels['deletejunk'] = 'Directly delete messages in Junk';
+$labels['showremoteimages'] = 'Display remote inline images';
+$labels['fromknownsenders'] = 'from known senders';
 $labels['always'] = 'sempre';
-$labels['everynminutes'] = 'cata $n minuta(s)';
-$labels['never'] = 'nunquam';
+$labels['showinlineimages'] = 'Display attached images below the message';
+$labels['autosavedraft']  = 'Automatically save draft';
+$labels['everynminutes']  = 'cata $n minuta(s)';
+$labels['refreshinterval']  = 'Refresh (check for new messages, etc.)';
+$labels['never']  = 'nunquam';
+$labels['immediately']  = 'immediately';
 $labels['messagesdisplaying'] = 'Inviar me_ssages';
+$labels['messagescomposition'] = 'Composing Messages';
 $labels['mimeparamfolding'] = 'Nomines de attachamento';
+$labels['2231folding'] = 'Full RFC 2231 (Thunderbird)';
+$labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
+$labels['2047folding'] = 'Full RFC 2047 (other)';
+$labels['force7bit'] = 'Use MIME encoding for 8-bit characters';
 $labels['advancedoptions'] = 'Optiones avantiate';
+$labels['focusonnewmessage'] = 'Focus browser window on new message';
+$labels['checkallfolders'] = 'Check all folders for new messages';
+$labels['displaynext'] = 'After message delete/move display the next message';
+$labels['defaultfont'] = 'Default font of HTML message';
 $labels['mainoptions'] = 'Optiones principal';
+$labels['browseroptions'] = 'Browser Options';
 $labels['section'] = 'Section';
 $labels['maintenance'] = 'Mantenimento';
 $labels['newmessage'] = 'Nove message';
 $labels['signatureoptions'] = 'Optiones de signatura';
+$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'] = 'Automaticamente inserta signatura';
+$labels['newmessageonly'] = 'new message only';
+$labels['replyandforwardonly'] = 'replies and forwards only';
 $labels['insertsignature'] = 'Insertar signatura';
+$labels['previewpanemarkread']  = 'Mark previewed messages as read';
+$labels['afternseconds']  = 'after $n seconds';
+$labels['reqmdn'] = 'Always request a return receipt';
+$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'] = 'Check spelling before sending a message';
 $labels['spellcheckoptions'] = 'Optiones de verification orthographic';
+$labels['spellcheckignoresyms'] = 'Ignore words with symbols';
+$labels['spellcheckignorenums'] = 'Ignore words with numbers';
+$labels['spellcheckignorecaps'] = 'Ignore words with all letters capitalized';
 $labels['addtodict'] = 'Adder al dictionario';
-$labels['folder'] = 'Dossier';
-$labels['foldername'] = 'Nomine de dossier';
-$labels['subscribed'] = 'Subscribite';
+$labels['mailtoprotohandler'] = 'Register protocol handler for mailto: links';
+$labels['forwardmode'] = 'Messages forwarding';
+$labels['inline'] = 'inline';
+$labels['asattachment'] = 'as attachment';
+
+$labels['folder']  = 'Dossier';
+$labels['folders']  = 'Dossieres';
+$labels['foldername']  = 'Nomine de dossier';
+$labels['subscribed']  = 'Subscribite';
 $labels['messagecount'] = 'Messages';
-$labels['create'] = 'Crear';
-$labels['createfolder'] = 'Crear un nove dossier';
-$labels['managefolders'] = 'Gerer le dossieres';
+$labels['create']  = 'Crear';
+$labels['createfolder']  = 'Crear un nove dossier';
+$labels['managefolders']  = 'Gerer le dossieres';
+$labels['specialfolders'] = 'Special Folders';
 $labels['properties'] = 'Proprietates';
 $labels['folderproperties'] = 'Proprietates de dossier';
+$labels['parentfolder'] = 'Parent folder';
 $labels['location'] = 'Location';
 $labels['info'] = 'Information';
+$labels['getfoldersize'] = 'Click to get folder size';
+$labels['changesubscription'] = 'Click to change subscription';
 $labels['foldertype'] = 'Typo de dossier';
-$labels['personalfolder'] = 'Dossier private';
-$labels['sharedfolder'] = 'Dossier public';
+$labels['personalfolder']  = 'Dossier private';
+$labels['otherfolder']  = 'Other User\'s Folder';
+$labels['sharedfolder']  = 'Dossier public';
+
 $labels['sortby'] = 'Ordinar per';
+$labels['sortasc']  = 'Sort ascending';
+$labels['sortdesc'] = 'Sort descending';
+$labels['undo'] = 'Undo';
+
+$labels['installedplugins'] = 'Installed plugins';
+$labels['plugin'] = 'Plugin';
+$labels['version'] = 'Version';
 $labels['source'] = 'Fonte';
 $labels['license'] = 'Licentia';
 $labels['support'] = 'Obtener supporte';
+
+// units
+$labels['B'] = 'B';
+$labels['KB'] = 'KB';
+$labels['MB'] = 'MB';
+$labels['GB'] = 'GB';
+
+// character sets
 $labels['unicode'] = 'Unicode';
 $labels['english'] = 'Anglese';
+$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['turkish'] = 'Turkish';
+$labels['nordic'] = 'Nordic';
+$labels['thai'] = 'Thai';
+$labels['celtic'] = 'Celtic';
+$labels['vietnamese'] = 'Vietnamese';
 $labels['japanese'] = 'Japonese';
 $labels['korean'] = 'Coreano';
 $labels['chinese'] = 'Chinese';
 
+?>
diff --git a/program/localization/ia/messages.inc b/program/localization/ia/messages.inc
index c08aca3f3..ebc6953d2 100644
--- a/program/localization/ia/messages.inc
+++ b/program/localization/ia/messages.inc
@@ -2,40 +2,170 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ia/messages.inc                                          |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Emilio Sepulveda <emilio@chilemoz.org>                        |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['loginfailed'] = 'Initio de session fallite';
+$messages['errortitle']  = 'An error occurred!';
+$messages['loginfailed']  = 'Initio de session fallite';
+$messages['cookiesdisabled'] = 'Your browser does not accept cookies.';
+$messages['sessionerror'] = 'Your session is invalid or expired.';
+$messages['storageerror'] = 'Connection to storage server failed.';
 $messages['servererror'] = 'Error de servitor!';
+$messages['servererrormsg'] = 'Server Error: $msg';
 $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.';
+$messages['loggedout'] = 'You have successfully terminated the session. Good bye!';
+$messages['mailboxempty'] = 'Mailbox is empty.';
+$messages['refreshing'] = 'Refreshing...';
 $messages['loading'] = 'Cargante ...';
+$messages['uploading'] = 'Uploading file...';
 $messages['uploadingmany'] = 'Incargante files...';
 $messages['loadingdata'] = 'Cargante datos...';
+$messages['checkingmail'] = 'Checking for new messages...';
 $messages['sendingmessage'] = 'Inviante message...';
+$messages['messagesent'] = 'Message sent successfully.';
+$messages['savingmessage'] = 'Saving message...';
+$messages['messagesaved'] = 'Message saved to Drafts.';
 $messages['successfullysaved'] = 'Salveguardate con successo.';
+$messages['addedsuccessfully'] = 'Contact added successfully to address book.';
+$messages['contactexists'] = 'A contact with the same e-mail address already exists.';
+$messages['contactnameexists'] = 'A contact with the same name already exists.';
+$messages['blockedimages'] = 'To protect your privacy, remote images are blocked in this message.';
+$messages['encryptedmessage'] = 'This is an encrypted message and can not be displayed. Sorry!';
 $messages['nocontactsfound'] = 'Nulle contactos trovate.';
+$messages['contactnotfound'] = 'The requested contact was not found.';
+$messages['contactsearchonly'] = 'Enter some search terms to find contacts';
 $messages['sendingfailed'] = 'Falleva in inviar le message.';
+$messages['senttooquickly'] = 'Please wait $sec sec(s). before sending this message.';
+$messages['errorsavingsent'] = 'An error occured while saving sent message.';
+$messages['errorsaving'] = 'An error occured while saving.';
 $messages['errormoving'] = 'Non pote mover le message(s)';
+$messages['errorcopying'] = 'Could not copy the message(s).';
 $messages['errordeleting'] = 'Il non pote deler le message(s).';
-$messages['nonamewarning'] = 'Per favor inserta nomine.';
+$messages['errormarking'] = 'Could not mark the message(s).';
+$messages['deletecontactconfirm']  = 'Do you really want to delete selected contact(s)?';
+$messages['deletegroupconfirm']  = 'Do you really want to delete selected group?';
+$messages['deletemessagesconfirm'] = 'Do you really want to delete selected message(s)?';
+$messages['deletefolderconfirm']  = 'Do you really want to delete this folder?';
+$messages['purgefolderconfirm']  = 'Do you really want to delete all messages in this folder?';
+$messages['contactdeleting'] = 'Deleting contact(s)...';
+$messages['groupdeleting'] = 'Deleting group...';
+$messages['folderdeleting'] = 'Deleting folder...';
+$messages['foldermoving'] = 'Moving folder...';
+$messages['foldersubscribing'] = 'Subscribing folder...';
+$messages['folderunsubscribing'] = 'Unsubscribing folder...';
+$messages['formincomplete'] = 'The form was not completely filled out.';
+$messages['noemailwarning'] = 'Please enter a valid email address.';
+$messages['nonamewarning']  = 'Per favor inserta nomine.';
+$messages['nopagesizewarning'] = 'Please enter a page size.';
+$messages['nosenderwarning'] = 'Please enter sender e-mail address.';
+$messages['norecipientwarning'] = 'Please enter at least one recipient.';
+$messages['nosubjectwarning']  = 'The "Subject" field is empty. Would you like to enter one now?';
+$messages['nobodywarning'] = 'Send this message without text?';
+$messages['notsentwarning'] = 'Message has not been sent. Do you want to discard your message?';
+$messages['noldapserver'] = 'Please select an ldap server to search.';
+$messages['nosearchname'] = 'Please enter a contact name or email address.';
+$messages['notuploadedwarning'] = 'Not all attachments have been uploaded yet. Please wait or cancel the upload.';
 $messages['searchsuccessful'] = '$nr messages trovate.';
 $messages['contactsearchsuccessful'] = '$nr contactos trovate.';
+$messages['searchnomatch'] = 'Search returned no matches.';
 $messages['searching'] = 'Cercante...';
 $messages['checking'] = 'A verificar...';
+$messages['nospellerrors'] = 'No spelling errors found.';
+$messages['folderdeleted'] = 'Folder successfully deleted.';
+$messages['foldersubscribed'] = 'Folder successfully subscribed.';
+$messages['folderunsubscribed'] = 'Folder successfully unsubscribed.';
+$messages['folderpurged'] = 'Folder has successfully been emptied.';
+$messages['folderexpunged'] = 'Folder has successfully been compacted.';
 $messages['deletedsuccessfully'] = 'Delete con successo.';
+$messages['converting'] = 'Removing formatting...';
+$messages['messageopenerror'] = 'Could not load message from server.';
 $messages['fileuploaderror'] = 'Incargamento de file falleva.';
+$messages['filesizeerror'] = 'The uploaded file exceeds the maximum size of $size.';
+$messages['copysuccess'] = 'Successfully copied $nr addresses.';
+$messages['copyerror'] = 'Could not copy any addresses.';
+$messages['sourceisreadonly'] = 'This address source is read only.';
+$messages['errorsavingcontact'] = 'Could not save the contact address.';
+$messages['movingmessage'] = 'Moving message(s)...';
+$messages['copyingmessage'] = 'Copying message(s)...';
+$messages['copyingcontact'] = 'Copying contact(s)...';
+$messages['deletingmessage'] = 'Deleting message(s)...';
+$messages['markingmessage'] = 'Marking message(s)...';
+$messages['addingmember'] = 'Adding contact(s) to the group...';
+$messages['removingmember'] = 'Removing contact(s) from the group...';
+$messages['receiptsent'] = 'Successfully sent a read receipt.';
+$messages['errorsendingreceipt'] = 'Could not send the receipt.';
+$messages['deleteidentityconfirm'] = 'Do you really want to delete this identity?';
+$messages['nodeletelastidentity'] = 'You cannot delete this identity, it\'s your last one.';
+$messages['forbiddencharacter'] = 'Folder name contains a forbidden character.';
 $messages['selectimportfile'] = 'Per favor tu selige le file a incargar.';
+$messages['addresswriterror'] = 'The selected address book is not writeable.';
+$messages['contactaddedtogroup'] = 'Successfully added the contacts to this group.';
+$messages['contactremovedfromgroup'] = 'Successfully removed contacts from this group.';
+$messages['nogroupassignmentschanged'] = 'No group assignments changed.';
+$messages['importwait'] = 'Importing, please wait...';
+$messages['importformaterror'] = 'Import failed! The uploaded file is not a valid import data file.';
+$messages['importconfirm'] = '<b>Successfully imported $inserted contacts</b>';
+$messages['importconfirmskipped'] = '<b>Skipped $skipped existing entries</b>';
+$messages['opnotpermitted'] = 'Operation not permitted!';
+$messages['nofromaddress'] = 'Missing e-mail address in selected identity.';
+$messages['editorwarning'] = 'Switching to the plain text editor will cause all text formatting to be lost. Do you wish to continue?';
+$messages['httpreceivedencrypterror'] = 'A fatal configuration error occurred. Contact your administrator immediately. <b>Your message can not be sent.</b>';
+$messages['smtpconnerror'] = 'SMTP Error ($code): Connection to server failed.';
+$messages['smtpautherror'] = 'SMTP Error ($code): Authentication failed.';
+$messages['smtpfromerror'] = 'SMTP Error ($code): Failed to set sender "$from" ($msg).';
+$messages['smtptoerror'] = 'SMTP Error ($code): Failed to add recipient "$to" ($msg).';
+$messages['smtprecipientserror'] = 'SMTP Error: Unable to parse recipients list.';
+$messages['smtperror'] = 'SMTP Error: $msg';
 $messages['emailformaterror'] = 'Adresse de e-mail invalide: $email';
+$messages['toomanyrecipients'] = 'Too many recipients. Reduce the number of recipients to $max.';
+$messages['maxgroupmembersreached'] = 'The number of group members exceeds the maximum of $max.';
+$messages['internalerror'] = 'An internal error occured. Please try again.';
+$messages['contactdelerror'] = 'Could not delete contact(s).';
+$messages['contactdeleted'] = 'Contact(s) deleted successfully.';
+$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'] = 'Le nomine non pote esser vacue.';
 $messages['nametoolong'] = 'Le nomine es troppo longe.';
+$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.';
 
+?>
diff --git a/program/localization/id_ID/labels.inc b/program/localization/id_ID/labels.inc
index ce388581e..eea3132cd 100644
--- a/program/localization/id_ID/labels.inc
+++ b/program/localization/id_ID/labels.inc
@@ -2,58 +2,78 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/id_ID/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = 'Selamat datang di $product';
-$labels['username'] = 'Username';
-$labels['password'] = 'Password';
-$labels['server'] = 'Server';
-$labels['login'] = 'Masuk';
-$labels['logout'] = 'Keluar';
-$labels['mail'] = 'E-Mail';
-$labels['settings'] = 'Pengaturan Pribadi';
+
+// login page
+$labels['welcome']   = 'Selamat datang di $product';
+$labels['username']  = 'Username';
+$labels['password']  = 'Password';
+$labels['server']    = 'Server';
+$labels['login']     = 'Masuk';
+
+// taskbar
+$labels['logout']   = 'Keluar';
+$labels['mail']     = 'E-Mail';
+$labels['settings'] = 'Pengaturan';
 $labels['addressbook'] = 'Buku Alamat';
-$labels['inbox'] = 'Kotak Masuk';
+
+// mailbox names
+$labels['inbox']  = 'Kotak Masuk';
 $labels['drafts'] = 'Daftar tunggu';
-$labels['sent'] = 'Terkirim';
-$labels['trash'] = 'Surat Terhapus';
-$labels['junk'] = 'Sampah';
+$labels['sent']   = 'Terkirim';
+$labels['trash']  = 'Surat Terhapus';
+$labels['junk']   = 'Sampah';
+
+// message listing
 $labels['subject'] = 'Judul';
-$labels['from'] = 'Pengirim';
-$labels['to'] = 'Penerima';
-$labels['cc'] = 'Lampiran';
-$labels['bcc'] = 'Lampiran tersembunyi';
+$labels['from']    = 'Pengirim';
+$labels['sender']  = 'Pengirim';
+$labels['to']      = 'Penerima';
+$labels['cc']      = 'Lampiran';
+$labels['bcc']     = 'Lampiran tersembunyi';
 $labels['replyto'] = 'Balas kepada';
 $labels['followupto'] = 'Surat Tindak Lanjut Untuk';
-$labels['date'] = 'Tanggal';
-$labels['size'] = 'Ukuran';
+$labels['date']    = 'Tanggal';
+$labels['size']    = 'Ukuran';
 $labels['priority'] = 'Prioritas';
 $labels['organization'] = 'Organisasi';
 $labels['readstatus'] = 'Status Terbaca';
 $labels['listoptions'] = 'Daftar Pilihan...';
+
 $labels['mailboxlist'] = 'Semua Folder';
-$labels['folders'] = 'Semua Folder';
-$labels['messagesfromto'] = 'Pesan ke $from sampai $to dari $count';
-$labels['threadsfromto'] = 'Untaian ke $from sampai $to dari $count';
-$labels['messagenrof'] = 'Pesan $nr sebanyak $count';
-$labels['fromtoshort'] = '$from - $to dari $count';
-$labels['copy'] = 'Salin';
-$labels['move'] = 'Pindahkan';
-$labels['moveto'] = 'Pindahkan ke...';
+$labels['messagesfromto'] = 'Pesan dari $from sampai $to dari total $count';
+$labels['threadsfromto'] = 'Untaian dari $from sampai $to dari total $count';
+$labels['messagenrof'] = 'Pesan $nr dari total $count';
+$labels['fromtoshort'] = '$from - $to dari total $count';
+
+$labels['copy']     = 'Salin';
+$labels['move']     = 'Pindahkan';
+$labels['moveto']   = 'Pindahkan ke...';
 $labels['download'] = 'Unduh';
+$labels['open']     = 'Open';
+$labels['showattachment'] = 'Tampilkan';
+$labels['showanyway'] = 'Tampilkan saja';
+
 $labels['filename'] = 'Nama berkas';
 $labels['filesize'] = 'Ukuran berkas';
-$labels['addtoaddressbook'] = 'Tambah ke Buku Tamu';
+
+$labels['addtoaddressbook'] = 'Tambah ke buku alamat';
+
+// weekdays short
 $labels['sun'] = 'Min';
 $labels['mon'] = 'Sen';
 $labels['tue'] = 'Sel';
@@ -61,79 +81,90 @@ $labels['wed'] = 'Rab';
 $labels['thu'] = 'Kam';
 $labels['fri'] = 'Jum';
 $labels['sat'] = 'Sab';
-$labels['sunday'] = 'Minggu';
-$labels['monday'] = 'Senin';
-$labels['tuesday'] = 'Selasa';
+
+// weekdays long
+$labels['sunday']    = 'Minggu';
+$labels['monday']    = 'Senin';
+$labels['tuesday']   = 'Selasa';
 $labels['wednesday'] = 'Rabu';
-$labels['thursday'] = 'Kamis';
-$labels['friday'] = 'Jumat';
-$labels['saturday'] = 'Sabtu';
-$labels['jan'] = 'Jan';
-$labels['feb'] = 'Feb';
-$labels['mar'] = 'Mar';
-$labels['apr'] = 'Apr';
-$labels['may'] = 'Mei';
-$labels['longmay'] = 'Mei';
-$labels['jun'] = 'Jun';
-$labels['jul'] = 'Jul';
-$labels['aug'] = 'Ags';
-$labels['sep'] = 'Sep';
-$labels['oct'] = 'Okt';
-$labels['nov'] = 'Nov';
-$labels['dec'] = 'Des';
-$labels['longjan'] = 'Januari';
-$labels['longfeb'] = 'Februari';
-$labels['longmar'] = 'Maret';
-$labels['longapr'] = 'April';
-$labels['longjun'] = 'Juni';
-$labels['longjul'] = 'Juli';
-$labels['longaug'] = 'Agustus';
-$labels['longsep'] = 'Spetember';
-$labels['longoct'] = 'Oktober';
-$labels['longnov'] = 'November';
-$labels['longdec'] = 'Desember';
+$labels['thursday']  = 'Kamis';
+$labels['friday']    = 'Jumat';
+$labels['saturday']  = 'Sabtu';
+
+// months short
+$labels['jan']	= 'Jan';
+$labels['feb']	= 'Feb';
+$labels['mar']	= 'Mar';
+$labels['apr']	= 'Apr';
+$labels['may']	= 'Mei';
+$labels['jun']	= 'Jun';
+$labels['jul'] 	= 'Jul';
+$labels['aug']	= 'Ags';
+$labels['sep']	= 'Sep';
+$labels['oct']	= 'Okt';
+$labels['nov']	= 'Nov';
+$labels['dec']	= 'Des';
+
+// months long
+$labels['longjan']	= 'Januari';
+$labels['longfeb']	= 'Februari';
+$labels['longmar']	= 'Maret';
+$labels['longapr']	= 'April';
+$labels['longmay']	= 'Mei';
+$labels['longjun']	= 'Juni';
+$labels['longjul']	= 'Juli';
+$labels['longaug']	= 'Agustus';
+$labels['longsep']	= 'Spetember';
+$labels['longoct']	= 'Oktober';
+$labels['longnov']	= 'November';
+$labels['longdec']	= 'Desember';
+
 $labels['today'] = 'Hari ini';
-$labels['refresh'] = 'Segarkan';
-$labels['checkmail'] = 'Periksa pesan baru';
-$labels['compose'] = 'Tulis sebuah pesan';
-$labels['writenewmessage'] = 'Buat pesan baru';
-$labels['reply'] = 'Balas';
-$labels['replytomessage'] = 'Balas pesan';
+
+// toolbar buttons
+$labels['refresh']          = 'Segarkan';
+$labels['checkmail']        = 'Periksa pesan baru';
+$labels['compose']          = 'Tulis sebuah pesan';
+$labels['writenewmessage']  = 'Buat pesan baru';
+$labels['reply']            = 'Balas';
+$labels['replytomessage']   = 'Balas ke pengirim';
 $labels['replytoallmessage'] = 'Balas ke pengirim dan yang lain';
-$labels['replyall'] = 'Balas ke semua';
-$labels['replylist'] = 'Balas ke milis';
-$labels['forward'] = 'Teruskan';
-$labels['forwardinline'] = 'Teruskan bersama surat';
+$labels['replyall']         = 'Balas ke semua';
+$labels['replylist']        = 'Balas ke milis';
+$labels['forward']          = 'Teruskan';
+$labels['forwardinline']    = 'Teruskan bersama surat';
 $labels['forwardattachment'] = 'Teruskan sebagai sisipan';
-$labels['forwardmessage'] = 'Teruskan pesan';
-$labels['deletemessage'] = 'Hapus pesan';
+$labels['forwardmessage']   = 'Teruskan pesan';
+$labels['deletemessage']    = 'Hapus pesan';
 $labels['movemessagetotrash'] = 'Pindahkan pesan ke tong sampah';
-$labels['printmessage'] = 'Cetak pesan ini';
-$labels['previousmessage'] = 'Perlihatkan pesan sebelumnya';
-$labels['firstmessage'] = 'Perlihatkan pesan pertama';
-$labels['nextmessage'] = 'Perlihatkan pesan berikutnya';
-$labels['lastmessage'] = 'Perlihatkan pesan terakhir';
-$labels['backtolist'] = 'Kembali ke daftar pesan';
-$labels['viewsource'] = 'Perlihatkan kode sumber';
-$labels['mark'] = 'Tandai';
-$labels['markmessages'] = 'Tandai Pesan';
-$labels['markread'] = 'Terbaca';
-$labels['markunread'] = 'Belum Terbaca';
-$labels['markflagged'] = 'Sudah ditandai';
-$labels['markunflagged'] = 'Belum ditandai';
-$labels['moreactions'] = 'Tindakan lain..';
-$labels['more'] = 'Selebihnya';
-$labels['back'] = 'Kembali';
-$labels['options'] = 'Pilihan';
+$labels['printmessage']     = 'Cetak pesan ini';
+$labels['previousmessage']  = 'Perlihatkan pesan sebelumnya';
+$labels['firstmessage']     = 'Perlihatkan pesan pertama';
+$labels['nextmessage']      = 'Perlihatkan pesan berikutnya';
+$labels['lastmessage']      = 'Perlihatkan pesan terakhir';
+$labels['backtolist']       = 'Kembali ke daftar pesan';
+$labels['viewsource']       = 'Perlihatkan kode sumber';
+$labels['mark']             = 'Tandai';
+$labels['markmessages']     = 'Tandai Pesan';
+$labels['markread']         = 'Terbaca';
+$labels['markunread']       = 'Belum Terbaca';
+$labels['markflagged']      = 'Sudah ditandai';
+$labels['markunflagged']    = 'Belum ditandai';
+$labels['moreactions']      = 'Tindakan lain..';
+$labels['more']             = 'Berikutnya';
+$labels['back']             = 'Kembali';
+$labels['options']          = 'Pilihan';
+
 $labels['select'] = 'Pilih';
 $labels['all'] = 'Semua';
 $labels['none'] = 'Tidak ada';
-$labels['nonesort'] = 'Tidak ada';
 $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';
 $labels['filter'] = 'Penyaringan';
 $labels['list'] = 'Daftar';
@@ -142,12 +173,14 @@ $labels['expand-all'] = 'Bentangkan Semua';
 $labels['expand-unread'] = 'Bentangkan yang Belum Terbaca';
 $labels['collapse-all'] = 'Lipat Semua';
 $labels['threaded'] = 'Teruntai';
+
 $labels['autoexpand_threads'] = 'Bentangkan pesan teruntai';
 $labels['do_expand'] = 'semua untaian';
 $labels['expand_only_unread'] = 'hanya pesan yang belum terbaca';
 $labels['fromto'] = 'Pengirim/Penerima';
 $labels['flag'] = 'Bendera';
 $labels['attachment'] = 'Lampiran';
+$labels['nonesort'] = 'Tidak ada';
 $labels['sentdate'] = 'Tanggal kirim';
 $labels['arrival'] = 'Tanggal masuk';
 $labels['asc'] = 'menaik';
@@ -156,175 +189,220 @@ $labels['listcolumns'] = 'Perlihatkan kolom';
 $labels['listsorting'] = 'Mengurutkan kolom';
 $labels['listorder'] = 'Mengurutkan susunan';
 $labels['listmode'] = 'Perlihatkan mode tinjauan';
-$labels['folderactions'] = 'Tindakan pada map';
+
+$labels['folderactions'] = 'Tindakan pada folder...';
 $labels['compact'] = 'Rampingkan';
 $labels['empty'] = 'Kosong';
-$labels['quota'] = 'Penggunaan kandar';
-$labels['unknown'] = 'Tidak dikenal';
-$labels['unlimited'] = 'Tidak terbatas';
-$labels['quicksearch'] = 'Pencarian cepat';
-$labels['resetsearch'] = 'Atur ulang pencarian';
-$labels['searchmod'] = 'Peubah pencarian';
-$labels['msgtext'] = 'Seluruh pesan';
+
+$labels['quota'] = 'Penggunaan ruang';
+$labels['unknown']  = 'Tidak dikenal';
+$labels['unlimited']  = 'Tidak terbatas';
+
+$labels['quicksearch']  = 'Pencarian cepat';
+$labels['resetsearch']  = 'Atur ulang pencarian';
+$labels['searchmod']  = 'Peubah pencarian';
+$labels['msgtext']  = 'Seluruh pesan';
+$labels['body']  = 'Badan';
+
 $labels['openinextwin'] = 'Buka dalam jendela baru';
 $labels['emlsave'] = 'Unduh (.eml)';
-$labels['editasnew'] = 'Sunting sebagai pesan baru';
-$labels['sendmessage'] = 'Kirim pesan sekarang';
-$labels['savemessage'] = 'Simpan konsep surat  ini';
-$labels['addattachment'] = 'Sisipkan sebuah berkas';
-$labels['charset'] = 'Set karakter';
-$labels['editortype'] = 'Tipe penyunting';
-$labels['returnreceipt'] = 'Tanda terima kembali';
-$labels['dsn'] = 'Pemberitahuan status terkirim';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
+
+// message compose
+$labels['editasnew']      = 'Sunting sebagai pesan baru';
+$labels['send']           = 'Kirim';
+$labels['sendmessage']    = 'Kirim pesan';
+$labels['savemessage']    = 'Simpan sebagai konsep';
+$labels['addattachment']  = 'Sisipkan sebuah berkas';
+$labels['charset']        = 'Set karakter';
+$labels['editortype']     = 'Tipe penyunting';
+$labels['returnreceipt']  = 'Tanda terima kembali';
+$labels['dsn']            = 'Pemberitahuan status terkirim';
 $labels['mailreplyintro'] = 'Pada $date, $sender menulis:';
-$labels['originalmessage'] = 'Pesan Sebenarnya';
-$labels['editidents'] = 'Ubah identitas';
-$labels['spellcheck'] = 'Ejaan';
+$labels['originalmessage'] = 'Pesan Asli';
+
+$labels['editidents']    = 'Ubah identitas';
+$labels['spellcheck']    = 'Ejaan';
 $labels['checkspelling'] = 'Pemeriksaan ejaan';
 $labels['resumeediting'] = 'Lanjutkan menyunting';
-$labels['revertto'] = 'Balikkan ke';
+$labels['revertto']      = 'Kembalikan ke';
+
 $labels['attach'] = 'Lampirkan';
 $labels['attachments'] = 'Sisipan';
 $labels['upload'] = 'Unggah';
 $labels['uploadprogress'] = '$percent ($current dari $total)';
-$labels['close'] = 'Tutup';
-$labels['messageoptions'] = 'Pilihan pesan...';
-$labels['low'] = 'Rendah';
-$labels['lowest'] = 'Paling Rendah';
-$labels['normal'] = 'Normal';
-$labels['high'] = 'Tinggi';
+$labels['close']  = 'Tutup';
+$labels['messageoptions']  = 'Pilihan pesan...';
+
+$labels['low']     = 'Rendah';
+$labels['lowest']  = 'Paling Rendah';
+$labels['normal']  = 'Normal';
+$labels['high']    = 'Tinggi';
 $labels['highest'] = 'Paling tinggi';
-$labels['nosubject'] = '(tanpa judul)';
+
+$labels['nosubject']  = '(tanpa judul)';
 $labels['showimages'] = 'Tampilkan gambar';
 $labels['alwaysshow'] = 'Selalu tampilkan gambar dari $sender';
-$labels['isdraft'] = 'Ini adalah konsep surat.';
+$labels['isdraft']    = 'Ini adalah konsep surat.';
+$labels['andnmore']   = '$nr lagi...';
+$labels['togglemoreheaders'] = 'Tampilkan kepala pesan lebih lanjut';
+$labels['togglefullheaders'] = 'Beralih kepala pesan penuh';
+
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Teks murni';
 $labels['savesentmessagein'] = 'Simpan pesan terkirim di';
 $labels['dontsave'] = 'Jangan disimpan';
 $labels['maxuploadsize'] = 'Ukuran file maksimal adalah $size';
+
 $labels['addcc'] = 'Tambah Cc';
 $labels['addbcc'] = 'Tambah Bcc';
 $labels['addreplyto'] = 'Tambah Balas Ke';
 $labels['addfollowupto'] = 'Tambahkan Tindak-Lanjut-Ke';
+
+// mdn
 $labels['mdnrequest'] = 'Pengirim pesan ini telah meminta untuk diberitahu ketika Anda membaca pesan ini. Apakah anda ingin memberitahu pengirim?';
 $labels['receiptread'] = 'Tanda Terima (baca)';
 $labels['yourmessage'] = 'Ini adalah Tanda Terima untuk pesan Anda';
 $labels['receiptnote'] = 'Catatan: Tanda Terima ini hanya mengesahkan bahwa pesan telah diperlihatkan pada komputer penerima. Tidak ada jaminan bahwa penerima telah membaca atau mengerti isi pesan.';
-$labels['name'] = 'Tampilkan nama';
-$labels['firstname'] = 'Nama depan';
-$labels['surname'] = 'Nama belakang';
-$labels['middlename'] = 'Nama tengah';
-$labels['nameprefix'] = 'awalan';
-$labels['namesuffix'] = 'sisipan';
-$labels['nickname'] = 'nama kecil';
-$labels['jobtitle'] = 'Jabatan';
-$labels['department'] = 'Departemen';
-$labels['gender'] = 'Jenis kelamin';
-$labels['maidenname'] = 'Nama asli';
-$labels['email'] = 'E-Mail';
-$labels['phone'] = 'Telepon';
-$labels['address'] = 'Alamat';
-$labels['street'] = 'Jalan';
-$labels['locality'] = 'Kota';
-$labels['zipcode'] = 'Kode pos';
-$labels['region'] = 'Kecamatan';
-$labels['country'] = 'Negara Bagian';
-$labels['birthday'] = 'Tanggal lahir';
-$labels['anniversary'] = 'Hari jadi';
-$labels['website'] = 'Laman web';
+
+// address boook
+$labels['name']         = 'Nama yang ditampilkan';
+$labels['firstname']    = 'Nama depan';
+$labels['surname']      = 'Nama belakang';
+$labels['middlename']   = 'Nama tengah';
+$labels['nameprefix']   = 'awalan';
+$labels['namesuffix']   = 'sisipan';
+$labels['nickname']     = 'nama panggilan';
+$labels['jobtitle']     = 'Jabatan';
+$labels['department']   = 'Departemen';
+$labels['gender']       = 'Jenis kelamin';
+$labels['maidenname']   = 'Nama asli';
+$labels['email']        = 'E-Mail';
+$labels['phone']        = 'Telepon';
+$labels['address']      = 'Alamat';
+$labels['street']       = 'Jalan';
+$labels['locality']     = 'Kota';
+$labels['zipcode']      = 'Kode pos';
+$labels['region']       = 'Provinsi';
+$labels['country']      = 'Negara';
+$labels['birthday']     = 'Tanggal lahir';
+$labels['anniversary']  = 'Hari jadi';
+$labels['website']      = 'Laman web';
 $labels['instantmessenger'] = 'IM';
 $labels['notes'] = 'Catatan';
-$labels['male'] = 'pria';
+$labels['male']   = 'pria';
 $labels['female'] = 'wanita';
 $labels['manager'] = 'Menejer';
 $labels['assistant'] = 'Asisten';
-$labels['typeassistant'] = 'Asisten';
 $labels['spouse'] = 'Suami/Istri';
 $labels['allfields'] = 'Semua isian';
 $labels['search'] = 'Cari';
 $labels['advsearch'] = 'Pencarian Lebih Lanjut';
 $labels['advanced'] = 'Tingkat lanjut';
 $labels['other'] = 'Lainnya';
-$labels['typeother'] = 'Lainnya';
-$labels['typehome'] = 'Rumah';
-$labels['typework'] = 'Kantor';
-$labels['typemobile'] = 'HP';
-$labels['typemain'] = 'Utama';
-$labels['typehomefax'] = 'Faks Rumah';
-$labels['typeworkfax'] = 'Faks Kantor';
-$labels['typecar'] = 'Mobil';
-$labels['typepager'] = 'Pejer';
-$labels['typevideo'] = 'Video';
-$labels['typehomepage'] = 'Laman Web';
+
+$labels['typehome']   = 'Rumah';
+$labels['typework']   = 'Kantor';
+$labels['typeother']  = 'Lainnya';
+$labels['typemobile']  = 'HP';
+$labels['typemain']  = 'Utama';
+$labels['typehomefax']  = 'Faks Rumah';
+$labels['typeworkfax']  = 'Faks Kantor';
+$labels['typecar']  = 'Mobil';
+$labels['typepager']  = 'Pejer';
+$labels['typevideo']  = 'Video';
+$labels['typeassistant']  = 'Asisten';
+$labels['typehomepage']  = 'Laman Web';
 $labels['typeblog'] = 'Blog';
 $labels['typeprofile'] = 'Profil';
+
 $labels['addfield'] = 'Tambah kolom isian';
 $labels['addcontact'] = 'Tambah kontak baru';
 $labels['editcontact'] = 'Ubah kontak';
 $labels['contacts'] = 'Daftar kontak';
 $labels['contactproperties'] = 'Properti kontak';
 $labels['personalinfo'] = 'Informasi pribadi';
-$labels['edit'] = 'Ubah';
+
+$labels['edit']   = 'Ubah';
 $labels['cancel'] = 'Batal';
-$labels['save'] = 'Simpan';
+$labels['save']   = 'Simpan';
 $labels['delete'] = 'Hapus';
 $labels['rename'] = 'Ganti nama';
 $labels['addphoto'] = 'Tambah';
 $labels['replacephoto'] = 'Ganti';
-$labels['uploadphoto'] = 'UNggah foto';
-$labels['newcontact'] = 'Buat kartu kontak baru';
-$labels['deletecontact'] = 'Hapus kontak terpilih';
-$labels['composeto'] = 'Tulis surat kepada';
-$labels['contactsfromto'] = 'Kontak $from sampai $to dari $count';
-$labels['print'] = 'Cetak';
-$labels['export'] = 'Ekspor';
-$labels['exportvcards'] = 'Ekspor kontak dalam format vCard';
+$labels['uploadphoto'] = 'Unggah foto';
+
+$labels['newcontact']     = 'Buat kartu kontak baru';
+$labels['deletecontact']  = 'Hapus kontak terpilih';
+$labels['composeto']      = 'Tulis surat kepada';
+$labels['contactsfromto'] = 'Kontak $from sampai $to dari total $count';
+$labels['print']          = 'Cetak';
+$labels['export']         = 'Ekspor';
+$labels['exportall']      = 'Ekspor semua';
+$labels['exportsel']      = 'Ekspor pilihan';
+$labels['exportvcards']   = 'Ekspor kontak dalam format vCard';
 $labels['newcontactgroup'] = 'Buat Grup baru';
-$labels['grouprename'] = 'Ganti nama grup';
-$labels['groupdelete'] = 'Hapus grup';
+$labels['grouprename']    = 'Ganti nama grup';
+$labels['groupdelete']    = 'Hapus grup';
 $labels['groupremoveselected'] = 'Hapus kontak terpilih dari grup';
-$labels['previouspage'] = 'Perlihatkan himpunan sebelumnya';
-$labels['firstpage'] = 'Perlihatkan himpunan pertama';
-$labels['nextpage'] = 'Perlihatkan himpunan selanjutnya';
-$labels['lastpage'] = 'Perlihatkan himpunan terakhir';
+
+$labels['previouspage']   = 'Perlihatkan himpunan sebelumnya';
+$labels['firstpage']      = 'Perlihatkan himpunan pertama';
+$labels['nextpage']       = 'Perlihatkan himpunan selanjutnya';
+$labels['lastpage']       = 'Perlihatkan himpunan terakhir';
+
 $labels['group'] = 'Kelompok';
 $labels['groups'] = 'Kelompok';
 $labels['personaladrbook'] = 'Alamat pribadi';
+
 $labels['searchsave'] = 'Simpan pencarian';
 $labels['searchdelete'] = 'Hapus pencarian';
+
 $labels['import'] = 'Impor';
 $labels['importcontacts'] = 'Impor kontak';
 $labels['importfromfile'] = 'Impor dari berkas:';
 $labels['importtarget'] = 'Tambahkan kontak baru ke buku alamat:';
 $labels['importreplace'] = 'Ganti seluruh buku alamat';
+$labels['importdesc'] = 'Anda dapat mengunggah kontak dari buku alamat yang telah ada.<br/>Saat ini kami mendukung import alamat dari format data <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> atau CSV (comma-separated).';
 $labels['done'] = 'Selesai';
+
+// settings
 $labels['settingsfor'] = 'Pengaturan untuk';
 $labels['about'] = 'Informasi program';
 $labels['preferences'] = 'Pilihan';
 $labels['userpreferences'] = 'Pilihan pengguna';
 $labels['editpreferences'] = 'Ubah pilihan pengguna';
+
 $labels['identities'] = 'Identitas';
 $labels['manageidentities'] = 'Atur identitas untuk akun ini';
 $labels['newidentity'] = 'Identitas baru';
+
 $labels['newitem'] = 'Item baru';
 $labels['edititem'] = 'Ubah item';
+
 $labels['preferhtml'] = 'Lebih suka HTML';
 $labels['defaultcharset'] = 'Default Character';
 $labels['htmlmessage'] = 'Pesan HTML';
+$labels['messagepart'] = 'Bagian';
+$labels['digitalsig'] = 'Tanda tangan digital';
 $labels['dateformat'] = 'Format tanggal';
 $labels['timeformat'] = 'Format waktu';
 $labels['prettydate'] = 'Tanggal Cantik';
-$labels['setdefault'] = 'Pengaturan Awal';
-$labels['autodetect'] = 'Otomatis';
-$labels['language'] = 'Bahasa';
-$labels['timezone'] = 'Daerah Waktu';
-$labels['pagesize'] = 'Baris per halaman';
+$labels['setdefault']  = 'Pengaturan Awal';
+$labels['autodetect']  = 'Otomatis';
+$labels['language']  = 'Bahasa';
+$labels['timezone']  = 'Daerah Waktu';
+$labels['pagesize']  = 'Baris per halaman';
 $labels['signature'] = 'Tanda tangan';
-$labels['dstactive'] = 'Waktu Musim Panas';
+$labels['dstactive']  = 'Waktu Musim Panas';
+$labels['showinextwin'] = 'Buka pesan di jendela baru';
+$labels['composeextwin'] = 'Buat pesan di jendela baru';
 $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';
@@ -347,20 +425,21 @@ $labels['showremoteimages'] = 'Tampilkan remote inline images';
 $labels['fromknownsenders'] = 'dari pengirim yang dikenal';
 $labels['always'] = 'selalu';
 $labels['showinlineimages'] = 'Tampilkan gambar terlampir dibawah pesan';
-$labels['autosavedraft'] = 'Otomatis menyimpan pesan tertunda';
-$labels['everynminutes'] = 'setiap $n menit';
-$labels['never'] = 'tidak pernah';
-$labels['immediately'] = 'secepatnya';
+$labels['autosavedraft']  = 'Otomatis menyimpan pesan tertunda';
+$labels['everynminutes']  = 'setiap $n menit';
+$labels['refreshinterval']  = 'Refresh (memeriksa pesan baru, dsb)';
+$labels['never']  = 'tidak pernah';
+$labels['immediately']  = 'secepatnya';
 $labels['messagesdisplaying'] = 'Penampilan Pesan';
 $labels['messagescomposition'] = 'Pengaturan Pesan';
 $labels['mimeparamfolding'] = 'Nama lampiran';
 $labels['2231folding'] = 'Full RFC 2231 (Thunderbird)';
 $labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
 $labels['2047folding'] = 'Full RFC 2047 (other)';
-$labels['force7bit'] = 'Gunakan MIME encoding untuk 8-bit karakter';
-$labels['advancedoptions'] = 'Pilihan canggih';
+$labels['force7bit'] = 'Gunakan MIME encoding untuk karakter 8-bit';
+$labels['advancedoptions'] = 'Pilihan lanjut';
 $labels['focusonnewmessage'] = 'Pusatkan jendela broswer saat ada pesan baru';
-$labels['checkallfolders'] = 'Periksa semua map untuk pesan baru';
+$labels['checkallfolders'] = 'Periksa semua folder untuk pesan baru';
 $labels['displaynext'] = 'Setelah menghapus/memindahkan, tampilkan pesan berikutnya';
 $labels['defaultfont'] = 'Huruf standar untuk pesan HTML';
 $labels['mainoptions'] = 'Pilihan Utama';
@@ -370,22 +449,20 @@ $labels['maintenance'] = 'Perbaikan';
 $labels['newmessage'] = 'Pesan baru';
 $labels['signatureoptions'] = 'Opsi tanda tangan';
 $labels['whenreplying'] = 'Ketika membalas';
+$labels['replyempty'] = 'jangan kutip pesan asli';
 $labels['replytopposting'] = 'Tulis pesan baru diatas pesan asli';
 $labels['replybottomposting'] = 'Tulis pesan baru dibawah pesan asli';
 $labels['replyremovesignature'] = 'ketika membalas pesan hapus tanda tangan dari pesan';
 $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';
+$labels['previewpanemarkread']  = 'Tandai pesan yang sudah dilihat';
+$labels['afternseconds']  = 'setelah $n detik';
 $labels['reqmdn'] = 'Selalu meminta tanda terima kembali';
 $labels['reqdsn'] = 'Selalu meminta pemberitahuan status terkirim';
 $labels['replysamefolder'] = 'Taruh balasan di folder yang sama dengan pesan yang dibalas';
-$labels['defaultaddressbook'] = 'Tambahkan kontak baru ke buku alamat terpilih';
+$labels['defaultabook'] = 'Buku alamat utama';
 $labels['autocompletesingle'] = 'Lewatkan alamat email alternatif pada pelengkapan otomatis';
 $labels['listnamedisplay'] = 'Daftar kontak sebagai';
 $labels['spellcheckbeforesend'] = 'Periksa ejaan sebelum mengirimkan pesan';
@@ -395,13 +472,18 @@ $labels['spellcheckignorenums'] = 'Abaikan kata-kata yang bernomor';
 $labels['spellcheckignorecaps'] = 'Abaikan kata-kata dengan huruf besar semua';
 $labels['addtodict'] = 'Tambahkan ke kamus';
 $labels['mailtoprotohandler'] = 'Daftarkan pengampu protokol untuk link mailto:';
-$labels['folder'] = 'Folder';
-$labels['foldername'] = 'Nama folder';
-$labels['subscribed'] = 'Subscribed';
+$labels['forwardmode'] = 'Meneruskan pesan';
+$labels['inline'] = 'dalam surat';
+$labels['asattachment'] = 'sebagai sisipan';
+
+$labels['folder']  = 'Folder';
+$labels['folders']  = 'Semua Folder';
+$labels['foldername']  = 'Nama folder';
+$labels['subscribed']  = 'Subscribed';
 $labels['messagecount'] = 'Pesan-pesan';
-$labels['create'] = 'Buat';
-$labels['createfolder'] = 'Buat folder baru';
-$labels['managefolders'] = 'Atur folder';
+$labels['create']  = 'Buat';
+$labels['createfolder']  = 'Buat folder baru';
+$labels['managefolders']  = 'Atur folder';
 $labels['specialfolders'] = 'Folder Khusus';
 $labels['properties'] = 'Atribut';
 $labels['folderproperties'] = 'Atribut folder';
@@ -411,22 +493,29 @@ $labels['info'] = 'Informasi';
 $labels['getfoldersize'] = 'Klik untuk mendapatkan ukuran folder';
 $labels['changesubscription'] = 'Klik untuk mengubah langganan';
 $labels['foldertype'] = 'Jenis folder';
-$labels['personalfolder'] = 'Folder pribadi';
-$labels['otherfolder'] = 'Folder lain';
-$labels['sharedfolder'] = 'Folder publik';
+$labels['personalfolder']  = 'Folder pribadi';
+$labels['otherfolder']  = 'Folder pengguna lain';
+$labels['sharedfolder']  = 'Folder publik';
+
 $labels['sortby'] = 'Urut berdasarkan';
-$labels['sortasc'] = 'Urut menaik';
+$labels['sortasc']  = 'Urut menaik';
 $labels['sortdesc'] = 'Urut menurun';
 $labels['undo'] = 'Batalkan';
+
+$labels['installedplugins'] = 'Plugin terpasang';
 $labels['plugin'] = 'Pengaya';
 $labels['version'] = 'Versi';
 $labels['source'] = 'Sumber';
 $labels['license'] = 'Lisensi';
 $labels['support'] = 'Dukungan';
+
+// units
 $labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
 $labels['GB'] = 'GB';
+
+// character sets
 $labels['unicode'] = 'Unicode';
 $labels['english'] = 'Inggris';
 $labels['westerneuropean'] = 'Eropa Barat';
@@ -446,3 +535,4 @@ $labels['japanese'] = 'Jepang';
 $labels['korean'] = 'Korea';
 $labels['chinese'] = 'Cina';
 
+?>
diff --git a/program/localization/id_ID/messages.inc b/program/localization/id_ID/messages.inc
index 7ed20754c..04d8242ad 100644
--- a/program/localization/id_ID/messages.inc
+++ b/program/localization/id_ID/messages.inc
@@ -2,89 +2,96 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/id_ID/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Putu Arya Sabda Wijaya <Unknown>                              |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['errortitle'] = 'Terjadi galat!';
-$messages['loginfailed'] = 'Gagal masuk';
-$messages['cookiesdisabled'] = 'Browser Anda tidak menerima cookies';
-$messages['sessionerror'] = 'Session Anda invalid atau kadaluwarsa';
-$messages['storageerror'] = 'Koneksi ke IMAP server gagal';
+$messages['errortitle']  = 'Terjadi error!';
+$messages['loginfailed']  = 'Login gagal.';
+$messages['cookiesdisabled'] = 'Browser Anda tidak menerima cookies.';
+$messages['sessionerror'] = 'Session Anda invalid atau kadaluwarsa.';
+$messages['storageerror'] = 'Koneksi ke server penyimpanan gagal';
 $messages['servererror'] = 'Server Error!';
 $messages['servererrormsg'] = 'Server Error: $msg';
 $messages['dberror'] = 'Basis data Error!';
-$messages['errorreadonly'] = 'Tidak bisa melakukan operasi. Folder hanya bisa dibaca';
-$messages['errornoperm'] = 'Tidak bisa melakukan operasi. Ijin ditolak';
+$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';
 $messages['loggedout'] = 'Anda berhasil mengakhiri session. Selamat Tinggal!';
-$messages['mailboxempty'] = 'Kotak masuk kosong';
+$messages['mailboxempty'] = 'Kotak masuk kosong.';
+$messages['refreshing'] = 'Menyegarkan...';
 $messages['loading'] = 'Memuat...';
 $messages['uploading'] = 'Menggungah berkas ...';
 $messages['uploadingmany'] = 'Mengunggah berkas-berkas...';
 $messages['loadingdata'] = 'Memuat data...';
 $messages['checkingmail'] = 'Memeriksa pesan baru...';
 $messages['sendingmessage'] = 'Mengirim pesan...';
-$messages['messagesent'] = 'Pesan terkirim';
+$messages['messagesent'] = 'Pesan berhasil dikirim.';
 $messages['savingmessage'] = 'Menyimpan pesan...';
 $messages['messagesaved'] = 'Menyimpan pesan ke daftar tunggu';
 $messages['successfullysaved'] = 'Berhasil disimpan';
 $messages['addedsuccessfully'] = 'Kontak berhasil ditambahkan ke buku alamat';
-$messages['contactexists'] = 'Kontak dengan alamat e-mail ini sudah ada';
-$messages['contactnameexists'] = 'Kontak dengan nama yang sama sudah ada';
+$messages['contactexists'] = 'Kontak dengan alamat e-mail ini sudah ada.';
+$messages['contactnameexists'] = 'Kontak dengan nama yang sama sudah ada.';
 $messages['blockedimages'] = 'Untuk melindungi privasi Anda, gambar-gambar diluar server diblok pada pesan ini.';
 $messages['encryptedmessage'] = 'Pesan ini terenkripsi dan tidak bisa ditampilkan. Maaf!';
 $messages['nocontactsfound'] = 'Kontak tidak ditemukan';
 $messages['contactnotfound'] = 'Kontak yang diminta tidak ditemukan';
 $messages['contactsearchonly'] = 'Masukkan jenis pencarian untuk mencari kontak';
-$messages['sendingfailed'] = 'Pengiriman pesan gagal';
-$messages['senttooquickly'] = 'Mohon tunggu $sec detik sebelum mengirim pesan ini';
-$messages['errorsavingsent'] = 'Error ketika menyimpan pesan terkirim';
-$messages['errorsaving'] = 'Error ketika menyimpan';
+$messages['sendingfailed'] = 'Gagal mengirim pesan.';
+$messages['senttooquickly'] = 'Mohon tunggu $sec detik sebelum mengirim pesan ini.';
+$messages['errorsavingsent'] = 'Error ketika menyimpan pesan terkirim.';
+$messages['errorsaving'] = 'Error ketika menyimpan.';
 $messages['errormoving'] = 'Pesan tidak bisa dipindahkan';
 $messages['errorcopying'] = 'Pesan tidak dapat disalin';
 $messages['errordeleting'] = 'Pesan tidak bisa dihapus';
 $messages['errormarking'] = 'Tidak dapat menandai pesan';
-$messages['deletecontactconfirm'] = 'Apakah anda yakin untuk menghapus kontak terpilih?';
-$messages['deletegroupconfirm'] = 'Yakinkah Anda ingin menhapus grup terpilih?';
+$messages['deletecontactconfirm']  = 'Apakah anda yakin untuk menghapus kontak terpilih?';
+$messages['deletegroupconfirm']  = 'Yakinkah Anda ingin menhapus grup terpilih?';
 $messages['deletemessagesconfirm'] = 'Yakin menghapus pesan terpilih?';
-$messages['deletefolderconfirm'] = 'Apakah anda benar-benar ingin menghapus map ini?';
-$messages['purgefolderconfirm'] = 'Yakin menghapus semua pesan pada map ini?';
+$messages['deletefolderconfirm']  = 'Apakah anda benar-benar ingin menghapus folder ini?';
+$messages['purgefolderconfirm']  = 'Yakin menghapus semua pesan pada folder ini?';
 $messages['contactdeleting'] = 'Menghapus kontak...';
 $messages['groupdeleting'] = 'Menghapus grup...';
 $messages['folderdeleting'] = 'Menghapus map...';
-$messages['foldermoving'] = 'Memindahkan map...';
+$messages['foldermoving'] = 'Memindahkan folder...';
 $messages['foldersubscribing'] = 'Melanggankan folder';
 $messages['folderunsubscribing'] = 'Berhenti melanggankan folder';
-$messages['formincomplete'] = 'Isian tidak terisi semua';
+$messages['formincomplete'] = 'Formulir tidak terisi semua';
 $messages['noemailwarning'] = 'Tolong masukkan alamat email yang valid';
-$messages['nonamewarning'] = 'Tolong masukkan nama';
+$messages['nonamewarning']  = 'Tolong masukkan nama';
 $messages['nopagesizewarning'] = 'Tolong masukkan ukuran halaman';
 $messages['nosenderwarning'] = 'Mohon memasukkan alamat e-mail pengirim';
 $messages['norecipientwarning'] = 'Tolong masukkan sedikitnya satu penerima';
-$messages['nosubjectwarning'] = '"Judul" kosong. Isi judul sekarang?';
+$messages['nosubjectwarning']  = '"Judul" kosong. Isi judul sekarang?';
 $messages['nobodywarning'] = 'Kirim pesan ini tanpa teks?';
 $messages['notsentwarning'] = 'Pesan belum terkirim. Buang pesan Anda?';
 $messages['noldapserver'] = 'Tolong pilih server LDAP untuk pencarian';
 $messages['nosearchname'] = 'Tolong masukkan nama kontak atau alamat email';
-$messages['notuploadedwarning'] = 'Proses upload belum selesai. Silahkan tunggu atau batalkan proses upload';
+$messages['notuploadedwarning'] = 'Proses upload belum selesai. Silahkan tunggu atau batalkan proses upload.';
 $messages['searchsuccessful'] = '$nr pesan ditemukan';
 $messages['contactsearchsuccessful'] = 'Ditemukan $nr  kontak';
 $messages['searchnomatch'] = 'Pencarian hasilnya nihil';
 $messages['searching'] = 'Mencari...';
 $messages['checking'] = 'Memeriksa...';
 $messages['nospellerrors'] = 'Tidak ditemukan kesalahan ejaan';
-$messages['folderdeleted'] = 'Map berhasil dihapus';
+$messages['folderdeleted'] = 'Folder berhasil dihapus';
 $messages['foldersubscribed'] = 'Folder berhasil dilanggankan';
 $messages['folderunsubscribed'] = 'Folder berhasil berhenti dilanggankan';
 $messages['folderpurged'] = 'Folder telah berhasil dikosongkan';
@@ -114,14 +121,15 @@ $messages['selectimportfile'] = 'Mohon pilih sebuah berkas untuk diunggah';
 $messages['addresswriterror'] = 'Buku alamat terpilih tidak dapat ditulisi';
 $messages['contactaddedtogroup'] = 'Berhasil menambahkan kontak kedalam grup ini';
 $messages['contactremovedfromgroup'] = 'Berhasil menghapus kontak dari grup ini';
+$messages['nogroupassignmentschanged'] = 'Tidak ada perubahan tugas grup.';
 $messages['importwait'] = 'Sedang mengimpor, harap menunggu...';
-$messages['importerror'] = 'Gagal mengimpor! Berkas terunggah bukan berkas vCard yang valid';
-$messages['importconfirm'] = '<b>Berhasil mengimpor $inserted kontak, $skipped entri dilewati</b>:<p><em>$names</em></p>';
+$messages['importformaterror'] = 'Proses import gagal. File yang di upload bukan file import yang valid.';
+$messages['importconfirm'] = '<b>Berhasil mengimpor $inserted kontak</b>';
 $messages['importconfirmskipped'] = '<b>$skipped entri yang sudah ada dilewatkan</b>';
 $messages['opnotpermitted'] = 'Operasi tidak diperbolehkan!';
 $messages['nofromaddress'] = 'kekurangan alamat e-mail pada identitas terpilih';
 $messages['editorwarning'] = 'Beralih pada editor teks murni akan mengakibatkan semua pemformatan teks hilang. Lanjutkan?';
-$messages['httpreceivedencrypterror'] = 'Terjadi sebuah kesalahan pengaturan. Segera hubungi administrator Anda. <b> Pesan Anda tidak bisa terkirim.</b>';
+$messages['httpreceivedencrypterror'] = 'Terjadi sebuah kesalahan pengaturan fatal. Segera hubungi administrator Anda. <b> Pesan Anda tidak bisa terkirim.</b>';
 $messages['smtpconnerror'] = 'SMTP Error ($code): Koneksi ke server gagal';
 $messages['smtpautherror'] = 'SMTP Error ($code): Otentifikasi gagal';
 $messages['smtpfromerror'] = 'SMTP Error ($code): Gagal mengatur pengirim "$from" ($msg)';
@@ -137,8 +145,8 @@ $messages['contactdeleted'] = 'Kontak berhasil dihapus';
 $messages['contactrestoreerror'] = 'Tidak bisa mengembalikan kontak yang terhapus.';
 $messages['contactrestored'] = 'Kontak berhasil dikembalikan.';
 $messages['groupdeleted'] = 'Grup berhasil dihapus';
-$messages['grouprenamed'] = 'Grup berhasil dinamai kembali';
-$messages['groupcreated'] = 'Grub berhasil dibuat';
+$messages['grouprenamed'] = 'Nama grup berhasil dirubah.';
+$messages['groupcreated'] = 'Grup berhasil dibuat';
 $messages['savedsearchdeleted'] = 'Pencarian tersimpan berhasil dihapus.';
 $messages['savedsearchdeleteerror'] = 'Tidak bisa menghapus pencarian tersimpan.';
 $messages['savedsearchcreated'] = 'Pencarian tersimpan berhasil dibuat.';
@@ -147,7 +155,7 @@ $messages['messagedeleted'] = 'Pesan berhasil dihapus';
 $messages['messagemoved'] = 'Pesan berhasil dipindahkan';
 $messages['messagecopied'] = 'Pesan berhasil disalin';
 $messages['messagemarked'] = 'Pesan berhasil ditandai';
-$messages['autocompletechars'] = 'Masukkan setidaknya $min karakter untuk swaparipurna';
+$messages['autocompletechars'] = 'Masukkan setidaknya $min karakter untuk pelengkapan otomatis.';
 $messages['autocompletemore'] = 'Ada banyak entri yang ditemukan. Tolong ketikkan lebih banyak karakter.';
 $messages['namecannotbeempty'] = 'Nama tidak boleh kosong';
 $messages['nametoolong'] = 'Nama terlalu panjang';
@@ -157,4 +165,7 @@ $messages['invalidimageformat'] = 'Bukan format gambar yang valid';
 $messages['mispellingsfound'] = 'Terdapat kesalahan ejaan pada pesan.';
 $messages['parentnotwritable'] = 'Tidak bisa membuat/memindahkan map ke map induk. Tidak memiliki hak akses.';
 $messages['messagetoobig'] = 'Pesan terlalu besar untuk diproses.';
+$messages['attachmentvalidationerror'] = 'PERINGATAN! Lampiran ini mencurigakan karena jenisnya tidak cocok dengan jenis yang dinyatakan di dalam pesan. Jika Anda tidak mempercayai pengirim, Anda tidak perlu membukanya di browser karena mungkin berisi konten berbahaya.<br/><br/><em>Expected: $expected; found: $detected</em>';
+$messages['noscriptwarning'] = 'Peringatan: Layanan ini membutuhkan Javascript! Untuk menggunakannya silahkan aktifkan Javascript di pengaturan browser Anda.';
 
+?>
diff --git a/program/localization/is_IS/labels.inc b/program/localization/is_IS/labels.inc
index d768050fe..80443dd3a 100644
--- a/program/localization/is_IS/labels.inc
+++ b/program/localization/is_IS/labels.inc
@@ -2,57 +2,78 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/is_IS/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = 'Velkomin í $product';
-$labels['username'] = 'Netfang';
-$labels['password'] = 'Lykilorð';
-$labels['server'] = 'Póstþjónn';
-$labels['login'] = 'Innskrá';
-$labels['logout'] = 'Útskrá';
-$labels['mail'] = 'Tölvupóstur';
+
+// login page
+$labels['welcome']   = 'Velkomin í $product';
+$labels['username']  = 'Netfang';
+$labels['password']  = 'Lykilorð';
+$labels['server']    = 'Póstþjónn';
+$labels['login']     = 'Innskrá';
+
+// taskbar
+$labels['logout']   = 'Útskrá';
+$labels['mail']     = 'Tölvupóstur';
 $labels['settings'] = 'Stillingar';
 $labels['addressbook'] = 'Nafnaskrá';
-$labels['inbox'] = 'Innhólf';
+
+// mailbox names
+$labels['inbox']  = 'Innhólf';
 $labels['drafts'] = 'Drög';
-$labels['sent'] = 'Sent';
-$labels['trash'] = 'Rusl';
-$labels['junk'] = 'Ruslpóstur';
+$labels['sent']   = 'Sent';
+$labels['trash']  = 'Rusl';
+$labels['junk']   = 'Ruslpóstur';
+
+// message listing
 $labels['subject'] = 'Titill';
-$labels['from'] = 'Frá';
-$labels['to'] = 'Til';
-$labels['cc'] = 'Afrit';
-$labels['bcc'] = 'Blint afrit';
+$labels['from']    = 'Frá';
+$labels['sender']  = 'Sender';
+$labels['to']      = 'Til';
+$labels['cc']      = 'Afrit';
+$labels['bcc']     = 'Blint afrit';
 $labels['replyto'] = 'Svar til';
 $labels['followupto'] = 'Svar við';
-$labels['date'] = 'Dagsetning';
-$labels['size'] = 'Stærð';
+$labels['date']    = 'Dagsetning';
+$labels['size']    = 'Stærð';
 $labels['priority'] = 'Forgangur';
 $labels['organization'] = 'Stofnun';
 $labels['readstatus'] = 'Lesmerking';
+$labels['listoptions'] = 'List options...';
+
 $labels['mailboxlist'] = 'Möppur';
-$labels['folders'] = 'Möppur';
 $labels['messagesfromto'] = 'Skeyti $from til $to af $count';
 $labels['threadsfromto'] = 'Þræðir $from til $to af $count';
 $labels['messagenrof'] = 'Skeyti $nr af $count';
 $labels['fromtoshort'] = '$from - $to af $count';
-$labels['copy'] = 'Afrit';
-$labels['move'] = 'Færa';
-$labels['moveto'] = 'Færa í...';
+
+$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';
+
 $labels['filename'] = 'Skráarheiti';
 $labels['filesize'] = 'Skráarstærð';
+
 $labels['addtoaddressbook'] = 'Bæta í nafnaskrá';
+
+// weekdays short
 $labels['sun'] = 'sunn.';
 $labels['mon'] = 'mán.';
 $labels['tue'] = 'þrið.';
@@ -60,79 +81,90 @@ $labels['wed'] = 'miðv.';
 $labels['thu'] = 'fimm.';
 $labels['fri'] = 'föst.';
 $labels['sat'] = 'laug.';
-$labels['sunday'] = 'sunnudagur';
-$labels['monday'] = 'mánudagur';
-$labels['tuesday'] = 'þriðjudagur';
+
+// weekdays long
+$labels['sunday']    = 'sunnudagur';
+$labels['monday']    = 'mánudagur';
+$labels['tuesday']   = 'þriðjudagur';
 $labels['wednesday'] = 'miðvikudagur';
-$labels['thursday'] = 'fimmtudagur';
-$labels['friday'] = 'föstudagur';
-$labels['saturday'] = 'laugardagur';
-$labels['jan'] = 'jan';
-$labels['feb'] = 'feb';
-$labels['mar'] = 'mar';
-$labels['apr'] = 'apr';
-$labels['may'] = 'maí';
-$labels['longmay'] = 'maí';
-$labels['jun'] = 'jún';
-$labels['jul'] = 'júl';
-$labels['aug'] = 'ágú';
-$labels['sep'] = 'sep';
-$labels['oct'] = 'okt';
-$labels['nov'] = 'nóv';
-$labels['dec'] = 'des';
-$labels['longjan'] = 'janúar';
-$labels['longfeb'] = 'febrúar';
-$labels['longmar'] = 'mars';
-$labels['longapr'] = 'apríl';
-$labels['longjun'] = 'júní';
-$labels['longjul'] = 'júlí';
-$labels['longaug'] = 'ágúst';
-$labels['longsep'] = 'september';
-$labels['longoct'] = 'október';
-$labels['longnov'] = 'nóvember';
-$labels['longdec'] = 'desember';
+$labels['thursday']  = 'fimmtudagur';
+$labels['friday']    = 'föstudagur';
+$labels['saturday']  = 'laugardagur';
+
+// months short
+$labels['jan']	= 'jan';
+$labels['feb']	= 'feb';
+$labels['mar']	= 'mar';
+$labels['apr']	= 'apr';
+$labels['may']	= 'maí';
+$labels['jun']	= 'jún';
+$labels['jul'] 	= 'júl';
+$labels['aug']	= 'ágú';
+$labels['sep']	= 'sep';
+$labels['oct']	= 'okt';
+$labels['nov']	= 'nóv';
+$labels['dec']	= 'des';
+
+// months long
+$labels['longjan']	= 'janúar';
+$labels['longfeb']	= 'febrúar';
+$labels['longmar']	= 'mars';
+$labels['longapr']	= 'apríl';
+$labels['longmay']	= 'maí';
+$labels['longjun']	= 'júní';
+$labels['longjul']	= 'júlí';
+$labels['longaug']	= 'ágúst';
+$labels['longsep']	= 'september';
+$labels['longoct']	= 'október';
+$labels['longnov']	= 'nóvember';
+$labels['longdec']	= 'desember';
+
 $labels['today'] = 'Í dag';
-$labels['refresh'] = 'Endurhlaða';
-$labels['checkmail'] = 'Gá að nýjum skeytum';
-$labels['compose'] = 'Semja skeyti';
-$labels['writenewmessage'] = 'Búa til nýtt skeyti';
-$labels['reply'] = 'Svara';
-$labels['replytomessage'] = 'Svara skeyti';
+
+// toolbar buttons
+$labels['refresh']          = 'Endurhlaða';
+$labels['checkmail']        = 'Gá að nýjum skeytum';
+$labels['compose']          = 'Semja skeyti';
+$labels['writenewmessage']  = 'Búa til nýtt skeyti';
+$labels['reply']            = 'Svara';
+$labels['replytomessage']   = 'Svara skeyti';
 $labels['replytoallmessage'] = 'Svar til lista eða sendanda og allra viðtakenda';
-$labels['replyall'] = 'Svara öllum';
-$labels['replylist'] = 'Svar til lista';
-$labels['forward'] = 'Áframsenda';
-$labels['forwardinline'] = 'Áframsenda innan skeytis';
+$labels['replyall']         = 'Svara öllum';
+$labels['replylist']        = 'Svar til lista';
+$labels['forward']          = 'Áframsenda';
+$labels['forwardinline']    = 'Áframsenda innan skeytis';
 $labels['forwardattachment'] = 'Áframsenda sem viðhengi';
-$labels['forwardmessage'] = 'Áframsenda skeyti';
-$labels['deletemessage'] = 'Eyða skeyti';
+$labels['forwardmessage']   = 'Áframsenda skeyti';
+$labels['deletemessage']    = 'Eyða skeyti';
 $labels['movemessagetotrash'] = 'Færa skeyti í ruslið';
-$labels['printmessage'] = 'Prenta skeyti';
-$labels['previousmessage'] = 'Sýna fyrra skeyti';
-$labels['firstmessage'] = 'Sýna fyrsta skeyti';
-$labels['nextmessage'] = 'Sýna næsta skeyti';
-$labels['lastmessage'] = 'Sýna síðasta skeyti';
-$labels['backtolist'] = 'Til baka í skeytalista';
-$labels['viewsource'] = 'Skoða kóða';
-$labels['mark'] = 'Merki';
-$labels['markmessages'] = 'Merkja skeyti';
-$labels['markread'] = 'Sem lesin';
-$labels['markunread'] = 'Sem ólesin';
-$labels['markflagged'] = 'Sem flögguð';
-$labels['markunflagged'] = 'Sem óflögguð';
-$labels['moreactions'] = 'Fleiri aðgerðir...';
-$labels['more'] = 'Meira';
-$labels['back'] = 'Til baka';
-$labels['options'] = 'Valkostir';
+$labels['printmessage']     = 'Prenta skeyti';
+$labels['previousmessage']  = 'Sýna fyrra skeyti';
+$labels['firstmessage']     = 'Sýna fyrsta skeyti';
+$labels['nextmessage']      = 'Sýna næsta skeyti';
+$labels['lastmessage']      = 'Sýna síðasta skeyti';
+$labels['backtolist']       = 'Til baka í skeytalista';
+$labels['viewsource']       = 'Skoða kóða';
+$labels['mark']             = 'Merki';
+$labels['markmessages']     = 'Merkja skeyti';
+$labels['markread']         = 'Sem lesin';
+$labels['markunread']       = 'Sem ólesin';
+$labels['markflagged']      = 'Sem flögguð';
+$labels['markunflagged']    = 'Sem óflögguð';
+$labels['moreactions']      = 'Fleiri aðgerðir...';
+$labels['more']             = 'Meira';
+$labels['back']             = 'Til baka';
+$labels['options']          = 'Valkostir';
+
 $labels['select'] = 'Velja';
 $labels['all'] = 'Allt';
 $labels['none'] = 'Ekkert';
-$labels['nonesort'] = 'Ekkert';
 $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';
 $labels['filter'] = 'Sía';
 $labels['list'] = 'Listi';
@@ -141,12 +173,14 @@ $labels['expand-all'] = 'Þenja allt út';
 $labels['expand-unread'] = 'Þenja ólesið';
 $labels['collapse-all'] = 'Fella allt saman';
 $labels['threaded'] = 'Þrætt';
+
 $labels['autoexpand_threads'] = 'Þenja skeytaþræði út';
 $labels['do_expand'] = 'allir þræðir';
 $labels['expand_only_unread'] = 'aðeins ólesin skeyti';
 $labels['fromto'] = 'Frá/Til';
 $labels['flag'] = 'Flagg';
 $labels['attachment'] = 'Viðhengi';
+$labels['nonesort'] = 'Ekkert';
 $labels['sentdate'] = 'Sendingardagur';
 $labels['arrival'] = 'Komudagur';
 $labels['asc'] = 'hækkandi';
@@ -155,173 +189,220 @@ $labels['listcolumns'] = 'Listadálkar';
 $labels['listsorting'] = 'Röðunardálkur';
 $labels['listorder'] = 'Röðun';
 $labels['listmode'] = 'Listayfirlit';
+
 $labels['folderactions'] = 'Möppuaðgerðir...';
 $labels['compact'] = 'Pakka';
 $labels['empty'] = 'Tæma';
+
 $labels['quota'] = 'Gagnamagn';
-$labels['unknown'] = 'óþekkt';
-$labels['unlimited'] = 'ótakmarkað';
-$labels['quicksearch'] = 'Flýtileit';
-$labels['resetsearch'] = 'Tæma leit';
-$labels['searchmod'] = 'Leitarskilyrði';
-$labels['msgtext'] = 'Allt skeytið';
+$labels['unknown']  = 'óþekkt';
+$labels['unlimited']  = 'ótakmarkað';
+
+$labels['quicksearch']  = 'Flýtileit';
+$labels['resetsearch']  = 'Tæma leit';
+$labels['searchmod']  = 'Leitarskilyrði';
+$labels['msgtext']  = 'Allt skeytið';
+$labels['body']  = 'Body';
+
 $labels['openinextwin'] = 'Opna í nýjum glugga';
 $labels['emlsave'] = 'Niðurhlaða (.eml)';
-$labels['editasnew'] = 'Breyta sem nýju';
-$labels['sendmessage'] = 'Senda skeytið núna';
-$labels['savemessage'] = 'Vista drög';
-$labels['addattachment'] = 'Hengja við';
-$labels['charset'] = 'Stafasett';
-$labels['editortype'] = 'Gerð ritils';
-$labels['returnreceipt'] = 'Kvittun við lestur';
-$labels['dsn'] = 'Afhendingarstaða';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
+
+// message compose
+$labels['editasnew']      = 'Breyta sem nýju';
+$labels['send']           = 'Send';
+$labels['sendmessage']    = 'Senda skeytið núna';
+$labels['savemessage']    = 'Vista drög';
+$labels['addattachment']  = 'Hengja við';
+$labels['charset']        = 'Stafasett';
+$labels['editortype']     = 'Gerð ritils';
+$labels['returnreceipt']  = 'Kvittun við lestur';
+$labels['dsn']            = 'Afhendingarstaða';
 $labels['mailreplyintro'] = 'Þann $date, $sender reit:';
 $labels['originalmessage'] = 'Upprunalegt skeyti';
-$labels['editidents'] = 'Breyta sjálfum';
-$labels['spellcheck'] = 'Stafsetning';
+
+$labels['editidents']    = 'Breyta sjálfum';
+$labels['spellcheck']    = 'Stafsetning';
 $labels['checkspelling'] = 'Athuga stafsetningu';
 $labels['resumeediting'] = 'Aftur í ritham';
-$labels['revertto'] = 'Hverfa til';
+$labels['revertto']      = 'Hverfa til';
+
 $labels['attach'] = 'Viðhengi';
 $labels['attachments'] = 'Viðhengi';
 $labels['upload'] = 'Hlaða upp';
 $labels['uploadprogress'] = '$percent ($current af $total)';
-$labels['close'] = 'Loka';
-$labels['messageoptions'] = 'Skeytisvalmöguleikar...';
-$labels['low'] = 'Lágt';
-$labels['lowest'] = 'Lægst';
-$labels['normal'] = 'Venjulegt';
-$labels['high'] = 'Hátt';
+$labels['close']  = 'Loka';
+$labels['messageoptions']  = 'Skeytisvalmöguleikar...';
+
+$labels['low']     = 'Lágt';
+$labels['lowest']  = 'Lægst';
+$labels['normal']  = 'Venjulegt';
+$labels['high']    = 'Hátt';
 $labels['highest'] = 'Hæst';
-$labels['nosubject'] = '(án titils)';
+
+$labels['nosubject']  = '(án titils)';
 $labels['showimages'] = 'Sýna myndir';
 $labels['alwaysshow'] = 'Sýna alltaf myndir frá $sender';
-$labels['isdraft'] = 'Þetta eru drög að skeyti';
+$labels['isdraft']    = 'Þetta eru drög að skeyti';
+$labels['andnmore']   = '$nr more...';
+$labels['togglemoreheaders'] = 'Show more message headers';
+$labels['togglefullheaders'] = 'Toggle raw message headers';
+
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Venjulegur texti';
 $labels['savesentmessagein'] = 'Vista send skeyti í';
 $labels['dontsave'] = 'ekki vista';
 $labels['maxuploadsize'] = 'Leyfileg hámarksstærð skjals er $size';
+
 $labels['addcc'] = 'Bæta við Cc';
 $labels['addbcc'] = 'Bæta við Bcc';
 $labels['addreplyto'] = 'Bæta við Reply-To';
 $labels['addfollowupto'] = 'Nýtt svar við';
+
+// mdn
 $labels['mdnrequest'] = 'Sendandi þessa skeytið hefur óskað þess að þú látir vita að þú hafir lesið þetta skeyti. Viltu láta hann vita?';
 $labels['receiptread'] = 'Kvittun (lesa)';
 $labels['yourmessage'] = 'Þetta er kvittun fyrir skeytið';
 $labels['receiptnote'] = 'ATH: Þessi kvittun segir aðeins til um að skeytið kom upp á skjánum á viðtakanda. Það er engin sönnun um að hann hafi lesið eða skilið innihaldið.';
-$labels['name'] = 'Skjánafn';
-$labels['firstname'] = 'Eiginnafn';
-$labels['surname'] = 'Eftirnafn';
-$labels['middlename'] = 'Millinafn';
-$labels['nameprefix'] = 'Forskeyti';
-$labels['namesuffix'] = 'Viðskeyti';
-$labels['nickname'] = 'Stuttnefni';
-$labels['jobtitle'] = 'Starfstitill';
-$labels['department'] = 'Deild';
-$labels['gender'] = 'Kyn';
-$labels['maidenname'] = 'Ættarnafn móður';
-$labels['email'] = 'Netfang';
-$labels['phone'] = 'Sími';
-$labels['address'] = 'Heimilisfang';
-$labels['street'] = 'Götuheiti';
-$labels['locality'] = 'Staður';
-$labels['zipcode'] = 'Póstnúmer';
-$labels['region'] = 'Ríki/Fylki';
-$labels['country'] = 'Land';
-$labels['birthday'] = 'Afmælisdagur';
-$labels['anniversary'] = 'Afmæli';
-$labels['website'] = 'Vefur';
+
+// address boook
+$labels['name']         = 'Skjánafn';
+$labels['firstname']    = 'Eiginnafn';
+$labels['surname']      = 'Eftirnafn';
+$labels['middlename']   = 'Millinafn';
+$labels['nameprefix']   = 'Forskeyti';
+$labels['namesuffix']   = 'Viðskeyti';
+$labels['nickname']     = 'Stuttnefni';
+$labels['jobtitle']     = 'Starfstitill';
+$labels['department']   = 'Deild';
+$labels['gender']       = 'Kyn';
+$labels['maidenname']   = 'Ættarnafn móður';
+$labels['email']        = 'Netfang';
+$labels['phone']        = 'Sími';
+$labels['address']      = 'Heimilisfang';
+$labels['street']       = 'Götuheiti';
+$labels['locality']     = 'Staður';
+$labels['zipcode']      = 'Póstnúmer';
+$labels['region']       = 'Ríki/Fylki';
+$labels['country']      = 'Land';
+$labels['birthday']     = 'Afmælisdagur';
+$labels['anniversary']  = 'Afmæli';
+$labels['website']      = 'Vefur';
 $labels['instantmessenger'] = 'Spjall';
 $labels['notes'] = 'Glósur';
-$labels['male'] = 'karlkyns';
+$labels['male']   = 'karlkyns';
 $labels['female'] = 'kvenkyns';
 $labels['manager'] = 'Stjórnandi';
 $labels['assistant'] = 'Aðstoðarmaður';
-$labels['typeassistant'] = 'Aðstoðarmaður';
 $labels['spouse'] = 'Maki';
 $labels['allfields'] = 'Öll svæði';
 $labels['search'] = 'Leit';
 $labels['advsearch'] = 'Ítarleg leit';
 $labels['advanced'] = 'Flóknari stillingar';
 $labels['other'] = 'Annað';
-$labels['typeother'] = 'Annað';
-$labels['typehome'] = 'Heimamappa';
-$labels['typework'] = 'Vinnusími';
-$labels['typemobile'] = 'Farsími';
-$labels['typemain'] = 'Aðalstillingar';
-$labels['typehomefax'] = 'Heimafax';
-$labels['typeworkfax'] = 'Vinnufax';
-$labels['typecar'] = 'Bíll';
-$labels['typepager'] = 'Friðþjófur';
-$labels['typevideo'] = 'Myndband';
-$labels['typehomepage'] = 'Vefur';
+
+$labels['typehome']   = 'Heimamappa';
+$labels['typework']   = 'Vinnusími';
+$labels['typeother']  = 'Annað';
+$labels['typemobile']  = 'Farsími';
+$labels['typemain']  = 'Aðalstillingar';
+$labels['typehomefax']  = 'Heimafax';
+$labels['typeworkfax']  = 'Vinnufax';
+$labels['typecar']  = 'Bíll';
+$labels['typepager']  = 'Friðþjófur';
+$labels['typevideo']  = 'Myndband';
+$labels['typeassistant']  = 'Aðstoðarmaður';
+$labels['typehomepage']  = 'Vefur';
 $labels['typeblog'] = 'Blogg';
 $labels['typeprofile'] = 'Mannlýsing';
+
 $labels['addfield'] = 'Bæta við svæði...';
 $labels['addcontact'] = 'Nýr tengiliður';
 $labels['editcontact'] = 'Lagfæra';
 $labels['contacts'] = 'Tengiliðir';
 $labels['contactproperties'] = 'Eiginleikar';
 $labels['personalinfo'] = 'Persónulegar upplýsingar';
-$labels['edit'] = 'Breyta';
+
+$labels['edit']   = 'Breyta';
 $labels['cancel'] = 'Hætta við';
-$labels['save'] = 'Vista';
+$labels['save']   = 'Vista';
 $labels['delete'] = 'Eyða';
 $labels['rename'] = 'Endurnefna';
 $labels['addphoto'] = 'Bæta við';
 $labels['replacephoto'] = 'Skipta út';
-$labels['newcontact'] = 'Búa til nýtt nafnspjald';
-$labels['deletecontact'] = 'Eyða völdum tengiliðum';
-$labels['composeto'] = 'Skrifa skeyti til';
+$labels['uploadphoto'] = 'Upload photo';
+
+$labels['newcontact']     = 'Búa til nýtt nafnspjald';
+$labels['deletecontact']  = 'Eyða völdum tengiliðum';
+$labels['composeto']      = 'Skrifa skeyti til';
 $labels['contactsfromto'] = 'Netföng $from til $to af $count';
-$labels['print'] = 'Prenta';
-$labels['export'] = 'Flytja út';
-$labels['exportvcards'] = 'Flytja út nafnspjöld á vCard formi';
+$labels['print']          = 'Prenta';
+$labels['export']         = 'Flytja út';
+$labels['exportall']      = 'Export all';
+$labels['exportsel']      = 'Export selected';
+$labels['exportvcards']   = 'Flytja út nafnspjöld á vCard formi';
 $labels['newcontactgroup'] = 'Nýr tengiliðahópur';
-$labels['grouprename'] = 'Breyta nafni hóps';
-$labels['groupdelete'] = 'Fjarlægja hóp';
-$labels['previouspage'] = 'Sýna fyrri síðu';
-$labels['firstpage'] = 'Sýna fyrstu síðu';
-$labels['nextpage'] = 'Sýna næstu síðu';
-$labels['lastpage'] = 'Sýna síðustu síðu';
+$labels['grouprename']    = 'Breyta nafni hóps';
+$labels['groupdelete']    = 'Fjarlægja hóp';
+$labels['groupremoveselected'] = 'Remove selected contacts from group';
+
+$labels['previouspage']   = 'Sýna fyrri síðu';
+$labels['firstpage']      = 'Sýna fyrstu síðu';
+$labels['nextpage']       = 'Sýna næstu síðu';
+$labels['lastpage']       = 'Sýna síðustu síðu';
+
 $labels['group'] = 'Hópur';
 $labels['groups'] = 'Hópar';
 $labels['personaladrbook'] = 'Persónuleg heimilisföng';
+
 $labels['searchsave'] = 'Vista leit';
 $labels['searchdelete'] = 'Eyða leit';
+
 $labels['import'] = 'Flytja inn';
 $labels['importcontacts'] = 'Flytja inn nafnspjöld';
 $labels['importfromfile'] = 'Flytja inn af skrá';
 $labels['importtarget'] = 'Bæta nýjum tengiliðum við:';
 $labels['importreplace'] = 'Skipta út allri netfangaskránni';
+$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['done'] = 'Búið';
+
+// settings
 $labels['settingsfor'] = 'Stillingar fyrir';
 $labels['about'] = 'Um forritið';
 $labels['preferences'] = 'Stillingar';
 $labels['userpreferences'] = 'Notendastillingar';
 $labels['editpreferences'] = 'Breyta notendastillingum';
+
 $labels['identities'] = 'Auðkenni';
 $labels['manageidentities'] = 'Stjórna auðkennum þessa reiknings';
 $labels['newidentity'] = 'Nýtt auðkenni';
+
 $labels['newitem'] = 'Nýtt';
 $labels['edititem'] = 'Breyta';
+
 $labels['preferhtml'] = 'Vil HTML';
 $labels['defaultcharset'] = 'Venjulegt stafasett';
 $labels['htmlmessage'] = 'HTML skeyti';
+$labels['messagepart'] = 'Part';
+$labels['digitalsig'] = 'Digital Signature';
 $labels['dateformat'] = 'Snið dagsetningar';
 $labels['timeformat'] = 'Tímasnið';
 $labels['prettydate'] = 'Fallegar dagsetningar';
-$labels['setdefault'] = 'Gera sjálfgilt';
-$labels['autodetect'] = 'Sjálfvirkt';
-$labels['language'] = 'Tungumál';
-$labels['timezone'] = 'Tímabelti';
-$labels['pagesize'] = 'Línur á síðu';
+$labels['setdefault']  = 'Gera sjálfgilt';
+$labels['autodetect']  = 'Sjálfvirkt';
+$labels['language']  = 'Tungumál';
+$labels['timezone']  = 'Tímabelti';
+$labels['pagesize']  = 'Línur á síðu';
 $labels['signature'] = 'Undirskrift';
-$labels['dstactive'] = 'Sumar-/vetratími';
+$labels['dstactive']  = 'Sumar-/vetratími';
+$labels['showinextwin'] = 'Open message in a new window';
+$labels['composeextwin'] = 'Compose in a new window';
 $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';
@@ -339,14 +420,16 @@ $labels['readwhendeleted'] = 'Merkja skeyti sem lesið þegar því er hent';
 $labels['flagfordeletion'] = 'Merkja skeyti til eyðingar í stað þess að eyða';
 $labels['skipdeleted'] = 'Ekki sýna eydd skeyti';
 $labels['deletealways'] = 'Ef ekki er hægt að setja skeytið í ruslafötuna, henda þeim';
+$labels['deletejunk'] = 'Directly delete messages in Junk';
 $labels['showremoteimages'] = 'Sýna myndir annarsstaðar frá';
 $labels['fromknownsenders'] = 'frá þekktum sendendum';
 $labels['always'] = 'alltaf';
 $labels['showinlineimages'] = 'Sýna viðhangandi myndir fyrir neðan skeytið';
-$labels['autosavedraft'] = 'Vista sjálfkrafa sem drög';
-$labels['everynminutes'] = '$n mínútu fresti';
-$labels['never'] = 'aldrei';
-$labels['immediately'] = 'samstundis';
+$labels['autosavedraft']  = 'Vista sjálfkrafa sem drög';
+$labels['everynminutes']  = '$n mínútu fresti';
+$labels['refreshinterval']  = 'Refresh (check for new messages, etc.)';
+$labels['never']  = 'aldrei';
+$labels['immediately']  = 'samstundis';
 $labels['messagesdisplaying'] = 'Sýni skeyti';
 $labels['messagescomposition'] = 'Semja skeyti';
 $labels['mimeparamfolding'] = 'Nafn á viðhengjum';
@@ -360,27 +443,26 @@ $labels['checkallfolders'] = 'Athuga ný skeyti í öllum möppum';
 $labels['displaynext'] = 'Að eyðingu/færslu lokinni sýna næsta skeyti';
 $labels['defaultfont'] = 'Sjálfgefið letur HTML-skeyta';
 $labels['mainoptions'] = 'Aðalstillingar';
+$labels['browseroptions'] = 'Browser Options';
 $labels['section'] = 'Hluti';
 $labels['maintenance'] = 'Viðhald';
 $labels['newmessage'] = 'Nýtt skeyti';
 $labels['signatureoptions'] = 'Valkostir undirskriftar';
 $labels['whenreplying'] = 'Þegar svarað';
+$labels['replyempty'] = 'do not quote the original message';
 $labels['replytopposting'] = 'hefja nýtt skeyti fyrir ofan eldra';
 $labels['replybottomposting'] = 'hefja nýtt skeyti undir eldra';
 $labels['replyremovesignature'] = 'Þegar svarað fjarlægja upphaflega undirskrift úr skeyti';
 $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';
+$labels['previewpanemarkread']  = 'Merka forskoðuð skeyti sem lesin';
+$labels['afternseconds']  = 'eftir $n sekúndur';
 $labels['reqmdn'] = 'Biðja ávallt um kvittun';
 $labels['reqdsn'] = 'Biðja ávallt um sendingarstöðu';
 $labels['replysamefolder'] = 'Setja svarskeyti í möppu sem upphaflegt skeyti er í';
-$labels['defaultaddressbook'] = 'Bæta nýjum tengiliðum við valda netfangaskrá';
+$labels['defaultabook'] = 'Default address book';
 $labels['autocompletesingle'] = 'Sleppa aukanetföngum í sjálfklárun';
 $labels['listnamedisplay'] = 'Lista tengiliði sem';
 $labels['spellcheckbeforesend'] = 'Athuga stafsetningu áður en skeyti er sent';
@@ -389,13 +471,19 @@ $labels['spellcheckignoresyms'] = 'Hunsa orð með merki';
 $labels['spellcheckignorenums'] = 'Hunsa orð með tölum';
 $labels['spellcheckignorecaps'] = 'Hunsa orð sem eru í hástöfum';
 $labels['addtodict'] = 'Bæta við orðalista';
-$labels['folder'] = 'Mappa';
-$labels['foldername'] = 'Nafn möppu';
-$labels['subscribed'] = 'Valin';
+$labels['mailtoprotohandler'] = 'Register protocol handler for mailto: links';
+$labels['forwardmode'] = 'Messages forwarding';
+$labels['inline'] = 'inline';
+$labels['asattachment'] = 'as attachment';
+
+$labels['folder']  = 'Mappa';
+$labels['folders']  = 'Möppur';
+$labels['foldername']  = 'Nafn möppu';
+$labels['subscribed']  = 'Valin';
 $labels['messagecount'] = 'Skeyti';
-$labels['create'] = 'Búa til';
-$labels['createfolder'] = 'Búa til nýja möppu';
-$labels['managefolders'] = 'Sýsla með möppur';
+$labels['create']  = 'Búa til';
+$labels['createfolder']  = 'Búa til nýja möppu';
+$labels['managefolders']  = 'Sýsla með möppur';
 $labels['specialfolders'] = 'Sérstakar möppur';
 $labels['properties'] = 'Eiginleikar';
 $labels['folderproperties'] = 'Eiginleikar möppu';
@@ -405,22 +493,29 @@ $labels['info'] = 'Upplýsingar';
 $labels['getfoldersize'] = 'Smelltu til að sjá stærð möppu';
 $labels['changesubscription'] = 'Smelltu til að breyta áskrift';
 $labels['foldertype'] = 'Möpputegund';
-$labels['personalfolder'] = 'Einkamappa';
-$labels['otherfolder'] = 'Möppur annara notenda';
-$labels['sharedfolder'] = 'Opin mappa';
+$labels['personalfolder']  = 'Einkamappa';
+$labels['otherfolder']  = 'Möppur annara notenda';
+$labels['sharedfolder']  = 'Opin mappa';
+
 $labels['sortby'] = 'Raða eftir';
-$labels['sortasc'] = 'Raða vaxandi';
+$labels['sortasc']  = 'Raða vaxandi';
 $labels['sortdesc'] = 'Raða minnkandi';
 $labels['undo'] = 'Taka til baka';
+
+$labels['installedplugins'] = 'Installed plugins';
 $labels['plugin'] = 'Viðbætur';
 $labels['version'] = 'Útgáfa';
 $labels['source'] = 'Uppruni';
 $labels['license'] = 'Notkunarleyfi';
 $labels['support'] = 'Fá aðstoð';
+
+// units
 $labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
 $labels['GB'] = 'GB';
+
+// character sets
 $labels['unicode'] = 'Unicode';
 $labels['english'] = 'Enska';
 $labels['westerneuropean'] = 'Vesturevrópskt';
@@ -440,3 +535,4 @@ $labels['japanese'] = 'Japanskt';
 $labels['korean'] = 'Kóreska';
 $labels['chinese'] = 'Kínverska';
 
+?>
diff --git a/program/localization/is_IS/messages.inc b/program/localization/is_IS/messages.inc
index 5705e55cb..6e9f35af3 100644
--- a/program/localization/is_IS/messages.inc
+++ b/program/localization/is_IS/messages.inc
@@ -2,58 +2,170 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/is_IS/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['loginfailed'] = 'Innskráning mistókst';
+$messages['errortitle']  = 'An error occurred!';
+$messages['loginfailed']  = 'Innskráning mistókst';
 $messages['cookiesdisabled'] = 'Vafrinn þinn vill ekki taka við kökum (cookies)';
 $messages['sessionerror'] = 'Innskráningin þín ógild eða útrunnin';
 $messages['storageerror'] = 'Tengin við IMAP-miðlara mistókst';
+$messages['servererror'] = 'Server Error!';
+$messages['servererrormsg'] = 'Server Error: $msg';
+$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';
 $messages['loggedout'] = 'Þú hefur útskráðst. Bless!';
 $messages['mailboxempty'] = 'Pósthólfið er tómt';
+$messages['refreshing'] = 'Refreshing...';
 $messages['loading'] = 'Hleð...';
+$messages['uploading'] = 'Uploading file...';
+$messages['uploadingmany'] = 'Uploading files...';
 $messages['loadingdata'] = 'Hleð gögn...';
 $messages['checkingmail'] = 'Gái að nýjum skeytum...';
+$messages['sendingmessage'] = 'Sending message...';
 $messages['messagesent'] = 'Skeyti var sent';
 $messages['savingmessage'] = 'Vista skeyti...';
 $messages['messagesaved'] = 'Skeytið vistað í Drög';
 $messages['successfullysaved'] = 'Vistun heppnaðist!';
 $messages['addedsuccessfully'] = 'Netfangi var bætt í netfangaskrá';
 $messages['contactexists'] = 'Þetta netfang er þegar skráð í netfangaskrána';
+$messages['contactnameexists'] = 'A contact with the same name already exists.';
 $messages['blockedimages'] = 'Til verndar hafa allar myndir í þessu skeyti verið blokkaðar.';
 $messages['encryptedmessage'] = 'Þetta er dulkóðað skeyti og því miður er ekki hægt að birta það';
 $messages['nocontactsfound'] = 'Engin netföng';
+$messages['contactnotfound'] = 'The requested contact was not found.';
+$messages['contactsearchonly'] = 'Enter some search terms to find contacts';
 $messages['sendingfailed'] = 'Sending misheppnaðist';
+$messages['senttooquickly'] = 'Please wait $sec sec(s). before sending this message.';
+$messages['errorsavingsent'] = 'An error occured while saving sent message.';
 $messages['errorsaving'] = 'Villa kom upp þegar var verið að vista';
 $messages['errormoving'] = 'Gat ekki fært skeytið';
+$messages['errorcopying'] = 'Could not copy the message(s).';
 $messages['errordeleting'] = 'Gat ekki eytt skeytinu';
-$messages['deletecontactconfirm'] = 'Ertu viss um að þú viljir eyða völdum netföngum?';
-$messages['deletefolderconfirm'] = 'Ertu viss um að vilja eyða þessari möppu?';
+$messages['errormarking'] = 'Could not mark the message(s).';
+$messages['deletecontactconfirm']  = 'Ertu viss um að þú viljir eyða völdum netföngum?';
+$messages['deletegroupconfirm']  = 'Do you really want to delete selected group?';
+$messages['deletemessagesconfirm'] = 'Do you really want to delete selected message(s)?';
+$messages['deletefolderconfirm']  = 'Ertu viss um að vilja eyða þessari möppu?';
+$messages['purgefolderconfirm']  = 'Do you really want to delete all messages in this folder?';
+$messages['contactdeleting'] = 'Deleting contact(s)...';
+$messages['groupdeleting'] = 'Deleting group...';
+$messages['folderdeleting'] = 'Deleting folder...';
+$messages['foldermoving'] = 'Moving folder...';
+$messages['foldersubscribing'] = 'Subscribing folder...';
+$messages['folderunsubscribing'] = 'Unsubscribing folder...';
 $messages['formincomplete'] = 'Formið var ekki fyllt út að fullu';
 $messages['noemailwarning'] = 'Sláðu inn gildt netfang';
-$messages['nonamewarning'] = 'Sláðu inn nafn';
+$messages['nonamewarning']  = 'Sláðu inn nafn';
 $messages['nopagesizewarning'] = 'Sláðu inn síðustærð';
+$messages['nosenderwarning'] = 'Please enter sender e-mail address.';
 $messages['norecipientwarning'] = 'Í það minnsta einn viðtakandi verður að vera';
-$messages['nosubjectwarning'] = 'Efnislínan er tóm. Viltu slá eitthvað inn í hana?';
+$messages['nosubjectwarning']  = 'Efnislínan er tóm. Viltu slá eitthvað inn í hana?';
 $messages['nobodywarning'] = 'Viltu senda tómt skeyti?';
 $messages['notsentwarning'] = 'Skeytið hefur ekki verið send. Viltu henda skeytinu?';
 $messages['noldapserver'] = 'Please select an ldap server to search';
 $messages['nosearchname'] = 'Sláðu inn nafn eða netfang';
+$messages['notuploadedwarning'] = 'Not all attachments have been uploaded yet. Please wait or cancel the upload.';
 $messages['searchsuccessful'] = '$nr skeyti fundust';
+$messages['contactsearchsuccessful'] = '$nr contacts found.';
 $messages['searchnomatch'] = 'Leit skilaði engu';
 $messages['searching'] = 'Leita...';
 $messages['checking'] = 'Gái...';
 $messages['nospellerrors'] = 'Engar innsláttarvillur fundust';
 $messages['folderdeleted'] = 'Möppu var eytt';
+$messages['foldersubscribed'] = 'Folder successfully subscribed.';
+$messages['folderunsubscribed'] = 'Folder successfully unsubscribed.';
+$messages['folderpurged'] = 'Folder has successfully been emptied.';
+$messages['folderexpunged'] = 'Folder has successfully been compacted.';
+$messages['deletedsuccessfully'] = 'Successfully deleted.';
+$messages['converting'] = 'Removing formatting...';
+$messages['messageopenerror'] = 'Could not load message from server.';
+$messages['fileuploaderror'] = 'File upload failed.';
+$messages['filesizeerror'] = 'The uploaded file exceeds the maximum size of $size.';
+$messages['copysuccess'] = 'Successfully copied $nr addresses.';
+$messages['copyerror'] = 'Could not copy any addresses.';
+$messages['sourceisreadonly'] = 'This address source is read only.';
+$messages['errorsavingcontact'] = 'Could not save the contact address.';
+$messages['movingmessage'] = 'Moving message(s)...';
+$messages['copyingmessage'] = 'Copying message(s)...';
+$messages['copyingcontact'] = 'Copying contact(s)...';
+$messages['deletingmessage'] = 'Deleting message(s)...';
+$messages['markingmessage'] = 'Marking message(s)...';
+$messages['addingmember'] = 'Adding contact(s) to the group...';
+$messages['removingmember'] = 'Removing contact(s) from the group...';
+$messages['receiptsent'] = 'Successfully sent a read receipt.';
+$messages['errorsendingreceipt'] = 'Could not send the receipt.';
+$messages['deleteidentityconfirm'] = 'Do you really want to delete this identity?';
+$messages['nodeletelastidentity'] = 'You cannot delete this identity, it\'s your last one.';
+$messages['forbiddencharacter'] = 'Folder name contains a forbidden character.';
+$messages['selectimportfile'] = 'Please select a file to upload.';
+$messages['addresswriterror'] = 'The selected address book is not writeable.';
+$messages['contactaddedtogroup'] = 'Successfully added the contacts to this group.';
+$messages['contactremovedfromgroup'] = 'Successfully removed contacts from this group.';
+$messages['nogroupassignmentschanged'] = 'No group assignments changed.';
+$messages['importwait'] = 'Importing, please wait...';
+$messages['importformaterror'] = 'Import failed! The uploaded file is not a valid import data file.';
+$messages['importconfirm'] = '<b>Successfully imported $inserted contacts</b>';
+$messages['importconfirmskipped'] = '<b>Skipped $skipped existing entries</b>';
+$messages['opnotpermitted'] = 'Operation not permitted!';
+$messages['nofromaddress'] = 'Missing e-mail address in selected identity.';
+$messages['editorwarning'] = 'Switching to the plain text editor will cause all text formatting to be lost. Do you wish to continue?';
+$messages['httpreceivedencrypterror'] = 'A fatal configuration error occurred. Contact your administrator immediately. <b>Your message can not be sent.</b>';
+$messages['smtpconnerror'] = 'SMTP Error ($code): Connection to server failed.';
+$messages['smtpautherror'] = 'SMTP Error ($code): Authentication failed.';
+$messages['smtpfromerror'] = 'SMTP Error ($code): Failed to set sender "$from" ($msg).';
+$messages['smtptoerror'] = 'SMTP Error ($code): Failed to add recipient "$to" ($msg).';
+$messages['smtprecipientserror'] = 'SMTP Error: Unable to parse recipients list.';
+$messages['smtperror'] = 'SMTP Error: $msg';
+$messages['emailformaterror'] = 'Invalid e-mail address: $email';
+$messages['toomanyrecipients'] = 'Too many recipients. Reduce the number of recipients to $max.';
+$messages['maxgroupmembersreached'] = 'The number of group members exceeds the maximum of $max.';
+$messages['internalerror'] = 'An internal error occured. Please try again.';
+$messages['contactdelerror'] = 'Could not delete contact(s).';
+$messages['contactdeleted'] = 'Contact(s) deleted successfully.';
+$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.';
 
+?>
diff --git a/program/localization/it_IT/labels.inc b/program/localization/it_IT/labels.inc
index 3d78df5c7..75a24c5fd 100644
--- a/program/localization/it_IT/labels.inc
+++ b/program/localization/it_IT/labels.inc
@@ -2,58 +2,78 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/it_IT/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Andrea Bernini <andrea.bernini@gmail.com>                     |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = 'Benvenuto in $product';
-$labels['username'] = 'Utente';
-$labels['password'] = 'Password';
-$labels['server'] = 'Server';
-$labels['login'] = 'Entra';
-$labels['logout'] = 'Esci';
-$labels['mail'] = 'E-Mail';
+
+// login page
+$labels['welcome']   = 'Benvenuto in $product';
+$labels['username']  = 'Utente';
+$labels['password']  = 'Password';
+$labels['server']    = 'Server';
+$labels['login']     = 'Entra';
+
+// taskbar
+$labels['logout']   = 'Esci';
+$labels['mail']     = 'E-Mail';
 $labels['settings'] = 'Impostazioni';
 $labels['addressbook'] = 'Rubrica';
-$labels['inbox'] = 'Posta in arrivo';
+
+// mailbox names
+$labels['inbox']  = 'Posta in arrivo';
 $labels['drafts'] = 'Bozze';
-$labels['sent'] = 'Inviata';
-$labels['trash'] = 'Cestino';
-$labels['junk'] = 'Spam';
+$labels['sent']   = 'Inviata';
+$labels['trash']  = 'Cestino';
+$labels['junk']   = 'Spam';
+
+// message listing
 $labels['subject'] = 'Oggetto';
-$labels['from'] = 'Mittente';
-$labels['to'] = 'Destinatario';
-$labels['cc'] = 'Cc';
-$labels['bcc'] = 'Bcc';
+$labels['from']    = 'Mittente';
+$labels['sender']  = 'Mittente';
+$labels['to']      = 'Destinatario';
+$labels['cc']      = 'Cc';
+$labels['bcc']     = 'Bcc';
 $labels['replyto'] = 'Rispondi a';
 $labels['followupto'] = 'Followup-To';
-$labels['date'] = 'Data';
-$labels['size'] = 'Dimensione';
+$labels['date']    = 'Data';
+$labels['size']    = 'Dimensione';
 $labels['priority'] = 'Priorità';
 $labels['organization'] = 'Società';
 $labels['readstatus'] = 'Visualizza lo stato';
 $labels['listoptions'] = 'Elenco opzioni...';
+
 $labels['mailboxlist'] = 'Cartelle';
-$labels['folders'] = 'Cartelle';
 $labels['messagesfromto'] = 'Messaggi da $from a $to di $count';
 $labels['threadsfromto'] = 'Thread da $from a $to di $count';
 $labels['messagenrof'] = 'Messaggio $nr di $count';
 $labels['fromtoshort'] = '$from – $to di $count';
-$labels['copy'] = 'Copia';
-$labels['move'] = 'Sposta';
-$labels['moveto'] = 'Sposta in...';
+
+$labels['copy']     = 'Copia';
+$labels['move']     = 'Sposta';
+$labels['moveto']   = 'Sposta in...';
 $labels['download'] = 'Download';
+$labels['open']     = 'Apri';
+$labels['showattachment'] = 'Visualizza';
+$labels['showanyway'] = 'Visualizza comunque';
+
 $labels['filename'] = 'Nome file';
 $labels['filesize'] = 'Dimensione file';
+
 $labels['addtoaddressbook'] = 'Aggiungi alla rubrica';
+
+// weekdays short
 $labels['sun'] = 'Dom';
 $labels['mon'] = 'Lun';
 $labels['tue'] = 'Mar';
@@ -61,78 +81,88 @@ $labels['wed'] = 'Mer';
 $labels['thu'] = 'Gio';
 $labels['fri'] = 'Ven';
 $labels['sat'] = 'Sab';
-$labels['sunday'] = 'Domenica';
-$labels['monday'] = 'Lunedì';
-$labels['tuesday'] = 'Martedì';
+
+// weekdays long
+$labels['sunday']    = 'Domenica';
+$labels['monday']    = 'Lunedì';
+$labels['tuesday']   = 'Martedì';
 $labels['wednesday'] = 'Mercoledì';
-$labels['thursday'] = 'Giovedì';
-$labels['friday'] = 'Venerdì';
-$labels['saturday'] = 'Sabato';
-$labels['jan'] = 'Gen';
-$labels['feb'] = 'Feb';
-$labels['mar'] = 'Mar';
-$labels['apr'] = 'Apr';
-$labels['may'] = 'Maggio';
-$labels['longmay'] = 'Maggio';
-$labels['jun'] = 'Giu';
-$labels['jul'] = 'Lug';
-$labels['aug'] = 'Ago';
-$labels['sep'] = 'Set';
-$labels['oct'] = 'Ott';
-$labels['nov'] = 'Nov';
-$labels['dec'] = 'Dic';
-$labels['longjan'] = 'Gennaio';
-$labels['longfeb'] = 'Febbraio';
-$labels['longmar'] = 'Marzo';
-$labels['longapr'] = 'Aprile';
-$labels['longjun'] = 'Giugno';
-$labels['longjul'] = 'Luglio';
-$labels['longaug'] = 'Agosto';
-$labels['longsep'] = 'Settembre';
-$labels['longoct'] = 'Ottobre';
-$labels['longnov'] = 'Novembre';
-$labels['longdec'] = 'Dicembre';
+$labels['thursday']  = 'Giovedì';
+$labels['friday']    = 'Venerdì';
+$labels['saturday']  = 'Sabato';
+
+// months short
+$labels['jan']	= 'Gen';
+$labels['feb']	= 'Feb';
+$labels['mar']	= 'Mar';
+$labels['apr']	= 'Apr';
+$labels['may']	= 'Maggio';
+$labels['jun']	= 'Giu';
+$labels['jul'] 	= 'Lug';
+$labels['aug']	= 'Ago';
+$labels['sep']	= 'Set';
+$labels['oct']	= 'Ott';
+$labels['nov']	= 'Nov';
+$labels['dec']	= 'Dic';
+
+// months long
+$labels['longjan']	= 'Gennaio';
+$labels['longfeb']	= 'Febbraio';
+$labels['longmar']	= 'Marzo';
+$labels['longapr']	= 'Aprile';
+$labels['longmay']	= 'Maggio';
+$labels['longjun']	= 'Giugno';
+$labels['longjul']	= 'Luglio';
+$labels['longaug']	= 'Agosto';
+$labels['longsep']	= 'Settembre';
+$labels['longoct']	= 'Ottobre';
+$labels['longnov']	= 'Novembre';
+$labels['longdec']	= 'Dicembre';
+
 $labels['today'] = 'Oggi';
-$labels['refresh'] = 'Aggiorna';
-$labels['checkmail'] = 'Controlla nuovi messaggi';
-$labels['compose'] = 'Scrivi un messaggio';
-$labels['writenewmessage'] = 'Scrivi un nuovo messaggio';
-$labels['reply'] = 'Rispondi';
-$labels['replytomessage'] = 'Rispondi al mittente';
+
+// toolbar buttons
+$labels['refresh']          = 'Aggiorna';
+$labels['checkmail']        = 'Controlla nuovi messaggi';
+$labels['compose']          = 'Scrivi un messaggio';
+$labels['writenewmessage']  = 'Scrivi un nuovo messaggio';
+$labels['reply']            = 'Rispondi';
+$labels['replytomessage']   = 'Rispondi al mittente';
 $labels['replytoallmessage'] = 'Rispondi al mittente e ai destinatari';
-$labels['replyall'] = 'Rispondi a tutti';
-$labels['replylist'] = 'Rispondi alla mailing list';
-$labels['forward'] = 'Inoltra';
-$labels['forwardinline'] = 'Inoltra come messaggio';
+$labels['replyall']         = 'Rispondi a tutti';
+$labels['replylist']        = 'Rispondi alla mailing list';
+$labels['forward']          = 'Inoltra';
+$labels['forwardinline']    = 'Inoltra come messaggio';
 $labels['forwardattachment'] = 'Inoltre come allegato';
-$labels['forwardmessage'] = 'Inoltra il messaggio';
-$labels['deletemessage'] = 'Elimina il messaggio';
+$labels['forwardmessage']   = 'Inoltra il messaggio';
+$labels['deletemessage']    = 'Elimina il messaggio';
 $labels['movemessagetotrash'] = 'Sposta il messaggio nel cestino';
-$labels['printmessage'] = 'Stampa il messaggio';
-$labels['previousmessage'] = 'Visualizza il messaggio precedente';
-$labels['firstmessage'] = 'Visualizza il primo messaggio';
-$labels['nextmessage'] = 'Visualizza il messaggio successivo';
-$labels['lastmessage'] = 'Visualizza l\'ultimo messaggio';
-$labels['backtolist'] = 'Torna alla lista messaggi';
-$labels['viewsource'] = 'Visualizza sorgente messaggio';
-$labels['mark'] = 'Contrassegna';
-$labels['markmessages'] = 'Marca i messaggi';
-$labels['markread'] = 'Letti';
-$labels['markunread'] = 'Non letti';
-$labels['markflagged'] = 'Contrassegnato';
-$labels['markunflagged'] = 'Non contrassegnato';
-$labels['moreactions'] = 'Altre operazioni...';
-$labels['more'] = 'Di più';
-$labels['back'] = 'Indietro';
-$labels['options'] = 'Opzioni';
+$labels['printmessage']     = 'Stampa il messaggio';
+$labels['previousmessage']  = 'Visualizza il messaggio precedente';
+$labels['firstmessage']     = 'Visualizza il primo messaggio';
+$labels['nextmessage']      = 'Visualizza il messaggio successivo';
+$labels['lastmessage']      = 'Visualizza l\'ultimo messaggio';
+$labels['backtolist']       = 'Torna alla lista messaggi';
+$labels['viewsource']       = 'Visualizza sorgente messaggio';
+$labels['mark']             = 'Contrassegna';
+$labels['markmessages']     = 'Marca i messaggi';
+$labels['markread']         = 'Letti';
+$labels['markunread']       = 'Non letti';
+$labels['markflagged']      = 'Contrassegnato';
+$labels['markunflagged']    = 'Non contrassegnato';
+$labels['moreactions']      = 'Altre operazioni...';
+$labels['more']             = 'Di più';
+$labels['back']             = 'Indietro';
+$labels['options']          = 'Opzioni';
+
 $labels['select'] = 'Seleziona';
 $labels['all'] = 'Tutti';
 $labels['none'] = 'Nessuno';
-$labels['nonesort'] = 'Nessuno';
 $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';
@@ -143,12 +173,14 @@ $labels['expand-all'] = 'Espandi tutto';
 $labels['expand-unread'] = 'Espandi non letti';
 $labels['collapse-all'] = 'Richiudi tutti';
 $labels['threaded'] = 'Per argomenti';
+
 $labels['autoexpand_threads'] = 'Espandi';
 $labels['do_expand'] = 'tutti i thread';
 $labels['expand_only_unread'] = 'solo con messaggi non letti';
 $labels['fromto'] = 'Mittente/Destinatario';
 $labels['flag'] = 'Contrassegnato';
 $labels['attachment'] = 'Allegato';
+$labels['nonesort'] = 'Nessuno';
 $labels['sentdate'] = 'Data d\'invio';
 $labels['arrival'] = 'Data di arrivo';
 $labels['asc'] = 'Ascendente';
@@ -157,181 +189,220 @@ $labels['listcolumns'] = 'Elenco Colonne';
 $labels['listsorting'] = 'Ordina per';
 $labels['listorder'] = 'Ordinamento';
 $labels['listmode'] = 'Modalità di visualizzazione';
+
 $labels['folderactions'] = 'Operazioni cartella';
 $labels['compact'] = 'Compatta';
 $labels['empty'] = 'Svuota';
+
 $labels['quota'] = 'Spazio utilizzato';
-$labels['unknown'] = 'sconosciuto';
-$labels['unlimited'] = 'illimitato';
-$labels['quicksearch'] = 'Ricerca veloce';
-$labels['resetsearch'] = 'Annulla ricerca';
-$labels['searchmod'] = 'Ambito di ricerca';
-$labels['msgtext'] = 'Intero messaggio';
+$labels['unknown']  = 'sconosciuto';
+$labels['unlimited']  = 'illimitato';
+
+$labels['quicksearch']  = 'Ricerca veloce';
+$labels['resetsearch']  = 'Annulla ricerca';
+$labels['searchmod']  = 'Ambito di ricerca';
+$labels['msgtext']  = 'Intero messaggio';
+$labels['body']  = 'Body';
+
 $labels['openinextwin'] = 'Apri in una nuova finestra';
 $labels['emlsave'] = 'Scarica (.eml)';
-$labels['editasnew'] = 'Modifica come nuovo';
-$labels['send'] = 'Invia';
-$labels['sendmessage'] = 'Invia il messaggio adesso';
-$labels['savemessage'] = 'Salva come bozza';
-$labels['addattachment'] = 'Allega un file';
-$labels['charset'] = 'Set di caratteri';
-$labels['editortype'] = 'Tipo editor';
-$labels['returnreceipt'] = 'Ricevuta di ritorno';
-$labels['dsn'] = 'Notifica di consegna';
+$labels['changeformattext'] = 'Visualizza nel formato testo semplice';
+$labels['changeformathtml'] = 'Visualizza nel formato HTML';
+
+// message compose
+$labels['editasnew']      = 'Modifica come nuovo';
+$labels['send']           = 'Invia';
+$labels['sendmessage']    = 'Invia il messaggio adesso';
+$labels['savemessage']    = 'Salva come bozza';
+$labels['addattachment']  = 'Allega un file';
+$labels['charset']        = 'Set di caratteri';
+$labels['editortype']     = 'Tipo editor';
+$labels['returnreceipt']  = 'Ricevuta di ritorno';
+$labels['dsn']            = 'Notifica di consegna';
 $labels['mailreplyintro'] = 'Il $date $sender ha scritto:';
 $labels['originalmessage'] = 'Messaggio originale';
-$labels['editidents'] = 'Modifica identità';
-$labels['spellcheck'] = 'Controllo ortografico';
+
+$labels['editidents']    = 'Modifica identità';
+$labels['spellcheck']    = 'Controllo ortografico';
 $labels['checkspelling'] = 'Controlla ortografia';
 $labels['resumeediting'] = 'Torna al messaggio';
-$labels['revertto'] = 'Ripristina';
+$labels['revertto']      = 'Ripristina';
+
 $labels['attach'] = 'Allega';
 $labels['attachments'] = 'Allegati';
 $labels['upload'] = 'Aggiungi';
 $labels['uploadprogress'] = '$percent ($current di $total)';
-$labels['close'] = 'Chiudi';
-$labels['messageoptions'] = 'Opzioni messaggi...';
-$labels['low'] = 'Bassa';
-$labels['lowest'] = 'Molto bassa';
-$labels['normal'] = 'Normale';
-$labels['high'] = 'Alta';
+$labels['close']  = 'Chiudi';
+$labels['messageoptions']  = 'Opzioni messaggi...';
+
+$labels['low']     = 'Bassa';
+$labels['lowest']  = 'Molto bassa';
+$labels['normal']  = 'Normale';
+$labels['high']    = 'Alta';
 $labels['highest'] = 'Molto alta';
-$labels['nosubject'] = '(nessun oggetto)';
+
+$labels['nosubject']  = '(nessun oggetto)';
 $labels['showimages'] = 'Visualizza immagini';
 $labels['alwaysshow'] = 'Mostra sempre immagini da $sender';
-$labels['isdraft'] = 'Questa è una bozza.';
-$labels['andnmore'] = 'ancora $nr...';
+$labels['isdraft']    = 'Questa è una bozza.';
+$labels['andnmore']   = 'ancora $nr...';
 $labels['togglemoreheaders'] = 'Mostra più intestazioni dei messaggi';
+$labels['togglefullheaders'] = 'Visualizza header raw';
+
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Testo semplice';
 $labels['savesentmessagein'] = 'Salva i messaggi inviati in';
 $labels['dontsave'] = 'non salvare';
 $labels['maxuploadsize'] = 'La dimensione massima consentita è $size';
+
 $labels['addcc'] = 'Aggiungi Cc';
 $labels['addbcc'] = 'Aggiungi Bcc';
 $labels['addreplyto'] = 'Aggiungi Rispondi a';
 $labels['addfollowupto'] = 'Aggiungi Followup-To';
+
+// mdn
 $labels['mdnrequest'] = 'Il mittente ha richiesto di ricevere una notifica dell\'avvenuta lettura del messaggio. Si desidera inviare tale notifica?';
 $labels['receiptread'] = 'Ricevuta di ritorno (letto)';
 $labels['yourmessage'] = 'Questa è la ricevuta di ritorno del messaggio inviato';
 $labels['receiptnote'] = 'Nota: questa Ricevuta di ritorno attesta solamente che il messaggio è stato visualizzato nel computer del destinatario. Non c\'è pertanto alcuna garanzia che il destinatario abbia letto o compreso il suo contenuto.';
-$labels['name'] = 'Nome visualizzato';
-$labels['firstname'] = 'Nome';
-$labels['surname'] = 'Cognome';
-$labels['middlename'] = 'Secondo nome';
-$labels['nameprefix'] = 'Prefisso';
-$labels['namesuffix'] = 'Suffisso';
-$labels['nickname'] = 'Soprannome';
-$labels['jobtitle'] = 'Titolo';
-$labels['department'] = 'Dipartimento';
-$labels['gender'] = 'Sesso';
-$labels['maidenname'] = 'Cognome da nubile';
-$labels['email'] = 'E-Mail';
-$labels['phone'] = 'Telefono';
-$labels['address'] = 'Indirizzo';
-$labels['street'] = 'Via';
-$labels['locality'] = 'Città';
-$labels['zipcode'] = 'CAP';
-$labels['region'] = 'Regione';
-$labels['country'] = 'Stato';
-$labels['birthday'] = 'Compleanno';
-$labels['anniversary'] = 'Anniversario';
-$labels['website'] = 'Sito web';
+
+// address boook
+$labels['name']         = 'Nome visualizzato';
+$labels['firstname']    = 'Nome';
+$labels['surname']      = 'Cognome';
+$labels['middlename']   = 'Secondo nome';
+$labels['nameprefix']   = 'Prefisso';
+$labels['namesuffix']   = 'Suffisso';
+$labels['nickname']     = 'Soprannome';
+$labels['jobtitle']     = 'Titolo';
+$labels['department']   = 'Dipartimento';
+$labels['gender']       = 'Sesso';
+$labels['maidenname']   = 'Cognome da nubile';
+$labels['email']        = 'E-Mail';
+$labels['phone']        = 'Telefono';
+$labels['address']      = 'Indirizzo';
+$labels['street']       = 'Via';
+$labels['locality']     = 'Città';
+$labels['zipcode']      = 'CAP';
+$labels['region']       = 'Regione';
+$labels['country']      = 'Stato';
+$labels['birthday']     = 'Compleanno';
+$labels['anniversary']  = 'Anniversario';
+$labels['website']      = 'Sito web';
 $labels['instantmessenger'] = 'IM';
 $labels['notes'] = 'Note';
-$labels['male'] = 'maschio';
+$labels['male']   = 'maschio';
 $labels['female'] = 'femmina';
 $labels['manager'] = 'Manager';
 $labels['assistant'] = 'Assistente';
-$labels['typeassistant'] = 'Assistente';
 $labels['spouse'] = 'Coniuge';
 $labels['allfields'] = 'Tutti i campi';
 $labels['search'] = 'Ricerca';
 $labels['advsearch'] = 'Ricerca avanzata';
 $labels['advanced'] = 'Opzioni avanzate';
 $labels['other'] = 'Altro';
-$labels['typeother'] = 'Altro';
-$labels['typehome'] = 'Casa';
-$labels['typework'] = 'Lavoro';
-$labels['typemobile'] = 'Cellulare';
-$labels['typemain'] = 'Principale';
-$labels['typehomefax'] = 'Fax casa';
-$labels['typeworkfax'] = 'Fax lavoro';
-$labels['typecar'] = 'Auto';
-$labels['typepager'] = 'Teledrin';
-$labels['typevideo'] = 'Video';
-$labels['typehomepage'] = 'Home page';
+
+$labels['typehome']   = 'Casa';
+$labels['typework']   = 'Lavoro';
+$labels['typeother']  = 'Altro';
+$labels['typemobile']  = 'Cellulare';
+$labels['typemain']  = 'Principale';
+$labels['typehomefax']  = 'Fax casa';
+$labels['typeworkfax']  = 'Fax lavoro';
+$labels['typecar']  = 'Auto';
+$labels['typepager']  = 'Teledrin';
+$labels['typevideo']  = 'Video';
+$labels['typeassistant']  = 'Assistente';
+$labels['typehomepage']  = 'Home page';
 $labels['typeblog'] = 'Blog';
 $labels['typeprofile'] = 'Profilo';
+
 $labels['addfield'] = 'Aggiungi campo...';
 $labels['addcontact'] = 'Aggiungi contatto alla rubrica';
 $labels['editcontact'] = 'Modifica contatto';
 $labels['contacts'] = 'Contatti';
 $labels['contactproperties'] = 'Proprietà contatto';
 $labels['personalinfo'] = 'Informazioni personali';
-$labels['edit'] = 'Modifica';
+
+$labels['edit']   = 'Modifica';
 $labels['cancel'] = 'Annulla';
-$labels['save'] = 'Salva';
+$labels['save']   = 'Salva';
 $labels['delete'] = 'Elimina';
 $labels['rename'] = 'Rinomina';
 $labels['addphoto'] = 'Aggiungi';
 $labels['replacephoto'] = 'Sostituisci';
 $labels['uploadphoto'] = 'Carica foto';
-$labels['newcontact'] = 'Crea un nuovo contatto';
-$labels['deletecontact'] = 'Elimina i contatti selezionati';
-$labels['composeto'] = 'Invia email a';
+
+$labels['newcontact']     = 'Crea un nuovo contatto';
+$labels['deletecontact']  = 'Elimina i contatti selezionati';
+$labels['composeto']      = 'Invia email a';
 $labels['contactsfromto'] = 'Contatti da $from a $to di $count';
-$labels['print'] = 'Stampa';
-$labels['export'] = 'Esporta';
-$labels['exportvcards'] = 'Esporta i contatti in formato vCard';
+$labels['print']          = 'Stampa';
+$labels['export']         = 'Esporta';
+$labels['exportall']      = 'Esporta tutto';
+$labels['exportsel']      = 'Esporta selezionati';
+$labels['exportvcards']   = 'Esporta i contatti in formato vCard';
 $labels['newcontactgroup'] = 'Crea un nuovo gruppo';
-$labels['grouprename'] = 'Rinomina il gruppo';
-$labels['groupdelete'] = 'Cancella il gruppo';
+$labels['grouprename']    = 'Rinomina il gruppo';
+$labels['groupdelete']    = 'Cancella il gruppo';
 $labels['groupremoveselected'] = 'Rimuovi i contatti selezionati dal gruppo';
-$labels['previouspage'] = 'Pagina precedente';
-$labels['firstpage'] = 'Prima pagina';
-$labels['nextpage'] = 'Pagina successiva';
-$labels['lastpage'] = 'Ultima pagina';
+
+$labels['previouspage']   = 'Pagina precedente';
+$labels['firstpage']      = 'Prima pagina';
+$labels['nextpage']       = 'Pagina successiva';
+$labels['lastpage']       = 'Ultima pagina';
+
 $labels['group'] = 'Gruppo';
 $labels['groups'] = 'Gruppi';
 $labels['personaladrbook'] = 'Rubrica Personale';
+
 $labels['searchsave'] = 'Salva ricerca';
 $labels['searchdelete'] = 'Elimina ricerca';
+
 $labels['import'] = 'Importa';
 $labels['importcontacts'] = 'Importa contatti';
 $labels['importfromfile'] = 'Importa da file:';
 $labels['importtarget'] = 'Aggiungi nuovi contattu alla rubrica:';
 $labels['importreplace'] = 'Sostituisci l\'intera rubrica';
+$labels['importdesc'] = 'Puoi caricare i contatti da una rubrica esistente.<br/>Attualmente si possono importare contatti in formato  <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> o CSV (comma-separated).';
 $labels['done'] = 'Fatto';
+
+// settings
 $labels['settingsfor'] = 'Impostazioni per';
 $labels['about'] = 'Informazioni';
 $labels['preferences'] = 'Preferenze';
 $labels['userpreferences'] = 'Preferenze utente';
 $labels['editpreferences'] = 'Modifica le preferenze per l\'utente';
+
 $labels['identities'] = 'Identità';
 $labels['manageidentities'] = 'Gestisci le identità per questo account';
 $labels['newidentity'] = 'Nuova identità';
+
 $labels['newitem'] = 'Nuovo elemento';
 $labels['edititem'] = 'Modifica elemento';
+
 $labels['preferhtml'] = 'Mostra HTML';
 $labels['defaultcharset'] = 'Set di caratteri predefinito';
 $labels['htmlmessage'] = 'Messaggio HTML';
+$labels['messagepart'] = 'Parte';
+$labels['digitalsig'] = 'Firma digitale';
 $labels['dateformat'] = 'Formato data';
 $labels['timeformat'] = 'Formato orario';
 $labels['prettydate'] = 'Date più leggibili';
-$labels['setdefault'] = 'Imposta predefinita';
-$labels['autodetect'] = 'Auto';
-$labels['language'] = 'Lingua';
-$labels['timezone'] = 'Fuso orario';
-$labels['pagesize'] = 'Righe per pagina';
+$labels['setdefault']  = 'Imposta predefinita';
+$labels['autodetect']  = 'Auto';
+$labels['language']  = 'Lingua';
+$labels['timezone']  = 'Fuso orario';
+$labels['pagesize']  = 'Righe per pagina';
 $labels['signature'] = 'Firma';
-$labels['dstactive'] = 'Gestione ora legale';
+$labels['dstactive']  = 'Gestione ora legale';
 $labels['showinextwin'] = 'Apri il messaggio in una nuova finestra';
 $labels['composeextwin'] = 'Crea messaggio in una nuova finestra';
 $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';
@@ -354,10 +425,11 @@ $labels['showremoteimages'] = 'Mostra immagini remote contenute nel messaggio';
 $labels['fromknownsenders'] = 'da mittenti conosciuti';
 $labels['always'] = 'sempre';
 $labels['showinlineimages'] = 'Mostra immagini allegate sotto il messaggio';
-$labels['autosavedraft'] = 'Salva le bozze automaticamente';
-$labels['everynminutes'] = 'ogni $n minuto(i)';
-$labels['never'] = 'mai';
-$labels['immediately'] = 'immediatamente';
+$labels['autosavedraft']  = 'Salva le bozze automaticamente';
+$labels['everynminutes']  = 'ogni $n minuto(i)';
+$labels['refreshinterval']  = 'Aggiorna (controlla nuovi messaggi, ecc.)';
+$labels['never']  = 'mai';
+$labels['immediately']  = 'immediatamente';
 $labels['messagesdisplaying'] = 'Visualizzazione Messaggi';
 $labels['messagescomposition'] = 'Composizione Messaggi';
 $labels['mimeparamfolding'] = 'Nomi allegati';
@@ -384,16 +456,13 @@ $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';
+$labels['previewpanemarkread']  = 'Segna i messagi in anteprima come letti';
+$labels['afternseconds']  = 'dopo $n secondi';
 $labels['reqmdn'] = 'Richiedi sempre la ricevuta di ritorno';
 $labels['reqdsn'] = 'Richiedi sempre la notifica di consegna';
 $labels['replysamefolder'] = 'Salva risposta nella cartella del messaggio a cui si risponde';
-$labels['defaultaddressbook'] = 'Aggiungi nuovi contatti alla rubrica selezionata';
+$labels['defaultabook'] = 'Rubrica predefinita';
 $labels['autocompletesingle'] = 'Non considerare gli indirizzi secondari nell\'autocompletamento';
 $labels['listnamedisplay'] = 'Elenca contatti come';
 $labels['spellcheckbeforesend'] = 'Esegui il controllo ortografico prima di inviare un messaggio';
@@ -406,13 +475,15 @@ $labels['mailtoprotohandler'] = 'Registra gestore per mailto:';
 $labels['forwardmode'] = 'Inoltro messaggi';
 $labels['inline'] = 'In linea';
 $labels['asattachment'] = 'come allegato';
-$labels['folder'] = 'Cartella';
-$labels['foldername'] = 'Nome cartella';
-$labels['subscribed'] = 'Sottoscritta';
+
+$labels['folder']  = 'Cartella';
+$labels['folders']  = 'Cartelle';
+$labels['foldername']  = 'Nome cartella';
+$labels['subscribed']  = 'Sottoscritta';
 $labels['messagecount'] = 'Messaggi';
-$labels['create'] = 'Crea';
-$labels['createfolder'] = 'Crea nuova cartella';
-$labels['managefolders'] = 'Gestione cartelle';
+$labels['create']  = 'Crea';
+$labels['createfolder']  = 'Crea nuova cartella';
+$labels['managefolders']  = 'Gestione cartelle';
 $labels['specialfolders'] = 'Cartelle Speciali';
 $labels['properties'] = 'Proprietà';
 $labels['folderproperties'] = 'Proprietà cartella';
@@ -422,22 +493,29 @@ $labels['info'] = 'Informazioni';
 $labels['getfoldersize'] = 'Click per la dimensione della cartella';
 $labels['changesubscription'] = 'Click per cambiare sottoscrizione';
 $labels['foldertype'] = 'Tipo di cartella';
-$labels['personalfolder'] = 'Cartella privata';
-$labels['otherfolder'] = 'Cartella di un altro utente';
-$labels['sharedfolder'] = 'Cartella pubblica';
+$labels['personalfolder']  = 'Cartella privata';
+$labels['otherfolder']  = 'Cartella di un altro utente';
+$labels['sharedfolder']  = 'Cartella pubblica';
+
 $labels['sortby'] = 'Ordina per';
-$labels['sortasc'] = 'Ordinamento crescente';
+$labels['sortasc']  = 'Ordinamento crescente';
 $labels['sortdesc'] = 'Ordinamento decrescente';
 $labels['undo'] = 'Annulla';
+
+$labels['installedplugins'] = 'Plugin Installati';
 $labels['plugin'] = 'Plugin';
 $labels['version'] = 'Versione';
 $labels['source'] = 'Sorgente';
 $labels['license'] = 'Licenza';
 $labels['support'] = 'Ottieni supporto';
+
+// units
 $labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
 $labels['GB'] = 'GB';
+
+// character sets
 $labels['unicode'] = 'Unicode';
 $labels['english'] = 'Inglese';
 $labels['westerneuropean'] = 'Europa occidentale';
@@ -457,3 +535,4 @@ $labels['japanese'] = 'Giapponese';
 $labels['korean'] = 'Coreano';
 $labels['chinese'] = 'Cinese';
 
+?>
diff --git a/program/localization/it_IT/messages.inc b/program/localization/it_IT/messages.inc
index b1b972676..80395b551 100644
--- a/program/localization/it_IT/messages.inc
+++ b/program/localization/it_IT/messages.inc
@@ -2,20 +2,23 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/it_IT/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Andrea Bernini <andrea.bernini@gmail.com>                     |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['errortitle'] = 'C\'è stato qualche errore';
-$messages['loginfailed'] = 'Impossibile accedere. Utente o password non corretti';
+$messages['errortitle']  = 'C\'è stato qualche errore';
+$messages['loginfailed']  = 'Impossibile accedere. Utente o password non corretti';
 $messages['cookiesdisabled'] = 'Il tuo browser non accetta i cookies';
 $messages['sessionerror'] = 'Sessione non valida o scaduta';
 $messages['storageerror'] = 'Impossibile connettersi al server IMAP';
@@ -25,11 +28,14 @@ $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';
 $messages['loggedout'] = 'Sessione chiusa correttamente. Arrivederci!';
 $messages['mailboxempty'] = 'La casella è vuota';
+$messages['refreshing'] = 'Aggiornamento...';
 $messages['loading'] = 'Caricamento...';
 $messages['uploading'] = 'Caricamento file...';
 $messages['uploadingmany'] = 'Caricamento file...';
@@ -56,11 +62,11 @@ $messages['errormoving'] = 'Impossibile spostare il messaggio';
 $messages['errorcopying'] = 'Impossibile copiare il messaggio';
 $messages['errordeleting'] = 'Impossibile eliminare il messaggio';
 $messages['errormarking'] = 'Impossibile segnare il messaggio';
-$messages['deletecontactconfirm'] = 'Sei sicuro di voler eliminare i contatti selezionati?';
-$messages['deletegroupconfirm'] = 'Sei sicuro di voler eliminare i gruppi selezionati?';
+$messages['deletecontactconfirm']  = 'Sei sicuro di voler eliminare i contatti selezionati?';
+$messages['deletegroupconfirm']  = 'Sei sicuro di voler eliminare i gruppi selezionati?';
 $messages['deletemessagesconfirm'] = 'Sei sicuro di voler eliminare i messaggi selezionati?';
-$messages['deletefolderconfirm'] = 'Sei sicuro di voler eliminare la cartella selezionata?';
-$messages['purgefolderconfirm'] = 'Sei sicuro di voler eliminare tutti i messaggi in questa cartella?';
+$messages['deletefolderconfirm']  = 'Sei sicuro di voler eliminare la cartella selezionata?';
+$messages['purgefolderconfirm']  = 'Sei sicuro di voler eliminare tutti i messaggi in questa cartella?';
 $messages['contactdeleting'] = 'Eliminazione contatti...';
 $messages['groupdeleting'] = 'Eliminazione gruppo...';
 $messages['folderdeleting'] = 'Eliminazione cartella...';
@@ -69,11 +75,11 @@ $messages['foldersubscribing'] = 'Sottoscrizione cartella...';
 $messages['folderunsubscribing'] = 'Cancellazione sottoscrizzione cartella...';
 $messages['formincomplete'] = 'Per favore, compila tutti i campi';
 $messages['noemailwarning'] = 'Per favore, immetti un indirizzo e-mail valido';
-$messages['nonamewarning'] = 'Per favore, immetti un nome';
+$messages['nonamewarning']  = 'Per favore, immetti un nome';
 $messages['nopagesizewarning'] = 'Per favore, immetti il numero di righe per pagina';
 $messages['nosenderwarning'] = 'Per favore, inserisci l\'indirizzo e-mail del mittente';
 $messages['norecipientwarning'] = 'Per favore, immetti almeno un destinatario';
-$messages['nosubjectwarning'] = 'L\'oggetto è vuoto. Vuoi inserirlo adesso?';
+$messages['nosubjectwarning']  = 'L\'oggetto è vuoto. Vuoi inserirlo adesso?';
 $messages['nobodywarning'] = 'Inviare il messaggio senza testo?';
 $messages['notsentwarning'] = 'Il messaggio non è stato inviato. Vuoi annullare questo messaggio?';
 $messages['noldapserver'] = 'Per favore, scegli un server LDAP in cui ricercare';
@@ -117,6 +123,7 @@ $messages['contactaddedtogroup'] = 'Contatto aggiunto con successo al gruppo';
 $messages['contactremovedfromgroup'] = 'Contatto rimosso con successo dal gruppo';
 $messages['nogroupassignmentschanged'] = 'Nessun assegnamento del gruppo è stato cambiato.';
 $messages['importwait'] = 'Importazione in corso, attendere...';
+$messages['importformaterror'] = 'Importazione fallita! Il file caricato non è un file valido per l\'importazione.';
 $messages['importconfirm'] = '<b>$inserted contatti importati con successo</p>';
 $messages['importconfirmskipped'] = '<b>$skipped ignorati perché esistono già</b>';
 $messages['opnotpermitted'] = 'Operazione non consentita!';
@@ -158,4 +165,7 @@ $messages['invalidimageformat'] = 'Formato immagine non valido';
 $messages['mispellingsfound'] = 'Sono stati riscontrati errori ortografici nel messaggio';
 $messages['parentnotwritable'] = 'Impossibile creare o muovere la cartella: accesso negato';
 $messages['messagetoobig'] = 'La parte del messaggio è troppo grande per essere processata.';
+$messages['attachmentvalidationerror'] = 'ATTENZIONE! Questo allegato è sospetto poiché non rispetta il tipo dichiarato nel messaggio. Se non conosci il mittente, non dovresti aprire l\'allegato nel browser in quanto potrebbe contenere malware.<br/><br/><em>Atteso: $expected; rilevato: $detected</em>';
+$messages['noscriptwarning'] = 'Attenzione: questo servizio di webmail richiede Javascript! Per utilizzarlo abilita Javascript nelle impostazioni del tuo browser.';
 
+?>
diff --git a/program/localization/ja_JP/labels.inc b/program/localization/ja_JP/labels.inc
index bdefe85b7..6998f0623 100644
--- a/program/localization/ja_JP/labels.inc
+++ b/program/localization/ja_JP/labels.inc
@@ -2,60 +2,78 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ja_JP/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Takahiro Kambe                                                |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = '$productにようこそ';
-$labels['username'] = 'ユーザー名';
-$labels['password'] = 'パスワード';
-$labels['server'] = 'サーバー';
-$labels['login'] = 'ログイン';
-$labels['logout'] = 'ログアウト';
-$labels['mail'] = '電子メール';
+
+// login page
+$labels['welcome']   = '$productにようこそ';
+$labels['username']  = 'ユーザー名';
+$labels['password']  = 'パスワード';
+$labels['server']    = 'サーバー';
+$labels['login']     = 'ログイン';
+
+// taskbar
+$labels['logout']   = 'ログアウト';
+$labels['mail']     = '電子メール';
 $labels['settings'] = '設定';
 $labels['addressbook'] = 'アドレス帳';
-$labels['inbox'] = '受信箱';
+
+// mailbox names
+$labels['inbox']  = '受信箱';
 $labels['drafts'] = '下書き';
-$labels['sent'] = '送信済み';
-$labels['trash'] = 'ごみ箱';
-$labels['junk'] = '迷惑メール';
+$labels['sent']   = '送信済み';
+$labels['trash']  = 'ごみ箱';
+$labels['junk']   = '迷惑メール';
+
+// message listing
 $labels['subject'] = '件名';
-$labels['from'] = '発信者';
-$labels['to'] = '宛先';
-$labels['cc'] = '写し(Cc)';
-$labels['bcc'] = '隠した写し(Bcc)';
+$labels['from']    = '発信者';
+$labels['sender']  = '送信者';
+$labels['to']      = '宛先';
+$labels['cc']      = '写し(Cc)';
+$labels['bcc']     = '隠した写し(Bcc)';
 $labels['replyto'] = '返信先';
 $labels['followupto'] = 'Followup-To';
-$labels['date'] = '日付';
-$labels['size'] = '大きさ';
+$labels['date']    = '日付';
+$labels['size']    = '大きさ';
 $labels['priority'] = '優先度';
 $labels['organization'] = '企業名';
 $labels['readstatus'] = '閲覧の状態';
 $labels['listoptions'] = '一覧のオプション...';
+
 $labels['mailboxlist'] = 'フォルダー';
-$labels['folders'] = 'フォルダー';
 $labels['messagesfromto'] = '$count通の$from通目から$to通目のメッセージ';
 $labels['threadsfromto'] = '$count通の$from通目から$to通目のスレッド';
 $labels['messagenrof'] = '$count通の$nr通目のメッセージ';
 $labels['fromtoshort'] = '$count通の$from通目から$to通目';
-$labels['copy'] = 'コピー';
-$labels['move'] = '移動';
-$labels['moveto'] = 'フォルダーに移動';
+
+$labels['copy']     = 'コピー';
+$labels['move']     = '移動';
+$labels['moveto']   = 'フォルダーに移動';
 $labels['download'] = 'ダウンロード';
+$labels['open']     = '開く';
 $labels['showattachment'] = '表示';
 $labels['showanyway'] = 'とにかく表示';
+
 $labels['filename'] = 'ファイル名';
 $labels['filesize'] = 'ファイルの大きさ';
+
 $labels['addtoaddressbook'] = 'アドレス帳に追加';
+
+// weekdays short
 $labels['sun'] = '日';
 $labels['mon'] = '月';
 $labels['tue'] = '火';
@@ -63,78 +81,88 @@ $labels['wed'] = '水';
 $labels['thu'] = '木';
 $labels['fri'] = '金';
 $labels['sat'] = '土';
-$labels['sunday'] = '日曜日';
-$labels['monday'] = '月曜日';
-$labels['tuesday'] = '火曜日';
+
+// weekdays long
+$labels['sunday']    = '日曜日';
+$labels['monday']    = '月曜日';
+$labels['tuesday']   = '火曜日';
 $labels['wednesday'] = '水曜日';
-$labels['thursday'] = '木曜日';
-$labels['friday'] = '金曜日';
-$labels['saturday'] = '土曜日';
-$labels['jan'] = '1月';
-$labels['feb'] = '2月';
-$labels['mar'] = '3月';
-$labels['apr'] = '4月';
-$labels['may'] = '5月';
-$labels['longmay'] = '5月';
-$labels['jun'] = '6月';
-$labels['jul'] = '7月';
-$labels['aug'] = '8月';
-$labels['sep'] = '9月';
-$labels['oct'] = '10月';
-$labels['nov'] = '11月';
-$labels['dec'] = '12月';
-$labels['longjan'] = '1月';
-$labels['longfeb'] = '2月';
-$labels['longmar'] = '3月';
-$labels['longapr'] = '4月';
-$labels['longjun'] = '6月';
-$labels['longjul'] = '7月';
-$labels['longaug'] = '8月';
-$labels['longsep'] = '9月';
-$labels['longoct'] = '10月';
-$labels['longnov'] = '11月';
-$labels['longdec'] = '12月';
+$labels['thursday']  = '木曜日';
+$labels['friday']    = '金曜日';
+$labels['saturday']  = '土曜日';
+
+// months short
+$labels['jan']	= '1月';
+$labels['feb']	= '2月';
+$labels['mar']	= '3月';
+$labels['apr']	= '4月';
+$labels['may']	= '5月';
+$labels['jun']	= '6月';
+$labels['jul'] 	= '7月';
+$labels['aug']	= '8月';
+$labels['sep']	= '9月';
+$labels['oct']	= '10月';
+$labels['nov']	= '11月';
+$labels['dec']	= '12月';
+
+// months long
+$labels['longjan']	= '1月';
+$labels['longfeb']	= '2月';
+$labels['longmar']	= '3月';
+$labels['longapr']	= '4月';
+$labels['longmay']	= '5月';
+$labels['longjun']	= '6月';
+$labels['longjul']	= '7月';
+$labels['longaug']	= '8月';
+$labels['longsep']	= '9月';
+$labels['longoct']	= '10月';
+$labels['longnov']	= '11月';
+$labels['longdec']	= '12月';
+
 $labels['today'] = '今日';
-$labels['refresh'] = '再読込み';
-$labels['checkmail'] = '新しく届いたメッセージを確認';
-$labels['compose'] = 'メッセージの作成';
-$labels['writenewmessage'] = '新しいメッセージを作成';
-$labels['reply'] = '返信';
-$labels['replytomessage'] = '送信者に返信';
+
+// toolbar buttons
+$labels['refresh']          = '再読込み';
+$labels['checkmail']        = '新しく届いたメッセージを確認';
+$labels['compose']          = 'メッセージの作成';
+$labels['writenewmessage']  = '新しいメッセージを作成';
+$labels['reply']            = '返信';
+$labels['replytomessage']   = '送信者に返信';
 $labels['replytoallmessage'] = 'メーリングリスト、または送信者とすべての宛先に返信';
-$labels['replyall'] = '全員に返信';
-$labels['replylist'] = 'メーリングリストに返信';
-$labels['forward'] = '転送';
-$labels['forwardinline'] = '本文に挿入して転送';
+$labels['replyall']         = '全員に返信';
+$labels['replylist']        = 'メーリングリストに返信';
+$labels['forward']          = '転送';
+$labels['forwardinline']    = '本文に挿入して転送';
 $labels['forwardattachment'] = '添付ファイルとして転送';
-$labels['forwardmessage'] = 'メッセージを転送';
-$labels['deletemessage'] = 'メッセージを削除';
+$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['more'] = '続く';
-$labels['back'] = '戻る';
-$labels['options'] = 'オプション';
+$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['more']             = '続く';
+$labels['back']             = '戻る';
+$labels['options']          = 'オプション';
+
 $labels['select'] = '選択';
 $labels['all'] = 'すべて';
 $labels['none'] = 'なし';
-$labels['nonesort'] = 'なし';
 $labels['currpage'] = '現在のページ';
 $labels['unread'] = '未読';
 $labels['flagged'] = 'フラグ付き';
 $labels['unanswered'] = '未返信';
+$labels['withattachment'] = '添付ファイルあり';
 $labels['deleted'] = '削除済み';
 $labels['undeleted'] = '削除済みでない';
 $labels['invert'] = '反転';
@@ -145,12 +173,14 @@ $labels['expand-all'] = 'すべて展開';
 $labels['expand-unread'] = '未開封のメッセージを展開';
 $labels['collapse-all'] = 'すべて折りたたむ';
 $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['asc'] = '昇順';
@@ -159,147 +189,176 @@ $labels['listcolumns'] = '列を一覧';
 $labels['listsorting'] = '並べ替える列';
 $labels['listorder'] = '並べ替える順序';
 $labels['listmode'] = '一覧表示モード';
+
 $labels['folderactions'] = 'フォルダーの操作...';
 $labels['compact'] = '圧縮';
 $labels['empty'] = '空';
+
 $labels['quota'] = 'ディスクの使用状況';
-$labels['unknown'] = '不明';
-$labels['unlimited'] = '無制限';
-$labels['quicksearch'] = '高速検索';
-$labels['resetsearch'] = '検索を解除';
-$labels['searchmod'] = '検索の条件';
-$labels['msgtext'] = 'メッセージ全体';
+$labels['unknown']  = '不明';
+$labels['unlimited']  = '無制限';
+
+$labels['quicksearch']  = '高速検索';
+$labels['resetsearch']  = '検索を解除';
+$labels['searchmod']  = '検索の条件';
+$labels['msgtext']  = 'メッセージ全体';
+$labels['body']  = '本文';
+
 $labels['openinextwin'] = '新しいウィンドウで開く';
 $labels['emlsave'] = 'ダウンロード(.eml形式)';
-$labels['editasnew'] = '新しいメッセージとして編集';
-$labels['send'] = '送信';
-$labels['sendmessage'] = 'メッセージを送信';
-$labels['savemessage'] = '下書きとして保存';
-$labels['addattachment'] = 'ファイルを添付';
-$labels['charset'] = '文字セット';
-$labels['editortype'] = 'エディターの種類';
-$labels['returnreceipt'] = '開封確認';
-$labels['dsn'] = '配送状態通知';
+$labels['changeformattext'] = 'テキスト形式で表示';
+$labels['changeformathtml'] = 'HTML形式で表示';
+
+// message compose
+$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['editidents'] = '識別情報を編集';
-$labels['spellcheck'] = 'スペル';
+
+$labels['editidents']    = '識別情報を編集';
+$labels['spellcheck']    = 'スペル';
 $labels['checkspelling'] = 'スペルチェック';
 $labels['resumeediting'] = '編集を再開';
-$labels['revertto'] = '元に戻す';
+$labels['revertto']      = '元に戻す';
+
 $labels['attach'] = '添付';
 $labels['attachments'] = '添付ファイル';
 $labels['upload'] = 'アップロード';
 $labels['uploadprogress'] = '$percent ($current / $total)';
-$labels['close'] = '閉じる';
-$labels['messageoptions'] = 'メッセージのオプション...';
-$labels['low'] = '低';
-$labels['lowest'] = '最低';
-$labels['normal'] = '通常';
-$labels['high'] = '高';
+$labels['close']  = '閉じる';
+$labels['messageoptions']  = 'メッセージのオプション...';
+
+$labels['low']     = '低';
+$labels['lowest']  = '最低';
+$labels['normal']  = '通常';
+$labels['high']    = '高';
 $labels['highest'] = '最高';
-$labels['nosubject'] = '(件名なし)';
+
+$labels['nosubject']  = '(件名なし)';
 $labels['showimages'] = '画像を表示';
 $labels['alwaysshow'] = '$sender から届いた画像は常に表示';
-$labels['isdraft'] = 'これは下書きのメッセージです。';
-$labels['andnmore'] = 'さらに$nr件...';
+$labels['isdraft']    = 'これは下書きのメッセージです。';
+$labels['andnmore']   = 'さらに$nr件...';
 $labels['togglemoreheaders'] = 'さらにメッセージのヘッダーを表示';
 $labels['togglefullheaders'] = 'メッセージヘッダーの生の表示と切り替え';
+
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'テキスト';
 $labels['savesentmessagein'] = '送信したメッセージの保存先';
 $labels['dontsave'] = '保存しない';
 $labels['maxuploadsize'] = '添付可能なファイルは最大で$sizeです。';
+
 $labels['addcc'] = '写し(Cc)を追加';
 $labels['addbcc'] = '隠した写し(Bcc)を追加';
 $labels['addreplyto'] = '返信先(Reply-To)を追加';
 $labels['addfollowupto'] = 'フォロー先(Followup-Toを追加';
+
+// mdn
 $labels['mdnrequest'] = 'このメッセージを読んだときに、送信者が通知を受けたいと依頼しています。開封確認の通知を送信しますか?';
 $labels['receiptread'] = '開封確認(表示済み)';
 $labels['yourmessage'] = 'これはあなたが送信したメッセージに対する開封確認です。';
 $labels['receiptnote'] = '注意: この開封確認は、メッセージが宛先のコンピューターで表示されたことだけを知らせるものです。受信者がメッセージを読んだり、内容を理解したと保証するものではありません。';
-$labels['name'] = '表示名';
-$labels['firstname'] = '名';
-$labels['surname'] = '姓';
-$labels['middlename'] = 'ミドルネーム';
-$labels['nameprefix'] = '敬称(名前の前)';
-$labels['namesuffix'] = '敬称(名前の後)';
-$labels['nickname'] = 'ニックネーム';
-$labels['jobtitle'] = '職名';
-$labels['department'] = '部署名';
-$labels['gender'] = '性別';
-$labels['maidenname'] = '旧姓';
-$labels['email'] = '電子メール';
-$labels['phone'] = '電話番号';
-$labels['address'] = '住所';
-$labels['street'] = '住所';
-$labels['locality'] = '都市';
-$labels['zipcode'] = '郵便番号';
-$labels['region'] = '都道府県';
-$labels['country'] = '国';
-$labels['birthday'] = '誕生日';
-$labels['anniversary'] = '記念日';
-$labels['website'] = 'ウェブサイト';
+
+// address boook
+$labels['name']         = '表示名';
+$labels['firstname']    = '名';
+$labels['surname']      = '姓';
+$labels['middlename']   = 'ミドルネーム';
+$labels['nameprefix']   = '敬称(名前の前)';
+$labels['namesuffix']   = '敬称(名前の後)';
+$labels['nickname']     = 'ニックネーム';
+$labels['jobtitle']     = '職名';
+$labels['department']   = '部署名';
+$labels['gender']       = '性別';
+$labels['maidenname']   = '旧姓';
+$labels['email']        = '電子メール';
+$labels['phone']        = '電話番号';
+$labels['address']      = '住所';
+$labels['street']       = '住所';
+$labels['locality']     = '都市';
+$labels['zipcode']      = '郵便番号';
+$labels['region']       = '都道府県';
+$labels['country']      = '国';
+$labels['birthday']     = '誕生日';
+$labels['anniversary']  = '記念日';
+$labels['website']      = 'ウェブサイト';
 $labels['instantmessenger'] = 'インスタントメッセージ';
 $labels['notes'] = '注釈';
-$labels['male'] = '男性';
+$labels['male']   = '男性';
 $labels['female'] = '女性';
 $labels['manager'] = '管理者';
 $labels['assistant'] = 'アシスタント';
-$labels['typeassistant'] = 'アシスタント';
 $labels['spouse'] = '配偶者';
 $labels['allfields'] = 'すべての項目';
 $labels['search'] = '検索';
 $labels['advsearch'] = '高度な検索';
 $labels['advanced'] = '高度';
 $labels['other'] = 'その他';
-$labels['typeother'] = 'その他';
-$labels['typehome'] = '自宅';
-$labels['typework'] = '職場';
-$labels['typemobile'] = 'モバイル';
-$labels['typemain'] = '主回線';
-$labels['typehomefax'] = '自宅ファクス';
-$labels['typeworkfax'] = '職場のFax';
-$labels['typecar'] = '車';
-$labels['typepager'] = 'ページャー(ポケットベル)';
-$labels['typevideo'] = '動画';
-$labels['typehomepage'] = 'ホームページ';
+
+$labels['typehome']   = '自宅';
+$labels['typework']   = '職場';
+$labels['typeother']  = 'その他';
+$labels['typemobile']  = 'モバイル';
+$labels['typemain']  = '主回線';
+$labels['typehomefax']  = '自宅ファクス';
+$labels['typeworkfax']  = '職場のFax';
+$labels['typecar']  = '車';
+$labels['typepager']  = 'ページャー(ポケットベル)';
+$labels['typevideo']  = '動画';
+$labels['typeassistant']  = 'アシスタント';
+$labels['typehomepage']  = 'ホームページ';
 $labels['typeblog'] = 'ブログ';
 $labels['typeprofile'] = 'プロフィール';
+
 $labels['addfield'] = '項目を追加...';
 $labels['addcontact'] = '新しい連絡先を追加';
 $labels['editcontact'] = '連絡先を編集';
 $labels['contacts'] = '連絡先';
 $labels['contactproperties'] = '連絡先の属性';
 $labels['personalinfo'] = '個人情報';
-$labels['edit'] = '編集';
+
+$labels['edit']   = '編集';
 $labels['cancel'] = '取り消し';
-$labels['save'] = '保存';
+$labels['save']   = '保存';
 $labels['delete'] = '削除';
 $labels['rename'] = '名前を変更';
 $labels['addphoto'] = '追加';
 $labels['replacephoto'] = '置き換え';
 $labels['uploadphoto'] = '写真をアップロード';
-$labels['newcontact'] = '新しい連絡先カードを作成';
-$labels['deletecontact'] = '選択した連絡先を削除';
-$labels['composeto'] = 'この連絡先宛にメッセージを作成';
+
+$labels['newcontact']     = '新しい連絡先カードを作成';
+$labels['deletecontact']  = '選択した連絡先を削除';
+$labels['composeto']      = 'この連絡先宛にメッセージを作成';
 $labels['contactsfromto'] = '$count件の連絡先の$from件目から$to件目';
-$labels['print'] = '印刷';
-$labels['export'] = 'エクスポート';
-$labels['exportvcards'] = 'vCard形式でエクスポート';
+$labels['print']          = '印刷';
+$labels['export']         = 'エクスポート';
+$labels['exportall']      = 'すべてエクスポート';
+$labels['exportsel']      = '選択した連絡先をエクスポート';
+$labels['exportvcards']   = 'vCard形式でエクスポート';
 $labels['newcontactgroup'] = '連絡先グループを新しく作成';
-$labels['grouprename'] = 'グループ名を変更';
-$labels['groupdelete'] = 'グループを削除';
+$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'] = '検索情報を保存';
 $labels['searchdelete'] = '検索情報を削除';
+
 $labels['import'] = 'インポート';
 $labels['importcontacts'] = '連絡先をインポート';
 $labels['importfromfile'] = 'ファイルからインポート';
@@ -307,35 +366,43 @@ $labels['importtarget'] = 'アドレス帳に新しい連絡先の追加:';
 $labels['importreplace'] = 'アドレス帳全体と置き換え';
 $labels['importdesc'] = '連絡先を既存のアドレス帳からアップロードできます。<br />現在、<a href="http://ja.wikipedia.org/wiki/VCard">vCard</a>またはCSV(コンマ区切り)のデータ形式からアドレスのインポートをサポートしています。';
 $labels['done'] = '完了';
+
+// settings
 $labels['settingsfor'] = '次の設定:';
 $labels['about'] = 'このプログラムについて';
 $labels['preferences'] = '設定';
 $labels['userpreferences'] = 'ユーザー設定';
 $labels['editpreferences'] = 'ユーザー設定を変更';
+
 $labels['identities'] = '識別情報';
 $labels['manageidentities'] = 'このアカウントの識別情報を管理';
 $labels['newidentity'] = '新しい識別情報';
+
 $labels['newitem'] = '新しい項目';
 $labels['edititem'] = '項目の編集';
+
 $labels['preferhtml'] = 'HTMLを表示';
 $labels['defaultcharset'] = '初期設定の文字セット';
 $labels['htmlmessage'] = 'HTMLメッセージ';
+$labels['messagepart'] = 'パート';
+$labels['digitalsig'] = 'デジタル署名';
 $labels['dateformat'] = '日付の書式';
 $labels['timeformat'] = '時刻の書式';
 $labels['prettydate'] = '短い日付で表示';
-$labels['setdefault'] = '初期値を設定';
-$labels['autodetect'] = '自動識別';
-$labels['language'] = '言語';
-$labels['timezone'] = 'タイムゾーン';
-$labels['pagesize'] = '1ページの表示件数';
+$labels['setdefault']  = '初期値を設定';
+$labels['autodetect']  = '自動識別';
+$labels['language']  = '言語';
+$labels['timezone']  = 'タイムゾーン';
+$labels['pagesize']  = '1ページの表示件数';
 $labels['signature'] = '署名';
-$labels['dstactive'] = 'サマータイムを適用';
+$labels['dstactive']  = 'サマータイムを適用';
 $labels['showinextwin'] = '新しいウィンドウでメッセージを表示';
 $labels['composeextwin'] = '新しいウィンドウでメッセージを作成';
 $labels['htmleditor'] = '作成時にHTMLメッセージを使用';
 $labels['htmlonreply'] = '返信時にHTMLメッセージを使用';
 $labels['htmlonreplyandforward'] = '転送またはHTMLメッセージへの返信';
 $labels['htmlsignature'] = 'HTMLの署名';
+$labels['showemail'] = '電子メールアドレスを表示名と共に表示';
 $labels['previewpane'] = 'プレビュー枠の表示';
 $labels['skin'] = 'インターフェイスのスキン';
 $labels['logoutclear'] = 'ログアウト時にごみ箱の内容を消去';
@@ -358,11 +425,11 @@ $labels['showremoteimages'] = '外部のインライン画像を表示';
 $labels['fromknownsenders'] = '送信者が知人の場合';
 $labels['always'] = '常時';
 $labels['showinlineimages'] = 'メッセージに添付された画像を下に表示';
-$labels['autosavedraft'] = '自動的に下書きを保存';
-$labels['everynminutes'] = '$n分毎';
-$labels['refreshinterval'] = '再表示 (新しいメッセージの確認等)';
-$labels['never'] = 'しない';
-$labels['immediately'] = '即時';
+$labels['autosavedraft']  = '自動的に下書きを保存';
+$labels['everynminutes']  = '$n分毎';
+$labels['refreshinterval']  = '再表示 (新しいメッセージの確認等)';
+$labels['never']  = 'しない';
+$labels['immediately']  = '即時';
 $labels['messagesdisplaying'] = 'メッセージの表示';
 $labels['messagescomposition'] = 'メッセージの作成';
 $labels['mimeparamfolding'] = '添付ファイルの名前';
@@ -389,12 +456,9 @@ $labels['replyremovesignature'] = '返信時に元の署名をメッセージか
 $labels['autoaddsignature'] = '自動的に署名を付加';
 $labels['newmessageonly'] = '新しいメッセージだけ';
 $labels['replyandforwardonly'] = '返信と転送だけ';
-$labels['replysignaturepos'] = '返信や転送で署名を挿入する位置';
-$labels['belowquote'] = '引用の後';
-$labels['abovequote'] = '引用の前';
 $labels['insertsignature'] = '署名を挿入';
-$labels['previewpanemarkread'] = 'プレビューしたメッセージを既読に設定';
-$labels['afternseconds'] = '$n秒後';
+$labels['previewpanemarkread']  = 'プレビューしたメッセージを既読に設定';
+$labels['afternseconds']  = '$n秒後';
 $labels['reqmdn'] = '常に開封確認通知を要求';
 $labels['reqdsn'] = '常に配送状態通知を要求';
 $labels['replysamefolder'] = '返信したメッセージを元のメールと同じフォルダに保存';
@@ -411,13 +475,15 @@ $labels['mailtoprotohandler'] = 'mailto: のリンクを扱うプロトコル処
 $labels['forwardmode'] = 'メッセージの転送形式';
 $labels['inline'] = 'インライン';
 $labels['asattachment'] = '添付ファイル';
-$labels['folder'] = 'フォルダー';
-$labels['foldername'] = 'フォルダー名';
-$labels['subscribed'] = '購読済み';
+
+$labels['folder']  = 'フォルダー';
+$labels['folders']  = 'フォルダー';
+$labels['foldername']  = 'フォルダー名';
+$labels['subscribed']  = '購読済み';
 $labels['messagecount'] = 'メッセージ';
-$labels['create'] = '作成';
-$labels['createfolder'] = '新しいフォルダーを作成';
-$labels['managefolders'] = 'フォルダーを管理';
+$labels['create']  = '作成';
+$labels['createfolder']  = '新しいフォルダーを作成';
+$labels['managefolders']  = 'フォルダーを管理';
 $labels['specialfolders'] = '特殊なフォルダー';
 $labels['properties'] = '属性';
 $labels['folderproperties'] = 'フォルダーの属性';
@@ -427,23 +493,29 @@ $labels['info'] = '情報';
 $labels['getfoldersize'] = 'クリックしてフォルダーの大きさを取得';
 $labels['changesubscription'] = 'クリックして購読状態を変更';
 $labels['foldertype'] = 'フォルダーの種類';
-$labels['personalfolder'] = '個人フォルダー';
-$labels['otherfolder'] = '他のユーザーのフォルダー';
-$labels['sharedfolder'] = '公開フォルダー';
+$labels['personalfolder']  = '個人フォルダー';
+$labels['otherfolder']  = '他のユーザーのフォルダー';
+$labels['sharedfolder']  = '公開フォルダー';
+
 $labels['sortby'] = '並べ替え';
-$labels['sortasc'] = '昇順で並べ替え';
+$labels['sortasc']  = '昇順で並べ替え';
 $labels['sortdesc'] = '降順で並べ替え';
 $labels['undo'] = '取り消し';
+
 $labels['installedplugins'] = 'インストールしているプラグイン';
 $labels['plugin'] = 'プラグイン';
 $labels['version'] = 'バージョン';
 $labels['source'] = 'ソース';
 $labels['license'] = 'ライセンス';
 $labels['support'] = 'サポートを得る';
+
+// units
 $labels['B'] = 'バイト';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
 $labels['GB'] = 'GB';
+
+// character sets
 $labels['unicode'] = 'Unicode';
 $labels['english'] = '英語';
 $labels['westerneuropean'] = '西ヨーロッパ言語';
@@ -463,3 +535,4 @@ $labels['japanese'] = '日本語';
 $labels['korean'] = '韓国語';
 $labels['chinese'] = '中国語';
 
+?>
diff --git a/program/localization/ja_JP/messages.inc b/program/localization/ja_JP/messages.inc
index b465e9f54..f4dd0fceb 100644
--- a/program/localization/ja_JP/messages.inc
+++ b/program/localization/ja_JP/messages.inc
@@ -2,20 +2,23 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ja_JP/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Takahiro Kambe                                                |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['errortitle'] = 'エラーが発生しました!';
-$messages['loginfailed'] = 'ログインできませんでした。';
+$messages['errortitle']  = 'エラーが発生しました!';
+$messages['loginfailed']  = 'ログインできませんでした。';
 $messages['cookiesdisabled'] = 'ブラウザーがCookieを受け付けません。';
 $messages['sessionerror'] = 'セッションが正しくないか期限が切れています。';
 $messages['storageerror'] = 'IMAP サーバーへの接続に失敗しました。';
@@ -25,6 +28,8 @@ $messages['dberror'] = 'データベースのエラーです!';
 $messages['requesttimedout'] = 'リクエストのタイムアウト';
 $messages['errorreadonly'] = '操作を実行できませんでした。フォルダーは読み込み専用です。';
 $messages['errornoperm'] = '操作を実行できませんでした。権限がありません。';
+$messages['erroroverquota'] = '操作を実行できませんでした。空きディスク容量がありません。';
+$messages['erroroverquotadelete'] = '空きディスク容量がありません。メッセージを削除するには SHIFT+DEL を使用してください。';
 $messages['invalidrequest'] = '不正なリクエストです!  データは保存していません。';
 $messages['invalidhost'] = '正しくないサーバー名です。';
 $messages['nomessagesfound'] = 'このフォルダーにはメッセージはありません。';
@@ -57,11 +62,11 @@ $messages['errormoving'] = 'メッセージを移動できません。';
 $messages['errorcopying'] = 'メッセージをコピーできません。';
 $messages['errordeleting'] = 'メッセージを削除できません。';
 $messages['errormarking'] = 'メッセージにマークを設定できません。';
-$messages['deletecontactconfirm'] = '選択した連絡先を本当に削除しますか?';
-$messages['deletegroupconfirm'] = 'このグループを本当に削除しますか?';
+$messages['deletecontactconfirm']  = '選択した連絡先を本当に削除しますか?';
+$messages['deletegroupconfirm']  = 'このグループを本当に削除しますか?';
 $messages['deletemessagesconfirm'] = '選択したメールを本当に削除しますか?';
-$messages['deletefolderconfirm'] = 'このフォルダーを本当に削除しますか?';
-$messages['purgefolderconfirm'] = 'このフォルダーのすべてのメールを本当に削除しますか?';
+$messages['deletefolderconfirm']  = 'このフォルダーを本当に削除しますか?';
+$messages['purgefolderconfirm']  = 'このフォルダーのすべてのメールを本当に削除しますか?';
 $messages['contactdeleting'] = '連絡先を削除中...';
 $messages['groupdeleting'] = 'グループを削除中...';
 $messages['folderdeleting'] = 'フォルダーを削除中...';
@@ -70,11 +75,11 @@ $messages['foldersubscribing'] = 'フォルダーを購読中...';
 $messages['folderunsubscribing'] = 'フォルダーの購読を解除中...';
 $messages['formincomplete'] = 'フォームに未記入の項目があります。';
 $messages['noemailwarning'] = '正しい電子メールアドレスを入力してください。';
-$messages['nonamewarning'] = '名前を入力してください。';
+$messages['nonamewarning']  = '名前を入力してください。';
 $messages['nopagesizewarning'] = 'ページのサイズを入力してください。';
 $messages['nosenderwarning'] = '送信者の電子メールアドレスを入力してください。';
 $messages['norecipientwarning'] = '少なくとも1つ宛先を入力してください。';
-$messages['nosubjectwarning'] = '件名(Subject)の欄が空です。今、入力しますか?';
+$messages['nosubjectwarning']  = '件名(Subject)の欄が空です。今、入力しますか?';
 $messages['nobodywarning'] = '本文の無いメッセージを送信しますか?';
 $messages['notsentwarning'] = 'メッセージを送信しませんでした。このメッセージを破棄しますか。';
 $messages['noldapserver'] = '検索するLDAPサーバーを選択してください。';
@@ -163,3 +168,4 @@ $messages['messagetoobig'] = 'その処理をするにはメッセージ部分�
 $messages['attachmentvalidationerror'] = '警告!  この添付ファイルはメッセージの宣言と一致しない種類という理由のため疑わしいです。送信者を信頼できないなら、悪意のある内容を含んでいるかもしれないのでブラウザーで開いてはなりません。<br/><br/><em>予測した種類: $expected; 発見した種類: $found</em>';
 $messages['noscriptwarning'] = '警告: このウェブメールサービスにはJavascriptが必要です!  使用するにはJavascriptをブラウザーの設定で有効にしてください。';
 
+?>
diff --git a/program/localization/ka_GE/labels.inc b/program/localization/ka_GE/labels.inc
index 1bd9ccb3f..3ab3b6e63 100755
--- a/program/localization/ka_GE/labels.inc
+++ b/program/localization/ka_GE/labels.inc
@@ -2,52 +2,78 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ka_GE/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = 'მოგესალმებათ $product';
-$labels['username'] = 'მომხმარებელი';
-$labels['password'] = 'პაროლი';
-$labels['server'] = 'სერვერი';
-$labels['login'] = 'შესვლა';
-$labels['logout'] = 'გამოსვლა';
-$labels['mail'] = 'ელფოსტა';
+
+// login page
+$labels['welcome']   = 'მოგესალმებათ $product';
+$labels['username']  = 'მომხმარებელი';
+$labels['password']  = 'პაროლი';
+$labels['server']    = 'სერვერი';
+$labels['login']     = 'შესვლა';
+
+// taskbar
+$labels['logout']   = 'გამოსვლა';
+$labels['mail']     = 'ელფოსტა';
 $labels['settings'] = 'პარამეტრები';
 $labels['addressbook'] = 'მისამართები';
-$labels['inbox'] = 'მიღებული';
+
+// mailbox names
+$labels['inbox']  = 'მიღებული';
 $labels['drafts'] = 'დროებითი';
-$labels['sent'] = 'გაგზავნილი';
-$labels['trash'] = 'წაშლილი';
-$labels['junk'] = 'სპამი';
+$labels['sent']   = 'გაგზავნილი';
+$labels['trash']  = 'წაშლილი';
+$labels['junk']   = 'სპამი';
+
+// message listing
 $labels['subject'] = 'სათაური';
-$labels['from'] = 'გამგზავნი';
-$labels['to'] = 'ვის';
-$labels['cc'] = 'ასლი';
-$labels['bcc'] = 'ფარული';
+$labels['from']    = 'გამგზავნი';
+$labels['sender']  = 'Sender';
+$labels['to']      = 'ვის';
+$labels['cc']      = 'ასლი';
+$labels['bcc']     = 'ფარული';
 $labels['replyto'] = 'პასუხი';
-$labels['date'] = 'თარიღი';
-$labels['size'] = 'ზომა';
+$labels['followupto'] = 'Followup-To';
+$labels['date']    = 'თარიღი';
+$labels['size']    = 'ზომა';
 $labels['priority'] = 'პრიორიტეტი';
 $labels['organization'] = 'ორგანიზაცია';
+$labels['readstatus'] = 'Read status';
+$labels['listoptions'] = 'List options...';
+
 $labels['mailboxlist'] = 'საქაღალდეები';
-$labels['folders'] = 'საქაღალდეები';
+$labels['messagesfromto'] = 'Messages $from to $to of $count';
+$labels['threadsfromto'] = 'Threads $from to $to of $count';
 $labels['messagenrof'] = 'შეტყობინება $nr დან $count';
-$labels['copy'] = 'ასლი';
-$labels['move'] = 'გადატანა';
-$labels['moveto'] = 'გადატანა...';
+$labels['fromtoshort'] = '$from – $to of $count';
+
+$labels['copy']     = 'ასლი';
+$labels['move']     = 'გადატანა';
+$labels['moveto']   = 'გადატანა...';
 $labels['download'] = 'გადმოწერა';
+$labels['open']     = 'Open';
+$labels['showattachment'] = 'Show';
+$labels['showanyway'] = 'Show it anyway';
+
 $labels['filename'] = 'ფაილის სახელი';
 $labels['filesize'] = 'ფაილის ზომა';
+
 $labels['addtoaddressbook'] = 'მისამართებში დამატება';
+
+// weekdays short
 $labels['sun'] = 'კვი';
 $labels['mon'] = 'ორშ';
 $labels['tue'] = 'სამ';
@@ -55,219 +81,328 @@ $labels['wed'] = 'ოთხ';
 $labels['thu'] = 'ხუთ';
 $labels['fri'] = 'პარ';
 $labels['sat'] = 'შაბ';
-$labels['sunday'] = 'კვირა';
-$labels['monday'] = 'ორშაბათი';
-$labels['tuesday'] = 'სამშაბათი';
+
+// weekdays long
+$labels['sunday']    = 'კვირა';
+$labels['monday']    = 'ორშაბათი';
+$labels['tuesday']   = 'სამშაბათი';
 $labels['wednesday'] = 'ოთხშაბათი';
-$labels['thursday'] = 'ხუთშაბათი';
-$labels['friday'] = 'პარასკევი';
-$labels['saturday'] = 'შაბათი';
-$labels['jan'] = 'იან';
-$labels['feb'] = 'თებ';
-$labels['mar'] = 'მარ';
-$labels['apr'] = 'აპრ';
-$labels['may'] = 'მაისი';
-$labels['longmay'] = 'მაისი';
-$labels['jun'] = 'ივნ';
-$labels['jul'] = 'ივლ';
-$labels['aug'] = 'აგვ';
-$labels['sep'] = 'სექ';
-$labels['oct'] = 'ოქტ';
-$labels['nov'] = 'ნოე';
-$labels['dec'] = 'დეკ';
-$labels['longjan'] = 'იანვარი';
-$labels['longfeb'] = 'თებერვალი';
-$labels['longmar'] = 'მარტი';
-$labels['longapr'] = 'აპრილი';
-$labels['longjun'] = 'ივნისი';
-$labels['longjul'] = 'ივლისი';
-$labels['longaug'] = 'აგვისტო';
-$labels['longsep'] = 'სექტემბერი';
-$labels['longoct'] = 'ოქტომბერი';
-$labels['longnov'] = 'ნოემბერი';
-$labels['longdec'] = 'დეკემბერი';
+$labels['thursday']  = 'ხუთშაბათი';
+$labels['friday']    = 'პარასკევი';
+$labels['saturday']  = 'შაბათი';
+
+// months short
+$labels['jan']	= 'იან';
+$labels['feb']	= 'თებ';
+$labels['mar']	= 'მარ';
+$labels['apr']	= 'აპრ';
+$labels['may']	= 'მაისი';
+$labels['jun']	= 'ივნ';
+$labels['jul'] 	= 'ივლ';
+$labels['aug']	= 'აგვ';
+$labels['sep']	= 'სექ';
+$labels['oct']	= 'ოქტ';
+$labels['nov']	= 'ნოე';
+$labels['dec']	= 'დეკ';
+
+// months long
+$labels['longjan']	= 'იანვარი';
+$labels['longfeb']	= 'თებერვალი';
+$labels['longmar']	= 'მარტი';
+$labels['longapr']	= 'აპრილი';
+$labels['longmay']	= 'მაისი';
+$labels['longjun']	= 'ივნისი';
+$labels['longjul']	= 'ივლისი';
+$labels['longaug']	= 'აგვისტო';
+$labels['longsep']	= 'სექტემბერი';
+$labels['longoct']	= 'ოქტომბერი';
+$labels['longnov']	= 'ნოემბერი';
+$labels['longdec']	= 'დეკემბერი';
+
 $labels['today'] = 'დღეს';
-$labels['checkmail'] = 'შემოწმება ახალ შეტყობინებაზე';
-$labels['compose'] = 'შეტყობინების დაწერა';
-$labels['writenewmessage'] = 'ახალი შეტყობინება';
-$labels['replytomessage'] = 'პასუხი';
+
+// toolbar buttons
+$labels['refresh']          = 'Refresh';
+$labels['checkmail']        = 'შემოწმება ახალ შეტყობინებაზე';
+$labels['compose']          = 'შეტყობინების დაწერა';
+$labels['writenewmessage']  = 'ახალი შეტყობინება';
+$labels['reply']            = 'Reply';
+$labels['replytomessage']   = 'პასუხი';
 $labels['replytoallmessage'] = 'პასუხი ყველას';
-$labels['forwardmessage'] = 'გადაგზავნა';
-$labels['deletemessage'] = 'წაშლა';
+$labels['replyall']         = 'Reply all';
+$labels['replylist']        = 'Reply list';
+$labels['forward']          = 'Forward';
+$labels['forwardinline']    = 'Forward inline';
+$labels['forwardattachment'] = 'Forward as attachment';
+$labels['forwardmessage']   = 'გადაგზავნა';
+$labels['deletemessage']    = 'წაშლა';
 $labels['movemessagetotrash'] = 'შეტყობინების წაშლილებში გადატანა';
-$labels['printmessage'] = 'შეტყობინების ამობეჭვდა';
-$labels['previousmessage'] = 'წინა შეტყობინების ნახვა';
-$labels['firstmessage'] = 'პირველი შეტყობინების ნახვა';
-$labels['nextmessage'] = 'შემდეგი შეტყობინების ნახვა';
-$labels['lastmessage'] = 'ბოლო შეტყობინების ნახვა';
-$labels['backtolist'] = 'უკან ჩამონათვალში';
-$labels['viewsource'] = 'შიგთავსი';
-$labels['markmessages'] = 'მონიშნეთ შეტყობინებები';
-$labels['markread'] = 'როგორც წაკითხული';
-$labels['markunread'] = 'როგორც წაუკითხავი';
-$labels['markflagged'] = 'როგორც მონიშნული';
-$labels['markunflagged'] = 'როგორც მოუნიშნავი';
-$labels['moreactions'] = 'მეტი მოქმედება...';
+$labels['printmessage']     = 'შეტყობინების ამობეჭვდა';
+$labels['previousmessage']  = 'წინა შეტყობინების ნახვა';
+$labels['firstmessage']     = 'პირველი შეტყობინების ნახვა';
+$labels['nextmessage']      = 'შემდეგი შეტყობინების ნახვა';
+$labels['lastmessage']      = 'ბოლო შეტყობინების ნახვა';
+$labels['backtolist']       = 'უკან ჩამონათვალში';
+$labels['viewsource']       = 'შიგთავსი';
+$labels['mark']             = 'Mark';
+$labels['markmessages']     = 'მონიშნეთ შეტყობინებები';
+$labels['markread']         = 'როგორც წაკითხული';
+$labels['markunread']       = 'როგორც წაუკითხავი';
+$labels['markflagged']      = 'როგორც მონიშნული';
+$labels['markunflagged']    = 'როგორც მოუნიშნავი';
+$labels['moreactions']      = 'მეტი მოქმედება...';
+$labels['more']             = 'More';
+$labels['back']             = 'Back';
+$labels['options']          = 'Options';
+
 $labels['select'] = 'მონიშვნა';
 $labels['all'] = 'ყველა';
 $labels['none'] = 'არცერთი';
-$labels['nonesort'] = 'არცერთი';
 $labels['currpage'] = 'მიმდინარე გვერდი';
 $labels['unread'] = 'წაუკითხავი';
 $labels['flagged'] = 'მონიშნული';
 $labels['unanswered'] = 'უპასუხო';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'წაშლილი';
+$labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'შებრუნებული';
 $labels['filter'] = 'ფილტრი';
 $labels['list'] = 'სია';
+$labels['threads'] = 'Threads';
 $labels['expand-all'] = 'ყველას გაშლა';
 $labels['expand-unread'] = 'წაუკითხავის გაშლა';
 $labels['collapse-all'] = 'ყველას დაკეცვა';
+$labels['threaded'] = 'Threaded';
+
+$labels['autoexpand_threads'] = 'Expand message threads';
+$labels['do_expand'] = 'all threads';
+$labels['expand_only_unread'] = 'only with unread messages';
 $labels['fromto'] = 'ვისგან/ვის';
 $labels['flag'] = 'დროშა';
 $labels['attachment'] = 'მიმაგრებული ფაილი';
+$labels['nonesort'] = 'არცერთი';
 $labels['sentdate'] = 'გაგზავნის თარიღი';
+$labels['arrival'] = 'Arrival date';
 $labels['asc'] = 'ზრდადობით';
 $labels['desc'] = 'კლებადობით';
+$labels['listcolumns'] = 'List columns';
+$labels['listsorting'] = 'Sorting column';
 $labels['listorder'] = 'დალაგება';
+$labels['listmode'] = 'List view mode';
+
+$labels['folderactions'] = 'Folder actions...';
 $labels['compact'] = 'შეკუმშვა';
 $labels['empty'] = 'გაცარიელება';
+
 $labels['quota'] = 'შეზღუდვა';
-$labels['unknown'] = 'უცნობი';
-$labels['unlimited'] = 'შეუზღუდავი';
-$labels['quicksearch'] = 'სწრაფი ძიება';
-$labels['resetsearch'] = 'ძიების გასუფთავება';
-$labels['searchmod'] = 'ძებნის ვარიანტები';
-$labels['msgtext'] = 'ყველა შეტყობინება';
+$labels['unknown']  = 'უცნობი';
+$labels['unlimited']  = 'შეუზღუდავი';
+
+$labels['quicksearch']  = 'სწრაფი ძიება';
+$labels['resetsearch']  = 'ძიების გასუფთავება';
+$labels['searchmod']  = 'ძებნის ვარიანტები';
+$labels['msgtext']  = 'ყველა შეტყობინება';
+$labels['body']  = 'Body';
+
 $labels['openinextwin'] = 'გახსნა ახალ ფანჯარაში';
 $labels['emlsave'] = 'გადმოწერა (.eml)';
-$labels['editasnew'] = 'რედაქტირება როგორც ახლის';
-$labels['sendmessage'] = 'შეტყობინების გაგზავნა';
-$labels['savemessage'] = 'დროებით შენახვა';
-$labels['addattachment'] = 'ფაილის ატვირთვა';
-$labels['charset'] = 'კოდირება';
-$labels['editortype'] = 'რედაქტორი';
-$labels['returnreceipt'] = 'პასუხის მოთხოვნა';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
+
+// message compose
+$labels['editasnew']      = 'რედაქტირება როგორც ახლის';
+$labels['send']           = 'Send';
+$labels['sendmessage']    = 'შეტყობინების გაგზავნა';
+$labels['savemessage']    = 'დროებით შენახვა';
+$labels['addattachment']  = 'ფაილის ატვირთვა';
+$labels['charset']        = 'კოდირება';
+$labels['editortype']     = 'რედაქტორი';
+$labels['returnreceipt']  = 'პასუხის მოთხოვნა';
+$labels['dsn']            = 'Delivery status notification';
+$labels['mailreplyintro'] = 'On $date, $sender wrote:';
+$labels['originalmessage'] = 'Original Message';
+
+$labels['editidents']    = 'Edit identities';
+$labels['spellcheck']    = 'Spell';
 $labels['checkspelling'] = 'ორთოგრაფიული შემოწმება';
 $labels['resumeediting'] = 'რედაქტირების გაგრძელება';
-$labels['revertto'] = 'გაუქმება';
+$labels['revertto']      = 'გაუქმება';
+
+$labels['attach'] = 'Attach';
 $labels['attachments'] = 'გზავნილები';
 $labels['upload'] = 'ატვირთვა';
-$labels['close'] = 'დახურვა';
-$labels['low'] = 'დაბალი';
-$labels['lowest'] = 'უდაბლესი';
-$labels['normal'] = 'საშუალო';
-$labels['high'] = 'მაღალი';
+$labels['uploadprogress'] = '$percent ($current from $total)';
+$labels['close']  = 'დახურვა';
+$labels['messageoptions']  = 'Message options...';
+
+$labels['low']     = 'დაბალი';
+$labels['lowest']  = 'უდაბლესი';
+$labels['normal']  = 'საშუალო';
+$labels['high']    = 'მაღალი';
 $labels['highest'] = 'უმაღლესი';
-$labels['nosubject'] = '(უსათაურო)';
+
+$labels['nosubject']  = '(უსათაურო)';
 $labels['showimages'] = 'გამოსახულების ჩვენება';
 $labels['alwaysshow'] = 'ყოველთვის გამოაჩინე სურათები $sender –გან';
+$labels['isdraft']    = 'This is a draft message.';
+$labels['andnmore']   = '$nr more...';
+$labels['togglemoreheaders'] = 'Show more message headers';
+$labels['togglefullheaders'] = 'Toggle raw message headers';
+
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'ტექსტური';
 $labels['savesentmessagein'] = 'შეინახე შეტყობინება';
 $labels['dontsave'] = 'არ შეინახო';
 $labels['maxuploadsize'] = 'მაქსიმალური დაშვებული ფაილის ზომა $size';
+
 $labels['addcc'] = 'დაამატე კოპიო';
 $labels['addbcc'] = 'დაამატე ფარული კოპიო';
 $labels['addreplyto'] = 'დაამატე გამომგზავნი';
+$labels['addfollowupto'] = 'Add Followup-To';
+
+// mdn
 $labels['mdnrequest'] = 'გამომგზავნს სურს შეიტყოს წერილის მიღება. გსურთ შეატყობინოთ გამომგზავნს?';
 $labels['receiptread'] = 'გზავნილის დაბრუნება';
 $labels['yourmessage'] = 'ეს არის მიღების დასტური თქვენს შეტყობინებაზე';
 $labels['receiptnote'] = 'განმარტება: ეს ნიშნავს რომ ადრესატმა მიიღო შეტყობინება. მაგრამ, არ ნიშნავს რომ წაიკითხა ან გაიგო ტექსტი';
-$labels['name'] = 'სრული სახელი';
-$labels['firstname'] = 'სახელი';
-$labels['surname'] = 'გვარი';
-$labels['department'] = 'დეპარტამენტი';
-$labels['gender'] = 'სქესი';
-$labels['email'] = 'ელ–ფოსტა';
-$labels['phone'] = 'ტელეფონი';
-$labels['address'] = 'მისამართი';
-$labels['street'] = 'ქუჩა';
-$labels['locality'] = 'ქალაქი';
-$labels['zipcode'] = 'ZIP კოდი';
-$labels['region'] = 'შტატი/პროვინცია';
-$labels['country'] = 'ქვეყანა';
-$labels['birthday'] = 'დაბადების დღე';
-$labels['website'] = 'ვებგვერდი';
-$labels['male'] = 'მამრობითი';
+
+// address boook
+$labels['name']         = 'სრული სახელი';
+$labels['firstname']    = 'სახელი';
+$labels['surname']      = 'გვარი';
+$labels['middlename']   = 'Middle Name';
+$labels['nameprefix']   = 'Prefix';
+$labels['namesuffix']   = 'Suffix';
+$labels['nickname']     = 'Nickname';
+$labels['jobtitle']     = 'Job Title';
+$labels['department']   = 'დეპარტამენტი';
+$labels['gender']       = 'სქესი';
+$labels['maidenname']   = 'Maiden Name';
+$labels['email']        = 'ელ–ფოსტა';
+$labels['phone']        = 'ტელეფონი';
+$labels['address']      = 'მისამართი';
+$labels['street']       = 'ქუჩა';
+$labels['locality']     = 'ქალაქი';
+$labels['zipcode']      = 'ZIP კოდი';
+$labels['region']       = 'შტატი/პროვინცია';
+$labels['country']      = 'ქვეყანა';
+$labels['birthday']     = 'დაბადების დღე';
+$labels['anniversary']  = 'Anniversary';
+$labels['website']      = 'ვებგვერდი';
+$labels['instantmessenger'] = 'IM';
+$labels['notes'] = 'Notes';
+$labels['male']   = 'მამრობითი';
 $labels['female'] = 'მდედრობით';
 $labels['manager'] = 'მენეჯერი';
+$labels['assistant'] = 'Assistant';
+$labels['spouse'] = 'Spouse';
 $labels['allfields'] = 'ყველა ველი';
 $labels['search'] = 'ძებნა';
 $labels['advsearch'] = 'გაფართოებული ძებნა';
+$labels['advanced'] = 'Advanced';
 $labels['other'] = 'სხვა';
-$labels['typeother'] = 'სხვა';
-$labels['typehome'] = 'სახლი';
-$labels['typework'] = 'სამსახური';
-$labels['typemobile'] = 'მობილური';
-$labels['typemain'] = 'ძირითადი';
-$labels['typehomefax'] = 'სახლის ფაქსი';
-$labels['typeworkfax'] = 'სამსახურის ფაქსი';
-$labels['typecar'] = 'მანქანა';
-$labels['typepager'] = 'პეიჯერი';
-$labels['typevideo'] = 'ვიდეო';
+
+$labels['typehome']   = 'სახლი';
+$labels['typework']   = 'სამსახური';
+$labels['typeother']  = 'სხვა';
+$labels['typemobile']  = 'მობილური';
+$labels['typemain']  = 'ძირითადი';
+$labels['typehomefax']  = 'სახლის ფაქსი';
+$labels['typeworkfax']  = 'სამსახურის ფაქსი';
+$labels['typecar']  = 'მანქანა';
+$labels['typepager']  = 'პეიჯერი';
+$labels['typevideo']  = 'ვიდეო';
+$labels['typeassistant']  = 'Assistant';
+$labels['typehomepage']  = 'Home Page';
 $labels['typeblog'] = 'ბლოგი';
 $labels['typeprofile'] = 'პროფილი';
+
 $labels['addfield'] = 'ველის დამატება...';
 $labels['addcontact'] = 'კონტაქტებში დამატება';
 $labels['editcontact'] = 'კონტაქტის რედაქტირება';
 $labels['contacts'] = 'კონტაქტები';
+$labels['contactproperties'] = 'Contact properties';
 $labels['personalinfo'] = 'პირადი ინფორმაცია';
-$labels['edit'] = 'რედაქტირება';
+
+$labels['edit']   = 'რედაქტირება';
 $labels['cancel'] = 'გაუქმება';
-$labels['save'] = 'შენახვა';
+$labels['save']   = 'შენახვა';
 $labels['delete'] = 'წაშლა';
 $labels['rename'] = 'გადარქმევა';
 $labels['addphoto'] = 'დამატება';
 $labels['replacephoto'] = 'გამოცვლა';
-$labels['newcontact'] = 'კონტაქტის შექმნა';
-$labels['deletecontact'] = 'მონიშნელი კონტაქტის წაშლა';
-$labels['composeto'] = 'ფოსტის გაგზავნა შერჩეულ ადრესატებთან';
+$labels['uploadphoto'] = 'Upload photo';
+
+$labels['newcontact']     = 'კონტაქტის შექმნა';
+$labels['deletecontact']  = 'მონიშნელი კონტაქტის წაშლა';
+$labels['composeto']      = 'ფოსტის გაგზავნა შერჩეულ ადრესატებთან';
 $labels['contactsfromto'] = 'კონტაქტები $from დან $to ში $count';
-$labels['print'] = 'დაბეჭვდა';
-$labels['export'] = 'ექსპორტი';
-$labels['exportvcards'] = 'კონტაქტების ექსპორტი vCard ფორმატში';
+$labels['print']          = 'დაბეჭვდა';
+$labels['export']         = 'ექსპორტი';
+$labels['exportall']      = 'Export all';
+$labels['exportsel']      = 'Export selected';
+$labels['exportvcards']   = 'კონტაქტების ექსპორტი vCard ფორმატში';
 $labels['newcontactgroup'] = 'ახალი საკონტაქტო ჯგუფის შექმნა';
-$labels['grouprename'] = 'ჯგუფის სახელის შეცვლა';
-$labels['groupdelete'] = 'ჯგუფის წაშლა';
-$labels['previouspage'] = 'წინას ჩვენება';
-$labels['firstpage'] = 'პირველის ჩვენება';
-$labels['nextpage'] = 'შემდეგის ჩვენება';
-$labels['lastpage'] = 'ბოლოს ჩვენება';
+$labels['grouprename']    = 'ჯგუფის სახელის შეცვლა';
+$labels['groupdelete']    = 'ჯგუფის წაშლა';
+$labels['groupremoveselected'] = 'Remove selected contacts from group';
+
+$labels['previouspage']   = 'წინას ჩვენება';
+$labels['firstpage']      = 'პირველის ჩვენება';
+$labels['nextpage']       = 'შემდეგის ჩვენება';
+$labels['lastpage']       = 'ბოლოს ჩვენება';
+
 $labels['group'] = 'ჯგუფი';
 $labels['groups'] = 'ჯგუფები';
 $labels['personaladrbook'] = 'პერსონალური მისამართები';
+
 $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['done'] = 'დასრულებულია';
+
+// settings
 $labels['settingsfor'] = 'პარამეტრები';
+$labels['about'] = 'About';
 $labels['preferences'] = 'პარამეტრები';
 $labels['userpreferences'] = 'მომხმარებლის პარამეტრები';
 $labels['editpreferences'] = 'მომხმარებლის პარამეტრების რედაქტირება';
+
 $labels['identities'] = 'პროფილები';
 $labels['manageidentities'] = 'პროფილების მართვა';
 $labels['newidentity'] = 'ახალი პროფილი';
+
 $labels['newitem'] = 'ახალი';
 $labels['edititem'] = 'რედაქტირება';
+
 $labels['preferhtml'] = 'როგორც HTML';
 $labels['defaultcharset'] = 'ნაგულისხმები სიმბოლოთა ნაკრები';
 $labels['htmlmessage'] = 'HTML შეტყობინება';
+$labels['messagepart'] = 'Part';
+$labels['digitalsig'] = 'Digital Signature';
 $labels['dateformat'] = 'თარიღის ფორმატი';
 $labels['timeformat'] = 'დროის ფორმატი';
 $labels['prettydate'] = 'კარგი თარიღები';
-$labels['setdefault'] = 'როგორც ზოგაგად';
-$labels['autodetect'] = 'ავტომატური';
-$labels['language'] = 'ენა';
-$labels['timezone'] = 'დროითი ზონა';
-$labels['pagesize'] = 'სტრიქონი გვერდზე';
+$labels['setdefault']  = 'როგორც ზოგაგად';
+$labels['autodetect']  = 'ავტომატური';
+$labels['language']  = 'ენა';
+$labels['timezone']  = 'დროითი ზონა';
+$labels['pagesize']  = 'სტრიქონი გვერდზე';
 $labels['signature'] = 'ხელმოწერა';
-$labels['dstactive'] = 'დროის გადაყვანა';
+$labels['dstactive']  = 'დროის გადაყვანა';
+$labels['showinextwin'] = 'Open message in a new window';
+$labels['composeextwin'] = 'Compose in a new window';
 $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'] = 'წაშლილების გასუფთავება გამოსვლისას';
@@ -278,18 +413,23 @@ $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'] = 'If moving messages to Trash fails, delete them';
+$labels['deletejunk'] = 'Directly delete messages in Junk';
 $labels['showremoteimages'] = 'გამოაჩინე მოშორებული სურათები';
 $labels['fromknownsenders'] = 'ნაცნობი მგზავნელებისგან';
 $labels['always'] = 'ყოველთვის';
 $labels['showinlineimages'] = 'ატვირთული სურათები გამოაჩინე გზავნილის ქვემოთ';
-$labels['autosavedraft'] = 'ავტომატური შენახვა';
-$labels['everynminutes'] = 'ყოველ $n წუთში';
-$labels['never'] = 'არასდროს';
-$labels['immediately'] = 'დაუყონებლივ';
+$labels['autosavedraft']  = 'ავტომატური შენახვა';
+$labels['everynminutes']  = 'ყოველ $n წუთში';
+$labels['refreshinterval']  = 'Refresh (check for new messages, etc.)';
+$labels['never']  = 'არასდროს';
+$labels['immediately']  = 'დაუყონებლივ';
 $labels['messagesdisplaying'] = 'გამოაჩინე შეტყობინებები';
 $labels['messagescomposition'] = 'შეტყობინებების შექმნა';
 $labels['mimeparamfolding'] = 'ბმულის სახელები';
@@ -301,55 +441,93 @@ $labels['advancedoptions'] = 'დამატებითი პარამე�
 $labels['focusonnewmessage'] = 'ფოკუსირება ახალ შეტყობინებებზე';
 $labels['checkallfolders'] = 'შეამოწმე ყველა საქაღალდე ახალ შეტყობინებაზე';
 $labels['displaynext'] = 'შეტყობინების წაშლის ან გადატანის შემდეგ გამოჩნდეს შემდეგი შეტყობინება';
+$labels['defaultfont'] = 'Default font of HTML message';
 $labels['mainoptions'] = 'ძირითადი პარამეტრები';
+$labels['browseroptions'] = 'Browser Options';
 $labels['section'] = 'განყოფილება';
 $labels['maintenance'] = 'მომსახურება';
 $labels['newmessage'] = 'ახალი შეტყობინება';
 $labels['signatureoptions'] = 'ხელმოწერის ოფციები';
 $labels['whenreplying'] = 'პასუხის შემთხვევაში';
+$labels['replyempty'] = 'do not quote the original message';
 $labels['replytopposting'] = 'დაიწყოს ახალი შეტყობინება ორიგინალის ზემოთ';
 $labels['replybottomposting'] = 'დაიწყოს ახალი შეტყობინება ორიგინალის ქვემოთ';
 $labels['replyremovesignature'] = 'წაიშალოს ხელმოწერა პასუხის შემთხვევაში';
 $labels['autoaddsignature'] = 'ავტომატურად დაემატოს ხელმოწერა';
 $labels['newmessageonly'] = 'მხოლოდ ახალი შეტყობინება';
 $labels['replyandforwardonly'] = 'მხოლოდ გადაგზავნის და პასუხის შემთხვევაში';
-$labels['replysignaturepos'] = 'მხოლოდ პასუხის ან გადაგზავნის შემთხვევაში გაყვეს ხელმოწერა';
-$labels['belowquote'] = 'ციტატის შემდეგ';
-$labels['abovequote'] = 'ციტატამდე';
 $labels['insertsignature'] = 'ხელმოცერის ჩასმა';
-$labels['afternseconds'] = '$n წამის შემდეგ';
+$labels['previewpanemarkread']  = 'Mark previewed messages as read';
+$labels['afternseconds']  = '$n წამის შემდეგ';
+$labels['reqmdn'] = 'Always request a return receipt';
+$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'] = 'Check spelling before sending a message';
+$labels['spellcheckoptions'] = 'Spellcheck Options';
+$labels['spellcheckignoresyms'] = 'Ignore words with symbols';
+$labels['spellcheckignorenums'] = 'Ignore words with numbers';
+$labels['spellcheckignorecaps'] = 'Ignore words with all letters capitalized';
 $labels['addtodict'] = 'ლექსიკონში დამატება';
-$labels['folder'] = 'საქაღალდე';
-$labels['foldername'] = 'საქაღალდის დასახელება';
-$labels['subscribed'] = 'გამოწერილია';
+$labels['mailtoprotohandler'] = 'Register protocol handler for mailto: links';
+$labels['forwardmode'] = 'Messages forwarding';
+$labels['inline'] = 'inline';
+$labels['asattachment'] = 'as attachment';
+
+$labels['folder']  = 'საქაღალდე';
+$labels['folders']  = 'საქაღალდეები';
+$labels['foldername']  = 'საქაღალდის დასახელება';
+$labels['subscribed']  = 'გამოწერილია';
 $labels['messagecount'] = 'შეტყობინებები';
-$labels['create'] = 'შექმნა';
-$labels['createfolder'] = 'საქაღალდის შექმნა';
-$labels['managefolders'] = 'საქაღალდეების მართვა';
+$labels['create']  = 'შექმნა';
+$labels['createfolder']  = 'საქაღალდის შექმნა';
+$labels['managefolders']  = 'საქაღალდეების მართვა';
 $labels['specialfolders'] = 'სპეციალური საქაღალდე';
+$labels['properties'] = 'Properties';
+$labels['folderproperties'] = 'Folder properties';
+$labels['parentfolder'] = 'Parent folder';
 $labels['location'] = 'მდებარეობა';
 $labels['info'] = 'ინფორმაცია';
+$labels['getfoldersize'] = 'Click to get folder size';
+$labels['changesubscription'] = 'Click to change subscription';
 $labels['foldertype'] = 'დასტის ტიპი';
-$labels['personalfolder'] = 'კერძო დასტა';
-$labels['sharedfolder'] = 'საჯარო დასტა';
+$labels['personalfolder']  = 'კერძო დასტა';
+$labels['otherfolder']  = 'Other User\'s Folder';
+$labels['sharedfolder']  = 'საჯარო დასტა';
+
 $labels['sortby'] = 'დალაგება';
-$labels['sortasc'] = 'დალაგება ზრდადობით';
+$labels['sortasc']  = 'დალაგება ზრდადობით';
 $labels['sortdesc'] = 'დალაგება კლებადობით';
 $labels['undo'] = 'დაბრუნება';
+
+$labels['installedplugins'] = 'Installed plugins';
+$labels['plugin'] = 'Plugin';
+$labels['version'] = 'Version';
+$labels['source'] = 'Source';
+$labels['license'] = 'License';
+$labels['support'] = 'Get support';
+
+// units
 $labels['B'] = 'ბტ';
 $labels['KB'] = 'კბტ';
 $labels['MB'] = 'მბტ';
 $labels['GB'] = 'გბტ';
+
+// character sets
 $labels['unicode'] = 'უნიკოდი';
 $labels['english'] = 'ინსგლისური';
 $labels['westerneuropean'] = 'დასავლურევროპული';
 $labels['easterneuropean'] = 'აღმოსავლეთევროპული';
+$labels['southeasterneuropean'] = 'South-Eastern European';
 $labels['baltic'] = 'ბალტიური';
 $labels['cyrillic'] = 'კირილიცა';
 $labels['arabic'] = 'არაბული';
 $labels['greek'] = 'ბერძნული';
 $labels['hebrew'] = 'ებრაული';
 $labels['turkish'] = 'თურქული';
+$labels['nordic'] = 'Nordic';
 $labels['thai'] = 'ტაი';
 $labels['celtic'] = 'კელტური';
 $labels['vietnamese'] = 'ვიეტნამური';
@@ -357,3 +535,4 @@ $labels['japanese'] = 'იაპონური';
 $labels['korean'] = 'კორეული';
 $labels['chinese'] = 'ჩინური';
 
+?>
diff --git a/program/localization/ka_GE/messages.inc b/program/localization/ka_GE/messages.inc
index 16d73bf2a..754343fac 100755
--- a/program/localization/ka_GE/messages.inc
+++ b/program/localization/ka_GE/messages.inc
@@ -2,31 +2,40 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ka_GE/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['loginfailed'] = 'შესვლა შეუძლებელია';
+$messages['errortitle']  = 'An error occurred!';
+$messages['loginfailed']  = 'შესვლა შეუძლებელია';
 $messages['cookiesdisabled'] = 'თქვენი ბროუზერი კუკიებს არ პასუხობს';
 $messages['sessionerror'] = 'თქვენი სესია არის მცდარი ან ვადაგასული';
 $messages['storageerror'] = 'IMAP სერვერთან დაკავშირება შეუძლებელია';
 $messages['servererror'] = 'შეცდომა სერვერზე!';
 $messages['servererrormsg'] = 'სერვერის შეცდომა: $msg';
 $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'] = 'არ არის ახალი შეტყობინება';
 $messages['loggedout'] = 'წარმატებით დაიხურა თქვენი სესია';
 $messages['mailboxempty'] = 'საფოსტო ყუთი ცარიელია';
+$messages['refreshing'] = 'Refreshing...';
 $messages['loading'] = 'იტვირთება...';
 $messages['uploading'] = 'ფაილი იტვირთება...';
 $messages['uploadingmany'] = 'ფაილების ატვირთვა...';
@@ -39,31 +48,38 @@ $messages['messagesaved'] = 'შეტყობინების დროე�
 $messages['successfullysaved'] = 'წარმატებით შეინახა';
 $messages['addedsuccessfully'] = 'კონტაქტი წარმატებით დაემატა მისამართებში';
 $messages['contactexists'] = 'კონტაქტი ამ მისამართზე უკვე არსებობს';
+$messages['contactnameexists'] = 'A contact with the same name already exists.';
 $messages['blockedimages'] = 'უსაფრთხოების მიზნით სურათების ჩვენება შეზღუდულია';
 $messages['encryptedmessage'] = 'შეტყობინება დაშიფრულია და სამწუხაროდ ჩვენება შეუძლებელია';
 $messages['nocontactsfound'] = 'კონტაქტი ვერ მოიძებნა';
 $messages['contactnotfound'] = 'მოთხოვნილი კონტაქტი ვერ მოიძებნა';
+$messages['contactsearchonly'] = 'Enter some search terms to find contacts';
 $messages['sendingfailed'] = 'შეტყობინება ვერ გაიგზავნა';
 $messages['senttooquickly'] = 'გთხოვთ მოიცადოთ $sec წამი. სანამ იგზავნება შეტყობინება';
 $messages['errorsavingsent'] = 'შეცდომა სანამ ინახება გაგზავნილი შეტყობინება';
 $messages['errorsaving'] = 'შენახვის დროს მოხდა შეცდომა';
 $messages['errormoving'] = 'შეტყობინების გადატანა შეუძლებელია';
+$messages['errorcopying'] = 'Could not copy the message(s).';
 $messages['errordeleting'] = 'შეტყობინების წაშლა შეუძლებელია';
 $messages['errormarking'] = 'შეტყობინების მონიშვნა შეუძლებელია';
-$messages['deletecontactconfirm'] = 'ნამდვილად გსურთ მონიშნული კონტაქტების წაშლა?';
+$messages['deletecontactconfirm']  = 'ნამდვილად გსურთ მონიშნული კონტაქტების წაშლა?';
+$messages['deletegroupconfirm']  = 'Do you really want to delete selected group?';
 $messages['deletemessagesconfirm'] = 'ნამდვილად გსურთ მონიშნული შეტყობინებების წაშლა?';
-$messages['deletefolderconfirm'] = 'ნამდვილად გსურთ ამ საქაღალდის წაშლა?';
-$messages['purgefolderconfirm'] = 'ნამდვილად გსურთ ყველა შეტყობინების წაშლა აღნიშნულ საქაღალდეში?';
+$messages['deletefolderconfirm']  = 'ნამდვილად გსურთ ამ საქაღალდის წაშლა?';
+$messages['purgefolderconfirm']  = 'ნამდვილად გსურთ ყველა შეტყობინების წაშლა აღნიშნულ საქაღალდეში?';
+$messages['contactdeleting'] = 'Deleting contact(s)...';
 $messages['groupdeleting'] = 'ჯგუფის წაშლა...';
 $messages['folderdeleting'] = 'საქაღალდის წაშლა...';
 $messages['foldermoving'] = 'საქაღალდის გადატანა...';
+$messages['foldersubscribing'] = 'Subscribing folder...';
+$messages['folderunsubscribing'] = 'Unsubscribing folder...';
 $messages['formincomplete'] = 'ყველა ველი არ არის შევსებული';
 $messages['noemailwarning'] = 'მიუთითეთ სწორი ელ–ფოსტის მისამართი';
-$messages['nonamewarning'] = 'მიუთითეთ სახელი';
+$messages['nonamewarning']  = 'მიუთითეთ სახელი';
 $messages['nopagesizewarning'] = 'მიუთითეთ ფურცლის ზომა';
 $messages['nosenderwarning'] = 'გთხოვთ შეიტანოთ მგზავნელის ელ–ფოსტის მისამართი';
 $messages['norecipientwarning'] = 'მიუთითეთ მიმღები';
-$messages['nosubjectwarning'] = 'გსურთ თუ არა შეტყობინების გაგზავნა უსათაუროდ?';
+$messages['nosubjectwarning']  = 'გსურთ თუ არა შეტყობინების გაგზავნა უსათაუროდ?';
 $messages['nobodywarning'] = 'გსურთ თუ არა შეტყობინების გაგზავნა უტექსტოდ?';
 $messages['notsentwarning'] = 'შეტყობინება ვერ იქნა გაგზავნილი. გსურთ თუ არა გზავნილის გაუქმება?';
 $messages['noldapserver'] = 'მიუთითეთ LDAP სერვერი ძიებისთვის';
@@ -76,6 +92,10 @@ $messages['searching'] = 'ძიება...';
 $messages['checking'] = 'შემოწმება...';
 $messages['nospellerrors'] = 'ორთოგრაფიული შეცდომა არ არის';
 $messages['folderdeleted'] = 'საქაღალდე წარმატებით წაიშალა';
+$messages['foldersubscribed'] = 'Folder successfully subscribed.';
+$messages['folderunsubscribed'] = 'Folder successfully unsubscribed.';
+$messages['folderpurged'] = 'Folder has successfully been emptied.';
+$messages['folderexpunged'] = 'Folder has successfully been compacted.';
 $messages['deletedsuccessfully'] = 'წარმატებით წაიშალა';
 $messages['converting'] = 'შეტყობინების ფორმატირების გაუქმება...';
 $messages['messageopenerror'] = 'შეტყობინება ვერ ჩაიტვირთა სერვერიდან';
@@ -86,15 +106,26 @@ $messages['copyerror'] = 'ვერცერთი მისამართი �
 $messages['sourceisreadonly'] = 'აღნიშნული მისამართის მხოლოდ წაკითხვაა შესაძლებელი';
 $messages['errorsavingcontact'] = 'საკონტაქტო მისამართის შენახვა შეუძლებელია';
 $messages['movingmessage'] = 'შეტყობინების გადატანა...';
+$messages['copyingmessage'] = 'Copying message(s)...';
+$messages['copyingcontact'] = 'Copying contact(s)...';
+$messages['deletingmessage'] = 'Deleting message(s)...';
+$messages['markingmessage'] = 'Marking message(s)...';
+$messages['addingmember'] = 'Adding contact(s) to the group...';
+$messages['removingmember'] = 'Removing contact(s) from the group...';
 $messages['receiptsent'] = 'წარმატებით გაიგზავნა';
 $messages['errorsendingreceipt'] = 'არ გაიგზავნა';
+$messages['deleteidentityconfirm'] = 'Do you really want to delete this identity?';
 $messages['nodeletelastidentity'] = 'წაშლა შეუძლებელია, ის თქვენთვის ერთადერთია';
 $messages['forbiddencharacter'] = 'საქაღალდის სახელი შეიცავს აკრძალულ სიმბოლოებს';
 $messages['selectimportfile'] = 'გთხოვთ მონიშნოთ ფაილი ასატვირთად';
 $messages['addresswriterror'] = 'მონიშნულ მისამართებში ჩაწერა შეუძლებელია';
+$messages['contactaddedtogroup'] = 'Successfully added the contacts to this group.';
+$messages['contactremovedfromgroup'] = 'Successfully removed contacts from this group.';
+$messages['nogroupassignmentschanged'] = 'No group assignments changed.';
 $messages['importwait'] = 'გთხოვთ მოიცადოთ, მიმდინარეობს შემოტანა';
-$messages['importerror'] = 'შემოტანა გაუქმდა! ატვირთული ფაილის ფორმატი არ ემთხვევა დასაშვებ vCard ფორმატს';
+$messages['importformaterror'] = 'Import failed! The uploaded file is not a valid import data file.';
 $messages['importconfirm'] = '<b>წარმატებით დასრულდა $inserted კონტაქტების შემოტანა, $skipped არსებულის გამოტოვება</b>:<p><em>$names</em></p>';
+$messages['importconfirmskipped'] = '<b>Skipped $skipped existing entries</b>';
 $messages['opnotpermitted'] = 'ოპერაცია შეზღუდულია';
 $messages['nofromaddress'] = 'ელ–ფოსტის მისამართი გამოტოვებულია';
 $messages['editorwarning'] = 'რედაქტორის გადართვა ტექსტურ რეჟიმში გამოიწვევს არსებული ტექსტის ფორმატის დაკარგვას. გსურთ გაგრძელება?';
@@ -106,16 +137,35 @@ $messages['smtptoerror'] = 'SMTP Error ($code): ვერ დაემატა
 $messages['smtprecipientserror'] = 'SMTP Error: მიმღებთა ჩამონათვალის დამუშავება ვერ მოხერხდა';
 $messages['smtperror'] = 'SMTP Error: $msg';
 $messages['emailformaterror'] = 'ელ-ფოსტის მისამართი არასწორია $email';
+$messages['toomanyrecipients'] = 'Too many recipients. Reduce the number of recipients to $max.';
+$messages['maxgroupmembersreached'] = 'The number of group members exceeds the maximum of $max.';
+$messages['internalerror'] = 'An internal error occured. Please try again.';
+$messages['contactdelerror'] = 'Could not delete contact(s).';
 $messages['contactdeleted'] = 'კონტაქტ(ებ)ი წარმატებით წაიშალა.';
+$messages['contactrestoreerror'] = 'Could not restore deleted contact(s).';
 $messages['contactrestored'] = 'კონრაქტ(ებ)ი წარმატებით აღდგა,';
 $messages['groupdeleted'] = 'ჯგუფი წარმატებით წაიშალა.';
+$messages['grouprenamed'] = 'Group renamed successfully.';
 $messages['groupcreated'] = 'ჯგუფი წარმატებით შეიქმნა.';
+$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'] = 'შეტყობინებები წარმატებით წაიშალა.';
 $messages['messagemoved'] = 'შეტყობინებები გადატანილია წარმატებით.';
+$messages['messagecopied'] = 'Message(s) copied successfully.';
 $messages['messagemarked'] = 'შეტყობინებები წარმატებით მოინიშნა.';
+$messages['autocompletechars'] = 'Enter at least $min characters for autocompletion.';
+$messages['autocompletemore'] = 'More matching entries found. Please type more characters.';
 $messages['namecannotbeempty'] = 'სახელი არ შეიძლება იყოს ცარიელი.';
 $messages['nametoolong'] = 'სახელი ძალიან მოკლეა.';
 $messages['folderupdated'] = 'დასტა წარმატებით განახლდა.';
 $messages['foldercreated'] = 'დასტა წარმატებით შეიქმნა.';
 $messages['invalidimageformat'] = 'გამოსახულების ფორმატი არასწორია.';
+$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.';
 
+?>
diff --git a/program/localization/km_KH/labels.inc b/program/localization/km_KH/labels.inc
index 7ae9631bd..7b10b5f7f 100644
--- a/program/localization/km_KH/labels.inc
+++ b/program/localization/km_KH/labels.inc
@@ -2,56 +2,78 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/km_KH/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = '$product សូមស្វាគមន៍';
-$labels['username'] = 'ឈ្មោះអ្នកប្រើ';
-$labels['password'] = 'ពាក្យសំងាត់';
-$labels['server'] = 'ម៉ាស៊ីនមេ';
-$labels['login'] = 'ពិនិត្យចូល';
-$labels['logout'] = 'ពិនិត្យចេញ';
-$labels['mail'] = 'អ៊ីមែល';
+
+// login page
+$labels['welcome']   = '$product សូមស្វាគមន៍';
+$labels['username']  = 'ឈ្មោះអ្នកប្រើ';
+$labels['password']  = 'ពាក្យសំងាត់';
+$labels['server']    = 'ម៉ាស៊ីនមេ';
+$labels['login']     = 'ពិនិត្យចូល';
+
+// taskbar
+$labels['logout']   = 'ពិនិត្យចេញ';
+$labels['mail']     = 'អ៊ីមែល';
 $labels['settings'] = 'កំនត់ការប្រើប្រាស់';
 $labels['addressbook'] = 'សៀវភៅអាសយដ្ឋាន';
-$labels['inbox'] = 'ប្រអប់សំបុត្រ';
+
+// mailbox names
+$labels['inbox']  = 'ប្រអប់សំបុត្រ';
 $labels['drafts'] = 'សំបុត្រពង្រៀង';
-$labels['sent'] = 'សំបុត្រដែលបានបញ្ជូន';
-$labels['trash'] = 'ធុងសំរាម';
-$labels['junk'] = 'សំបុត្រមិនល្អ';
+$labels['sent']   = 'សំបុត្រដែលបានបញ្ជូន';
+$labels['trash']  = 'ធុងសំរាម';
+$labels['junk']   = 'សំបុត្រមិនល្អ';
+
+// message listing
 $labels['subject'] = 'ចំណងជើង';
-$labels['from'] = 'អ្នកផ្ញើ';
-$labels['to'] = 'អ្នកទទួល';
-$labels['cc'] = 'Cc';
-$labels['bcc'] = 'Bcc';
+$labels['from']    = 'អ្នកផ្ញើ';
+$labels['sender']  = 'Sender';
+$labels['to']      = 'អ្នកទទួល';
+$labels['cc']      = 'Cc';
+$labels['bcc']     = 'Bcc';
 $labels['replyto'] = 'ឆ្លើយតបទៅកាន់';
 $labels['followupto'] = 'ឆ្លើយតបទៅកាន់ក្រុម';
-$labels['date'] = 'កាលបរិច្ឆេត';
-$labels['size'] = 'ទំហំ';
+$labels['date']    = 'កាលបរិច្ឆេត';
+$labels['size']    = 'ទំហំ';
 $labels['priority'] = 'អទិភាព';
 $labels['organization'] = 'អង្គភាព';
 $labels['readstatus'] = 'ស្ថានភាពនៃការអាន';
+$labels['listoptions'] = 'List options...';
+
 $labels['mailboxlist'] = 'ថតទាំងអស់';
-$labels['folders'] = 'ថតទាំងអស់';
 $labels['messagesfromto'] = 'សំបុត្រពី $from ទៅដល់ $toក្នុងចំណោម $count សំបុត្រ';
 $labels['threadsfromto'] = 'បន្តុំសំបុត្រពី $from ទៅដល់ $toក្នុងចំណោម $count សំបុត្រ';
 $labels['messagenrof'] = 'សំបុត្រ $nr នៃ $count';
-$labels['copy'] = 'ចំលង';
-$labels['move'] = 'ផ្ទេរ';
-$labels['moveto'] = 'ផ្ទេរទៅ';
+$labels['fromtoshort'] = '$from – $to of $count';
+
+$labels['copy']     = 'ចំលង';
+$labels['move']     = 'ផ្ទេរ';
+$labels['moveto']   = 'ផ្ទេរទៅ';
 $labels['download'] = 'ទាញយក';
+$labels['open']     = 'Open';
+$labels['showattachment'] = 'Show';
+$labels['showanyway'] = 'Show it anyway';
+
 $labels['filename'] = 'ឈ្មោះឯកសារ';
 $labels['filesize'] = 'ទំហំឯកសារ';
+
 $labels['addtoaddressbook'] = 'រក្សាទុកក្នុងសៀវភៅអាសយដ្ឋាន';
+
+// weekdays short
 $labels['sun'] = 'អាទិត្យ';
 $labels['mon'] = 'ច័ន្ទ';
 $labels['tue'] = 'អង្គារ';
@@ -59,69 +81,90 @@ $labels['wed'] = 'ពុធ';
 $labels['thu'] = 'ព្រហស្បតិ៍';
 $labels['fri'] = 'សុក្រ';
 $labels['sat'] = 'សៅរ៍';
-$labels['sunday'] = 'អាទិត្យ';
-$labels['monday'] = 'ច័ន្ទ';
-$labels['tuesday'] = 'អង្គារ';
+
+// weekdays long
+$labels['sunday']    = 'អាទិត្យ';
+$labels['monday']    = 'ច័ន្ទ';
+$labels['tuesday']   = 'អង្គារ';
 $labels['wednesday'] = 'ពុធ';
-$labels['thursday'] = 'ព្រហស្បតិ៍';
-$labels['friday'] = 'សុក្រ';
-$labels['saturday'] = 'សៅរ៍';
-$labels['jan'] = 'មករា';
-$labels['feb'] = 'កុម្ភះ';
-$labels['mar'] = 'មិនា';
-$labels['apr'] = 'មេសា';
-$labels['may'] = 'ឧសភា';
-$labels['longmay'] = 'ឧសភា';
-$labels['jun'] = 'មិថុនា';
-$labels['jul'] = 'កក្កដា';
-$labels['aug'] = 'សីហា';
-$labels['sep'] = 'កញ្ញា';
-$labels['oct'] = 'តុលា';
-$labels['nov'] = 'វិច្ឆិកា';
-$labels['dec'] = 'ធ្នូ';
-$labels['longjan'] = 'មករា';
-$labels['longfeb'] = 'កុម្ភះ';
-$labels['longmar'] = 'មិនា';
-$labels['longapr'] = 'មេសា';
-$labels['longjun'] = 'មិថុនា';
-$labels['longjul'] = 'កក្កដា';
-$labels['longaug'] = 'សីហា';
-$labels['longsep'] = 'កញ្ញា';
-$labels['longoct'] = 'តុលា';
-$labels['longnov'] = 'វិច្ឆិកា';
-$labels['longdec'] = 'ធ្នូ';
+$labels['thursday']  = 'ព្រហស្បតិ៍';
+$labels['friday']    = 'សុក្រ';
+$labels['saturday']  = 'សៅរ៍';
+
+// months short
+$labels['jan']	= 'មករា';
+$labels['feb']	= 'កុម្ភះ';
+$labels['mar']	= 'មិនា';
+$labels['apr']	= 'មេសា';
+$labels['may']	= 'ឧសភា';
+$labels['jun']	= 'មិថុនា';
+$labels['jul'] 	= 'កក្កដា';
+$labels['aug']	= 'សីហា';
+$labels['sep']	= 'កញ្ញា';
+$labels['oct']	= 'តុលា';
+$labels['nov']	= 'វិច្ឆិកា';
+$labels['dec']	= 'ធ្នូ';
+
+// months long
+$labels['longjan']	= 'មករា';
+$labels['longfeb']	= 'កុម្ភះ';
+$labels['longmar']	= 'មិនា';
+$labels['longapr']	= 'មេសា';
+$labels['longmay']	= 'ឧសភា';
+$labels['longjun']	= 'មិថុនា';
+$labels['longjul']	= 'កក្កដា';
+$labels['longaug']	= 'សីហា';
+$labels['longsep']	= 'កញ្ញា';
+$labels['longoct']	= 'តុលា';
+$labels['longnov']	= 'វិច្ឆិកា';
+$labels['longdec']	= 'ធ្នូ';
+
 $labels['today'] = 'ថ្ងៃនេះ';
-$labels['checkmail'] = 'ពិនិត្យសំបុត្រថ្មី';
-$labels['compose'] = 'សរសេរសំបុត្រថ្មី';
-$labels['writenewmessage'] = 'សរសេរសំបុត្រថ្មី';
-$labels['replytomessage'] = 'ឆ្លើយតបទៅអ្នកផ្ញើ';
+
+// toolbar buttons
+$labels['refresh']          = 'Refresh';
+$labels['checkmail']        = 'ពិនិត្យសំបុត្រថ្មី';
+$labels['compose']          = 'សរសេរសំបុត្រថ្មី';
+$labels['writenewmessage']  = 'សរសេរសំបុត្រថ្មី';
+$labels['reply']            = 'Reply';
+$labels['replytomessage']   = 'ឆ្លើយតបទៅអ្នកផ្ញើ';
 $labels['replytoallmessage'] = 'ឆ្លើយតបទៅ អ្នកទទួលទាំងអស់និង ក្រុម ឬ អ្នកផ្ញើ';
-$labels['replyall'] = 'ឆ្លើយតបទៅទាំងអស់គ្នា';
-$labels['replylist'] = 'ឆ្លើយតបទៅក្រុម';
-$labels['forwardmessage'] = 'ផ្ញើសំបុត្របន្តរ';
-$labels['deletemessage'] = 'លុបសំបុត្រចោល';
+$labels['replyall']         = 'ឆ្លើយតបទៅទាំងអស់គ្នា';
+$labels['replylist']        = 'ឆ្លើយតបទៅក្រុម';
+$labels['forward']          = 'Forward';
+$labels['forwardinline']    = 'Forward inline';
+$labels['forwardattachment'] = 'Forward as attachment';
+$labels['forwardmessage']   = 'ផ្ញើសំបុត្របន្តរ';
+$labels['deletemessage']    = 'លុបសំបុត្រចោល';
 $labels['movemessagetotrash'] = 'ផ្ទេរសំបុត្រទៅក្នុងធុងសំរាម';
-$labels['printmessage'] = 'បោះពុម្ភសំបុត្រ';
-$labels['previousmessage'] = 'បង្ហាញសំបុត្រចាស់';
-$labels['firstmessage'] = 'បង្ហាញសំបុត្រដំបូង';
-$labels['nextmessage'] = 'បង្ហាញសំបុត្របន្ទាប់';
-$labels['lastmessage'] = 'បង្ហាញសំបុត្រចុងក្រោយ';
-$labels['backtolist'] = 'ត្រលប់ទៅកាន់ក្រុមសំបុត្រ';
-$labels['viewsource'] = 'បង្ហាញ Source របស់សំបុត្រ';
-$labels['markmessages'] = 'កំណត់សំគាល់សំបុត្រ';
-$labels['markread'] = 'កំណត់ថាបានអានរួច';
-$labels['markunread'] = 'កំណត់ថាមិនទាន់បានអាន';
-$labels['markflagged'] = 'កំណត់សំគាល់ដោយផ្កាយ';
-$labels['markunflagged'] = 'លុបកំណត់សំគាល់ដោយផ្កាយ';
+$labels['printmessage']     = 'បោះពុម្ភសំបុត្រ';
+$labels['previousmessage']  = 'បង្ហាញសំបុត្រចាស់';
+$labels['firstmessage']     = 'បង្ហាញសំបុត្រដំបូង';
+$labels['nextmessage']      = 'បង្ហាញសំបុត្របន្ទាប់';
+$labels['lastmessage']      = 'បង្ហាញសំបុត្រចុងក្រោយ';
+$labels['backtolist']       = 'ត្រលប់ទៅកាន់ក្រុមសំបុត្រ';
+$labels['viewsource']       = 'បង្ហាញ Source របស់សំបុត្រ';
+$labels['mark']             = 'Mark';
+$labels['markmessages']     = 'កំណត់សំគាល់សំបុត្រ';
+$labels['markread']         = 'កំណត់ថាបានអានរួច';
+$labels['markunread']       = 'កំណត់ថាមិនទាន់បានអាន';
+$labels['markflagged']      = 'កំណត់សំគាល់ដោយផ្កាយ';
+$labels['markunflagged']    = 'លុបកំណត់សំគាល់ដោយផ្កាយ';
+$labels['moreactions']      = 'More actions...';
+$labels['more']             = 'More';
+$labels['back']             = 'Back';
+$labels['options']          = 'Options';
+
 $labels['select'] = 'ជ្រើសរើស';
 $labels['all'] = 'ទាំងអស់';
 $labels['none'] = 'មិនតំរៀប';
-$labels['nonesort'] = 'មិនតំរៀប';
 $labels['currpage'] = 'ទំព័រនេះ';
 $labels['unread'] = 'មិនទាន់អាន';
 $labels['flagged'] = 'មានកំណត់សំគាល់ដោយផ្កាយ';
 $labels['unanswered'] = 'មិនទាន់ឆ្លើយតប';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'បានលុបរួច';
+$labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'បញ្ច្រស់';
 $labels['filter'] = 'លក្ខខ័ណ្ឌ';
 $labels['list'] = 'តារាង';
@@ -130,12 +173,14 @@ $labels['expand-all'] = 'បង្ហាញសំបុត្រទាំងអ�
 $labels['expand-unread'] = 'បង្ហាញសំបុត្រមិនទាន់អាន';
 $labels['collapse-all'] = 'បិទសំបុត្រទាំងអស់';
 $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['asc'] = 'តាមលំដាប់ចុះ';
@@ -144,150 +189,220 @@ $labels['listcolumns'] = 'តារាងជួរឈ';
 $labels['listsorting'] = 'តំរៀបជួរឈ';
 $labels['listorder'] = 'លំដាប់នៃការតំរៀប';
 $labels['listmode'] = 'បង្ហាញជាតារាង';
+
 $labels['folderactions'] = 'មុខងារថត';
 $labels['compact'] = 'បង្រួម';
 $labels['empty'] = 'ទទេរ';
+
 $labels['quota'] = 'ទំហំសំបុត្រទាំងអស់ដែលមាន';
-$labels['unknown'] = 'មិនស្គាល់';
-$labels['unlimited'] = 'គ្មានកំនត់';
-$labels['quicksearch'] = 'ស្វែងរក';
-$labels['resetsearch'] = 'កំណត់លក្ខខ័ណ្ឌស្វែងរកជាថ្មី';
-$labels['searchmod'] = 'កែសំរួលលក្ខខ័ណ្ឌស្វែងរក';
-$labels['msgtext'] = 'សំបុត្រទាំងមូល';
+$labels['unknown']  = 'មិនស្គាល់';
+$labels['unlimited']  = 'គ្មានកំនត់';
+
+$labels['quicksearch']  = 'ស្វែងរក';
+$labels['resetsearch']  = 'កំណត់លក្ខខ័ណ្ឌស្វែងរកជាថ្មី';
+$labels['searchmod']  = 'កែសំរួលលក្ខខ័ណ្ឌស្វែងរក';
+$labels['msgtext']  = 'សំបុត្រទាំងមូល';
+$labels['body']  = 'Body';
+
 $labels['openinextwin'] = 'បើកក្នុងវីនដូវថ្មី';
 $labels['emlsave'] = 'រក្សាទុកទិន្នន័យជាឯកសារប្រភេទ(.eml)';
-$labels['editasnew'] = 'កែហើយរក្សាទុកដូចជាសំបុត្រថ្មី';
-$labels['sendmessage'] = 'ផ្ញើសំបុត្រនេះ';
-$labels['savemessage'] = 'រក្សាទុកសំបុត្រពង្រៀង';
-$labels['addattachment'] = 'ឯកសារភ្ជាប់';
-$labels['charset'] = 'ប្រភេទអក្សរ';
-$labels['editortype'] = 'ប្រភេទ Editor';
-$labels['returnreceipt'] = 'អត្ថបទបញ្ជាក់ពីការត្រឡប់';
-$labels['dsn'] = 'ប្រាប់អំពីស្ថានភាពផ្ញើ';
-$labels['editidents'] = 'ផ្លាស់ប្តូរអត្តសញ្ញាណ';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
+
+// message compose
+$labels['editasnew']      = 'កែហើយរក្សាទុកដូចជាសំបុត្រថ្មី';
+$labels['send']           = 'Send';
+$labels['sendmessage']    = 'ផ្ញើសំបុត្រនេះ';
+$labels['savemessage']    = 'រក្សាទុកសំបុត្រពង្រៀង';
+$labels['addattachment']  = 'ឯកសារភ្ជាប់';
+$labels['charset']        = 'ប្រភេទអក្សរ';
+$labels['editortype']     = 'ប្រភេទ Editor';
+$labels['returnreceipt']  = 'អត្ថបទបញ្ជាក់ពីការត្រឡប់';
+$labels['dsn']            = 'ប្រាប់អំពីស្ថានភាពផ្ញើ';
+$labels['mailreplyintro'] = 'On $date, $sender wrote:';
+$labels['originalmessage'] = 'Original Message';
+
+$labels['editidents']    = 'ផ្លាស់ប្តូរអត្តសញ្ញាណ';
+$labels['spellcheck']    = 'Spell';
 $labels['checkspelling'] = 'ពិនិត្យអក្ខរាវិរុទ្ធ';
 $labels['resumeediting'] = 'បន្តរការកែតំរូវ';
-$labels['revertto'] = 'ត្រលប់ទៅ';
+$labels['revertto']      = 'ត្រលប់ទៅ';
+
+$labels['attach'] = 'Attach';
 $labels['attachments'] = 'ឯកសារភ្ជាប់';
 $labels['upload'] = 'ភ្ជាប់ឯកសារ';
-$labels['close'] = 'បិទ';
-$labels['messageoptions'] = 'កំណត់ជំរើសរបស់សំបុត្រ';
-$labels['low'] = 'ទាប';
-$labels['lowest'] = 'ទាបបំផុត';
-$labels['normal'] = 'ធម្មតា';
-$labels['high'] = 'ខ្ពស់';
+$labels['uploadprogress'] = '$percent ($current from $total)';
+$labels['close']  = 'បិទ';
+$labels['messageoptions']  = 'កំណត់ជំរើសរបស់សំបុត្រ';
+
+$labels['low']     = 'ទាប';
+$labels['lowest']  = 'ទាបបំផុត';
+$labels['normal']  = 'ធម្មតា';
+$labels['high']    = 'ខ្ពស់';
 $labels['highest'] = 'ខ្ពស់បំផុត';
-$labels['nosubject'] = '(គ្មានចំណងជើង)';
+
+$labels['nosubject']  = '(គ្មានចំណងជើង)';
 $labels['showimages'] = 'បង្ហាញរូបភាព';
 $labels['alwaysshow'] = 'បង្ហាញជានិច្ចរាល់រូបភាពបញ្ជូនពី$sender';
+$labels['isdraft']    = 'This is a draft message.';
+$labels['andnmore']   = '$nr more...';
+$labels['togglemoreheaders'] = 'Show more message headers';
+$labels['togglefullheaders'] = 'Toggle raw message headers';
+
 $labels['htmltoggle'] = 'អត្ថបទ HTML';
 $labels['plaintoggle'] = 'អត្ថបទធម្មតា';
 $labels['savesentmessagein'] = 'រក្សាសំបុត្រដែលបានផ្ញើក្នុង';
 $labels['dontsave'] = 'មិនរក្សាទុក';
 $labels['maxuploadsize'] = 'ទំហំឯកសារធំបំផុតដែលអាចភ្ជាប់បានគឺ$size';
+
 $labels['addcc'] = 'បន្ថែម Cc';
 $labels['addbcc'] = 'បន្ថែម Bcc';
 $labels['addreplyto'] = 'បន្ថែម Reply-To';
 $labels['addfollowupto'] = 'បន្ថែម Followup-To';
+
+// mdn
+$labels['mdnrequest'] = 'The sender of this message has asked to be notified when you read this message. Do you wish to notify the sender?';
 $labels['receiptread'] = 'អត្ថបទផ្ញើត្រលប់ (បានអាន)';
 $labels['yourmessage'] = 'នេះគឺជាអត្ថបទផ្ញើត្រលប់សំរាប់សំបុត្ររបស់លោកអ្នក។';
-$labels['name'] = 'ឈ្មោះសំរាប់បង្ហាញ';
-$labels['firstname'] = 'នាមត្រកូល';
-$labels['surname'] = 'នាមខ្លួន';
-$labels['middlename'] = 'ឈ្មោះកណ្តាល';
-$labels['nameprefix'] = 'ពាក្យពីមុខឈ្មោះ';
-$labels['namesuffix'] = 'ពាក្យពីក្រោយឈ្មោះ';
-$labels['nickname'] = 'ឈ្មោះហៅក្រៅ';
-$labels['jobtitle'] = 'ឈ្មោះការងារ';
-$labels['department'] = 'នាយកដ្ឋាន';
-$labels['gender'] = 'ភេទ';
-$labels['maidenname'] = 'ឈ្មោះពីកំណើត';
-$labels['email'] = 'អ៊ីមែល';
-$labels['phone'] = 'ទូរស័ព្ទ';
-$labels['address'] = 'អាសយដ្ឋាន';
-$labels['street'] = 'ផ្លូវ';
-$labels['locality'] = 'ទីក្រុង';
-$labels['zipcode'] = 'លេខប៉ុស្តិ៍';
-$labels['region'] = 'តំបន់';
-$labels['country'] = 'ប្រទេស';
-$labels['birthday'] = 'ថ្ងៃខួបកំណើត';
-$labels['anniversary'] = 'ខួប';
-$labels['website'] = 'គេហទំព័រ';
+$labels['receiptnote'] = 'Note: This receipt only acknowledges that the message was displayed on the recipient\'s computer. There is no guarantee that the recipient has read or understood the message contents.';
+
+// address boook
+$labels['name']         = 'ឈ្មោះសំរាប់បង្ហាញ';
+$labels['firstname']    = 'នាមត្រកូល';
+$labels['surname']      = 'នាមខ្លួន';
+$labels['middlename']   = 'ឈ្មោះកណ្តាល';
+$labels['nameprefix']   = 'ពាក្យពីមុខឈ្មោះ';
+$labels['namesuffix']   = 'ពាក្យពីក្រោយឈ្មោះ';
+$labels['nickname']     = 'ឈ្មោះហៅក្រៅ';
+$labels['jobtitle']     = 'ឈ្មោះការងារ';
+$labels['department']   = 'នាយកដ្ឋាន';
+$labels['gender']       = 'ភេទ';
+$labels['maidenname']   = 'ឈ្មោះពីកំណើត';
+$labels['email']        = 'អ៊ីមែល';
+$labels['phone']        = 'ទូរស័ព្ទ';
+$labels['address']      = 'អាសយដ្ឋាន';
+$labels['street']       = 'ផ្លូវ';
+$labels['locality']     = 'ទីក្រុង';
+$labels['zipcode']      = 'លេខប៉ុស្តិ៍';
+$labels['region']       = 'តំបន់';
+$labels['country']      = 'ប្រទេស';
+$labels['birthday']     = 'ថ្ងៃខួបកំណើត';
+$labels['anniversary']  = 'ខួប';
+$labels['website']      = 'គេហទំព័រ';
 $labels['instantmessenger'] = 'IM';
 $labels['notes'] = 'កំណត់ហេតុ';
-$labels['male'] = 'ប្រុស';
+$labels['male']   = 'ប្រុស';
 $labels['female'] = 'ស្រី';
 $labels['manager'] = 'នាយក';
 $labels['assistant'] = 'ជំនួយការ';
-$labels['typeassistant'] = 'ជំនួយការ';
 $labels['spouse'] = 'គ្រួសារ';
+$labels['allfields'] = 'All fields';
+$labels['search'] = 'Search';
+$labels['advsearch'] = 'Advanced Search';
+$labels['advanced'] = 'Advanced';
 $labels['other'] = 'ផ្សេងពីនេះ';
-$labels['typeother'] = 'ផ្សេងពីនេះ';
-$labels['typehome'] = 'គេហដ្ឋាន';
-$labels['typework'] = 'កន្លែងធ្វើការ';
-$labels['typemobile'] = 'ទូរស័ព្ទដៃ';
-$labels['typemain'] = 'ចំបង';
-$labels['typehomefax'] = 'ទូរសារនៅគេហដ្ឋាន';
-$labels['typeworkfax'] = 'ទូរសារនៅកន្លែងធ្វើការ';
-$labels['typecar'] = 'រថយន្ត';
-$labels['typepager'] = 'ឧបករណ៍ផ្តល់សារ';
-$labels['typevideo'] = 'វីដេអូរ';
+
+$labels['typehome']   = 'គេហដ្ឋាន';
+$labels['typework']   = 'កន្លែងធ្វើការ';
+$labels['typeother']  = 'ផ្សេងពីនេះ';
+$labels['typemobile']  = 'ទូរស័ព្ទដៃ';
+$labels['typemain']  = 'ចំបង';
+$labels['typehomefax']  = 'ទូរសារនៅគេហដ្ឋាន';
+$labels['typeworkfax']  = 'ទូរសារនៅកន្លែងធ្វើការ';
+$labels['typecar']  = 'រថយន្ត';
+$labels['typepager']  = 'ឧបករណ៍ផ្តល់សារ';
+$labels['typevideo']  = 'វីដេអូរ';
+$labels['typeassistant']  = 'ជំនួយការ';
+$labels['typehomepage']  = 'Home Page';
+$labels['typeblog'] = 'Blog';
+$labels['typeprofile'] = 'Profile';
+
 $labels['addfield'] = 'បន្ថែម';
 $labels['addcontact'] = 'បន្ថែមអាសយដ្ឋានទាក់ទង';
 $labels['editcontact'] = 'កែប្រែអាសយដ្ឋានទាក់ទង';
 $labels['contacts'] = 'អាសយដ្ឋានទាក់ទងទាំងអស់';
 $labels['contactproperties'] = 'ព័ត៌មានអំពីទំនាក់ទំនង';
 $labels['personalinfo'] = 'ព័ត៌មានផ្ទាល់ខ្លួន';
-$labels['edit'] = 'កែតំរូវ';
+
+$labels['edit']   = 'កែតំរូវ';
 $labels['cancel'] = 'លះបង់';
-$labels['save'] = 'រក្សាទុក';
+$labels['save']   = 'រក្សាទុក';
 $labels['delete'] = 'លុបចោល';
 $labels['rename'] = 'ប្តូរឈ្មោះ';
 $labels['addphoto'] = 'បន្ថែមរូបថត';
 $labels['replacephoto'] = 'លុបរូបថត';
-$labels['newcontact'] = 'បង្កើតអាសយដ្ឋានទាក់ទងថ្មី';
-$labels['deletecontact'] = 'លុបអាសយដ្ឋានទាក់ទងដែលបានជ្រើសរើស';
-$labels['composeto'] = 'ផ្ញើសំបុត្រទៅ';
+$labels['uploadphoto'] = 'Upload photo';
+
+$labels['newcontact']     = 'បង្កើតអាសយដ្ឋានទាក់ទងថ្មី';
+$labels['deletecontact']  = 'លុបអាសយដ្ឋានទាក់ទងដែលបានជ្រើសរើស';
+$labels['composeto']      = 'ផ្ញើសំបុត្រទៅ';
 $labels['contactsfromto'] = 'អាសយដ្ឋានទាក់ទង $from ដល់ $to នៃ$count';
-$labels['print'] = 'បោះពុម្ភ';
-$labels['export'] = 'ទាញនិងរក្សាទុក';
-$labels['exportvcards'] = 'ទាញនិងរក្សាទុកអាសយដ្ឋានជាប្រភេទvCard';
+$labels['print']          = 'បោះពុម្ភ';
+$labels['export']         = 'ទាញនិងរក្សាទុក';
+$labels['exportall']      = 'Export all';
+$labels['exportsel']      = 'Export selected';
+$labels['exportvcards']   = 'ទាញនិងរក្សាទុកអាសយដ្ឋានជាប្រភេទvCard';
 $labels['newcontactgroup'] = 'បង្កើតក្រុមអាសយដ្ឋានថ្មី';
-$labels['previouspage'] = 'ទំព័រមុន';
-$labels['firstpage'] = 'ទំព័រដំបូង';
-$labels['nextpage'] = 'ទំព័របន្ទាប់';
-$labels['lastpage'] = 'ទំព័រចុងក្រោយ';
+$labels['grouprename']    = 'Rename group';
+$labels['groupdelete']    = 'Delete group';
+$labels['groupremoveselected'] = 'Remove selected contacts from group';
+
+$labels['previouspage']   = 'ទំព័រមុន';
+$labels['firstpage']      = 'ទំព័រដំបូង';
+$labels['nextpage']       = 'ទំព័របន្ទាប់';
+$labels['lastpage']       = 'ទំព័រចុងក្រោយ';
+
 $labels['group'] = 'ក្រុម';
 $labels['groups'] = 'ក្រុម';
 $labels['personaladrbook'] = 'អាសយដ្ឋានផ្ទាល់ខ្លួន';
+
+$labels['searchsave'] = 'Save search';
+$labels['searchdelete'] = 'Delete search';
+
 $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['done'] = 'ចប់រួចរាល់';
+
+// settings
 $labels['settingsfor'] = 'កំណត់សំរាប់';
+$labels['about'] = 'About';
 $labels['preferences'] = 'កំណត់តាមការចូលចិត្ត';
 $labels['userpreferences'] = 'កំណត់តាមការចូលចិត្តរបស់អ្នកប្រើ';
 $labels['editpreferences'] = 'ផ្លាស់ប្តូរការចូលចិត្តរបស់អ្នកប្រើ';
+
 $labels['identities'] = 'អត្តសញ្ញាណ';
 $labels['manageidentities'] = 'គ្រប់គ្រងអត្តសញ្ញាណ';
 $labels['newidentity'] = 'អត្តសញ្ញាណថ្មី';
+
 $labels['newitem'] = 'វត្ថុថ្មី';
 $labels['edititem'] = 'កែប្រែវត្ថុ';
+
 $labels['preferhtml'] = 'បង្ហាញជា HTML';
 $labels['defaultcharset'] = 'លេខកូតអក្សរមានស្រាប់';
 $labels['htmlmessage'] = 'សំបុត្រប្រភេទ HTML';
+$labels['messagepart'] = 'Part';
+$labels['digitalsig'] = 'Digital Signature';
+$labels['dateformat'] = 'Date format';
+$labels['timeformat'] = 'Time format';
 $labels['prettydate'] = 'កាលបរិច្ឆេតងាយស្រួលមើល';
-$labels['setdefault'] = 'កំណត់ទុក';
-$labels['autodetect'] = 'ស្វ័យប្រវត្តិ';
-$labels['language'] = 'ភាសា';
-$labels['timezone'] = 'ម៉ោង';
-$labels['pagesize'] = 'ចំនួនសំបុត្រក្នុងមួយទំព័រ';
+$labels['setdefault']  = 'កំណត់ទុក';
+$labels['autodetect']  = 'ស្វ័យប្រវត្តិ';
+$labels['language']  = 'ភាសា';
+$labels['timezone']  = 'ម៉ោង';
+$labels['pagesize']  = 'ចំនួនសំបុត្រក្នុងមួយទំព័រ';
 $labels['signature'] = 'ហត្ថលេខា';
-$labels['dstactive'] = 'ម៉ោងវស្សានរដូវ';
+$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['htmlsignature'] = 'ហត្ថលេខាតាមបែប HTML';
+$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'បង្ហាញប្រអប់សំរាប់មើលសំបុត្រ';
 $labels['skin'] = 'ការរចនាទំព័រ';
 $labels['logoutclear'] = 'សំអាតធុងសំរាមពេលពិនិត្យចេញ';
@@ -305,14 +420,16 @@ $labels['readwhendeleted'] = 'កំណត់សំបុត្រថាបា�
 $labels['flagfordeletion'] = 'កំណត់សញ្ញាផ្កាយអោយសំបុត្រថាបានលុបដោយមិនចាំបាច់លុបជាក់ស្តែង';
 $labels['skipdeleted'] = 'មិនបង្ហាញសំបុត្រដែលបានលុប';
 $labels['deletealways'] = 'លុបសំបុត្រចោលប្រសិនជាមិនអាចផ្ទេសំបុត្រនោះទៅធុងសំរាមបាន';
+$labels['deletejunk'] = 'Directly delete messages in Junk';
 $labels['showremoteimages'] = 'បង្ហាញរូបភាពដែលគេផ្ញើមក';
 $labels['fromknownsenders'] = 'ពីអ្នកផ្ញើដែលស្គាល់';
 $labels['always'] = 'គ្រប់ពេល';
 $labels['showinlineimages'] = 'បង្ហាញរូបភាពនៅក្រោមអត្ថបទសំបុត្រ';
-$labels['autosavedraft'] = 'រក្សាទុកសំបុត្រពង្រៀងដោយស្វ័យប្រវត្តិ';
-$labels['everynminutes'] = 'រៀងរាល់ $n នាទី';
-$labels['never'] = 'មិនដែល';
-$labels['immediately'] = 'ភ្លាមៗ';
+$labels['autosavedraft']  = 'រក្សាទុកសំបុត្រពង្រៀងដោយស្វ័យប្រវត្តិ';
+$labels['everynminutes']  = 'រៀងរាល់ $n នាទី';
+$labels['refreshinterval']  = 'Refresh (check for new messages, etc.)';
+$labels['never']  = 'មិនដែល';
+$labels['immediately']  = 'ភ្លាមៗ';
 $labels['messagesdisplaying'] = 'កំពុងបង្ហាញសំបុត្រ';
 $labels['messagescomposition'] = 'កំពុងសរសេរសំបុត្រ';
 $labels['mimeparamfolding'] = 'ឈ្មោះឯកសារភ្ជាប់';
@@ -324,34 +441,49 @@ $labels['advancedoptions'] = 'ការកំណត់ពឹស្តារ';
 $labels['focusonnewmessage'] = 'ផ្តោតលើវីនដូវដែលកំពុងសរសេរសំបុត្រថ្មី';
 $labels['checkallfolders'] = 'ពិនិត្យសំបុត្រថ្មីនៅគ្រប់ថតទាំងអស់';
 $labels['displaynext'] = 'បន្ទាប់ពីសំបុត្រត្រូវបានលុប​ឬផ្ទេរបង្ហាញសំបុត្របន្ទាប់';
+$labels['defaultfont'] = 'Default font of HTML message';
 $labels['mainoptions'] = 'ជំរើសដែលជាគោល';
+$labels['browseroptions'] = 'Browser Options';
 $labels['section'] = 'ផ្នែក';
 $labels['maintenance'] = 'ការថែរក្សា';
 $labels['newmessage'] = 'សំបុត្រថ្មី';
 $labels['signatureoptions'] = 'កំណត់ហត្ថលេខា';
 $labels['whenreplying'] = 'នៅពេលកំពុងឆ្លើយតប';
+$labels['replyempty'] = 'do not quote the original message';
 $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 វិនាទី';
+$labels['previewpanemarkread']  = 'កំណត់សំបុត្រ​ដែល​បាន​បង្ហាញ​​ជា​សំបុត្របាន​អាន​រួច';
+$labels['afternseconds']  = 'ក្រោយពី $n វិនាទី';
 $labels['reqmdn'] = 'ក្រោយពី $n វិនាទី';
 $labels['reqdsn'] = 'ក្រោយពី $n វិនាទី';
 $labels['replysamefolder'] = 'ក្រោយពី $n វិនាទី';
-$labels['folder'] = 'ថត';
-$labels['foldername'] = 'ឈ្មោះថត';
-$labels['subscribed'] = 'កំណត់យកមកប្រើ';
+$labels['defaultabook'] = 'Default address book';
+$labels['autocompletesingle'] = 'Skip alternative email addresses in autocompletion';
+$labels['listnamedisplay'] = 'List contacts as';
+$labels['spellcheckbeforesend'] = 'Check spelling before sending a message';
+$labels['spellcheckoptions'] = 'Spellcheck Options';
+$labels['spellcheckignoresyms'] = 'Ignore words with symbols';
+$labels['spellcheckignorenums'] = 'Ignore words with numbers';
+$labels['spellcheckignorecaps'] = 'Ignore words with all letters capitalized';
+$labels['addtodict'] = 'Add to dictionary';
+$labels['mailtoprotohandler'] = 'Register protocol handler for mailto: links';
+$labels['forwardmode'] = 'Messages forwarding';
+$labels['inline'] = 'inline';
+$labels['asattachment'] = 'as attachment';
+
+$labels['folder']  = 'ថត';
+$labels['folders']  = 'ថតទាំងអស់';
+$labels['foldername']  = 'ឈ្មោះថត';
+$labels['subscribed']  = 'កំណត់យកមកប្រើ';
 $labels['messagecount'] = 'សំបុត្រ';
-$labels['create'] = 'បង្កើត';
-$labels['createfolder'] = 'បង្កើតថតថ្មី';
-$labels['managefolders'] = 'រៀបចំថត';
+$labels['create']  = 'បង្កើត';
+$labels['createfolder']  = 'បង្កើតថតថ្មី';
+$labels['managefolders']  = 'រៀបចំថត';
 $labels['specialfolders'] = 'ថតពិសេស';
 $labels['properties'] = 'ព័ត៌មាន';
 $labels['folderproperties'] = 'ព័ត៌មានអំពីថត';
@@ -360,13 +492,30 @@ $labels['location'] = 'ទីកន្លែង';
 $labels['info'] = 'ព័ត៌មាន';
 $labels['getfoldersize'] = 'ទំហំថត';
 $labels['changesubscription'] = 'ផ្លាស់ប្តូរការជាវ';
+$labels['foldertype'] = 'Folder Type';
+$labels['personalfolder']  = 'Private Folder';
+$labels['otherfolder']  = 'Other User\'s Folder';
+$labels['sharedfolder']  = 'Public Folder';
+
 $labels['sortby'] = 'តំរៀបតាម';
-$labels['sortasc'] = 'តំរៀបតាមលំដាប់ចុះ';
+$labels['sortasc']  = 'តំរៀបតាមលំដាប់ចុះ';
 $labels['sortdesc'] = 'តំរៀបតាមលំដាប់ឡើង';
+$labels['undo'] = 'Undo';
+
+$labels['installedplugins'] = 'Installed plugins';
+$labels['plugin'] = 'Plugin';
+$labels['version'] = 'Version';
+$labels['source'] = 'Source';
+$labels['license'] = 'License';
+$labels['support'] = 'Get support';
+
+// units
 $labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
 $labels['GB'] = 'GB';
+
+// character sets
 $labels['unicode'] = 'យូនីកូដ';
 $labels['english'] = 'ភាសាអង់គ្លេស';
 $labels['westerneuropean'] = 'អឺរ៉ុបខាងលិច';
@@ -386,3 +535,4 @@ $labels['japanese'] = 'ភាសាជប៉ុន';
 $labels['korean'] = 'ភាសាកូរ៉េ';
 $labels['chinese'] = 'ភាសាចិន';
 
+?>
diff --git a/program/localization/km_KH/messages.inc b/program/localization/km_KH/messages.inc
index 9984cc554..1f629fa6c 100644
--- a/program/localization/km_KH/messages.inc
+++ b/program/localization/km_KH/messages.inc
@@ -2,33 +2,43 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/km_KH/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['loginfailed'] = 'ការពិនិត្យចូលមិនបានសំរេចព្រោះមានបញ្ហាកើតឡើង';
+$messages['errortitle']  = 'An error occurred!';
+$messages['loginfailed']  = 'ការពិនិត្យចូលមិនបានសំរេចព្រោះមានបញ្ហាកើតឡើង';
 $messages['cookiesdisabled'] = 'កម្មវិធីមើលគេហទំព័រនេះមិនទទួលយកCookies';
 $messages['sessionerror'] = 'Session មិនត្រឹមត្រូវ ឬហួសកំណត់';
 $messages['storageerror'] = 'មិនអាចភ្ជាប់ទៅកាន់ម៉ាស៊ីនIMAP';
 $messages['servererror'] = 'មានបញ្ហានៅម៉ាស៊ីនមេ';
 $messages['servererrormsg'] = 'បញ្ហា: $msg';
+$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'] = 'ពុំមានសំបុត្រក្នុងប្រអប់សំបុត្រនេះទេ';
 $messages['loggedout'] = 'អ្នកបានពិនិត្យចេញដោយជោគជ័យ។';
 $messages['mailboxempty'] = 'ប្រអប់សំបុត្រទទេ';
+$messages['refreshing'] = 'Refreshing...';
 $messages['loading'] = 'កំពុងដំណើរការ...';
 $messages['uploading'] = 'កំពុងបញ្ជូនឯកសារ...';
+$messages['uploadingmany'] = 'Uploading files...';
 $messages['loadingdata'] = 'កំពុងបើកឯកសារ...';
 $messages['checkingmail'] = 'កំពុងស្វែងរកមើលសំបុត្រថ្មី៝...';
 $messages['sendingmessage'] = 'កំពុងផ្ញើសំបុត្រ...';
@@ -38,10 +48,12 @@ $messages['messagesaved'] = 'សំបុត្រត្រូវបានរក
 $messages['successfullysaved'] = 'រក្សាទុកដោយជោគជ័យ';
 $messages['addedsuccessfully'] = 'អាសយដ្ឋានត្រូវបានរក្សាទុកដោយជោគជ័យ';
 $messages['contactexists'] = 'ព័ត៌មានទាក់ទងដែលមានអ៊ីមែលនេះមានក្នុងសៀវភៅអាសយដ្ឋានរួចហើយ';
+$messages['contactnameexists'] = 'A contact with the same name already exists.';
 $messages['blockedimages'] = 'រូបភាពដែលមានក្នុងសំបុត្រនេះត្រូវបានបិទដើម្បីរក្សាសុវត្ថភាព';
 $messages['encryptedmessage'] = 'លោកអ្នកមិនអាចមើលសំបុត្រនេះបានទេពីព្រោះសំបុត្រនេះជាសំបុត្រសំងាត់';
 $messages['nocontactsfound'] = 'ពុំមានអាសយដ្ឋានទាក់ទងទេ';
 $messages['contactnotfound'] = 'អាសយដ្ឋានទាក់ទងដែលលោកអ្នកចង់រកពុំមានឡើយ';
+$messages['contactsearchonly'] = 'Enter some search terms to find contacts';
 $messages['sendingfailed'] = 'មិនអាចផ្ញើសំបុត្របាន';
 $messages['senttooquickly'] = 'សូមរងចាំ $sec វិនាទីមុននឹងផ្ញើសំបុត្រនេះ';
 $messages['errorsavingsent'] = 'មានបញ្ហាកើតឡើងនៅពេលកំពុងរក្សាទុកសំបុត្រដែលបានផ្ញើរួច';
@@ -50,26 +62,31 @@ $messages['errormoving'] = 'មិនអាចផ្ទេរសំបុត្�
 $messages['errorcopying'] = 'មិនអាចចំលងសំបុត្របាន';
 $messages['errordeleting'] = 'មិនអាចលុបសំបុត្រចោលបាន';
 $messages['errormarking'] = 'មិនអាចកំណត់ចំណាំលើសំបុត្របាន';
-$messages['deletecontactconfirm'] = 'តើលោកអ្នកពិតជាចង់លុបព័ត៌មានទំនាក់ទំនងនេះមែនទេ?';
+$messages['deletecontactconfirm']  = 'តើលោកអ្នកពិតជាចង់លុបព័ត៌មានទំនាក់ទំនងនេះមែនទេ?';
+$messages['deletegroupconfirm']  = 'Do you really want to delete selected group?';
 $messages['deletemessagesconfirm'] = 'តើលោកអ្នកពិតជាចង់លុបសំបុត្រនេះមែនទេ?';
-$messages['deletefolderconfirm'] = 'តើលោកអ្នកពិតជាចង់លុបថតនេះមែនទេ?';
-$messages['purgefolderconfirm'] = 'តើលោកអ្នកពិតជាចង់លុបសំបុត្រទាំងអស់នៅក្នុងថតនេះមែនទេ?';
+$messages['deletefolderconfirm']  = 'តើលោកអ្នកពិតជាចង់លុបថតនេះមែនទេ?';
+$messages['purgefolderconfirm']  = 'តើលោកអ្នកពិតជាចង់លុបសំបុត្រទាំងអស់នៅក្នុងថតនេះមែនទេ?';
+$messages['contactdeleting'] = 'Deleting contact(s)...';
+$messages['groupdeleting'] = 'Deleting group...';
 $messages['folderdeleting'] = 'កំពុងលុបថតសំរាប់ទុកឯកសារ...';
 $messages['foldermoving'] = 'កំពុងផ្ទេរថតសំរាប់ទុកឯកសារ...';
 $messages['foldersubscribing'] = 'កំពុងកំណត់ប្រើថតសំរាប់ទុកឯកសារ...';
 $messages['folderunsubscribing'] = 'កំពុងកំណត់មិនប្រើថតសំរាប់ទុកឯកសារ...';
 $messages['formincomplete'] = 'សូមបំពេញទិន្នន័យអោយបានគ្រប់';
 $messages['noemailwarning'] = 'អ៊ីមែលត្រឹមត្រូវ';
-$messages['nonamewarning'] = 'សូមសរសេរឈ្មោះរបស់អ្នក';
+$messages['nonamewarning']  = 'សូមសរសេរឈ្មោះរបស់អ្នក';
 $messages['nopagesizewarning'] = 'សូមកំណត់ទំហំទំព័រ';
 $messages['nosenderwarning'] = 'សូមសរសេរអ៊ីមែលរបស់អ្នកផ្ញើ';
 $messages['norecipientwarning'] = 'សូមសរសេរអ្នកទទួលយ៉ាងហោចណាស់ម្នាក់';
-$messages['nosubjectwarning'] = 'សំបុត្រគ្មានចំណងជើងតើអ្នកចង់សរសេរចំណងជើងនៅពេលនេះទេ?';
+$messages['nosubjectwarning']  = 'សំបុត្រគ្មានចំណងជើងតើអ្នកចង់សរសេរចំណងជើងនៅពេលនេះទេ?';
 $messages['nobodywarning'] = 'តើលោកអ្នកចង់ផ្ញើសំបុត្រដែលគ្មានតួអត្ថបទសំបុត្រទេ?';
 $messages['notsentwarning'] = 'សំបុត្រនេះមិនទាន់បានផ្ញើទេ។ តើលោកអ្នកចង់លុបចោលទេ?';
 $messages['noldapserver'] = 'សូមកំណត់ម៉ាស៊ីន LDAPដើម្បីស្វែងរក';
 $messages['nosearchname'] = 'សូមបំពេញឈ្មោះទំនាក់ទំនង ឬអាសយដ្ឋានអ៊ីមែល';
+$messages['notuploadedwarning'] = 'Not all attachments have been uploaded yet. Please wait or cancel the upload.';
 $messages['searchsuccessful'] = 'រកឃើញសំបុត្រចំនួន $nr';
+$messages['contactsearchsuccessful'] = '$nr contacts found.';
 $messages['searchnomatch'] = 'រកមិនឃើញអ្វីទាំងអស់';
 $messages['searching'] = 'កំពុងស្វែងរក...';
 $messages['checking'] = 'កំពុងពិនិត្យរក...';
@@ -90,21 +107,29 @@ $messages['sourceisreadonly'] = 'លោកអ្នកមានសិទ្ធ�
 $messages['errorsavingcontact'] = 'មិនអាចរក្សាអាសយដ្ឋានបានទេ';
 $messages['movingmessage'] = 'កំពុកផ្តេរសំបុត្រ...';
 $messages['copyingmessage'] = 'កំពុងចំលងសំបុត្រ...';
+$messages['copyingcontact'] = 'Copying contact(s)...';
 $messages['deletingmessage'] = 'កំពុងលុបសំបុត្រ...';
 $messages['markingmessage'] = 'កំពុងកំណត់សំគាល់សំបុត្រ...';
+$messages['addingmember'] = 'Adding contact(s) to the group...';
+$messages['removingmember'] = 'Removing contact(s) from the group...';
 $messages['receiptsent'] = 'បានបញ្ជូនអត្ថបទបញ្ជាក់ថាបានអានបានសំរេច';
 $messages['errorsendingreceipt'] = 'មិនអាចបញ្ជូនអត្ថបទបញ្ជាក់ថាបានអាន ទេ';
+$messages['deleteidentityconfirm'] = 'Do you really want to delete this identity?';
 $messages['nodeletelastidentity'] = 'លោកអ្នកមិនអាចលុបអត្តសញ្ញាណនេះទេព្រោះវានៅសល់ចុងក្រោយគេ';
 $messages['forbiddencharacter'] = 'ឈ្មោះថតនេះមានអក្សរដែលត្រូវហាមឃាត់';
 $messages['selectimportfile'] = 'សូមជ្រើសរើសឯកសារដើម្បីបញ្ជូនភ្ជាប់';
 $messages['addresswriterror'] = 'សៀវភៅអាសយដ្ឋាននោះមិនអាចសរសេរចូលបានទេ';
 $messages['contactaddedtogroup'] = 'បានដាក់ពត៌មានទំនាក់ទំនងចូលក្នុងក្រុមនេះដោយជោគជ័យ';
 $messages['contactremovedfromgroup'] = 'បានលុបពត៌មានទំនាក់ទំនងចេញពីក្រុមនេះដោយជោគជ័យ';
+$messages['nogroupassignmentschanged'] = 'No group assignments changed.';
 $messages['importwait'] = 'សូមមេត្តារង់ចាំកំពុងទាញទិន្នន័យចូល ...';
-$messages['importerror'] = 'ការទាញចូលមិនបានសំរេច!ឯកសារដែលជ្រើសរើសនោះមិនមែនជាប្រភេទឯកសារvCard ទេ ។';
+$messages['importformaterror'] = 'Import failed! The uploaded file is not a valid import data file.';
 $messages['importconfirm'] = '<b>ព័ត៌មានទំនាក់ទំនង $insertedបានបញ្ចូលដោយជោគជ័យ,ហើយបានរំលងចោលពត៌មានដែលមានស្រាប់$skipped </b>:<p><em>$names</em></p>';
+$messages['importconfirmskipped'] = '<b>Skipped $skipped existing entries</b>';
 $messages['opnotpermitted'] = 'ប្រតិ្តបត្តិការត្រូវបានគេហាមឃាត់!';
 $messages['nofromaddress'] = 'ខ្វះអាសយដ្ឋានអ៊ីមែលក្នុងអត្តសញ្ណាណមួយនេះ';
+$messages['editorwarning'] = 'Switching to the plain text editor will cause all text formatting to be lost. Do you wish to continue?';
+$messages['httpreceivedencrypterror'] = 'A fatal configuration error occurred. Contact your administrator immediately. <b>Your message can not be sent.</b>';
 $messages['smtpconnerror'] = 'SMTP Error ($code):មិនអាចភ្ជាប់ទៅម៉ាស៊ីនមេ';
 $messages['smtpautherror'] = 'SMTP Error ($code):ព័ត៌មានគនីយមិនត្រឹមត្រូវ';
 $messages['smtpfromerror'] = 'SMTP Error ($code):មិនអាចកំនត់អ្នកផ្ញើ "$from" ($msg)';
@@ -117,17 +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'] = 'លុបក្រុមបានដោយជោគជ័យ';
 $messages['grouprenamed'] = 'ប្តូរឈ្មោះក្រុមបានដោយជោគជ័យ';
 $messages['groupcreated'] = 'បង្កើតក្រុមបានដោយជោគជ័យ';
+$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'] = 'លុបសំបុត្របានដោយជោគជ័យ';
 $messages['messagemoved'] = 'ផ្ទេរសំបុត្របានដោយជោគជ័យ';
 $messages['messagecopied'] = 'ចំលងសំបុត្របានដោយជោគជ័យ';
 $messages['messagemarked'] = 'កំណត់សំគាល់សំបុត្របានដោយជោគជ័យ';
 $messages['autocompletechars'] = 'សូមសរសេរអក្សរយ៉ាងតិច $minដើម្បីបង្ហាយដោយស្វ័យប្រវត្តិ';
+$messages['autocompletemore'] = 'More matching entries found. Please type more characters.';
 $messages['namecannotbeempty'] = 'សូមសរសេរឈ្មោះ';
 $messages['nametoolong'] = 'ឈ្មោះវែងពេក';
 $messages['folderupdated'] = 'ផ្លាស់ប្តូរថតបានដោយជោគជ័យ';
 $messages['foldercreated'] = 'បង្កើតថតបានដោយជោគជ័យ';
 $messages['invalidimageformat'] = 'ប្រភេទរូបភាពមិនត្រឹមត្រូវ';
+$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.';
 
+?>
diff --git a/program/localization/ko_KR/labels.inc b/program/localization/ko_KR/labels.inc
index 3f8ba0576..950928767 100644
--- a/program/localization/ko_KR/labels.inc
+++ b/program/localization/ko_KR/labels.inc
@@ -2,54 +2,78 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ko_KR/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Aleksander Machniak <alec@alec.pl>                            |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = '$product에 오신 것을 환영합니다';
-$labels['username'] = '사용자명';
-$labels['password'] = '비밀번호';
-$labels['server'] = '서버';
-$labels['login'] = '로그인';
-$labels['logout'] = '로그아웃';
-$labels['mail'] = '이메일';
-$labels['settings'] = '개인 설정';
+
+// login page
+$labels['welcome']   = '$product에 오신 것을 환영합니다';
+$labels['username']  = '사용자명';
+$labels['password']  = '암호';
+$labels['server']    = '서버';
+$labels['login']     = '로그인';
+
+// taskbar
+$labels['logout']   = '로그아웃';
+$labels['mail']     = '메일';
+$labels['settings'] = '설정';
 $labels['addressbook'] = '주소록';
-$labels['inbox'] = '받은편지함';
-$labels['drafts'] = '임시저장';
-$labels['sent'] = '보낸편지함';
-$labels['trash'] = '휴지통';
-$labels['junk'] = '정크메일';
+
+// mailbox names
+$labels['inbox']  = '받은 편지함';
+$labels['drafts'] = '임시 보관함';
+$labels['sent']   = '보낸 편지함';
+$labels['trash']  = '휴지통';
+$labels['junk']   = '스팸 편지함';
+
+// message listing
 $labels['subject'] = '제목';
-$labels['from'] = '보내는 사람';
-$labels['to'] = '받는 사람';
-$labels['cc'] = '참조';
-$labels['bcc'] = '숨은 참조';
+$labels['from']    = '보내는 사람';
+$labels['sender']  = '발신인';
+$labels['to']      = '받는 사람';
+$labels['cc']      = '참조';
+$labels['bcc']     = '숨은 참조';
 $labels['replyto'] = '회신 주소';
-$labels['date'] = '날짜';
-$labels['size'] = '크기';
+$labels['followupto'] = '전달';
+$labels['date']    = '날짜';
+$labels['size']    = '크기';
 $labels['priority'] = '우선순위';
 $labels['organization'] = '기관';
+$labels['readstatus'] = '읽음 상태';
+$labels['listoptions'] = '목록 옵션...';
+
 $labels['mailboxlist'] = '폴더';
-$labels['folders'] = '폴더';
-$labels['messagesfromto'] = '$count 개 중 $from 에서 $to 번 메시지';
-$labels['threadsfromto'] = '$from 에서 $to 까지 $count 개의 쓰레드';
-$labels['messagenrof'] = '$count 개 중 $nr 번 메시지';
-$labels['copy'] = '참조';
-$labels['move'] = '이동';
-$labels['moveto'] = '이동...';
+$labels['messagesfromto'] = '총 $count개 중 $from 번째부터 $to 번째까지의 메시지';
+$labels['threadsfromto'] = '총 $count개 중 $from 번째부터 $to 번째까지의 스레드';
+$labels['messagenrof'] = '총 $count개 중  $nr 번째 메시지';
+$labels['fromtoshort'] = '총 $count개 중 $from 번째 - $to 번째';
+
+$labels['copy']     = '복사';
+$labels['move']     = '이동';
+$labels['moveto']   = '이동할 위치...';
 $labels['download'] = '다운로드';
-$labels['filename'] = '파일 이름';
+$labels['open']     = '열기';
+$labels['showattachment'] = '보기';
+$labels['showanyway'] = '그래도 항상 보기';
+
+$labels['filename'] = '파일명';
 $labels['filesize'] = '파일 크기';
+
 $labels['addtoaddressbook'] = '주소록에 추가';
+
+// weekdays short
 $labels['sun'] = '일';
 $labels['mon'] = '월';
 $labels['tue'] = '화';
@@ -57,347 +81,458 @@ $labels['wed'] = '수';
 $labels['thu'] = '목';
 $labels['fri'] = '금';
 $labels['sat'] = '토';
-$labels['sunday'] = '일요일';
-$labels['monday'] = '월요일';
-$labels['tuesday'] = '화요일';
+
+// weekdays long
+$labels['sunday']    = '일요일';
+$labels['monday']    = '월요일';
+$labels['tuesday']   = '화요일';
 $labels['wednesday'] = '수요일';
-$labels['thursday'] = '목요일';
-$labels['friday'] = '금요일';
-$labels['saturday'] = '토요일';
-$labels['jan'] = '1월';
-$labels['feb'] = '2월';
-$labels['mar'] = '3월';
-$labels['apr'] = '4월';
-$labels['may'] = '5월';
-$labels['longmay'] = '5월';
-$labels['jun'] = '6월';
-$labels['jul'] = '7월';
-$labels['aug'] = '8월';
-$labels['sep'] = '9월';
-$labels['oct'] = '10월';
-$labels['nov'] = '11월';
-$labels['dec'] = '12월';
-$labels['longjan'] = '1월';
-$labels['longfeb'] = '2월';
-$labels['longmar'] = '3월';
-$labels['longapr'] = '4월';
-$labels['longjun'] = '6월';
-$labels['longjul'] = '7월';
-$labels['longaug'] = '8월';
-$labels['longsep'] = '9월';
-$labels['longoct'] = '10월';
-$labels['longnov'] = '11월';
-$labels['longdec'] = '12월';
+$labels['thursday']  = '목요일';
+$labels['friday']    = '금요일';
+$labels['saturday']  = '토요일';
+
+// months short
+$labels['jan']	= '1월';
+$labels['feb']	= '2월';
+$labels['mar']	= '3월';
+$labels['apr']	= '4월';
+$labels['may']	= '5월';
+$labels['jun']	= '6월';
+$labels['jul'] 	= '7월';
+$labels['aug']	= '8월';
+$labels['sep']	= '9월';
+$labels['oct']	= '10월';
+$labels['nov']	= '11월';
+$labels['dec']	= '12월';
+
+// months long
+$labels['longjan']	= '1월';
+$labels['longfeb']	= '2월';
+$labels['longmar']	= '3월';
+$labels['longapr']	= '4월';
+$labels['longmay']	= '5월';
+$labels['longjun']	= '6월';
+$labels['longjul']	= '7월';
+$labels['longaug']	= '8월';
+$labels['longsep']	= '9월';
+$labels['longoct']	= '10월';
+$labels['longnov']	= '11월';
+$labels['longdec']	= '12월';
+
 $labels['today'] = '오늘';
-$labels['refresh'] = '새로 고침';
-$labels['checkmail'] = '새 메일 확인';
-$labels['compose'] = '메일 쓰기';
-$labels['writenewmessage'] = '새 메일 작성';
-$labels['reply'] = '회신';
-$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['viewsource'] = '소스 보기';
-$labels['mark'] = '표시';
-$labels['markmessages'] = '메시지 표시';
-$labels['markread'] = '읽은 것으로 표시';
-$labels['markunread'] = '읽지 않은 것으로 표시';
-$labels['markflagged'] = '깃발 달기';
-$labels['markunflagged'] = '깃발 내리기';
-$labels['moreactions'] = '이외의 동작...';
-$labels['more'] = '더보기';
-$labels['back'] = '뒤로';
-$labels['options'] = '선택 사항';
+
+// toolbar buttons
+$labels['refresh']          = '새로 고침';
+$labels['checkmail']        = '새 메시지 확인';
+$labels['compose']          = '메시지 작성';
+$labels['writenewmessage']  = '새 메시지 생성';
+$labels['reply']            = '회신';
+$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['viewsource']       = '소스 보기';
+$labels['mark']             = '표시';
+$labels['markmessages']     = '메시지 표시하기';
+$labels['markread']         = '읽음으로 표시';
+$labels['markunread']       = '읽지 않음으로 표시';
+$labels['markflagged']      = '깃발로 표시됨으로 표시';
+$labels['markunflagged']    = '깃발로 표시되지 않음으로 표시';
+$labels['moreactions']      = '추가 동작...';
+$labels['more']             = '더보기';
+$labels['back']             = '뒤로';
+$labels['options']          = '옵션';
+
 $labels['select'] = '선택';
 $labels['all'] = '모두';
 $labels['none'] = '없음';
-$labels['nonesort'] = '없음';
 $labels['currpage'] = '현재 페이지';
 $labels['unread'] = '읽지 않음';
-$labels['flagged'] = '깃발';
+$labels['flagged'] = '깃발로 표시됨';
 $labels['unanswered'] = '답장하지 않음';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = '삭제됨';
+$labels['undeleted'] = '삭제되지 않음';
 $labels['invert'] = '반전';
 $labels['filter'] = '필터';
-$labels['list'] = '리스트';
-$labels['threads'] = '쓰레드';
+$labels['list'] = '목록';
+$labels['threads'] = '스레드';
 $labels['expand-all'] = '모두 확장';
+$labels['expand-unread'] = '읽지 않은 메시지 확장';
 $labels['collapse-all'] = '모두 접기';
-$labels['threaded'] = '그룹화됨';
-$labels['autoexpand_threads'] = '모든 메시지 확장';
-$labels['flag'] = '표시';
-$labels['attachment'] = '첨부';
-$labels['sentdate'] = '보낸 날짜';
-$labels['arrival'] = '수신 날짜';
+$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['asc'] = '오름차순';
 $labels['desc'] = '내림차순';
-$labels['listsorting'] = '정렬';
+$labels['listcolumns'] = '열 목록 보기';
+$labels['listsorting'] = '열 정렬';
 $labels['listorder'] = '정렬 순서';
+$labels['listmode'] = '화면 모드 목록 보기';
+
 $labels['folderactions'] = '폴더 명령';
 $labels['compact'] = '간단하게';
-$labels['empty'] = '비우기';
-$labels['quota'] = '디스크 사용';
-$labels['unknown'] = '알수 없음';
-$labels['unlimited'] = '제한 없음';
-$labels['quicksearch'] = '빨리 찾기';
-$labels['resetsearch'] = '찾기 리셋';
-$labels['msgtext'] = '전체 메시지';
+$labels['empty'] = '비어 있음';
+
+$labels['quota'] = '디스크 사용량';
+$labels['unknown']  = '알 수 없음';
+$labels['unlimited']  = '제한 없음';
+
+$labels['quicksearch']  = '빠른 검색';
+$labels['resetsearch']  = '검색 재설정';
+$labels['searchmod']  = '수정자 검색';
+$labels['msgtext']  = '전체 메시지';
+$labels['body']  = '본문';
+
 $labels['openinextwin'] = '새 창에서 열기';
-$labels['emlsave'] = '다운로드 (.eml)';
-$labels['sendmessage'] = '메일 지금 보냄';
-$labels['savemessage'] = '드래프트 저장';
-$labels['addattachment'] = '파일 첨부';
-$labels['charset'] = '문자셋';
-$labels['editortype'] = '편집기 형태';
-$labels['returnreceipt'] = '수신 확인 요청하기';
-$labels['dsn'] = '전송상태 메일 받기';
-$labels['mailreplyintro'] = '$date에, $sender가 작성:';
+$labels['emlsave'] = '다운로드(.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
+
+// message compose
+$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['spellcheck'] = '맞춤법';
-$labels['checkspelling'] = '스펠링 체크';
-$labels['resumeediting'] = '편집 계속';
-$labels['revertto'] = '돌아감';
+
+$labels['editidents']    = '신원 편집';
+$labels['spellcheck']    = '맞춤법';
+$labels['checkspelling'] = '맞춤법 검사하기';
+$labels['resumeediting'] = '편집 계속하기';
+$labels['revertto']      = '돌아가기';
+
 $labels['attach'] = '첨부';
-$labels['attachments'] = '첨부 파일';
+$labels['attachments'] = '첨부파일';
 $labels['upload'] = '업로드';
-$labels['uploadprogress'] = '$percent ($total 에서 $current)';
-$labels['close'] = '닫기';
-$labels['messageoptions'] = '메시지 옵션(들)...';
-$labels['low'] = '낮음';
-$labels['lowest'] = '가장 낮음';
-$labels['normal'] = '보통';
-$labels['high'] = '높음';
+$labels['uploadprogress'] = '$percent ($total개 중 $current개)';
+$labels['close']  = '닫기';
+$labels['messageoptions']  = '메시지 옵션...';
+
+$labels['low']     = '낮음';
+$labels['lowest']  = '가장 낮음';
+$labels['normal']  = '보통';
+$labels['high']    = '높음';
 $labels['highest'] = '가장 높음';
-$labels['nosubject'] = '(제목 없음)';
-$labels['showimages'] = '이미지 표시';
-$labels['alwaysshow'] = '$sender 에서 온 이미지 항상 보기';
-$labels['isdraft'] = '이 메시지는 임시 보관 메시지 입니다.';
+
+$labels['nosubject']  = '(제목 없음)';
+$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['addcc'] = '참조 넣기';
-$labels['addbcc'] = '숨은참조 넣기';
-$labels['addreplyto'] = '회신주소 넣기';
-$labels['mdnrequest'] = '이 메시지를 보낸 분이 읽음 확인 요청을 했습니다. 확인할까요?';
-$labels['receiptread'] = '읽음 확인 보내기';
-$labels['yourmessage'] = '당신의 메시지를 읽었습니다.';
-$labels['receiptnote'] = '주의: 이 확인은 이 메시지가 수신자의 컴퓨터에 표시된 것만을 의미합니다. 수신자가 반드시 이 메일을 읽거나 이해했다는 것은 아닙니다.';
-$labels['name'] = '표시 이름';
-$labels['firstname'] = '이름';
-$labels['surname'] = '성';
-$labels['middlename'] = '가운데 이름';
-$labels['nameprefix'] = '접두사';
-$labels['namesuffix'] = '접미사';
-$labels['nickname'] = '별명';
-$labels['jobtitle'] = '직위';
-$labels['department'] = '부서';
-$labels['gender'] = '성별';
-$labels['maidenname'] = '결혼 전 이름';
-$labels['email'] = '이메일';
-$labels['phone'] = '전화';
-$labels['address'] = '주소';
-$labels['street'] = '세부주소';
-$labels['locality'] = '시/구/군';
-$labels['zipcode'] = '우편번호';
-$labels['region'] = '도';
-$labels['country'] = '국가';
-$labels['birthday'] = '생년월일';
-$labels['anniversary'] = '기념일';
-$labels['website'] = '웹사이트';
-$labels['instantmessenger'] = '메신져';
-$labels['notes'] = '노트';
-$labels['male'] = '남성';
+$labels['maxuploadsize'] = '최대 허용 파일 크기는 $size 입니다';
+
+$labels['addcc'] = '참조 추가';
+$labels['addbcc'] = '숨은 참조 추가';
+$labels['addreplyto'] = '회신 주소 추가';
+$labels['addfollowupto'] = '전달 추가';
+
+// mdn
+$labels['mdnrequest'] = '이 메시지를 보낸 사람이 사용자가 이 메시지를 읽었을 때 읽음 확인을 요청했습니다. 보낸 사람에게 알리시겠습니까?';
+$labels['receiptread'] = '수신 확인 (읽음)';
+$labels['yourmessage'] = '이것은 사용자의 메시지에 대한 수신 확인입니다.';
+$labels['receiptnote'] = '참고: 이 수신 확인은 이 메시지가 받는 사람의 컴퓨터에 표시되었다는 것만을 의미합니다. 받는 사람이 메시지 내용을 읽거나 이해했다는 보장은 없습니다.';
+
+// address boook
+$labels['name']         = '표시명';
+$labels['firstname']    = '이름';
+$labels['surname']      = '성';
+$labels['middlename']   = '가운데 이름';
+$labels['nameprefix']   = '접두사';
+$labels['namesuffix']   = '접미사';
+$labels['nickname']     = '별칭';
+$labels['jobtitle']     = '직위';
+$labels['department']   = '부서';
+$labels['gender']       = '성별';
+$labels['maidenname']   = '결혼 전 성';
+$labels['email']        = '이메일';
+$labels['phone']        = '전화';
+$labels['address']      = '주소';
+$labels['street']       = '나머지 주소';
+$labels['locality']     = '시/구/군';
+$labels['zipcode']      = '우편번호';
+$labels['region']       = '시/도';
+$labels['country']      = '국가';
+$labels['birthday']     = '생년월일';
+$labels['anniversary']  = '기념일';
+$labels['website']      = '웹사이트';
+$labels['instantmessenger'] = '인스턴트 메신저';
+$labels['notes'] = '메모';
+$labels['male']   = '남성';
 $labels['female'] = '여성';
-$labels['manager'] = '관리자';
-$labels['assistant'] = '도우미';
-$labels['typeassistant'] = '도우미';
+$labels['manager'] = '상사';
+$labels['assistant'] = '비서';
 $labels['spouse'] = '배우자';
-$labels['allfields'] = '친구 전체';
+$labels['allfields'] = '모든 항목';
 $labels['search'] = '검색';
-$labels['advsearch'] = '상세 검색';
-$labels['advanced'] = '고급 설정';
-$labels['other'] = '그 외';
-$labels['typeother'] = '그 외';
-$labels['typehome'] = '홈';
-$labels['typework'] = '직장';
-$labels['typemobile'] = '휴대폰';
-$labels['typemain'] = '주';
-$labels['typehomefax'] = '팩스(집)';
-$labels['typeworkfax'] = '팩스(직장)';
-$labels['typecar'] = '자동차';
-$labels['typepager'] = '호출기';
-$labels['typevideo'] = '동영상';
-$labels['typehomepage'] = '홈 페이지';
+$labels['advsearch'] = '고급 검색';
+$labels['advanced'] = '고급';
+$labels['other'] = '기타';
+
+$labels['typehome']   = '자택';
+$labels['typework']   = '직장';
+$labels['typeother']  = '기타';
+$labels['typemobile']  = '휴대전화';
+$labels['typemain']  = '대표';
+$labels['typehomefax']  = '자택 팩스';
+$labels['typeworkfax']  = '직장 팩스';
+$labels['typecar']  = '자동차';
+$labels['typepager']  = '호출기';
+$labels['typevideo']  = '동영상';
+$labels['typeassistant']  = '비서';
+$labels['typehomepage']  = '홈페이지';
 $labels['typeblog'] = '블로그';
 $labels['typeprofile'] = '자기소개';
-$labels['addfield'] = '항목 추가..';
+
+$labels['addfield'] = '필드 추가..';
 $labels['addcontact'] = '새 연락처 추가';
 $labels['editcontact'] = '연락처 편집';
 $labels['contacts'] = '연락처';
+$labels['contactproperties'] = '연락처 속성';
 $labels['personalinfo'] = '개인 정보';
-$labels['edit'] = '편집';
+
+$labels['edit']   = '편집';
 $labels['cancel'] = '취소';
-$labels['save'] = '저장';
+$labels['save']   = '저장';
 $labels['delete'] = '삭제';
 $labels['rename'] = '이름 변경';
 $labels['addphoto'] = '추가';
 $labels['replacephoto'] = '바꾸기';
-$labels['uploadphoto'] = '사진 올리기';
-$labels['newcontact'] = '새 연락처 카드 만들기';
-$labels['deletecontact'] = '선택한 연락처 삭제';
-$labels['composeto'] = '새 메일 작성';
-$labels['contactsfromto'] = '$from 에서 $to 로의 연락처 $count 개';
-$labels['print'] = '인쇄';
-$labels['export'] = '내보내기';
-$labels['exportvcards'] = '연락처를 vCard 포맷으로 내보내기';
-$labels['newcontactgroup'] = '새로운 연락처 그룹 생성';
-$labels['grouprename'] = '그룹 이름 바꾸기';
-$labels['groupdelete'] = '그룹 삭제';
+$labels['uploadphoto'] = '사진 업로드';
+
+$labels['newcontact']     = '새 연락처 카드 생성';
+$labels['deletecontact']  = '선택한 연락처 삭제';
+$labels['composeto']      = '메일 작성 대상';
+$labels['contactsfromto'] = '총 $count개의 연락처 중 $from 번째부터 $to 번째 까지';
+$labels['print']          = '인쇄';
+$labels['export']         = '내보내기';
+$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'] = '검색 저장';
+$labels['searchdelete'] = '검색 삭제';
+
 $labels['import'] = '가져오기';
 $labels['importcontacts'] = '연락처 가져오기';
-$labels['importfromfile'] = '파일에서 가져오기';
-$labels['importreplace'] = '전체 주소록을 바꿈';
+$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['preferhtml'] = 'HTML 보이기';
-$labels['defaultcharset'] = '기본 문자 세트';
+
+$labels['newitem'] = '새 항목';
+$labels['edititem'] = '항목 편집';
+
+$labels['preferhtml'] = 'HTML 표시';
+$labels['defaultcharset'] = '기본 인코딩';
 $labels['htmlmessage'] = 'HTML 메시지';
+$labels['messagepart'] = '부분';
+$labels['digitalsig'] = '디지털 서명';
 $labels['dateformat'] = '날짜 형식';
 $labels['timeformat'] = '시간 형식';
-$labels['prettydate'] = '날짜 형식';
-$labels['setdefault'] = '기본으로 설정';
-$labels['autodetect'] = '자동';
-$labels['language'] = '언어';
-$labels['timezone'] = '시간대';
-$labels['pagesize'] = '페이지당 줄 수';
+$labels['prettydate'] = '간결한 날짜';
+$labels['setdefault']  = '기본 설정';
+$labels['autodetect']  = '자동';
+$labels['language']  = '언어';
+$labels['timezone']  = '시간대';
+$labels['pagesize']  = '페이지당 행 수';
 $labels['signature'] = '서명';
-$labels['dstactive'] = '서머타임';
-$labels['htmleditor'] = 'HTML 메일 쓰기';
-$labels['htmlonreply'] = 'HTML 메시지에 회신할 때에 만';
+$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['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['never'] = '하지 않음';
-$labels['immediately'] = '즉시';
-$labels['messagesdisplaying'] = '메시지 표시 중';
-$labels['messagescomposition'] = '메시지 작성 중';
-$labels['mimeparamfolding'] = '첨부 파일 이름';
+$labels['showinlineimages'] = '메시지 하단에 첨부 이미지 표시';
+$labels['autosavedraft']  = '작성 중인 메시지를 자동으로 저장';
+$labels['everynminutes']  = '매 $n분 마다';
+$labels['refreshinterval']  = '새로 고침 (새 메시지 확인, 기타 등등)';
+$labels['never']  = '하지 않음';
+$labels['immediately']  = '즉시';
+$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['autoaddsignature'] = '자동으로 서명 추가';
-$labels['newmessageonly'] = '새로운 메시지만';
-$labels['replyandforwardonly'] = '회신이나 전달 메시지 만';
+$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['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['folder'] = '폴더';
-$labels['foldername'] = '폴더 이름';
-$labels['subscribed'] = '가입됨';
+$labels['mailtoprotohandler'] = 'mailto: 링크의 프로토콜 처리자 등록';
+$labels['forwardmode'] = '메시지 전달';
+$labels['inline'] = '본문 내용으로';
+$labels['asattachment'] = '첨부파일로';
+
+$labels['folder']  = '폴더';
+$labels['folders']  = '폴더';
+$labels['foldername']  = '폴더명';
+$labels['subscribed']  = '구독함';
 $labels['messagecount'] = '메시지';
-$labels['create'] = '만들기';
-$labels['createfolder'] = '새 폴더 만들기';
-$labels['managefolders'] = '폴더 관리';
+$labels['create']  = '생성';
+$labels['createfolder']  = '새 폴더 생성';
+$labels['managefolders']  = '폴더 관리';
 $labels['specialfolders'] = '특수 폴더';
-$labels['properties'] = '등록 정보';
-$labels['folderproperties'] = '폴더 등록 정보';
+$labels['properties'] = '속성';
+$labels['folderproperties'] = '폴더 속성';
 $labels['parentfolder'] = '상위 폴더';
+$labels['location'] = '위치';
 $labels['info'] = '정보';
-$labels['getfoldersize'] = '폴더의 사이즈를 알아보려면 클릭';
-$labels['changesubscription'] = '구독을 변경하려면 클릭';
-$labels['foldertype'] = '폴더 타입';
-$labels['personalfolder'] = '개인 폴더';
-$labels['otherfolder'] = '다른 사용자의 폴더';
-$labels['sharedfolder'] = '공개 폴더';
-$labels['sortby'] = '정렬';
-$labels['sortasc'] = '오름차순으로 정렬';
+$labels['getfoldersize'] = '폴더 크기를 확인하려면 클릭하세요';
+$labels['changesubscription'] = '구독을 변경하려면 클릭하세요';
+$labels['foldertype'] = '폴더 유형';
+$labels['personalfolder']  = '개인 폴더';
+$labels['otherfolder']  = '다른 사용자의 폴더';
+$labels['sharedfolder']  = '공유 폴더';
+
+$labels['sortby'] = '정렬 방식';
+$labels['sortasc']  = '오름차순으로 정렬';
 $labels['sortdesc'] = '내림차순으로 정렬';
 $labels['undo'] = '실행 취소';
+
+$labels['installedplugins'] = '설치된 플러그인';
 $labels['plugin'] = '플러그인';
 $labels['version'] = '버전';
-$labels['license'] = '라이센스';
-$labels['support'] = '지원 받기';
-$labels['B'] = '바이트';
-$labels['KB'] = '킬로바이트';
-$labels['MB'] = '메가바이트';
-$labels['GB'] = '기가바이트';
-$labels['unicode'] = '유니코드(단일 코드,다국적 지원코드)';
+$labels['source'] = '소스';
+$labels['license'] = '라이선스';
+$labels['support'] = '지원 요청';
+
+// units
+$labels['B'] = 'B';
+$labels['KB'] = 'KB';
+$labels['MB'] = 'MB';
+$labels['GB'] = 'GB';
+
+// character sets
+$labels['unicode'] = '유니코드';
 $labels['english'] = '영어';
+$labels['westerneuropean'] = '서유럽어';
+$labels['easterneuropean'] = '동유럽어';
+$labels['southeasterneuropean'] = '남동유럽어';
+$labels['baltic'] = '발트어';
+$labels['cyrillic'] = '키릴어';
+$labels['arabic'] = '아랍어';
+$labels['greek'] = '그리스어';
+$labels['hebrew'] = '히브리어';
 $labels['turkish'] = '터키어';
+$labels['nordic'] = '북유럽어';
 $labels['thai'] = '태국어';
+$labels['celtic'] = '켈트어';
 $labels['vietnamese'] = '베트남어';
 $labels['japanese'] = '일본어';
 $labels['korean'] = '한국어';
 $labels['chinese'] = '중국어';
 
+?>
diff --git a/program/localization/ko_KR/messages.inc b/program/localization/ko_KR/messages.inc
index c1936dbd0..bf42c9c89 100644
--- a/program/localization/ko_KR/messages.inc
+++ b/program/localization/ko_KR/messages.inc
@@ -2,151 +2,171 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ko_KR/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Kim, Woohyun <woohyun.kim@gmail.com>                          |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['errortitle'] = '에러가 발생!';
-$messages['loginfailed'] = '로그인이 실패하였습니다.';
-$messages['cookiesdisabled'] = '브라우저가 쿠키를 지원하지 않습니다';
-$messages['sessionerror'] = '세션이 유효하지 않거나 종료되었습니다';
+$messages['errortitle']  = '오류 발생!';
+$messages['loginfailed']  = '로그인이 실패하였습니다.';
+$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['nomessagesfound'] = '이 메일함에 메일이 없습니다';
-$messages['loggedout'] = '세션을 성공적으로 종료하였습니다. 안녕히 가십시오!';
-$messages['mailboxempty'] = '메일함이 비어있습니다';
+$messages['errorreadonly'] = '명령을 수행할 수 없습니다. 읽기 전용 폴더임.';
+$messages['errornoperm'] = '명령을 수행할 수 없습니다. 권한이 거부됨.';
+$messages['erroroverquota'] = '작업을 수행할 수 없음. 여유 공간이 없음.';
+$messages['erroroverquotadelete'] = '여유 공간이 없음. SHIFT-DEL을 이용하여 메시지를 삭제하세요.';
+$messages['invalidrequest'] = '잘못된 요청! 데이터가 저장되지 않았음.';
+$messages['invalidhost'] = '잘못된 서버 이름입니다.';
+$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['nodeletelastidentity'] = '이 정보는 마지막 남은 것이므로 지울 수 없습니다';
-$messages['forbiddencharacter'] = '폴더 이름에 쓸 수 없는 문자가 포함되어 있습니다';
-$messages['selectimportfile'] = '업로드할 파일을 선택하세요';
-$messages['addresswriterror'] = '선택한 주소록은 쓸 수 없습니다';
-$messages['contactaddedtogroup'] = '이 그룹에 연락처를 성공적으로 추가 함.';
-$messages['contactremovedfromgroup'] = '이 그룹으로 부터 연락처를 성공적으로 제거 함.';
-$messages['importwait'] = '가져오는 중, 기다리세요...';
-$messages['importerror'] = '가져오기 실패! 업로드한 파일이 유효한 vCard 파일이 아닙니다.';
-$messages['importconfirm'] = '<b>$inserted 연락처를 성공적으로 가져왔고, $skipped 존재하는 항목은 건너뛰었습니다.</b>:<p><em>$names</em></p>';
-$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['messagedeleted'] = '메시지(들)이 성공적으로 삭제 됨.';
-$messages['messagemoved'] = '메시지(들)을 성공적으로 이동 함.';
-$messages['messagecopied'] = '메시지(들)을 성공적으로 복사 함.';
-$messages['messagemarked'] = '메시지(들)에 성공적으로 표시 함.';
-$messages['autocompletechars'] = '자동 완성을 위해서 적어도 $min 글자를 입력하세요.';
-$messages['namecannotbeempty'] = '이름이 비워져서는 안됩니다.';
+$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 연락처를 성공적으로 가져옴<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['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 a6de26f94..a4f6cb568 100644
--- a/program/localization/ku/labels.inc
+++ b/program/localization/ku/labels.inc
@@ -2,52 +2,78 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ku/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = 'Bixêr hatî $product \'ê';
-$labels['username'] = 'Bikarhêner';
-$labels['password'] = 'Nasnav';
-$labels['server'] = 'Pêşkêşkar';
-$labels['login'] = 'Têkevê';
-$labels['logout'] = 'Derkeve';
-$labels['mail'] = 'E-Peyam';
+
+// login page
+$labels['welcome']   = 'Bixêr hatî $product \'ê';
+$labels['username']  = 'Bikarhêner';
+$labels['password']  = 'Nasnav';
+$labels['server']    = 'Pêşkêşkar';
+$labels['login']     = 'Têkevê';
+
+// taskbar
+$labels['logout']   = 'Derkeve';
+$labels['mail']     = 'E-Peyam';
 $labels['settings'] = 'Mîhengên Takekesî';
 $labels['addressbook'] = 'Lênûska Navnîşanan';
-$labels['inbox'] = 'Hatî';
+
+// mailbox names
+$labels['inbox']  = 'Hatî';
 $labels['drafts'] = 'Hilanînî';
-$labels['sent'] = 'Şandî';
-$labels['trash'] = 'Çop';
-$labels['junk'] = 'Biikêrnehatî';
+$labels['sent']   = 'Şandî';
+$labels['trash']  = 'Çop';
+$labels['junk']   = 'Biikêrnehatî';
+
+// message listing
 $labels['subject'] = 'Mijar';
-$labels['from'] = 'Şandyar';
-$labels['to'] = 'Standyar';
-$labels['cc'] = 'Kopiya Karbon';
-$labels['bcc'] = 'Kopiya karbon a Veşartî';
+$labels['from']    = 'Şandyar';
+$labels['sender']  = 'Sender';
+$labels['to']      = 'Standyar';
+$labels['cc']      = 'Kopiya Karbon';
+$labels['bcc']     = 'Kopiya karbon a Veşartî';
 $labels['replyto'] = 'Navnîşanên Standyar';
-$labels['date'] = 'Dîrok';
-$labels['size'] = 'Mezinahî';
+$labels['followupto'] = 'Followup-To';
+$labels['date']    = 'Dîrok';
+$labels['size']    = 'Mezinahî';
 $labels['priority'] = 'Girîngî';
 $labels['organization'] = 'Sazî';
+$labels['readstatus'] = 'Read status';
+$labels['listoptions'] = 'List options...';
+
 $labels['mailboxlist'] = 'Peldank';
-$labels['folders'] = 'Peldank';
 $labels['messagesfromto'] = 'Peyam $count ên di navbera $from - $to';
+$labels['threadsfromto'] = 'Threads $from to $to of $count';
 $labels['messagenrof'] = '$nr a peyama $count';
-$labels['copy'] = 'Kopiya Karbon';
-$labels['moveto'] = 'bibe...';
+$labels['fromtoshort'] = '$from – $to of $count';
+
+$labels['copy']     = 'Kopiya Karbon';
+$labels['move']     = 'Move';
+$labels['moveto']   = 'bibe...';
 $labels['download'] = 'daxe';
+$labels['open']     = 'Open';
+$labels['showattachment'] = 'Show';
+$labels['showanyway'] = 'Show it anyway';
+
 $labels['filename'] = 'Navê pelê';
 $labels['filesize'] = 'Mezinahiya pelê';
+
 $labels['addtoaddressbook'] = 'Têxe lênûska navnîşanan';
+
+// weekdays short
 $labels['sun'] = 'Yş';
 $labels['mon'] = 'Dş';
 $labels['tue'] = 'Sş';
@@ -55,125 +81,458 @@ $labels['wed'] = 'Çş';
 $labels['thu'] = 'Pş';
 $labels['fri'] = 'În';
 $labels['sat'] = 'Şe';
-$labels['sunday'] = 'Yekşem';
-$labels['monday'] = 'Duşem';
-$labels['tuesday'] = 'Sêşem';
+
+// weekdays long
+$labels['sunday']    = 'Yekşem';
+$labels['monday']    = 'Duşem';
+$labels['tuesday']   = 'Sêşem';
 $labels['wednesday'] = 'Çarşem';
-$labels['thursday'] = 'Pêncşem';
-$labels['friday'] = 'În';
-$labels['saturday'] = 'Şemî';
+$labels['thursday']  = 'Pêncşem';
+$labels['friday']    = 'În';
+$labels['saturday']  = 'Şemî';
+
+// months short
+$labels['jan']	= 'Jan';
+$labels['feb']	= 'Feb';
+$labels['mar']	= 'Mar';
+$labels['apr']	= 'Apr';
+$labels['may']	= 'May';
+$labels['jun']	= 'Jun';
+$labels['jul'] 	= 'Jul';
+$labels['aug']	= 'Aug';
+$labels['sep']	= 'Sep';
+$labels['oct']	= 'Oct';
+$labels['nov']	= 'Nov';
+$labels['dec']	= 'Dec';
+
+// months long
+$labels['longjan']	= 'January';
+$labels['longfeb']	= 'February';
+$labels['longmar']	= 'March';
+$labels['longapr']	= 'April';
+$labels['longmay']	= 'May';
+$labels['longjun']	= 'June';
+$labels['longjul']	= 'July';
+$labels['longaug']	= 'August';
+$labels['longsep']	= 'September';
+$labels['longoct']	= 'October';
+$labels['longnov']	= 'November';
+$labels['longdec']	= 'December';
+
 $labels['today'] = 'Îro';
-$labels['checkmail'] = 'Li peyamên nû venihêre';
-$labels['compose'] = 'Peyamekê biafirîne';
-$labels['writenewmessage'] = 'Peyameke nû biafirîne';
-$labels['replytomessage'] = 'Bersivê bide peyamê';
+
+// toolbar buttons
+$labels['refresh']          = 'Refresh';
+$labels['checkmail']        = 'Li peyamên nû venihêre';
+$labels['compose']          = 'Peyamekê biafirîne';
+$labels['writenewmessage']  = 'Peyameke nû biafirîne';
+$labels['reply']            = 'Reply';
+$labels['replytomessage']   = 'Bersivê bide peyamê';
 $labels['replytoallmessage'] = 'Bersivê ji bo hemû kesên ku ev peyan standine bişîne';
-$labels['forwardmessage'] = 'Bersivê bide peyamê';
-$labels['deletemessage'] = 'Peyamê jê bibe';
+$labels['replyall']         = 'Reply all';
+$labels['replylist']        = 'Reply list';
+$labels['forward']          = 'Forward';
+$labels['forwardinline']    = 'Forward inline';
+$labels['forwardattachment'] = 'Forward as attachment';
+$labels['forwardmessage']   = 'Bersivê bide peyamê';
+$labels['deletemessage']    = 'Peyamê jê bibe';
 $labels['movemessagetotrash'] = 'Peyamê dake çopê';
-$labels['printmessage'] = 'Vê peyamê çap bike';
-$labels['previousmessage'] = 'Peyama berê nîşan bide';
-$labels['firstmessage'] = 'Peyama yekemîn nîşan bide';
-$labels['nextmessage'] = 'Peyama di rêzê de nîşan bide';
-$labels['lastmessage'] = 'Peyama dawî nîşan bide';
-$labels['backtolist'] = 'Vegere lîsteya peyaman';
-$labels['viewsource'] = 'Çavkaniyê nîşan bide';
-$labels['markmessages'] = 'Peyamê nîşan bike';
-$labels['markread'] = 'Wekî xwendî';
-$labels['markunread'] = 'Wekî nexwendî';
+$labels['printmessage']     = 'Vê peyamê çap bike';
+$labels['previousmessage']  = 'Peyama berê nîşan bide';
+$labels['firstmessage']     = 'Peyama yekemîn nîşan bide';
+$labels['nextmessage']      = 'Peyama di rêzê de nîşan bide';
+$labels['lastmessage']      = 'Peyama dawî nîşan bide';
+$labels['backtolist']       = 'Vegere lîsteya peyaman';
+$labels['viewsource']       = 'Çavkaniyê nîşan bide';
+$labels['mark']             = 'Mark';
+$labels['markmessages']     = 'Peyamê nîşan bike';
+$labels['markread']         = 'Wekî xwendî';
+$labels['markunread']       = 'Wekî nexwendî';
+$labels['markflagged']      = 'As flagged';
+$labels['markunflagged']    = 'As unflagged';
+$labels['moreactions']      = 'More actions...';
+$labels['more']             = 'More';
+$labels['back']             = 'Back';
+$labels['options']          = 'Options';
+
 $labels['select'] = 'Hilbijêre';
 $labels['all'] = 'Hemû';
 $labels['none'] = 'Ne yek jî';
-$labels['nonesort'] = 'Ne yek jî';
+$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';
+$labels['filter'] = 'Filter';
+$labels['list'] = 'List';
+$labels['threads'] = 'Threads';
+$labels['expand-all'] = 'Expand All';
+$labels['expand-unread'] = 'Expand Unread';
+$labels['collapse-all'] = 'Collapse All';
+$labels['threaded'] = 'Threaded';
+
+$labels['autoexpand_threads'] = 'Expand message threads';
+$labels['do_expand'] = 'all threads';
+$labels['expand_only_unread'] = 'only with unread messages';
+$labels['fromto'] = 'From/To';
+$labels['flag'] = 'Flag';
+$labels['attachment'] = 'Attachment';
+$labels['nonesort'] = 'Ne yek jî';
+$labels['sentdate'] = 'Sent date';
+$labels['arrival'] = 'Arrival date';
+$labels['asc'] = 'ascending';
+$labels['desc'] = 'descending';
+$labels['listcolumns'] = 'List columns';
+$labels['listsorting'] = 'Sorting column';
+$labels['listorder'] = 'Sorting order';
+$labels['listmode'] = 'List view mode';
+
+$labels['folderactions'] = 'Folder actions...';
 $labels['compact'] = 'Kompakt';
 $labels['empty'] = 'Vala Bike';
+
 $labels['quota'] = 'Bikaranîna dîskê';
-$labels['unknown'] = 'nayê zanîn';
-$labels['unlimited'] = 'bêsînor';
-$labels['quicksearch'] = 'Lêgerîna bilez';
-$labels['resetsearch'] = 'Lêgerînê reset bike';
-$labels['sendmessage'] = 'Peyamê niha bişîne';
-$labels['savemessage'] = 'Hilîne';
-$labels['addattachment'] = 'Pelekê lê zêde bike';
-$labels['charset'] = 'Curetîp';
-$labels['editortype'] = 'Cureyê serastkat';
-$labels['returnreceipt'] = 'Rapora Vegerînê';
+$labels['unknown']  = 'nayê zanîn';
+$labels['unlimited']  = 'bêsînor';
+
+$labels['quicksearch']  = 'Lêgerîna bilez';
+$labels['resetsearch']  = 'Lêgerînê reset bike';
+$labels['searchmod']  = 'Search modifiers';
+$labels['msgtext']  = 'Entire message';
+$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';
+$labels['send']           = 'Send';
+$labels['sendmessage']    = 'Peyamê niha bişîne';
+$labels['savemessage']    = 'Hilîne';
+$labels['addattachment']  = 'Pelekê lê zêde bike';
+$labels['charset']        = 'Curetîp';
+$labels['editortype']     = 'Cureyê serastkat';
+$labels['returnreceipt']  = 'Rapora Vegerînê';
+$labels['dsn']            = 'Delivery status notification';
+$labels['mailreplyintro'] = 'On $date, $sender wrote:';
+$labels['originalmessage'] = 'Original Message';
+
+$labels['editidents']    = 'Edit identities';
+$labels['spellcheck']    = 'Spell';
 $labels['checkspelling'] = 'Kontrola rastnivîsê';
 $labels['resumeediting'] = 'Serastkirinê bidomîne';
-$labels['revertto'] = 'Şûnde bîne';
+$labels['revertto']      = 'Şûnde bîne';
+
+$labels['attach'] = 'Attach';
 $labels['attachments'] = 'Pêvek';
 $labels['upload'] = 'Bar bike';
-$labels['close'] = 'Bigire';
-$labels['low'] = 'Nizm';
-$labels['lowest'] = 'Nizmtirîn';
-$labels['normal'] = 'Asayî';
-$labels['high'] = 'Bilind';
+$labels['uploadprogress'] = '$percent ($current from $total)';
+$labels['close']  = 'Bigire';
+$labels['messageoptions']  = 'Message options...';
+
+$labels['low']     = 'Nizm';
+$labels['lowest']  = 'Nizmtirîn';
+$labels['normal']  = 'Asayî';
+$labels['high']    = 'Bilind';
 $labels['highest'] = 'Bilintirîn';
-$labels['nosubject'] = '(bê mijar)';
+
+$labels['nosubject']  = '(bê mijar)';
 $labels['showimages'] = 'Xuyakirina wêneyan';
+$labels['alwaysshow'] = 'Always show images from $sender';
+$labels['isdraft']    = 'This is a draft message.';
+$labels['andnmore']   = '$nr more...';
+$labels['togglemoreheaders'] = 'Show more message headers';
+$labels['togglefullheaders'] = 'Toggle raw message headers';
+
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Deqa tazî';
+$labels['savesentmessagein'] = 'Save sent message in';
+$labels['dontsave'] = 'don\'t save';
+$labels['maxuploadsize'] = 'Maximum allowed file size is $size';
+
 $labels['addcc'] = 'Cc Têxê';
 $labels['addbcc'] = 'Bcc Têxê';
 $labels['addreplyto'] = 'Bibersivîne têxê';
+$labels['addfollowupto'] = 'Add Followup-To';
+
+// mdn
 $labels['mdnrequest'] = 'Şandyara/ê vê peyamê xwest dema ku te peyam vekir, jê re hişyarî here. Dixwazî jê re hişyarî here?';
 $labels['receiptread'] = 'Rapora Vegerînê (xwendî)';
 $labels['yourmessage'] = 'Ev rapora vegerîna peyama te ye';
 $labels['receiptnote'] = 'Nîşe: Ev dide zanîn ka peyama te şand hat xwendin an na. Naveroka peyamê bi mîgogerî nayê zanîn.';
-$labels['name'] = 'Navê xuya dibe';
-$labels['firstname'] = 'Nav';
-$labels['surname'] = 'Paşnav';
-$labels['email'] = 'E-Peyam';
+
+// address boook
+$labels['name']         = 'Navê xuya dibe';
+$labels['firstname']    = 'Nav';
+$labels['surname']      = 'Paşnav';
+$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['email']        = 'E-Peyam';
+$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['typepager']  = 'Pager';
+$labels['typevideo']  = 'Video';
+$labels['typeassistant']  = 'Assistant';
+$labels['typehomepage']  = 'Home Page';
+$labels['typeblog'] = 'Blog';
+$labels['typeprofile'] = 'Profile';
+
+$labels['addfield'] = 'Add field...';
 $labels['addcontact'] = 'Têkiliyeke nû têxê';
 $labels['editcontact'] = 'Têkiliyê serast bike';
-$labels['edit'] = 'Serast bike';
+$labels['contacts'] = 'Contacts';
+$labels['contactproperties'] = 'Contact properties';
+$labels['personalinfo'] = 'Personal information';
+
+$labels['edit']   = 'Serast bike';
 $labels['cancel'] = 'Betal';
-$labels['save'] = 'Tomar bike';
+$labels['save']   = 'Tomar bike';
 $labels['delete'] = 'Jê Bibe';
-$labels['newcontact'] = 'kardeke nû a têkiliyê biafirîne';
-$labels['deletecontact'] = 'Têkiliyên hilbijartî jê bibe';
-$labels['composeto'] = 'Ji têkiliya hilbijartî re peyam bişîne';
+$labels['rename'] = 'Rename';
+$labels['addphoto'] = 'Add';
+$labels['replacephoto'] = 'Replace';
+$labels['uploadphoto'] = 'Upload photo';
+
+$labels['newcontact']     = 'kardeke nû a têkiliyê biafirîne';
+$labels['deletecontact']  = 'Têkiliyên hilbijartî jê bibe';
+$labels['composeto']      = 'Ji têkiliya hilbijartî re peyam bişîne';
 $labels['contactsfromto'] = 'Têkiliyên $count ên di navbera $from - $to de';
-$labels['print'] = 'çap bike';
-$labels['export'] = 'Derxe';
-$labels['previouspage'] = 'Seta berê nîşan bide';
-$labels['firstpage'] = 'Seta yekemîn nîşan bide';
-$labels['nextpage'] = 'Seta di rêzê de nîşan bide';
-$labels['lastpage'] = 'Seta dawî nîşan bide';
+$labels['print']          = 'çap bike';
+$labels['export']         = 'Derxe';
+$labels['exportall']      = 'Export all';
+$labels['exportsel']      = 'Export selected';
+$labels['exportvcards']   = 'Export contacts in vCard format';
+$labels['newcontactgroup'] = 'Create new contact group';
+$labels['grouprename']    = 'Rename group';
+$labels['groupdelete']    = 'Delete group';
+$labels['groupremoveselected'] = 'Remove selected contacts from group';
+
+$labels['previouspage']   = 'Seta berê nîşan bide';
+$labels['firstpage']      = 'Seta yekemîn nîşan bide';
+$labels['nextpage']       = 'Seta di rêzê de nîşan bide';
+$labels['lastpage']       = 'Seta dawî nîşan bide';
+
+$labels['group'] = 'Group';
 $labels['groups'] = 'Kom';
 $labels['personaladrbook'] = 'Navnîşanên Takekesî';
+
+$labels['searchsave'] = 'Save search';
+$labels['searchdelete'] = 'Delete search';
+
+$labels['import'] = 'Import';
+$labels['importcontacts'] = 'Import contacts';
+$labels['importfromfile'] = 'Import from file:';
+$labels['importtarget'] = 'Add new contacts to address book:';
+$labels['importreplace'] = 'Replace the entire address book';
+$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['done'] = 'Done';
+
+// settings
 $labels['settingsfor'] = 'Mîheng ji bo';
+$labels['about'] = 'About';
 $labels['preferences'] = 'Vebijêrk';
 $labels['userpreferences'] = 'Vebijêrkên bikarhêner';
 $labels['editpreferences'] = 'Vebijêrkên bikarhêner serast bike';
+
 $labels['identities'] = 'Nasname';
 $labels['manageidentities'] = 'Nasnameyên vê hesabê serast bike';
 $labels['newidentity'] = 'Nasnameya nû';
+
 $labels['newitem'] = 'Parçeya nû';
 $labels['edititem'] = 'Parçeyê serast bike';
+
 $labels['preferhtml'] = 'Wekî HTML nîşan bide';
+$labels['defaultcharset'] = 'Default Character Set';
 $labels['htmlmessage'] = 'Peyama HTML';
+$labels['messagepart'] = 'Part';
+$labels['digitalsig'] = 'Digital Signature';
+$labels['dateformat'] = 'Date format';
+$labels['timeformat'] = 'Time format';
 $labels['prettydate'] = 'Kurtenivîsa Dîrokê';
-$labels['setdefault'] = 'Wekî standard tomar bike';
-$labels['language'] = 'Ziman';
-$labels['timezone'] = 'Herêma demê';
-$labels['pagesize'] = 'Hejmara peyamên her rûpelekê';
+$labels['setdefault']  = 'Wekî standard tomar bike';
+$labels['autodetect']  = 'Auto';
+$labels['language']  = 'Ziman';
+$labels['timezone']  = 'Herêma demê';
+$labels['pagesize']  = 'Hejmara peyamên her rûpelekê';
 $labels['signature'] = 'Şanenav';
-$labels['dstactive'] = 'Demjimêra havînî';
+$labels['dstactive']  = 'Demjimêra havînî';
+$labels['showinextwin'] = 'Open message in a new window';
+$labels['composeextwin'] = 'Compose in a new window';
 $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['autosavedraft'] = 'Xweber hilîne';
-$labels['never'] = 'qet';
-$labels['folder'] = 'Peldank';
-$labels['foldername'] = 'Navê peldankê';
-$labels['subscribed'] = 'Ni şanenav';
+$labels['skin'] = 'Interface skin';
+$labels['logoutclear'] = 'Clear Trash on logout';
+$labels['logoutcompact'] = 'Compact Inbox on logout';
+$labels['uisettings'] = 'User Interface';
+$labels['serversettings'] = 'Server Settings';
+$labels['mailboxview'] = 'Mailbox View';
+$labels['mdnrequests'] = 'On request for return receipt';
+$labels['askuser'] = 'ask me';
+$labels['autosend'] = 'send receipt';
+$labels['autosendknown'] = 'send receipt to my contacts, otherwise ask me';
+$labels['autosendknownignore'] = 'send receipt to my contacts, otherwise ignore';
+$labels['ignore'] = 'ignore';
+$labels['readwhendeleted'] = 'Mark the message as read on delete';
+$labels['flagfordeletion'] = 'Flag the message for deletion instead of delete';
+$labels['skipdeleted'] = 'Do not show deleted messages';
+$labels['deletealways'] = 'If moving messages to Trash fails, delete them';
+$labels['deletejunk'] = 'Directly delete messages in Junk';
+$labels['showremoteimages'] = 'Display remote inline images';
+$labels['fromknownsenders'] = 'from known senders';
+$labels['always'] = 'always';
+$labels['showinlineimages'] = 'Display attached images below the message';
+$labels['autosavedraft']  = 'Xweber hilîne';
+$labels['everynminutes']  = 'every $n minute(s)';
+$labels['refreshinterval']  = 'Refresh (check for new messages, etc.)';
+$labels['never']  = 'qet';
+$labels['immediately']  = 'immediately';
+$labels['messagesdisplaying'] = 'Displaying Messages';
+$labels['messagescomposition'] = 'Composing Messages';
+$labels['mimeparamfolding'] = 'Attachment names';
+$labels['2231folding'] = 'Full RFC 2231 (Thunderbird)';
+$labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
+$labels['2047folding'] = 'Full RFC 2047 (other)';
+$labels['force7bit'] = 'Use MIME encoding for 8-bit characters';
+$labels['advancedoptions'] = 'Advanced options';
+$labels['focusonnewmessage'] = 'Focus browser window on new message';
+$labels['checkallfolders'] = 'Check all folders for new messages';
+$labels['displaynext'] = 'After message delete/move display the next message';
+$labels['defaultfont'] = 'Default font of HTML message';
+$labels['mainoptions'] = 'Main Options';
+$labels['browseroptions'] = 'Browser Options';
+$labels['section'] = 'Section';
+$labels['maintenance'] = 'Maintenance';
+$labels['newmessage'] = 'New Message';
+$labels['signatureoptions'] = 'Signature Options';
+$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'] = 'Automatically add signature';
+$labels['newmessageonly'] = 'new message only';
+$labels['replyandforwardonly'] = 'replies and forwards only';
+$labels['insertsignature'] = 'Insert signature';
+$labels['previewpanemarkread']  = 'Mark previewed messages as read';
+$labels['afternseconds']  = 'after $n seconds';
+$labels['reqmdn'] = 'Always request a return receipt';
+$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'] = 'Check spelling before sending a message';
+$labels['spellcheckoptions'] = 'Spellcheck Options';
+$labels['spellcheckignoresyms'] = 'Ignore words with symbols';
+$labels['spellcheckignorenums'] = 'Ignore words with numbers';
+$labels['spellcheckignorecaps'] = 'Ignore words with all letters capitalized';
+$labels['addtodict'] = 'Add to dictionary';
+$labels['mailtoprotohandler'] = 'Register protocol handler for mailto: links';
+$labels['forwardmode'] = 'Messages forwarding';
+$labels['inline'] = 'inline';
+$labels['asattachment'] = 'as attachment';
+
+$labels['folder']  = 'Peldank';
+$labels['folders']  = 'Peldank';
+$labels['foldername']  = 'Navê peldankê';
+$labels['subscribed']  = 'Ni şanenav';
 $labels['messagecount'] = 'Peyam';
-$labels['create'] = 'Biafirîne';
-$labels['createfolder'] = 'Peldankeke nû biafirîne';
-$labels['managefolders'] = 'Rêveberiya peldankan';
+$labels['create']  = 'Biafirîne';
+$labels['createfolder']  = 'Peldankeke nû biafirîne';
+$labels['managefolders']  = 'Rêveberiya peldankan';
+$labels['specialfolders'] = 'Special Folders';
+$labels['properties'] = 'Properties';
+$labels['folderproperties'] = 'Folder properties';
+$labels['parentfolder'] = 'Parent folder';
+$labels['location'] = 'Location';
+$labels['info'] = 'Information';
+$labels['getfoldersize'] = 'Click to get folder size';
+$labels['changesubscription'] = 'Click to change subscription';
+$labels['foldertype'] = 'Folder Type';
+$labels['personalfolder']  = 'Private Folder';
+$labels['otherfolder']  = 'Other User\'s Folder';
+$labels['sharedfolder']  = 'Public Folder';
+
 $labels['sortby'] = 'Şêweyê rêzkirinê';
-$labels['sortasc'] = 'Wekî zêde dibe';
+$labels['sortasc']  = 'Wekî zêde dibe';
 $labels['sortdesc'] = 'Wekî kêm dibe';
+$labels['undo'] = 'Undo';
+
+$labels['installedplugins'] = 'Installed plugins';
+$labels['plugin'] = 'Plugin';
+$labels['version'] = 'Version';
+$labels['source'] = 'Source';
+$labels['license'] = 'License';
+$labels['support'] = 'Get support';
+
+// units
+$labels['B'] = 'B';
+$labels['KB'] = 'KB';
+$labels['MB'] = 'MB';
+$labels['GB'] = 'GB';
+
+// character sets
+$labels['unicode'] = 'Unicode';
+$labels['english'] = '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['turkish'] = 'Turkish';
+$labels['nordic'] = 'Nordic';
+$labels['thai'] = 'Thai';
+$labels['celtic'] = 'Celtic';
+$labels['vietnamese'] = 'Vietnamese';
+$labels['japanese'] = 'Japanese';
+$labels['korean'] = 'Korean';
+$labels['chinese'] = 'Chinese';
 
+?>
diff --git a/program/localization/ku/messages.inc b/program/localization/ku/messages.inc
index e35260cc1..9d219cbf5 100644
--- a/program/localization/ku/messages.inc
+++ b/program/localization/ku/messages.inc
@@ -2,27 +2,43 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ku/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['loginfailed'] = 'Têketin têk çû';
+$messages['errortitle']  = 'An error occurred!';
+$messages['loginfailed']  = 'Têketin têk çû';
 $messages['cookiesdisabled'] = 'Geroka te destûrê nade çerezan';
 $messages['sessionerror'] = 'Danişîna te çewt e an jî bi dawî bûye';
 $messages['storageerror'] = 'Girêdana pêşkêşkara IMAP têk çû';
+$messages['servererror'] = 'Server Error!';
+$messages['servererrormsg'] = 'Server Error: $msg';
+$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';
 $messages['loggedout'] = 'Te danişînî bi dawî anî. Oxir be!';
 $messages['mailboxempty'] = 'Peyamdank vala ye';
+$messages['refreshing'] = 'Refreshing...';
 $messages['loading'] = 'Tê barkirin...';
+$messages['uploading'] = 'Uploading file...';
+$messages['uploadingmany'] = 'Uploading files...';
 $messages['loadingdata'] = 'Dane tên barkirin...';
 $messages['checkingmail'] = 'Li peyamên nû vedinihêre...';
 $messages['sendingmessage'] = 'Peyamê dişîne...';
@@ -32,34 +48,54 @@ $messages['messagesaved'] = 'Peyam di Hilanînî de hat hilanîn';
 $messages['successfullysaved'] = 'Hat hilanîn';
 $messages['addedsuccessfully'] = 'Têkilî li navnîşanan hat zêdekirin';
 $messages['contactexists'] = 'Têkiliyeke bi vê navnîşanê jixwe heye';
+$messages['contactnameexists'] = 'A contact with the same name already exists.';
 $messages['blockedimages'] = 'Ji bo ewlekariya te wêneyên cuda yên vê peyamê hatin astenkirin.';
 $messages['encryptedmessage'] = 'Ev peyamenek şîfrekirî ye, bibore, nayê vekirin!';
 $messages['nocontactsfound'] = 'Tu têkiliyek nehat dîtin';
 $messages['contactnotfound'] = 'Têkiliya dihat xwestin nehat dîtin';
+$messages['contactsearchonly'] = 'Enter some search terms to find contacts';
 $messages['sendingfailed'] = 'Peyam nehat şandin';
+$messages['senttooquickly'] = 'Please wait $sec sec(s). before sending this message.';
+$messages['errorsavingsent'] = 'An error occured while saving sent message.';
 $messages['errorsaving'] = 'Di tomarkirinê de çewtiyek derket';
 $messages['errormoving'] = 'Ciyê peyamê nehat guherandin';
+$messages['errorcopying'] = 'Could not copy the message(s).';
 $messages['errordeleting'] = 'Peyam nehat jêbirin';
-$messages['deletecontactconfirm'] = 'Ji dil dixwazî têkiliya/ên nîşankirî jê bibî?';
+$messages['errormarking'] = 'Could not mark the message(s).';
+$messages['deletecontactconfirm']  = 'Ji dil dixwazî têkiliya/ên nîşankirî jê bibî?';
+$messages['deletegroupconfirm']  = 'Do you really want to delete selected group?';
 $messages['deletemessagesconfirm'] = 'Ji dil dixwazî peya/ên nîşankirî jê bibî?';
-$messages['deletefolderconfirm'] = 'Ji dil dixwazî vê peldankê jê bibî?';
-$messages['purgefolderconfirm'] = 'Ji dil dixwazî hemû peyamên di vê peldankê de jê bibî?';
+$messages['deletefolderconfirm']  = 'Ji dil dixwazî vê peldankê jê bibî?';
+$messages['purgefolderconfirm']  = 'Ji dil dixwazî hemû peyamên di vê peldankê de jê bibî?';
+$messages['contactdeleting'] = 'Deleting contact(s)...';
+$messages['groupdeleting'] = 'Deleting group...';
+$messages['folderdeleting'] = 'Deleting folder...';
+$messages['foldermoving'] = 'Moving folder...';
+$messages['foldersubscribing'] = 'Subscribing folder...';
+$messages['folderunsubscribing'] = 'Unsubscribing folder...';
 $messages['formincomplete'] = 'Form bi temamî nehat tijekirin';
 $messages['noemailwarning'] = 'Tika ye, navnîşaneke rast têkevê';
-$messages['nonamewarning'] = 'Tika ye, navekî têkevê';
+$messages['nonamewarning']  = 'Tika ye, navekî têkevê';
 $messages['nopagesizewarning'] = 'Tika ye, mezinahiyeke pelê têkevê';
+$messages['nosenderwarning'] = 'Please enter sender e-mail address.';
 $messages['norecipientwarning'] = 'Tika ye, herî kêm standyarekê têkevê';
-$messages['nosubjectwarning'] = 'Qada "Mijar"ê vala ye. Dixwazî niha tiştekî lê binivîsî?';
+$messages['nosubjectwarning']  = 'Qada "Mijar"ê vala ye. Dixwazî niha tiştekî lê binivîsî?';
 $messages['nobodywarning'] = 'Peyamê bê nivîs bişeyînî?';
 $messages['notsentwarning'] = 'Peyam nehat şandin. Dixwazî peyamê pişTgo bikî?';
 $messages['noldapserver'] = 'Tika ye, ji bo lêgerînê pêşkêşkareke Idap têkevê';
 $messages['nosearchname'] = 'Tika ye, nav an jî navnîşaneke têkiliyê têkevê';
+$messages['notuploadedwarning'] = 'Not all attachments have been uploaded yet. Please wait or cancel the upload.';
 $messages['searchsuccessful'] = '$nr peyam hat(in) dîtin';
+$messages['contactsearchsuccessful'] = '$nr contacts found.';
 $messages['searchnomatch'] = 'Di lêgerînê de tu tişt nehat dîtin';
 $messages['searching'] = 'Digere...';
 $messages['checking'] = 'Vedinihêre...';
 $messages['nospellerrors'] = 'Tu şaşiyeke rastnivîsê nehat dîtin';
 $messages['folderdeleted'] = 'Peldank hat jêbirin';
+$messages['foldersubscribed'] = 'Folder successfully subscribed.';
+$messages['folderunsubscribed'] = 'Folder successfully unsubscribed.';
+$messages['folderpurged'] = 'Folder has successfully been emptied.';
+$messages['folderexpunged'] = 'Folder has successfully been compacted.';
 $messages['deletedsuccessfully'] = 'Hat jêbirin';
 $messages['converting'] = 'Formatkirin ji peyamê tê birin...';
 $messages['messageopenerror'] = 'Peyam ji pêşkêşkar nehat barkirin';
@@ -70,7 +106,66 @@ $messages['copyerror'] = 'Tu navnîşan nehat jibergirtin';
 $messages['sourceisreadonly'] = 'Çavkaniya vê navnîşanê tenê-xwendin e';
 $messages['errorsavingcontact'] = 'Navnîşana têkiliyê nehat barkirin';
 $messages['movingmessage'] = 'Ciyê peyamê tê guhertin...';
+$messages['copyingmessage'] = 'Copying message(s)...';
+$messages['copyingcontact'] = 'Copying contact(s)...';
+$messages['deletingmessage'] = 'Deleting message(s)...';
+$messages['markingmessage'] = 'Marking message(s)...';
+$messages['addingmember'] = 'Adding contact(s) to the group...';
+$messages['removingmember'] = 'Removing contact(s) from the group...';
 $messages['receiptsent'] = 'Rapora şandina serkeftî';
 $messages['errorsendingreceipt'] = 'Rapor nehat şandin';
+$messages['deleteidentityconfirm'] = 'Do you really want to delete this identity?';
 $messages['nodeletelastidentity'] = 'Nikarî vê nasnameyê jê bibî. Ew ya dawî ye.';
+$messages['forbiddencharacter'] = 'Folder name contains a forbidden character.';
+$messages['selectimportfile'] = 'Please select a file to upload.';
+$messages['addresswriterror'] = 'The selected address book is not writeable.';
+$messages['contactaddedtogroup'] = 'Successfully added the contacts to this group.';
+$messages['contactremovedfromgroup'] = 'Successfully removed contacts from this group.';
+$messages['nogroupassignmentschanged'] = 'No group assignments changed.';
+$messages['importwait'] = 'Importing, please wait...';
+$messages['importformaterror'] = 'Import failed! The uploaded file is not a valid import data file.';
+$messages['importconfirm'] = '<b>Successfully imported $inserted contacts</b>';
+$messages['importconfirmskipped'] = '<b>Skipped $skipped existing entries</b>';
+$messages['opnotpermitted'] = 'Operation not permitted!';
+$messages['nofromaddress'] = 'Missing e-mail address in selected identity.';
+$messages['editorwarning'] = 'Switching to the plain text editor will cause all text formatting to be lost. Do you wish to continue?';
+$messages['httpreceivedencrypterror'] = 'A fatal configuration error occurred. Contact your administrator immediately. <b>Your message can not be sent.</b>';
+$messages['smtpconnerror'] = 'SMTP Error ($code): Connection to server failed.';
+$messages['smtpautherror'] = 'SMTP Error ($code): Authentication failed.';
+$messages['smtpfromerror'] = 'SMTP Error ($code): Failed to set sender "$from" ($msg).';
+$messages['smtptoerror'] = 'SMTP Error ($code): Failed to add recipient "$to" ($msg).';
+$messages['smtprecipientserror'] = 'SMTP Error: Unable to parse recipients list.';
+$messages['smtperror'] = 'SMTP Error: $msg';
+$messages['emailformaterror'] = 'Invalid e-mail address: $email';
+$messages['toomanyrecipients'] = 'Too many recipients. Reduce the number of recipients to $max.';
+$messages['maxgroupmembersreached'] = 'The number of group members exceeds the maximum of $max.';
+$messages['internalerror'] = 'An internal error occured. Please try again.';
+$messages['contactdelerror'] = 'Could not delete contact(s).';
+$messages['contactdeleted'] = 'Contact(s) deleted successfully.';
+$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.';
 
+?>
diff --git a/program/localization/lt_LT/labels.inc b/program/localization/lt_LT/labels.inc
index 039ac8581..6398a3683 100644
--- a/program/localization/lt_LT/labels.inc
+++ b/program/localization/lt_LT/labels.inc
@@ -2,58 +2,78 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/lt_LT/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = 'Sveiki! Čia $product';
-$labels['username'] = 'Naudotojo vardas';
-$labels['password'] = 'Slaptažodis';
-$labels['server'] = 'Serveris';
-$labels['login'] = 'Prisijungti';
-$labels['logout'] = 'Atsijungti';
-$labels['mail'] = 'El. paštas';
+
+// login page
+$labels['welcome']   = 'Sveiki! Čia $product';
+$labels['username']  = 'Naudotojo vardas';
+$labels['password']  = 'Slaptažodis';
+$labels['server']    = 'Serveris';
+$labels['login']     = 'Prisijungti';
+
+// taskbar
+$labels['logout']   = 'Atsijungti';
+$labels['mail']     = 'El. paštas';
 $labels['settings'] = 'Nuostatos';
 $labels['addressbook'] = 'Adresų knyga';
-$labels['inbox'] = 'Gauti laiškai';
+
+// mailbox names
+$labels['inbox']  = 'Gauti laiškai';
 $labels['drafts'] = 'Juodraščiai';
-$labels['sent'] = 'Išsiųsti laiškai';
-$labels['trash'] = 'Šiukšlinė';
-$labels['junk'] = 'Brukalas';
+$labels['sent']   = 'Išsiųsti laiškai';
+$labels['trash']  = 'Šiukšlinė';
+$labels['junk']   = 'Brukalas';
+
+// message listing
 $labels['subject'] = 'Tema';
-$labels['from'] = 'Siuntėjas';
-$labels['to'] = 'Gavėjas';
-$labels['cc'] = 'Kopija';
-$labels['bcc'] = 'Slaptoji kopija';
+$labels['from']    = 'Siuntėjas';
+$labels['sender']  = 'Siuntėjas';
+$labels['to']      = 'Gavėjas';
+$labels['cc']      = 'Kopija';
+$labels['bcc']     = 'Slaptoji kopija';
 $labels['replyto'] = 'Atsakymą gaus';
 $labels['followupto'] = 'Followup-To';
-$labels['date'] = 'Data';
-$labels['size'] = 'Dydis';
+$labels['date']    = 'Data';
+$labels['size']    = 'Dydis';
 $labels['priority'] = 'Prioritetas';
 $labels['organization'] = 'Organizacija';
 $labels['readstatus'] = 'Neskaitytas';
 $labels['listoptions'] = 'Sąrašo nuostatos…';
+
 $labels['mailboxlist'] = 'Aplankai';
-$labels['folders'] = 'Aplankai';
 $labels['messagesfromto'] = 'Laiškai nuo $from iki $to iš $count';
 $labels['threadsfromto'] = 'Gijos nuo $from iki $to iš $count';
 $labels['messagenrof'] = 'Laiškas $nr iš $count';
 $labels['fromtoshort'] = '$from – $to iš $count';
-$labels['copy'] = 'Kopijuoti';
-$labels['move'] = 'Perkelti';
-$labels['moveto'] = 'Perkelti į…';
+
+$labels['copy']     = 'Kopijuoti';
+$labels['move']     = 'Perkelti';
+$labels['moveto']   = 'Perkelti į…';
 $labels['download'] = 'Parsisiųsti';
+$labels['open']     = 'Atverti';
+$labels['showattachment'] = 'Rodyti';
+$labels['showanyway'] = 'Vistiek rodyti';
+
 $labels['filename'] = 'Failo vardas';
 $labels['filesize'] = 'Failo dydis';
+
 $labels['addtoaddressbook'] = 'Įtraukti į adresų knygą';
+
+// weekdays short
 $labels['sun'] = 'Sek';
 $labels['mon'] = 'Pir';
 $labels['tue'] = 'Ant';
@@ -61,79 +81,90 @@ $labels['wed'] = 'Tre';
 $labels['thu'] = 'Ket';
 $labels['fri'] = 'Pen';
 $labels['sat'] = 'Šeš';
-$labels['sunday'] = 'Sekmadienis';
-$labels['monday'] = 'Pirmadienis';
-$labels['tuesday'] = 'Antradienis';
+
+// weekdays long
+$labels['sunday']    = 'Sekmadienis';
+$labels['monday']    = 'Pirmadienis';
+$labels['tuesday']   = 'Antradienis';
 $labels['wednesday'] = 'Trečiadienis';
-$labels['thursday'] = 'Ketvirtadienis';
-$labels['friday'] = 'Penktadienis';
-$labels['saturday'] = 'Šeštadienis';
-$labels['jan'] = 'Sau';
-$labels['feb'] = 'Vas';
-$labels['mar'] = 'Kov';
-$labels['apr'] = 'Bal';
-$labels['may'] = 'Gegužė';
-$labels['longmay'] = 'Gegužė';
-$labels['jun'] = 'Bir';
-$labels['jul'] = 'Lie';
-$labels['aug'] = 'Rgp';
-$labels['sep'] = 'Rgs';
-$labels['oct'] = 'Spl';
-$labels['nov'] = 'Lap';
-$labels['dec'] = 'Grd';
-$labels['longjan'] = 'Sausis';
-$labels['longfeb'] = 'Vasaris';
-$labels['longmar'] = 'Kovas';
-$labels['longapr'] = 'Balandis';
-$labels['longjun'] = 'Biržėlis';
-$labels['longjul'] = 'Liepa';
-$labels['longaug'] = 'Rugpjūtis';
-$labels['longsep'] = 'Rugsėjis';
-$labels['longoct'] = 'Spalis';
-$labels['longnov'] = 'Lapkritis';
-$labels['longdec'] = 'Gruodis';
+$labels['thursday']  = 'Ketvirtadienis';
+$labels['friday']    = 'Penktadienis';
+$labels['saturday']  = 'Šeštadienis';
+
+// months short
+$labels['jan']	= 'Sau';
+$labels['feb']	= 'Vas';
+$labels['mar']	= 'Kov';
+$labels['apr']	= 'Bal';
+$labels['may']	= 'Gegužė';
+$labels['jun']	= 'Bir';
+$labels['jul'] 	= 'Lie';
+$labels['aug']	= 'Rgp';
+$labels['sep']	= 'Rgs';
+$labels['oct']	= 'Spl';
+$labels['nov']	= 'Lap';
+$labels['dec']	= 'Grd';
+
+// months long
+$labels['longjan']	= 'Sausis';
+$labels['longfeb']	= 'Vasaris';
+$labels['longmar']	= 'Kovas';
+$labels['longapr']	= 'Balandis';
+$labels['longmay']	= 'Gegužė';
+$labels['longjun']	= 'Biržėlis';
+$labels['longjul']	= 'Liepa';
+$labels['longaug']	= 'Rugpjūtis';
+$labels['longsep']	= 'Rugsėjis';
+$labels['longoct']	= 'Spalis';
+$labels['longnov']	= 'Lapkritis';
+$labels['longdec']	= 'Gruodis';
+
 $labels['today'] = 'Šiandien';
-$labels['refresh'] = 'Atnaujinti';
-$labels['checkmail'] = 'Tikrinti, ar yra naujų laiškų';
-$labels['compose'] = 'Rašyti naują laišką';
-$labels['writenewmessage'] = 'Rašyti naują laišką';
-$labels['reply'] = 'Atsakyti';
-$labels['replytomessage'] = 'Atsakyti siuntėjui';
+
+// toolbar buttons
+$labels['refresh']          = 'Atnaujinti';
+$labels['checkmail']        = 'Tikrinti, ar yra naujų laiškų';
+$labels['compose']          = 'Rašyti naują laišką';
+$labels['writenewmessage']  = 'Rašyti naują laišką';
+$labels['reply']            = 'Atsakyti';
+$labels['replytomessage']   = 'Atsakyti siuntėjui';
 $labels['replytoallmessage'] = 'Atsakyti el. pašto grupei arba laiško siuntėjui ir visiems jo gavėjams';
-$labels['replyall'] = 'Atsakyti visiems';
-$labels['replylist'] = 'Atsakyti el. pašto grupei';
-$labels['forward'] = 'Persiųsti';
-$labels['forwardinline'] = 'Persiųsti cituojant';
+$labels['replyall']         = 'Atsakyti visiems';
+$labels['replylist']        = 'Atsakyti el. pašto grupei';
+$labels['forward']          = 'Persiųsti';
+$labels['forwardinline']    = 'Persiųsti cituojant';
 $labels['forwardattachment'] = 'Persiųsti priedu';
-$labels['forwardmessage'] = 'Persiųsti laišką';
-$labels['deletemessage'] = 'Pašalinti laišką';
+$labels['forwardmessage']   = 'Persiųsti laišką';
+$labels['deletemessage']    = 'Pašalinti laišką';
 $labels['movemessagetotrash'] = 'Perkelti laišką į šiukšlinę';
-$labels['printmessage'] = 'Atspausdinti laišką';
-$labels['previousmessage'] = 'Rodyti ankstesnį laišką';
-$labels['firstmessage'] = 'Rodyti pirmąjį laišką';
-$labels['nextmessage'] = 'Rodyti tolesnį laišką';
-$labels['lastmessage'] = 'Rodyti paskutinį laišką';
-$labels['backtolist'] = 'Grižti į laiškų sarašą';
-$labels['viewsource'] = 'Rodyti pirminį tekstą';
-$labels['mark'] = 'Pažymėti';
-$labels['markmessages'] = 'Pažymėti laiškus';
-$labels['markread'] = 'Kaip skaitytus';
-$labels['markunread'] = 'Kaip neskaitytus';
-$labels['markflagged'] = 'Pažymėti gairele';
-$labels['markunflagged'] = 'Pašalinti gairelę';
-$labels['moreactions'] = 'Kiti veiksmai…';
-$labels['more'] = 'Daugiau';
-$labels['back'] = 'Grįžti';
-$labels['options'] = 'Nuostatos';
+$labels['printmessage']     = 'Atspausdinti laišką';
+$labels['previousmessage']  = 'Rodyti ankstesnį laišką';
+$labels['firstmessage']     = 'Rodyti pirmąjį laišką';
+$labels['nextmessage']      = 'Rodyti tolesnį laišką';
+$labels['lastmessage']      = 'Rodyti paskutinį laišką';
+$labels['backtolist']       = 'Grižti į laiškų sarašą';
+$labels['viewsource']       = 'Rodyti pirminį tekstą';
+$labels['mark']             = 'Pažymėti';
+$labels['markmessages']     = 'Pažymėti laiškus';
+$labels['markread']         = 'Kaip skaitytus';
+$labels['markunread']       = 'Kaip neskaitytus';
+$labels['markflagged']      = 'Pažymėti gairele';
+$labels['markunflagged']    = 'Pašalinti gairelę';
+$labels['moreactions']      = 'Kiti veiksmai…';
+$labels['more']             = 'Daugiau';
+$labels['back']             = 'Grįžti';
+$labels['options']          = 'Nuostatos';
+
 $labels['select'] = 'Pažymėti';
 $labels['all'] = 'visus';
 $labels['none'] = 'Nerūšiuoti';
-$labels['nonesort'] = 'Nerūšiuoti';
 $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';
 $labels['filter'] = 'Rodyti';
 $labels['list'] = 'Sąrašas';
@@ -142,12 +173,14 @@ $labels['expand-all'] = 'išskleisti visas';
 $labels['expand-unread'] = 'išskleisti turinčias neskaitytų laiškų';
 $labels['collapse-all'] = 'suskleisti visas';
 $labels['threaded'] = 'Rodyti gijas';
+
 $labels['autoexpand_threads'] = 'Išskleisti gijas';
 $labels['do_expand'] = 'visas';
 $labels['expand_only_unread'] = 'tik turinčias neskaitytų laiškų';
 $labels['fromto'] = 'Siuntėjas/Gavėjas';
 $labels['flag'] = 'Gairelė';
 $labels['attachment'] = 'Priedas';
+$labels['nonesort'] = 'Nerūšiuoti';
 $labels['sentdate'] = 'Išsiuntimo laikas';
 $labels['arrival'] = 'Gavimo laikas';
 $labels['asc'] = 'didėjančiai';
@@ -156,175 +189,220 @@ $labels['listcolumns'] = 'Stulpelių sąrašas';
 $labels['listsorting'] = 'Stulpelis rikiavimui';
 $labels['listorder'] = 'Rikiavimo tvarka';
 $labels['listmode'] = 'Sąrašo rodymo veiksena';
+
 $labels['folderactions'] = 'Veiksmai su aplankais…';
 $labels['compact'] = 'Suglaudinti';
 $labels['empty'] = 'Ištuštinti';
+
 $labels['quota'] = 'Disko naudojimas';
-$labels['unknown'] = 'nežinomas';
-$labels['unlimited'] = 'neribotas';
-$labels['quicksearch'] = 'Sparčioji paieška';
-$labels['resetsearch'] = 'Atšaukti paiešką';
-$labels['searchmod'] = 'Paieškos modifikatoriai';
-$labels['msgtext'] = 'Visas laiškas';
+$labels['unknown']  = 'nežinomas';
+$labels['unlimited']  = 'neribotas';
+
+$labels['quicksearch']  = 'Sparčioji paieška';
+$labels['resetsearch']  = 'Atšaukti paiešką';
+$labels['searchmod']  = 'Paieškos modifikatoriai';
+$labels['msgtext']  = 'Visas laiškas';
+$labels['body']  = 'Laiško tekstas';
+
 $labels['openinextwin'] = 'Atverti naujame lange';
 $labels['emlsave'] = 'Parsisiųsti (.eml)';
-$labels['editasnew'] = 'Redaguoti kaip naują';
-$labels['sendmessage'] = 'Išsiųsti laiską';
-$labels['savemessage'] = 'Išsaugoti šį juodraštį';
-$labels['addattachment'] = 'Pridėti failą';
-$labels['charset'] = 'Koduotė';
-$labels['editortype'] = 'Laiško tipas';
-$labels['returnreceipt'] = 'Prašyti pristatymo pažymos';
-$labels['dsn'] = 'Laiško pristatymo pažyma';
+$labels['changeformattext'] = 'Rodyti grynojo teksto formatu';
+$labels['changeformathtml'] = 'Rodyti HTML formatu';
+
+// message compose
+$labels['editasnew']      = 'Redaguoti kaip naują';
+$labels['send']           = 'Siųsti';
+$labels['sendmessage']    = 'Išsiųsti laiską';
+$labels['savemessage']    = 'Išsaugoti šį juodraštį';
+$labels['addattachment']  = 'Pridėti failą';
+$labels['charset']        = 'Koduotė';
+$labels['editortype']     = 'Laiško tipas';
+$labels['returnreceipt']  = 'Prašyti pristatymo pažymos';
+$labels['dsn']            = 'Laiško pristatymo pažyma';
 $labels['mailreplyintro'] = '$date, $sender rašė:';
 $labels['originalmessage'] = 'Originalus laiškas';
-$labels['editidents'] = 'Tvarkyti tapatybes';
-$labels['spellcheck'] = 'Tikrinti rašybą';
+
+$labels['editidents']    = 'Tvarkyti tapatybes';
+$labels['spellcheck']    = 'Tikrinti rašybą';
 $labels['checkspelling'] = 'Tikrinti rašybą';
 $labels['resumeediting'] = 'Tęsti redagavimą';
-$labels['revertto'] = 'Atstatyti į';
+$labels['revertto']      = 'Atstatyti į';
+
 $labels['attach'] = 'Pridėti failą';
 $labels['attachments'] = 'Pridėti failai';
 $labels['upload'] = 'Įkelti';
 $labels['uploadprogress'] = '$percent ($current iš $total)';
-$labels['close'] = 'Užverti';
-$labels['messageoptions'] = 'Laiško savybės…';
-$labels['low'] = 'Žemas';
-$labels['lowest'] = 'Žemiausias';
-$labels['normal'] = 'Normalus';
-$labels['high'] = 'Aukštas';
+$labels['close']  = 'Užverti';
+$labels['messageoptions']  = 'Laiško savybės…';
+
+$labels['low']     = 'Žemas';
+$labels['lowest']  = 'Žemiausias';
+$labels['normal']  = 'Normalus';
+$labels['high']    = 'Aukštas';
 $labels['highest'] = 'Aukščiausias';
-$labels['nosubject'] = '(tema nenurodyta)';
+
+$labels['nosubject']  = '(tema nenurodyta)';
 $labels['showimages'] = 'Rodyti paveikslėlius';
 $labels['alwaysshow'] = 'Visada rodyti paveikslėlius $sender laiškuose';
-$labels['isdraft'] = 'Tai – laiško juodraštis.';
+$labels['isdraft']    = 'Tai – laiško juodraštis.';
+$labels['andnmore']   = '$nr daugiau...';
+$labels['togglemoreheaders'] = 'Rodyti daugiau antraščių';
+$labels['togglefullheaders'] = 'Įjungti/išjungti neapdorotas laiškų antraštes';
+
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Grynasis tekstas';
 $labels['savesentmessagein'] = 'Išsiųstus laiškus įrašyti į';
 $labels['dontsave'] = 'neįrašyti';
 $labels['maxuploadsize'] = 'Maksimalus leistinas failo dydis yra $size';
+
 $labels['addcc'] = 'Pridėti Cc';
 $labels['addbcc'] = 'Pridėti Bcc';
 $labels['addreplyto'] = 'Pridėti Reply-To';
 $labels['addfollowupto'] = 'Pridėti Followup-To';
+
+// mdn
 $labels['mdnrequest'] = 'Šio laiško siuntėjas paprašė patvirtinti, kad jūs jį perskaitėte. Ar išsiųsti tai patvirtinančią pažymą?';
 $labels['receiptread'] = 'Patvirtinimas (laiškas perskaitytas)';
 $labels['yourmessage'] = 'Tai – pažyma, patvirtinanti, jog buvo perskaitytas Jūsų laiškas';
 $labels['receiptnote'] = 'Pastaba: šia pažyma patvirtinamas tik faktas, jog laiškas buvo parodytas gavėjui. Ja negarantuojama, jog gavėjas perskaitė ir suprato laiško turinį.';
-$labels['name'] = 'Rodomas vardas';
-$labels['firstname'] = 'Vardas';
-$labels['surname'] = 'Pavardė';
-$labels['middlename'] = 'Kiti vardai';
-$labels['nameprefix'] = 'Titulas';
-$labels['namesuffix'] = 'Sufiksas';
-$labels['nickname'] = 'Pravardė';
-$labels['jobtitle'] = 'Pareigos';
-$labels['department'] = 'Padalinys';
-$labels['gender'] = 'Lytis';
-$labels['maidenname'] = 'Mergautinė pavardė';
-$labels['email'] = 'El. paštas';
-$labels['phone'] = 'Telefono numeris';
-$labels['address'] = 'Adresas';
-$labels['street'] = 'Gatvė, namas ir butas';
-$labels['locality'] = 'Miestas';
-$labels['zipcode'] = 'Pašto kodas';
-$labels['region'] = 'Regionas';
-$labels['country'] = 'Valstybė';
-$labels['birthday'] = 'Gimimo data';
-$labels['anniversary'] = 'Jubiliejus';
-$labels['website'] = 'Svetainė';
+
+// address boook
+$labels['name']         = 'Rodomas vardas';
+$labels['firstname']    = 'Vardas';
+$labels['surname']      = 'Pavardė';
+$labels['middlename']   = 'Kiti vardai';
+$labels['nameprefix']   = 'Titulas';
+$labels['namesuffix']   = 'Sufiksas';
+$labels['nickname']     = 'Pravardė';
+$labels['jobtitle']     = 'Pareigos';
+$labels['department']   = 'Padalinys';
+$labels['gender']       = 'Lytis';
+$labels['maidenname']   = 'Mergautinė pavardė';
+$labels['email']        = 'El. paštas';
+$labels['phone']        = 'Telefono numeris';
+$labels['address']      = 'Adresas';
+$labels['street']       = 'Gatvė, namas ir butas';
+$labels['locality']     = 'Miestas';
+$labels['zipcode']      = 'Pašto kodas';
+$labels['region']       = 'Regionas';
+$labels['country']      = 'Valstybė';
+$labels['birthday']     = 'Gimimo data';
+$labels['anniversary']  = 'Jubiliejus';
+$labels['website']      = 'Svetainė';
 $labels['instantmessenger'] = 'Tikralaikiai pokalbiai';
 $labels['notes'] = 'Pastabos';
-$labels['male'] = 'vyras';
+$labels['male']   = 'vyras';
 $labels['female'] = 'moteris';
 $labels['manager'] = 'Vadybininkas(-ė)';
 $labels['assistant'] = 'Padėjėjo(-os)';
-$labels['typeassistant'] = 'Padėjėjo(-os)';
 $labels['spouse'] = 'Sutuoktinis';
 $labels['allfields'] = 'Visi laukai';
 $labels['search'] = 'Paieška';
 $labels['advsearch'] = 'Išplėstinė paieška';
 $labels['advanced'] = 'Išsamiau';
 $labels['other'] = 'Kitas';
-$labels['typeother'] = 'Kitas';
-$labels['typehome'] = 'Namų';
-$labels['typework'] = 'Darbo';
-$labels['typemobile'] = 'Mobilusis';
-$labels['typemain'] = 'Pagrindinis';
-$labels['typehomefax'] = 'Namų faksas';
-$labels['typeworkfax'] = 'Darbo faksas';
-$labels['typecar'] = 'Automobilyje';
-$labels['typepager'] = 'Pranešimų gaviklis';
-$labels['typevideo'] = 'Vaizdo';
-$labels['typehomepage'] = 'Tinklalapis';
+
+$labels['typehome']   = 'Namų';
+$labels['typework']   = 'Darbo';
+$labels['typeother']  = 'Kitas';
+$labels['typemobile']  = 'Mobilusis';
+$labels['typemain']  = 'Pagrindinis';
+$labels['typehomefax']  = 'Namų faksas';
+$labels['typeworkfax']  = 'Darbo faksas';
+$labels['typecar']  = 'Automobilyje';
+$labels['typepager']  = 'Pranešimų gaviklis';
+$labels['typevideo']  = 'Vaizdo';
+$labels['typeassistant']  = 'Padėjėjo(-os)';
+$labels['typehomepage']  = 'Tinklalapis';
 $labels['typeblog'] = 'Tinklaraštis';
 $labels['typeprofile'] = 'Profilis';
+
 $labels['addfield'] = 'Pridėti lauką…';
 $labels['addcontact'] = 'Pridėti adresatą';
 $labels['editcontact'] = 'Taisyti adresatą';
 $labels['contacts'] = 'Adresatai';
 $labels['contactproperties'] = 'Adresato savybės';
 $labels['personalinfo'] = 'Asmeniniai duomenys';
-$labels['edit'] = 'Redaguoti';
+
+$labels['edit']   = 'Redaguoti';
 $labels['cancel'] = 'Atsisakyti';
-$labels['save'] = 'Įrašyti';
+$labels['save']   = 'Įrašyti';
 $labels['delete'] = 'Pašalinti';
 $labels['rename'] = 'Pervardinti';
 $labels['addphoto'] = 'Pridėti';
 $labels['replacephoto'] = 'Pakeisti';
 $labels['uploadphoto'] = 'Įkelti nuotrauką';
-$labels['newcontact'] = 'Sukurti naują adresatą';
-$labels['deletecontact'] = 'Ištrinti pažymėtus adresatus';
-$labels['composeto'] = 'Rašyti laišką';
+
+$labels['newcontact']     = 'Sukurti naują adresatą';
+$labels['deletecontact']  = 'Ištrinti pažymėtus adresatus';
+$labels['composeto']      = 'Rašyti laišką';
 $labels['contactsfromto'] = 'Adresatai nuo $from iki $to iš $count';
-$labels['print'] = 'Spausdinti';
-$labels['export'] = 'Eksportuoti';
-$labels['exportvcards'] = 'Eksportuoti adresatus  „vCard“ formatu';
+$labels['print']          = 'Spausdinti';
+$labels['export']         = 'Eksportuoti';
+$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ę';
-$labels['groupdelete'] = 'Pašalinti grupę';
+$labels['grouprename']    = 'Pervardinti grupę';
+$labels['groupdelete']    = 'Pašalinti grupę';
 $labels['groupremoveselected'] = 'Pašalinti pažymėtus adresatus iš grupės';
-$labels['previouspage'] = 'Rodyti ankstesnį puslapį';
-$labels['firstpage'] = 'Rodyti pirmąjį puslapį';
-$labels['nextpage'] = 'Rodyti tolesnį puslapį';
-$labels['lastpage'] = 'Rodyti paskutinį puslapį';
+
+$labels['previouspage']   = 'Rodyti ankstesnį puslapį';
+$labels['firstpage']      = 'Rodyti pirmąjį puslapį';
+$labels['nextpage']       = 'Rodyti tolesnį puslapį';
+$labels['lastpage']       = 'Rodyti paskutinį puslapį';
+
 $labels['group'] = 'Grupė';
 $labels['groups'] = 'Grupės';
 $labels['personaladrbook'] = 'Asmeniniai adresai';
+
 $labels['searchsave'] = 'Įrašyti kaip radinių aplanką';
 $labels['searchdelete'] = 'Pašalinti radinių aplanką';
+
 $labels['import'] = 'Importuoti';
 $labels['importcontacts'] = 'Importuoti adresatus';
 $labels['importfromfile'] = 'Importuoti iš failo:';
 $labels['importtarget'] = 'Pridėti naujus adresatus į adresų knygą:';
 $labels['importreplace'] = 'Perrašyti visą adresų knygą';
+$labels['importdesc'] = 'Galite įkelti kontaktus iš jau turimos adresų knygos. <br/>Šiuo metu galima importuoti kontaktus iš <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> arba CSV (comma-separated) duomenų formatų.';
 $labels['done'] = 'Baigta';
+
+// settings
 $labels['settingsfor'] = 'Nuostatos';
 $labels['about'] = 'Apie';
 $labels['preferences'] = 'Nuostatos';
 $labels['userpreferences'] = 'Naudotojo nuostatos';
 $labels['editpreferences'] = 'Keisti naudotojo nuostatas';
+
 $labels['identities'] = 'Tapatybės';
 $labels['manageidentities'] = 'Tvarkyti šios paskyros tapatybes';
 $labels['newidentity'] = 'Nauja tapatybė';
+
 $labels['newitem'] = 'Naujas elementas';
 $labels['edititem'] = 'Redaguoti elementą';
+
 $labels['preferhtml'] = 'Rodyti HTML';
 $labels['defaultcharset'] = 'Numatytoji koduotė';
 $labels['htmlmessage'] = 'HTML laiškas';
+$labels['messagepart'] = 'Dalis';
+$labels['digitalsig'] = 'Skaitmeninis parašas';
 $labels['dateformat'] = 'Datos formatas';
 $labels['timeformat'] = 'Laiko formatas';
 $labels['prettydate'] = 'Dailios datos';
-$labels['setdefault'] = 'Laikyti numatytąja';
-$labels['autodetect'] = 'Aptikti automatiškai';
-$labels['language'] = 'Kalba';
-$labels['timezone'] = 'Laiko juosta';
-$labels['pagesize'] = 'Eilučių skaičius puslapyje';
+$labels['setdefault']  = 'Laikyti numatytąja';
+$labels['autodetect']  = 'Aptikti automatiškai';
+$labels['language']  = 'Kalba';
+$labels['timezone']  = 'Laiko juosta';
+$labels['pagesize']  = 'Eilučių skaičius puslapyje';
 $labels['signature'] = 'Parašas';
-$labels['dstactive'] = 'Vasaros laikas skiriasi';
+$labels['dstactive']  = 'Vasaros laikas skiriasi';
+$labels['showinextwin'] = 'Atidaryti pranešimą naujame lange';
+$labels['composeextwin'] = 'Rašyti naujame lange';
 $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';
@@ -347,10 +425,11 @@ $labels['showremoteimages'] = 'Įkelti paveikslėlius iš interneto serverių';
 $labels['fromknownsenders'] = 'tik žinomų siuntėjų laiškuose';
 $labels['always'] = 'visada';
 $labels['showinlineimages'] = 'Rodyti pridėtus paveikslėlius žemiau laiško';
-$labels['autosavedraft'] = 'Automatiškai įrašyti juodraščius';
-$labels['everynminutes'] = 'kas $n min.';
-$labels['never'] = 'niekada';
-$labels['immediately'] = 'nedelsiant';
+$labels['autosavedraft']  = 'Automatiškai įrašyti juodraščius';
+$labels['everynminutes']  = 'kas $n min.';
+$labels['refreshinterval']  = 'Atnaujinti (patikrinti, ar nėra naujų laiškų ir pan.)';
+$labels['never']  = 'niekada';
+$labels['immediately']  = 'nedelsiant';
 $labels['messagesdisplaying'] = 'Laiškų rodymas';
 $labels['messagescomposition'] = 'Laiškų rašymas';
 $labels['mimeparamfolding'] = 'Prisegtų failų vardų kodavimas';
@@ -370,22 +449,20 @@ $labels['maintenance'] = 'Priežiūra';
 $labels['newmessage'] = 'Naujas laiškas';
 $labels['signatureoptions'] = 'Parašo nuostatos';
 $labels['whenreplying'] = 'Kuriant atsakymą';
+$labels['replyempty'] = 'necituoti originalaus laiško';
 $labels['replytopposting'] = 'rašyti atsakymą virš cituojamo laiško';
 $labels['replybottomposting'] = 'rašyti atsakymą po cituojamu laišku';
 $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.';
+$labels['previewpanemarkread']  = 'Peržiūros polangyje parodytus laiškus žymėti skaitytais';
+$labels['afternseconds']  = 'praėjus $n sek.';
 $labels['reqmdn'] = 'Visuomet prašyti patvirtinimo, jog laiškas perskaitytas';
 $labels['reqdsn'] = 'Visuomet prašyti laiško pristatymo pažymos';
 $labels['replysamefolder'] = 'Atsakymus talpinti į tą patį aplanką, kuriame yra pirminis laiškas';
-$labels['defaultaddressbook'] = 'Pridėti naujus adresatus į pasirinktąją adresų knygą';
+$labels['defaultabook'] = 'Numatytoji adresų knyga';
 $labels['autocompletesingle'] = 'Užbaigiant adresus, praleisti antrinius';
 $labels['listnamedisplay'] = 'Rodyti adresatus kaip';
 $labels['spellcheckbeforesend'] = 'Tikrinti rašybą prieš išsiunčiant laišką';
@@ -395,13 +472,18 @@ $labels['spellcheckignorenums'] = 'Nepaisyti žodžių su skaitmenimis';
 $labels['spellcheckignorecaps'] = 'Nepaisyti žodžių vien iš didžiųjų raidžių';
 $labels['addtodict'] = 'Įtraukti į žodyną';
 $labels['mailtoprotohandler'] = 'Užregistruoti svetainę kaip dirbančią su „mailto:“ saitais';
-$labels['folder'] = 'Aplankas';
-$labels['foldername'] = 'Aplanko vardas';
-$labels['subscribed'] = 'Užsakytas';
+$labels['forwardmode'] = 'Laiškų persiuntimo būdas';
+$labels['inline'] = 'kaip citatą';
+$labels['asattachment'] = 'kaip priedas';
+
+$labels['folder']  = 'Aplankas';
+$labels['folders']  = 'Aplankai';
+$labels['foldername']  = 'Aplanko vardas';
+$labels['subscribed']  = 'Užsakytas';
 $labels['messagecount'] = 'Laiškai';
-$labels['create'] = 'Sukurti';
-$labels['createfolder'] = 'Sukurti naują aplanką';
-$labels['managefolders'] = 'Tvarkyti aplankus';
+$labels['create']  = 'Sukurti';
+$labels['createfolder']  = 'Sukurti naują aplanką';
+$labels['managefolders']  = 'Tvarkyti aplankus';
 $labels['specialfolders'] = 'Specialieji aplankai';
 $labels['properties'] = 'Savybės';
 $labels['folderproperties'] = 'Aplanko savybės';
@@ -411,22 +493,29 @@ $labels['info'] = 'Informacija';
 $labels['getfoldersize'] = 'Spustelėkite, norėdami sužinoti aplanko dydį';
 $labels['changesubscription'] = 'Spustelėkite, norėdami keisti prenumeratos nuostatas';
 $labels['foldertype'] = 'Aplanko tipas';
-$labels['personalfolder'] = 'Asmeninis aplankas';
-$labels['otherfolder'] = 'Kito naudotojo aplankas';
-$labels['sharedfolder'] = 'Viešas aplankas';
+$labels['personalfolder']  = 'Asmeninis aplankas';
+$labels['otherfolder']  = 'Kito naudotojo aplankas';
+$labels['sharedfolder']  = 'Viešas aplankas';
+
 $labels['sortby'] = 'Rikiuoti pagal';
-$labels['sortasc'] = 'Rikiuoti didėjančiai';
+$labels['sortasc']  = 'Rikiuoti didėjančiai';
 $labels['sortdesc'] = 'Rikiuoti mažėjančiai';
 $labels['undo'] = 'Atšaukti';
+
+$labels['installedplugins'] = 'Įdiegti įskiepiai';
 $labels['plugin'] = 'Papildinys';
 $labels['version'] = 'Versija';
 $labels['source'] = 'Šaltinis';
 $labels['license'] = 'Licencija';
 $labels['support'] = 'Gauti pagalbos';
+
+// units
 $labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
 $labels['GB'] = 'GB';
+
+// character sets
 $labels['unicode'] = 'Unikodas';
 $labels['english'] = 'Anglų';
 $labels['westerneuropean'] = 'Vakarų Europos';
@@ -446,3 +535,4 @@ $labels['japanese'] = 'Japonų';
 $labels['korean'] = 'Korėjiečių';
 $labels['chinese'] = 'Kinų';
 
+?>
diff --git a/program/localization/lt_LT/messages.inc b/program/localization/lt_LT/messages.inc
index b83ffcfe4..df19c291b 100644
--- a/program/localization/lt_LT/messages.inc
+++ b/program/localization/lt_LT/messages.inc
@@ -2,20 +2,23 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/lt_LT/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Rimas Kudelis <rq@akl.lt>                                     |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['errortitle'] = 'Įvyko klaida!';
-$messages['loginfailed'] = 'Prisijungti nepavyko.';
+$messages['errortitle']  = 'Įvyko klaida!';
+$messages['loginfailed']  = 'Prisijungti nepavyko.';
 $messages['cookiesdisabled'] = 'Jūsų naršyklė nepriima slapukų.';
 $messages['sessionerror'] = 'Jūsų sesija negaliojanti.';
 $messages['storageerror'] = 'Nepavyko prisijungti prie IMAP serverio.';
@@ -25,10 +28,14 @@ $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.';
 $messages['loggedout'] = 'Jūs sėkmingai atsijungėte. Iki kito karto!';
 $messages['mailboxempty'] = 'Pašto dėžutė tuščia.';
+$messages['refreshing'] = 'Atnaujinama…';
 $messages['loading'] = 'Įkeliama…';
 $messages['uploading'] = 'Įkeliamas failas…';
 $messages['uploadingmany'] = 'Įkeliami failai…';
@@ -55,11 +62,11 @@ $messages['errormoving'] = 'Laiško(-ų) perkelti nepavyko.';
 $messages['errorcopying'] = 'Laiško(-ų) nukopijuoti nepavyko.';
 $messages['errordeleting'] = 'Laiško(-ų) pašalinti nepavyko.';
 $messages['errormarking'] = 'Laiško(-ų) pažymėti nepavyko.';
-$messages['deletecontactconfirm'] = 'Ar tikrai pašalinti pažymėtą(-us) adresatą(-us)?';
-$messages['deletegroupconfirm'] = 'Ar tikrai pašalinti pažymėtą grupę?';
+$messages['deletecontactconfirm']  = 'Ar tikrai pašalinti pažymėtą(-us) adresatą(-us)?';
+$messages['deletegroupconfirm']  = 'Ar tikrai pašalinti pažymėtą grupę?';
 $messages['deletemessagesconfirm'] = 'Ar tikrai pašalinti pažymėtą(-us) laišką(-us)?';
-$messages['deletefolderconfirm'] = 'Ar tikrai pašalinti šį aplanką?';
-$messages['purgefolderconfirm'] = 'Ar tikrai pašalinti visus šiame aplanke esančius laiškus?';
+$messages['deletefolderconfirm']  = 'Ar tikrai pašalinti šį aplanką?';
+$messages['purgefolderconfirm']  = 'Ar tikrai pašalinti visus šiame aplanke esančius laiškus?';
 $messages['contactdeleting'] = 'Adresatas(-ai) šalinamas(-i)…';
 $messages['groupdeleting'] = 'Grupė šalinama…';
 $messages['folderdeleting'] = 'Aplankas šalinamas…';
@@ -68,11 +75,11 @@ $messages['foldersubscribing'] = 'Aplankas prenumeruojamas…';
 $messages['folderunsubscribing'] = 'Atsisakoma aplanko prenumeratos…';
 $messages['formincomplete'] = 'Forma nepilnai užpildyta.';
 $messages['noemailwarning'] = 'Prašom įvesti teisingą el. pašto adresą.';
-$messages['nonamewarning'] = 'Prašom įvesti vardą.';
+$messages['nonamewarning']  = 'Prašom įvesti vardą.';
 $messages['nopagesizewarning'] = 'Prašom įvesti puslapio dydį.';
 $messages['nosenderwarning'] = 'Prašom įvesti siuntėjo el. pašto adresą.';
 $messages['norecipientwarning'] = 'Prašom įvesti bent vieną gavėją.';
-$messages['nosubjectwarning'] = 'Temos laukelis tuščias. Ar norite temą įvesti dabar?';
+$messages['nosubjectwarning']  = 'Temos laukelis tuščias. Ar norite temą įvesti dabar?';
 $messages['nobodywarning'] = 'Išsiųsti šį laišką be teksto?';
 $messages['notsentwarning'] = 'Laiškas neišsiųstas. Ar jūs tikrai norite jo atsikratyti?';
 $messages['noldapserver'] = 'Prašome pasirinkti LDAP serverį paieškai.';
@@ -114,8 +121,9 @@ $messages['selectimportfile'] = 'Parinkite norimą įkelti failą.';
 $messages['addresswriterror'] = 'Pasirinktoji adresų knyga prieinama tik skaitymui.';
 $messages['contactaddedtogroup'] = 'Adresatai sėkmingai įtraukti į šią grupę.';
 $messages['contactremovedfromgroup'] = 'Adresatai sėkmingai pašalinti iš šios grupės.';
+$messages['nogroupassignmentschanged'] = 'Grupių priskyrimai nepakeisti.';
 $messages['importwait'] = 'Importuojama, prašome palaukti…';
-$messages['importerror'] = 'Importavimas nepavyko! Įkeltasis failas nėra „vCard“ formato.';
+$messages['importformaterror'] = 'Importas nepavyko! Įkeltasis failas nėra tinkamas importavimui duomenų failas.';
 $messages['importconfirm'] = '<b>Sėkmingai importuoti $inserted adresatai(-ų)</b>';
 $messages['importconfirmskipped'] = '<b>Praleisti $skipped jau egzistuojantys adresatai(-ų)</b>';
 $messages['opnotpermitted'] = 'Veiksmas neleistinas!';
@@ -157,4 +165,7 @@ $messages['invalidimageformat'] = 'Paveikslo formatas netinkamas.';
 $messages['mispellingsfound'] = 'Laiške rasta rašybos klaidų.';
 $messages['parentnotwritable'] = 'Nepavyko sukurti arba perkelti aplanko į parinktą tėvinį aplanką. Trūksta prieigos teisių.';
 $messages['messagetoobig'] = 'Laiško dalis yra per didelė, kad galėtų būti apdorota.';
+$messages['attachmentvalidationerror'] = 'Dėmesio! Šis priedas yra įtartinas, nes jo tipas nesutampa su deklaruotu laiške. Jeigu nepasitikite šiuo siuntėju, šio priedo atverti naršyklėje nepatartina, nes jis gali būti kenksmingas.<br/><br/><em>Tikėtasi: $expected; aptikta: $detected</em>';
+$messages['noscriptwarning'] = 'Dėmesio: šiai saityno el. pašto sistemai veikti būtini „JavaScript“ scenarijai! Norėdami ja naudotis, įjunkite „JavaScript“ savo naršyklės nuostatose.';
 
+?>
diff --git a/program/localization/lv_LV/labels.inc b/program/localization/lv_LV/labels.inc
index 4c83528f6..7d4de2564 100644
--- a/program/localization/lv_LV/labels.inc
+++ b/program/localization/lv_LV/labels.inc
@@ -2,56 +2,78 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/lv_LV/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = 'Esiet laipni lūgti $product';
-$labels['username'] = 'Lietotājvārds';
-$labels['password'] = 'Parole';
-$labels['server'] = 'Serveris';
-$labels['login'] = 'Pieslēgties';
-$labels['logout'] = 'Atslēgties';
-$labels['mail'] = 'E-pasts';
+
+// login page
+$labels['welcome']   = 'Esiet laipni lūgti $product';
+$labels['username']  = 'Lietotājvārds';
+$labels['password']  = 'Parole';
+$labels['server']    = 'Serveris';
+$labels['login']     = 'Pieslēgties';
+
+// taskbar
+$labels['logout']   = 'Atslēgties';
+$labels['mail']     = 'E-pasts';
 $labels['settings'] = 'Personīgie iestatījumi';
 $labels['addressbook'] = 'Adrešu grāmata';
-$labels['inbox'] = 'Ienākošās';
+
+// mailbox names
+$labels['inbox']  = 'Ienākošās';
 $labels['drafts'] = 'Uzmetumi';
-$labels['sent'] = 'Nosūtītās';
-$labels['trash'] = 'Miskaste';
-$labels['junk'] = 'Mēstules';
+$labels['sent']   = 'Nosūtītās';
+$labels['trash']  = 'Miskaste';
+$labels['junk']   = 'Mēstules';
+
+// message listing
 $labels['subject'] = 'Temats';
-$labels['from'] = 'No';
-$labels['to'] = 'Kam';
-$labels['cc'] = 'Cc';
-$labels['bcc'] = 'Bcc';
+$labels['from']    = 'No';
+$labels['sender']  = 'Sender';
+$labels['to']      = 'Kam';
+$labels['cc']      = 'Cc';
+$labels['bcc']     = 'Bcc';
 $labels['replyto'] = 'Reply-To';
 $labels['followupto'] = 'Followup-To';
-$labels['date'] = 'Datums';
-$labels['size'] = 'Izmērs';
+$labels['date']    = 'Datums';
+$labels['size']    = 'Izmērs';
 $labels['priority'] = 'Prioritāte';
 $labels['organization'] = 'Uzņēmums';
 $labels['readstatus'] = 'Izlasīšanas statuss';
+$labels['listoptions'] = 'List options...';
+
 $labels['mailboxlist'] = 'Mapes';
-$labels['folders'] = 'Mapes';
 $labels['messagesfromto'] = 'Vēstules $from līdz $to no $count';
 $labels['threadsfromto'] = 'Vijumi $from līdz $to no $count';
 $labels['messagenrof'] = '$nr. vēstule  no $count';
-$labels['copy'] = 'Kopēt';
-$labels['move'] = 'Pārvietot';
-$labels['moveto'] = 'pārvietot uz...';
+$labels['fromtoshort'] = '$from – $to of $count';
+
+$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';
+
 $labels['filename'] = 'Faila nosaukums';
 $labels['filesize'] = 'Faila izmērs';
+
 $labels['addtoaddressbook'] = 'Pievienot adrešu grāmatai';
+
+// weekdays short
 $labels['sun'] = 'Sv';
 $labels['mon'] = 'P';
 $labels['tue'] = 'O';
@@ -59,72 +81,90 @@ $labels['wed'] = 'T';
 $labels['thu'] = 'C';
 $labels['fri'] = 'P';
 $labels['sat'] = 'Se';
-$labels['sunday'] = 'Svētdiena';
-$labels['monday'] = 'Pirmdiena';
-$labels['tuesday'] = 'Otrdiena';
+
+// weekdays long
+$labels['sunday']    = 'Svētdiena';
+$labels['monday']    = 'Pirmdiena';
+$labels['tuesday']   = 'Otrdiena';
 $labels['wednesday'] = 'Trešdiena';
-$labels['thursday'] = 'Ceturtdiena';
-$labels['friday'] = 'Piektdiena';
-$labels['saturday'] = 'Sestdiena';
-$labels['jan'] = 'Jan';
-$labels['feb'] = 'Feb';
-$labels['mar'] = 'Mar';
-$labels['apr'] = 'Apr';
-$labels['may'] = 'Maijs';
-$labels['longmay'] = 'Maijs';
-$labels['jun'] = 'Jūn';
-$labels['jul'] = 'Jūl';
-$labels['aug'] = 'Aug';
-$labels['sep'] = 'Sep';
-$labels['oct'] = 'Okt';
-$labels['nov'] = 'Nov';
-$labels['dec'] = 'Dec';
-$labels['longjan'] = 'Janvāris';
-$labels['longfeb'] = 'Februāris';
-$labels['longmar'] = 'Marts';
-$labels['longapr'] = 'Aprīlis';
-$labels['longjun'] = 'Jūnijs';
-$labels['longjul'] = 'Jūlijs';
-$labels['longaug'] = 'Augusts';
-$labels['longsep'] = 'Septembris';
-$labels['longoct'] = 'Oktobris';
-$labels['longnov'] = 'Novembris';
-$labels['longdec'] = 'Decembris';
+$labels['thursday']  = 'Ceturtdiena';
+$labels['friday']    = 'Piektdiena';
+$labels['saturday']  = 'Sestdiena';
+
+// months short
+$labels['jan']	= 'Jan';
+$labels['feb']	= 'Feb';
+$labels['mar']	= 'Mar';
+$labels['apr']	= 'Apr';
+$labels['may']	= 'Maijs';
+$labels['jun']	= 'Jūn';
+$labels['jul'] 	= 'Jūl';
+$labels['aug']	= 'Aug';
+$labels['sep']	= 'Sep';
+$labels['oct']	= 'Okt';
+$labels['nov']	= 'Nov';
+$labels['dec']	= 'Dec';
+
+// months long
+$labels['longjan']	= 'Janvāris';
+$labels['longfeb']	= 'Februāris';
+$labels['longmar']	= 'Marts';
+$labels['longapr']	= 'Aprīlis';
+$labels['longmay']	= 'Maijs';
+$labels['longjun']	= 'Jūnijs';
+$labels['longjul']	= 'Jūlijs';
+$labels['longaug']	= 'Augusts';
+$labels['longsep']	= 'Septembris';
+$labels['longoct']	= 'Oktobris';
+$labels['longnov']	= 'Novembris';
+$labels['longdec']	= 'Decembris';
+
 $labels['today'] = 'Šodien';
-$labels['checkmail'] = 'Pārbaudīt pastu';
-$labels['compose'] = 'Rakstīt vēstuli';
-$labels['writenewmessage'] = 'Rakstīt jaunu vēstuli';
-$labels['replytomessage'] = 'Atbildēt';
+
+// toolbar buttons
+$labels['refresh']          = 'Refresh';
+$labels['checkmail']        = 'Pārbaudīt pastu';
+$labels['compose']          = 'Rakstīt vēstuli';
+$labels['writenewmessage']  = 'Rakstīt jaunu vēstuli';
+$labels['reply']            = 'Reply';
+$labels['replytomessage']   = 'Atbildēt';
 $labels['replytoallmessage'] = 'Atbildēt sūtītājam un visiem saņēmējiem';
-$labels['replyall'] = 'Atbildēt visiem';
-$labels['replylist'] = 'Atbildēt listei';
-$labels['forwardinline'] = 'Pārsūtīt iekļaujot vēstulē';
+$labels['replyall']         = 'Atbildēt visiem';
+$labels['replylist']        = 'Atbildēt listei';
+$labels['forward']          = 'Forward';
+$labels['forwardinline']    = 'Pārsūtīt iekļaujot vēstulē';
 $labels['forwardattachment'] = 'Pārsūtīt kā pielikumu';
-$labels['forwardmessage'] = 'Pārsūtīt vēstuli';
-$labels['deletemessage'] = 'Dzēst vēstuli';
+$labels['forwardmessage']   = 'Pārsūtīt vēstuli';
+$labels['deletemessage']    = 'Dzēst vēstuli';
 $labels['movemessagetotrash'] = 'Pārvietot vēstuli uz miskasti';
-$labels['printmessage'] = 'izdrukāt';
-$labels['previousmessage'] = 'Parādīt iepriekšējo vēstuli';
-$labels['firstmessage'] = 'Parādīt pirmo vēstuli';
-$labels['nextmessage'] = 'Parādīt nākamo vēstuli';
-$labels['lastmessage'] = 'Parādīt pēdējo vēstuli';
-$labels['backtolist'] = 'Atpakaļ uz vēstuļu sarakstu';
-$labels['viewsource'] = 'parādīt pirmtekstu';
-$labels['markmessages'] = 'Marķēt vēstules kā:';
-$labels['markread'] = 'lasītas';
-$labels['markunread'] = 'nelasītas';
-$labels['markflagged'] = 'iezīmētas';
-$labels['markunflagged'] = 'neiezīmētas';
-$labels['moreactions'] = 'Citas darbības...';
+$labels['printmessage']     = 'izdrukāt';
+$labels['previousmessage']  = 'Parādīt iepriekšējo vēstuli';
+$labels['firstmessage']     = 'Parādīt pirmo vēstuli';
+$labels['nextmessage']      = 'Parādīt nākamo vēstuli';
+$labels['lastmessage']      = 'Parādīt pēdējo vēstuli';
+$labels['backtolist']       = 'Atpakaļ uz vēstuļu sarakstu';
+$labels['viewsource']       = 'parādīt pirmtekstu';
+$labels['mark']             = 'Mark';
+$labels['markmessages']     = 'Marķēt vēstules kā:';
+$labels['markread']         = 'lasītas';
+$labels['markunread']       = 'nelasītas';
+$labels['markflagged']      = 'iezīmētas';
+$labels['markunflagged']    = 'neiezīmētas';
+$labels['moreactions']      = 'Citas darbības...';
+$labels['more']             = 'More';
+$labels['back']             = 'Back';
+$labels['options']          = 'Options';
+
 $labels['select'] = 'Iezīmēt';
 $labels['all'] = 'visas';
 $labels['none'] = 'Neviens';
-$labels['nonesort'] = 'Neviens';
 $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';
 $labels['filter'] = 'Filtrēt';
 $labels['list'] = 'Saraksts';
@@ -133,12 +173,14 @@ $labels['expand-all'] = 'Izvērst visus';
 $labels['expand-unread'] = 'Izvērst neizlasītos';
 $labels['collapse-all'] = 'Savērst visu';
 $labels['threaded'] = 'Savīts';
+
 $labels['autoexpand_threads'] = 'Izvērst vēstuļu vijumus';
 $labels['do_expand'] = 'visiem vijumiem';
 $labels['expand_only_unread'] = 'tikai tad, ja ir neizlasītas vēstules';
 $labels['fromto'] = 'Sūtītājs/Saņēmējs';
 $labels['flag'] = 'Iezīmēts';
 $labels['attachment'] = 'Pielikums';
+$labels['nonesort'] = 'Neviens';
 $labels['sentdate'] = 'Nosūtīšanas datums';
 $labels['arrival'] = 'Pienākšanas datums';
 $labels['asc'] = 'augoša';
@@ -147,170 +189,220 @@ $labels['listcolumns'] = 'Saraksta kolonnas';
 $labels['listsorting'] = 'Kārtot pēc kolonnas';
 $labels['listorder'] = 'Kārtošanas secība';
 $labels['listmode'] = 'Saraksta režīms';
+
 $labels['folderactions'] = 'Darbības ar mapēm...';
 $labels['compact'] = 'saspiest';
 $labels['empty'] = 'iztukšot';
+
 $labels['quota'] = 'Kvota';
-$labels['unknown'] = 'nezināms';
-$labels['unlimited'] = 'neierobežots';
-$labels['quicksearch'] = 'Ārtā meklēšana';
-$labels['resetsearch'] = 'Atstatīt meklēšanu';
-$labels['searchmod'] = 'Meklēt laukos:';
-$labels['msgtext'] = 'Vēstules tekstā';
+$labels['unknown']  = 'nezināms';
+$labels['unlimited']  = 'neierobežots';
+
+$labels['quicksearch']  = 'Ārtā meklēšana';
+$labels['resetsearch']  = 'Atstatīt meklēšanu';
+$labels['searchmod']  = 'Meklēt laukos:';
+$labels['msgtext']  = 'Vēstules tekstā';
+$labels['body']  = 'Body';
+
 $labels['openinextwin'] = 'atvērt jaunā logā';
 $labels['emlsave'] = 'lejupielādēt (.eml)';
-$labels['editasnew'] = 'rediģēt kā jaunu';
-$labels['sendmessage'] = 'Sūtīt vēstuli';
-$labels['savemessage'] = 'Saglabāt uzmetumu';
-$labels['addattachment'] = 'Pievienot failu';
-$labels['charset'] = 'Rakstzīmju kopa';
-$labels['editortype'] = 'Redaktora tips';
-$labels['returnreceipt'] = 'Saņemšanas apstiprinājums';
-$labels['dsn'] = 'Atskaite par piegādi';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
+
+// message compose
+$labels['editasnew']      = 'rediģēt kā jaunu';
+$labels['send']           = 'Send';
+$labels['sendmessage']    = 'Sūtīt vēstuli';
+$labels['savemessage']    = 'Saglabāt uzmetumu';
+$labels['addattachment']  = 'Pievienot failu';
+$labels['charset']        = 'Rakstzīmju kopa';
+$labels['editortype']     = 'Redaktora tips';
+$labels['returnreceipt']  = 'Saņemšanas apstiprinājums';
+$labels['dsn']            = 'Atskaite par piegādi';
 $labels['mailreplyintro'] = '$sender @ $date rakstīja:';
 $labels['originalmessage'] = 'Sākotnējā vēstule';
-$labels['editidents'] = 'Rediģēt identitātes';
+
+$labels['editidents']    = 'Rediģēt identitātes';
+$labels['spellcheck']    = 'Spell';
 $labels['checkspelling'] = 'Pārbaudīt pareizrakstību';
 $labels['resumeediting'] = 'Turpināt rediģēšanu';
-$labels['revertto'] = 'Atgriezt uz';
+$labels['revertto']      = 'Atgriezt uz';
+
+$labels['attach'] = 'Attach';
 $labels['attachments'] = 'Pielikumi';
 $labels['upload'] = 'Augšupielādēt';
 $labels['uploadprogress'] = '$percent ($current no $total)';
-$labels['close'] = 'Aizvērt';
-$labels['messageoptions'] = 'Vēstuļu iestatījumi...';
-$labels['low'] = 'Zema';
-$labels['lowest'] = 'Zemākā';
-$labels['normal'] = 'Normāla';
-$labels['high'] = 'Augsta';
+$labels['close']  = 'Aizvērt';
+$labels['messageoptions']  = 'Vēstuļu iestatījumi...';
+
+$labels['low']     = 'Zema';
+$labels['lowest']  = 'Zemākā';
+$labels['normal']  = 'Normāla';
+$labels['high']    = 'Augsta';
 $labels['highest'] = 'Augstākā';
-$labels['nosubject'] = '(no subject)';
+
+$labels['nosubject']  = '(no subject)';
 $labels['showimages'] = 'Rādīt attēlus';
 $labels['alwaysshow'] = 'Vienmēr rādīt attēlus no $sender';
-$labels['isdraft'] = 'Šis ir melnraksts.';
+$labels['isdraft']    = 'Šis ir melnraksts.';
+$labels['andnmore']   = '$nr more...';
+$labels['togglemoreheaders'] = 'Show more message headers';
+$labels['togglefullheaders'] = 'Toggle raw message headers';
+
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Vienkāršs teksts';
 $labels['savesentmessagein'] = 'Saglabāt nosūtīto vēstuli mapē';
 $labels['dontsave'] = 'nesaglabāt';
 $labels['maxuploadsize'] = 'Maksimālais atļautais faila izmērs ir $size';
+
 $labels['addcc'] = 'Pievienot Cc';
 $labels['addbcc'] = 'Pievienot Bcc';
 $labels['addreplyto'] = 'Pievienot Reply-To';
 $labels['addfollowupto'] = 'Pievienot Followup-To';
+
+// mdn
 $labels['mdnrequest'] = 'Šīs vēstules sūtītājs vēlas redzēt vēstules saņemšanas apstiprinājumu. Vai jūs vēlaties nosūtīt apstiprinājumu?';
 $labels['receiptread'] = 'Saņemšanas apstiprinājums';
 $labels['yourmessage'] = 'Šīs ir jūsu vēstules saņemšanas apstiprinājums';
 $labels['receiptnote'] = 'Piezīme: Šīs apsiprinājums nozīmē tikai to, ka vēstule tika parādīta uz saņēmāja datora. Tas nenozīmē, ka saņēmējs ir izlasījis vai izpratis vēstules saturu.';
-$labels['name'] = 'Uzrādītais vārds';
-$labels['firstname'] = 'Vārds';
-$labels['surname'] = 'Uzvārds';
-$labels['middlename'] = 'Otrais vārds';
-$labels['nameprefix'] = 'Prefikss';
-$labels['namesuffix'] = 'Sufikss';
-$labels['nickname'] = 'Iesauka (nick)';
-$labels['jobtitle'] = 'Amats';
-$labels['department'] = 'Nodaļa';
-$labels['gender'] = 'Dzimums';
-$labels['maidenname'] = 'Pirmslaulību uzvārds';
-$labels['email'] = 'E-pasts';
-$labels['phone'] = 'Tālrunis';
-$labels['address'] = 'Adrese';
-$labels['street'] = 'Iela';
-$labels['locality'] = 'Pilsēta';
-$labels['zipcode'] = 'Pasta kods';
-$labels['region'] = 'Novads';
-$labels['country'] = 'Pilsēta';
-$labels['birthday'] = 'Dzimšanas diena';
-$labels['anniversary'] = 'Gadadiena';
-$labels['website'] = 'Web lapa';
+
+// address boook
+$labels['name']         = 'Uzrādītais vārds';
+$labels['firstname']    = 'Vārds';
+$labels['surname']      = 'Uzvārds';
+$labels['middlename']   = 'Otrais vārds';
+$labels['nameprefix']   = 'Prefikss';
+$labels['namesuffix']   = 'Sufikss';
+$labels['nickname']     = 'Iesauka (nick)';
+$labels['jobtitle']     = 'Amats';
+$labels['department']   = 'Nodaļa';
+$labels['gender']       = 'Dzimums';
+$labels['maidenname']   = 'Pirmslaulību uzvārds';
+$labels['email']        = 'E-pasts';
+$labels['phone']        = 'Tālrunis';
+$labels['address']      = 'Adrese';
+$labels['street']       = 'Iela';
+$labels['locality']     = 'Pilsēta';
+$labels['zipcode']      = 'Pasta kods';
+$labels['region']       = 'Novads';
+$labels['country']      = 'Pilsēta';
+$labels['birthday']     = 'Dzimšanas diena';
+$labels['anniversary']  = 'Gadadiena';
+$labels['website']      = 'Web lapa';
 $labels['instantmessenger'] = 'IM';
 $labels['notes'] = 'Piezīmes';
-$labels['male'] = 'vīrietis';
+$labels['male']   = 'vīrietis';
 $labels['female'] = 'sieviete';
 $labels['manager'] = 'Menedžeris';
 $labels['assistant'] = 'Asistents';
-$labels['typeassistant'] = 'Asistents';
 $labels['spouse'] = 'Laulātais draugs';
 $labels['allfields'] = 'Visi lauki';
 $labels['search'] = 'Meklēt';
 $labels['advsearch'] = 'Paplašinātā meklēšana';
+$labels['advanced'] = 'Advanced';
 $labels['other'] = 'Cits';
-$labels['typeother'] = 'Cits';
-$labels['typehome'] = 'Mājas';
-$labels['typework'] = 'Darbs';
-$labels['typemobile'] = 'Mobilais tālrunis';
-$labels['typemain'] = 'Galvenais';
-$labels['typehomefax'] = 'Mājas Fax';
-$labels['typeworkfax'] = 'Darba Fax';
-$labels['typecar'] = 'Auto';
-$labels['typepager'] = 'Peidžeris';
-$labels['typevideo'] = 'Video';
-$labels['typehomepage'] = 'Web lapa';
+
+$labels['typehome']   = 'Mājas';
+$labels['typework']   = 'Darbs';
+$labels['typeother']  = 'Cits';
+$labels['typemobile']  = 'Mobilais tālrunis';
+$labels['typemain']  = 'Galvenais';
+$labels['typehomefax']  = 'Mājas Fax';
+$labels['typeworkfax']  = 'Darba Fax';
+$labels['typecar']  = 'Auto';
+$labels['typepager']  = 'Peidžeris';
+$labels['typevideo']  = 'Video';
+$labels['typeassistant']  = 'Asistents';
+$labels['typehomepage']  = 'Web lapa';
 $labels['typeblog'] = 'Blogs';
 $labels['typeprofile'] = 'Profils';
+
 $labels['addfield'] = 'Pievienot lauku...';
 $labels['addcontact'] = 'Pievienot iezīmēto ierakstu adrešu grāmatai';
 $labels['editcontact'] = 'Rediģēt adrešu grāmatas ierakstu';
 $labels['contacts'] = 'Kontakti';
 $labels['contactproperties'] = 'Kontakta īpašības';
 $labels['personalinfo'] = 'Personiskā informācija';
-$labels['edit'] = 'Rediģēt';
+
+$labels['edit']   = 'Rediģēt';
 $labels['cancel'] = 'Atcelt';
-$labels['save'] = 'Saglabāt';
+$labels['save']   = 'Saglabāt';
 $labels['delete'] = 'Dzēst';
 $labels['rename'] = 'Pārdēvēt';
 $labels['addphoto'] = 'Pievienot';
 $labels['replacephoto'] = 'Aizvietot';
-$labels['newcontact'] = 'Izveidot jaunu ierakstu';
-$labels['deletecontact'] = 'Dzēst iezīmētos ierakstus';
-$labels['composeto'] = 'Rakstīt vēstuli';
+$labels['uploadphoto'] = 'Upload photo';
+
+$labels['newcontact']     = 'Izveidot jaunu ierakstu';
+$labels['deletecontact']  = 'Dzēst iezīmētos ierakstus';
+$labels['composeto']      = 'Rakstīt vēstuli';
 $labels['contactsfromto'] = 'Ieraksti $from līdz $to no $count';
-$labels['print'] = 'Drukāt';
-$labels['export'] = 'Eksportēt';
-$labels['exportvcards'] = 'Eksportēt kontaktus vCard formātā';
+$labels['print']          = 'Drukāt';
+$labels['export']         = 'Eksportēt';
+$labels['exportall']      = 'Export all';
+$labels['exportsel']      = 'Export selected';
+$labels['exportvcards']   = 'Eksportēt kontaktus vCard formātā';
 $labels['newcontactgroup'] = 'Izveidot jaunu kontaktu grupu';
-$labels['grouprename'] = 'Pārdēvēt grupu';
-$labels['groupdelete'] = 'Izdzēst grupu';
-$labels['previouspage'] = 'Parādīt iepriekšējo kopu';
-$labels['firstpage'] = 'Parādīt pirmo kopu';
-$labels['nextpage'] = 'Parādīt nākamo kopu';
-$labels['lastpage'] = 'Parādīt pēdējo kopu';
+$labels['grouprename']    = 'Pārdēvēt grupu';
+$labels['groupdelete']    = 'Izdzēst grupu';
+$labels['groupremoveselected'] = 'Remove selected contacts from group';
+
+$labels['previouspage']   = 'Parādīt iepriekšējo kopu';
+$labels['firstpage']      = 'Parādīt pirmo kopu';
+$labels['nextpage']       = 'Parādīt nākamo kopu';
+$labels['lastpage']       = 'Parādīt pēdējo kopu';
+
 $labels['group'] = 'Grupa';
 $labels['groups'] = 'Grupas';
 $labels['personaladrbook'] = 'Personīgās adreses';
+
 $labels['searchsave'] = 'Saglabāt meklēšanas pieprasījumu';
 $labels['searchdelete'] = 'Dzēst saglabāto meklēšanas pieprasījumu';
+
 $labels['import'] = 'Importēt';
 $labels['importcontacts'] = 'Importēt kontaktus';
 $labels['importfromfile'] = 'Importēt no faila:';
 $labels['importtarget'] = 'Pievienot jaunus kontaktus adrešu grāmatai';
 $labels['importreplace'] = 'Aizvietot visu adrešu grāmatu';
+$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['done'] = 'Pabeigts';
+
+// settings
 $labels['settingsfor'] = 'Iestatījumi';
 $labels['about'] = 'Par';
 $labels['preferences'] = 'Iestatījumi';
 $labels['userpreferences'] = 'Lietotāja preferences';
 $labels['editpreferences'] = 'Rediģēt lietotāja preferences';
+
 $labels['identities'] = 'Identitātes';
 $labels['manageidentities'] = 'Rediģēt šī konta identitātes';
 $labels['newidentity'] = 'Jauna identitāte';
+
 $labels['newitem'] = 'Jauns';
 $labels['edititem'] = 'Rediģēt';
+
 $labels['preferhtml'] = 'Dot priekšroku HTML formatētām vēstulēm';
 $labels['defaultcharset'] = 'Noklusētā rakstzīmju kopa';
 $labels['htmlmessage'] = 'HTML vēstule';
+$labels['messagepart'] = 'Part';
+$labels['digitalsig'] = 'Digital Signature';
 $labels['dateformat'] = 'Datuma formāts';
 $labels['timeformat'] = 'Laika formāts';
 $labels['prettydate'] = 'Formatēt datumus';
-$labels['setdefault'] = 'Uzlikt kā noklusēto';
-$labels['autodetect'] = 'Automātiski';
-$labels['language'] = 'Valoda';
-$labels['timezone'] = 'Laika zona';
-$labels['pagesize'] = 'Rindas lapā';
+$labels['setdefault']  = 'Uzlikt kā noklusēto';
+$labels['autodetect']  = 'Automātiski';
+$labels['language']  = 'Valoda';
+$labels['timezone']  = 'Laika zona';
+$labels['pagesize']  = 'Rindas lapā';
 $labels['signature'] = 'Paraksts';
-$labels['dstactive'] = 'Vasaras/ziemas laiks';
+$labels['dstactive']  = 'Vasaras/ziemas laiks';
+$labels['showinextwin'] = 'Open message in a new window';
+$labels['composeextwin'] = 'Compose in a new window';
 $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';
@@ -328,14 +420,16 @@ $labels['readwhendeleted'] = 'Atzīmēt dzēstās vēstules kā izlasītas';
 $labels['flagfordeletion'] = 'Dzēšot marķēt vēstules kā dzēstas, bet nedzēst';
 $labels['skipdeleted'] = 'Nerādīt dzēstās vēstules';
 $labels['deletealways'] = 'Izdzēst vēstules, ja tās neizdodas pārvietot uz miskasti';
+$labels['deletejunk'] = 'Directly delete messages in Junk';
 $labels['showremoteimages'] = 'Rādīt attēlus, kas atrodas uz cita servera';
 $labels['fromknownsenders'] = 'no zināmiem sūtītājiem';
 $labels['always'] = 'vienmēr';
 $labels['showinlineimages'] = 'Rādīt pielikuma attēlus zem vēstules';
-$labels['autosavedraft'] = 'Automātiski saglabāt uzmetumu';
-$labels['everynminutes'] = 'ik pa $n minūti(ēm)';
-$labels['never'] = 'nekad';
-$labels['immediately'] = 'nekavējoties';
+$labels['autosavedraft']  = 'Automātiski saglabāt uzmetumu';
+$labels['everynminutes']  = 'ik pa $n minūti(ēm)';
+$labels['refreshinterval']  = 'Refresh (check for new messages, etc.)';
+$labels['never']  = 'nekad';
+$labels['immediately']  = 'nekavējoties';
 $labels['messagesdisplaying'] = 'Vēstuļu attēlošana';
 $labels['messagescomposition'] = 'Vēstuļu rakstīšana';
 $labels['mimeparamfolding'] = 'Pielikumu nosaukumi';
@@ -349,41 +443,47 @@ $labels['checkallfolders'] = 'Pārbaudīt visas mapes pēc jaunām vēstulēm';
 $labels['displaynext'] = 'Rādīt nākamo vēstuli pēc dzēšanas/pārvietošanas';
 $labels['defaultfont'] = 'Noklusētais fonts vēstulei HTML formātā';
 $labels['mainoptions'] = 'Galvenie iestatījumi';
+$labels['browseroptions'] = 'Browser Options';
 $labels['section'] = 'Kategorija';
 $labels['maintenance'] = 'Uzturēšana';
 $labels['newmessage'] = 'Vēstuļu pienākšana';
 $labels['signatureoptions'] = 'Paraksta iestatījumi';
 $labels['whenreplying'] = 'Atbildot';
+$labels['replyempty'] = 'do not quote the original message';
 $labels['replytopposting'] = 'sākt jaunu vēstuli virs oriģināla';
 $labels['replybottomposting'] = 'sākt jaunu vēstuli zem oriģināla';
 $labels['replyremovesignature'] = 'Atbildot izņemt oriģinālo parakstu no vēstules';
 $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';
+$labels['previewpanemarkread']  = 'Atzīmēt priekšskatītās vēstules kā lasītas';
+$labels['afternseconds']  = 'pēc $n sekundēm';
 $labels['reqmdn'] = 'Vienmēr pieprasīt atskati par vēstules izlasīšanu';
 $labels['reqdsn'] = 'Vienmēr pieprasīt atskati par vēstules piegādāšanu saņēmēja serverim';
 $labels['replysamefolder'] = 'Glabāt atbildes tajā pašā mapē, kurā ir vēstule, uz kuru tika atbildēts';
-$labels['defaultaddressbook'] = 'Pievienot jaunus kontaktus atzīmētajai adrešu grāmatai';
+$labels['defaultabook'] = 'Default address book';
 $labels['autocompletesingle'] = 'Automātiski aizpildot, izlaist alternatīvās e-pasta adreses';
+$labels['listnamedisplay'] = 'List contacts as';
 $labels['spellcheckbeforesend'] = 'Pārbaudīt pareizrakstību pirms vēstules nosūtīšanas';
 $labels['spellcheckoptions'] = 'Pareizrakstības iestatījumi';
 $labels['spellcheckignoresyms'] = 'Ignorēt vārdus, kuri satur simbolus';
 $labels['spellcheckignorenums'] = 'Ignorēt vārdus, kuri satur skaitļus';
 $labels['spellcheckignorecaps'] = 'Ignorēt vārdus, kuri rakstīti ar lielajiem burtiem';
 $labels['addtodict'] = 'Pievienot vārdnīcai';
-$labels['folder'] = 'Mapi';
-$labels['foldername'] = 'Mapes nosaukums';
-$labels['subscribed'] = 'Abonēta';
+$labels['mailtoprotohandler'] = 'Register protocol handler for mailto: links';
+$labels['forwardmode'] = 'Messages forwarding';
+$labels['inline'] = 'inline';
+$labels['asattachment'] = 'as attachment';
+
+$labels['folder']  = 'Mapi';
+$labels['folders']  = 'Mapes';
+$labels['foldername']  = 'Mapes nosaukums';
+$labels['subscribed']  = 'Abonēta';
 $labels['messagecount'] = 'Vēstules';
-$labels['create'] = 'Izveidot';
-$labels['createfolder'] = 'Izveidot jaunu mapi';
-$labels['managefolders'] = 'Rediģēt mapes';
+$labels['create']  = 'Izveidot';
+$labels['createfolder']  = 'Izveidot jaunu mapi';
+$labels['managefolders']  = 'Rediģēt mapes';
 $labels['specialfolders'] = 'Īpašās mapes';
 $labels['properties'] = 'Īpašības';
 $labels['folderproperties'] = 'Mapes īpašības';
@@ -393,22 +493,29 @@ $labels['info'] = 'Informācija';
 $labels['getfoldersize'] = 'Uzklikšķiniet, lai uzzinātu mapes izmēru';
 $labels['changesubscription'] = 'Uzklikšķiniet, lai mainītu abonēšanu';
 $labels['foldertype'] = 'Mapes veids';
-$labels['personalfolder'] = 'Privāta mape';
-$labels['otherfolder'] = 'Cita lietotāja mape';
-$labels['sharedfolder'] = 'Publiska mape';
+$labels['personalfolder']  = 'Privāta mape';
+$labels['otherfolder']  = 'Cita lietotāja mape';
+$labels['sharedfolder']  = 'Publiska mape';
+
 $labels['sortby'] = 'Kārtot pēc';
-$labels['sortasc'] = 'Kārtot augošā secībā';
+$labels['sortasc']  = 'Kārtot augošā secībā';
 $labels['sortdesc'] = 'Kārtot dilstošā secībā';
 $labels['undo'] = 'Atsaukt';
+
+$labels['installedplugins'] = 'Installed plugins';
 $labels['plugin'] = 'Spraudnis';
 $labels['version'] = 'Versija';
 $labels['source'] = 'Oriģināls';
 $labels['license'] = 'Licence';
 $labels['support'] = 'Atbalsts';
+
+// units
 $labels['B'] = 'B';
 $labels['KB'] = 'kB';
 $labels['MB'] = 'MB';
 $labels['GB'] = 'GB';
+
+// character sets
 $labels['unicode'] = 'Unikoda';
 $labels['english'] = 'Angļu';
 $labels['westerneuropean'] = 'Rietumeiropas';
@@ -428,3 +535,4 @@ $labels['japanese'] = 'Japāņu';
 $labels['korean'] = 'Korejiešu';
 $labels['chinese'] = 'Ķīniešu';
 
+?>
diff --git a/program/localization/lv_LV/messages.inc b/program/localization/lv_LV/messages.inc
index e42998dd9..b69a73e2b 100644
--- a/program/localization/lv_LV/messages.inc
+++ b/program/localization/lv_LV/messages.inc
@@ -2,96 +2,104 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/lv_LV/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$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['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['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['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['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['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['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ē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, 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['nonamewarning'] = 'Lūdzu ievadiet vārdu';
+$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['nosubjectwarning']  = 'Lauks "temats" ir tukšs. Vai vēlaties to aizpildīt tagad?';
+$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';
@@ -113,8 +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'] = 'Grupā nekas netika mainīts.';
 $messages['importwait'] = 'Importēju, lūdzu uzgaidiet...';
-$messages['importerror'] = 'Imports neizdevās! Augšupielādētais fails nav korekts vCard fails';
+$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!';
@@ -156,4 +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'] = '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 81aa13927..bb9606e6a 100755
--- a/program/localization/mk_MK/labels.inc
+++ b/program/localization/mk_MK/labels.inc
@@ -2,52 +2,78 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/mk_MK/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = 'Добредојдовте во $product';
-$labels['username'] = 'Корисничко име';
-$labels['password'] = 'Лозинка';
-$labels['server'] = 'Сервер';
-$labels['login'] = 'Најава';
-$labels['logout'] = 'Одјава';
-$labels['mail'] = 'Е-пошта';
+
+// login page
+$labels['welcome']   = 'Добредојдовте во $product';
+$labels['username']  = 'Корисничко име';
+$labels['password']  = 'Лозинка';
+$labels['server']    = 'Сервер';
+$labels['login']     = 'Најава';
+
+// taskbar
+$labels['logout']   = 'Одјава';
+$labels['mail']     = 'Е-пошта';
 $labels['settings'] = 'Нагодувања';
 $labels['addressbook'] = 'Именик';
-$labels['inbox'] = 'Примени';
+
+// mailbox names
+$labels['inbox']  = 'Примени';
 $labels['drafts'] = 'Непратени';
-$labels['sent'] = 'Пратени';
-$labels['trash'] = 'Корпа';
-$labels['junk'] = 'Ѓубре';
+$labels['sent']   = 'Пратени';
+$labels['trash']  = 'Корпа';
+$labels['junk']   = 'Ѓубре';
+
+// message listing
 $labels['subject'] = 'Наслов';
-$labels['from'] = 'Праќач';
-$labels['to'] = 'Примач';
-$labels['cc'] = 'Копирај';
-$labels['bcc'] = 'Bcc';
+$labels['from']    = 'Праќач';
+$labels['sender']  = 'Sender';
+$labels['to']      = 'Примач';
+$labels['cc']      = 'Копирај';
+$labels['bcc']     = 'Bcc';
 $labels['replyto'] = 'Препрати на';
-$labels['date'] = 'Датум';
-$labels['size'] = 'Големина';
+$labels['followupto'] = 'Followup-To';
+$labels['date']    = 'Датум';
+$labels['size']    = 'Големина';
 $labels['priority'] = 'Приоритет';
 $labels['organization'] = 'Организација';
+$labels['readstatus'] = 'Read status';
+$labels['listoptions'] = 'List options...';
+
 $labels['mailboxlist'] = 'Папки';
-$labels['folders'] = 'Папки';
 $labels['messagesfromto'] = 'Писма од $from до $to од $count';
+$labels['threadsfromto'] = 'Threads $from to $to of $count';
 $labels['messagenrof'] = 'Писмо $nr од $count';
-$labels['copy'] = 'Копирај';
-$labels['moveto'] = 'Премести во...';
+$labels['fromtoshort'] = '$from – $to of $count';
+
+$labels['copy']     = 'Копирај';
+$labels['move']     = 'Move';
+$labels['moveto']   = 'Премести во...';
 $labels['download'] = 'Преземи';
+$labels['open']     = 'Open';
+$labels['showattachment'] = 'Show';
+$labels['showanyway'] = 'Show it anyway';
+
 $labels['filename'] = 'Име на податотеката';
 $labels['filesize'] = 'Големина на податотеката';
+
 $labels['addtoaddressbook'] = 'Додај во именик';
+
+// weekdays short
 $labels['sun'] = 'Нед';
 $labels['mon'] = 'Пон';
 $labels['tue'] = 'Вто';
@@ -55,161 +81,328 @@ $labels['wed'] = 'Сре';
 $labels['thu'] = 'Чет';
 $labels['fri'] = 'Пет';
 $labels['sat'] = 'Саб';
-$labels['sunday'] = 'Недела';
-$labels['monday'] = 'Понеделник';
-$labels['tuesday'] = 'Вторник';
+
+// weekdays long
+$labels['sunday']    = 'Недела';
+$labels['monday']    = 'Понеделник';
+$labels['tuesday']   = 'Вторник';
 $labels['wednesday'] = 'Среда';
-$labels['thursday'] = 'Четврток';
-$labels['friday'] = 'Петок';
-$labels['saturday'] = 'Сабота';
-$labels['jan'] = 'Јан';
-$labels['feb'] = 'Фев';
-$labels['mar'] = 'Мар';
-$labels['apr'] = 'Апр';
-$labels['may'] = 'Мај';
-$labels['longmay'] = 'Мај';
-$labels['jun'] = 'Јун';
-$labels['jul'] = 'Јул';
-$labels['aug'] = 'Авг';
-$labels['sep'] = 'Сеп';
-$labels['oct'] = 'Окт';
-$labels['nov'] = 'Ное';
-$labels['dec'] = 'Дек';
-$labels['longjan'] = 'Јануари';
-$labels['longfeb'] = 'Февруари';
-$labels['longmar'] = 'Март';
-$labels['longapr'] = 'Април';
-$labels['longjun'] = 'Јуни';
-$labels['longjul'] = 'Јули';
-$labels['longaug'] = 'Август';
-$labels['longsep'] = 'Септември';
-$labels['longoct'] = 'Октомври';
-$labels['longnov'] = 'Ноември';
-$labels['longdec'] = 'Декември';
+$labels['thursday']  = 'Четврток';
+$labels['friday']    = 'Петок';
+$labels['saturday']  = 'Сабота';
+
+// months short
+$labels['jan']	= 'Јан';
+$labels['feb']	= 'Фев';
+$labels['mar']	= 'Мар';
+$labels['apr']	= 'Апр';
+$labels['may']	= 'Мај';
+$labels['jun']	= 'Јун';
+$labels['jul'] 	= 'Јул';
+$labels['aug']	= 'Авг';
+$labels['sep']	= 'Сеп';
+$labels['oct']	= 'Окт';
+$labels['nov']	= 'Ное';
+$labels['dec']	= 'Дек';
+
+// months long
+$labels['longjan']	= 'Јануари';
+$labels['longfeb']	= 'Февруари';
+$labels['longmar']	= 'Март';
+$labels['longapr']	= 'Април';
+$labels['longmay']	= 'Мај';
+$labels['longjun']	= 'Јуни';
+$labels['longjul']	= 'Јули';
+$labels['longaug']	= 'Август';
+$labels['longsep']	= 'Септември';
+$labels['longoct']	= 'Октомври';
+$labels['longnov']	= 'Ноември';
+$labels['longdec']	= 'Декември';
+
 $labels['today'] = 'Денес';
-$labels['checkmail'] = 'Провери пошта';
-$labels['compose'] = 'Пиши ново писмо';
-$labels['writenewmessage'] = 'Ново писмо';
-$labels['replytomessage'] = 'Одговори на испраќачот';
+
+// toolbar buttons
+$labels['refresh']          = 'Refresh';
+$labels['checkmail']        = 'Провери пошта';
+$labels['compose']          = 'Пиши ново писмо';
+$labels['writenewmessage']  = 'Ново писмо';
+$labels['reply']            = 'Reply';
+$labels['replytomessage']   = 'Одговори на испраќачот';
 $labels['replytoallmessage'] = 'Одговори на испраќачот и сите примачи';
-$labels['forwardmessage'] = 'Препрати писмо';
-$labels['deletemessage'] = 'Избриши писмо';
+$labels['replyall']         = 'Reply all';
+$labels['replylist']        = 'Reply list';
+$labels['forward']          = 'Forward';
+$labels['forwardinline']    = 'Forward inline';
+$labels['forwardattachment'] = 'Forward as attachment';
+$labels['forwardmessage']   = 'Препрати писмо';
+$labels['deletemessage']    = 'Избриши писмо';
 $labels['movemessagetotrash'] = 'Премести ги писмата во Корпа';
-$labels['printmessage'] = 'Испечати писмо';
-$labels['previousmessage'] = 'Прикажи го претходното писмо';
-$labels['firstmessage'] = 'Прикажи го првото писмо';
-$labels['nextmessage'] = 'Прикажи го следното писмо';
-$labels['lastmessage'] = 'Прикажи го последното писмо';
-$labels['backtolist'] = 'Назад кон листа на писма';
-$labels['viewsource'] = 'Покажи го изворот на писмото';
-$labels['markmessages'] = 'Обележи ги писмата';
-$labels['markread'] = 'Како прочитани';
-$labels['markunread'] = 'Како непрочитани';
-$labels['markflagged'] = 'Како обележано';
-$labels['markunflagged'] = 'Како необележано';
+$labels['printmessage']     = 'Испечати писмо';
+$labels['previousmessage']  = 'Прикажи го претходното писмо';
+$labels['firstmessage']     = 'Прикажи го првото писмо';
+$labels['nextmessage']      = 'Прикажи го следното писмо';
+$labels['lastmessage']      = 'Прикажи го последното писмо';
+$labels['backtolist']       = 'Назад кон листа на писма';
+$labels['viewsource']       = 'Покажи го изворот на писмото';
+$labels['mark']             = 'Mark';
+$labels['markmessages']     = 'Обележи ги писмата';
+$labels['markread']         = 'Како прочитани';
+$labels['markunread']       = 'Како непрочитани';
+$labels['markflagged']      = 'Како обележано';
+$labels['markunflagged']    = 'Како необележано';
+$labels['moreactions']      = 'More actions...';
+$labels['more']             = 'More';
+$labels['back']             = 'Back';
+$labels['options']          = 'Options';
+
 $labels['select'] = 'Одбери';
 $labels['all'] = 'Сите';
 $labels['none'] = 'Ниедно';
-$labels['nonesort'] = 'Ниедно';
+$labels['currpage'] = 'Current page';
 $labels['unread'] = 'Непрочитани';
 $labels['flagged'] = 'Обележано';
 $labels['unanswered'] = 'Неодговорено';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Избришано';
+$labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'Обратно';
 $labels['filter'] = 'Филтер';
+$labels['list'] = 'List';
+$labels['threads'] = 'Threads';
+$labels['expand-all'] = 'Expand All';
+$labels['expand-unread'] = 'Expand Unread';
+$labels['collapse-all'] = 'Collapse All';
+$labels['threaded'] = 'Threaded';
+
+$labels['autoexpand_threads'] = 'Expand message threads';
+$labels['do_expand'] = 'all threads';
+$labels['expand_only_unread'] = 'only with unread messages';
+$labels['fromto'] = 'From/To';
+$labels['flag'] = 'Flag';
+$labels['attachment'] = 'Attachment';
+$labels['nonesort'] = 'Ниедно';
+$labels['sentdate'] = 'Sent date';
+$labels['arrival'] = 'Arrival date';
+$labels['asc'] = 'ascending';
+$labels['desc'] = 'descending';
+$labels['listcolumns'] = 'List columns';
+$labels['listsorting'] = 'Sorting column';
+$labels['listorder'] = 'Sorting order';
+$labels['listmode'] = 'List view mode';
+
+$labels['folderactions'] = 'Folder actions...';
 $labels['compact'] = 'Компактно';
 $labels['empty'] = 'Испразни';
+
 $labels['quota'] = 'Искористен простор';
-$labels['unknown'] = 'непознато';
-$labels['unlimited'] = 'неограничено';
-$labels['quicksearch'] = 'Брзо пребарување';
-$labels['resetsearch'] = 'Ново пребарување';
-$labels['searchmod'] = 'Модификатори на пребарувањето';
-$labels['msgtext'] = 'Цело писмо';
+$labels['unknown']  = 'непознато';
+$labels['unlimited']  = 'неограничено';
+
+$labels['quicksearch']  = 'Брзо пребарување';
+$labels['resetsearch']  = 'Ново пребарување';
+$labels['searchmod']  = 'Модификатори на пребарувањето';
+$labels['msgtext']  = 'Цело писмо';
+$labels['body']  = 'Body';
+
 $labels['openinextwin'] = 'Отвори во нов прозорец';
 $labels['emlsave'] = 'Преземи (.eml)';
-$labels['editasnew'] = 'Уреди како ново';
-$labels['sendmessage'] = 'Испрати сега';
-$labels['savemessage'] = 'Зачувај го писмото во Непратени';
-$labels['addattachment'] = 'Приложи податотека';
-$labels['charset'] = 'Збир од знаци';
-$labels['editortype'] = 'Тип на уредник';
-$labels['returnreceipt'] = 'Врати';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
+
+// message compose
+$labels['editasnew']      = 'Уреди како ново';
+$labels['send']           = 'Send';
+$labels['sendmessage']    = 'Испрати сега';
+$labels['savemessage']    = 'Зачувај го писмото во Непратени';
+$labels['addattachment']  = 'Приложи податотека';
+$labels['charset']        = 'Збир од знаци';
+$labels['editortype']     = 'Тип на уредник';
+$labels['returnreceipt']  = 'Врати';
+$labels['dsn']            = 'Delivery status notification';
+$labels['mailreplyintro'] = 'On $date, $sender wrote:';
+$labels['originalmessage'] = 'Original Message';
+
+$labels['editidents']    = 'Edit identities';
+$labels['spellcheck']    = 'Spell';
 $labels['checkspelling'] = 'Провери правопис';
 $labels['resumeediting'] = 'Продолжи со уредување';
-$labels['revertto'] = 'Врати на';
+$labels['revertto']      = 'Врати на';
+
+$labels['attach'] = 'Attach';
 $labels['attachments'] = 'Приложено';
 $labels['upload'] = 'Подигни';
-$labels['close'] = 'Затвори';
-$labels['low'] = 'Низок';
-$labels['lowest'] = 'Најнизок';
-$labels['normal'] = 'Нормален';
-$labels['high'] = 'Висок';
+$labels['uploadprogress'] = '$percent ($current from $total)';
+$labels['close']  = 'Затвори';
+$labels['messageoptions']  = 'Message options...';
+
+$labels['low']     = 'Низок';
+$labels['lowest']  = 'Најнизок';
+$labels['normal']  = 'Нормален';
+$labels['high']    = 'Висок';
 $labels['highest'] = 'Највисок';
-$labels['nosubject'] = '(без наслов)';
+
+$labels['nosubject']  = '(без наслов)';
 $labels['showimages'] = 'Прикажи слики';
 $labels['alwaysshow'] = 'Секогаш прикажувај ги сликите од $sender';
+$labels['isdraft']    = 'This is a draft message.';
+$labels['andnmore']   = '$nr more...';
+$labels['togglemoreheaders'] = 'Show more message headers';
+$labels['togglefullheaders'] = 'Toggle raw message headers';
+
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Обичен текст';
 $labels['savesentmessagein'] = 'Сними го пратеното писмо во';
 $labels['dontsave'] = 'не зачувувај';
 $labels['maxuploadsize'] = 'Максималната дозволена големина за податотеката е $size';
+
 $labels['addcc'] = 'Додај Cc';
 $labels['addbcc'] = 'Додај Bcc';
 $labels['addreplyto'] = 'Додај Одговори-на';
+$labels['addfollowupto'] = 'Add Followup-To';
+
+// mdn
 $labels['mdnrequest'] = 'Праќачот на оваа порака сака да биде известен кога ќе го прочитате писмото. Дали сакате да го известите?';
 $labels['receiptread'] = 'Извести (прочитано)';
 $labels['yourmessage'] = 'Ова е известување за вашата порака';
 $labels['receiptnote'] = 'Напомена: Ова известување само потврдува дека писмото кое сте го пратиле е отворено. Не е гаранција дека примачот го прочитал или разбрал истото.';
-$labels['name'] = 'Име за приказ';
-$labels['firstname'] = 'Име';
-$labels['surname'] = 'Презиме';
-$labels['email'] = 'Е-пошта';
+
+// address boook
+$labels['name']         = 'Име за приказ';
+$labels['firstname']    = 'Име';
+$labels['surname']      = 'Презиме';
+$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['email']        = 'Е-пошта';
+$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['typepager']  = 'Pager';
+$labels['typevideo']  = 'Video';
+$labels['typeassistant']  = 'Assistant';
+$labels['typehomepage']  = 'Home Page';
+$labels['typeblog'] = 'Blog';
+$labels['typeprofile'] = 'Profile';
+
+$labels['addfield'] = 'Add field...';
 $labels['addcontact'] = 'Додај нов контакт';
 $labels['editcontact'] = 'Уреди контакт';
-$labels['edit'] = 'Уреди';
+$labels['contacts'] = 'Contacts';
+$labels['contactproperties'] = 'Contact properties';
+$labels['personalinfo'] = 'Personal information';
+
+$labels['edit']   = 'Уреди';
 $labels['cancel'] = 'Откажи';
-$labels['save'] = 'Зачувај';
+$labels['save']   = 'Зачувај';
 $labels['delete'] = 'Избриши';
-$labels['newcontact'] = 'Додај ново име';
-$labels['deletecontact'] = 'Избриши ги следните имиња';
-$labels['composeto'] = 'Напиши порака за';
+$labels['rename'] = 'Rename';
+$labels['addphoto'] = 'Add';
+$labels['replacephoto'] = 'Replace';
+$labels['uploadphoto'] = 'Upload photo';
+
+$labels['newcontact']     = 'Додај ново име';
+$labels['deletecontact']  = 'Избриши ги следните имиња';
+$labels['composeto']      = 'Напиши порака за';
 $labels['contactsfromto'] = 'Имиња од $from до $to од $count';
-$labels['print'] = 'Испечати';
-$labels['export'] = 'Извези како';
-$labels['exportvcards'] = 'Извези ги контактите во vCard формат';
-$labels['previouspage'] = 'Прикажи претходна страна';
-$labels['firstpage'] = 'Прикажи ја првата страна';
-$labels['nextpage'] = 'Прикажи ја следната страна';
-$labels['lastpage'] = 'Прикажи ја последната страна';
+$labels['print']          = 'Испечати';
+$labels['export']         = 'Извези како';
+$labels['exportall']      = 'Export all';
+$labels['exportsel']      = 'Export selected';
+$labels['exportvcards']   = 'Извези ги контактите во vCard формат';
+$labels['newcontactgroup'] = 'Create new contact group';
+$labels['grouprename']    = 'Rename group';
+$labels['groupdelete']    = 'Delete group';
+$labels['groupremoveselected'] = 'Remove selected contacts from group';
+
+$labels['previouspage']   = 'Прикажи претходна страна';
+$labels['firstpage']      = 'Прикажи ја првата страна';
+$labels['nextpage']       = 'Прикажи ја следната страна';
+$labels['lastpage']       = 'Прикажи ја последната страна';
+
+$labels['group'] = 'Group';
 $labels['groups'] = 'Групи';
 $labels['personaladrbook'] = 'Лични адреси';
+
+$labels['searchsave'] = 'Save search';
+$labels['searchdelete'] = 'Delete search';
+
 $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['done'] = 'Завршено';
+
+// settings
 $labels['settingsfor'] = 'Нагодувања за';
+$labels['about'] = 'About';
 $labels['preferences'] = 'Нагодувања';
 $labels['userpreferences'] = 'Кориснички нагодувања';
 $labels['editpreferences'] = 'Промени кориснички нагодувања';
+
 $labels['identities'] = 'Идентитети';
 $labels['manageidentities'] = 'Организирај ги идентитетите за овој корисник';
 $labels['newidentity'] = 'Нов идентитет';
+
 $labels['newitem'] = 'Нов објект';
 $labels['edititem'] = 'Промени објект';
+
 $labels['preferhtml'] = 'Прикажи во HTML';
+$labels['defaultcharset'] = 'Default Character Set';
 $labels['htmlmessage'] = 'HTML писмо';
+$labels['messagepart'] = 'Part';
+$labels['digitalsig'] = 'Digital Signature';
+$labels['dateformat'] = 'Date format';
+$labels['timeformat'] = 'Time format';
 $labels['prettydate'] = 'Убави датуми';
-$labels['setdefault'] = 'Постави за основно';
-$labels['autodetect'] = 'Автоматски';
-$labels['language'] = 'Јазик';
-$labels['timezone'] = 'Часовна зона';
-$labels['pagesize'] = 'Редови по страна';
+$labels['setdefault']  = 'Постави за основно';
+$labels['autodetect']  = 'Автоматски';
+$labels['language']  = 'Јазик';
+$labels['timezone']  = 'Часовна зона';
+$labels['pagesize']  = 'Редови по страна';
 $labels['signature'] = 'Потпис';
-$labels['dstactive'] = 'Промени на времето';
+$labels['dstactive']  = 'Промени на времето';
+$labels['showinextwin'] = 'Open message in a new window';
+$labels['composeextwin'] = 'Compose in a new window';
 $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'] = 'Исчисти ја Кантата при излез';
@@ -220,56 +413,126 @@ $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'] = 'If moving messages to Trash fails, delete them';
+$labels['deletejunk'] = 'Directly delete messages in Junk';
 $labels['showremoteimages'] = 'Прикажи вметнати слики';
 $labels['fromknownsenders'] = 'од познати праќачи';
 $labels['always'] = 'секогаш';
 $labels['showinlineimages'] = 'Прикажи приложени слики под писмото';
-$labels['autosavedraft'] = 'Авоматски зачувувај во Непратени';
-$labels['everynminutes'] = 'секои $n минути';
-$labels['never'] = 'никогаш';
+$labels['autosavedraft']  = 'Авоматски зачувувај во Непратени';
+$labels['everynminutes']  = 'секои $n минути';
+$labels['refreshinterval']  = 'Refresh (check for new messages, etc.)';
+$labels['never']  = 'никогаш';
+$labels['immediately']  = 'immediately';
 $labels['messagesdisplaying'] = 'Прикажување на писма';
 $labels['messagescomposition'] = 'Пишување на писма';
 $labels['mimeparamfolding'] = 'Име на прикачените податотеки';
 $labels['2231folding'] = 'Полн RFC 2231 (Thunderbird)';
 $labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
 $labels['2047folding'] = 'Полн RFC 2047 (друго)';
+$labels['force7bit'] = 'Use MIME encoding for 8-bit characters';
 $labels['advancedoptions'] = 'Напредни можности';
 $labels['focusonnewmessage'] = 'Фокусирај го прозорецот на прелистувачот на новото писмо';
 $labels['checkallfolders'] = 'Провери ги сите папки за нови писма';
 $labels['displaynext'] = 'По бришење/преместување на писмото прикажи го следното писмо';
+$labels['defaultfont'] = 'Default font of HTML message';
 $labels['mainoptions'] = 'Главни можности';
+$labels['browseroptions'] = 'Browser Options';
 $labels['section'] = 'Заглавие';
 $labels['maintenance'] = 'Одржување';
 $labels['newmessage'] = 'Ново писмо';
 $labels['signatureoptions'] = 'Можности за потписот';
 $labels['whenreplying'] = 'При одговарање';
+$labels['replyempty'] = 'do not quote the original message';
 $labels['replytopposting'] = 'новото писмо започни го над оригиналот';
 $labels['replybottomposting'] = 'новото писмо започни го под оригиналот';
 $labels['replyremovesignature'] = 'При одговарање отстрани го изворниот потпис од писмото';
 $labels['autoaddsignature'] = 'Автоматски додавај потпис';
 $labels['newmessageonly'] = 'само нови писма';
 $labels['replyandforwardonly'] = 'само одгорови и препраќања';
-$labels['replysignaturepos'] = 'При одговарање или препраќање стави потпис';
-$labels['belowquote'] = 'под цитираното';
-$labels['abovequote'] = 'над цитираното';
 $labels['insertsignature'] = 'Вметни потпис';
-$labels['folder'] = 'Папка';
-$labels['foldername'] = 'Име на папката';
-$labels['subscribed'] = 'Претплатен';
+$labels['previewpanemarkread']  = 'Mark previewed messages as read';
+$labels['afternseconds']  = 'after $n seconds';
+$labels['reqmdn'] = 'Always request a return receipt';
+$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'] = 'Check spelling before sending a message';
+$labels['spellcheckoptions'] = 'Spellcheck Options';
+$labels['spellcheckignoresyms'] = 'Ignore words with symbols';
+$labels['spellcheckignorenums'] = 'Ignore words with numbers';
+$labels['spellcheckignorecaps'] = 'Ignore words with all letters capitalized';
+$labels['addtodict'] = 'Add to dictionary';
+$labels['mailtoprotohandler'] = 'Register protocol handler for mailto: links';
+$labels['forwardmode'] = 'Messages forwarding';
+$labels['inline'] = 'inline';
+$labels['asattachment'] = 'as attachment';
+
+$labels['folder']  = 'Папка';
+$labels['folders']  = 'Папки';
+$labels['foldername']  = 'Име на папката';
+$labels['subscribed']  = 'Претплатен';
 $labels['messagecount'] = 'Пораки';
-$labels['create'] = 'Создај';
-$labels['createfolder'] = 'Создај нова папка';
-$labels['managefolders'] = 'Организирање на папки';
+$labels['create']  = 'Создај';
+$labels['createfolder']  = 'Создај нова папка';
+$labels['managefolders']  = 'Организирање на папки';
 $labels['specialfolders'] = 'Специјални папки';
+$labels['properties'] = 'Properties';
+$labels['folderproperties'] = 'Folder properties';
+$labels['parentfolder'] = 'Parent folder';
+$labels['location'] = 'Location';
+$labels['info'] = 'Information';
+$labels['getfoldersize'] = 'Click to get folder size';
+$labels['changesubscription'] = 'Click to change subscription';
+$labels['foldertype'] = 'Folder Type';
+$labels['personalfolder']  = 'Private Folder';
+$labels['otherfolder']  = 'Other User\'s Folder';
+$labels['sharedfolder']  = 'Public Folder';
+
 $labels['sortby'] = 'Сортирај по';
-$labels['sortasc'] = 'Сортирај нагорно';
+$labels['sortasc']  = 'Сортирај нагорно';
 $labels['sortdesc'] = 'Сортирај надолно';
+$labels['undo'] = 'Undo';
+
+$labels['installedplugins'] = 'Installed plugins';
+$labels['plugin'] = 'Plugin';
+$labels['version'] = 'Version';
+$labels['source'] = 'Source';
+$labels['license'] = 'License';
+$labels['support'] = 'Get support';
+
+// units
 $labels['B'] = 'Б';
 $labels['KB'] = 'КБ';
 $labels['MB'] = 'МБ';
 $labels['GB'] = 'ГБ';
 
+// character sets
+$labels['unicode'] = 'Unicode';
+$labels['english'] = '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['turkish'] = 'Turkish';
+$labels['nordic'] = 'Nordic';
+$labels['thai'] = 'Thai';
+$labels['celtic'] = 'Celtic';
+$labels['vietnamese'] = 'Vietnamese';
+$labels['japanese'] = 'Japanese';
+$labels['korean'] = 'Korean';
+$labels['chinese'] = 'Chinese';
+
+?>
diff --git a/program/localization/mk_MK/messages.inc b/program/localization/mk_MK/messages.inc
index 65f83e366..f7a8d9a12 100755
--- a/program/localization/mk_MK/messages.inc
+++ b/program/localization/mk_MK/messages.inc
@@ -2,30 +2,43 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/mk_MK/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['loginfailed'] = 'Најавата не успеа';
+$messages['errortitle']  = 'An error occurred!';
+$messages['loginfailed']  = 'Најавата не успеа';
 $messages['cookiesdisabled'] = 'Вашиот прелистувач не прифаќа колачиња';
 $messages['sessionerror'] = 'Сесијата е неважечка или е истечена';
 $messages['storageerror'] = 'Поврзувањето со IMAP не успеа';
 $messages['servererror'] = 'Грешка во серверот!';
+$messages['servererrormsg'] = 'Server Error: $msg';
+$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'] = 'Немате писма во ова сандаче';
 $messages['loggedout'] = 'Успешно се одјавивте. Ви благодариме и довидување!';
 $messages['mailboxempty'] = 'Поштенското сандаче е празно.';
+$messages['refreshing'] = 'Refreshing...';
 $messages['loading'] = 'Вчитувам...';
 $messages['uploading'] = 'Ја подигам податотеката...';
+$messages['uploadingmany'] = 'Uploading files...';
 $messages['loadingdata'] = 'Ги вчитувам податоците...';
 $messages['checkingmail'] = 'Проверувам нова пошта...';
 $messages['sendingmessage'] = 'Ја испраќам пораката...';
@@ -35,41 +48,54 @@ $messages['messagesaved'] = 'Пораката е зачувана во Непр�
 $messages['successfullysaved'] = 'Успешно зачувано';
 $messages['addedsuccessfully'] = 'Името е успешно додадено во Именикот';
 $messages['contactexists'] = 'Веќе постои име со зададената Е-поштенска адреса';
+$messages['contactnameexists'] = 'A contact with the same name already exists.';
 $messages['blockedimages'] = 'За да се заштити вашата приватност, сликите во оваа порака не се прикажани.';
 $messages['encryptedmessage'] = 'Оваа порака е кодирана и не може да се прикаже. Жалиме!';
 $messages['nocontactsfound'] = 'Нема пронајдено имиња.';
 $messages['contactnotfound'] = 'Бараното име не е пронајдено';
+$messages['contactsearchonly'] = 'Enter some search terms to find contacts';
 $messages['sendingfailed'] = 'Не упеав да го испратам писмото';
 $messages['senttooquickly'] = 'Почекајте $sec секунда/и пред да го испратите писмото';
 $messages['errorsavingsent'] = 'Грешка при зачувувањето на пратеното писмо';
 $messages['errorsaving'] = 'Грешка при зачувувањето';
 $messages['errormoving'] = 'Не можев да го преместам писмото';
+$messages['errorcopying'] = 'Could not copy the message(s).';
 $messages['errordeleting'] = 'Не можев да го избришам писмото';
 $messages['errormarking'] = 'Не можев да го обележам писмото';
-$messages['deletecontactconfirm'] = 'Дали сте сигурни дека сакате да го избришете одбраното(те) име(ња)?';
+$messages['deletecontactconfirm']  = 'Дали сте сигурни дека сакате да го избришете одбраното(те) име(ња)?';
+$messages['deletegroupconfirm']  = 'Do you really want to delete selected group?';
 $messages['deletemessagesconfirm'] = 'Дали сте сигурни дека сакате да го(и) избришете обележаниот(те) писмо(а)?';
-$messages['deletefolderconfirm'] = 'Дали сте сигурни дека сакате да ја избришете оваа папка?';
-$messages['purgefolderconfirm'] = 'Дали сте сигурни дека сакате да ги избршете сите писма во оваа папка?';
+$messages['deletefolderconfirm']  = 'Дали сте сигурни дека сакате да ја избришете оваа папка?';
+$messages['purgefolderconfirm']  = 'Дали сте сигурни дека сакате да ги избршете сите писма во оваа папка?';
+$messages['contactdeleting'] = 'Deleting contact(s)...';
+$messages['groupdeleting'] = 'Deleting group...';
 $messages['folderdeleting'] = 'Ја бришам папката...';
 $messages['foldermoving'] = 'Ја преместувам папката...';
+$messages['foldersubscribing'] = 'Subscribing folder...';
+$messages['folderunsubscribing'] = 'Unsubscribing folder...';
 $messages['formincomplete'] = 'Имате изоставено непополнети информации';
 $messages['noemailwarning'] = 'Внесете валидна е-поштенска адреса';
-$messages['nonamewarning'] = 'Внесете име';
+$messages['nonamewarning']  = 'Внесете име';
 $messages['nopagesizewarning'] = 'Внесете големина на страницата';
 $messages['nosenderwarning'] = 'Внесете адреса на праќачот';
 $messages['norecipientwarning'] = 'Внесете барем еден примач';
-$messages['nosubjectwarning'] = 'Немате внесено „Наслов“. Дали сакате да внесете?';
+$messages['nosubjectwarning']  = 'Немате внесено „Наслов“. Дали сакате да внесете?';
 $messages['nobodywarning'] = 'Писмото нема текст во него. Дали сакате да го испратите?';
 $messages['notsentwarning'] = 'Писмото не е пратено. Дали сакате да го отфрлите?';
 $messages['noldapserver'] = 'Изберете LDAP сервер за пребарување';
 $messages['nosearchname'] = 'Внесете име или е-поштенска адреса';
 $messages['notuploadedwarning'] = 'Сè уште нема подигнати прилози. Почекајте или откажете го подигањето';
 $messages['searchsuccessful'] = 'Пронајадени се $nr пораки';
+$messages['contactsearchsuccessful'] = '$nr contacts found.';
 $messages['searchnomatch'] = 'Пребарувањето не даде резлутати';
 $messages['searching'] = 'Пребарувам....';
 $messages['checking'] = 'Проверувам...';
 $messages['nospellerrors'] = 'Нема грешки во спелувањето';
 $messages['folderdeleted'] = 'Папката е успешно избришана';
+$messages['foldersubscribed'] = 'Folder successfully subscribed.';
+$messages['folderunsubscribed'] = 'Folder successfully unsubscribed.';
+$messages['folderpurged'] = 'Folder has successfully been emptied.';
+$messages['folderexpunged'] = 'Folder has successfully been compacted.';
 $messages['deletedsuccessfully'] = 'Успешно избришано';
 $messages['converting'] = 'Форматирањето на писмото е отстрането...';
 $messages['messageopenerror'] = 'Не можев да го вчитам писното од серверот';
@@ -80,15 +106,26 @@ $messages['copyerror'] = 'Не можам да ги копирам адреси�
 $messages['sourceisreadonly'] = 'Изворот на оваа адреса неможе да се промени';
 $messages['errorsavingcontact'] = 'Името неможе да се сними';
 $messages['movingmessage'] = 'Пораката се преместува...';
+$messages['copyingmessage'] = 'Copying message(s)...';
+$messages['copyingcontact'] = 'Copying contact(s)...';
+$messages['deletingmessage'] = 'Deleting message(s)...';
+$messages['markingmessage'] = 'Marking message(s)...';
+$messages['addingmember'] = 'Adding contact(s) to the group...';
+$messages['removingmember'] = 'Removing contact(s) from the group...';
 $messages['receiptsent'] = 'Известувањето е успешно пратено';
 $messages['errorsendingreceipt'] = 'Известувањето не е пратено';
+$messages['deleteidentityconfirm'] = 'Do you really want to delete this identity?';
 $messages['nodeletelastidentity'] = 'Овој идентитет неможе да се избрише, тој е последниот.';
 $messages['forbiddencharacter'] = 'Името на папката содржи несоодветен формат';
 $messages['selectimportfile'] = 'Изберете ја податотеката која сакате да ја прикачите';
 $messages['addresswriterror'] = 'Одбраниот именик не може да се менува';
+$messages['contactaddedtogroup'] = 'Successfully added the contacts to this group.';
+$messages['contactremovedfromgroup'] = 'Successfully removed contacts from this group.';
+$messages['nogroupassignmentschanged'] = 'No group assignments changed.';
 $messages['importwait'] = 'Убезувам,, почекајте...';
-$messages['importerror'] = 'Увезувањето не неуспешно! Прикачената податотека не е важечки vCard документ.';
+$messages['importformaterror'] = 'Import failed! The uploaded file is not a valid import data file.';
 $messages['importconfirm'] = '<b>Успешно се увезени $inserted имиња, $skipped веќе постојат и се прескокнати</b>:<p><em>$names</em></p>';
+$messages['importconfirmskipped'] = '<b>Skipped $skipped existing entries</b>';
 $messages['opnotpermitted'] = 'Операцијата не е дозволена';
 $messages['nofromaddress'] = 'Не е внесена е-пошта во одберениот идентитет';
 $messages['editorwarning'] = 'Префрлањето на уредникот на обичен текст ќе резултира со губење на целото форматирање на текстот. Дали сакате да продолжите?';
@@ -100,4 +137,35 @@ $messages['smtptoerror'] = 'SMTP грешка ($code): Не успеав да г
 $messages['smtprecipientserror'] = 'SMTP грешка: Не успеав да ја испарсирам листата на примачи';
 $messages['smtperror'] = 'SMTP Error: $msg';
 $messages['emailformaterror'] = 'Неправилна поштенска адреса: $email';
+$messages['toomanyrecipients'] = 'Too many recipients. Reduce the number of recipients to $max.';
+$messages['maxgroupmembersreached'] = 'The number of group members exceeds the maximum of $max.';
+$messages['internalerror'] = 'An internal error occured. Please try again.';
+$messages['contactdelerror'] = 'Could not delete contact(s).';
+$messages['contactdeleted'] = 'Contact(s) deleted successfully.';
+$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.';
 
+?>
diff --git a/program/localization/ml_IN/labels.inc b/program/localization/ml_IN/labels.inc
index 0cab9c231..ed0e7402a 100644
--- a/program/localization/ml_IN/labels.inc
+++ b/program/localization/ml_IN/labels.inc
@@ -2,47 +2,78 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ml_IN/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: midhun <orisis47@gmail.com>                                   |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = '$product ലേയ്ക്ക് സ്വാഗതം';
-$labels['username'] = 'ഉപയോക്തൃനാമം';
-$labels['password'] = 'രഹസ്യവാക്ക്';
-$labels['server'] = 'സേവകന്‍';
-$labels['login'] = 'പ്രവേശിക്കുക';
-$labels['logout'] = 'പുറത്ത് കടക്കുക';
-$labels['mail'] = 'തപാല്‍';
+
+// login page
+$labels['welcome']   = '$product ലേയ്ക്ക് സ്വാഗതം';
+$labels['username']  = 'ഉപയോക്തൃനാമം';
+$labels['password']  = 'രഹസ്യവാക്ക്';
+$labels['server']    = 'സേവകന്‍';
+$labels['login']     = 'പ്രവേശിക്കുക';
+
+// taskbar
+$labels['logout']   = 'പുറത്ത് കടക്കുക';
+$labels['mail']     = 'തപാല്‍';
 $labels['settings'] = 'ക്രമീകരണങ്ങള്‍';
 $labels['addressbook'] = 'വിലാസ പുസ്തകം';
-$labels['inbox'] = 'ഇന്‍ബോക്സ്';
+
+// mailbox names
+$labels['inbox']  = 'ഇന്‍ബോക്സ്';
 $labels['drafts'] = 'പൂര്‍ത്തിയാകാത്തവ';
-$labels['sent'] = 'അയച്ചവ';
-$labels['trash'] = 'ചവറ്റുകുട്ട';
-$labels['junk'] = 'ആവശ്യമില്ലാത്തവ';
+$labels['sent']   = 'അയച്ചവ';
+$labels['trash']  = 'ചവറ്റുകുട്ട';
+$labels['junk']   = 'ആവശ്യമില്ലാത്തവ';
+
+// message listing
 $labels['subject'] = 'വിഷയം';
-$labels['from'] = 'പ്രേഷിതന്‍';
-$labels['to'] = 'സ്വീകര്‍ത്താവ്';
-$labels['date'] = 'തീയതി';
-$labels['size'] = 'വലിപ്പം';
+$labels['from']    = 'പ്രേഷിതന്‍';
+$labels['sender']  = 'Sender';
+$labels['to']      = 'സ്വീകര്‍ത്താവ്';
+$labels['cc']      = 'Cc';
+$labels['bcc']     = 'Bcc';
+$labels['replyto'] = 'Reply-To';
+$labels['followupto'] = 'Followup-To';
+$labels['date']    = 'തീയതി';
+$labels['size']    = 'വലിപ്പം';
 $labels['priority'] = 'മുന്‍ഗണന';
+$labels['organization'] = 'Organization';
 $labels['readstatus'] = 'അവസ്ഥ വായിക്കുക';
+$labels['listoptions'] = 'List options...';
+
 $labels['mailboxlist'] = 'ഫോള്‍ഡറുകള്‍';
-$labels['folders'] = 'ഫോള്‍ഡറുകള്‍';
-$labels['copy'] = 'പകര്‍ത്തുക';
-$labels['move'] = 'നീക്കുക';
+$labels['messagesfromto'] = 'Messages $from to $to of $count';
+$labels['threadsfromto'] = 'Threads $from to $to of $count';
+$labels['messagenrof'] = 'Message $nr of $count';
+$labels['fromtoshort'] = '$from – $to of $count';
+
+$labels['copy']     = 'പകര്‍ത്തുക';
+$labels['move']     = 'നീക്കുക';
+$labels['moveto']   = 'Move to...';
 $labels['download'] = 'ഡൗണ്‍ലോഡ്';
+$labels['open']     = 'Open';
+$labels['showattachment'] = 'Show';
+$labels['showanyway'] = 'Show it anyway';
+
 $labels['filename'] = 'ഫയല്‍ നാമം';
 $labels['filesize'] = 'ഫയലിന്റെ വലിപ്പം';
+
 $labels['addtoaddressbook'] = 'മേല്‍വിലാസങ്ങളില്‍ ചേര്‍ക്കുക.';
+
+// weekdays short
 $labels['sun'] = 'ഞാ';
 $labels['mon'] = 'തി';
 $labels['tue'] = 'ചൊ';
@@ -50,215 +81,446 @@ $labels['wed'] = 'ബു';
 $labels['thu'] = 'വ്യാ';
 $labels['fri'] = 'വെ';
 $labels['sat'] = 'ശ';
-$labels['sunday'] = 'ഞായര്‍';
-$labels['monday'] = 'തിങ്കള്‍';
-$labels['tuesday'] = 'ചൊവ്വ';
+
+// weekdays long
+$labels['sunday']    = 'ഞായര്‍';
+$labels['monday']    = 'തിങ്കള്‍';
+$labels['tuesday']   = 'ചൊവ്വ';
 $labels['wednesday'] = 'ബുധന്‍';
-$labels['thursday'] = 'വ്യാഴം';
-$labels['friday'] = 'വെള്ളി';
-$labels['saturday'] = 'ശനി';
-$labels['jan'] = 'ജനു';
-$labels['feb'] = 'ഫെബ്';
-$labels['mar'] = 'മാര്‍';
-$labels['apr'] = 'ഏപ്ര';
-$labels['may'] = 'മെ';
-$labels['longmay'] = 'മെ';
-$labels['jun'] = 'ജൂണ്‍';
-$labels['jul'] = 'ജൂലൈ';
-$labels['aug'] = 'ആഗസ്റ്റ്';
-$labels['sep'] = 'സെപ്റ്റംബര്‍';
-$labels['oct'] = 'ഒക്ടോബര്‍';
-$labels['nov'] = 'നവംബര്‍';
-$labels['dec'] = 'ഡിസംബര്‍';
-$labels['longjan'] = 'ജനുവരി';
-$labels['longfeb'] = 'ഫെബ്രുവരി';
-$labels['longmar'] = 'മാര്‍ച്ച്';
-$labels['longapr'] = 'ഏപ്രില്‍';
-$labels['longjun'] = 'ജൂണ്‍';
-$labels['longjul'] = 'ജൂലൈ';
-$labels['longaug'] = 'ആഗസ്റ്റ്';
-$labels['longsep'] = 'സെപ്തംബ‌ര്‍';
-$labels['longoct'] = 'ഒക്ടോബര്‍';
-$labels['longnov'] = 'നവംബ‌ര്‍';
-$labels['longdec'] = 'ഡിസംബ‌ര്‍';
+$labels['thursday']  = 'വ്യാഴം';
+$labels['friday']    = 'വെള്ളി';
+$labels['saturday']  = 'ശനി';
+
+// months short
+$labels['jan']	= 'ജനു';
+$labels['feb']	= 'ഫെബ്';
+$labels['mar']	= 'മാര്‍';
+$labels['apr']	= 'ഏപ്ര';
+$labels['may']	= 'മെ';
+$labels['jun']	= 'ജൂണ്‍';
+$labels['jul'] 	= 'ജൂലൈ';
+$labels['aug']	= 'ആഗസ്റ്റ്';
+$labels['sep']	= 'സെപ്റ്റംബര്‍';
+$labels['oct']	= 'ഒക്ടോബര്‍';
+$labels['nov']	= 'നവംബര്‍';
+$labels['dec']	= 'ഡിസംബര്‍';
+
+// months long
+$labels['longjan']	= 'ജനുവരി';
+$labels['longfeb']	= 'ഫെബ്രുവരി';
+$labels['longmar']	= 'മാര്‍ച്ച്';
+$labels['longapr']	= 'ഏപ്രില്‍';
+$labels['longmay']	= 'മെ';
+$labels['longjun']	= 'ജൂണ്‍';
+$labels['longjul']	= 'ജൂലൈ';
+$labels['longaug']	= 'ആഗസ്റ്റ്';
+$labels['longsep']	= 'സെപ്തംബ‌ര്‍';
+$labels['longoct']	= 'ഒക്ടോബര്‍';
+$labels['longnov']	= 'നവംബ‌ര്‍';
+$labels['longdec']	= 'ഡിസംബ‌ര്‍';
+
 $labels['today'] = 'ഇന്ന്';
-$labels['refresh'] = 'പുതുക്കുക';
-$labels['checkmail'] = 'പുതിയ സന്ദേശത്തിനായി തിരയുക';
-$labels['compose'] = 'രചന';
-$labels['reply'] = 'മറുപടി';
-$labels['forward'] = 'കൈമാറുക';
-$labels['forwardmessage'] = 'സന്ദേശം കൈമാറുക';
-$labels['deletemessage'] = 'സന്ദേശം മായ്ക്കുക';
+
+// toolbar buttons
+$labels['refresh']          = 'പുതുക്കുക';
+$labels['checkmail']        = 'പുതിയ സന്ദേശത്തിനായി തിരയുക';
+$labels['compose']          = 'രചന';
+$labels['writenewmessage']  = 'Create a new message';
+$labels['reply']            = 'മറുപടി';
+$labels['replytomessage']   = 'Reply to sender';
+$labels['replytoallmessage'] = 'Reply to list or to sender and all recipients';
+$labels['replyall']         = 'Reply all';
+$labels['replylist']        = 'Reply list';
+$labels['forward']          = 'കൈമാറുക';
+$labels['forwardinline']    = 'Forward inline';
+$labels['forwardattachment'] = 'Forward as attachment';
+$labels['forwardmessage']   = 'സന്ദേശം കൈമാറുക';
+$labels['deletemessage']    = 'സന്ദേശം മായ്ക്കുക';
 $labels['movemessagetotrash'] = 'സന്ദേശം ചവറ്റുകുട്ടയിലേക്ക് നീക്കുക';
-$labels['printmessage'] = 'ഈ സന്ദേശം അച്ചടിക്കുക';
-$labels['previousmessage'] = 'മുന്‍പുളള സന്ദേശം കാണിക്കുക.';
-$labels['firstmessage'] = 'ആദ്യത്തെ സന്ദേശം കാണിക്കുക.';
-$labels['nextmessage'] = 'അടുത്ത സന്ദേശം കാണിക്കുക.';
-$labels['lastmessage'] = 'അവസാനത്തെ സന്ദേശം കാണിക്കുക.';
-$labels['viewsource'] = 'ഉറവിടം കാണിക്കുക.';
-$labels['mark'] = 'അടയാളപ്പെടുത്തു';
-$labels['markmessages'] = 'സന്തേശങ്ങള്‍ അടയാളപ്പെടുത്തു';
-$labels['markread'] = 'വായിച്ചതായി';
-$labels['markunread'] = 'വായിക്കാത്തതായി';
-$labels['moreactions'] = 'കൂടുതല്‍ ചെയ്തികള്‍...';
-$labels['more'] = 'കൂടുതല്‍';
-$labels['back'] = 'പിന്നോട്ട്';
-$labels['options'] = 'ഐച്ഛികങ്ങള്‍‌';
+$labels['printmessage']     = 'ഈ സന്ദേശം അച്ചടിക്കുക';
+$labels['previousmessage']  = 'മുന്‍പുളള സന്ദേശം കാണിക്കുക.';
+$labels['firstmessage']     = 'ആദ്യത്തെ സന്ദേശം കാണിക്കുക.';
+$labels['nextmessage']      = 'അടുത്ത സന്ദേശം കാണിക്കുക.';
+$labels['lastmessage']      = 'അവസാനത്തെ സന്ദേശം കാണിക്കുക.';
+$labels['backtolist']       = 'Back to message list';
+$labels['viewsource']       = 'ഉറവിടം കാണിക്കുക.';
+$labels['mark']             = 'അടയാളപ്പെടുത്തു';
+$labels['markmessages']     = 'സന്തേശങ്ങള്‍ അടയാളപ്പെടുത്തു';
+$labels['markread']         = 'വായിച്ചതായി';
+$labels['markunread']       = 'വായിക്കാത്തതായി';
+$labels['markflagged']      = 'As flagged';
+$labels['markunflagged']    = 'As unflagged';
+$labels['moreactions']      = 'കൂടുതല്‍ ചെയ്തികള്‍...';
+$labels['more']             = 'കൂടുതല്‍';
+$labels['back']             = 'പിന്നോട്ട്';
+$labels['options']          = 'ഐച്ഛികങ്ങള്‍‌';
+
 $labels['select'] = 'തെരഞ്ഞെടുക്കുക';
 $labels['all'] = 'എല്ലാം';
 $labels['none'] = 'ഒന്നുമില്ല';
-$labels['nonesort'] = 'ഒന്നുമില്ല';
 $labels['currpage'] = 'നിലവിലുളള പേജ്';
 $labels['unread'] = 'വായിക്കാത്തത്';
 $labels['flagged'] = 'അടയാളപ്പെടുത്തിയവ';
 $labels['unanswered'] = 'മറുപടി കൊടുക്കാത്ത';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'മായ്ച്ചവ';
+$labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'തലതിരിക്കുക';
 $labels['filter'] = 'അരിപ്പ';
 $labels['list'] = 'പട്ടിക';
+$labels['threads'] = 'Threads';
 $labels['expand-all'] = 'എല്ലാം വികസിപ്പിക്കുക';
 $labels['expand-unread'] = 'വായിക്കാത്തവ വികസിപ്പിക്കുക';
 $labels['collapse-all'] = 'എല്ലാം അടയ്ക്കുക';
+$labels['threaded'] = 'Threaded';
+
+$labels['autoexpand_threads'] = 'Expand message threads';
+$labels['do_expand'] = 'all threads';
+$labels['expand_only_unread'] = 'only with unread messages';
 $labels['fromto'] = 'എവിടുന്ന് /എങ്ങൊട്ടു';
+$labels['flag'] = 'Flag';
+$labels['attachment'] = 'Attachment';
+$labels['nonesort'] = 'ഒന്നുമില്ല';
 $labels['sentdate'] = 'അയച്ച തീയതി';
 $labels['arrival'] = 'വന്ന തീയതി';
 $labels['asc'] = 'ആരോഹണം';
 $labels['desc'] = 'അവരോഹണം';
+$labels['listcolumns'] = 'List columns';
+$labels['listsorting'] = 'Sorting column';
 $labels['listorder'] = 'തരംതിരിക്കണ്ട രീതി';
+$labels['listmode'] = 'List view mode';
+
+$labels['folderactions'] = 'Folder actions...';
 $labels['compact'] = 'ചുരുക്കു';
 $labels['empty'] = 'ശൂന്യം';
+
 $labels['quota'] = 'ഡിസ്ക്ക് ഉപയോഗം';
-$labels['unknown'] = 'അറിയാത്ത';
-$labels['unlimited'] = 'പരിമിതികളില്ലാത്ത';
-$labels['quicksearch'] = 'പെട്ടെന്ന് തെരയു';
-$labels['msgtext'] = 'മുഴുവന്‍ സന്ദേശവും';
+$labels['unknown']  = 'അറിയാത്ത';
+$labels['unlimited']  = 'പരിമിതികളില്ലാത്ത';
+
+$labels['quicksearch']  = 'പെട്ടെന്ന് തെരയു';
+$labels['resetsearch']  = 'Reset search';
+$labels['searchmod']  = 'Search modifiers';
+$labels['msgtext']  = 'മുഴുവന്‍ സന്ദേശവും';
+$labels['body']  = 'Body';
+
 $labels['openinextwin'] = 'പുതിയ വിന്‍ഡോയില്‍ തുറക്കുക';
-$labels['editasnew'] = 'പുതിയതായി തിരുത്തുക';
-$labels['sendmessage'] = 'സന്ദേശം അയയ്ക്കുക';
-$labels['savemessage'] = 'പൂര്‍ത്തിയാകാത്തവ ആയി സൂക്ഷിക്കുക';
-$labels['addattachment'] = 'ഒരു ഫയല്‍ മെയിലിനൊപ്പം ചേര്‍ക്കുക';
-$labels['editortype'] = 'തിരുത്തല്‍ രീതി';
+$labels['emlsave'] = 'Download (.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
+
+// message compose
+$labels['editasnew']      = 'പുതിയതായി തിരുത്തുക';
+$labels['send']           = 'Send';
+$labels['sendmessage']    = 'സന്ദേശം അയയ്ക്കുക';
+$labels['savemessage']    = 'പൂര്‍ത്തിയാകാത്തവ ആയി സൂക്ഷിക്കുക';
+$labels['addattachment']  = 'ഒരു ഫയല്‍ മെയിലിനൊപ്പം ചേര്‍ക്കുക';
+$labels['charset']        = 'Charset';
+$labels['editortype']     = 'തിരുത്തല്‍ രീതി';
+$labels['returnreceipt']  = 'Return receipt';
+$labels['dsn']            = 'Delivery status notification';
+$labels['mailreplyintro'] = 'On $date, $sender wrote:';
 $labels['originalmessage'] = 'യഥാര്‍ഥ സന്ദേശം';
+
+$labels['editidents']    = 'Edit identities';
+$labels['spellcheck']    = 'Spell';
 $labels['checkspelling'] = 'അക്ഷരത്തെറ്റു് പരിശോധിക്കുക';
 $labels['resumeediting'] = 'തിരുത്തല്‍ തുടരുക';
+$labels['revertto']      = 'Revert to';
+
 $labels['attach'] = 'സംയോജിപ്പിക്കു';
 $labels['attachments'] = 'അറ്റാച്ച്മെന്റുകള്‍';
 $labels['upload'] = 'അപ്‌ലോഡ് ചെയ്യുക';
-$labels['close'] = 'അടയ്ക്കുക';
-$labels['messageoptions'] = 'സന്ദേശ ​ഐച്ഛികങ്ങള്‍...';
-$labels['low'] = 'കുറഞ്ഞ';
-$labels['lowest'] = 'ഏറ്റവും കുറഞ്ഞ';
-$labels['normal'] = 'സാധാരണ';
-$labels['high'] = 'കൂടിയ';
+$labels['uploadprogress'] = '$percent ($current from $total)';
+$labels['close']  = 'അടയ്ക്കുക';
+$labels['messageoptions']  = 'സന്ദേശ ​ഐച്ഛികങ്ങള്‍...';
+
+$labels['low']     = 'കുറഞ്ഞ';
+$labels['lowest']  = 'ഏറ്റവും കുറഞ്ഞ';
+$labels['normal']  = 'സാധാരണ';
+$labels['high']    = 'കൂടിയ';
 $labels['highest'] = 'ഏറ്റവും കൂടിയത്';
-$labels['nosubject'] = '(വിഷയം ഇല്ല)';
+
+$labels['nosubject']  = '(വിഷയം ഇല്ല)';
 $labels['showimages'] = 'ചിത്രങ്ങള്‍ കാണിക്കുക';
-$labels['isdraft'] = 'ഇതൊരു കരടുരൂപമാണ്.';
+$labels['alwaysshow'] = 'Always show images from $sender';
+$labels['isdraft']    = 'ഇതൊരു കരടുരൂപമാണ്.';
+$labels['andnmore']   = '$nr more...';
+$labels['togglemoreheaders'] = 'Show more message headers';
+$labels['togglefullheaders'] = 'Toggle raw message headers';
+
 $labels['htmltoggle'] = 'HTML';
+$labels['plaintoggle'] = 'Plain text';
+$labels['savesentmessagein'] = 'Save sent message in';
 $labels['dontsave'] = 'സുക്ഷിക്കരുത്';
 $labels['maxuploadsize'] = '$size ആണ് പരമാവധി  ഫയല്‍ വലിപ്പം';
-$labels['firstname'] = 'ആദ്യ നാമം';
-$labels['surname'] = 'അവസാന നാമം';
-$labels['nickname'] = 'ചെല്ലപേര്';
-$labels['jobtitle'] = 'ജോലിയുടെ പേര്';
-$labels['department'] = 'വകുപ്പ്';
-$labels['gender'] = 'ലിംഗം';
-$labels['maidenname'] = 'കന്യകാനാമം';
-$labels['email'] = 'ഇമെയില്‍';
-$labels['phone'] = 'ഫോണ്‍';
-$labels['address'] = 'മേല്‍വിലാസം';
-$labels['street'] = 'തെരുവ്';
-$labels['locality'] = 'നഗരം';
-$labels['zipcode'] = 'പിന്‍ കോഡ്';
-$labels['region'] = 'സംസ്ഥാനം / പ്രദേശം';
-$labels['country'] = 'രാജ്യം';
-$labels['birthday'] = 'പിറന്നാള്‍';
-$labels['anniversary'] = 'വാര്‍ഷികം';
-$labels['website'] = 'വെബ്സൈറ്റ്';
+
+$labels['addcc'] = 'Add Cc';
+$labels['addbcc'] = 'Add Bcc';
+$labels['addreplyto'] = 'Add Reply-To';
+$labels['addfollowupto'] = 'Add Followup-To';
+
+// mdn
+$labels['mdnrequest'] = 'The sender of this message has asked to be notified when you read this message. Do you wish to notify the sender?';
+$labels['receiptread'] = 'Return Receipt (read)';
+$labels['yourmessage'] = 'This is a Return Receipt for your message';
+$labels['receiptnote'] = 'Note: This receipt only acknowledges that the message was displayed on the recipient\'s computer. There is no guarantee that the recipient has read or understood the message contents.';
+
+// address boook
+$labels['name']         = 'Display Name';
+$labels['firstname']    = 'ആദ്യ നാമം';
+$labels['surname']      = 'അവസാന നാമം';
+$labels['middlename']   = 'Middle Name';
+$labels['nameprefix']   = 'Prefix';
+$labels['namesuffix']   = 'Suffix';
+$labels['nickname']     = 'ചെല്ലപേര്';
+$labels['jobtitle']     = 'ജോലിയുടെ പേര്';
+$labels['department']   = 'വകുപ്പ്';
+$labels['gender']       = 'ലിംഗം';
+$labels['maidenname']   = 'കന്യകാനാമം';
+$labels['email']        = 'ഇമെയില്‍';
+$labels['phone']        = 'ഫോണ്‍';
+$labels['address']      = 'മേല്‍വിലാസം';
+$labels['street']       = 'തെരുവ്';
+$labels['locality']     = 'നഗരം';
+$labels['zipcode']      = 'പിന്‍ കോഡ്';
+$labels['region']       = 'സംസ്ഥാനം / പ്രദേശം';
+$labels['country']      = 'രാജ്യം';
+$labels['birthday']     = 'പിറന്നാള്‍';
+$labels['anniversary']  = 'വാര്‍ഷികം';
+$labels['website']      = 'വെബ്സൈറ്റ്';
+$labels['instantmessenger'] = 'IM';
 $labels['notes'] = 'കുറിപ്പുകള്‍';
-$labels['male'] = 'പുരുഷന്‍';
+$labels['male']   = 'പുരുഷന്‍';
 $labels['female'] = 'സ്‌ത്രീ';
 $labels['manager'] = 'പരിപാലകന്‍';
 $labels['assistant'] = 'സഹായി';
-$labels['typeassistant'] = 'സഹായി';
 $labels['spouse'] = 'ഭാര്യ/ഭര്‍ത്താവ്';
+$labels['allfields'] = 'All fields';
 $labels['search'] = 'തെരയുക';
 $labels['advsearch'] = 'വിപുലമായ തിരച്ചില്‍';
 $labels['advanced'] = 'സങ്കീര്‍ണ്ണം';
 $labels['other'] = 'മറ്റുള്ളത്';
-$labels['typeother'] = 'മറ്റുള്ളത്';
-$labels['typehome'] = 'ആസ്ഥാനം';
-$labels['typework'] = 'ജോലി';
-$labels['typemobile'] = 'മോബൈല്‍';
-$labels['typemain'] = 'പ്രധാനപ്പെട്ട';
-$labels['typehomefax'] = 'വീട്ടിലെ ഫാക്സ്';
-$labels['typeworkfax'] = 'കാര്യാലയത്തിലെ ഫാക്സ്';
-$labels['typecar'] = 'കാര്‍';
-$labels['typepager'] = 'പേജര്‍';
-$labels['typevideo'] = 'ചലച്ചിത്രം';
-$labels['typehomepage'] = 'ഹോം പേജ്';
+
+$labels['typehome']   = 'ആസ്ഥാനം';
+$labels['typework']   = 'ജോലി';
+$labels['typeother']  = 'മറ്റുള്ളത്';
+$labels['typemobile']  = 'മോബൈല്‍';
+$labels['typemain']  = 'പ്രധാനപ്പെട്ട';
+$labels['typehomefax']  = 'വീട്ടിലെ ഫാക്സ്';
+$labels['typeworkfax']  = 'കാര്യാലയത്തിലെ ഫാക്സ്';
+$labels['typecar']  = 'കാര്‍';
+$labels['typepager']  = 'പേജര്‍';
+$labels['typevideo']  = 'ചലച്ചിത്രം';
+$labels['typeassistant']  = 'സഹായി';
+$labels['typehomepage']  = 'ഹോം പേജ്';
 $labels['typeblog'] = 'ബ്ലോഗ്';
 $labels['typeprofile'] = 'പ്രൊഫൈല്‍';
+
+$labels['addfield'] = 'Add field...';
+$labels['addcontact'] = 'Add new contact';
+$labels['editcontact'] = 'Edit contact';
+$labels['contacts'] = 'Contacts';
+$labels['contactproperties'] = 'Contact properties';
 $labels['personalinfo'] = 'സ്വകാര്യ വിവരങ്ങള്‍';
-$labels['edit'] = 'തിരുത്തുക';
+
+$labels['edit']   = 'തിരുത്തുക';
 $labels['cancel'] = 'റദ്ദാക്കുക';
-$labels['save'] = 'സൂക്ഷിക്കുക';
+$labels['save']   = 'സൂക്ഷിക്കുക';
 $labels['delete'] = 'നീക്കം ചെയ്യുക';
 $labels['rename'] = 'പേരുമാറ്റുക';
 $labels['addphoto'] = 'ചേര്‍ക്കുക';
 $labels['replacephoto'] = 'പകരം വയ്ക്കുക';
-$labels['print'] = 'അച്ചടി';
-$labels['export'] = 'പുറത്തെടുക്കുക';
-$labels['grouprename'] = 'കുട്ടത്തിന്റെ പേര് മാറ്റുക';
-$labels['groupdelete'] = 'കൂട്ടം മായ്ക്കുക';
-$labels['previouspage'] = 'മുമ്പുളള താള്‍ കാണിയ്ക്കുക';
+$labels['uploadphoto'] = 'Upload photo';
+
+$labels['newcontact']     = 'Create new contact card';
+$labels['deletecontact']  = 'Delete selected contacts';
+$labels['composeto']      = 'Compose mail to';
+$labels['contactsfromto'] = 'Contacts $from to $to of $count';
+$labels['print']          = 'അച്ചടി';
+$labels['export']         = 'പുറത്തെടുക്കുക';
+$labels['exportall']      = 'Export all';
+$labels['exportsel']      = 'Export selected';
+$labels['exportvcards']   = 'Export contacts in vCard format';
+$labels['newcontactgroup'] = 'Create new contact group';
+$labels['grouprename']    = 'കുട്ടത്തിന്റെ പേര് മാറ്റുക';
+$labels['groupdelete']    = 'കൂട്ടം മായ്ക്കുക';
+$labels['groupremoveselected'] = 'Remove selected contacts from group';
+
+$labels['previouspage']   = 'മുമ്പുളള താള്‍ കാണിയ്ക്കുക';
+$labels['firstpage']      = 'Show first page';
+$labels['nextpage']       = 'Show next page';
+$labels['lastpage']       = 'Show last page';
+
 $labels['group'] = 'കൂട്ടം';
 $labels['groups'] = 'കൂട്ടങ്ങള്‍';
 $labels['personaladrbook'] = 'സ്വകാര്യ വിലാസങ്ങള്‍';
+
 $labels['searchsave'] = 'തിരയല്‍ സൂക്ഷിക്കുക';
 $labels['searchdelete'] = 'തിരയല്‍ നീക്കംചെയ്യുക';
+
 $labels['import'] = 'പ്രോഗ്രമ്മിലേക്ക് എടുക്കുക';
+$labels['importcontacts'] = 'Import contacts';
+$labels['importfromfile'] = 'Import from file:';
+$labels['importtarget'] = 'Add new contacts to address book:';
+$labels['importreplace'] = 'Replace the entire address book';
+$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['done'] = 'പൂര്‍ത്തീകരിച്ചു';
+
+// settings
+$labels['settingsfor'] = 'Settings for';
 $labels['about'] = 'വിവരം';
+$labels['preferences'] = 'Preferences';
 $labels['userpreferences'] = 'ഉപയൊക്ത മുന്‍ഗണനകള്‍';
+$labels['editpreferences'] = 'Edit user preferences';
+
+$labels['identities'] = 'Identities';
+$labels['manageidentities'] = 'Manage identities for this account';
+$labels['newidentity'] = 'New identity';
+
+$labels['newitem'] = 'New item';
+$labels['edititem'] = 'Edit item';
+
 $labels['preferhtml'] = 'HTML കാണിക്കുക';
-$labels['language'] = 'ഭാഷ';
-$labels['timezone'] = 'സമയ മേഖല';
-$labels['pagesize'] = 'ഒരു താളിലെ വരികള്‍';
+$labels['defaultcharset'] = 'Default Character Set';
+$labels['htmlmessage'] = 'HTML Message';
+$labels['messagepart'] = 'Part';
+$labels['digitalsig'] = 'Digital Signature';
+$labels['dateformat'] = 'Date format';
+$labels['timeformat'] = 'Time format';
+$labels['prettydate'] = 'Pretty dates';
+$labels['setdefault']  = 'Set default';
+$labels['autodetect']  = 'Auto';
+$labels['language']  = 'ഭാഷ';
+$labels['timezone']  = 'സമയ മേഖല';
+$labels['pagesize']  = 'ഒരു താളിലെ വരികള്‍';
 $labels['signature'] = 'ഒപ്പ്';
+$labels['dstactive']  = 'Daylight saving time';
+$labels['showinextwin'] = 'Open message in a new window';
+$labels['composeextwin'] = 'Compose in a new window';
 $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';
+$labels['logoutcompact'] = 'Compact Inbox on logout';
+$labels['uisettings'] = 'User Interface';
 $labels['serversettings'] = 'സേവകന്റെ ക്രമീകരണങ്ങള്‍';
+$labels['mailboxview'] = 'Mailbox View';
+$labels['mdnrequests'] = 'On request for return receipt';
 $labels['askuser'] = 'എന്നൊടു ചോദിക്കുക';
+$labels['autosend'] = 'send receipt';
+$labels['autosendknown'] = 'send receipt to my contacts, otherwise ask me';
+$labels['autosendknownignore'] = 'send receipt to my contacts, otherwise ignore';
 $labels['ignore'] = 'അവഗണിക്കുക';
+$labels['readwhendeleted'] = 'Mark the message as read on delete';
+$labels['flagfordeletion'] = 'Flag the message for deletion instead of delete';
+$labels['skipdeleted'] = 'Do not show deleted messages';
+$labels['deletealways'] = 'If moving messages to Trash fails, delete them';
+$labels['deletejunk'] = 'Directly delete messages in Junk';
+$labels['showremoteimages'] = 'Display remote inline images';
+$labels['fromknownsenders'] = 'from known senders';
 $labels['always'] = 'എപ്പോഴും';
-$labels['never'] = 'ഒരിക്കലുമില്ല';
-$labels['immediately'] = 'ഉടനടി';
+$labels['showinlineimages'] = 'Display attached images below the message';
+$labels['autosavedraft']  = 'Automatically save draft';
+$labels['everynminutes']  = 'every $n minute(s)';
+$labels['refreshinterval']  = 'Refresh (check for new messages, etc.)';
+$labels['never']  = 'ഒരിക്കലുമില്ല';
+$labels['immediately']  = 'ഉടനടി';
+$labels['messagesdisplaying'] = 'Displaying Messages';
+$labels['messagescomposition'] = 'Composing Messages';
+$labels['mimeparamfolding'] = 'Attachment names';
 $labels['2231folding'] = 'Full RFC 2231 (തണ്ടര്‍ബേട് )';
 $labels['miscfolding'] = 'Full RFC 2231 ( മൈക്രൊസൊഫ്റ്റ് ഔട്ട്ലൂക്കു് )';
 $labels['2047folding'] = 'Full RFC 2047 (മറ്റുള്ളവ)';
 $labels['force7bit'] = '8-bit അക്ഷരങ്ങള്‍ക്കു "MIME encoding" ഉപയോഗിക്കുക';
 $labels['advancedoptions'] = 'വിപുലീക്രിതമായ ക്രമീകരണങ്ങള്‍';
+$labels['focusonnewmessage'] = 'Focus browser window on new message';
+$labels['checkallfolders'] = 'Check all folders for new messages';
+$labels['displaynext'] = 'After message delete/move display the next message';
 $labels['defaultfont'] = 'HTML സന്ദേശത്തിന്റെ തനതായ ലിപി';
+$labels['mainoptions'] = 'Main Options';
+$labels['browseroptions'] = 'Browser Options';
 $labels['section'] = 'വിഭാഗം';
+$labels['maintenance'] = 'Maintenance';
 $labels['newmessage'] = 'പുതിയ സന്ദേശം';
+$labels['signatureoptions'] = 'Signature Options';
+$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'] = 'Automatically add signature';
 $labels['newmessageonly'] = 'പുതിയ സന്ദേശം മാത്രം';
-$labels['belowquote'] = 'ഉദ്ധാരണത്തിനു താഴെ';
-$labels['afternseconds'] = '$n നിമിഷങ്ങള്‍ കഴിഞ്ഞു്';
+$labels['replyandforwardonly'] = 'replies and forwards only';
+$labels['insertsignature'] = 'Insert signature';
+$labels['previewpanemarkread']  = 'Mark previewed messages as read';
+$labels['afternseconds']  = '$n നിമിഷങ്ങള്‍ കഴിഞ്ഞു്';
+$labels['reqmdn'] = 'Always request a return receipt';
+$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'] = 'Check spelling before sending a message';
+$labels['spellcheckoptions'] = 'Spellcheck Options';
+$labels['spellcheckignoresyms'] = 'Ignore words with symbols';
 $labels['spellcheckignorenums'] = 'അക്കങ്ങള്‍ ഉള്ള വാക്കുകളെ അവഗണിക്കുക';
+$labels['spellcheckignorecaps'] = 'Ignore words with all letters capitalized';
 $labels['addtodict'] = 'നിഘണ്ടുവില്‍ ചേര്‍ക്കുക';
+$labels['mailtoprotohandler'] = 'Register protocol handler for mailto: links';
+$labels['forwardmode'] = 'Messages forwarding';
+$labels['inline'] = 'inline';
+$labels['asattachment'] = 'as attachment';
+
+$labels['folder']  = 'Folder';
+$labels['folders']  = 'ഫോള്‍ഡറുകള്‍';
+$labels['foldername']  = 'Folder name';
+$labels['subscribed']  = 'Subscribed';
+$labels['messagecount'] = 'Messages';
+$labels['create']  = 'Create';
+$labels['createfolder']  = 'Create new folder';
+$labels['managefolders']  = 'Manage folders';
+$labels['specialfolders'] = 'Special Folders';
 $labels['properties'] = 'സവിശേഷതകള്‍';
+$labels['folderproperties'] = 'Folder properties';
+$labels['parentfolder'] = 'Parent folder';
+$labels['location'] = 'Location';
 $labels['info'] = 'വിവരം';
 $labels['getfoldersize'] = 'അറയുടെ വലുപ്പം അരിയാന്‍ ക്ലിക്ക് ചെയ്യുക';
-$labels['personalfolder'] = 'സ്വകാര്യ അറ';
-$labels['sharedfolder'] = 'പൊതു - അറ';
+$labels['changesubscription'] = 'Click to change subscription';
+$labels['foldertype'] = 'Folder Type';
+$labels['personalfolder']  = 'സ്വകാര്യ അറ';
+$labels['otherfolder']  = 'Other User\'s Folder';
+$labels['sharedfolder']  = 'പൊതു - അറ';
+
+$labels['sortby'] = 'Sort by';
+$labels['sortasc']  = 'Sort ascending';
+$labels['sortdesc'] = 'Sort descending';
+$labels['undo'] = 'Undo';
+
+$labels['installedplugins'] = 'Installed plugins';
+$labels['plugin'] = 'Plugin';
+$labels['version'] = 'Version';
+$labels['source'] = 'Source';
+$labels['license'] = 'License';
 $labels['support'] = 'സഹായം തേടുക';
+
+// units
+$labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
 $labels['GB'] = 'GB';
+
+// character sets
 $labels['unicode'] = 'യൂണിക്കോഡ്';
 $labels['english'] = 'ഇംഗ്ലീഷ്';
 $labels['westerneuropean'] = 'പടിഞ്ഞാറന്‍ യൂറോപ്യന്‍';
 $labels['easterneuropean'] = 'കിഴക്കന്‍ യൂറോപ്യന്‍';
+$labels['southeasterneuropean'] = 'South-Eastern European';
 $labels['baltic'] = 'ബാള്‍ട്ടിക്ക്';
 $labels['cyrillic'] = 'സിറില്ലിക്ക്';
 $labels['arabic'] = 'അറബിക്ക്';
@@ -273,3 +535,4 @@ $labels['japanese'] = 'ജാപ്പനീസ്';
 $labels['korean'] = 'കൊറിയന്‍';
 $labels['chinese'] = 'ചൈനീസ്‌';
 
+?>
diff --git a/program/localization/ml_IN/messages.inc b/program/localization/ml_IN/messages.inc
index 3e4b4d5da..28eb22be2 100644
--- a/program/localization/ml_IN/messages.inc
+++ b/program/localization/ml_IN/messages.inc
@@ -2,25 +2,170 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ml_ML/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Anish A <aneesh.nl@gmail.com>                                 |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
+$messages['errortitle']  = 'An error occurred!';
+$messages['loginfailed']  = 'Login failed.';
 $messages['cookiesdisabled'] = 'തങ്കളുടെ ബ്രവു്സര്‍ കുക്കീസ് സ്വീകരിക്കുന്നതല്ല';
+$messages['sessionerror'] = 'Your session is invalid or expired.';
+$messages['storageerror'] = 'Connection to storage server failed.';
 $messages['servererror'] = 'സര്‍വര്‍ പിഴവ് !';
+$messages['servererrormsg'] = 'Server Error: $msg';
+$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.';
+$messages['loggedout'] = 'You have successfully terminated the session. Good bye!';
+$messages['mailboxempty'] = 'Mailbox is empty.';
+$messages['refreshing'] = 'Refreshing...';
 $messages['loading'] = 'തുറക്കുന്നു...';
+$messages['uploading'] = 'Uploading file...';
+$messages['uploadingmany'] = 'Uploading files...';
+$messages['loadingdata'] = 'Loading data...';
 $messages['checkingmail'] = 'പുതിയ സന്ദേസങ്ങള്‍കുവേണ്ടി തിരയുന്നു...';
 $messages['sendingmessage'] = 'സന്ദേശം അയക്കുന്നു...';
+$messages['messagesent'] = 'Message sent successfully.';
+$messages['savingmessage'] = 'Saving message...';
+$messages['messagesaved'] = 'Message saved to Drafts.';
+$messages['successfullysaved'] = 'Successfully saved.';
+$messages['addedsuccessfully'] = 'Contact added successfully to address book.';
+$messages['contactexists'] = 'A contact with the same e-mail address already exists.';
+$messages['contactnameexists'] = 'A contact with the same name already exists.';
+$messages['blockedimages'] = 'To protect your privacy, remote images are blocked in this message.';
+$messages['encryptedmessage'] = 'This is an encrypted message and can not be displayed. Sorry!';
+$messages['nocontactsfound'] = 'No contacts found.';
+$messages['contactnotfound'] = 'The requested contact was not found.';
+$messages['contactsearchonly'] = 'Enter some search terms to find contacts';
 $messages['sendingfailed'] = 'സന്ദേശം അയക്കാന്‍ സാധിച്ചില്ല.';
 $messages['senttooquickly'] = 'സന്ദേശം അയക്കുന്നതിനു മുന്പു ദയവായ്  $sec കാത്തിരിക്കൂ';
+$messages['errorsavingsent'] = 'An error occured while saving sent message.';
+$messages['errorsaving'] = 'An error occured while saving.';
+$messages['errormoving'] = 'Could not move the message(s).';
+$messages['errorcopying'] = 'Could not copy the message(s).';
+$messages['errordeleting'] = 'Could not delete the message(s).';
+$messages['errormarking'] = 'Could not mark the message(s).';
+$messages['deletecontactconfirm']  = 'Do you really want to delete selected contact(s)?';
+$messages['deletegroupconfirm']  = 'Do you really want to delete selected group?';
+$messages['deletemessagesconfirm'] = 'Do you really want to delete selected message(s)?';
+$messages['deletefolderconfirm']  = 'Do you really want to delete this folder?';
+$messages['purgefolderconfirm']  = 'Do you really want to delete all messages in this folder?';
+$messages['contactdeleting'] = 'Deleting contact(s)...';
+$messages['groupdeleting'] = 'Deleting group...';
+$messages['folderdeleting'] = 'Deleting folder...';
+$messages['foldermoving'] = 'Moving folder...';
+$messages['foldersubscribing'] = 'Subscribing folder...';
+$messages['folderunsubscribing'] = 'Unsubscribing folder...';
+$messages['formincomplete'] = 'The form was not completely filled out.';
+$messages['noemailwarning'] = 'Please enter a valid email address.';
+$messages['nonamewarning']  = 'Please enter a name.';
+$messages['nopagesizewarning'] = 'Please enter a page size.';
+$messages['nosenderwarning'] = 'Please enter sender e-mail address.';
+$messages['norecipientwarning'] = 'Please enter at least one recipient.';
+$messages['nosubjectwarning']  = 'The "Subject" field is empty. Would you like to enter one now?';
+$messages['nobodywarning'] = 'Send this message without text?';
+$messages['notsentwarning'] = 'Message has not been sent. Do you want to discard your message?';
+$messages['noldapserver'] = 'Please select an ldap server to search.';
+$messages['nosearchname'] = 'Please enter a contact name or email address.';
+$messages['notuploadedwarning'] = 'Not all attachments have been uploaded yet. Please wait or cancel the upload.';
+$messages['searchsuccessful'] = '$nr messages found.';
+$messages['contactsearchsuccessful'] = '$nr contacts found.';
+$messages['searchnomatch'] = 'Search returned no matches.';
+$messages['searching'] = 'Searching...';
+$messages['checking'] = 'Checking...';
+$messages['nospellerrors'] = 'No spelling errors found.';
+$messages['folderdeleted'] = 'Folder successfully deleted.';
+$messages['foldersubscribed'] = 'Folder successfully subscribed.';
+$messages['folderunsubscribed'] = 'Folder successfully unsubscribed.';
+$messages['folderpurged'] = 'Folder has successfully been emptied.';
+$messages['folderexpunged'] = 'Folder has successfully been compacted.';
+$messages['deletedsuccessfully'] = 'Successfully deleted.';
+$messages['converting'] = 'Removing formatting...';
+$messages['messageopenerror'] = 'Could not load message from server.';
+$messages['fileuploaderror'] = 'File upload failed.';
+$messages['filesizeerror'] = 'The uploaded file exceeds the maximum size of $size.';
+$messages['copysuccess'] = 'Successfully copied $nr addresses.';
+$messages['copyerror'] = 'Could not copy any addresses.';
+$messages['sourceisreadonly'] = 'This address source is read only.';
+$messages['errorsavingcontact'] = 'Could not save the contact address.';
+$messages['movingmessage'] = 'Moving message(s)...';
+$messages['copyingmessage'] = 'Copying message(s)...';
+$messages['copyingcontact'] = 'Copying contact(s)...';
+$messages['deletingmessage'] = 'Deleting message(s)...';
+$messages['markingmessage'] = 'Marking message(s)...';
+$messages['addingmember'] = 'Adding contact(s) to the group...';
+$messages['removingmember'] = 'Removing contact(s) from the group...';
+$messages['receiptsent'] = 'Successfully sent a read receipt.';
+$messages['errorsendingreceipt'] = 'Could not send the receipt.';
+$messages['deleteidentityconfirm'] = 'Do you really want to delete this identity?';
+$messages['nodeletelastidentity'] = 'You cannot delete this identity, it\'s your last one.';
+$messages['forbiddencharacter'] = 'Folder name contains a forbidden character.';
+$messages['selectimportfile'] = 'Please select a file to upload.';
+$messages['addresswriterror'] = 'The selected address book is not writeable.';
+$messages['contactaddedtogroup'] = 'Successfully added the contacts to this group.';
+$messages['contactremovedfromgroup'] = 'Successfully removed contacts from this group.';
+$messages['nogroupassignmentschanged'] = 'No group assignments changed.';
+$messages['importwait'] = 'Importing, please wait...';
+$messages['importformaterror'] = 'Import failed! The uploaded file is not a valid import data file.';
+$messages['importconfirm'] = '<b>Successfully imported $inserted contacts</b>';
+$messages['importconfirmskipped'] = '<b>Skipped $skipped existing entries</b>';
+$messages['opnotpermitted'] = 'Operation not permitted!';
+$messages['nofromaddress'] = 'Missing e-mail address in selected identity.';
+$messages['editorwarning'] = 'Switching to the plain text editor will cause all text formatting to be lost. Do you wish to continue?';
+$messages['httpreceivedencrypterror'] = 'A fatal configuration error occurred. Contact your administrator immediately. <b>Your message can not be sent.</b>';
+$messages['smtpconnerror'] = 'SMTP Error ($code): Connection to server failed.';
+$messages['smtpautherror'] = 'SMTP Error ($code): Authentication failed.';
+$messages['smtpfromerror'] = 'SMTP Error ($code): Failed to set sender "$from" ($msg).';
+$messages['smtptoerror'] = 'SMTP Error ($code): Failed to add recipient "$to" ($msg).';
+$messages['smtprecipientserror'] = 'SMTP Error: Unable to parse recipients list.';
+$messages['smtperror'] = 'SMTP Error: $msg';
+$messages['emailformaterror'] = 'Invalid e-mail address: $email';
+$messages['toomanyrecipients'] = 'Too many recipients. Reduce the number of recipients to $max.';
+$messages['maxgroupmembersreached'] = 'The number of group members exceeds the maximum of $max.';
+$messages['internalerror'] = 'An internal error occured. Please try again.';
+$messages['contactdelerror'] = 'Could not delete contact(s).';
+$messages['contactdeleted'] = 'Contact(s) deleted successfully.';
+$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.';
 
+?>
diff --git a/program/localization/mr_IN/labels.inc b/program/localization/mr_IN/labels.inc
index 83e05001a..02b129e0b 100755
--- a/program/localization/mr_IN/labels.inc
+++ b/program/localization/mr_IN/labels.inc
@@ -2,56 +2,78 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/mr_IN/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = '$product वरती स्वागत आहे';
-$labels['username'] = 'वापरकर्त्याचे नाव(तुमचे इमेल)';
-$labels['password'] = 'परवलीचा शब्द';
-$labels['server'] = 'सर्व्हर';
-$labels['login'] = 'प्रवेश';
-$labels['logout'] = 'बाहेर जा';
-$labels['mail'] = 'इ-मेल';
+
+// login page
+$labels['welcome']   = '$product वरती स्वागत आहे';
+$labels['username']  = 'वापरकर्त्याचे नाव(तुमचे इमेल)';
+$labels['password']  = 'परवलीचा शब्द';
+$labels['server']    = 'सर्व्हर';
+$labels['login']     = 'प्रवेश';
+
+// taskbar
+$labels['logout']   = 'बाहेर जा';
+$labels['mail']     = 'इ-मेल';
 $labels['settings'] = 'तुमची पसंती';
 $labels['addressbook'] = 'पत्ता नोंदवही';
-$labels['inbox'] = 'आलेले संदेश';
+
+// mailbox names
+$labels['inbox']  = 'आलेले संदेश';
 $labels['drafts'] = 'मसुदा';
-$labels['sent'] = 'पाठवलेले';
-$labels['trash'] = 'कचरा पेटी';
-$labels['junk'] = 'नको असलेले कचरा संदेश';
+$labels['sent']   = 'पाठवलेले';
+$labels['trash']  = 'कचरा पेटी';
+$labels['junk']   = 'नको असलेले कचरा संदेश';
+
+// message listing
 $labels['subject'] = 'विषय';
-$labels['from'] = 'प्रेषक';
-$labels['to'] = 'प्रती';
-$labels['cc'] = 'प्रत';
-$labels['bcc'] = 'गुप्त प्रत';
+$labels['from']    = 'प्रेषक';
+$labels['sender']  = 'Sender';
+$labels['to']      = 'प्रती';
+$labels['cc']      = 'प्रत';
+$labels['bcc']     = 'गुप्त प्रत';
 $labels['replyto'] = 'यास उत्तर द्या';
-$labels['date'] = 'दिनांक';
-$labels['size'] = 'आकार';
+$labels['followupto'] = 'Followup-To';
+$labels['date']    = 'दिनांक';
+$labels['size']    = 'आकार';
 $labels['priority'] = 'प्राधान्य';
 $labels['organization'] = 'संस्था';
 $labels['readstatus'] = 'वाचन स्थिती';
 $labels['listoptions'] = 'विकल्प सूची';
+
 $labels['mailboxlist'] = 'फोल्डर्स';
-$labels['folders'] = 'फोल्डर्स';
 $labels['messagesfromto'] = 'संदेश $from कडून $to साठी $count वा';
 $labels['threadsfromto'] = 'धागे $from कडून $to साठी $count वा';
 $labels['messagenrof'] = 'Message $nr of $count';
-$labels['copy'] = 'नक्‍कल';
-$labels['move'] = 'हलवा';
-$labels['moveto'] = 'या फोल्डरमधे ठेवा';
+$labels['fromtoshort'] = '$from – $to of $count';
+
+$labels['copy']     = 'नक्‍कल';
+$labels['move']     = 'हलवा';
+$labels['moveto']   = 'या फोल्डरमधे ठेवा';
 $labels['download'] = 'उतरवून घ्या';
+$labels['open']     = 'Open';
+$labels['showattachment'] = 'Show';
+$labels['showanyway'] = 'Show it anyway';
+
 $labels['filename'] = 'फाईलचे नाव';
 $labels['filesize'] = 'फाईलचा आकार';
+
 $labels['addtoaddressbook'] = 'पत्ता नोंदवहीत नोंदवा';
+
+// weekdays short
 $labels['sun'] = 'रवी';
 $labels['mon'] = 'सोम';
 $labels['tue'] = 'मंगळ';
@@ -59,75 +81,90 @@ $labels['wed'] = 'बुध';
 $labels['thu'] = 'गुरु';
 $labels['fri'] = 'शुक्र';
 $labels['sat'] = 'शनी';
-$labels['sunday'] = 'रविवार';
-$labels['monday'] = 'सोमवार';
-$labels['tuesday'] = 'मंगळवार';
+
+// weekdays long
+$labels['sunday']    = 'रविवार';
+$labels['monday']    = 'सोमवार';
+$labels['tuesday']   = 'मंगळवार';
 $labels['wednesday'] = 'बुधवार';
-$labels['thursday'] = 'गुरुवार';
-$labels['friday'] = 'शुक्रवार';
-$labels['saturday'] = 'शनीवार';
-$labels['jan'] = 'जाने';
-$labels['feb'] = 'फेब्';
-$labels['mar'] = 'मार्च';
-$labels['apr'] = 'एप्रिल';
-$labels['may'] = 'मे';
-$labels['longmay'] = 'मे';
-$labels['jun'] = 'जून';
-$labels['jul'] = 'जुलै';
-$labels['aug'] = 'ऑगस्ट';
-$labels['sep'] = 'सप्टें';
-$labels['oct'] = 'ऑक्टो';
-$labels['nov'] = 'नोव्हें';
-$labels['dec'] = 'डिसें';
-$labels['longjan'] = 'जानेवारी';
-$labels['longfeb'] = 'फेब्रूवारी';
-$labels['longmar'] = 'मार्च';
-$labels['longapr'] = 'एप्रिल';
-$labels['longjun'] = 'जून';
-$labels['longjul'] = 'जुलै';
-$labels['longaug'] = 'ऑगस्ट';
-$labels['longsep'] = 'सप्टेंबर';
-$labels['longoct'] = 'ऑक्टोबर';
-$labels['longnov'] = 'नोव्हेंबर';
-$labels['longdec'] = 'डिसेंबर';
+$labels['thursday']  = 'गुरुवार';
+$labels['friday']    = 'शुक्रवार';
+$labels['saturday']  = 'शनीवार';
+
+// months short
+$labels['jan']	= 'जाने';
+$labels['feb']	= 'फेब्';
+$labels['mar']	= 'मार्च';
+$labels['apr']	= 'एप्रिल';
+$labels['may']	= 'मे';
+$labels['jun']	= 'जून';
+$labels['jul'] 	= 'जुलै';
+$labels['aug']	= 'ऑगस्ट';
+$labels['sep']	= 'सप्टें';
+$labels['oct']	= 'ऑक्टो';
+$labels['nov']	= 'नोव्हें';
+$labels['dec']	= 'डिसें';
+
+// months long
+$labels['longjan']	= 'जानेवारी';
+$labels['longfeb']	= 'फेब्रूवारी';
+$labels['longmar']	= 'मार्च';
+$labels['longapr']	= 'एप्रिल';
+$labels['longmay']	= 'मे';
+$labels['longjun']	= 'जून';
+$labels['longjul']	= 'जुलै';
+$labels['longaug']	= 'ऑगस्ट';
+$labels['longsep']	= 'सप्टेंबर';
+$labels['longoct']	= 'ऑक्टोबर';
+$labels['longnov']	= 'नोव्हेंबर';
+$labels['longdec']	= 'डिसेंबर';
+
 $labels['today'] = 'आज';
-$labels['refresh'] = 'अद्ययावत करा';
-$labels['checkmail'] = 'नवीन संदेश आले आहेत का पहा';
-$labels['compose'] = 'नवीन संदेश तयार करा';
-$labels['writenewmessage'] = 'नवीन संदेश तयार करा';
-$labels['reply'] = 'उत्तर दया';
-$labels['replytomessage'] = 'पाठवणार्‍याला उत्तर द्या';
+
+// toolbar buttons
+$labels['refresh']          = 'अद्ययावत करा';
+$labels['checkmail']        = 'नवीन संदेश आले आहेत का पहा';
+$labels['compose']          = 'नवीन संदेश तयार करा';
+$labels['writenewmessage']  = 'नवीन संदेश तयार करा';
+$labels['reply']            = 'उत्तर दया';
+$labels['replytomessage']   = 'पाठवणार्‍याला उत्तर द्या';
 $labels['replytoallmessage'] = 'पाठवणार्‍याला आणि प्रत केलेल्या सर्वांना संदेश पाठवा';
-$labels['replyall'] = 'सर्वांना उत्तर दया';
-$labels['forwardmessage'] = 'हा संदेश पुढे पाठवा';
-$labels['deletemessage'] = 'संदेश काढून टाका';
+$labels['replyall']         = 'सर्वांना उत्तर दया';
+$labels['replylist']        = 'Reply list';
+$labels['forward']          = 'Forward';
+$labels['forwardinline']    = 'Forward inline';
+$labels['forwardattachment'] = 'Forward as attachment';
+$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['more'] = 'अधिक';
-$labels['back'] = 'मागे';
-$labels['options'] = 'पर्याय';
+$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['more']             = 'अधिक';
+$labels['back']             = 'मागे';
+$labels['options']          = 'पर्याय';
+
 $labels['select'] = 'निवडा';
 $labels['all'] = 'सर्व';
 $labels['none'] = 'कोणताही नाही';
-$labels['nonesort'] = 'कोणताही नाही';
 $labels['currpage'] = 'सध्‍याचे पान';
 $labels['unread'] = 'न वाचलेले';
 $labels['flagged'] = 'खूण लावलेले';
 $labels['unanswered'] = 'उत्तर न दिलेले';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'काढून टाकलेला(ले)';
+$labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'उलट करा';
 $labels['filter'] = 'गाळणी';
 $labels['list'] = 'यादी';
@@ -136,12 +173,14 @@ $labels['expand-all'] = 'सर्व विस्‍तारीत करा';
 $labels['expand-unread'] = 'न वाचलेला विस्‍तारा';
 $labels['collapse-all'] = 'सर्व मिटवा';
 $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['asc'] = 'चढत्‍या क्रमाने';
@@ -150,151 +189,220 @@ $labels['listcolumns'] = 'सुची स्‍तंभ';
 $labels['listsorting'] = 'स्‍तंभ वर्गीकरण';
 $labels['listorder'] = 'वर्गीकरण क्रम';
 $labels['listmode'] = 'यादी दर्शक पध्‍दत';
+
 $labels['folderactions'] = 'फोल्डर कृती..';
 $labels['compact'] = 'छोटा';
 $labels['empty'] = 'रिकामा';
+
 $labels['quota'] = 'डिस्कचा वापर';
-$labels['unknown'] = 'माहित नसलेला';
-$labels['unlimited'] = 'अमर्याद';
-$labels['quicksearch'] = 'चटकन शोध';
-$labels['resetsearch'] = 'परत शोध';
-$labels['searchmod'] = 'बदलकर्त्‍यांना शोधा';
-$labels['msgtext'] = 'संपूर्ण संदेश';
+$labels['unknown']  = 'माहित नसलेला';
+$labels['unlimited']  = 'अमर्याद';
+
+$labels['quicksearch']  = 'चटकन शोध';
+$labels['resetsearch']  = 'परत शोध';
+$labels['searchmod']  = 'बदलकर्त्‍यांना शोधा';
+$labels['msgtext']  = 'संपूर्ण संदेश';
+$labels['body']  = 'Body';
+
 $labels['openinextwin'] = 'नवीन खिडकी उघडा';
 $labels['emlsave'] = 'इएमएल स्‍वरूपात उतरवून घ्या';
-$labels['editasnew'] = 'नवीन आहे असा संपादित करा';
-$labels['sendmessage'] = 'आत्ता पाठवा';
-$labels['savemessage'] = 'हा मसूदा साठवून ठेवा';
-$labels['addattachment'] = 'फाईल सोबत जोडा';
-$labels['charset'] = 'कॅरेक्टर सेट';
-$labels['editortype'] = 'संपादकाचा प्रकार';
-$labels['returnreceipt'] = 'पोच पावती';
-$labels['dsn'] = 'पोच स्थिती निर्देशक';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
+
+// message compose
+$labels['editasnew']      = 'नवीन आहे असा संपादित करा';
+$labels['send']           = 'Send';
+$labels['sendmessage']    = 'आत्ता पाठवा';
+$labels['savemessage']    = 'हा मसूदा साठवून ठेवा';
+$labels['addattachment']  = 'फाईल सोबत जोडा';
+$labels['charset']        = 'कॅरेक्टर सेट';
+$labels['editortype']     = 'संपादकाचा प्रकार';
+$labels['returnreceipt']  = 'पोच पावती';
+$labels['dsn']            = 'पोच स्थिती निर्देशक';
 $labels['mailreplyintro'] = '$date या दिवशी $sender ने लिहीले :';
 $labels['originalmessage'] = 'खरा संदेश';
-$labels['editidents'] = 'ओळख संपादित करा';
-$labels['spellcheck'] = 'लिखाण';
+
+$labels['editidents']    = 'ओळख संपादित करा';
+$labels['spellcheck']    = 'लिखाण';
 $labels['checkspelling'] = 'शुध्द लेखन';
 $labels['resumeediting'] = 'परत संदेश संपादित करा';
-$labels['revertto'] = 'परत जा';
+$labels['revertto']      = 'परत जा';
+
 $labels['attach'] = 'जोडा';
 $labels['attachments'] = 'जोडलेल्या';
 $labels['upload'] = 'चढवा';
-$labels['close'] = 'बंद';
-$labels['messageoptions'] = 'संदेश पर्याय..';
-$labels['low'] = 'कमी';
-$labels['lowest'] = 'कमित कमी';
-$labels['normal'] = 'नेहमी प्रमाणे';
-$labels['high'] = 'तातडीचे';
+$labels['uploadprogress'] = '$percent ($current from $total)';
+$labels['close']  = 'बंद';
+$labels['messageoptions']  = 'संदेश पर्याय..';
+
+$labels['low']     = 'कमी';
+$labels['lowest']  = 'कमित कमी';
+$labels['normal']  = 'नेहमी प्रमाणे';
+$labels['high']    = 'तातडीचे';
 $labels['highest'] = 'अतिशय तातडीचे';
-$labels['nosubject'] = '(विषय नाही)';
+
+$labels['nosubject']  = '(विषय नाही)';
 $labels['showimages'] = 'चित्र दाखवा';
 $labels['alwaysshow'] = '$sender कडून आलेल्या संदेशातील चित्रे नेहमी दाखवा';
-$labels['isdraft'] = 'हा मसुदा संदेश आहे';
+$labels['isdraft']    = 'हा मसुदा संदेश आहे';
+$labels['andnmore']   = '$nr more...';
+$labels['togglemoreheaders'] = 'Show more message headers';
+$labels['togglefullheaders'] = 'Toggle raw message headers';
+
 $labels['htmltoggle'] = 'एच टी एम एल';
 $labels['plaintoggle'] = 'साधे लिखाण';
 $labels['savesentmessagein'] = 'पाठवलेला संदेश या फोल्डरमधे ठेवा';
 $labels['dontsave'] = 'संदेश साठवू नका';
 $labels['maxuploadsize'] = 'जास्‍तीत जास्‍त फाइलचा आकार $size असू शकतो';
+
 $labels['addcc'] = 'प्रत करा';
 $labels['addbcc'] = 'गुप्त प्रत करा';
 $labels['addreplyto'] = 'आणखी लोकांना संदेश पाठवा';
+$labels['addfollowupto'] = 'Add Followup-To';
+
+// mdn
 $labels['mdnrequest'] = 'हा संदेश पाठवणार्‍याने हा संदेश तुम्ही वाचल्यावर कळवावयाला सांगितले आहे. तुम्हाला असे कळवणे चालेल ना?';
 $labels['receiptread'] = 'पोच पावती (संदेश वाचला)';
 $labels['yourmessage'] = 'ही तुमच्या संदेशाची पोच पावती आहे.';
 $labels['receiptnote'] = 'सूचना: ही पोच पावती तुम्ही ज्यांना  संदेश पाठवला त्यांच्या संगणकावर दिसला एवढेच सांगते. तुम्ही ज्यांना हा संदेश पाठवला, त्यांनी तो वाचला, आणि त्यांना तो नक्की समजला हे मात्र सांगत नाही.';
-$labels['name'] = 'टोपणनाव';
-$labels['firstname'] = 'नाव';
-$labels['surname'] = 'आडनाव';
-$labels['middlename'] = 'मधले नाव';
-$labels['nickname'] = 'टोपणनाव';
-$labels['jobtitle'] = 'कामाचे शिर्षक';
-$labels['department'] = 'विभाग';
-$labels['gender'] = 'लिंग';
-$labels['email'] = 'इ-मेल्';
-$labels['phone'] = 'दूरध्वनी';
-$labels['address'] = 'पत्ता';
-$labels['street'] = 'रस्ता';
-$labels['locality'] = 'शहर';
-$labels['region'] = 'राज्य / संस्थान';
-$labels['country'] = 'देश';
-$labels['birthday'] = 'वाढदिवस';
-$labels['website'] = 'संकेतस्थळ';
+
+// address boook
+$labels['name']         = 'टोपणनाव';
+$labels['firstname']    = 'नाव';
+$labels['surname']      = 'आडनाव';
+$labels['middlename']   = 'मधले नाव';
+$labels['nameprefix']   = 'Prefix';
+$labels['namesuffix']   = 'Suffix';
+$labels['nickname']     = 'टोपणनाव';
+$labels['jobtitle']     = 'कामाचे शिर्षक';
+$labels['department']   = 'विभाग';
+$labels['gender']       = 'लिंग';
+$labels['maidenname']   = 'Maiden Name';
+$labels['email']        = 'इ-मेल्';
+$labels['phone']        = 'दूरध्वनी';
+$labels['address']      = 'पत्ता';
+$labels['street']       = 'रस्ता';
+$labels['locality']     = 'शहर';
+$labels['zipcode']      = 'ZIP Code';
+$labels['region']       = 'राज्य / संस्थान';
+$labels['country']      = 'देश';
+$labels['birthday']     = 'वाढदिवस';
+$labels['anniversary']  = 'Anniversary';
+$labels['website']      = 'संकेतस्थळ';
+$labels['instantmessenger'] = 'IM';
 $labels['notes'] = 'टिपा';
-$labels['male'] = 'पुरूष';
+$labels['male']   = 'पुरूष';
 $labels['female'] = 'स्त्री';
 $labels['manager'] = 'व्यवस्थापक';
 $labels['assistant'] = 'सहाय्यक';
-$labels['typeassistant'] = 'सहाय्यक';
+$labels['spouse'] = 'Spouse';
+$labels['allfields'] = 'All fields';
 $labels['search'] = 'शोध';
 $labels['advsearch'] = 'प्रगत शोध';
 $labels['advanced'] = 'आधुनिक';
 $labels['other'] = 'इतर';
-$labels['typeother'] = 'इतर';
-$labels['typehome'] = 'मुख्यपृष्ठ';
-$labels['typework'] = 'काम';
-$labels['typemobile'] = 'भ्रमणध्वनी';
-$labels['typemain'] = 'मुख्य';
-$labels['typevideo'] = 'चलचित्र';
-$labels['typehomepage'] = 'मुख्य पृष्ठ';
+
+$labels['typehome']   = 'मुख्यपृष्ठ';
+$labels['typework']   = 'काम';
+$labels['typeother']  = 'इतर';
+$labels['typemobile']  = 'भ्रमणध्वनी';
+$labels['typemain']  = 'मुख्य';
+$labels['typehomefax']  = 'Home Fax';
+$labels['typeworkfax']  = 'Work Fax';
+$labels['typecar']  = 'Car';
+$labels['typepager']  = 'Pager';
+$labels['typevideo']  = 'चलचित्र';
+$labels['typeassistant']  = 'सहाय्यक';
+$labels['typehomepage']  = 'मुख्य पृष्ठ';
+$labels['typeblog'] = 'Blog';
+$labels['typeprofile'] = 'Profile';
+
+$labels['addfield'] = 'Add field...';
 $labels['addcontact'] = 'नवीन पत्ता नोंदवहीत ठेवा';
 $labels['editcontact'] = 'नोंदवहीतील पत्ता सुधारा';
 $labels['contacts'] = 'संपर्क';
+$labels['contactproperties'] = 'Contact properties';
 $labels['personalinfo'] = 'वैयक्तिक माहिती';
-$labels['edit'] = 'संदेश तयार करा';
+
+$labels['edit']   = 'संदेश तयार करा';
 $labels['cancel'] = 'रद्द करा';
-$labels['save'] = 'ठेवून द्या';
+$labels['save']   = 'ठेवून द्या';
 $labels['delete'] = 'काढून टाका';
 $labels['rename'] = 'दूसरे नाव द्या';
 $labels['addphoto'] = 'समावेश करा';
 $labels['replacephoto'] = 'बदला';
-$labels['newcontact'] = 'नोंदवहीत नवीन संपर्क लिहिण्यासाठी';
-$labels['deletecontact'] = 'खूण केलेले सर्व संपर्काचे पत्ते काढून टाका';
-$labels['composeto'] = 'साठी नवीन संदेश तयार करा';
+$labels['uploadphoto'] = 'Upload photo';
+
+$labels['newcontact']     = 'नोंदवहीत नवीन संपर्क लिहिण्यासाठी';
+$labels['deletecontact']  = 'खूण केलेले सर्व संपर्काचे पत्ते काढून टाका';
+$labels['composeto']      = 'साठी नवीन संदेश तयार करा';
 $labels['contactsfromto'] = '$from पासून ते $to पर्यंत $count पैकी';
-$labels['print'] = 'छापा';
-$labels['export'] = 'निर्यात करा';
-$labels['exportvcards'] = 'व्ही कार्ड स्वरुपात पत्ते निर्यात करा';
+$labels['print']          = 'छापा';
+$labels['export']         = 'निर्यात करा';
+$labels['exportall']      = 'Export all';
+$labels['exportsel']      = 'Export selected';
+$labels['exportvcards']   = 'व्ही कार्ड स्वरुपात पत्ते निर्यात करा';
 $labels['newcontactgroup'] = 'नवीन पत्‍त्‍यांचा गट बनवा';
-$labels['groupdelete'] = 'गट नष्ट करा';
-$labels['previouspage'] = 'आधिचा संच दाखवा';
-$labels['firstpage'] = 'पहिला संच दाखवा';
-$labels['nextpage'] = 'नंतरचा संच दाखवा';
-$labels['lastpage'] = 'शेवटचा संच दाखवा';
+$labels['grouprename']    = 'Rename group';
+$labels['groupdelete']    = 'गट नष्ट करा';
+$labels['groupremoveselected'] = 'Remove selected contacts from group';
+
+$labels['previouspage']   = 'आधिचा संच दाखवा';
+$labels['firstpage']      = 'पहिला संच दाखवा';
+$labels['nextpage']       = 'नंतरचा संच दाखवा';
+$labels['lastpage']       = 'शेवटचा संच दाखवा';
+
 $labels['group'] = 'गट';
 $labels['groups'] = 'अनेक गट';
 $labels['personaladrbook'] = 'वैयक्तिक पत्ते';
+
 $labels['searchsave'] = 'शोध जतन करा';
 $labels['searchdelete'] = 'शोध नष्ट करा';
+
 $labels['import'] = 'आयात करा';
 $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['done'] = 'झाले';
+
+// settings
 $labels['settingsfor'] = 'साठी सेटिंग्ज';
 $labels['about'] = 'च्या विषयी';
 $labels['preferences'] = 'तुमची पसंती';
 $labels['userpreferences'] = 'वापरकर्त्याची पसंती';
 $labels['editpreferences'] = 'वापरकर्त्याची पसंती सुधारा';
+
 $labels['identities'] = 'ओळख';
 $labels['manageidentities'] = 'या खात्यासाठी ओळखींचे नियोजन करा';
 $labels['newidentity'] = 'नवीन ओळख';
+
 $labels['newitem'] = 'नवीन प्रकार';
 $labels['edititem'] = 'प्रकार सुधारा';
+
 $labels['preferhtml'] = 'एच टी एम एल दाखवा';
 $labels['defaultcharset'] = 'नेहमीचा अक्षर संच';
 $labels['htmlmessage'] = 'एच टी एम एल संदेश';
+$labels['messagepart'] = 'Part';
+$labels['digitalsig'] = 'Digital Signature';
+$labels['dateformat'] = 'Date format';
+$labels['timeformat'] = 'Time format';
 $labels['prettydate'] = 'विशेष दिवस';
-$labels['setdefault'] = 'हा नेहमीसाठी वापरा';
-$labels['autodetect'] = 'स्वयंचलित';
-$labels['language'] = 'भाषा';
-$labels['timezone'] = 'वेळ  क्षेत्र';
-$labels['pagesize'] = 'प्रत्येक पानावरील ओळी';
+$labels['setdefault']  = 'हा नेहमीसाठी वापरा';
+$labels['autodetect']  = 'स्वयंचलित';
+$labels['language']  = 'भाषा';
+$labels['timezone']  = 'वेळ  क्षेत्र';
+$labels['pagesize']  = 'प्रत्येक पानावरील ओळी';
 $labels['signature'] = 'सही';
-$labels['dstactive'] = 'दिवसाची वेळ';
+$labels['dstactive']  = 'दिवसाची वेळ';
+$labels['showinextwin'] = 'Open message in a new window';
+$labels['composeextwin'] = 'Compose in a new window';
 $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'] = 'खात्यातून बाहेर पडतांना कचरा पेटी साफ करा';
@@ -305,19 +413,23 @@ $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'] = 'Directly delete messages in Junk';
 $labels['showremoteimages'] = 'संदेशातील चित्रे दाखवा';
 $labels['fromknownsenders'] = 'माहितीतील पाठवणार्‍याकडून संदेश';
 $labels['always'] = 'नेहमी';
 $labels['showinlineimages'] = 'सोबत जोडलेली चित्रे संदेशाच्या खाली दाखवा';
-$labels['autosavedraft'] = 'मसूदा आपोआप जतन करा';
-$labels['everynminutes'] = 'प्रत्येक $n मिनिटांनी';
-$labels['never'] = 'कधीच नाही';
-$labels['immediately'] = 'ताबडतोब';
+$labels['autosavedraft']  = 'मसूदा आपोआप जतन करा';
+$labels['everynminutes']  = 'प्रत्येक $n मिनिटांनी';
+$labels['refreshinterval']  = 'Refresh (check for new messages, etc.)';
+$labels['never']  = 'कधीच नाही';
+$labels['immediately']  = 'ताबडतोब';
 $labels['messagesdisplaying'] = 'संदेश दाखवा';
 $labels['messagescomposition'] = 'संदेश तयार करा';
 $labels['mimeparamfolding'] = 'सोबत दिलेल्या फाईल्सची नावे';
@@ -329,41 +441,81 @@ $labels['advancedoptions'] = 'अधिक पर्याय';
 $labels['focusonnewmessage'] = 'ब्राऊझर खिडकी नवीन संदेशावर केंद्रित करा';
 $labels['checkallfolders'] = 'सर्व फोल्डरमधे नवीन संदेश शोधा';
 $labels['displaynext'] = 'संदेश काढल्‍यानंतर किंवा हलवल्‍यानंतर पुढचा संदेश दाखवा';
+$labels['defaultfont'] = 'Default font of HTML message';
 $labels['mainoptions'] = 'मुख्‍य पर्याय';
+$labels['browseroptions'] = 'Browser Options';
 $labels['section'] = 'भाग';
 $labels['maintenance'] = 'देखभाल';
 $labels['newmessage'] = 'नवीन संदेश';
 $labels['signatureoptions'] = 'सही पर्याय';
 $labels['whenreplying'] = 'उत्‍तर देताना';
+$labels['replyempty'] = 'do not quote the original message';
 $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 क्षणानंतर';
+$labels['previewpanemarkread']  = 'प्रदर्शित संदेश पाहीले अशी खुण करा';
+$labels['afternseconds']  = '$n क्षणानंतर';
 $labels['reqmdn'] = 'नेहमी पोचपावतीची विनंती करा';
 $labels['reqdsn'] = 'नेहमी पोचपावती स्थिती निर्देशाची विनंती करा';
-$labels['folder'] = 'फोल्डर';
-$labels['foldername'] = 'फोल्डरचे नाव';
-$labels['subscribed'] = 'वर्गणिदार होणे';
+$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'] = 'Check spelling before sending a message';
+$labels['spellcheckoptions'] = 'Spellcheck Options';
+$labels['spellcheckignoresyms'] = 'Ignore words with symbols';
+$labels['spellcheckignorenums'] = 'Ignore words with numbers';
+$labels['spellcheckignorecaps'] = 'Ignore words with all letters capitalized';
+$labels['addtodict'] = 'Add to dictionary';
+$labels['mailtoprotohandler'] = 'Register protocol handler for mailto: links';
+$labels['forwardmode'] = 'Messages forwarding';
+$labels['inline'] = 'inline';
+$labels['asattachment'] = 'as attachment';
+
+$labels['folder']  = 'फोल्डर';
+$labels['folders']  = 'फोल्डर्स';
+$labels['foldername']  = 'फोल्डरचे नाव';
+$labels['subscribed']  = 'वर्गणिदार होणे';
 $labels['messagecount'] = 'संदेश';
-$labels['create'] = 'तयार करा';
-$labels['createfolder'] = 'नवीन फोल्डर तयार करा';
-$labels['managefolders'] = 'फोल्डर्सचे नियोजन करा';
+$labels['create']  = 'तयार करा';
+$labels['createfolder']  = 'नवीन फोल्डर तयार करा';
+$labels['managefolders']  = 'फोल्डर्सचे नियोजन करा';
 $labels['specialfolders'] = 'विषेश फोल्डर';
+$labels['properties'] = 'Properties';
+$labels['folderproperties'] = 'Folder properties';
+$labels['parentfolder'] = 'Parent folder';
+$labels['location'] = 'Location';
+$labels['info'] = 'Information';
+$labels['getfoldersize'] = 'Click to get folder size';
+$labels['changesubscription'] = 'Click to change subscription';
+$labels['foldertype'] = 'Folder Type';
+$labels['personalfolder']  = 'Private Folder';
+$labels['otherfolder']  = 'Other User\'s Folder';
+$labels['sharedfolder']  = 'Public Folder';
+
 $labels['sortby'] = 'ने वर्गवारी करा';
-$labels['sortasc'] = 'चढत्या क्रमाने';
+$labels['sortasc']  = 'चढत्या क्रमाने';
 $labels['sortdesc'] = 'उतरत्या क्रमाने';
+$labels['undo'] = 'Undo';
+
+$labels['installedplugins'] = 'Installed plugins';
+$labels['plugin'] = 'Plugin';
+$labels['version'] = 'Version';
+$labels['source'] = 'Source';
+$labels['license'] = 'License';
+$labels['support'] = 'Get support';
+
+// units
 $labels['B'] = 'बाइट';
 $labels['KB'] = 'केबी';
 $labels['MB'] = 'एमबी';
 $labels['GB'] = 'जीबी';
+
+// character sets
 $labels['unicode'] = 'युनिकोड';
 $labels['english'] = 'इंग्रजी';
 $labels['westerneuropean'] = 'पश्चिम युरोपियन';
@@ -383,3 +535,4 @@ $labels['japanese'] = 'जपानी';
 $labels['korean'] = 'कोरियन';
 $labels['chinese'] = 'चिनी';
 
+?>
diff --git a/program/localization/mr_IN/messages.inc b/program/localization/mr_IN/messages.inc
index 5945ef1e6..bc4097fb5 100755
--- a/program/localization/mr_IN/messages.inc
+++ b/program/localization/mr_IN/messages.inc
@@ -2,35 +2,43 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/mr_IN/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Devendra Buddhikot <devendradb@rediffmail.com>                |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['errortitle'] = 'काहीतरी चूक झाली';
-$messages['loginfailed'] = 'प्रवेश करता आला नाही';
+$messages['errortitle']  = 'काहीतरी चूक झाली';
+$messages['loginfailed']  = 'प्रवेश करता आला नाही';
 $messages['cookiesdisabled'] = 'तुमचा ब्राऊझर कुकीज घेऊ शकत नाही';
 $messages['sessionerror'] = 'तुम्ही प्रवेश केल्यानंतर बराच वेळ काही न करता गेला म्हणून तुमचा कालावधी संपला किंवा तुमच्या कालावधीच्या नोंदेत काही चूक झाली आहे.';
 $messages['storageerror'] = 'आयमॅप सर्व्हरशी संपर्क होवू शकला नाही.';
 $messages['servererror'] = 'सर्व्‍हर चूक !';
 $messages['servererrormsg'] = 'सर्व्हर चूक : $msg';
 $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'] = 'या खात्यामधे कोणताही संदेश आलेला नाही';
 $messages['loggedout'] = 'तुम्ही यशस्वीरित्या खाते बंद केले आहे . राम राम !';
 $messages['mailboxempty'] = 'खात्यात कोणताही संदेश नाही';
+$messages['refreshing'] = 'Refreshing...';
 $messages['loading'] = 'संदेश आणत आहे';
 $messages['uploading'] = 'फाईल चढवली जात आहे...';
+$messages['uploadingmany'] = 'Uploading files...';
 $messages['loadingdata'] = 'माहिती आणत आहे';
 $messages['checkingmail'] = 'नवीन संदेश आले आहेत का हे पहात आहे';
 $messages['sendingmessage'] = 'संदेश पाठवत आहे';
@@ -45,6 +53,7 @@ $messages['blockedimages'] = 'तुमची गोपनीयता पाळ
 $messages['encryptedmessage'] = 'हा गुप्त व सांकेतिक संदेश आहे. तो तुम्हाला असा दाखवता येणार नाही.';
 $messages['nocontactsfound'] = 'कोणताच पत्ता नोंदवहीत नाही.';
 $messages['contactnotfound'] = 'या नावाचा कोणताच पत्ता नोंदवहीत नाही.';
+$messages['contactsearchonly'] = 'Enter some search terms to find contacts';
 $messages['sendingfailed'] = 'संदेश पाठवता आला नाही.';
 $messages['senttooquickly'] = 'कृपया हा संदेश पाठवण्यापूर्वी $sec थांबा';
 $messages['errorsavingsent'] = 'पाठवलेला संदेश ठेवून देतांना काहीतरी चूक झाली.';
@@ -53,31 +62,38 @@ $messages['errormoving'] = 'संदेश तेथे ठेवता आल�
 $messages['errorcopying'] = 'संदेशांची नक्‍कल करता आली नाही';
 $messages['errordeleting'] = 'संदेश काढून टाकता आला नाही.';
 $messages['errormarking'] = 'संदेशांवर खूण करता आली नाही.';
-$messages['deletecontactconfirm'] = 'खूण केलेले सर्व पत्ते खरोखरच तुम्हाला काढून टाकायचे आहेत का?';
-$messages['deletegroupconfirm'] = 'निवडलेला गट तुम्हाला नक्की नष्ट करायचा आहे का?';
+$messages['deletecontactconfirm']  = 'खूण केलेले सर्व पत्ते खरोखरच तुम्हाला काढून टाकायचे आहेत का?';
+$messages['deletegroupconfirm']  = 'निवडलेला गट तुम्हाला नक्की नष्ट करायचा आहे का?';
 $messages['deletemessagesconfirm'] = 'खूण केलेले सर्व संदेश खरोखरच तुम्हाला काढून टाकायचे आहेत का?';
-$messages['deletefolderconfirm'] = 'हा फोल्डर खरोखरच तुम्हाला काढून टाकायचा आहेत का?';
-$messages['purgefolderconfirm'] = 'या फोल्डरमधिल सर्व संदेश खरोखरच तुम्हाला काढून टाकायचे आहेत का?';
+$messages['deletefolderconfirm']  = 'हा फोल्डर खरोखरच तुम्हाला काढून टाकायचा आहेत का?';
+$messages['purgefolderconfirm']  = 'या फोल्डरमधिल सर्व संदेश खरोखरच तुम्हाला काढून टाकायचे आहेत का?';
+$messages['contactdeleting'] = 'Deleting contact(s)...';
+$messages['groupdeleting'] = 'Deleting group...';
 $messages['folderdeleting'] = 'फोल्डर काढून टाकत आहे';
 $messages['foldermoving'] = 'फोल्डर हलवत आहे.';
+$messages['foldersubscribing'] = 'Subscribing folder...';
+$messages['folderunsubscribing'] = 'Unsubscribing folder...';
 $messages['formincomplete'] = 'फॉर्म पूर्णपणे भरलेला  नाही.';
 $messages['noemailwarning'] = 'योग्य, बरोबर, आणि वैध इमेल पत्ता द्या.';
-$messages['nonamewarning'] = 'नाव द्या';
+$messages['nonamewarning']  = 'नाव द्या';
 $messages['nopagesizewarning'] = 'पानाचा आकार द्या';
 $messages['nosenderwarning'] = 'पाठवणार्‍याचा इमेल पत्ता द्या';
 $messages['norecipientwarning'] = 'किमान एकतरी पत्ता द्या ज्यांना तुम्हाला संदेश पाठवावयाचा आहे.';
-$messages['nosubjectwarning'] = 'विषय दिलेला नाही. तुम्हाला विषय द्यायचा आहे का?';
+$messages['nosubjectwarning']  = 'विषय दिलेला नाही. तुम्हाला विषय द्यायचा आहे का?';
 $messages['nobodywarning'] = 'संदेशामधे कोणताही मजकूर नाही. तुम्हाला तसाच संदेश पाठवावयाचा आहे का?';
 $messages['notsentwarning'] = 'संदेश पाठवला गेला नाही. तुम्हाला हा संदेश रद्द करायचा आहे का?';
 $messages['noldapserver'] = 'शोधण्यासाठी ldap सर्व्हर निवडा';
 $messages['nosearchname'] = 'कृपया ज्यांना तुम्हाला संदेश पाठवावयाचा आहे त्यांचे नाव किंवा इमेल पत्ता द्या.';
 $messages['notuploadedwarning'] = 'सर्व फाईल अजून चढवल्‍या गेलेल्‍या नाहीत. कृपया वाट पहा किंवा मागे फिरा';
 $messages['searchsuccessful'] = '$nr संदेष मिळाले.';
+$messages['contactsearchsuccessful'] = '$nr contacts found.';
 $messages['searchnomatch'] = 'शोध घेतल्यानंतर एकही संदेश मिळाला नाही';
 $messages['searching'] = 'शोधत आहे......';
 $messages['checking'] = 'तपासत आहे.....';
 $messages['nospellerrors'] = 'शुध्दलेखनाची चूक सापडली नाही';
 $messages['folderdeleted'] = 'फोल्डर यशस्वी रित्या काढून टाकण्यात आला आहे.';
+$messages['foldersubscribed'] = 'Folder successfully subscribed.';
+$messages['folderunsubscribed'] = 'Folder successfully unsubscribed.';
 $messages['folderpurged'] = 'फोल्डर यशस्वीरीत्या रिकामा केला';
 $messages['folderexpunged'] = 'फोल्डर यशस्वीरीत्या संक्षिप्त केला';
 $messages['deletedsuccessfully'] = 'यशस्वी रित्या काढून टाकण्यात आला आहे.';
@@ -91,6 +107,11 @@ $messages['sourceisreadonly'] = 'पत्ता फक्त वाचण्य
 $messages['errorsavingcontact'] = 'पत्ता नोंदवहीत ठेवता आला नाही.';
 $messages['movingmessage'] = 'संदेश हलवत आहे..';
 $messages['copyingmessage'] = 'संदेशाची नक्‍कल करत आहे...';
+$messages['copyingcontact'] = 'Copying contact(s)...';
+$messages['deletingmessage'] = 'Deleting message(s)...';
+$messages['markingmessage'] = 'Marking message(s)...';
+$messages['addingmember'] = 'Adding contact(s) to the group...';
+$messages['removingmember'] = 'Removing contact(s) from the group...';
 $messages['receiptsent'] = 'पोचपावती यशस्वीरित्या पाठवण्यात आली आहे.';
 $messages['errorsendingreceipt'] = 'पोचपावती पाठवता आली नाही.';
 $messages['deleteidentityconfirm'] = 'तुम्हाला ही ओळख नक्की नष्ट करायची आहे का?';
@@ -100,9 +121,11 @@ $messages['selectimportfile'] = 'चढवण्यासाठी फाईल
 $messages['addresswriterror'] = 'निवडलेल्या पत्ता नोंदवहीत नोंद करता येत नाही.';
 $messages['contactaddedtogroup'] = 'पत्‍ते यशस्‍वीरित्‍या हया गटात वाढवण्‍यात आले.';
 $messages['contactremovedfromgroup'] = 'पत्‍ते यशस्‍वीरित्‍या हया गटातून काढून टाकले.';
+$messages['nogroupassignmentschanged'] = 'No group assignments changed.';
 $messages['importwait'] = 'आयात करत आहे, कृपया वाट पहा.....';
-$messages['importerror'] = 'आयात झाली नाही. आयात करत असलेली फाईल व्हीकार्ड प्रकाराची नाही';
+$messages['importformaterror'] = 'Import failed! The uploaded file is not a valid import data file.';
 $messages['importconfirm'] = '<b>$inserted पत्ते यशस्वीरित्या आयात केल, $skipped आधिच असलेल्या नोंदी केल्या नाहीत</b>:<p><em>$names</em></p>';
+$messages['importconfirmskipped'] = '<b>Skipped $skipped existing entries</b>';
 $messages['opnotpermitted'] = 'ही क्रिया करण्यास परवानगी नाही.';
 $messages['nofromaddress'] = 'निवडलेल्या खात्यात इमेल पत्ता दिलेला नाही.';
 $messages['editorwarning'] = 'टेक्स्ट संपादन निवडल्यास संदेशाचे दृष्य स्वरुप बदलून जाईल. तुम्हाला असेच करायचे आहे ना?';
@@ -117,4 +140,32 @@ $messages['emailformaterror'] = 'अवैध ईमेल पत्‍ता :
 $messages['toomanyrecipients'] = 'खूप जास्‍त प्राप्‍तकर्ते. प्राप्‍तकर्त्‍यांची संख्‍या $max पर्यंत कमी करा';
 $messages['maxgroupmembersreached'] = 'गट सभासद संख्‍या $max पेक्षा जास्‍त झाली आहे';
 $messages['internalerror'] = 'अंतर्गत चूक झाली. कृपया परत प्रयत्‍न करा.';
+$messages['contactdelerror'] = 'Could not delete contact(s).';
+$messages['contactdeleted'] = 'Contact(s) deleted successfully.';
+$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.';
 
+?>
diff --git a/program/localization/ms_MY/labels.inc b/program/localization/ms_MY/labels.inc
index 51e5073b8..318af05ad 100644
--- a/program/localization/ms_MY/labels.inc
+++ b/program/localization/ms_MY/labels.inc
@@ -2,58 +2,78 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ms_MY/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: nawawi                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = 'Selamat datang ke $product';
-$labels['username'] = 'Nama Pengguna';
-$labels['password'] = 'Katalaluan';
-$labels['server'] = 'Pelayan';
-$labels['login'] = 'Log Masuk';
-$labels['logout'] = 'Log Keluar';
-$labels['mail'] = 'Mel';
+
+// login page
+$labels['welcome']   = 'Selamat datang ke $product';
+$labels['username']  = 'Nama Pengguna';
+$labels['password']  = 'Katalaluan';
+$labels['server']    = 'Pelayan';
+$labels['login']     = 'Log Masuk';
+
+// taskbar
+$labels['logout']   = 'Log Keluar';
+$labels['mail']     = 'Mel';
 $labels['settings'] = 'Tetapan';
 $labels['addressbook'] = 'Buku Alamat';
-$labels['inbox'] = 'Peti Masuk';
+
+// mailbox names
+$labels['inbox']  = 'Peti Masuk';
 $labels['drafts'] = 'Draf';
-$labels['sent'] = 'Hantar';
-$labels['trash'] = 'Tong Sampah';
-$labels['junk'] = 'Junk';
+$labels['sent']   = 'Hantar';
+$labels['trash']  = 'Tong Sampah';
+$labels['junk']   = 'Junk';
+
+// message listing
 $labels['subject'] = 'Subjek';
-$labels['from'] = 'Daripada';
-$labels['to'] = 'Kepada';
-$labels['cc'] = 'Cc';
-$labels['bcc'] = 'Bcc';
+$labels['from']    = 'Daripada';
+$labels['sender']  = 'Sender';
+$labels['to']      = 'Kepada';
+$labels['cc']      = 'Cc';
+$labels['bcc']     = 'Bcc';
 $labels['replyto'] = 'Balasan Kepada';
 $labels['followupto'] = 'Susulan Ke';
-$labels['date'] = 'Tarikh';
-$labels['size'] = 'Saiz';
+$labels['date']    = 'Tarikh';
+$labels['size']    = 'Saiz';
 $labels['priority'] = 'Prioriti';
 $labels['organization'] = 'Organisasi';
 $labels['readstatus'] = 'Status baca';
 $labels['listoptions'] = 'Senarai pilihan';
+
 $labels['mailboxlist'] = 'Folder';
-$labels['folders'] = 'Folder';
 $labels['messagesfromto'] = 'Mesej $from ke $to dari $count';
 $labels['threadsfromto'] = 'Urutan $from ke $to dari $count';
 $labels['messagenrof'] = 'Mesej $nr dari $count';
 $labels['fromtoshort'] = '$from - $to dari $count';
-$labels['copy'] = 'Salin';
-$labels['move'] = 'Alih';
-$labels['moveto'] = 'Alih ke...';
+
+$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';
+
 $labels['filename'] = 'Nama Fail';
 $labels['filesize'] = 'Saiz Fail';
+
 $labels['addtoaddressbook'] = 'Tambah ke buku alamat';
+
+// weekdays short
 $labels['sun'] = 'Aha';
 $labels['mon'] = 'Isn';
 $labels['tue'] = 'Sel';
@@ -61,79 +81,90 @@ $labels['wed'] = 'Rab';
 $labels['thu'] = 'Kha';
 $labels['fri'] = 'Jum';
 $labels['sat'] = 'Sab';
-$labels['sunday'] = 'Ahad';
-$labels['monday'] = 'Isnin';
-$labels['tuesday'] = 'Selasa';
+
+// weekdays long
+$labels['sunday']    = 'Ahad';
+$labels['monday']    = 'Isnin';
+$labels['tuesday']   = 'Selasa';
 $labels['wednesday'] = 'Rabu';
-$labels['thursday'] = 'Khamis';
-$labels['friday'] = 'Jumaat';
-$labels['saturday'] = 'Sabtu';
-$labels['jan'] = 'Jan';
-$labels['feb'] = 'Feb';
-$labels['mar'] = 'Mac';
-$labels['apr'] = 'Apr';
-$labels['may'] = 'Mei';
-$labels['longmay'] = 'Mei';
-$labels['jun'] = 'Jun';
-$labels['jul'] = 'Jul';
-$labels['aug'] = 'Ogo';
-$labels['sep'] = 'Sep';
-$labels['oct'] = 'Okt';
-$labels['nov'] = 'Nov';
-$labels['dec'] = 'Dis';
-$labels['longjan'] = 'Januari';
-$labels['longfeb'] = 'Februari';
-$labels['longmar'] = 'March';
-$labels['longapr'] = 'April';
-$labels['longjun'] = 'Jun';
-$labels['longjul'] = 'Julai';
-$labels['longaug'] = 'Ogos';
-$labels['longsep'] = 'September';
-$labels['longoct'] = 'Oktober';
-$labels['longnov'] = 'November';
-$labels['longdec'] = 'Disember';
+$labels['thursday']  = 'Khamis';
+$labels['friday']    = 'Jumaat';
+$labels['saturday']  = 'Sabtu';
+
+// months short
+$labels['jan']	= 'Jan';
+$labels['feb']	= 'Feb';
+$labels['mar']	= 'Mac';
+$labels['apr']	= 'Apr';
+$labels['may']	= 'Mei';
+$labels['jun']	= 'Jun';
+$labels['jul'] 	= 'Jul';
+$labels['aug']	= 'Ogo';
+$labels['sep']	= 'Sep';
+$labels['oct']	= 'Okt';
+$labels['nov']	= 'Nov';
+$labels['dec']	= 'Dis';
+
+// months long
+$labels['longjan']	= 'Januari';
+$labels['longfeb']	= 'Februari';
+$labels['longmar']	= 'March';
+$labels['longapr']	= 'April';
+$labels['longmay']	= 'Mei';
+$labels['longjun']	= 'Jun';
+$labels['longjul']	= 'Julai';
+$labels['longaug']	= 'Ogos';
+$labels['longsep']	= 'September';
+$labels['longoct']	= 'Oktober';
+$labels['longnov']	= 'November';
+$labels['longdec']	= 'Disember';
+
 $labels['today'] = 'Hari Ini';
-$labels['refresh'] = 'Refresh';
-$labels['checkmail'] = 'Semak mesej baru';
-$labels['compose'] = 'Karang mesej';
-$labels['writenewmessage'] = 'Cipta mesej baru';
-$labels['reply'] = 'Balas';
-$labels['replytomessage'] = 'Balas mesej';
+
+// toolbar buttons
+$labels['refresh']          = 'Refresh';
+$labels['checkmail']        = 'Semak mesej baru';
+$labels['compose']          = 'Karang mesej';
+$labels['writenewmessage']  = 'Cipta mesej baru';
+$labels['reply']            = 'Balas';
+$labels['replytomessage']   = 'Balas mesej';
 $labels['replytoallmessage'] = 'Balas kepada penghantar dan semua penerima';
-$labels['replyall'] = 'Balas semua';
-$labels['replylist'] = 'Senarai balas';
-$labels['forward'] = 'Majukan';
-$labels['forwardinline'] = 'Majukan dalam mesej';
+$labels['replyall']         = 'Balas semua';
+$labels['replylist']        = 'Senarai balas';
+$labels['forward']          = 'Majukan';
+$labels['forwardinline']    = 'Majukan dalam mesej';
 $labels['forwardattachment'] = 'Majukan sebagai lampiran';
-$labels['forwardmessage'] = 'Marakan mesej';
-$labels['deletemessage'] = 'Pindah mesej ke sampah';
+$labels['forwardmessage']   = 'Marakan mesej';
+$labels['deletemessage']    = 'Pindah mesej ke sampah';
 $labels['movemessagetotrash'] = 'Pindah mesej ke Tong Sampah';
-$labels['printmessage'] = 'Cetak mesej ini';
-$labels['previousmessage'] = 'Papar mesej sebelumnya';
-$labels['firstmessage'] = 'Papar mesej pertama';
-$labels['nextmessage'] = 'Papat mesej seterusnya';
-$labels['lastmessage'] = 'Papat mesej terakhir';
-$labels['backtolist'] = 'Kembali ke senarai mesej';
-$labels['viewsource'] = 'Papar sumber';
-$labels['mark'] = 'Tanda';
-$labels['markmessages'] = 'Tanda mesej';
-$labels['markread'] = 'Sebagai Dibaca';
-$labels['markunread'] = 'Sebagai Tidak dibaca';
-$labels['markflagged'] = 'Seperti  ditanda';
-$labels['markunflagged'] = 'Seperti tidak ditanda';
-$labels['moreactions'] = 'Tindakan lanjut..';
-$labels['more'] = 'Seterusnya';
-$labels['back'] = 'Kembali';
-$labels['options'] = 'Opsyen';
+$labels['printmessage']     = 'Cetak mesej ini';
+$labels['previousmessage']  = 'Papar mesej sebelumnya';
+$labels['firstmessage']     = 'Papar mesej pertama';
+$labels['nextmessage']      = 'Papat mesej seterusnya';
+$labels['lastmessage']      = 'Papat mesej terakhir';
+$labels['backtolist']       = 'Kembali ke senarai mesej';
+$labels['viewsource']       = 'Papar sumber';
+$labels['mark']             = 'Tanda';
+$labels['markmessages']     = 'Tanda mesej';
+$labels['markread']         = 'Sebagai Dibaca';
+$labels['markunread']       = 'Sebagai Tidak dibaca';
+$labels['markflagged']      = 'Seperti  ditanda';
+$labels['markunflagged']    = 'Seperti tidak ditanda';
+$labels['moreactions']      = 'Tindakan lanjut..';
+$labels['more']             = 'Seterusnya';
+$labels['back']             = 'Kembali';
+$labels['options']          = 'Opsyen';
+
 $labels['select'] = 'Pilih';
 $labels['all'] = 'Semua';
 $labels['none'] = 'Tiada';
-$labels['nonesort'] = 'Tiada';
 $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';
 $labels['filter'] = 'Tapis';
 $labels['list'] = 'Senarai';
@@ -142,12 +173,14 @@ $labels['expand-all'] = 'Buka Semua';
 $labels['expand-unread'] = 'Buka yang belum dibaca';
 $labels['collapse-all'] = 'Tutup Semua';
 $labels['threaded'] = 'Telah urutan';
+
 $labels['autoexpand_threads'] = 'Buka mesej mengikut urutan';
 $labels['do_expand'] = 'Kesemua urutan';
 $labels['expand_only_unread'] = 'hanya dengan mesej yang belum dibaca';
 $labels['fromto'] = 'Daripada/Kepada';
 $labels['flag'] = 'Tanda';
 $labels['attachment'] = 'Lampiran';
+$labels['nonesort'] = 'Tiada';
 $labels['sentdate'] = 'Tarikh dihantar';
 $labels['arrival'] = 'Tarikh terima';
 $labels['asc'] = 'menaik';
@@ -156,104 +189,222 @@ $labels['listcolumns'] = 'Senarai ruang';
 $labels['listsorting'] = 'pengisihan ruang';
 $labels['listorder'] = 'Urutan pengisihan';
 $labels['listmode'] = 'Mod senarai paparan';
+
 $labels['folderactions'] = 'Aksi folder';
 $labels['compact'] = 'Kompak';
 $labels['empty'] = 'Kosong';
+
 $labels['quota'] = 'Penggunaan cakera';
-$labels['unknown'] = 'tidak diketahui';
-$labels['unlimited'] = 'Tidak terhad';
-$labels['quicksearch'] = 'Carian pantas';
-$labels['resetsearch'] = 'Set semula carian';
-$labels['searchmod'] = 'Pengubah carian';
-$labels['msgtext'] = 'Keseluruhan mesej';
+$labels['unknown']  = 'tidak diketahui';
+$labels['unlimited']  = 'Tidak terhad';
+
+$labels['quicksearch']  = 'Carian pantas';
+$labels['resetsearch']  = 'Set semula carian';
+$labels['searchmod']  = 'Pengubah carian';
+$labels['msgtext']  = 'Keseluruhan mesej';
+$labels['body']  = 'Body';
+
 $labels['openinextwin'] = 'Buka dalam tetingkap baru';
 $labels['emlsave'] = 'Muat-turun (.eml)';
-$labels['editasnew'] = 'Ubah seperti baharu';
-$labels['sendmessage'] = 'Hantar mesej';
-$labels['savemessage'] = 'Simapan sebagai draf';
-$labels['addattachment'] = 'Lampir fail';
-$labels['charset'] = 'Set aksara';
-$labels['editortype'] = 'Jenis Editor';
-$labels['returnreceipt'] = 'Penerimaan semula';
-$labels['dsn'] = 'Status pemberitahuan penghantaran';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
+
+// message compose
+$labels['editasnew']      = 'Ubah seperti baharu';
+$labels['send']           = 'Send';
+$labels['sendmessage']    = 'Hantar mesej';
+$labels['savemessage']    = 'Simapan sebagai draf';
+$labels['addattachment']  = 'Lampir fail';
+$labels['charset']        = 'Set aksara';
+$labels['editortype']     = 'Jenis Editor';
+$labels['returnreceipt']  = 'Penerimaan semula';
+$labels['dsn']            = 'Status pemberitahuan penghantaran';
 $labels['mailreplyintro'] = 'Pada $date, $sender menulis';
 $labels['originalmessage'] = 'Mesej Asal';
-$labels['editidents'] = 'Ubah identiti';
-$labels['spellcheck'] = 'Eja';
+
+$labels['editidents']    = 'Ubah identiti';
+$labels['spellcheck']    = 'Eja';
 $labels['checkspelling'] = 'Semak ejaan';
 $labels['resumeediting'] = 'Sambung pengeditan';
-$labels['revertto'] = 'Kembali kepada';
+$labels['revertto']      = 'Kembali kepada';
+
 $labels['attach'] = 'Lampirkan';
 $labels['attachments'] = 'Lampiran';
 $labels['upload'] = 'Muat naik';
 $labels['uploadprogress'] = '$percent ($current dari $total)';
-$labels['close'] = 'Tutup';
-$labels['messageoptions'] = 'Opsyen mesej';
-$labels['low'] = 'Rendah';
-$labels['lowest'] = 'Paling Rendah';
-$labels['normal'] = 'Normal';
-$labels['high'] = 'Tinggi';
+$labels['close']  = 'Tutup';
+$labels['messageoptions']  = 'Opsyen mesej';
+
+$labels['low']     = 'Rendah';
+$labels['lowest']  = 'Paling Rendah';
+$labels['normal']  = 'Normal';
+$labels['high']    = 'Tinggi';
 $labels['highest'] = 'Paling Tinggi';
-$labels['nosubject'] = '(tiada subjek)';
+
+$labels['nosubject']  = '(tiada subjek)';
 $labels['showimages'] = 'Papar imej';
 $labels['alwaysshow'] = 'selalu paparkan imej dari $sender';
-$labels['isdraft'] = 'Ini adalah draf mesej';
+$labels['isdraft']    = 'Ini adalah draf mesej';
+$labels['andnmore']   = '$nr more...';
+$labels['togglemoreheaders'] = 'Show more message headers';
+$labels['togglefullheaders'] = 'Toggle raw message headers';
+
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Teks kosong';
 $labels['savesentmessagein'] = 'Simpan mesej yang telah dihantar dalam';
 $labels['dontsave'] = 'Jangan simpan';
 $labels['maxuploadsize'] = 'maksimum saiz fail yang dibenarkan ialah $size';
+
 $labels['addcc'] = 'Tambah Cc';
 $labels['addbcc'] = 'Tambah Bcc';
 $labels['addreplyto'] = 'Tambah Reply-To';
 $labels['addfollowupto'] = 'Tambah Followup-To';
+
+// mdn
 $labels['mdnrequest'] = 'Pengirim mesej ini mahu diberitahu apabila anda membaca mesej ini. Adakah anda ingin memberitahu pengirim?';
 $labels['receiptread'] = 'Balas Resip (dibaca)';
 $labels['yourmessage'] = 'Ini adalah Resip Balasan untuk mesej anda';
 $labels['receiptnote'] = 'Perhatian: Resip ini hanya untuk memberitahu yang mesej ini telah dipaparkan di komputer penerima. Tidak ada jaminan yang penerima telah membaca atau memahami kandungan mesej.';
-$labels['name'] = 'Nama paparan';
-$labels['firstname'] = 'Nama pertama';
-$labels['surname'] = 'Nama akhir';
-$labels['email'] = 'E-Mel';
+
+// address boook
+$labels['name']         = 'Nama paparan';
+$labels['firstname']    = 'Nama pertama';
+$labels['surname']      = 'Nama akhir';
+$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['email']        = 'E-Mel';
+$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['typepager']  = 'Pager';
+$labels['typevideo']  = 'Video';
+$labels['typeassistant']  = 'Assistant';
+$labels['typehomepage']  = 'Home Page';
+$labels['typeblog'] = 'Blog';
+$labels['typeprofile'] = 'Profile';
+
+$labels['addfield'] = 'Add field...';
 $labels['addcontact'] = 'Tambah kontek baru';
 $labels['editcontact'] = 'Ubahsuai Kontek';
-$labels['edit'] = 'Sunting';
+$labels['contacts'] = 'Contacts';
+$labels['contactproperties'] = 'Contact properties';
+$labels['personalinfo'] = 'Personal information';
+
+$labels['edit']   = 'Sunting';
 $labels['cancel'] = 'Batal';
-$labels['save'] = 'Simpan';
+$labels['save']   = 'Simpan';
 $labels['delete'] = 'Padam';
-$labels['newcontact'] = 'Cipta kad kontek baru';
-$labels['deletecontact'] = 'Hapus kontek yang dipilih';
-$labels['composeto'] = 'Karang mel kepada';
+$labels['rename'] = 'Rename';
+$labels['addphoto'] = 'Add';
+$labels['replacephoto'] = 'Replace';
+$labels['uploadphoto'] = 'Upload photo';
+
+$labels['newcontact']     = 'Cipta kad kontek baru';
+$labels['deletecontact']  = 'Hapus kontek yang dipilih';
+$labels['composeto']      = 'Karang mel kepada';
 $labels['contactsfromto'] = 'Kontek $from ke $to dari $count';
-$labels['print'] = 'Cetak';
-$labels['export'] = 'Eksport';
-$labels['previouspage'] = 'Papar set sebelumnya';
-$labels['firstpage'] = 'Papar set pertama';
-$labels['nextpage'] = 'Papar set seterusnya';
-$labels['lastpage'] = 'Papar set akhir';
+$labels['print']          = 'Cetak';
+$labels['export']         = 'Eksport';
+$labels['exportall']      = 'Export all';
+$labels['exportsel']      = 'Export selected';
+$labels['exportvcards']   = 'Export contacts in vCard format';
+$labels['newcontactgroup'] = 'Create new contact group';
+$labels['grouprename']    = 'Rename group';
+$labels['groupdelete']    = 'Delete group';
+$labels['groupremoveselected'] = 'Remove selected contacts from group';
+
+$labels['previouspage']   = 'Papar set sebelumnya';
+$labels['firstpage']      = 'Papar set pertama';
+$labels['nextpage']       = 'Papar set seterusnya';
+$labels['lastpage']       = 'Papar set akhir';
+
+$labels['group'] = 'Group';
 $labels['groups'] = 'Kumpulan';
 $labels['personaladrbook'] = 'Alamat-alamat Peribadi';
+
+$labels['searchsave'] = 'Save search';
+$labels['searchdelete'] = 'Delete search';
+
+$labels['import'] = 'Import';
+$labels['importcontacts'] = 'Import contacts';
+$labels['importfromfile'] = 'Import from file:';
+$labels['importtarget'] = 'Add new contacts to address book:';
+$labels['importreplace'] = 'Replace the entire address book';
+$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['done'] = 'Done';
+
+// settings
 $labels['settingsfor'] = 'Tetapan bagi';
+$labels['about'] = 'About';
 $labels['preferences'] = 'Keutamaan';
 $labels['userpreferences'] = 'Keutamaan pengguna';
 $labels['editpreferences'] = 'Sunting keutamaan pengguna';
+
 $labels['identities'] = 'Identiti';
 $labels['manageidentities'] = 'Urus identiti bagi akaun ini';
 $labels['newidentity'] = 'Identiti baru';
+
 $labels['newitem'] = 'Butiran baru';
 $labels['edititem'] = 'Ubahsuai butiran';
+
 $labels['preferhtml'] = 'Papar HTML';
+$labels['defaultcharset'] = 'Default Character Set';
 $labels['htmlmessage'] = 'Mesej HTML';
+$labels['messagepart'] = 'Part';
+$labels['digitalsig'] = 'Digital Signature';
+$labels['dateformat'] = 'Date format';
+$labels['timeformat'] = 'Time format';
 $labels['prettydate'] = 'Tarikh-tarikh cantik';
-$labels['setdefault'] = 'Tetap asal';
-$labels['language'] = 'Bahasa';
-$labels['timezone'] = 'Zon Masa';
-$labels['pagesize'] = 'Baris setiap muka';
+$labels['setdefault']  = 'Tetap asal';
+$labels['autodetect']  = 'Auto';
+$labels['language']  = 'Bahasa';
+$labels['timezone']  = 'Zon Masa';
+$labels['pagesize']  = 'Baris setiap muka';
 $labels['signature'] = 'Tandatangan';
-$labels['dstactive'] = 'Simpanan siang hari';
+$labels['dstactive']  = 'Simpanan siang hari';
+$labels['showinextwin'] = 'Open message in a new window';
+$labels['composeextwin'] = 'Compose in a new window';
 $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';
 $labels['logoutcompact'] = 'Padatkan Inbox ketika keluar';
 $labels['uisettings'] = 'Antaramuka Pengguna';
@@ -262,19 +413,126 @@ $labels['mailboxview'] = 'Pandangan kotak Mel';
 $labels['mdnrequests'] = 'Pemberitahuan Pengirim';
 $labels['askuser'] = 'Tanya pengguna';
 $labels['autosend'] = 'Hantar automatik';
+$labels['autosendknown'] = 'send receipt to my contacts, otherwise ask me';
+$labels['autosendknownignore'] = 'send receipt to my contacts, otherwise ignore';
 $labels['ignore'] = 'Biarkan';
 $labels['readwhendeleted'] = 'Tanda mesej sebagai dibaca ketika hapus';
 $labels['flagfordeletion'] = 'Tanda mesej untuk pembuangan (tidak delete terus)';
-$labels['autosavedraft'] = 'Simpan draf dengan automatik';
-$labels['never'] = 'tidak pernah';
-$labels['folder'] = 'Kabinet Fail';
-$labels['foldername'] = 'Nama Kabinet Fail';
-$labels['subscribed'] = 'Dilanggan';
+$labels['skipdeleted'] = 'Do not show deleted messages';
+$labels['deletealways'] = 'If moving messages to Trash fails, delete them';
+$labels['deletejunk'] = 'Directly delete messages in Junk';
+$labels['showremoteimages'] = 'Display remote inline images';
+$labels['fromknownsenders'] = 'from known senders';
+$labels['always'] = 'always';
+$labels['showinlineimages'] = 'Display attached images below the message';
+$labels['autosavedraft']  = 'Simpan draf dengan automatik';
+$labels['everynminutes']  = 'every $n minute(s)';
+$labels['refreshinterval']  = 'Refresh (check for new messages, etc.)';
+$labels['never']  = 'tidak pernah';
+$labels['immediately']  = 'immediately';
+$labels['messagesdisplaying'] = 'Displaying Messages';
+$labels['messagescomposition'] = 'Composing Messages';
+$labels['mimeparamfolding'] = 'Attachment names';
+$labels['2231folding'] = 'Full RFC 2231 (Thunderbird)';
+$labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
+$labels['2047folding'] = 'Full RFC 2047 (other)';
+$labels['force7bit'] = 'Use MIME encoding for 8-bit characters';
+$labels['advancedoptions'] = 'Advanced options';
+$labels['focusonnewmessage'] = 'Focus browser window on new message';
+$labels['checkallfolders'] = 'Check all folders for new messages';
+$labels['displaynext'] = 'After message delete/move display the next message';
+$labels['defaultfont'] = 'Default font of HTML message';
+$labels['mainoptions'] = 'Main Options';
+$labels['browseroptions'] = 'Browser Options';
+$labels['section'] = 'Section';
+$labels['maintenance'] = 'Maintenance';
+$labels['newmessage'] = 'New Message';
+$labels['signatureoptions'] = 'Signature Options';
+$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'] = 'Automatically add signature';
+$labels['newmessageonly'] = 'new message only';
+$labels['replyandforwardonly'] = 'replies and forwards only';
+$labels['insertsignature'] = 'Insert signature';
+$labels['previewpanemarkread']  = 'Mark previewed messages as read';
+$labels['afternseconds']  = 'after $n seconds';
+$labels['reqmdn'] = 'Always request a return receipt';
+$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'] = 'Check spelling before sending a message';
+$labels['spellcheckoptions'] = 'Spellcheck Options';
+$labels['spellcheckignoresyms'] = 'Ignore words with symbols';
+$labels['spellcheckignorenums'] = 'Ignore words with numbers';
+$labels['spellcheckignorecaps'] = 'Ignore words with all letters capitalized';
+$labels['addtodict'] = 'Add to dictionary';
+$labels['mailtoprotohandler'] = 'Register protocol handler for mailto: links';
+$labels['forwardmode'] = 'Messages forwarding';
+$labels['inline'] = 'inline';
+$labels['asattachment'] = 'as attachment';
+
+$labels['folder']  = 'Kabinet Fail';
+$labels['folders']  = 'Folder';
+$labels['foldername']  = 'Nama Kabinet Fail';
+$labels['subscribed']  = 'Dilanggan';
 $labels['messagecount'] = 'Mesej-mesej';
-$labels['create'] = 'Cipta';
-$labels['createfolder'] = 'Cipta kabinet fail baru';
-$labels['managefolders'] = 'Urus kabinet fail';
+$labels['create']  = 'Cipta';
+$labels['createfolder']  = 'Cipta kabinet fail baru';
+$labels['managefolders']  = 'Urus kabinet fail';
+$labels['specialfolders'] = 'Special Folders';
+$labels['properties'] = 'Properties';
+$labels['folderproperties'] = 'Folder properties';
+$labels['parentfolder'] = 'Parent folder';
+$labels['location'] = 'Location';
+$labels['info'] = 'Information';
+$labels['getfoldersize'] = 'Click to get folder size';
+$labels['changesubscription'] = 'Click to change subscription';
+$labels['foldertype'] = 'Folder Type';
+$labels['personalfolder']  = 'Private Folder';
+$labels['otherfolder']  = 'Other User\'s Folder';
+$labels['sharedfolder']  = 'Public Folder';
+
 $labels['sortby'] = 'Susun dengan';
-$labels['sortasc'] = 'Susun menaik';
+$labels['sortasc']  = 'Susun menaik';
 $labels['sortdesc'] = 'Susun menurun';
+$labels['undo'] = 'Undo';
+
+$labels['installedplugins'] = 'Installed plugins';
+$labels['plugin'] = 'Plugin';
+$labels['version'] = 'Version';
+$labels['source'] = 'Source';
+$labels['license'] = 'License';
+$labels['support'] = 'Get support';
+
+// units
+$labels['B'] = 'B';
+$labels['KB'] = 'KB';
+$labels['MB'] = 'MB';
+$labels['GB'] = 'GB';
+
+// character sets
+$labels['unicode'] = 'Unicode';
+$labels['english'] = '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['turkish'] = 'Turkish';
+$labels['nordic'] = 'Nordic';
+$labels['thai'] = 'Thai';
+$labels['celtic'] = 'Celtic';
+$labels['vietnamese'] = 'Vietnamese';
+$labels['japanese'] = 'Japanese';
+$labels['korean'] = 'Korean';
+$labels['chinese'] = 'Chinese';
 
+?>
diff --git a/program/localization/ms_MY/messages.inc b/program/localization/ms_MY/messages.inc
index 3cf4b5a41..72d2e3075 100644
--- a/program/localization/ms_MY/messages.inc
+++ b/program/localization/ms_MY/messages.inc
@@ -2,27 +2,43 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ms_MY/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: abuyop <Unknown>                                              |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['loginfailed'] = 'Log masuk gagal';
+$messages['errortitle']  = 'An error occurred!';
+$messages['loginfailed']  = 'Log masuk gagal';
 $messages['cookiesdisabled'] = 'Pelayar anda tidak menerima cookies';
 $messages['sessionerror'] = 'Sesi anda tidak sah atau telah tamat';
 $messages['storageerror'] = 'Sambungan ke pelayan IMAP gagal';
+$messages['servererror'] = 'Server Error!';
+$messages['servererrormsg'] = 'Server Error: $msg';
+$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';
 $messages['loggedout'] = 'Sesi anda telah tamat. Selamat tinggal!';
 $messages['mailboxempty'] = 'Kotak mail kosong';
+$messages['refreshing'] = 'Refreshing...';
 $messages['loading'] = 'Memuat...';
+$messages['uploading'] = 'Uploading file...';
+$messages['uploadingmany'] = 'Uploading files...';
 $messages['loadingdata'] = 'Memuat data...';
 $messages['checkingmail'] = 'Menyemak mesej baru...';
 $messages['sendingmessage'] = 'Menghantar mesej...';
@@ -32,34 +48,54 @@ $messages['messagesaved'] = 'Mesej disimpan dalam Draf';
 $messages['successfullysaved'] = 'Berjaya disimpan';
 $messages['addedsuccessfully'] = 'Kontek berjaya disimpan ke dalam buku alamat';
 $messages['contactexists'] = 'Kontek dengan alamat emel ini sudah wujud';
+$messages['contactnameexists'] = 'A contact with the same name already exists.';
 $messages['blockedimages'] = 'Untuk melindungi kebesasan peribadi anda, imej jauh dihalang dalam mesej ini.';
 $messages['encryptedmessage'] = 'Ini adalah mesej yang di\'encrypted\' dan tidak boleh dipamerkan. Maaf!';
 $messages['nocontactsfound'] = 'Tiada kontek dijumpai';
 $messages['contactnotfound'] = 'Kontek yang diminta tidak dijumpai';
+$messages['contactsearchonly'] = 'Enter some search terms to find contacts';
 $messages['sendingfailed'] = 'Gagal menghantar mesej';
+$messages['senttooquickly'] = 'Please wait $sec sec(s). before sending this message.';
+$messages['errorsavingsent'] = 'An error occured while saving sent message.';
 $messages['errorsaving'] = 'Terdapat ralat ketika menyimpan';
 $messages['errormoving'] = 'Tidak boleh pindah mesej';
+$messages['errorcopying'] = 'Could not copy the message(s).';
 $messages['errordeleting'] = 'Tidak boleh hapus mesej';
-$messages['deletecontactconfirm'] = 'Adakah anda ingin hapuskan kontek yang dipilih?';
+$messages['errormarking'] = 'Could not mark the message(s).';
+$messages['deletecontactconfirm']  = 'Adakah anda ingin hapuskan kontek yang dipilih?';
+$messages['deletegroupconfirm']  = 'Do you really want to delete selected group?';
 $messages['deletemessagesconfirm'] = 'Adakah anda ingin hapuskan mesej yang dipilih?';
-$messages['deletefolderconfirm'] = 'Adakah anda ingin hapuskan kabinet fail ini?';
-$messages['purgefolderconfirm'] = 'Adakah anda ingin hapuskan semua mesej dalam kabinet fail ini?';
+$messages['deletefolderconfirm']  = 'Adakah anda ingin hapuskan kabinet fail ini?';
+$messages['purgefolderconfirm']  = 'Adakah anda ingin hapuskan semua mesej dalam kabinet fail ini?';
+$messages['contactdeleting'] = 'Deleting contact(s)...';
+$messages['groupdeleting'] = 'Deleting group...';
+$messages['folderdeleting'] = 'Deleting folder...';
+$messages['foldermoving'] = 'Moving folder...';
+$messages['foldersubscribing'] = 'Subscribing folder...';
+$messages['folderunsubscribing'] = 'Unsubscribing folder...';
 $messages['formincomplete'] = 'Borang tidak diisi dengan lengkap';
 $messages['noemailwarning'] = 'Sila masukkan alamat emel yang sah';
-$messages['nonamewarning'] = 'Sila masukkan nama';
+$messages['nonamewarning']  = 'Sila masukkan nama';
 $messages['nopagesizewarning'] = 'Sila masukkan saiz halaman';
+$messages['nosenderwarning'] = 'Please enter sender e-mail address.';
 $messages['norecipientwarning'] = 'Sila masukkan sekurang-kurangnya satu penerima';
-$messages['nosubjectwarning'] = 'Ruang "Subjek" kosong. Adakah anda ingin masukkannya sekarang?';
+$messages['nosubjectwarning']  = 'Ruang "Subjek" kosong. Adakah anda ingin masukkannya sekarang?';
 $messages['nobodywarning'] = 'Hantar mesej ini tanpa teks?';
 $messages['notsentwarning'] = 'Mesej tidak dihantar. Adakah anda ingin menyingkir mesej anda?';
 $messages['noldapserver'] = 'Sila pilih satu pelayan ldap untuk carian';
 $messages['nosearchname'] = 'Sila masukkan nama kontek atau alamat emel';
+$messages['notuploadedwarning'] = 'Not all attachments have been uploaded yet. Please wait or cancel the upload.';
 $messages['searchsuccessful'] = '$nr mesej dijumpai';
+$messages['contactsearchsuccessful'] = '$nr contacts found.';
 $messages['searchnomatch'] = 'Carian tiada padanan';
 $messages['searching'] = 'Menggelintar...';
 $messages['checking'] = 'Menyemak...';
 $messages['nospellerrors'] = 'Tiada kesalah ejaan dijumpai';
 $messages['folderdeleted'] = 'Kabinet fail berjaya dihapuskan';
+$messages['foldersubscribed'] = 'Folder successfully subscribed.';
+$messages['folderunsubscribed'] = 'Folder successfully unsubscribed.';
+$messages['folderpurged'] = 'Folder has successfully been emptied.';
+$messages['folderexpunged'] = 'Folder has successfully been compacted.';
 $messages['deletedsuccessfully'] = 'Berjaya dihapuskan';
 $messages['converting'] = 'Singkir format dari mesej...';
 $messages['messageopenerror'] = 'Tidak boleh muat mesej dari server';
@@ -70,7 +106,66 @@ $messages['copyerror'] = 'Tidak boleh salin apa-apa alamat';
 $messages['sourceisreadonly'] = 'Sumber alamat ini adalah untuk bacaan sahaja';
 $messages['errorsavingcontact'] = 'Tidak boleh simmpan alamat kontek';
 $messages['movingmessage'] = 'Memindah mesej...';
+$messages['copyingmessage'] = 'Copying message(s)...';
+$messages['copyingcontact'] = 'Copying contact(s)...';
+$messages['deletingmessage'] = 'Deleting message(s)...';
+$messages['markingmessage'] = 'Marking message(s)...';
+$messages['addingmember'] = 'Adding contact(s) to the group...';
+$messages['removingmember'] = 'Removing contact(s) from the group...';
 $messages['receiptsent'] = 'Berjaya menghantar resip bacaan';
 $messages['errorsendingreceipt'] = 'Tidak dapat menghantar resip';
+$messages['deleteidentityconfirm'] = 'Do you really want to delete this identity?';
 $messages['nodeletelastidentity'] = 'Anda tidak boleh membuang identiti ini, ia milik anda yang terakhir.';
+$messages['forbiddencharacter'] = 'Folder name contains a forbidden character.';
+$messages['selectimportfile'] = 'Please select a file to upload.';
+$messages['addresswriterror'] = 'The selected address book is not writeable.';
+$messages['contactaddedtogroup'] = 'Successfully added the contacts to this group.';
+$messages['contactremovedfromgroup'] = 'Successfully removed contacts from this group.';
+$messages['nogroupassignmentschanged'] = 'No group assignments changed.';
+$messages['importwait'] = 'Importing, please wait...';
+$messages['importformaterror'] = 'Import failed! The uploaded file is not a valid import data file.';
+$messages['importconfirm'] = '<b>Successfully imported $inserted contacts</b>';
+$messages['importconfirmskipped'] = '<b>Skipped $skipped existing entries</b>';
+$messages['opnotpermitted'] = 'Operation not permitted!';
+$messages['nofromaddress'] = 'Missing e-mail address in selected identity.';
+$messages['editorwarning'] = 'Switching to the plain text editor will cause all text formatting to be lost. Do you wish to continue?';
+$messages['httpreceivedencrypterror'] = 'A fatal configuration error occurred. Contact your administrator immediately. <b>Your message can not be sent.</b>';
+$messages['smtpconnerror'] = 'SMTP Error ($code): Connection to server failed.';
+$messages['smtpautherror'] = 'SMTP Error ($code): Authentication failed.';
+$messages['smtpfromerror'] = 'SMTP Error ($code): Failed to set sender "$from" ($msg).';
+$messages['smtptoerror'] = 'SMTP Error ($code): Failed to add recipient "$to" ($msg).';
+$messages['smtprecipientserror'] = 'SMTP Error: Unable to parse recipients list.';
+$messages['smtperror'] = 'SMTP Error: $msg';
+$messages['emailformaterror'] = 'Invalid e-mail address: $email';
+$messages['toomanyrecipients'] = 'Too many recipients. Reduce the number of recipients to $max.';
+$messages['maxgroupmembersreached'] = 'The number of group members exceeds the maximum of $max.';
+$messages['internalerror'] = 'An internal error occured. Please try again.';
+$messages['contactdelerror'] = 'Could not delete contact(s).';
+$messages['contactdeleted'] = 'Contact(s) deleted successfully.';
+$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.';
 
+?>
diff --git a/program/localization/nb_NO/labels.inc b/program/localization/nb_NO/labels.inc
index 2ee9a6c33..cba58dc9c 100644
--- a/program/localization/nb_NO/labels.inc
+++ b/program/localization/nb_NO/labels.inc
@@ -2,60 +2,78 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/nb_NO/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Fredrik Larsen <fredrik.h.larsen@gmail.com>                   |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = 'Velkommen til $product';
-$labels['username'] = 'Brukernavn';
-$labels['password'] = 'Passord';
-$labels['server'] = 'Tjener';
-$labels['login'] = 'Logg inn';
-$labels['logout'] = 'Logg ut';
-$labels['mail'] = 'E-post';
+
+// login page
+$labels['welcome']   = 'Velkommen til $product';
+$labels['username']  = 'Brukernavn';
+$labels['password']  = 'Passord';
+$labels['server']    = 'Tjener';
+$labels['login']     = 'Logg inn';
+
+// taskbar
+$labels['logout']   = 'Logg ut';
+$labels['mail']     = 'E-post';
 $labels['settings'] = 'Innstillinger';
 $labels['addressbook'] = 'Adressebok';
-$labels['inbox'] = 'Innboks';
+
+// mailbox names
+$labels['inbox']  = 'Innboks';
 $labels['drafts'] = 'Kladd';
-$labels['sent'] = 'Sendt';
-$labels['trash'] = 'Slettet';
-$labels['junk'] = 'Spam';
+$labels['sent']   = 'Sendt';
+$labels['trash']  = 'Slettet';
+$labels['junk']   = 'Spam';
+
+// message listing
 $labels['subject'] = 'Emne';
-$labels['from'] = 'Avsender';
-$labels['to'] = 'Mottaker';
-$labels['cc'] = 'Kopi til';
-$labels['bcc'] = 'Blindkopi til';
+$labels['from']    = 'Avsender';
+$labels['sender']  = 'Avsender';
+$labels['to']      = 'Mottaker';
+$labels['cc']      = 'Kopi til';
+$labels['bcc']     = 'Blindkopi til';
 $labels['replyto'] = 'Svar til';
 $labels['followupto'] = 'Oppfølging til';
-$labels['date'] = 'Dato';
-$labels['size'] = 'Størrelse';
+$labels['date']    = 'Dato';
+$labels['size']    = 'Størrelse';
 $labels['priority'] = 'Prioritet';
 $labels['organization'] = 'Organisasjon';
 $labels['readstatus'] = 'Lese status';
 $labels['listoptions'] = 'List muligheter';
+
 $labels['mailboxlist'] = 'Mapper';
-$labels['folders'] = 'Mapper';
 $labels['messagesfromto'] = 'Meldinger $from til $to av $count';
 $labels['threadsfromto'] = 'Tråder $from til $to av $count';
 $labels['messagenrof'] = 'Melding $nr av $count';
 $labels['fromtoshort'] = '$from – $to av $count';
-$labels['copy'] = 'Kopier';
-$labels['move'] = 'Flytt';
-$labels['moveto'] = 'flytt til...';
+
+$labels['copy']     = 'Kopier';
+$labels['move']     = 'Flytt';
+$labels['moveto']   = 'flytt til...';
 $labels['download'] = 'last ned';
+$labels['open']     = 'Åpen';
 $labels['showattachment'] = 'Vis';
 $labels['showanyway'] = 'Vis likevel';
+
 $labels['filename'] = 'Filnavn';
 $labels['filesize'] = 'Filstørrelse';
+
 $labels['addtoaddressbook'] = 'Legg til i adressebok';
+
+// weekdays short
 $labels['sun'] = 'Søn';
 $labels['mon'] = 'Man';
 $labels['tue'] = 'Tir';
@@ -63,78 +81,88 @@ $labels['wed'] = 'Ons';
 $labels['thu'] = 'Tor';
 $labels['fri'] = 'Fre';
 $labels['sat'] = 'Lør';
-$labels['sunday'] = 'Søndag';
-$labels['monday'] = 'Mandag';
-$labels['tuesday'] = 'Tirsdag';
+
+// weekdays long
+$labels['sunday']    = 'Søndag';
+$labels['monday']    = 'Mandag';
+$labels['tuesday']   = 'Tirsdag';
 $labels['wednesday'] = 'Onsdag';
-$labels['thursday'] = 'Torsdag';
-$labels['friday'] = 'Fredag';
-$labels['saturday'] = 'Lørdag';
-$labels['jan'] = 'Jan';
-$labels['feb'] = 'Feb';
-$labels['mar'] = 'Mar';
-$labels['apr'] = 'Apr';
-$labels['may'] = 'Mai';
-$labels['longmay'] = 'Mai';
-$labels['jun'] = 'Jun';
-$labels['jul'] = 'Jul';
-$labels['aug'] = 'Aug';
-$labels['sep'] = 'Sep';
-$labels['oct'] = 'Okt';
-$labels['nov'] = 'Nov';
-$labels['dec'] = 'Des';
-$labels['longjan'] = 'Januar';
-$labels['longfeb'] = 'Februar';
-$labels['longmar'] = 'Mars';
-$labels['longapr'] = 'April';
-$labels['longjun'] = 'Juni';
-$labels['longjul'] = 'Juli';
-$labels['longaug'] = 'August';
-$labels['longsep'] = 'September';
-$labels['longoct'] = 'Oktober';
-$labels['longnov'] = 'November';
-$labels['longdec'] = 'Desember';
+$labels['thursday']  = 'Torsdag';
+$labels['friday']    = 'Fredag';
+$labels['saturday']  = 'Lørdag';
+
+// months short
+$labels['jan']	= 'Jan';
+$labels['feb']	= 'Feb';
+$labels['mar']	= 'Mar';
+$labels['apr']	= 'Apr';
+$labels['may']	= 'Mai';
+$labels['jun']	= 'Jun';
+$labels['jul'] 	= 'Jul';
+$labels['aug']	= 'Aug';
+$labels['sep']	= 'Sep';
+$labels['oct']	= 'Okt';
+$labels['nov']	= 'Nov';
+$labels['dec']	= 'Des';
+
+// months long
+$labels['longjan']	= 'Januar';
+$labels['longfeb']	= 'Februar';
+$labels['longmar']	= 'Mars';
+$labels['longapr']	= 'April';
+$labels['longmay']	= 'Mai';
+$labels['longjun']	= 'Juni';
+$labels['longjul']	= 'Juli';
+$labels['longaug']	= 'August';
+$labels['longsep']	= 'September';
+$labels['longoct']	= 'Oktober';
+$labels['longnov']	= 'November';
+$labels['longdec']	= 'Desember';
+
 $labels['today'] = 'I dag';
-$labels['refresh'] = 'Oppdater';
-$labels['checkmail'] = 'Se etter nye meldinger';
-$labels['compose'] = 'Skriv ny e-post';
-$labels['writenewmessage'] = 'Opprett ny e-post';
-$labels['reply'] = 'Svar';
-$labels['replytomessage'] = 'Svar på denne e-posten';
+
+// toolbar buttons
+$labels['refresh']          = 'Oppdater';
+$labels['checkmail']        = 'Se etter nye meldinger';
+$labels['compose']          = 'Skriv ny e-post';
+$labels['writenewmessage']  = 'Opprett ny e-post';
+$labels['reply']            = 'Svar';
+$labels['replytomessage']   = 'Svar på denne e-posten';
 $labels['replytoallmessage'] = 'Svar til alle mottakere';
-$labels['replyall'] = 'Svar alle';
-$labels['replylist'] = 'Svarliste';
-$labels['forward'] = 'Videresend';
-$labels['forwardinline'] = 'Videresend i melding';
+$labels['replyall']         = 'Svar alle';
+$labels['replylist']        = 'Svarliste';
+$labels['forward']          = 'Videresend';
+$labels['forwardinline']    = 'Videresend i melding';
 $labels['forwardattachment'] = 'Vidresend som vedlegg';
-$labels['forwardmessage'] = 'Videresend denne e-posten';
-$labels['deletemessage'] = 'Slett e-posten';
+$labels['forwardmessage']   = 'Videresend denne e-posten';
+$labels['deletemessage']    = 'Slett e-posten';
 $labels['movemessagetotrash'] = 'Flytt e-posten til søppel';
-$labels['printmessage'] = 'Skriv ut denne e-posten';
-$labels['previousmessage'] = 'Vis forrige melding';
-$labels['firstmessage'] = 'Vis første melding';
-$labels['nextmessage'] = 'Vis neste melding';
-$labels['lastmessage'] = 'Vis siste melding';
-$labels['backtolist'] = 'Tilbake til e-postlisten';
-$labels['viewsource'] = 'Vis kilde';
-$labels['mark'] = 'Merke';
-$labels['markmessages'] = 'Merk meldinger';
-$labels['markread'] = 'som lest';
-$labels['markunread'] = 'som ulest';
-$labels['markflagged'] = 'som flagget';
-$labels['markunflagged'] = 'som uflagget';
-$labels['moreactions'] = 'Flere handlinger …';
-$labels['more'] = 'Mer';
-$labels['back'] = 'Tilbake';
-$labels['options'] = 'Alternativer';
+$labels['printmessage']     = 'Skriv ut denne e-posten';
+$labels['previousmessage']  = 'Vis forrige melding';
+$labels['firstmessage']     = 'Vis første melding';
+$labels['nextmessage']      = 'Vis neste melding';
+$labels['lastmessage']      = 'Vis siste melding';
+$labels['backtolist']       = 'Tilbake til e-postlisten';
+$labels['viewsource']       = 'Vis kilde';
+$labels['mark']             = 'Merke';
+$labels['markmessages']     = 'Merk meldinger';
+$labels['markread']         = 'som lest';
+$labels['markunread']       = 'som ulest';
+$labels['markflagged']      = 'som flagget';
+$labels['markunflagged']    = 'som uflagget';
+$labels['moreactions']      = 'Flere handlinger …';
+$labels['more']             = 'Mer';
+$labels['back']             = 'Tilbake';
+$labels['options']          = 'Alternativer';
+
 $labels['select'] = 'Velg';
 $labels['all'] = 'Alle';
 $labels['none'] = 'Ingen';
-$labels['nonesort'] = 'Ingen';
 $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';
@@ -145,12 +173,14 @@ $labels['expand-all'] = 'Utvid alle';
 $labels['expand-unread'] = 'Utvid uleste';
 $labels['collapse-all'] = 'Skjul alle';
 $labels['threaded'] = 'Trådet';
+
 $labels['autoexpand_threads'] = 'Utvid tråder';
 $labels['do_expand'] = 'alle tråder';
 $labels['expand_only_unread'] = 'kun med uleste meldinger';
 $labels['fromto'] = 'Avsender/Mottaker';
 $labels['flag'] = 'Flagg';
 $labels['attachment'] = 'Vedlegg';
+$labels['nonesort'] = 'Ingen';
 $labels['sentdate'] = 'Dato sendt';
 $labels['arrival'] = 'Dato mottatt';
 $labels['asc'] = 'stigende';
@@ -159,147 +189,176 @@ $labels['listcolumns'] = 'Listekolonner';
 $labels['listsorting'] = 'Sorteringskolonne';
 $labels['listorder'] = 'Sorteringsrekkefølge';
 $labels['listmode'] = 'Listevisningsmodus';
+
 $labels['folderactions'] = 'Mappehandlinger...';
 $labels['compact'] = 'Rydd opp';
 $labels['empty'] = 'Tøm';
+
 $labels['quota'] = 'Plassforbruk';
-$labels['unknown'] = 'ukjent';
-$labels['unlimited'] = 'ubegrenset';
-$labels['quicksearch'] = 'Hurtigsøk';
-$labels['resetsearch'] = 'Nullstill søk';
-$labels['searchmod'] = 'Søke felt';
-$labels['msgtext'] = 'Hele meldingen';
+$labels['unknown']  = 'ukjent';
+$labels['unlimited']  = 'ubegrenset';
+
+$labels['quicksearch']  = 'Hurtigsøk';
+$labels['resetsearch']  = 'Nullstill søk';
+$labels['searchmod']  = 'Søke felt';
+$labels['msgtext']  = 'Hele meldingen';
+$labels['body']  = 'Meldingstekst';
+
 $labels['openinextwin'] = 'Åpne i nytt vindu';
 $labels['emlsave'] = 'Last ned (.eml)';
-$labels['editasnew'] = 'Rediger som ny';
-$labels['send'] = 'Send.';
-$labels['sendmessage'] = 'Send e-posten';
-$labels['savemessage'] = 'Lagre kladd';
-$labels['addattachment'] = 'Vedlegg';
-$labels['charset'] = 'Tegnsett';
-$labels['editortype'] = 'Format';
-$labels['returnreceipt'] = 'Be om kvittering';
-$labels['dsn'] = 'Leveringsstatus notifikasjon';
+$labels['changeformattext'] = 'Vis i ren tekst';
+$labels['changeformathtml'] = 'Vis i HTML';
+
+// message compose
+$labels['editasnew']      = 'Rediger som ny';
+$labels['send']           = 'Send.';
+$labels['sendmessage']    = 'Send e-posten';
+$labels['savemessage']    = 'Lagre kladd';
+$labels['addattachment']  = 'Vedlegg';
+$labels['charset']        = 'Tegnsett';
+$labels['editortype']     = 'Format';
+$labels['returnreceipt']  = 'Be om kvittering';
+$labels['dsn']            = 'Leveringsstatus notifikasjon';
 $labels['mailreplyintro'] = 'Den $date, skrev $sender:';
 $labels['originalmessage'] = 'Opprinnelig melding';
-$labels['editidents'] = 'Endre identiteter';
-$labels['spellcheck'] = 'Stavekontroll';
+
+$labels['editidents']    = 'Endre identiteter';
+$labels['spellcheck']    = 'Stavekontroll';
 $labels['checkspelling'] = 'Stavekontroll';
 $labels['resumeediting'] = 'Fortsett redigering';
-$labels['revertto'] = 'Tilbake til';
+$labels['revertto']      = 'Tilbake til';
+
 $labels['attach'] = 'Legg ved';
 $labels['attachments'] = 'Vedlegg';
 $labels['upload'] = 'Last opp';
 $labels['uploadprogress'] = '$percent ($current fra $total)';
-$labels['close'] = 'Lukk';
-$labels['messageoptions'] = 'Meldingsalternativer...';
-$labels['low'] = 'Lav';
-$labels['lowest'] = 'Lavest';
-$labels['normal'] = 'Normal';
-$labels['high'] = 'Høy';
+$labels['close']  = 'Lukk';
+$labels['messageoptions']  = 'Meldingsalternativer...';
+
+$labels['low']     = 'Lav';
+$labels['lowest']  = 'Lavest';
+$labels['normal']  = 'Normal';
+$labels['high']    = 'Høy';
 $labels['highest'] = 'Høyest';
-$labels['nosubject'] = '(intet emne)';
+
+$labels['nosubject']  = '(intet emne)';
 $labels['showimages'] = 'Vis bilder';
 $labels['alwaysshow'] = 'Vis alltid bilder fra $sender';
-$labels['isdraft'] = 'Dette er en kladd.';
-$labels['andnmore'] = '$nr flere ...';
+$labels['isdraft']    = 'Dette er en kladd.';
+$labels['andnmore']   = '$nr flere ...';
 $labels['togglemoreheaders'] = 'Vis flere meldings-headere';
 $labels['togglefullheaders'] = 'Veksle visning av meldingens headere i råformat';
+
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Ren tekst';
 $labels['savesentmessagein'] = 'Lagre sendt melding i';
 $labels['dontsave'] = 'ikke lagre';
 $labels['maxuploadsize'] = 'Maksimalt tillatt filstørrelse er $size';
+
 $labels['addcc'] = 'Legg til kopiadressat (Cc)';
 $labels['addbcc'] = 'Legg til blindkopiadressat (Bcc)';
 $labels['addreplyto'] = 'Legg til svar til (Reply-To)';
 $labels['addfollowupto'] = 'Legg til oppfølging';
+
+// mdn
 $labels['mdnrequest'] = 'Senderen av denne meldingen har bedt om å bli gjort oppmerksom på at denne meldingen er lest. Ønsker du å sende denne bekreftelsen?';
 $labels['receiptread'] = 'Kvittering (lest)';
 $labels['yourmessage'] = 'Dette er en kvittering for at din e-post er mottatt';
 $labels['receiptnote'] = 'Merknad: Denne kvitteringen bekrefter bare at e-posten ble vist hos mottakeren. Det er ingen garanti for at mottakeren har lest eller forstått innholdet i e-posten.';
-$labels['name'] = 'Visningsnavn';
-$labels['firstname'] = 'Fornavn';
-$labels['surname'] = 'Etternavn';
-$labels['middlename'] = 'Mellom Navn';
-$labels['nameprefix'] = 'Prefiks';
-$labels['namesuffix'] = 'Suffiks';
-$labels['nickname'] = 'Kallenavn';
-$labels['jobtitle'] = 'Jobb Tittel';
-$labels['department'] = 'Avdeling';
-$labels['gender'] = 'Kjønn';
-$labels['maidenname'] = 'Pikenavn';
-$labels['email'] = 'E-post';
-$labels['phone'] = 'Telefon';
-$labels['address'] = 'Adresse';
-$labels['street'] = 'Gate';
-$labels['locality'] = 'Sted';
-$labels['zipcode'] = 'Postkode';
-$labels['region'] = 'Stat/provins';
-$labels['country'] = 'Land';
-$labels['birthday'] = 'Fødselsdag';
-$labels['anniversary'] = 'Merkedag';
-$labels['website'] = 'Nettsted';
+
+// address boook
+$labels['name']         = 'Visningsnavn';
+$labels['firstname']    = 'Fornavn';
+$labels['surname']      = 'Etternavn';
+$labels['middlename']   = 'Mellom Navn';
+$labels['nameprefix']   = 'Prefiks';
+$labels['namesuffix']   = 'Suffiks';
+$labels['nickname']     = 'Kallenavn';
+$labels['jobtitle']     = 'Jobb Tittel';
+$labels['department']   = 'Avdeling';
+$labels['gender']       = 'Kjønn';
+$labels['maidenname']   = 'Pikenavn';
+$labels['email']        = 'E-post';
+$labels['phone']        = 'Telefon';
+$labels['address']      = 'Adresse';
+$labels['street']       = 'Gate';
+$labels['locality']     = 'Sted';
+$labels['zipcode']      = 'Postkode';
+$labels['region']       = 'Stat/provins';
+$labels['country']      = 'Land';
+$labels['birthday']     = 'Fødselsdag';
+$labels['anniversary']  = 'Merkedag';
+$labels['website']      = 'Nettsted';
 $labels['instantmessenger'] = 'Lynmelding';
 $labels['notes'] = 'Notater';
-$labels['male'] = 'Mann';
+$labels['male']   = 'Mann';
 $labels['female'] = 'Kvinne';
 $labels['manager'] = 'Leder';
 $labels['assistant'] = 'Assistent';
-$labels['typeassistant'] = 'Assistent';
 $labels['spouse'] = 'Ektefelle';
 $labels['allfields'] = 'Alle felter';
 $labels['search'] = 'Søk';
 $labels['advsearch'] = 'Avansert søk';
 $labels['advanced'] = 'Avansert';
 $labels['other'] = 'Annet';
-$labels['typeother'] = 'Annet';
-$labels['typehome'] = 'Hjem';
-$labels['typework'] = 'Jobb';
-$labels['typemobile'] = 'Mobil';
-$labels['typemain'] = 'Hoved';
-$labels['typehomefax'] = 'Hjemmefaks';
-$labels['typeworkfax'] = 'Faks på arbeid';
-$labels['typecar'] = 'Bil';
-$labels['typepager'] = 'Personsøker';
-$labels['typevideo'] = 'Video';
-$labels['typehomepage'] = 'Hjemmeside';
+
+$labels['typehome']   = 'Hjem';
+$labels['typework']   = 'Jobb';
+$labels['typeother']  = 'Annet';
+$labels['typemobile']  = 'Mobil';
+$labels['typemain']  = 'Hoved';
+$labels['typehomefax']  = 'Hjemmefaks';
+$labels['typeworkfax']  = 'Faks på arbeid';
+$labels['typecar']  = 'Bil';
+$labels['typepager']  = 'Personsøker';
+$labels['typevideo']  = 'Video';
+$labels['typeassistant']  = 'Assistent';
+$labels['typehomepage']  = 'Hjemmeside';
 $labels['typeblog'] = 'Blogg';
 $labels['typeprofile'] = 'Profil';
+
 $labels['addfield'] = 'Legg til felt ...';
 $labels['addcontact'] = 'Legg til ny kontakt';
 $labels['editcontact'] = 'Rediger kontakt';
 $labels['contacts'] = 'Kontakter';
 $labels['contactproperties'] = 'Egenskaper';
 $labels['personalinfo'] = 'Personlig informasjon';
-$labels['edit'] = 'Rediger';
+
+$labels['edit']   = 'Rediger';
 $labels['cancel'] = 'Avbryt';
-$labels['save'] = 'Lagre';
+$labels['save']   = 'Lagre';
 $labels['delete'] = 'Slett';
 $labels['rename'] = 'Gi nytt navn';
 $labels['addphoto'] = 'Legg til';
 $labels['replacephoto'] = 'Erstatt';
 $labels['uploadphoto'] = 'Last opp bilde';
-$labels['newcontact'] = 'Opprett ny kontakt';
-$labels['deletecontact'] = 'Slett valgte kontakter';
-$labels['composeto'] = 'Skriv e-post til';
+
+$labels['newcontact']     = 'Opprett ny kontakt';
+$labels['deletecontact']  = 'Slett valgte kontakter';
+$labels['composeto']      = 'Skriv e-post til';
 $labels['contactsfromto'] = 'Kontakter $from til $to av $count';
-$labels['print'] = 'Skriv ut';
-$labels['export'] = 'Eksporter';
-$labels['exportvcards'] = 'Eksporter kontakter i vCard-format';
+$labels['print']          = 'Skriv ut';
+$labels['export']         = 'Eksporter';
+$labels['exportall']      = 'Eksporter alle';
+$labels['exportsel']      = 'Eksporter valgte';
+$labels['exportvcards']   = 'Eksporter kontakter i vCard-format';
 $labels['newcontactgroup'] = 'Opprett ny kontaktgruppe';
-$labels['grouprename'] = 'Endre navn på gruppe';
-$labels['groupdelete'] = 'Slett gruppe';
+$labels['grouprename']    = 'Endre navn på gruppe';
+$labels['groupdelete']    = 'Slett gruppe';
 $labels['groupremoveselected'] = 'Fjern valgte kontakter fra gruppe';
-$labels['previouspage'] = 'Vis forrige sett';
-$labels['firstpage'] = 'Vis første sett';
-$labels['nextpage'] = 'Vis neste sett';
-$labels['lastpage'] = 'Vis siste sett';
+
+$labels['previouspage']   = 'Vis forrige sett';
+$labels['firstpage']      = 'Vis første sett';
+$labels['nextpage']       = 'Vis neste sett';
+$labels['lastpage']       = 'Vis siste sett';
+
 $labels['group'] = 'Gruppe';
 $labels['groups'] = 'Grupper';
 $labels['personaladrbook'] = 'Egne adresser';
+
 $labels['searchsave'] = 'Lagre søk';
 $labels['searchdelete'] = 'Slett søk';
+
 $labels['import'] = 'Importer';
 $labels['importcontacts'] = 'Importer kontakter';
 $labels['importfromfile'] = 'Importer fra fil:';
@@ -307,35 +366,43 @@ $labels['importtarget'] = 'Legg til kontakter i adresseboka:';
 $labels['importreplace'] = 'Erstatt hele adresseboken';
 $labels['importdesc'] = 'Du kan laste opp kontakter fra en eksisterende adressebok.<br/>Vi støtter adressebøker i <a href="http://no.wikipedia.org/wiki/VCard">vCard</a> eller CSV (kommaseparert) .';
 $labels['done'] = 'Fullført';
+
+// settings
 $labels['settingsfor'] = 'Innstillinger for';
 $labels['about'] = 'Om';
 $labels['preferences'] = 'Oppsett';
 $labels['userpreferences'] = 'Brukeroppsett';
 $labels['editpreferences'] = 'Rediger brukeroppsett';
+
 $labels['identities'] = 'Identiteter';
 $labels['manageidentities'] = 'Administrer identitetene for denne kontoen';
 $labels['newidentity'] = 'Ny identitet';
+
 $labels['newitem'] = 'Nytt punkt';
 $labels['edititem'] = 'Rediger punkt';
+
 $labels['preferhtml'] = 'Foretrekk HTML';
 $labels['defaultcharset'] = 'Standard tegnsett';
 $labels['htmlmessage'] = 'HTML-melding';
+$labels['messagepart'] = 'Del';
+$labels['digitalsig'] = 'Digital signatur';
 $labels['dateformat'] = 'Datoformat';
 $labels['timeformat'] = 'Tidsformat';
 $labels['prettydate'] = 'Pen datovisning';
-$labels['setdefault'] = 'Sett som standard';
-$labels['autodetect'] = 'Auto';
-$labels['language'] = 'Språk';
-$labels['timezone'] = 'Tidssone';
-$labels['pagesize'] = 'Linjer per side';
+$labels['setdefault']  = 'Sett som standard';
+$labels['autodetect']  = 'Auto';
+$labels['language']  = 'Språk';
+$labels['timezone']  = 'Tidssone';
+$labels['pagesize']  = 'Linjer per side';
 $labels['signature'] = 'Signatur';
-$labels['dstactive'] = 'Sommertid';
+$labels['dstactive']  = 'Sommertid';
 $labels['showinextwin'] = 'Åpne melding i nytt vindu';
 $labels['composeextwin'] = 'Skriv i nytt vindu';
 $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';
@@ -358,11 +425,11 @@ $labels['showremoteimages'] = 'Vis bilder fra eksterne servere i meldinger';
 $labels['fromknownsenders'] = 'fra kjente avsendere';
 $labels['always'] = 'alltid';
 $labels['showinlineimages'] = 'Vis vedlagte bilder nedenfor meldingen';
-$labels['autosavedraft'] = 'Autolagring av utkast';
-$labels['everynminutes'] = 'hvert $n minutt';
-$labels['refreshinterval'] = 'Oppdater (sjekk for nye meldinger etc.)';
-$labels['never'] = 'Aldri';
-$labels['immediately'] = 'umiddelbart';
+$labels['autosavedraft']  = 'Autolagring av utkast';
+$labels['everynminutes']  = 'hvert $n minutt';
+$labels['refreshinterval']  = 'Oppdater (sjekk for nye meldinger etc.)';
+$labels['never']  = 'Aldri';
+$labels['immediately']  = 'umiddelbart';
 $labels['messagesdisplaying'] = 'Visning av meldinger';
 $labels['messagescomposition'] = 'Skriving av meldinger';
 $labels['mimeparamfolding'] = 'Vedleggsnavn';
@@ -389,12 +456,9 @@ $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';
+$labels['previewpanemarkread']  = 'Merk forhåndsviste meldinger som lest';
+$labels['afternseconds']  = 'etter $n sekunder';
 $labels['reqmdn'] = 'Alltid be om svarkvittering';
 $labels['reqdsn'] = 'Alltid be om leveringsstatus';
 $labels['replysamefolder'] = 'Legg svar i mappen til meldingen det svares på';
@@ -411,13 +475,15 @@ $labels['mailtoprotohandler'] = 'Registrer protokollhåndtering for mailto-lenke
 $labels['forwardmode'] = 'Meldinger videresendes';
 $labels['inline'] = 'i teksten';
 $labels['asattachment'] = 'som vedlegg';
-$labels['folder'] = 'Mappe';
-$labels['foldername'] = 'Mappenavn';
-$labels['subscribed'] = 'Abonnere';
+
+$labels['folder']  = 'Mappe';
+$labels['folders']  = 'Mapper';
+$labels['foldername']  = 'Mappenavn';
+$labels['subscribed']  = 'Abonnere';
 $labels['messagecount'] = 'Meldinger';
-$labels['create'] = 'Opprett';
-$labels['createfolder'] = 'Lag ny mappe';
-$labels['managefolders'] = 'Rediger mapper';
+$labels['create']  = 'Opprett';
+$labels['createfolder']  = 'Lag ny mappe';
+$labels['managefolders']  = 'Rediger mapper';
 $labels['specialfolders'] = 'Spesielle mapper';
 $labels['properties'] = 'Egenskaper';
 $labels['folderproperties'] = 'Egenskaper for mappe';
@@ -427,23 +493,29 @@ $labels['info'] = 'Informasjon';
 $labels['getfoldersize'] = 'Klikk for å få mappestørrelse';
 $labels['changesubscription'] = 'Klikk for å endre abonnement';
 $labels['foldertype'] = 'Mappetype';
-$labels['personalfolder'] = 'Privat mappe';
-$labels['otherfolder'] = 'Annen brukers mappe';
-$labels['sharedfolder'] = 'Offentlig mappe';
+$labels['personalfolder']  = 'Privat mappe';
+$labels['otherfolder']  = 'Annen brukers mappe';
+$labels['sharedfolder']  = 'Offentlig mappe';
+
 $labels['sortby'] = 'Sorter etter';
-$labels['sortasc'] = 'Eldste først';
+$labels['sortasc']  = 'Eldste først';
 $labels['sortdesc'] = 'Nyeste først';
 $labels['undo'] = 'Angre';
+
 $labels['installedplugins'] = 'Installerte tillegg';
 $labels['plugin'] = 'Tilleggsmodul';
 $labels['version'] = 'Versjon';
 $labels['source'] = 'Kildekode';
 $labels['license'] = 'Lisensvilkår';
 $labels['support'] = 'Få hjelp';
+
+// units
 $labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
 $labels['GB'] = 'GB';
+
+// character sets
 $labels['unicode'] = 'Unicode';
 $labels['english'] = 'Engelsk';
 $labels['westerneuropean'] = 'Vesteuropeisk';
@@ -463,3 +535,4 @@ $labels['japanese'] = 'Japansk';
 $labels['korean'] = 'Koreansk';
 $labels['chinese'] = 'Kinesisk';
 
+?>
diff --git a/program/localization/nb_NO/messages.inc b/program/localization/nb_NO/messages.inc
index 9bc66a0c0..7785f474a 100644
--- a/program/localization/nb_NO/messages.inc
+++ b/program/localization/nb_NO/messages.inc
@@ -2,20 +2,23 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/nb_NO/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Åsmund Skjæveland <aasmunds@ulrik.uio.no>                   |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['errortitle'] = 'Det oppsto en feil!';
-$messages['loginfailed'] = 'Pålogging mislyktes';
+$messages['errortitle']  = 'Det oppsto en feil!';
+$messages['loginfailed']  = 'Pålogging mislyktes';
 $messages['cookiesdisabled'] = 'Nettleseren din tillater ikke informasjonskapsler (cookies)';
 $messages['sessionerror'] = 'Din nettlesertilkobling er ugyldig eller utløpt';
 $messages['storageerror'] = 'Tilkobling til IMAP-tjener mislyktes.';
@@ -25,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';
@@ -57,11 +62,11 @@ $messages['errormoving'] = 'Kunne ikke flytte meldingen(e)';
 $messages['errorcopying'] = 'Kunne ikke kopiere meldingen(e)';
 $messages['errordeleting'] = 'Kunne ikke slette meldingen(e)';
 $messages['errormarking'] = 'Kunne ikke markere meldingen(e)';
-$messages['deletecontactconfirm'] = 'Vil du virkelig slette valgte kontakt(er)?';
-$messages['deletegroupconfirm'] = 'Vil du virkelig slette den valgte gruppa?';
+$messages['deletecontactconfirm']  = 'Vil du virkelig slette valgte kontakt(er)?';
+$messages['deletegroupconfirm']  = 'Vil du virkelig slette den valgte gruppa?';
 $messages['deletemessagesconfirm'] = 'Vil du virkelig slette de(n) valgte meldingen(e)?';
-$messages['deletefolderconfirm'] = 'Vil du virkelig slette denne mappen?';
-$messages['purgefolderconfirm'] = 'Vil du virkelig slette alle meldingene i denne mappen?';
+$messages['deletefolderconfirm']  = 'Vil du virkelig slette denne mappen?';
+$messages['purgefolderconfirm']  = 'Vil du virkelig slette alle meldingene i denne mappen?';
 $messages['contactdeleting'] = 'Sletter kontakt(er) ...';
 $messages['groupdeleting'] = 'Sletter gruppe ...';
 $messages['folderdeleting'] = 'Sletter mappe...';
@@ -70,11 +75,11 @@ $messages['foldersubscribing'] = 'Abonnerer på mappe ...';
 $messages['folderunsubscribing'] = 'Avslutter mappeabonnement ...';
 $messages['formincomplete'] = 'Skjemaet var ikke fullstendig fylt ut';
 $messages['noemailwarning'] = 'Vennligst oppgi en gyldig epostadresse.';
-$messages['nonamewarning'] = 'Angi et navn';
+$messages['nonamewarning']  = 'Angi et navn';
 $messages['nopagesizewarning'] = 'Angi sidestørrelsen';
 $messages['nosenderwarning'] = 'Vennligst angi avsenderadresse';
 $messages['norecipientwarning'] = 'Skriv inn minst én mottaker';
-$messages['nosubjectwarning'] = 'Emnefeltet er tomt. Vil du skrive det inn nå?';
+$messages['nosubjectwarning']  = 'Emnefeltet er tomt. Vil du skrive det inn nå?';
 $messages['nobodywarning'] = 'Send denne meldingen uten tekst?';
 $messages['notsentwarning'] = 'E-posten er ikke sendt. Er du sikker på at du vil avbryte skrivingen?';
 $messages['noldapserver'] = 'Velg LDAP-tjener å søke i';
@@ -163,3 +168,4 @@ $messages['messagetoobig'] = 'Meldingsdelen er for stor til at den kan prosesser
 $messages['attachmentvalidationerror'] = 'ADVARSEL! Dette vedlegget er mistenkelig fordi det er av en type som ikke passer med det som er deklarert i meldingen. Hvis du ikke stoler på avsenderen burde du ikke åpne det i nettleseren, fordi det kan ha skadelig innhold.<br/><br/><em>Forventet: $expected; fant: $detected</em>rnrnWARNING! 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'] = 'NB: Denne webmail-klienten krever Javascript! Skru på Javascript i nettleseren din for å kunne bruke den.';
 
+?>
diff --git a/program/localization/ne_NP/labels.inc b/program/localization/ne_NP/labels.inc
index d06a03792..29d43ef9c 100644
--- a/program/localization/ne_NP/labels.inc
+++ b/program/localization/ne_NP/labels.inc
@@ -2,57 +2,78 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ne_NP/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Prasanna Singh                                                |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = '$product मा स्वागत छ';
-$labels['username'] = 'प्रयोगकर्ताको नाम';
-$labels['password'] = 'प्रवेश शब्द';
-$labels['server'] = 'सर्भर';
-$labels['login'] = 'लगइन गर्नुहोस्';
-$labels['logout'] = 'लगआउट गर्नुहोस्';
-$labels['mail'] = 'ई-मेल';
+
+// login page
+$labels['welcome']   = '$product मा स्वागत छ';
+$labels['username']  = 'प्रयोगकर्ताको नाम';
+$labels['password']  = 'प्रवेश शब्द';
+$labels['server']    = 'सर्भर';
+$labels['login']     = 'लगइन गर्नुहोस्';
+
+// taskbar
+$labels['logout']   = 'लगआउट गर्नुहोस्';
+$labels['mail']     = 'ई-मेल';
 $labels['settings'] = 'व्यक्तिगत रोजाईहरु';
 $labels['addressbook'] = 'ठेगाना पुस्तिका';
-$labels['inbox'] = 'प्राप्ति मञ्जूषा';
+
+// mailbox names
+$labels['inbox']  = 'प्राप्ति मञ्जूषा';
 $labels['drafts'] = 'ड्राफ्टहरू';
-$labels['sent'] = 'पठईएका मेलहरु';
-$labels['trash'] = 'रद्दी टोकरी';
-$labels['junk'] = 'स्पाम';
+$labels['sent']   = 'पठईएका मेलहरु';
+$labels['trash']  = 'रद्दी टोकरी';
+$labels['junk']   = 'स्पाम';
+
+// message listing
 $labels['subject'] = 'विषय';
-$labels['from'] = 'प्रेषक';
-$labels['to'] = 'प्रापक';
-$labels['cc'] = 'बोधार्थ';
-$labels['bcc'] = 'गुप्त बोधार्थ';
+$labels['from']    = 'प्रेषक';
+$labels['sender']  = 'Sender';
+$labels['to']      = 'प्रापक';
+$labels['cc']      = 'बोधार्थ';
+$labels['bcc']     = 'गुप्त बोधार्थ';
 $labels['replyto'] = 'लाई-जवाफ';
 $labels['followupto'] = 'यसलाई अनुसरण गर्नुहोस्';
-$labels['date'] = 'तारिख';
-$labels['size'] = 'नाप';
+$labels['date']    = 'तारिख';
+$labels['size']    = 'नाप';
 $labels['priority'] = 'प्राथमिकता';
 $labels['organization'] = 'संस्था';
 $labels['readstatus'] = 'पढेको अवस्था';
+$labels['listoptions'] = 'List options...';
+
 $labels['mailboxlist'] = 'फोल्डरहरु';
-$labels['folders'] = 'फोल्डरहरु';
 $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['copy']     = 'प्रतिलिपि गर्नुहोस्';
+$labels['move']     = 'सार्नुहोस';
+$labels['moveto']   = 'यहाँ सार्नुहोस';
 $labels['download'] = 'डाऊनलोड';
+$labels['open']     = 'Open';
+$labels['showattachment'] = 'Show';
+$labels['showanyway'] = 'Show it anyway';
+
 $labels['filename'] = 'फाईलको नाम';
 $labels['filesize'] = 'फाईलको नाप';
+
 $labels['addtoaddressbook'] = 'ठेगाना पुस्तिकामा भर्नुहोस';
+
+// weekdays short
 $labels['sun'] = 'आइत';
 $labels['mon'] = 'सोम';
 $labels['tue'] = 'मंगल';
@@ -60,150 +81,458 @@ $labels['wed'] = 'बुध';
 $labels['thu'] = 'विहि';
 $labels['fri'] = 'शुक';
 $labels['sat'] = 'शनि';
-$labels['sunday'] = 'आइतवार';
-$labels['monday'] = 'सोमवार';
-$labels['tuesday'] = 'मंगलवार';
+
+// weekdays long
+$labels['sunday']    = 'आइतवार';
+$labels['monday']    = 'सोमवार';
+$labels['tuesday']   = 'मंगलवार';
 $labels['wednesday'] = 'बुधवार';
-$labels['thursday'] = 'विहिवार';
-$labels['friday'] = 'शुक्रवार';
-$labels['saturday'] = 'शनिवार';
-$labels['jan'] = 'जनवरी';
-$labels['feb'] = 'फेब्रुवरी';
-$labels['mar'] = 'मार्च';
-$labels['apr'] = 'अप्रिल';
-$labels['may'] = 'मई';
-$labels['longmay'] = 'मई';
-$labels['jun'] = 'जुन';
-$labels['jul'] = 'जुलाई';
-$labels['aug'] = 'अगस्ट';
-$labels['sep'] = 'सेप्टेम्बर';
-$labels['oct'] = 'अक्टोबर';
-$labels['nov'] = 'नोभेम्बर';
-$labels['dec'] = 'डिसेम्बर';
-$labels['longjan'] = 'जनवरी';
-$labels['longfeb'] = 'फेब्रुवरी';
-$labels['longmar'] = 'मार्च';
-$labels['longapr'] = 'अप्रिल';
-$labels['longjun'] = 'जुन';
-$labels['longjul'] = 'जुलाई';
-$labels['longaug'] = 'अगस्ट';
-$labels['longsep'] = 'सेप्टेम्बर';
-$labels['longoct'] = 'अक्टोबर';
-$labels['longnov'] = 'नोभेम्बर';
-$labels['longdec'] = 'डिसेम्बर';
+$labels['thursday']  = 'विहिवार';
+$labels['friday']    = 'शुक्रवार';
+$labels['saturday']  = 'शनिवार';
+
+// months short
+$labels['jan']	= 'जनवरी';
+$labels['feb']	= 'फेब्रुवरी';
+$labels['mar']	= 'मार्च';
+$labels['apr']	= 'अप्रिल';
+$labels['may']	= 'मई';
+$labels['jun']	= 'जुन';
+$labels['jul'] 	= 'जुलाई';
+$labels['aug']	= 'अगस्ट';
+$labels['sep']	= 'सेप्टेम्बर';
+$labels['oct']	= 'अक्टोबर';
+$labels['nov']	= 'नोभेम्बर';
+$labels['dec']	= 'डिसेम्बर';
+
+// months long
+$labels['longjan']	= 'जनवरी';
+$labels['longfeb']	= 'फेब्रुवरी';
+$labels['longmar']	= 'मार्च';
+$labels['longapr']	= 'अप्रिल';
+$labels['longmay']	= 'मई';
+$labels['longjun']	= 'जुन';
+$labels['longjul']	= 'जुलाई';
+$labels['longaug']	= 'अगस्ट';
+$labels['longsep']	= 'सेप्टेम्बर';
+$labels['longoct']	= 'अक्टोबर';
+$labels['longnov']	= 'नोभेम्बर';
+$labels['longdec']	= 'डिसेम्बर';
+
 $labels['today'] = 'आज';
-$labels['refresh'] = 'ताजा पार्नुहोस्';
-$labels['checkmail'] = 'नया मेल खोज्नुहोस';
-$labels['compose'] = 'रचना गर्नुहोस्';
-$labels['writenewmessage'] = 'नया मेल लेख्नुहोस';
-$labels['reply'] = 'जवाफ दिनुहोस्';
-$labels['replytomessage'] = 'प्रेषकलाई जवाफ दिनुहोस';
+
+// toolbar buttons
+$labels['refresh']          = 'ताजा पार्नुहोस्';
+$labels['checkmail']        = 'नया मेल खोज्नुहोस';
+$labels['compose']          = 'रचना गर्नुहोस्';
+$labels['writenewmessage']  = 'नया मेल लेख्नुहोस';
+$labels['reply']            = 'जवाफ दिनुहोस्';
+$labels['replytomessage']   = 'प्रेषकलाई जवाफ दिनुहोस';
 $labels['replytoallmessage'] = 'प्रेषक लगायत सबैलाई जवाफ दिनुहोस';
-$labels['replyall'] = 'सबैलाई जवाफ दिनुहोस';
-$labels['replylist'] = 'जवाफ तालिका';
-$labels['forward'] = 'फरवार्ड गर्नुहोस्';
-$labels['forwardinline'] = 'आन्तरिक पंक्तिमा फरवार्ड गर्नुहोस';
+$labels['replyall']         = 'सबैलाई जवाफ दिनुहोस';
+$labels['replylist']        = 'जवाफ तालिका';
+$labels['forward']          = 'फरवार्ड गर्नुहोस्';
+$labels['forwardinline']    = 'आन्तरिक पंक्तिमा फरवार्ड गर्नुहोस';
 $labels['forwardattachment'] = 'एट्याचमेन्ट जसरी फरवार्ड गर्नुहोस';
-$labels['forwardmessage'] = 'मेल अगाडि पठाउनुहोस';
-$labels['deletemessage'] = 'रद्दी टोकरीमा हाल्नुहोस';
+$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['more'] = 'अझ धेरै';
-$labels['back'] = 'पछाडि';
-$labels['options'] = 'विकल्पहरू';
+$labels['printmessage']     = 'यो सन्देशलाई मुद्रण गर्नुहोस्';
+$labels['previousmessage']  = 'पछाडिको सन्देश देखाउनुहोस';
+$labels['firstmessage']     = 'पहलो सन्देश देखाउनुहोस';
+$labels['nextmessage']      = 'अगाडिको सन्देश देखाउनुहोस';
+$labels['lastmessage']      = 'अन्तिम सन्देश देखाउनुहोस';
+$labels['backtolist']       = 'सन्देश सूची देखाउनुहोस';
+$labels['viewsource']       = 'श्रोत देखाउनुहोस';
+$labels['mark']             = 'चिन्ह लगाउनुहोस्';
+$labels['markmessages']     = 'सन्देशमा चिन्ह लगाउनुहोस्';
+$labels['markread']         = 'As read';
+$labels['markunread']       = 'As unread';
+$labels['markflagged']      = 'As flagged';
+$labels['markunflagged']    = 'As unflagged';
+$labels['moreactions']      = 'More actions...';
+$labels['more']             = 'अझ धेरै';
+$labels['back']             = 'पछाडि';
+$labels['options']          = 'विकल्पहरू';
+
 $labels['select'] = 'चयन गर्नुहोस्';
 $labels['all'] = 'सबै';
 $labels['none'] = 'हैन';
-$labels['nonesort'] = 'हैन';
+$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';
+$labels['filter'] = 'Filter';
+$labels['list'] = 'List';
+$labels['threads'] = 'Threads';
+$labels['expand-all'] = 'Expand All';
+$labels['expand-unread'] = 'Expand Unread';
+$labels['collapse-all'] = 'Collapse All';
+$labels['threaded'] = 'Threaded';
+
+$labels['autoexpand_threads'] = 'Expand message threads';
+$labels['do_expand'] = 'all threads';
+$labels['expand_only_unread'] = 'only with unread messages';
+$labels['fromto'] = 'From/To';
+$labels['flag'] = 'Flag';
+$labels['attachment'] = 'Attachment';
+$labels['nonesort'] = 'हैन';
+$labels['sentdate'] = 'Sent date';
+$labels['arrival'] = 'Arrival date';
+$labels['asc'] = 'ascending';
+$labels['desc'] = 'descending';
+$labels['listcolumns'] = 'List columns';
+$labels['listsorting'] = 'Sorting column';
+$labels['listorder'] = 'Sorting order';
+$labels['listmode'] = 'List view mode';
+
+$labels['folderactions'] = 'Folder actions...';
 $labels['compact'] = 'छोटो गर्नुहोस';
 $labels['empty'] = 'खाली गर्ने';
+
 $labels['quota'] = 'डिस्कको उपभोग';
-$labels['unknown'] = 'अज्ञात';
-$labels['unlimited'] = 'अनगिन्ति';
-$labels['quicksearch'] = 'स्फुर्ति खोज';
-$labels['resetsearch'] = 'पन: खोज';
-$labels['sendmessage'] = 'तुरुन्तै मेल पठाउनुहोस';
-$labels['savemessage'] = 'ड्राफ्ट जोगाउनुहोस';
-$labels['addattachment'] = 'फाइल टाँस्नुहोस';
-$labels['charset'] = 'क्यारेक्टर सेट';
-$labels['editortype'] = 'सम्पादकको प्रकार';
-$labels['returnreceipt'] = 'फिर्ति रसीद';
+$labels['unknown']  = 'अज्ञात';
+$labels['unlimited']  = 'अनगिन्ति';
+
+$labels['quicksearch']  = 'स्फुर्ति खोज';
+$labels['resetsearch']  = 'पन: खोज';
+$labels['searchmod']  = 'Search modifiers';
+$labels['msgtext']  = 'Entire message';
+$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';
+$labels['send']           = 'Send';
+$labels['sendmessage']    = 'तुरुन्तै मेल पठाउनुहोस';
+$labels['savemessage']    = 'ड्राफ्ट जोगाउनुहोस';
+$labels['addattachment']  = 'फाइल टाँस्नुहोस';
+$labels['charset']        = 'क्यारेक्टर सेट';
+$labels['editortype']     = 'सम्पादकको प्रकार';
+$labels['returnreceipt']  = 'फिर्ति रसीद';
+$labels['dsn']            = 'Delivery status notification';
+$labels['mailreplyintro'] = 'On $date, $sender wrote:';
+$labels['originalmessage'] = 'Original Message';
+
+$labels['editidents']    = 'Edit identities';
+$labels['spellcheck']    = 'Spell';
 $labels['checkspelling'] = 'हिज्जे जाँच';
 $labels['resumeediting'] = 'पुन: सम्पादन गर्नुहोस';
-$labels['revertto'] = 'पहिलेको स्थितीमा जानुहोस';
+$labels['revertto']      = 'पहिलेको स्थितीमा जानुहोस';
+
+$labels['attach'] = 'Attach';
 $labels['attachments'] = 'टाँसिएका फाईलहरु';
 $labels['upload'] = 'अपलोड';
-$labels['close'] = 'बन्द';
-$labels['low'] = 'कम';
-$labels['lowest'] = 'सबै भन्दा कम';
-$labels['normal'] = 'साधारण';
-$labels['high'] = 'उच्च';
+$labels['uploadprogress'] = '$percent ($current from $total)';
+$labels['close']  = 'बन्द';
+$labels['messageoptions']  = 'Message options...';
+
+$labels['low']     = 'कम';
+$labels['lowest']  = 'सबै भन्दा कम';
+$labels['normal']  = 'साधारण';
+$labels['high']    = 'उच्च';
 $labels['highest'] = 'उच्चतम';
-$labels['nosubject'] = '(बिना विषयको)';
+
+$labels['nosubject']  = '(बिना विषयको)';
 $labels['showimages'] = 'चित्र देखाउनुहोस';
+$labels['alwaysshow'] = 'Always show images from $sender';
+$labels['isdraft']    = 'This is a draft message.';
+$labels['andnmore']   = '$nr more...';
+$labels['togglemoreheaders'] = 'Show more message headers';
+$labels['togglefullheaders'] = 'Toggle raw message headers';
+
 $labels['htmltoggle'] = 'ऐच-टी-ऐम-एल (HTML)';
 $labels['plaintoggle'] = 'सादा अक्षर';
-$labels['name'] = 'देखाउने नाम';
-$labels['firstname'] = 'पहिलो नाम';
-$labels['surname'] = 'थर';
-$labels['email'] = 'ई-मेल';
+$labels['savesentmessagein'] = 'Save sent message in';
+$labels['dontsave'] = 'don\'t save';
+$labels['maxuploadsize'] = 'Maximum allowed file size is $size';
+
+$labels['addcc'] = 'Add Cc';
+$labels['addbcc'] = 'Add Bcc';
+$labels['addreplyto'] = 'Add Reply-To';
+$labels['addfollowupto'] = 'Add Followup-To';
+
+// mdn
+$labels['mdnrequest'] = 'The sender of this message has asked to be notified when you read this message. Do you wish to notify the sender?';
+$labels['receiptread'] = 'Return Receipt (read)';
+$labels['yourmessage'] = 'This is a Return Receipt for your message';
+$labels['receiptnote'] = 'Note: This receipt only acknowledges that the message was displayed on the recipient\'s computer. There is no guarantee that the recipient has read or understood the message contents.';
+
+// address boook
+$labels['name']         = 'देखाउने नाम';
+$labels['firstname']    = 'पहिलो नाम';
+$labels['surname']      = 'थर';
+$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['email']        = 'ई-मेल';
+$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['typepager']  = 'Pager';
+$labels['typevideo']  = 'Video';
+$labels['typeassistant']  = 'Assistant';
+$labels['typehomepage']  = 'Home Page';
+$labels['typeblog'] = 'Blog';
+$labels['typeprofile'] = 'Profile';
+
+$labels['addfield'] = 'Add field...';
 $labels['addcontact'] = 'नया सम्पर्क जोड्नुहोस';
 $labels['editcontact'] = 'सम्पर्क सच्याउनुहोस';
-$labels['edit'] = 'सच्याउनुहोस';
+$labels['contacts'] = 'Contacts';
+$labels['contactproperties'] = 'Contact properties';
+$labels['personalinfo'] = 'Personal information';
+
+$labels['edit']   = 'सच्याउनुहोस';
 $labels['cancel'] = 'खारेज गर्नुहोस';
-$labels['save'] = 'जोगाउनुहोस';
+$labels['save']   = 'जोगाउनुहोस';
 $labels['delete'] = 'मेटाउनुहोस';
-$labels['newcontact'] = 'नया सम्पर्क कार्ड बनाउनुहोस';
-$labels['deletecontact'] = 'छानिएका सम्पर्कहरु मेटाउनुहोस';
-$labels['composeto'] = 'मेल लेखी पठाउनुहोस';
+$labels['rename'] = 'Rename';
+$labels['addphoto'] = 'Add';
+$labels['replacephoto'] = 'Replace';
+$labels['uploadphoto'] = 'Upload photo';
+
+$labels['newcontact']     = 'नया सम्पर्क कार्ड बनाउनुहोस';
+$labels['deletecontact']  = 'छानिएका सम्पर्कहरु मेटाउनुहोस';
+$labels['composeto']      = 'मेल लेखी पठाउनुहोस';
 $labels['contactsfromto'] = 'सम्पर्कहरु $from बाट $to सम्म, $count मध्यबाट';
-$labels['print'] = 'छाप्नुहोस';
-$labels['export'] = 'ऐक्स्पोर्ट गर्नुहोस';
-$labels['previouspage'] = 'पहिलेको सेट देखाउनुहोस';
-$labels['firstpage'] = 'पहिलो सेट देखाउनुहोस';
-$labels['nextpage'] = 'अर्को सेट देखाउनुहोस';
-$labels['lastpage'] = 'अन्तिम सेट देखाउनुहोस';
+$labels['print']          = 'छाप्नुहोस';
+$labels['export']         = 'ऐक्स्पोर्ट गर्नुहोस';
+$labels['exportall']      = 'Export all';
+$labels['exportsel']      = 'Export selected';
+$labels['exportvcards']   = 'Export contacts in vCard format';
+$labels['newcontactgroup'] = 'Create new contact group';
+$labels['grouprename']    = 'Rename group';
+$labels['groupdelete']    = 'Delete group';
+$labels['groupremoveselected'] = 'Remove selected contacts from group';
+
+$labels['previouspage']   = 'पहिलेको सेट देखाउनुहोस';
+$labels['firstpage']      = 'पहिलो सेट देखाउनुहोस';
+$labels['nextpage']       = 'अर्को सेट देखाउनुहोस';
+$labels['lastpage']       = 'अन्तिम सेट देखाउनुहोस';
+
+$labels['group'] = 'Group';
 $labels['groups'] = 'समूहहरु';
 $labels['personaladrbook'] = 'व्यक्तिगत ठेगानाहरु';
+
+$labels['searchsave'] = 'Save search';
+$labels['searchdelete'] = 'Delete search';
+
+$labels['import'] = 'Import';
+$labels['importcontacts'] = 'Import contacts';
+$labels['importfromfile'] = 'Import from file:';
+$labels['importtarget'] = 'Add new contacts to address book:';
+$labels['importreplace'] = 'Replace the entire address book';
+$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['done'] = 'Done';
+
+// settings
 $labels['settingsfor'] = 'तय';
+$labels['about'] = 'About';
 $labels['preferences'] = 'रोजाइहरु';
 $labels['userpreferences'] = 'यूसरका रोजाइहरु';
 $labels['editpreferences'] = 'यूसरका रोजाइहर सम्पादन गर्नुहोस';
+
 $labels['identities'] = 'पहिचानहरु';
 $labels['manageidentities'] = 'यो खाताको पहिचानहरको व्यवस्था गर्नुहोस';
 $labels['newidentity'] = 'नया पहिचान';
+
 $labels['newitem'] = 'नया प्रकार';
 $labels['edititem'] = 'प्रकार सम्पादन गर्नुहोस';
+
 $labels['preferhtml'] = 'ऐच-टी-ऐम-ऐल(HTML) देखाउनुहोस';
+$labels['defaultcharset'] = 'Default Character Set';
 $labels['htmlmessage'] = 'ऐच-टी-ऐम-ऐल (HTML) रूपका मेल';
+$labels['messagepart'] = 'Part';
+$labels['digitalsig'] = 'Digital Signature';
+$labels['dateformat'] = 'Date format';
+$labels['timeformat'] = 'Time format';
 $labels['prettydate'] = 'सुन्दर तारिख';
-$labels['setdefault'] = 'तय गर्नुहोस';
-$labels['language'] = 'भाषा';
-$labels['timezone'] = 'समय क्षेत्र';
-$labels['pagesize'] = 'हरेक पन्नामा यति';
+$labels['setdefault']  = 'तय गर्नुहोस';
+$labels['autodetect']  = 'Auto';
+$labels['language']  = 'भाषा';
+$labels['timezone']  = 'समय क्षेत्र';
+$labels['pagesize']  = 'हरेक पन्नामा यति';
 $labels['signature'] = 'हस्ताक्षर';
-$labels['dstactive'] = 'प्रकाश बचाव';
+$labels['dstactive']  = 'प्रकाश बचाव';
+$labels['showinextwin'] = 'Open message in a new window';
+$labels['composeextwin'] = 'Compose in a new window';
 $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['autosavedraft'] = 'स्वत ड्राफ्ट जोगाउनुहोस';
-$labels['never'] = 'काहिलै नहुने';
-$labels['folder'] = 'फोल्डर';
-$labels['foldername'] = 'फोल्डरको नाम';
-$labels['subscribed'] = 'सबस्क्राईब गरियो';
-$labels['create'] = 'बनाउनुहोस';
-$labels['createfolder'] = 'नया फोलडर बनाउनुहोस';
-$labels['managefolders'] = 'फोलडर व्यवस्थित गर्नुहोस';
+$labels['skin'] = 'Interface skin';
+$labels['logoutclear'] = 'Clear Trash on logout';
+$labels['logoutcompact'] = 'Compact Inbox on logout';
+$labels['uisettings'] = 'User Interface';
+$labels['serversettings'] = 'Server Settings';
+$labels['mailboxview'] = 'Mailbox View';
+$labels['mdnrequests'] = 'On request for return receipt';
+$labels['askuser'] = 'ask me';
+$labels['autosend'] = 'send receipt';
+$labels['autosendknown'] = 'send receipt to my contacts, otherwise ask me';
+$labels['autosendknownignore'] = 'send receipt to my contacts, otherwise ignore';
+$labels['ignore'] = 'ignore';
+$labels['readwhendeleted'] = 'Mark the message as read on delete';
+$labels['flagfordeletion'] = 'Flag the message for deletion instead of delete';
+$labels['skipdeleted'] = 'Do not show deleted messages';
+$labels['deletealways'] = 'If moving messages to Trash fails, delete them';
+$labels['deletejunk'] = 'Directly delete messages in Junk';
+$labels['showremoteimages'] = 'Display remote inline images';
+$labels['fromknownsenders'] = 'from known senders';
+$labels['always'] = 'always';
+$labels['showinlineimages'] = 'Display attached images below the message';
+$labels['autosavedraft']  = 'स्वत ड्राफ्ट जोगाउनुहोस';
+$labels['everynminutes']  = 'every $n minute(s)';
+$labels['refreshinterval']  = 'Refresh (check for new messages, etc.)';
+$labels['never']  = 'काहिलै नहुने';
+$labels['immediately']  = 'immediately';
+$labels['messagesdisplaying'] = 'Displaying Messages';
+$labels['messagescomposition'] = 'Composing Messages';
+$labels['mimeparamfolding'] = 'Attachment names';
+$labels['2231folding'] = 'Full RFC 2231 (Thunderbird)';
+$labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
+$labels['2047folding'] = 'Full RFC 2047 (other)';
+$labels['force7bit'] = 'Use MIME encoding for 8-bit characters';
+$labels['advancedoptions'] = 'Advanced options';
+$labels['focusonnewmessage'] = 'Focus browser window on new message';
+$labels['checkallfolders'] = 'Check all folders for new messages';
+$labels['displaynext'] = 'After message delete/move display the next message';
+$labels['defaultfont'] = 'Default font of HTML message';
+$labels['mainoptions'] = 'Main Options';
+$labels['browseroptions'] = 'Browser Options';
+$labels['section'] = 'Section';
+$labels['maintenance'] = 'Maintenance';
+$labels['newmessage'] = 'New Message';
+$labels['signatureoptions'] = 'Signature Options';
+$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'] = 'Automatically add signature';
+$labels['newmessageonly'] = 'new message only';
+$labels['replyandforwardonly'] = 'replies and forwards only';
+$labels['insertsignature'] = 'Insert signature';
+$labels['previewpanemarkread']  = 'Mark previewed messages as read';
+$labels['afternseconds']  = 'after $n seconds';
+$labels['reqmdn'] = 'Always request a return receipt';
+$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'] = 'Check spelling before sending a message';
+$labels['spellcheckoptions'] = 'Spellcheck Options';
+$labels['spellcheckignoresyms'] = 'Ignore words with symbols';
+$labels['spellcheckignorenums'] = 'Ignore words with numbers';
+$labels['spellcheckignorecaps'] = 'Ignore words with all letters capitalized';
+$labels['addtodict'] = 'Add to dictionary';
+$labels['mailtoprotohandler'] = 'Register protocol handler for mailto: links';
+$labels['forwardmode'] = 'Messages forwarding';
+$labels['inline'] = 'inline';
+$labels['asattachment'] = 'as attachment';
+
+$labels['folder']  = 'फोल्डर';
+$labels['folders']  = 'फोल्डरहरु';
+$labels['foldername']  = 'फोल्डरको नाम';
+$labels['subscribed']  = 'सबस्क्राईब गरियो';
+$labels['messagecount'] = 'Messages';
+$labels['create']  = 'बनाउनुहोस';
+$labels['createfolder']  = 'नया फोलडर बनाउनुहोस';
+$labels['managefolders']  = 'फोलडर व्यवस्थित गर्नुहोस';
+$labels['specialfolders'] = 'Special Folders';
+$labels['properties'] = 'Properties';
+$labels['folderproperties'] = 'Folder properties';
+$labels['parentfolder'] = 'Parent folder';
+$labels['location'] = 'Location';
+$labels['info'] = 'Information';
+$labels['getfoldersize'] = 'Click to get folder size';
+$labels['changesubscription'] = 'Click to change subscription';
+$labels['foldertype'] = 'Folder Type';
+$labels['personalfolder']  = 'Private Folder';
+$labels['otherfolder']  = 'Other User\'s Folder';
+$labels['sharedfolder']  = 'Public Folder';
+
 $labels['sortby'] = 'यसरी तय गर्नुहोस';
-$labels['sortasc'] = 'पहिलो देखि अन्तिम सम्म तय गर्नुहोस';
+$labels['sortasc']  = 'पहिलो देखि अन्तिम सम्म तय गर्नुहोस';
 $labels['sortdesc'] = 'अन्तिम देखि पहिलो सम्म तय गर्नुहोस';
+$labels['undo'] = 'Undo';
+
+$labels['installedplugins'] = 'Installed plugins';
+$labels['plugin'] = 'Plugin';
+$labels['version'] = 'Version';
+$labels['source'] = 'Source';
+$labels['license'] = 'License';
+$labels['support'] = 'Get support';
+
+// units
+$labels['B'] = 'B';
+$labels['KB'] = 'KB';
+$labels['MB'] = 'MB';
+$labels['GB'] = 'GB';
+
+// character sets
+$labels['unicode'] = 'Unicode';
+$labels['english'] = '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['turkish'] = 'Turkish';
+$labels['nordic'] = 'Nordic';
+$labels['thai'] = 'Thai';
+$labels['celtic'] = 'Celtic';
+$labels['vietnamese'] = 'Vietnamese';
+$labels['japanese'] = 'Japanese';
+$labels['korean'] = 'Korean';
+$labels['chinese'] = 'Chinese';
 
+?>
diff --git a/program/localization/ne_NP/messages.inc b/program/localization/ne_NP/messages.inc
index e61759363..c5214bb0f 100644
--- a/program/localization/ne_NP/messages.inc
+++ b/program/localization/ne_NP/messages.inc
@@ -2,27 +2,43 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ne_NP/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['loginfailed'] = 'लागईन हुन पाएन';
+$messages['errortitle']  = 'An error occurred!';
+$messages['loginfailed']  = 'लागईन हुन पाएन';
 $messages['cookiesdisabled'] = 'तपाईको ब्राऊसरले कुकी स्वीकार गारिरहेको छैन';
 $messages['sessionerror'] = 'सत्र समाप्त वा अवैद्य';
 $messages['storageerror'] = 'सर्वर संग सम्पर्क हुन पाएन';
+$messages['servererror'] = 'Server Error!';
+$messages['servererrormsg'] = 'Server Error: $msg';
+$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'] = 'यो मेलबक्स मा कुनै मेल छैन';
 $messages['loggedout'] = 'सत्र समाप्त । नमास्कार!';
 $messages['mailboxempty'] = 'मेल बक्स खाली छ';
+$messages['refreshing'] = 'Refreshing...';
 $messages['loading'] = 'लोड भईरहेको छ...';
+$messages['uploading'] = 'Uploading file...';
+$messages['uploadingmany'] = 'Uploading files...';
 $messages['loadingdata'] = 'डाटा लोड भईरहेको छै...';
 $messages['checkingmail'] = 'नया मेलको खोजी भईरहेको छ...';
 $messages['sendingmessage'] = 'मेल पठाईदै रहेको छ...';
@@ -32,34 +48,54 @@ $messages['messagesaved'] = 'मेल ड्राफ्ट फोल्डर�
 $messages['successfullysaved'] = 'सफल्तापूर्वक जोगाईयो';
 $messages['addedsuccessfully'] = 'सम्पर्क पुस्तिकामा सफल्तापूर्वक सम्पर्क प्रविष्ट गारियो';
 $messages['contactexists'] = 'यो ई-मेल पहिलै लिईसकिएको छ';
+$messages['contactnameexists'] = 'A contact with the same name already exists.';
 $messages['blockedimages'] = 'तपाईको प्राईवेसी को लागि तथा अन्य स्पामबाट बच्नकोलागि यो मेलमा चित्रहुरु देखाईएका छैनन्।';
 $messages['encryptedmessage'] = 'माफ गर्नुहोसे, यो मेल ईन्क्रिफ्ट गरिएको रूपमा छ, त्यसैले देखाउन सकिदैन!';
 $messages['nocontactsfound'] = 'कुनै सम्पर्क भेटिएन';
 $messages['contactnotfound'] = 'अनुरोध गारिएको सम्पर्क भेटिएन';
+$messages['contactsearchonly'] = 'Enter some search terms to find contacts';
 $messages['sendingfailed'] = 'मेल पठाउन सकिएन';
+$messages['senttooquickly'] = 'Please wait $sec sec(s). before sending this message.';
+$messages['errorsavingsent'] = 'An error occured while saving sent message.';
 $messages['errorsaving'] = 'जोगाउदा-जोगाउदै गडबड भायो';
 $messages['errormoving'] = 'मेल सार्न सकिएन';
+$messages['errorcopying'] = 'Could not copy the message(s).';
 $messages['errordeleting'] = 'मेल मेटाउन सकिएन';
-$messages['deletecontactconfirm'] = 'तापाईले छान्नुभएको सम्पर्कहरु, साँचै मेट्न चहानुहुन्छ?';
+$messages['errormarking'] = 'Could not mark the message(s).';
+$messages['deletecontactconfirm']  = 'तापाईले छान्नुभएको सम्पर्कहरु, साँचै मेट्न चहानुहुन्छ?';
+$messages['deletegroupconfirm']  = 'Do you really want to delete selected group?';
 $messages['deletemessagesconfirm'] = 'तापाईले छान्नु भएको मेलहरु, साँचै मेट्न चहानुहुन्छ?';
-$messages['deletefolderconfirm'] = 'तापाईले साँचै यो फोल्डर मेट्न चहानु हुन्छ?';
-$messages['purgefolderconfirm'] = 'तापाईले साँचै यो फोल्डरमा भएका सबै मेलहरु मेट्न चहानुहुन्छ?';
+$messages['deletefolderconfirm']  = 'तापाईले साँचै यो फोल्डर मेट्न चहानु हुन्छ?';
+$messages['purgefolderconfirm']  = 'तापाईले साँचै यो फोल्डरमा भएका सबै मेलहरु मेट्न चहानुहुन्छ?';
+$messages['contactdeleting'] = 'Deleting contact(s)...';
+$messages['groupdeleting'] = 'Deleting group...';
+$messages['folderdeleting'] = 'Deleting folder...';
+$messages['foldermoving'] = 'Moving folder...';
+$messages['foldersubscribing'] = 'Subscribing folder...';
+$messages['folderunsubscribing'] = 'Unsubscribing folder...';
 $messages['formincomplete'] = 'फर्म पूर्ण रुपमा भरिएको छैन';
 $messages['noemailwarning'] = 'कृपया वैद्य ई-मेल भर्नुहोस';
-$messages['nonamewarning'] = 'कृपया नाम भर्नुहोस';
+$messages['nonamewarning']  = 'कृपया नाम भर्नुहोस';
 $messages['nopagesizewarning'] = 'कृपया पन्नाको नाप भर्नुहोस';
+$messages['nosenderwarning'] = 'Please enter sender e-mail address.';
 $messages['norecipientwarning'] = 'कृपया कम-से-कम एउटा प्रापकको विवरण भर्नुहोस';
-$messages['nosubjectwarning'] = 'मेलको कुनै विषय तोकिएको छैनै। केहि तोक्न चहानुहुन्छ ?';
+$messages['nosubjectwarning']  = 'मेलको कुनै विषय तोकिएको छैनै। केहि तोक्न चहानुहुन्छ ?';
 $messages['nobodywarning'] = 'बिना केहि लेखि पठाउने?';
 $messages['notsentwarning'] = 'मेल पठएको छैन.. मेल रद्द गर्न चहानुहुन्छ?';
 $messages['noldapserver'] = 'कृपया खोजको निम्ति एउटा ऐलडाप सर्वर छान्नहोस';
 $messages['nosearchname'] = 'कृपया सम्पर्कको नाम या ई-मेल भर्नुहोस';
+$messages['notuploadedwarning'] = 'Not all attachments have been uploaded yet. Please wait or cancel the upload.';
 $messages['searchsuccessful'] = '$nr मेलहरु पाइयो';
+$messages['contactsearchsuccessful'] = '$nr contacts found.';
 $messages['searchnomatch'] = 'खोज असफल रहयो';
 $messages['searching'] = 'खोजि भईरहेको छ...';
 $messages['checking'] = 'जाँच भईरहेको छ...';
 $messages['nospellerrors'] = 'कुनै गलत हिज्जे फेला परेनन्';
 $messages['folderdeleted'] = 'फोल्डर सफल्तापूर्वक मेटियो';
+$messages['foldersubscribed'] = 'Folder successfully subscribed.';
+$messages['folderunsubscribed'] = 'Folder successfully unsubscribed.';
+$messages['folderpurged'] = 'Folder has successfully been emptied.';
+$messages['folderexpunged'] = 'Folder has successfully been compacted.';
 $messages['deletedsuccessfully'] = 'सफल्तापूर्वक मेटियो';
 $messages['converting'] = 'मेलबाट फोर्माटिङ हटाईदै छ...';
 $messages['messageopenerror'] = 'सर्वरबाट मेल लोड हुन सकेन';
@@ -69,4 +105,67 @@ $messages['copysuccess'] = 'सफल्तापूर्वक $nr ठेग�
 $messages['copyerror'] = 'कुनै पनि ठेगानाहरु उतार्न सकिएन';
 $messages['sourceisreadonly'] = 'यो ठेगाना को श्रोत पढ्नको लागि मात्र उपलब्ध छ';
 $messages['errorsavingcontact'] = 'स्मपर्कको ठेगाना जोगाउन सकिएन';
+$messages['movingmessage'] = 'Moving message(s)...';
+$messages['copyingmessage'] = 'Copying message(s)...';
+$messages['copyingcontact'] = 'Copying contact(s)...';
+$messages['deletingmessage'] = 'Deleting message(s)...';
+$messages['markingmessage'] = 'Marking message(s)...';
+$messages['addingmember'] = 'Adding contact(s) to the group...';
+$messages['removingmember'] = 'Removing contact(s) from the group...';
+$messages['receiptsent'] = 'Successfully sent a read receipt.';
+$messages['errorsendingreceipt'] = 'Could not send the receipt.';
+$messages['deleteidentityconfirm'] = 'Do you really want to delete this identity?';
+$messages['nodeletelastidentity'] = 'You cannot delete this identity, it\'s your last one.';
+$messages['forbiddencharacter'] = 'Folder name contains a forbidden character.';
+$messages['selectimportfile'] = 'Please select a file to upload.';
+$messages['addresswriterror'] = 'The selected address book is not writeable.';
+$messages['contactaddedtogroup'] = 'Successfully added the contacts to this group.';
+$messages['contactremovedfromgroup'] = 'Successfully removed contacts from this group.';
+$messages['nogroupassignmentschanged'] = 'No group assignments changed.';
+$messages['importwait'] = 'Importing, please wait...';
+$messages['importformaterror'] = 'Import failed! The uploaded file is not a valid import data file.';
+$messages['importconfirm'] = '<b>Successfully imported $inserted contacts</b>';
+$messages['importconfirmskipped'] = '<b>Skipped $skipped existing entries</b>';
+$messages['opnotpermitted'] = 'Operation not permitted!';
+$messages['nofromaddress'] = 'Missing e-mail address in selected identity.';
+$messages['editorwarning'] = 'Switching to the plain text editor will cause all text formatting to be lost. Do you wish to continue?';
+$messages['httpreceivedencrypterror'] = 'A fatal configuration error occurred. Contact your administrator immediately. <b>Your message can not be sent.</b>';
+$messages['smtpconnerror'] = 'SMTP Error ($code): Connection to server failed.';
+$messages['smtpautherror'] = 'SMTP Error ($code): Authentication failed.';
+$messages['smtpfromerror'] = 'SMTP Error ($code): Failed to set sender "$from" ($msg).';
+$messages['smtptoerror'] = 'SMTP Error ($code): Failed to add recipient "$to" ($msg).';
+$messages['smtprecipientserror'] = 'SMTP Error: Unable to parse recipients list.';
+$messages['smtperror'] = 'SMTP Error: $msg';
+$messages['emailformaterror'] = 'Invalid e-mail address: $email';
+$messages['toomanyrecipients'] = 'Too many recipients. Reduce the number of recipients to $max.';
+$messages['maxgroupmembersreached'] = 'The number of group members exceeds the maximum of $max.';
+$messages['internalerror'] = 'An internal error occured. Please try again.';
+$messages['contactdelerror'] = 'Could not delete contact(s).';
+$messages['contactdeleted'] = 'Contact(s) deleted successfully.';
+$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.';
 
+?>
diff --git a/program/localization/nl_BE/labels.inc b/program/localization/nl_BE/labels.inc
index 5691f025d..eb44eefc0 100644
--- a/program/localization/nl_BE/labels.inc
+++ b/program/localization/nl_BE/labels.inc
@@ -2,56 +2,78 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/nl_BE/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = 'Welkom bij $product';
-$labels['username'] = 'Gebruikersnaam';
-$labels['password'] = 'Wachtwoord';
-$labels['server'] = 'Server';
-$labels['login'] = 'Aanmelden';
-$labels['logout'] = 'Afmelden';
-$labels['mail'] = 'Berichten';
+
+// login page
+$labels['welcome']   = 'Welkom bij $product';
+$labels['username']  = 'Gebruikersnaam';
+$labels['password']  = 'Wachtwoord';
+$labels['server']    = 'Server';
+$labels['login']     = 'Aanmelden';
+
+// taskbar
+$labels['logout']   = 'Afmelden';
+$labels['mail']     = 'Berichten';
 $labels['settings'] = 'Instellingen';
 $labels['addressbook'] = 'Contactpersonen';
-$labels['inbox'] = 'Postvak IN';
+
+// mailbox names
+$labels['inbox']  = 'Postvak IN';
 $labels['drafts'] = 'Concepten';
-$labels['sent'] = 'Verzonden berichten';
-$labels['trash'] = 'Prullenbak';
-$labels['junk'] = 'Spam';
+$labels['sent']   = 'Verzonden berichten';
+$labels['trash']  = 'Prullenbak';
+$labels['junk']   = 'Spam';
+
+// message listing
 $labels['subject'] = 'Onderwerp';
-$labels['from'] = 'Van';
-$labels['to'] = 'Aan';
-$labels['cc'] = 'Cc';
-$labels['bcc'] = 'Bcc';
+$labels['from']    = 'Van';
+$labels['sender']  = 'Afzender';
+$labels['to']      = 'Aan';
+$labels['cc']      = 'Cc';
+$labels['bcc']     = 'Bcc';
 $labels['replyto'] = 'Antwoorden aan';
 $labels['followupto'] = 'Followup aan';
-$labels['date'] = 'Datum';
-$labels['size'] = 'Grootte';
+$labels['date']    = 'Datum';
+$labels['size']    = 'Grootte';
 $labels['priority'] = 'Prioriteit';
 $labels['organization'] = 'Organisatie';
 $labels['readstatus'] = 'Gelezen?';
+$labels['listoptions'] = 'Lijstopties...';
+
 $labels['mailboxlist'] = 'Mappen';
-$labels['folders'] = 'Mappen';
 $labels['messagesfromto'] = 'Berichten $from - $to van $count';
-$labels['threadsfromto'] = 'Conversatie $from - $to van $count';
+$labels['threadsfromto'] = 'Conversaties $from - $to van $count';
 $labels['messagenrof'] = 'Bericht $nr van $count';
-$labels['copy'] = 'Kopieer';
-$labels['move'] = 'Verplaats';
-$labels['moveto'] = 'Verplaats naar...';
+$labels['fromtoshort'] = '$from - $to van $count';
+
+$labels['copy']     = 'Kopieer';
+$labels['move']     = 'Verplaats';
+$labels['moveto']   = 'Verplaats naar...';
 $labels['download'] = 'Downloaden';
+$labels['open']     = 'Open';
+$labels['showattachment'] = 'Weergeven';
+$labels['showanyway'] = 'Toch weergeven';
+
 $labels['filename'] = 'Bestandsnaam';
 $labels['filesize'] = 'Bestandsgrootte';
+
 $labels['addtoaddressbook'] = 'Voeg toe aan lijst met contactpersonen';
+
+// weekdays short
 $labels['sun'] = 'Zo';
 $labels['mon'] = 'Ma';
 $labels['tue'] = 'Di';
@@ -59,69 +81,90 @@ $labels['wed'] = 'Wo';
 $labels['thu'] = 'Do';
 $labels['fri'] = 'Vr';
 $labels['sat'] = 'Za';
-$labels['sunday'] = 'Zondag';
-$labels['monday'] = 'Maandag';
-$labels['tuesday'] = 'Dinsdag';
+
+// weekdays long
+$labels['sunday']    = 'Zondag';
+$labels['monday']    = 'Maandag';
+$labels['tuesday']   = 'Dinsdag';
 $labels['wednesday'] = 'Woensdag';
-$labels['thursday'] = 'Donderdag';
-$labels['friday'] = 'Vrijdag';
-$labels['saturday'] = 'Zaterdag';
-$labels['jan'] = 'Jan';
-$labels['feb'] = 'Feb';
-$labels['mar'] = 'Mrt';
-$labels['apr'] = 'Apr';
-$labels['may'] = 'Mei';
-$labels['longmay'] = 'Mei';
-$labels['jun'] = 'Jun';
-$labels['jul'] = 'Jul';
-$labels['aug'] = 'Aug';
-$labels['sep'] = 'Sep';
-$labels['oct'] = 'Okt';
-$labels['nov'] = 'Nov';
-$labels['dec'] = 'Dec';
-$labels['longjan'] = 'Januari';
-$labels['longfeb'] = 'Februari';
-$labels['longmar'] = 'Maart';
-$labels['longapr'] = 'April';
-$labels['longjun'] = 'Juni';
-$labels['longjul'] = 'Juli';
-$labels['longaug'] = 'Augustus';
-$labels['longsep'] = 'September';
-$labels['longoct'] = 'Oktober';
-$labels['longnov'] = 'November';
-$labels['longdec'] = 'December';
+$labels['thursday']  = 'Donderdag';
+$labels['friday']    = 'Vrijdag';
+$labels['saturday']  = 'Zaterdag';
+
+// months short
+$labels['jan']	= 'Jan';
+$labels['feb']	= 'Feb';
+$labels['mar']	= 'Mrt';
+$labels['apr']	= 'Apr';
+$labels['may']	= 'Mei';
+$labels['jun']	= 'Jun';
+$labels['jul'] 	= 'Jul';
+$labels['aug']	= 'Aug';
+$labels['sep']	= 'Sep';
+$labels['oct']	= 'Okt';
+$labels['nov']	= 'Nov';
+$labels['dec']	= 'Dec';
+
+// months long
+$labels['longjan']	= 'Januari';
+$labels['longfeb']	= 'Februari';
+$labels['longmar']	= 'Maart';
+$labels['longapr']	= 'April';
+$labels['longmay']	= 'Mei';
+$labels['longjun']	= 'Juni';
+$labels['longjul']	= 'Juli';
+$labels['longaug']	= 'Augustus';
+$labels['longsep']	= 'September';
+$labels['longoct']	= 'Oktober';
+$labels['longnov']	= 'November';
+$labels['longdec']	= 'December';
+
 $labels['today'] = 'Vandaag';
-$labels['checkmail'] = 'Controleer op nieuwe berichten';
-$labels['compose'] = 'Nieuw bericht opstellen';
-$labels['writenewmessage'] = 'Nieuw bericht';
-$labels['replytomessage'] = 'Beantwoorden';
-$labels['replytoallmessage'] = 'Allen beantwoorden';
-$labels['replyall'] = 'Allen beantwoorden';
-$labels['replylist'] = 'Lijst beantwoorden';
-$labels['forwardmessage'] = 'Doorsturen';
-$labels['deletemessage'] = 'Dit bericht verwijderen';
+
+// toolbar buttons
+$labels['refresh']          = 'Vernieuwen';
+$labels['checkmail']        = 'Controleer op nieuwe berichten';
+$labels['compose']          = 'Nieuw bericht opstellen';
+$labels['writenewmessage']  = 'Nieuw bericht';
+$labels['reply']            = 'Beantwoorden';
+$labels['replytomessage']   = 'Beantwoorden aan afzender';
+$labels['replytoallmessage'] = 'Antwoorden naar lijst of naar afzender en alle ontvangers';
+$labels['replyall']         = 'Allen beantwoorden';
+$labels['replylist']        = 'Lijst beantwoorden';
+$labels['forward']          = 'Doorsturen';
+$labels['forwardinline']    = 'Forward inline';
+$labels['forwardattachment'] = 'Doorsturen als bijlage';
+$labels['forwardmessage']   = 'Bericht doorsturen';
+$labels['deletemessage']    = 'Dit bericht verwijderen';
 $labels['movemessagetotrash'] = 'Verplaats bericht naar verwijderde items';
-$labels['printmessage'] = 'Afdrukken';
-$labels['previousmessage'] = 'Vorig bericht';
-$labels['firstmessage'] = 'Eerste bericht';
-$labels['nextmessage'] = 'Volgende bericht';
-$labels['lastmessage'] = 'Laatste bericht';
-$labels['backtolist'] = 'Terug naar berichtenlijst';
-$labels['viewsource'] = 'Broncode bericht weergeven';
-$labels['markmessages'] = 'Markeer berichten';
-$labels['markread'] = 'Als gelezen';
-$labels['markunread'] = 'Als ongelezen';
-$labels['markflagged'] = 'Selecteren';
-$labels['markunflagged'] = 'Niet Selecteren';
+$labels['printmessage']     = 'Afdrukken';
+$labels['previousmessage']  = 'Vorig bericht';
+$labels['firstmessage']     = 'Eerste bericht';
+$labels['nextmessage']      = 'Volgende bericht';
+$labels['lastmessage']      = 'Laatste bericht';
+$labels['backtolist']       = 'Terug naar berichtenlijst';
+$labels['viewsource']       = 'Broncode bericht weergeven';
+$labels['mark']             = 'Markeren';
+$labels['markmessages']     = 'Markeer berichten';
+$labels['markread']         = 'Als gelezen';
+$labels['markunread']       = 'Als ongelezen';
+$labels['markflagged']      = 'Selecteren';
+$labels['markunflagged']    = 'Niet Selecteren';
+$labels['moreactions']      = 'Meer acties...';
+$labels['more']             = 'Meer';
+$labels['back']             = 'Terug';
+$labels['options']          = 'Opties';
+
 $labels['select'] = 'Selecteren';
-$labels['all'] = 'Alles';
+$labels['all'] = 'Alle';
 $labels['none'] = 'Geen';
-$labels['nonesort'] = 'Geen';
 $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';
 $labels['filter'] = 'Filter';
 $labels['list'] = 'Lijst';
@@ -130,12 +173,14 @@ $labels['expand-all'] = 'Alles uitklappen';
 $labels['expand-unread'] = 'Ongelezen uitklappen';
 $labels['collapse-all'] = 'Alles inklappen';
 $labels['threaded'] = 'Conversaties';
+
 $labels['autoexpand_threads'] = 'Klap alle conversaties uit';
 $labels['do_expand'] = 'alle conversaties';
 $labels['expand_only_unread'] = 'alleen met ongelezen berichten';
 $labels['fromto'] = 'Afzender/Ontvanger';
 $labels['flag'] = 'Markeer';
 $labels['attachment'] = 'Bijlage';
+$labels['nonesort'] = 'Geen';
 $labels['sentdate'] = 'Verzenddatum';
 $labels['arrival'] = 'Ontvangstdatum';
 $labels['asc'] = 'oplopend';
@@ -144,111 +189,220 @@ $labels['listcolumns'] = 'Kolommen';
 $labels['listsorting'] = 'Sorteerkolom';
 $labels['listorder'] = 'Sorteervolgorde';
 $labels['listmode'] = 'Lijstweergave mode';
+
 $labels['folderactions'] = 'Acties voor map...';
 $labels['compact'] = 'Comprimeren';
 $labels['empty'] = 'Legen';
+
 $labels['quota'] = 'Gebruikte schijfruimte';
-$labels['unknown'] = 'onbekend';
-$labels['unlimited'] = 'ongelimiteerd';
-$labels['quicksearch'] = 'Snelzoeken';
-$labels['resetsearch'] = 'Zoek opnieuw';
-$labels['searchmod'] = 'Zoekopties';
-$labels['msgtext'] = 'Volledig bericht';
+$labels['unknown']  = 'onbekend';
+$labels['unlimited']  = 'onbeperkt';
+
+$labels['quicksearch']  = 'Snelzoeken';
+$labels['resetsearch']  = 'Zoek opnieuw';
+$labels['searchmod']  = 'Zoekopties';
+$labels['msgtext']  = 'Volledig bericht';
+$labels['body']  = 'Body';
+
 $labels['openinextwin'] = 'Openen in een nieuw venster';
 $labels['emlsave'] = 'Opslaan (.eml)';
-$labels['editasnew'] = 'Als nieuw bewerken';
-$labels['sendmessage'] = 'Verzenden';
-$labels['savemessage'] = 'Bewaar als concept';
-$labels['addattachment'] = 'Bestand toevoegen als bijlage';
-$labels['charset'] = 'Karakterset';
-$labels['editortype'] = 'Opmaak';
-$labels['returnreceipt'] = 'Ontvangstbevestiging';
-$labels['dsn'] = 'Delivery Status Notification';
-$labels['editidents'] = 'Bewerk identiteiten';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
+
+// message compose
+$labels['editasnew']      = 'Als nieuw bewerken';
+$labels['send']           = 'Verzenden';
+$labels['sendmessage']    = 'Bericht verzenden';
+$labels['savemessage']    = 'Bewaar als concept';
+$labels['addattachment']  = 'Bestand toevoegen als bijlage';
+$labels['charset']        = 'Karakterset';
+$labels['editortype']     = 'Opmaak';
+$labels['returnreceipt']  = 'Ontvangstbevestiging';
+$labels['dsn']            = 'Delivery Status Notification';
+$labels['mailreplyintro'] = 'Op $date, schreef $sender:';
+$labels['originalmessage'] = 'Orgineel bericht';
+
+$labels['editidents']    = 'Bewerk identiteiten';
+$labels['spellcheck']    = 'Spellen';
 $labels['checkspelling'] = 'Controleer spelling';
 $labels['resumeediting'] = 'Hervat bewerken';
-$labels['revertto'] = 'Ongedaan maken';
+$labels['revertto']      = 'Ongedaan maken';
+
+$labels['attach'] = 'Bijvoegen';
 $labels['attachments'] = 'Bijlagen';
-$labels['upload'] = 'Toevoegen';
-$labels['close'] = 'Sluiten';
-$labels['messageoptions'] = 'Opties voor bericht...';
-$labels['low'] = 'Laag';
-$labels['lowest'] = 'Laagste';
-$labels['normal'] = 'Normaal';
-$labels['high'] = 'Hoog';
+$labels['upload'] = 'Uploaden';
+$labels['uploadprogress'] = '$percent ($current van $total)';
+$labels['close']  = 'Sluiten';
+$labels['messageoptions']  = 'Opties voor bericht...';
+
+$labels['low']     = 'Laag';
+$labels['lowest']  = 'Laagste';
+$labels['normal']  = 'Normaal';
+$labels['high']    = 'Hoog';
 $labels['highest'] = 'Hoogste';
-$labels['nosubject'] = '(geen onderwerp)';
+
+$labels['nosubject']  = '(geen onderwerp)';
 $labels['showimages'] = 'Toon afbeeldingen';
 $labels['alwaysshow'] = 'Afbeeldingen van $sender altijd tonen';
+$labels['isdraft']    = 'Dit is een concept bericht.';
+$labels['andnmore']   = '$nr meer...';
+$labels['togglemoreheaders'] = 'Toon meer berichthoofden';
+$labels['togglefullheaders'] = 'Toggle raw message headers';
+
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Platte tekst';
 $labels['savesentmessagein'] = 'Bewaar verzonden bericht in';
 $labels['dontsave'] = 'niet bewaren';
 $labels['maxuploadsize'] = 'Maximum toegestane bestandsgrootte is $size';
+
 $labels['addcc'] = 'Cc toevoegen';
 $labels['addbcc'] = 'Bcc toevoegen';
 $labels['addreplyto'] = 'Antwoorden aan toevoegen';
 $labels['addfollowupto'] = 'Followup aan toevoegen';
+
+// mdn
 $labels['mdnrequest'] = 'De afzender heeft een ontvangstbevestiging gevraagd. Wilt u deze versturen?';
 $labels['receiptread'] = 'Ontvangstbevestiging (gelezen)';
 $labels['yourmessage'] = 'Dir is een onvangstbevestiging voor uw bericht';
 $labels['receiptnote'] = 'Opmerking: deze ontvangstbevestiging houdt enkel in dat het bericht was weergegeven bij de ontvanger. Er is geen garantie dat de ontvanger het bericht daadwerkelijk heeft gelezen en/of begrepen.';
-$labels['name'] = 'Naam';
-$labels['firstname'] = 'Voornaam';
-$labels['surname'] = 'Achternaam';
-$labels['email'] = 'E-mailadres';
+
+// address boook
+$labels['name']         = 'Naam';
+$labels['firstname']    = 'Voornaam';
+$labels['surname']      = 'Achternaam';
+$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['email']        = 'E-mailadres';
+$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['typepager']  = 'Pager';
+$labels['typevideo']  = 'Video';
+$labels['typeassistant']  = 'Assistant';
+$labels['typehomepage']  = 'Home Page';
+$labels['typeblog'] = 'Blog';
+$labels['typeprofile'] = 'Profile';
+
+$labels['addfield'] = 'Add field...';
 $labels['addcontact'] = 'Geselecteerde contactpersoon toevoegen';
 $labels['editcontact'] = 'Contactpersoon bewerken';
 $labels['contacts'] = 'Contactpersonen';
 $labels['contactproperties'] = 'Eigenschappen van contactpersoon';
-$labels['edit'] = 'Bewerken';
+$labels['personalinfo'] = 'Personal information';
+
+$labels['edit']   = 'Bewerken';
 $labels['cancel'] = 'Annuleren';
-$labels['save'] = 'Opslaan';
+$labels['save']   = 'Opslaan';
 $labels['delete'] = 'Verwijderen';
 $labels['rename'] = 'Hernoemen';
-$labels['newcontact'] = 'Contactpersoon toevoegen';
-$labels['deletecontact'] = 'Verwijder geselecteerde contactpersonen';
-$labels['composeto'] = 'Mail sturen aan';
+$labels['addphoto'] = 'Add';
+$labels['replacephoto'] = 'Replace';
+$labels['uploadphoto'] = 'Upload photo';
+
+$labels['newcontact']     = 'Contactpersoon toevoegen';
+$labels['deletecontact']  = 'Verwijder geselecteerde contactpersonen';
+$labels['composeto']      = 'Mail sturen aan';
 $labels['contactsfromto'] = 'Contactpersonen $from - $to van $count';
-$labels['print'] = 'Afdrukken';
-$labels['export'] = 'Exporteren';
-$labels['exportvcards'] = 'Exporteer contactpersonen in vCard formaat';
+$labels['print']          = 'Afdrukken';
+$labels['export']         = 'Exporteren';
+$labels['exportall']      = 'Export all';
+$labels['exportsel']      = 'Export selected';
+$labels['exportvcards']   = 'Exporteer contactpersonen in vCard formaat';
 $labels['newcontactgroup'] = 'Maak een nieuwe contactgroep';
-$labels['previouspage'] = 'Toon vorige';
-$labels['firstpage'] = 'Toon eerste';
-$labels['nextpage'] = 'Toon volgende';
-$labels['lastpage'] = 'Toon laatste';
+$labels['grouprename']    = 'Rename group';
+$labels['groupdelete']    = 'Delete group';
+$labels['groupremoveselected'] = 'Remove selected contacts from group';
+
+$labels['previouspage']   = 'Toon vorige';
+$labels['firstpage']      = 'Toon eerste';
+$labels['nextpage']       = 'Toon volgende';
+$labels['lastpage']       = 'Toon laatste';
+
 $labels['group'] = 'Groep';
 $labels['groups'] = 'Groepen';
 $labels['personaladrbook'] = 'Personlijke adressen';
+
+$labels['searchsave'] = 'Save search';
+$labels['searchdelete'] = 'Delete search';
+
 $labels['import'] = 'Importeer';
 $labels['importcontacts'] = 'Contactpersonen importeren';
 $labels['importfromfile'] = 'Importeer van bestand:';
+$labels['importtarget'] = 'Add new contacts to address book:';
 $labels['importreplace'] = 'Vervang het complete adresboek';
+$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['done'] = 'Klaar';
+
+// settings
 $labels['settingsfor'] = 'Instellingen voor';
+$labels['about'] = 'About';
 $labels['preferences'] = 'Voorkeuren';
 $labels['userpreferences'] = 'Gebruikersvoorkeuren';
 $labels['editpreferences'] = 'Gebruikersvoorkeuren bewerken';
+
 $labels['identities'] = 'Identiteiten';
 $labels['manageidentities'] = 'Beheer de identiteiten voor deze gebruiker';
 $labels['newidentity'] = 'Nieuwe identiteit';
+
 $labels['newitem'] = 'Nieuw';
 $labels['edititem'] = 'Bewerken';
+
 $labels['preferhtml'] = 'Gebruik HTML-opmaak';
 $labels['defaultcharset'] = 'Standaard karakterset';
 $labels['htmlmessage'] = 'HTML-bericht';
+$labels['messagepart'] = 'Part';
+$labels['digitalsig'] = 'Digital Signature';
+$labels['dateformat'] = 'Date format';
+$labels['timeformat'] = 'Time format';
 $labels['prettydate'] = 'Uitgebreide datumweergave';
-$labels['setdefault'] = 'Als standaard instellen';
-$labels['autodetect'] = 'Automatisch';
-$labels['language'] = 'Taal';
-$labels['timezone'] = 'Tijdzone';
-$labels['pagesize'] = 'Berichten per pagina';
+$labels['setdefault']  = 'Als standaard instellen';
+$labels['autodetect']  = 'Automatisch';
+$labels['language']  = 'Taal';
+$labels['timezone']  = 'Tijdzone';
+$labels['pagesize']  = 'Berichten per pagina';
 $labels['signature'] = 'Handtekening';
-$labels['dstactive'] = 'Zomer/wintertijd';
+$labels['dstactive']  = 'Zomer/wintertijd';
+$labels['showinextwin'] = 'Open message in a new window';
+$labels['composeextwin'] = 'Compose in a new window';
 $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';
@@ -266,14 +420,16 @@ $labels['readwhendeleted'] = 'Bericht na verwijderen als gelezen markeren';
 $labels['flagfordeletion'] = 'Bericht niet verwijderen maar als verwijderd markeren';
 $labels['skipdeleted'] = 'Verwijderde berichten niet tonen';
 $labels['deletealways'] = 'Verwijder bericht wanneer verplaatsen naar Prullenbak mislukt';
+$labels['deletejunk'] = 'Directly delete messages in Junk';
 $labels['showremoteimages'] = 'Geef externe toegevoegde berichten weer';
 $labels['fromknownsenders'] = 'Van bekende afzenders';
 $labels['always'] = 'altijd';
 $labels['showinlineimages'] = 'Toon bijgevoegde afbeeldingen onder het bericht';
-$labels['autosavedraft'] = 'Automatisch als concept opslaan';
-$labels['everynminutes'] = 'elke $n minuten';
-$labels['never'] = 'nooit';
-$labels['immediately'] = 'onmiddellijk';
+$labels['autosavedraft']  = 'Automatisch als concept opslaan';
+$labels['everynminutes']  = 'elke $n minuten';
+$labels['refreshinterval']  = 'Refresh (check for new messages, etc.)';
+$labels['never']  = 'nooit';
+$labels['immediately']  = 'onmiddellijk';
 $labels['messagesdisplaying'] = 'Berichten weergave';
 $labels['messagescomposition'] = 'Berichten aanmaken';
 $labels['mimeparamfolding'] = 'Namen van bijlagen';
@@ -285,34 +441,49 @@ $labels['advancedoptions'] = 'Geavanceerde opties';
 $labels['focusonnewmessage'] = 'Focus browserscherm bij nieuw bericht';
 $labels['checkallfolders'] = 'Controleer alle mappen op nieuwe berichten';
 $labels['displaynext'] = 'Na verplaatsen/verwijderen het volgende bericht tonen';
+$labels['defaultfont'] = 'Default font of HTML message';
 $labels['mainoptions'] = 'Hoofdopties';
+$labels['browseroptions'] = 'Browser Options';
 $labels['section'] = 'Sectie';
 $labels['maintenance'] = 'Onderhoud';
 $labels['newmessage'] = 'Nieuw bericht';
 $labels['signatureoptions'] = 'Opties voor handtekening';
 $labels['whenreplying'] = 'Bij beantwoorden';
+$labels['replyempty'] = 'do not quote the original message';
 $labels['replytopposting'] = 'begin bericht boven het origineel';
 $labels['replybottomposting'] = 'begin bericht onder het origineel';
 $labels['replyremovesignature'] = 'Verwijder handtekening uit het origneel bij beantwoorden';
 $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';
+$labels['previewpanemarkread']  = 'Markeer voorbeeldbericht als gelezen';
+$labels['afternseconds']  = 'Na $n seconden';
 $labels['reqmdn'] = 'Vraag altijd een ontvangstbevestiging';
 $labels['reqdsn'] = 'Vraag altijd een Delivery Status Notification';
 $labels['replysamefolder'] = 'Plaats antwoorden in de map van het beantwoorde bericht';
-$labels['folder'] = 'Map';
-$labels['foldername'] = 'Naam';
-$labels['subscribed'] = 'Geabonneerd';
+$labels['defaultabook'] = 'Default address book';
+$labels['autocompletesingle'] = 'Skip alternative email addresses in autocompletion';
+$labels['listnamedisplay'] = 'List contacts as';
+$labels['spellcheckbeforesend'] = 'Check spelling before sending a message';
+$labels['spellcheckoptions'] = 'Spellcheck Options';
+$labels['spellcheckignoresyms'] = 'Ignore words with symbols';
+$labels['spellcheckignorenums'] = 'Ignore words with numbers';
+$labels['spellcheckignorecaps'] = 'Ignore words with all letters capitalized';
+$labels['addtodict'] = 'Add to dictionary';
+$labels['mailtoprotohandler'] = 'Register protocol handler for mailto: links';
+$labels['forwardmode'] = 'Messages forwarding';
+$labels['inline'] = 'inline';
+$labels['asattachment'] = 'as attachment';
+
+$labels['folder']  = 'Map';
+$labels['folders']  = 'Mappen';
+$labels['foldername']  = 'Naam';
+$labels['subscribed']  = 'Geabonneerd';
 $labels['messagecount'] = 'Berichten';
-$labels['create'] = 'Aanmaken';
-$labels['createfolder'] = 'Nieuwe map aanmaken';
-$labels['managefolders'] = 'Mappen beheren';
+$labels['create']  = 'Aanmaken';
+$labels['createfolder']  = 'Nieuwe map aanmaken';
+$labels['managefolders']  = 'Mappen beheren';
 $labels['specialfolders'] = 'Speciale mappen';
 $labels['properties'] = 'Eigenschappen';
 $labels['folderproperties'] = 'Eigenschappen van map';
@@ -321,13 +492,30 @@ $labels['location'] = 'Locatie';
 $labels['info'] = 'Informatie';
 $labels['getfoldersize'] = 'Klik voor de grootte van de map';
 $labels['changesubscription'] = 'Klik voor abonnement te wijzigen';
+$labels['foldertype'] = 'Folder Type';
+$labels['personalfolder']  = 'Private Folder';
+$labels['otherfolder']  = 'Other User\'s Folder';
+$labels['sharedfolder']  = 'Public Folder';
+
 $labels['sortby'] = 'Sorteren op';
-$labels['sortasc'] = 'Oplopend sorteren';
+$labels['sortasc']  = 'Oplopend sorteren';
 $labels['sortdesc'] = 'Aflopend sorteren';
+$labels['undo'] = 'Undo';
+
+$labels['installedplugins'] = 'Installed plugins';
+$labels['plugin'] = 'Plugin';
+$labels['version'] = 'Version';
+$labels['source'] = 'Source';
+$labels['license'] = 'License';
+$labels['support'] = 'Get support';
+
+// units
 $labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
 $labels['GB'] = 'GB';
+
+// character sets
 $labels['unicode'] = 'Unicode';
 $labels['english'] = 'Engels';
 $labels['westerneuropean'] = 'West-Europees';
@@ -347,3 +535,4 @@ $labels['japanese'] = 'Japans';
 $labels['korean'] = 'Koreaans';
 $labels['chinese'] = 'Chinees';
 
+?>
diff --git a/program/localization/nl_BE/messages.inc b/program/localization/nl_BE/messages.inc
index d0d705392..d87329dc3 100644
--- a/program/localization/nl_BE/messages.inc
+++ b/program/localization/nl_BE/messages.inc
@@ -2,32 +2,40 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/nl_BE/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['loginfailed'] = 'Aanmelden mislukt...';
+$messages['errortitle']  = 'Er is een fout opgetreden!';
+$messages['loginfailed']  = 'Aanmelden mislukt...';
 $messages['cookiesdisabled'] = 'Uw browser accepteert geen cookies...';
 $messages['sessionerror'] = 'Sessie is reeds beëindigd of is ongeldig...';
 $messages['storageerror'] = 'Kon geen verbinding maken met de IMAP server...';
 $messages['servererror'] = 'Server fout!';
 $messages['servererrormsg'] = 'Server fout: $msg';
 $messages['dberror'] = 'Database Fout!';
-$messages['errorreadonly'] = 'Kon opdracht niet uitvoeren. Map is alleen-lezen';
-$messages['errornoperm'] = 'Kon opdracht niet uitvoeren. Toegang geweigerd';
+$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...';
 $messages['loggedout'] = 'U bent nu afgemeld. Tot ziens!';
 $messages['mailboxempty'] = 'Mailbox is leeg...';
+$messages['refreshing'] = 'Bezig met vernieuwen...';
 $messages['loading'] = 'Bezig met ophalen gegevens...';
 $messages['uploading'] = 'Bezig met uploaden...';
 $messages['uploadingmany'] = 'Bestanden worden geüpload...';
@@ -36,67 +44,67 @@ $messages['checkingmail'] = 'Controleer op nieuwe berichten...';
 $messages['sendingmessage'] = 'Bericht wordt verstuurd...';
 $messages['messagesent'] = 'Het bericht is verzonden...';
 $messages['savingmessage'] = 'Bericht wordt bewaard...';
-$messages['messagesaved'] = 'Bericht bewaard in Concepten';
+$messages['messagesaved'] = 'Bericht bewaard in Concepten.';
 $messages['successfullysaved'] = 'Succesvol opgeslagen...';
 $messages['addedsuccessfully'] = 'Contactpersoon is toegevoegd...';
 $messages['contactexists'] = 'Er bestaat reeds een contactpersoon met dit e-mailadres...';
 $messages['contactnameexists'] = 'Er bestaat al een contactpersoon met deze naam.';
-$messages['blockedimages'] = 'Om uw privacy te beschermen worden de afbeeldingen in dit bericht niet getoond...';
-$messages['encryptedmessage'] = 'Dit bericht is geëncrypteerd en kan niet worden weergegeven, sorry...';
+$messages['blockedimages'] = 'Om uw privacy te beschermen worden de afbeeldingen in dit bericht niet getoond.';
+$messages['encryptedmessage'] = 'Dit bericht is geëncrypteerd en kan niet worden weergegeven, sorry!';
 $messages['nocontactsfound'] = 'Geen contactpersonen gevonden...';
-$messages['contactnotfound'] = 'De gevraagde contactpersoon was niet gevonden';
+$messages['contactnotfound'] = 'De gevraagde contactpersoon was niet gevonden.';
 $messages['contactsearchonly'] = 'Voer enkele zoektermen in om de contactpersonen te zoeken.';
 $messages['sendingfailed'] = 'Kon het bericht niet versturen...';
-$messages['senttooquickly'] = 'U moet $sec seconden wachten om het bericht te versturen.';
-$messages['errorsavingsent'] = 'Er is een fout opgetreden tijdens het opslaan van het verzonden bericht';
+$messages['senttooquickly'] = 'U moet $sec second(en) wachten om het bericht te versturen.';
+$messages['errorsavingsent'] = 'Er is een fout opgetreden tijdens het opslaan van het verzonden bericht.';
 $messages['errorsaving'] = 'Er is een fout opgetreden bij het opslaan van het bericht...';
 $messages['errormoving'] = 'Kon de bericht(en) niet verplaatsen...';
 $messages['errorcopying'] = 'Kon de bericht(en) niet kopiëren';
 $messages['errordeleting'] = 'Kon de bericht(en) niet verwijderen...';
 $messages['errormarking'] = 'Kon de bericht(en) niet markeren...';
-$messages['deletecontactconfirm'] = 'Bent u zeker dat u de geselecteerde contactpers(o)on(en) wilt verwijderen?';
-$messages['deletegroupconfirm'] = 'Weet u zeker dat u de geselecteerde groep wilt verwijderen?';
+$messages['deletecontactconfirm']  = 'Bent u zeker dat u de geselecteerde contactpers(o)on(en) wilt verwijderen?';
+$messages['deletegroupconfirm']  = 'Weet u zeker dat u de geselecteerde groep wilt verwijderen?';
 $messages['deletemessagesconfirm'] = 'Bent u zeker dat u de geselecteerde bericht(en) wilt verwijderen?';
-$messages['deletefolderconfirm'] = 'Weet u zeker dat u deze map wilt verwijderen?';
-$messages['purgefolderconfirm'] = 'Bent u zeker dat u alle berichten in deze map wilt verwijderen?';
+$messages['deletefolderconfirm']  = 'Weet u zeker dat u deze map wilt verwijderen?';
+$messages['purgefolderconfirm']  = 'Bent u zeker dat u alle berichten in deze map wilt verwijderen?';
 $messages['contactdeleting'] = 'Bezig met verwijderen één of meer contactpersonen...';
 $messages['groupdeleting'] = 'Groep wordt verwijderd...';
 $messages['folderdeleting'] = 'Map verwijderen...';
 $messages['foldermoving'] = 'Map verplaatsen...';
 $messages['foldersubscribing'] = 'Bezig met abonneren op map...';
 $messages['folderunsubscribing'] = 'Abonnement op map wordt opgezegd...';
-$messages['formincomplete'] = 'Het formulier is niet volledig ingevuld...';
-$messages['noemailwarning'] = 'Geef een geldig e-mailadres op...';
-$messages['nonamewarning'] = 'Geef een naam op...';
-$messages['nopagesizewarning'] = 'Geef een geldig aantal berichten per pagina op...';
-$messages['nosenderwarning'] = 'Geef een e-mailadres van de afzender op';
-$messages['norecipientwarning'] = 'Geef minstens één bestemmeling op...';
-$messages['nosubjectwarning'] = 'Geen onderwerp opgegeven. Wenst u alsnog een onderwerp te geven?';
+$messages['formincomplete'] = 'Het formulier is niet volledig ingevuld.';
+$messages['noemailwarning'] = 'Geef een geldig e-mailadres op.';
+$messages['nonamewarning']  = 'Geef een naam op.';
+$messages['nopagesizewarning'] = 'Geef een geldig aantal berichten per pagina op.';
+$messages['nosenderwarning'] = 'Geef een e-mailadres van de afzender op.';
+$messages['norecipientwarning'] = 'Geef minstens één bestemmeling op.';
+$messages['nosubjectwarning']  = 'Geen onderwerp opgegeven. Wenst u alsnog een onderwerp te geven?';
 $messages['nobodywarning'] = 'Wilt u dit lege bericht versturen?';
 $messages['notsentwarning'] = 'Het bericht is niet verzonden. Wilt u het bericht verwijderen?';
-$messages['noldapserver'] = 'Kies een LDAP server waarop gezocht moet worden...';
-$messages['nosearchname'] = 'Geen een contacpersoon of e-mailadres op...';
+$messages['noldapserver'] = 'Kies een LDAP server waarop gezocht moet worden.';
+$messages['nosearchname'] = 'Geen een contacpersoon of e-mailadres op.';
 $messages['notuploadedwarning'] = 'Nog niet alle bijlagen zijn geüpload. Wacht even of annuleer de upload.';
-$messages['searchsuccessful'] = '$nr berichten gevonden';
+$messages['searchsuccessful'] = '$nr berichten gevonden.';
 $messages['contactsearchsuccessful'] = '$nr contactpersonen gevonden.';
-$messages['searchnomatch'] = 'Zoekopdracht leverde geen resultaten';
+$messages['searchnomatch'] = 'Zoekopdracht leverde geen resultaten.';
 $messages['searching'] = 'Bezig met zoeken...';
 $messages['checking'] = 'Bezig met controleren...';
-$messages['nospellerrors'] = 'Geen spelfouten gevonden';
-$messages['folderdeleted'] = 'Map met succes verwijderd';
+$messages['nospellerrors'] = 'Geen spelfouten gevonden.';
+$messages['folderdeleted'] = 'Map met succes verwijderd.';
 $messages['foldersubscribed'] = 'Folder succesvol geabonneerd.';
 $messages['folderunsubscribed'] = 'Folder succesvol uitgeschreven.';
 $messages['folderpurged'] = 'Folder met succes geleegd.';
-$messages['folderexpunged'] = 'Map met succes geleegd';
-$messages['deletedsuccessfully'] = 'Succesvol verwijderd';
+$messages['folderexpunged'] = 'Map met succes geleegd.';
+$messages['deletedsuccessfully'] = 'Succesvol verwijderd.';
 $messages['converting'] = 'Opmaak van het bericht wordt gewist...';
-$messages['messageopenerror'] = 'Kon het bericht niet ophalen van de server';
-$messages['fileuploaderror'] = 'Bestandupload mislukt';
-$messages['filesizeerror'] = 'Het bestand overschrijdt de maximum grootte van $size';
-$messages['copysuccess'] = '$nr adressen met succes gekopieerd';
-$messages['copyerror'] = 'Kon de adressen niet kopiëren';
-$messages['sourceisreadonly'] = 'Het adres kan niet worden opgeslagen';
-$messages['errorsavingcontact'] = 'Kon de contactpersoon niet bewaren';
+$messages['messageopenerror'] = 'Kon het bericht niet ophalen van de server.';
+$messages['fileuploaderror'] = 'Bestandsupload mislukt.';
+$messages['filesizeerror'] = 'Het bestand overschrijdt de maximum grootte van $size.';
+$messages['copysuccess'] = '$nr adressen met succes gekopieerd.';
+$messages['copyerror'] = 'Kon de adressen niet kopiëren.';
+$messages['sourceisreadonly'] = 'Het adres kan niet worden opgeslagen.';
+$messages['errorsavingcontact'] = 'Kon de contactpersoon niet bewaren.';
 $messages['movingmessage'] = 'Bericht wordt verplaatst...';
 $messages['copyingmessage'] = 'Bericht wordt gekopieerd...';
 $messages['copyingcontact'] = 'Kopiëren contactpersonen...';
@@ -104,55 +112,60 @@ $messages['deletingmessage'] = 'Bericht wordt verwijderd...';
 $messages['markingmessage'] = 'Bericht wordt gemarkeerd...';
 $messages['addingmember'] = 'Contactpersonen worden toegevoegd aan de groep...';
 $messages['removingmember'] = 'Contactpersonen worden verwijderd uit de groep...';
-$messages['receiptsent'] = 'Ontvangstbevestiging verstuurd';
-$messages['errorsendingreceipt'] = 'Kon de ontvangstbevestigign niet versturen';
+$messages['receiptsent'] = 'Ontvangstbevestiging verstuurd.';
+$messages['errorsendingreceipt'] = 'Kon de ontvangstbevestigign niet versturen.';
+$messages['deleteidentityconfirm'] = 'Bent u zeker dat u deze identiteit wilt verwijderen?';
 $messages['nodeletelastidentity'] = 'U kunt dit laatste afzendadres niet verwijderen.';
-$messages['forbiddencharacter'] = 'De naam van de map bevat een karakter dat niet is toegestaan';
-$messages['selectimportfile'] = 'Selecteer een bestand om te uploaden';
-$messages['addresswriterror'] = 'Het geselecteerde adresboek is alleen-lezen';
-$messages['contactaddedtogroup'] = 'Contact(en) met succes toegevoegd aan de groep';
-$messages['contactremovedfromgroup'] = 'Contact(en) met succes verwijderd aan de groep';
-$messages['importwait'] = 'Importeren, even geduld...';
-$messages['importerror'] = 'Importeren mislukt! Het verstuurde bestand is geen geldig vCard bestand.';
-$messages['importconfirm'] = '<b>Er zijn $inserted contactpersonen succesvol geïmporteerd, en $skipped bestaande overgeslagen</b>:<p><em>$names</em></p>';
+$messages['forbiddencharacter'] = 'De naam van de map bevat een karakter dat niet is toegestaan.';
+$messages['selectimportfile'] = 'Selecteer een bestand om te uploaden.';
+$messages['addresswriterror'] = 'Het geselecteerde adresboek is alleen-lezen.';
+$messages['contactaddedtogroup'] = 'Contact(en) met succes toegevoegd aan de groep.';
+$messages['contactremovedfromgroup'] = 'Contact(en) met succes verwijderd aan de groep.';
+$messages['nogroupassignmentschanged'] = 'Geen groepslidmaatschap gewijzigd.';
+$messages['importwait'] = 'Bezig met importeren, even geduld...';
+$messages['importformaterror'] = 'Importeren mislukt! Het geüploade bestand is geen importeerbaar bestand.';
+$messages['importconfirm'] = '<b>Er zijn $inserted contactpersonen succesvol geïmporteerd</b>';
 $messages['importconfirmskipped'] = '<b>$skipped bestaande contactpersonen overgeslagen</b>';
 $messages['opnotpermitted'] = 'Deze actie is niet toegestaan!';
-$messages['nofromaddress'] = 'Er is geen e-mailadres in de geselecteerde identiteit';
-$messages['editorwarning'] = 'Door het overschakelen naar de platte tekst editor gaat alle opmaak verloren. Weet je zeker dat je verder wil gaan?';
+$messages['nofromaddress'] = 'De geselecteerde identiteit bevat geen emailadres.';
+$messages['editorwarning'] = 'Door het overschakelen naar de platte tekst editor gaat alle opmaak verloren. Weet u zeker dat u verder wilt gaan?';
 $messages['httpreceivedencrypterror'] = 'Er is een fatale fout opgetreden. Neem direct contact op met uw systeembeheerder. <b>Uw bericht kon niet worden verzonden.</b>';
-$messages['smtpconnerror'] = 'SMTP Fout ($code): Verbinding met server mislukt';
-$messages['smtpautherror'] = 'SMTP Fout ($code): Authenticatie mislukt';
-$messages['smtpfromerror'] = 'SMTP Fout ($code): Kon afzender "$from" niet instellen ($msg)';
-$messages['smtptoerror'] = 'SMTP Fout ($code): Kon ontvanger "$to" niet toevoegen ($msg)';
-$messages['smtprecipientserror'] = 'SMTP Fout: Kon lijst van ontvangers niet verwerken';
+$messages['smtpconnerror'] = 'SMTP Fout ($code): Verbinding met server mislukt.';
+$messages['smtpautherror'] = 'SMTP Fout ($code): Authenticatie mislukt.';
+$messages['smtpfromerror'] = 'SMTP Fout ($code): Kon afzender "$from" niet instellen ($msg).';
+$messages['smtptoerror'] = 'SMTP Fout ($code): Kon ontvanger "$to" niet toevoegen ($msg).';
+$messages['smtprecipientserror'] = 'SMTP Fout: Kon lijst van ontvangers niet verwerken.';
 $messages['smtperror'] = 'SMTP Fout: $msg';
 $messages['emailformaterror'] = 'Ongeldig e-mailadres: $email';
-$messages['toomanyrecipients'] = 'Te veel geadresseerden. Verminder de hoeveelheid geadresseerden tot $max';
-$messages['maxgroupmembersreached'] = 'Het aantal leden van de groep groter is dan de maximale van $max';
-$messages['internalerror'] = 'Er is een interne fout opgetreden. Probeer het nogmaals';
-$messages['contactdelerror'] = 'Kon contactpersoon niet verwijderen';
-$messages['contactdeleted'] = 'Contactpersoon succesvol verwijderd';
-$messages['contactrestoreerror'] = 'Verwijderde contactpersonen konden niet hersteld worden';
+$messages['toomanyrecipients'] = 'Te veel geadresseerden. Verminder de hoeveelheid geadresseerden tot $max.';
+$messages['maxgroupmembersreached'] = 'Het aantal leden van de groep groter is dan de maximale van $max.';
+$messages['internalerror'] = 'Er is een interne fout opgetreden. Probeer het nogmaals.';
+$messages['contactdelerror'] = 'Kon contactpersoon niet verwijderen.';
+$messages['contactdeleted'] = 'Contactpersoon succesvol verwijderd.';
+$messages['contactrestoreerror'] = 'Verwijderde contactpersonen konden niet hersteld worden.';
 $messages['contactrestored'] = 'Contactpersonen succesvol hersteld.';
-$messages['groupdeleted'] = 'Groep succesvol verwijderd';
-$messages['grouprenamed'] = 'Groep succesvol hernoemd';
-$messages['groupcreated'] = 'Groep succesvol aangemaakt';
+$messages['groupdeleted'] = 'Groep succesvol verwijderd.';
+$messages['grouprenamed'] = 'Groep succesvol hernoemd.';
+$messages['groupcreated'] = 'Groep succesvol aangemaakt.';
 $messages['savedsearchdeleted'] = 'Opgeslagen zoekopdracht successvol verwijderd.';
 $messages['savedsearchdeleteerror'] = 'Opgeslagen zoekopdracht kon niet worden verwijderd.';
 $messages['savedsearchcreated'] = 'Zoekopdracht successvol opgeslagen.';
 $messages['savedsearchcreateerror'] = 'Zoekopdracht kon niet worden opgeslagen.';
-$messages['messagedeleted'] = 'Bericht(en) succesvol verwijderd';
-$messages['messagemoved'] = 'Bericht(en) succesvol verplaatst';
-$messages['messagecopied'] = 'Bericht(en) succesvol gekopieerd';
-$messages['messagemarked'] = 'Bericht(en) succesvol gemarkeerd';
-$messages['autocompletechars'] = 'Geef ten minste $min karakters voor auto aanvullen';
+$messages['messagedeleted'] = 'Bericht(en) succesvol verwijderd.';
+$messages['messagemoved'] = 'Bericht(en) succesvol verplaatst.';
+$messages['messagecopied'] = 'Bericht(en) succesvol gekopieerd.';
+$messages['messagemarked'] = 'Bericht(en) succesvol gemarkeerd.';
+$messages['autocompletechars'] = 'Geef ten minste $min karakters voor auto-aanvullen.';
 $messages['autocompletemore'] = 'Meerdere resultaten gevonden. Verfijn uw zoekopdracht.';
-$messages['namecannotbeempty'] = 'Naam kan niet leeg zijn';
-$messages['nametoolong'] = 'Naam is te lang';
-$messages['folderupdated'] = 'Map succesvol geüpdatet';
-$messages['foldercreated'] = 'Map succesvol aangemaakt';
-$messages['invalidimageformat'] = 'Geen geldig afbeeldingsformaat';
-$messages['mispellingsfound'] = 'Spelfouten gedetecteerd in bericht';
+$messages['namecannotbeempty'] = 'Naam kan niet leeg zijn.';
+$messages['nametoolong'] = 'Naam is te lang.';
+$messages['folderupdated'] = 'Map succesvol bijgewerkt.';
+$messages['foldercreated'] = 'Map succesvol aangemaakt.';
+$messages['invalidimageformat'] = 'Geen geldig afbeeldingsformaat.';
+$messages['mispellingsfound'] = 'Spellingsfouten gedetecteerd in bericht.';
 $messages['parentnotwritable'] = 'U heeft niet voldoende rechten een map te maken / verplaatsen in deze map.';
 $messages['messagetoobig'] = 'Dit deel van uw bericht is te groot om het te verwerken.';
+$messages['attachmentvalidationerror'] = 'OPGELET! Deze bijlage is verdacht omdat het aangetroffen bestandstype niet overeenkomt met het verwachte type. Indien u de afzender niet vertrouwd open deze bijlage in geen geval in uw browser aangezien deze schadelijk data kan bevatten.<br /><br /><em>Verwacht: $expected; Aangetroffen: $detected</em>';
+$messages['noscriptwarning'] = 'Opgelet: deze webmail service vereist JavaScript! Om deze service te kunnen gebruiken dient u JavaScript toe te staan in de instellingen van uw browser.';
 
+?>
diff --git a/program/localization/nl_NL/labels.inc b/program/localization/nl_NL/labels.inc
index 5e2b1e39d..7bd48bd4a 100644
--- a/program/localization/nl_NL/labels.inc
+++ b/program/localization/nl_NL/labels.inc
@@ -2,60 +2,78 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/nl_NL/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Lazlo                                                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = 'Welkom bij $product';
-$labels['username'] = 'Gebruikersnaam';
-$labels['password'] = 'Wachtwoord';
-$labels['server'] = 'Server';
-$labels['login'] = 'Inloggen';
-$labels['logout'] = 'Uitloggen';
-$labels['mail'] = 'E-mail';
+
+// login page
+$labels['welcome']   = 'Welkom bij $product';
+$labels['username']  = 'Gebruikersnaam';
+$labels['password']  = 'Wachtwoord';
+$labels['server']    = 'Server';
+$labels['login']     = 'Inloggen';
+
+// taskbar
+$labels['logout']   = 'Uitloggen';
+$labels['mail']     = 'E-mail';
 $labels['settings'] = 'Instellingen';
 $labels['addressbook'] = 'Adresboek';
-$labels['inbox'] = 'Postvak IN';
+
+// mailbox names
+$labels['inbox']  = 'Postvak In';
 $labels['drafts'] = 'Concepten';
-$labels['sent'] = 'Verzonden';
-$labels['trash'] = 'Prullenbak';
-$labels['junk'] = 'Spam';
+$labels['sent']   = 'Verzonden';
+$labels['trash']  = 'Prullenbak';
+$labels['junk']   = 'Spam';
+
+// message listing
 $labels['subject'] = 'Onderwerp';
-$labels['from'] = 'Afzender';
-$labels['to'] = 'Ontvanger';
-$labels['cc'] = 'Kopie';
-$labels['bcc'] = 'Bcc';
+$labels['from']    = 'Afzender';
+$labels['sender']  = 'Afzender';
+$labels['to']      = 'Ontvanger';
+$labels['cc']      = 'Kopie';
+$labels['bcc']     = 'Bcc';
 $labels['replyto'] = 'Antwoord-aan';
 $labels['followupto'] = 'Followup-Aan';
-$labels['date'] = 'Datum';
-$labels['size'] = 'Grootte';
+$labels['date']    = 'Datum';
+$labels['size']    = 'Grootte';
 $labels['priority'] = 'Prioriteit';
 $labels['organization'] = 'Organisatie';
 $labels['readstatus'] = 'Gelezen?';
 $labels['listoptions'] = 'Lijstopties...';
+
 $labels['mailboxlist'] = 'Mappen';
-$labels['folders'] = 'Mappen';
 $labels['messagesfromto'] = 'Bericht $from t/m $to van $count';
 $labels['threadsfromto'] = 'Conversatie $from t/m $to van $count';
 $labels['messagenrof'] = 'Bericht $nr van $count';
 $labels['fromtoshort'] = '$from – $to van $count';
-$labels['copy'] = 'Kopiëren';
-$labels['move'] = 'Verplaats';
-$labels['moveto'] = 'Verplaats naar...';
+
+$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';
+
 $labels['filename'] = 'Bestandsnaam';
 $labels['filesize'] = 'Bestandsgrootte';
+
 $labels['addtoaddressbook'] = 'Toevoegen aan adresboek';
+
+// weekdays short
 $labels['sun'] = 'Zo';
 $labels['mon'] = 'Ma';
 $labels['tue'] = 'Di';
@@ -63,81 +81,91 @@ $labels['wed'] = 'Wo';
 $labels['thu'] = 'Do';
 $labels['fri'] = 'Vr';
 $labels['sat'] = 'Za';
-$labels['sunday'] = 'Zondag';
-$labels['monday'] = 'Maandag';
-$labels['tuesday'] = 'Dinsdag';
-$labels['wednesday'] = 'Woensdag';
-$labels['thursday'] = 'Donderdag';
-$labels['friday'] = 'Vrijdag';
-$labels['saturday'] = 'Zaterdag';
-$labels['jan'] = 'Jan';
-$labels['feb'] = 'Feb';
-$labels['mar'] = 'Mrt';
-$labels['apr'] = 'Apr';
-$labels['may'] = 'Mei';
-$labels['longmay'] = 'Mei';
-$labels['jun'] = 'Jun';
-$labels['jul'] = 'Jul';
-$labels['aug'] = 'Aug';
-$labels['sep'] = 'Sep';
-$labels['oct'] = 'Okt';
-$labels['nov'] = 'Nov';
-$labels['dec'] = 'Dec';
-$labels['longjan'] = 'Januari';
-$labels['longfeb'] = 'Februari';
-$labels['longmar'] = 'Maart';
-$labels['longapr'] = 'April';
-$labels['longjun'] = 'Juni';
-$labels['longjul'] = 'Juli';
-$labels['longaug'] = 'Augustus';
-$labels['longsep'] = 'September';
-$labels['longoct'] = 'Oktober';
-$labels['longnov'] = 'November';
-$labels['longdec'] = 'December';
+
+// weekdays long
+$labels['sunday']    = 'zondag';
+$labels['monday']    = 'maandag';
+$labels['tuesday']   = 'dinsdag';
+$labels['wednesday'] = 'woensdag';
+$labels['thursday']  = 'donderdag';
+$labels['friday']    = 'vrijdag';
+$labels['saturday']  = 'zaterdag';
+
+// months short
+$labels['jan']	= 'jan';
+$labels['feb']	= 'feb';
+$labels['mar']	= 'mrt';
+$labels['apr']	= 'apr';
+$labels['may']	= 'mei';
+$labels['jun']	= 'jun';
+$labels['jul'] 	= 'jul';
+$labels['aug']	= 'aug';
+$labels['sep']	= 'sep';
+$labels['oct']	= 'okt';
+$labels['nov']	= 'nov';
+$labels['dec']	= 'dec';
+
+// months long
+$labels['longjan']	= 'januari';
+$labels['longfeb']	= 'februari';
+$labels['longmar']	= 'maart';
+$labels['longapr']	= 'april';
+$labels['longmay']	= 'mei';
+$labels['longjun']	= 'juni';
+$labels['longjul']	= 'juli';
+$labels['longaug']	= 'augustus';
+$labels['longsep']	= 'september';
+$labels['longoct']	= 'oktober';
+$labels['longnov']	= 'november';
+$labels['longdec']	= 'december';
+
 $labels['today'] = 'Vandaag';
-$labels['refresh'] = 'Vernieuwen';
-$labels['checkmail'] = 'Controleer op nieuwe berichten';
-$labels['compose'] = 'Nieuw bericht aanmaken';
-$labels['writenewmessage'] = 'Maak een nieuw bericht';
-$labels['reply'] = 'Beantwoorden';
-$labels['replytomessage'] = 'Beantwoord het bericht';
+
+// toolbar buttons
+$labels['refresh']          = 'Vernieuwen';
+$labels['checkmail']        = 'Controleer op nieuwe berichten';
+$labels['compose']          = 'Opstellen';
+$labels['writenewmessage']  = 'Maak een nieuw bericht';
+$labels['reply']            = 'Beantwoorden';
+$labels['replytomessage']   = 'Beantwoord het bericht';
 $labels['replytoallmessage'] = 'Beantwoord lijst of afzender en alle ontvangers';
-$labels['replyall'] = 'Beantwoord alle ontvangers';
-$labels['replylist'] = 'Beantwoord lijst';
-$labels['forward'] = 'Doorsturen';
-$labels['forwardinline'] = 'Doorsturen in bericht';
+$labels['replyall']         = 'Beantwoord alle ontvangers';
+$labels['replylist']        = 'Beantwoord lijst';
+$labels['forward']          = 'Doorsturen';
+$labels['forwardinline']    = 'Doorsturen in bericht';
 $labels['forwardattachment'] = 'Doorsturen als bijlage';
-$labels['forwardmessage'] = 'Bericht doorsturen';
-$labels['deletemessage'] = 'Verwijder het bericht';
+$labels['forwardmessage']   = 'Bericht doorsturen';
+$labels['deletemessage']    = 'Verwijder het bericht';
 $labels['movemessagetotrash'] = 'Verplaats het bericht naar de prullenbak';
-$labels['printmessage'] = 'Dit bericht afdrukken';
-$labels['previousmessage'] = 'Toon het vorige bericht';
-$labels['firstmessage'] = 'Toon het eerste bericht';
-$labels['nextmessage'] = 'Toon het volgende bericht';
-$labels['lastmessage'] = 'Toon het laatste bericht';
-$labels['backtolist'] = 'Terug naar berichtenoverzicht';
-$labels['viewsource'] = 'Toon bron';
-$labels['mark'] = 'Markeren';
-$labels['markmessages'] = 'Markeer berichten';
-$labels['markread'] = 'Gelezen';
-$labels['markunread'] = 'Ongelezen';
-$labels['markflagged'] = 'Selecteren';
-$labels['markunflagged'] = 'Niet selecteren';
-$labels['moreactions'] = 'Meer acties';
-$labels['more'] = 'Meer';
-$labels['back'] = 'Terug';
-$labels['options'] = 'Opties';
+$labels['printmessage']     = 'Dit bericht afdrukken';
+$labels['previousmessage']  = 'Toon het vorige bericht';
+$labels['firstmessage']     = 'Toon het eerste bericht';
+$labels['nextmessage']      = 'Toon het volgende bericht';
+$labels['lastmessage']      = 'Toon het laatste bericht';
+$labels['backtolist']       = 'Terug naar berichtenoverzicht';
+$labels['viewsource']       = 'Toon bron';
+$labels['mark']             = 'Markeren';
+$labels['markmessages']     = 'Markeer berichten';
+$labels['markread']         = 'Gelezen';
+$labels['markunread']       = 'Ongelezen';
+$labels['markflagged']      = 'Gemarkeerd';
+$labels['markunflagged']    = 'Niet-gemarkeerd';
+$labels['moreactions']      = 'Meer acties...';
+$labels['more']             = 'Meer';
+$labels['back']             = 'Terug';
+$labels['options']          = 'Opties';
+
 $labels['select'] = 'Selecteer';
 $labels['all'] = 'Allemaal';
 $labels['none'] = 'Geen';
-$labels['nonesort'] = 'Geen';
 $labels['currpage'] = 'Huidige pagina';
 $labels['unread'] = 'Ongelezen';
-$labels['flagged'] = 'Geselecteerd';
+$labels['flagged'] = 'Gemarkeerd';
 $labels['unanswered'] = 'Onbeantwoord';
+$labels['withattachment'] = 'Met bijlage';
 $labels['deleted'] = 'Verwijderd';
 $labels['undeleted'] = 'Niet verwijderd';
-$labels['invert'] = 'Selectie omdraaien';
+$labels['invert'] = 'Selectie omkeren';
 $labels['filter'] = 'Filter';
 $labels['list'] = 'Lijst';
 $labels['threads'] = 'Conversaties';
@@ -145,226 +173,265 @@ $labels['expand-all'] = 'Alles uitklappen';
 $labels['expand-unread'] = 'Ongelezen uitklappen';
 $labels['collapse-all'] = 'Alles inklappen';
 $labels['threaded'] = 'Conversaties';
+
 $labels['autoexpand_threads'] = 'Klap alle conversaties uit';
 $labels['do_expand'] = 'alle conversaties';
 $labels['expand_only_unread'] = 'alleen met ongelezen berichten';
 $labels['fromto'] = 'Afzender/Ontvanger';
 $labels['flag'] = 'Markeer';
 $labels['attachment'] = 'Bijlage';
-$labels['sentdate'] = 'Verzend datum';
-$labels['arrival'] = 'Aankomst datum';
+$labels['nonesort'] = 'Geen';
+$labels['sentdate'] = 'Verzenddatum';
+$labels['arrival'] = 'Ontvangstdatum';
 $labels['asc'] = 'oplopend';
 $labels['desc'] = 'aflopend';
 $labels['listcolumns'] = 'Kolommen';
 $labels['listsorting'] = 'Sorteer op kolom';
 $labels['listorder'] = 'Sorteervolgorde';
-$labels['listmode'] = 'Weergavemodus';
-$labels['folderactions'] = 'Acties voor map...';
+$labels['listmode'] = 'Lijstweergave';
+
+$labels['folderactions'] = 'Mapacties...';
 $labels['compact'] = 'Opschonen';
 $labels['empty'] = 'Legen';
-$labels['quota'] = 'Mailbox quotum';
-$labels['unknown'] = 'onbekend';
-$labels['unlimited'] = 'onbeperkt';
-$labels['quicksearch'] = 'Snel zoeken';
-$labels['resetsearch'] = 'Reset zoekopdracht';
-$labels['searchmod'] = 'Zoekopties';
-$labels['msgtext'] = 'Gehele bericht';
+
+$labels['quota'] = 'Opslagverbruik';
+$labels['unknown']  = 'onbekend';
+$labels['unlimited']  = 'onbeperkt';
+
+$labels['quicksearch']  = 'Snel zoeken';
+$labels['resetsearch']  = 'Wis zoekopdracht';
+$labels['searchmod']  = 'Zoekopties';
+$labels['msgtext']  = 'Gehele bericht';
+$labels['body']  = 'Inhoud';
+
 $labels['openinextwin'] = 'Openen in een nieuw venster';
 $labels['emlsave'] = 'Opslaan (.eml)';
-$labels['editasnew'] = 'Als nieuw bewerken';
-$labels['send'] = 'Verzenden';
-$labels['sendmessage'] = 'Verstuur het bericht nu';
-$labels['savemessage'] = 'Bewaar als concept';
-$labels['addattachment'] = 'Voeg een bijlage toe';
-$labels['charset'] = 'Tekenset';
-$labels['editortype'] = 'Opmaak';
-$labels['returnreceipt'] = 'Ontvangstbevestiging';
-$labels['dsn'] = 'Afleveringsbericht (DSN)';
+$labels['changeformattext'] = 'Weergeven als platte tekst';
+$labels['changeformathtml'] = 'Weergeven als opgemaakte tekst (HTML)';
+
+// message compose
+$labels['editasnew']      = 'Als nieuw bewerken';
+$labels['send']           = 'Verzenden';
+$labels['sendmessage']    = 'Verstuur bericht';
+$labels['savemessage']    = 'Bewaar als concept';
+$labels['addattachment']  = 'Bijlage toevoegen';
+$labels['charset']        = 'Tekenset';
+$labels['editortype']     = 'Soort tekstverwerker';
+$labels['returnreceipt']  = 'Ontvangstbevestiging';
+$labels['dsn']            = 'Afleveringsbericht (DSN)';
 $labels['mailreplyintro'] = '$sender schreef op $date:';
-$labels['originalmessage'] = 'Originele bericht';
-$labels['editidents'] = 'Bewerk identiteiten';
-$labels['spellcheck'] = 'Spelling';
+$labels['originalmessage'] = 'Oorspronkelijke bericht';
+
+$labels['editidents']    = 'Identiteiten bewerken';
+$labels['spellcheck']    = 'Spelling';
 $labels['checkspelling'] = 'Controleer spelling';
 $labels['resumeediting'] = 'Doorgaan met opstellen';
-$labels['revertto'] = 'Wijzig terug in';
+$labels['revertto']      = 'Terugwijzigen in';
+
 $labels['attach'] = 'Bijvoegen';
 $labels['attachments'] = 'Bijlagen';
 $labels['upload'] = 'Toevoegen';
 $labels['uploadprogress'] = '$percent ($current van $total)';
-$labels['close'] = 'Sluit';
-$labels['messageoptions'] = 'Acties voor bericht...';
-$labels['low'] = 'Laag';
-$labels['lowest'] = 'Laagste';
-$labels['normal'] = 'Normaal';
-$labels['high'] = 'Hoog';
+$labels['close']  = 'Sluit';
+$labels['messageoptions']  = 'Berichtopties...';
+
+$labels['low']     = 'Laag';
+$labels['lowest']  = 'Laagste';
+$labels['normal']  = 'Normaal';
+$labels['high']    = 'Hoog';
 $labels['highest'] = 'Hoogste';
-$labels['nosubject'] = '(geen onderwerp)';
+
+$labels['nosubject']  = '(geen onderwerp)';
 $labels['showimages'] = 'Toon afbeeldingen';
 $labels['alwaysshow'] = 'Afbeeldingen van $sender altijd tonen';
-$labels['isdraft'] = 'Dit is een concept.';
-$labels['andnmore'] = '$nr meer...';
+$labels['isdraft']    = 'Dit is een conceptbericht.';
+$labels['andnmore']   = '$nr meer...';
 $labels['togglemoreheaders'] = 'Toon meer berichtheaders';
 $labels['togglefullheaders'] = 'Originele berichtheaders aan/uit';
-$labels['htmltoggle'] = 'HTML';
-$labels['plaintoggle'] = 'Gewone tekst';
+
+$labels['htmltoggle'] = 'Opgemaakt (HTML)';
+$labels['plaintoggle'] = 'Platte tekst';
 $labels['savesentmessagein'] = 'Bewaar verzonden bericht in';
 $labels['dontsave'] = 'niet bewaren';
 $labels['maxuploadsize'] = 'Maximum toegestane bestandsgrootte is $size';
+
 $labels['addcc'] = 'Cc toevoegen';
 $labels['addbcc'] = 'Bcc toevoegen';
 $labels['addreplyto'] = 'Antwoord-aan toevoegen';
-$labels['addfollowupto'] = 'Mail-Followup-Aan toevoegen';
+$labels['addfollowupto'] = 'Followup-To toevoegen';
+
+// mdn
 $labels['mdnrequest'] = 'De afzender van dit bericht heeft gevraagd een melding te ontvangen wanneer u dit bericht heeft gelezen. Wilt u deze melding verzenden?';
 $labels['receiptread'] = 'Ontvangstbevestiging (gelezen)';
 $labels['yourmessage'] = 'Dit is een ontvangstbevestiging voor uw bericht';
 $labels['receiptnote'] = 'Let op: Dit bevestigt alleen dat uw bericht bij de geadresseerde is weergegeven. Er is geen garantie dat de geadresseerde het bericht daadwerkelijk heeft gelezen of de inhoud ervan heeft begrepen.';
-$labels['name'] = 'Naam';
-$labels['firstname'] = 'Voornaam';
-$labels['surname'] = 'Achternaam';
-$labels['middlename'] = 'Tweede naam';
-$labels['nameprefix'] = 'Initialen';
-$labels['namesuffix'] = 'Aanhef';
-$labels['nickname'] = 'Bijnaam';
-$labels['jobtitle'] = 'Functietitel';
-$labels['department'] = 'Afdeling';
-$labels['gender'] = 'Geslacht';
-$labels['maidenname'] = 'Meisjesnaam';
-$labels['email'] = 'E-mail';
-$labels['phone'] = 'Telefoon';
-$labels['address'] = 'Adres';
-$labels['street'] = 'Straat';
-$labels['locality'] = 'Stad';
-$labels['zipcode'] = 'Postcode';
-$labels['region'] = 'Provincie/staat';
-$labels['country'] = 'Land';
-$labels['birthday'] = 'Geboortedag';
-$labels['anniversary'] = 'Verjaardag';
-$labels['website'] = 'Website';
+
+// address boook
+$labels['name']         = 'Weergavenaam';
+$labels['firstname']    = 'Voornaam';
+$labels['surname']      = 'Achternaam';
+$labels['middlename']   = 'Tweede naam';
+$labels['nameprefix']   = 'Voorvoegsel';
+$labels['namesuffix']   = 'Achtervoegsel';
+$labels['nickname']     = 'Bijnaam';
+$labels['jobtitle']     = 'Functietitel';
+$labels['department']   = 'Afdeling';
+$labels['gender']       = 'Geslacht';
+$labels['maidenname']   = 'Meisjesnaam';
+$labels['email']        = 'E-mail';
+$labels['phone']        = 'Telefoon';
+$labels['address']      = 'Adres';
+$labels['street']       = 'Straat';
+$labels['locality']     = 'Stad';
+$labels['zipcode']      = 'Postcode';
+$labels['region']       = 'Provincie/staat';
+$labels['country']      = 'Land';
+$labels['birthday']     = 'Geboortedatum';
+$labels['anniversary']  = 'Gedenkdatum';
+$labels['website']      = 'Website';
 $labels['instantmessenger'] = 'IM';
-$labels['notes'] = 'Notities';
-$labels['male'] = 'Man';
+$labels['notes'] = 'Opmerkingen';
+$labels['male']   = 'Man';
 $labels['female'] = 'Vrouw';
-$labels['manager'] = 'Manager';
+$labels['manager'] = 'Leidinggevende';
 $labels['assistant'] = 'Assistent';
-$labels['typeassistant'] = 'Assistent';
 $labels['spouse'] = 'Echtgenoot';
 $labels['allfields'] = 'Alle velden';
 $labels['search'] = 'Zoeken';
 $labels['advsearch'] = 'Geavanceerd zoeken';
 $labels['advanced'] = 'Geavanceerd';
 $labels['other'] = 'Anders';
-$labels['typeother'] = 'Anders';
-$labels['typehome'] = 'Thuis';
-$labels['typework'] = 'Werk';
-$labels['typemobile'] = 'Mobiel';
-$labels['typemain'] = 'Belangrijkste';
-$labels['typehomefax'] = 'Fax Thuis';
-$labels['typeworkfax'] = 'Fax Werk';
-$labels['typecar'] = 'Auto';
-$labels['typepager'] = 'Pieper';
-$labels['typevideo'] = 'Video';
-$labels['typehomepage'] = 'Website';
-$labels['typeblog'] = 'Blog';
+
+$labels['typehome']   = 'Thuis';
+$labels['typework']   = 'Werk';
+$labels['typeother']  = 'Anders';
+$labels['typemobile']  = 'Mobiel';
+$labels['typemain']  = 'Belangrijkste';
+$labels['typehomefax']  = 'Fax thuis';
+$labels['typeworkfax']  = 'Fax werk';
+$labels['typecar']  = 'Auto';
+$labels['typepager']  = 'Pieper';
+$labels['typevideo']  = 'Video';
+$labels['typeassistant']  = 'Assistent';
+$labels['typehomepage']  = 'Website';
+$labels['typeblog'] = 'Weblog';
 $labels['typeprofile'] = 'Profiel';
+
 $labels['addfield'] = 'Veld toevoegen...';
 $labels['addcontact'] = 'Nieuwe contactpersoon toevoegen';
 $labels['editcontact'] = 'Contactpersoon wijzigen';
 $labels['contacts'] = 'Contactpersonen';
 $labels['contactproperties'] = 'Gegevens van contactpersoon';
 $labels['personalinfo'] = 'Persoonlijke informatie';
-$labels['edit'] = 'Wijzig';
+
+$labels['edit']   = 'Wijzig';
 $labels['cancel'] = 'Annuleren';
-$labels['save'] = 'Opslaan';
+$labels['save']   = 'Opslaan';
 $labels['delete'] = 'Verwijder';
-$labels['rename'] = 'Hernoem';
+$labels['rename'] = 'Hernoemen';
 $labels['addphoto'] = 'Toevoegen';
 $labels['replacephoto'] = 'Vervangen';
-$labels['uploadphoto'] = 'Upload foto';
-$labels['newcontact'] = 'Voeg een nieuwe contactpersoon toe';
-$labels['deletecontact'] = 'Verwijder geselecteerde contactpersonen';
-$labels['composeto'] = 'Stuur een bericht naar';
+$labels['uploadphoto'] = 'Foto uploaden';
+
+$labels['newcontact']     = 'Voeg een nieuwe contactpersoon toe';
+$labels['deletecontact']  = 'Verwijder geselecteerde contactpersonen';
+$labels['composeto']      = 'Stuur een bericht naar';
 $labels['contactsfromto'] = 'Contactpersonen $from t/m $to van $count';
-$labels['print'] = 'Afdrukken';
-$labels['export'] = 'Exporteren';
-$labels['exportvcards'] = 'Exporteer contactpersonen in vCard-formaat';
+$labels['print']          = 'Afdrukken';
+$labels['export']         = 'Exporteren';
+$labels['exportall']      = 'Alles exporteren';
+$labels['exportsel']      = 'Selectie exporteren';
+$labels['exportvcards']   = 'Exporteer contactpersonen in vCard-formaat';
 $labels['newcontactgroup'] = 'Maak een nieuwe contactgroep';
-$labels['grouprename'] = 'Groep hernoemen';
-$labels['groupdelete'] = 'Groep verwijderen';
+$labels['grouprename']    = 'Groep hernoemen';
+$labels['groupdelete']    = 'Groep verwijderen';
 $labels['groupremoveselected'] = 'Verwijder geselecteerde contactpersonen van groep';
-$labels['previouspage'] = 'Vorige pagina';
-$labels['firstpage'] = 'Eerste pagina';
-$labels['nextpage'] = 'Volgende pagina';
-$labels['lastpage'] = 'Laatste pagina';
+
+$labels['previouspage']   = 'Vorige pagina';
+$labels['firstpage']      = 'Eerste pagina';
+$labels['nextpage']       = 'Volgende pagina';
+$labels['lastpage']       = 'Laatste pagina';
+
 $labels['group'] = 'Groep';
 $labels['groups'] = 'Groepen';
 $labels['personaladrbook'] = 'Persoonlijk adresboek';
+
 $labels['searchsave'] = 'Zoekopdracht opslaan';
 $labels['searchdelete'] = 'Zoekopdracht verwijderen';
-$labels['import'] = 'Importeer';
+
+$labels['import'] = 'Importeren';
 $labels['importcontacts'] = 'Contactpersonen importeren';
 $labels['importfromfile'] = 'Importeer van bestand:';
 $labels['importtarget'] = 'Voeg nieuwe contactpersonen toe aan adresboek:';
 $labels['importreplace'] = 'Vervang het complete adresboek';
 $labels['importdesc'] = 'U kunt contactpersonen uploaden van een bestaand adresboek<br/>Momenteel wordt het importeren van adresboeken in <a href="http://en.wikipedia.org/wiki/VCard">vCard-formaat</a> of CSV-formaat (kommagescheiden tekstbestand) ondersteund.';
 $labels['done'] = 'Klaar';
+
+// settings
 $labels['settingsfor'] = 'Instellingen voor';
 $labels['about'] = 'Over';
 $labels['preferences'] = 'Instellingen';
 $labels['userpreferences'] = 'Gebruikersinstellingen';
 $labels['editpreferences'] = 'Wijzig gebruikersinstellingen';
+
 $labels['identities'] = 'Identiteiten';
 $labels['manageidentities'] = 'Beheer identiteiten voor dit account';
 $labels['newidentity'] = 'Identiteit toevoegen';
+
 $labels['newitem'] = 'Nieuw item';
 $labels['edititem'] = 'Wijzig item';
-$labels['preferhtml'] = 'Toon HTML';
+
+$labels['preferhtml'] = 'Toon berichten in HTML-opmaak';
 $labels['defaultcharset'] = 'Standaard tekenset';
 $labels['htmlmessage'] = 'HTML-bericht';
+$labels['messagepart'] = 'Gedeelte';
+$labels['digitalsig'] = 'Digitale handtekening';
 $labels['dateformat'] = 'Datumnotatie';
 $labels['timeformat'] = 'Tijdweergave';
 $labels['prettydate'] = 'Leesbare datums';
-$labels['setdefault'] = 'Stel in als standaard';
-$labels['autodetect'] = 'Automatisch';
-$labels['language'] = 'Taal';
-$labels['timezone'] = 'Tijdzone';
-$labels['pagesize'] = 'Aantal berichten per pagina';
+$labels['setdefault']  = 'Stel in als standaard';
+$labels['autodetect']  = 'Automatisch';
+$labels['language']  = 'Taal';
+$labels['timezone']  = 'Tijdzone';
+$labels['pagesize']  = 'Aantal berichten per pagina';
 $labels['signature'] = 'Ondertekening';
-$labels['dstactive'] = 'Zomertijd';
+$labels['dstactive']  = 'Zomertijd';
 $labels['showinextwin'] = 'Bericht in een nieuw venster openen';
 $labels['composeextwin'] = 'In een nieuw venster bewerken';
 $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';
-$labels['logoutcompact'] = 'Postvak IN opschonen bij uitloggen';
+$labels['logoutcompact'] = 'Postvak In opschonen bij uitloggen';
 $labels['uisettings'] = 'Gebruikersinterface';
 $labels['serversettings'] = 'Serverinstellingen';
 $labels['mailboxview'] = 'Mailboxweergave';
 $labels['mdnrequests'] = 'Ontvangstmeldingen';
 $labels['askuser'] = 'altijd aan mij vragen';
 $labels['autosend'] = 'stuur automatisch';
-$labels['autosendknown'] = 'stuur ontvangstbevestiging alleen naar mijn contactpersonen, voor anderen aan mij vragen';
-$labels['autosendknownignore'] = 'stuur ontvangstbevestiging alleen naar mijn contactpersonen,  voor anderen negeren';
+$labels['autosendknown'] = 'stuur automatisch naar mijn contactpersonen,  anders vragen';
+$labels['autosendknownignore'] = 'stuur automatisch naar mijn contactpersonen,  anders negeren';
 $labels['ignore'] = 'negeren';
 $labels['readwhendeleted'] = 'Bericht na verwijderen als gelezen markeren';
-$labels['flagfordeletion'] = 'Bericht niet verwijderen maar als verwijderd markeren';
+$labels['flagfordeletion'] = 'Bericht niet verwijderen maar als \'te verwijderen\' markeren';
 $labels['skipdeleted'] = 'Verwijderde berichten niet tonen';
 $labels['deletealways'] = 'Verwijder bericht wanneer verplaatsen naar Prullenbak mislukt';
 $labels['deletejunk'] = 'Verwijder direct berichten in Spam';
-$labels['showremoteimages'] = 'Afbeeldingen op afstand weergeven';
+$labels['showremoteimages'] = 'Externe afbeeldingen weergeven';
 $labels['fromknownsenders'] = 'van bekende afzenders';
 $labels['always'] = 'altijd';
 $labels['showinlineimages'] = 'Bijgevoegde afbeeldingen onder het bericht weergeven';
-$labels['autosavedraft'] = 'Concept automatisch opslaan';
-$labels['everynminutes'] = 'iedere $n minuten';
-$labels['refreshinterval'] = 'Vernieuwen (controleer op nieuwe berichten, etc.)';
-$labels['never'] = 'nooit';
-$labels['immediately'] = 'onmiddellijk';
+$labels['autosavedraft']  = 'Concept automatisch opslaan';
+$labels['everynminutes']  = 'iedere $n minuten';
+$labels['refreshinterval']  = 'Vernieuwen (controleer op nieuwe berichten, etc.)';
+$labels['never']  = 'nooit';
+$labels['immediately']  = 'onmiddellijk';
 $labels['messagesdisplaying'] = 'Berichtenweergave';
-$labels['messagescomposition'] = 'Berichten aanmaken';
+$labels['messagescomposition'] = 'Berichten opstellen';
 $labels['mimeparamfolding'] = 'Namen van bijlagen';
 $labels['2231folding'] = 'Volledig RFC 2231 (Thunderbird)';
 $labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
@@ -389,12 +456,9 @@ $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';
+$labels['previewpanemarkread']  = 'Markeer voorbeeldberichten als gelezen';
+$labels['afternseconds']  = 'na $n seconden';
 $labels['reqmdn'] = 'Vraag altijd een ontvangstbevestiging';
 $labels['reqdsn'] = 'Vraag altijd om een afleveringsbericht';
 $labels['replysamefolder'] = 'Bewaar reacties in de map van het beantwoorde bericht';
@@ -411,39 +475,47 @@ $labels['mailtoprotohandler'] = 'Registreer protocolhandler voor mailto: links';
 $labels['forwardmode'] = 'Berichten doorsturen';
 $labels['inline'] = 'invoegen';
 $labels['asattachment'] = 'als bijlage';
-$labels['folder'] = 'Map';
-$labels['foldername'] = 'Mapnaam';
-$labels['subscribed'] = 'Geabonneerd';
+
+$labels['folder']  = 'Map';
+$labels['folders']  = 'Mappen';
+$labels['foldername']  = 'Mapnaam';
+$labels['subscribed']  = 'Geabonneerd';
 $labels['messagecount'] = 'Berichten';
-$labels['create'] = 'Nieuw';
-$labels['createfolder'] = 'Maak nieuwe map';
-$labels['managefolders'] = 'Beheer mappen';
+$labels['create']  = 'Nieuw';
+$labels['createfolder']  = 'Nieuwe map maken';
+$labels['managefolders']  = 'Beheer mappen';
 $labels['specialfolders'] = 'Speciale mappen';
 $labels['properties'] = 'Eigenschappen';
-$labels['folderproperties'] = 'Map eigenschappen';
+$labels['folderproperties'] = 'Mapeigenschappen';
 $labels['parentfolder'] = 'Bovenliggende map';
 $labels['location'] = 'Locatie';
 $labels['info'] = 'Informatie';
 $labels['getfoldersize'] = 'Klik om de omvang van de map te berekenen';
-$labels['changesubscription'] = 'Klik voor het wijzigen van de inschrijving';
+$labels['changesubscription'] = 'Klik om abonnering te wijzigen';
 $labels['foldertype'] = 'Maptype';
-$labels['personalfolder'] = 'Privé map';
-$labels['otherfolder'] = 'Map van andere gebruiker';
-$labels['sharedfolder'] = 'Publieke map';
+$labels['personalfolder']  = 'Privémap';
+$labels['otherfolder']  = 'Map van andere gebruiker';
+$labels['sharedfolder']  = 'Publieke map';
+
 $labels['sortby'] = 'Sorteer op';
-$labels['sortasc'] = 'Sorteer oplopend';
+$labels['sortasc']  = 'Sorteer oplopend';
 $labels['sortdesc'] = 'Sorteer aflopend';
 $labels['undo'] = 'Ongedaan maken';
+
 $labels['installedplugins'] = 'Geïnstalleerde plug-ins';
 $labels['plugin'] = 'Invoegtoepassing';
 $labels['version'] = 'Versie';
 $labels['source'] = 'Broncode';
 $labels['license'] = 'Licentie';
 $labels['support'] = 'Hulp nodig?';
+
+// units
 $labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
 $labels['GB'] = 'GB';
+
+// character sets
 $labels['unicode'] = 'Unicode';
 $labels['english'] = 'Engels';
 $labels['westerneuropean'] = 'West-Europees';
@@ -463,3 +535,4 @@ $labels['japanese'] = 'Japans';
 $labels['korean'] = 'Koreaans';
 $labels['chinese'] = 'Chinees';
 
+?>
diff --git a/program/localization/nl_NL/messages.inc b/program/localization/nl_NL/messages.inc
index fe050adc3..4a67e1590 100644
--- a/program/localization/nl_NL/messages.inc
+++ b/program/localization/nl_NL/messages.inc
@@ -2,29 +2,34 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/nl_NL/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Geert Wirken                                                  |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['errortitle'] = 'Er is een fout opgetreden!';
-$messages['loginfailed'] = 'Aanmelden mislukt.';
+$messages['errortitle']  = 'Er is een fout opgetreden!';
+$messages['loginfailed']  = 'Aanmelden mislukt.';
 $messages['cookiesdisabled'] = 'Uw browser accepteert geen cookies.';
 $messages['sessionerror'] = 'Uw sessie is verlopen of ongeldig.';
 $messages['storageerror'] = 'Verbinding met IMAP-server mislukt.';
 $messages['servererror'] = 'Serverfout!';
 $messages['servererrormsg'] = 'Serverfout: $msg';
 $messages['dberror'] = 'Databasefout!';
-$messages['requesttimedout'] = 'Wachttijd verzoek overschreden';
-$messages['errorreadonly'] = 'Niet in staat om de bewerking uit te voeren. Map is alleen-lezen.';
+$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.';
@@ -36,18 +41,18 @@ $messages['uploading'] = 'Bestand wordt geüpload...';
 $messages['uploadingmany'] = 'Bestanden worden geüpload...';
 $messages['loadingdata'] = 'Gegevens worden geladen...';
 $messages['checkingmail'] = 'Controleren op nieuwe berichten...';
-$messages['sendingmessage'] = 'Bericht versturen...';
+$messages['sendingmessage'] = 'Bericht wordt verstuurd...';
 $messages['messagesent'] = 'Bericht succesvol verstuurd.';
 $messages['savingmessage'] = 'Bericht wordt opgeslagen...';
 $messages['messagesaved'] = 'Bericht opgeslagen in Concepten.';
 $messages['successfullysaved'] = 'Succesvol opgeslagen.';
-$messages['addedsuccessfully'] = 'Contact is succesvol toegevoegd aan het adresboek.';
+$messages['addedsuccessfully'] = 'Contactpersoon succesvol toegevoegd aan het adresboek.';
 $messages['contactexists'] = 'Er bestaat al een contactpersoon met dit e-mailadres.';
 $messages['contactnameexists'] = 'Er bestaat al een contactpersoon met deze naam.';
 $messages['blockedimages'] = 'Om uw privacy te beschermen zijn externe afbeeldingen geblokkeerd in dit bericht.';
-$messages['encryptedmessage'] = 'Dit is een gecodeerd bericht en kan niet weergegeven worden. Excuses!';
+$messages['encryptedmessage'] = 'Dit is een versleuteld bericht en kan niet weergegeven worden. Excuses!';
 $messages['nocontactsfound'] = 'Geen contactpersonen gevonden.';
-$messages['contactnotfound'] = 'Contactpersoon niet gevonden.';
+$messages['contactnotfound'] = 'Opgevraagde contactpersoon niet gevonden.';
 $messages['contactsearchonly'] = 'Voer enkele zoektermen in om contactpersonen te zoeken';
 $messages['sendingfailed'] = 'Verzenden van bericht is mislukt.';
 $messages['senttooquickly'] = 'Wacht alstublieft $sec seconde(n) voordat u dit bericht verstuurt.';
@@ -57,11 +62,11 @@ $messages['errormoving'] = 'Kan bericht(en) niet verplaatsen.';
 $messages['errorcopying'] = 'Kan bericht(en) niet kopiëren.';
 $messages['errordeleting'] = 'Kan bericht(en) niet verwijderen.';
 $messages['errormarking'] = 'Kan bericht(en) niet markeren.';
-$messages['deletecontactconfirm'] = 'Weet u zeker dat u de geselecteerde contact(en) wilt verwijderen?';
-$messages['deletegroupconfirm'] = 'Weet u zeker dat u de geselecteerde groep wilt verwijderen?';
+$messages['deletecontactconfirm']  = 'Weet u zeker dat u de geselecteerde contact(en) wilt verwijderen?';
+$messages['deletegroupconfirm']  = 'Weet u zeker dat u de geselecteerde groep wilt verwijderen?';
 $messages['deletemessagesconfirm'] = 'Weet u zeker dat u de geselecteerde bericht(en) wilt verwijderen?';
-$messages['deletefolderconfirm'] = 'Weet u zeker dat u deze map wilt verwijderen?';
-$messages['purgefolderconfirm'] = 'Weet u zeker dat u alle berichten in deze map wilt verwijderen?';
+$messages['deletefolderconfirm']  = 'Weet u zeker dat u deze map wilt verwijderen?';
+$messages['purgefolderconfirm']  = 'Weet u zeker dat u alle berichten in deze map wilt verwijderen?';
 $messages['contactdeleting'] = 'Bezig met verwijderen van contact(en)...';
 $messages['groupdeleting'] = 'Groep wordt verwijderd...';
 $messages['folderdeleting'] = 'Map wordt verwijderd...';
@@ -70,13 +75,13 @@ $messages['foldersubscribing'] = 'Bezig met abonneren op map...';
 $messages['folderunsubscribing'] = 'Abonnement op map wordt opgezegd...';
 $messages['formincomplete'] = 'Het formulier was niet volledig ingevuld.';
 $messages['noemailwarning'] = 'Geef een geldig e-mailadres op.';
-$messages['nonamewarning'] = 'Vul een naam in.';
+$messages['nonamewarning']  = 'Vul een naam in.';
 $messages['nopagesizewarning'] = 'Geef een paginagrootte op.';
 $messages['nosenderwarning'] = 'Geef een e-mailadres van de afzender op.';
 $messages['norecipientwarning'] = 'Geef tenminste één ontvanger op.';
-$messages['nosubjectwarning'] = 'Het \'Onderwerp\' veld is leeg. Wilt u nu alsnog een onderwerp opgeven?';
+$messages['nosubjectwarning']  = 'U heeft geen onderwerp ingevoerd. Wilt u nu een onderwerp opgeven?';
 $messages['nobodywarning'] = 'Dit bericht zonder inhoud versturen?';
-$messages['notsentwarning'] = 'Bericht is niet verstuurd. Weet u zeker dat u het niet wilt bewaren?';
+$messages['notsentwarning'] = 'Het bericht is niet verstuurd. Wilt u uw bericht weggooien?';
 $messages['noldapserver'] = 'Selecteer een LDAP-server om te zoeken.';
 $messages['nosearchname'] = 'Vul de naam of e-mailadres in van een contactpersoon.';
 $messages['notuploadedwarning'] = 'Nog niet alle bijlagen zijn geüpload. Wacht even of annuleer de upload.';
@@ -86,11 +91,11 @@ $messages['searchnomatch'] = 'Zoekopdracht heeft geen resultaten opgeleverd.';
 $messages['searching'] = 'Zoeken...';
 $messages['checking'] = 'Controleren...';
 $messages['nospellerrors'] = 'Geen spelfouten gevonden.';
-$messages['folderdeleted'] = 'Map successvol verwijderd.';
+$messages['folderdeleted'] = 'Map succesvol verwijderd.';
 $messages['foldersubscribed'] = 'Succesvol geabonneerd op map.';
 $messages['folderunsubscribed'] = 'Abonnement op map succesvol opgezegd.';
-$messages['folderpurged'] = 'Folder met succes geleegd.';
-$messages['folderexpunged'] = 'Folder succesvol geleegd.';
+$messages['folderpurged'] = 'Map succesvol leeggemaakt.';
+$messages['folderexpunged'] = 'Map succesvol opgeschoond.';
 $messages['deletedsuccessfully'] = 'Met succes verwijderd.';
 $messages['converting'] = 'Opmaak van bericht verwijderen...';
 $messages['messageopenerror'] = 'Kan het bericht niet van de server laden.';
@@ -98,68 +103,69 @@ $messages['fileuploaderror'] = 'Bestand uploaden mislukt.';
 $messages['filesizeerror'] = 'Het bestand overschrijdt de maximale grootte van $size.';
 $messages['copysuccess'] = '$nr adressen succesvol gekopieerd.';
 $messages['copyerror'] = 'Kan geen adressen kopiëren.';
-$messages['sourceisreadonly'] = 'Het adres is alleen-lezen.';
-$messages['errorsavingcontact'] = 'Kan het ontvanger-adres niet opslaan.';
+$messages['sourceisreadonly'] = 'Deze adresbron is alleen-lezen.';
+$messages['errorsavingcontact'] = 'Kan contactpersoon niet opslaan.';
 $messages['movingmessage'] = 'Bericht(en) verplaatsen...';
 $messages['copyingmessage'] = 'Bericht(en) kopiëren...';
 $messages['copyingcontact'] = 'Contact(en) kopiëren...';
 $messages['deletingmessage'] = 'Bericht(en) verwijderen...';
 $messages['markingmessage'] = 'Bericht(en) markeren...';
-$messages['addingmember'] = 'Contactpersonen worden toegevoegd aan de groep...';
-$messages['removingmember'] = 'Contactpersonen worden verwijderd uit de groep...';
+$messages['addingmember'] = 'Contactpersonen worden toegevoegd aan groep...';
+$messages['removingmember'] = 'Contactpersonen worden verwijderd uit groep...';
 $messages['receiptsent'] = 'Ontvangstbevestiging is verstuurd.';
 $messages['errorsendingreceipt'] = 'Kan de ontvangstbevestiging niet versturen.';
 $messages['deleteidentityconfirm'] = 'Weet u zeker dat u deze identiteit wilt verwijderen?';
 $messages['nodeletelastidentity'] = 'U kunt uw enige identiteit niet verwijderen.';
 $messages['forbiddencharacter'] = 'De naam van de map bevat een karakter dat niet is toegestaan.';
-$messages['selectimportfile'] = 'Selecteer een bestand om de uploaden.';
-$messages['addresswriterror'] = 'Het geselecteerde adresboek is alleen lezen.';
-$messages['contactaddedtogroup'] = 'Contact(en) met succes toegevoegd aan de groep.';
-$messages['contactremovedfromgroup'] = 'Contact(en) met succes verwijderd aan de groep.';
+$messages['selectimportfile'] = 'Selecteer een bestand om te uploaden.';
+$messages['addresswriterror'] = 'Het geselecteerde adresboek is alleen-lezen.';
+$messages['contactaddedtogroup'] = 'Contact(en) met succes toegevoegd aan deze groep.';
+$messages['contactremovedfromgroup'] = 'Contact(en) met succes verwijderd van deze groep.';
 $messages['nogroupassignmentschanged'] = 'Geen groepstoewijzingen aangepast.';
 $messages['importwait'] = 'Importeren, even geduld...';
 $messages['importformaterror'] = 'Importeren mislukt! Het geüploade bestand is geen geldig importbestand.';
-$messages['importconfirm'] = '<b>Er zijn $inserted contactpersonen succesvol geïmporteerd, en $skipped bestaande overgeslagen</b>:<p><em>$names</em></p>';
+$messages['importconfirm'] = '<b>$inserted contactpersonen succesvol geïmporteerd</b>';
 $messages['importconfirmskipped'] = '<b>$skipped bestaande contactpersonen overgeslagen</b>';
-$messages['opnotpermitted'] = 'Deze verrichting is niet toegestaan!';
-$messages['nofromaddress'] = 'Het e-mailadres mist in de geselecteerde identiteit.';
-$messages['editorwarning'] = 'Door het overschakelen naar de platte tekst editor gaat alle opmaak verloren. Weet u zeker dat u verder wilt gaan?';
-$messages['httpreceivedencrypterror'] = 'Er is een fatale fout opgetreden. Neem direct contact op met uw systeembeheerder. <b>Uw bericht kon niet worden verzonden.</b>';
-$messages['smtpconnerror'] = 'SMTP Fout ($code): Verbinding met server mislukt.';
-$messages['smtpautherror'] = 'SMTP Fout ($code): Autenticatie mislukt.';
-$messages['smtpfromerror'] = 'SMTP Fout ($code): Kon afzender "$from" niet instellen ($msg).';
-$messages['smtptoerror'] = 'SMTP Fout ($code): Kon ontvanger "$to" niet toevoegen ($msg).';
-$messages['smtprecipientserror'] = 'SMTP Fout: Kon lijst van ontvangers niet verwerken.';
-$messages['smtperror'] = 'SMTP Fout: $msg';
+$messages['opnotpermitted'] = 'Deze bewerking is niet toegestaan!';
+$messages['nofromaddress'] = 'Het e-mailadres ontbreekt in de geselecteerde identiteit.';
+$messages['editorwarning'] = 'Door het overschakelen naar de platte-tekstverwerker gaat alle opmaak verloren. Weet u zeker dat u verder wilt gaan?';
+$messages['httpreceivedencrypterror'] = 'Er is een onherstelbare configuratiefout opgetreden. Neem direct contact op met uw systeembeheerder. <b>Uw bericht kon niet worden verzonden.</b>';
+$messages['smtpconnerror'] = 'SMTP-fout ($code): Verbinding met server mislukt.';
+$messages['smtpautherror'] = 'SMTP-fout ($code): Authenticatie mislukt.';
+$messages['smtpfromerror'] = 'SMTP-fout ($code): Afzender "$from" kan niet ingesteld worden ($msg).';
+$messages['smtptoerror'] = 'SMTP-fout ($code): Ontvanger "$to" kan niet toegevoegd worden ($msg).';
+$messages['smtprecipientserror'] = 'SMTP-fout: Lijst met ontvangers kan niet verwerkt worden.';
+$messages['smtperror'] = 'SMTP-fout: $msg';
 $messages['emailformaterror'] = 'Ongeldig e-mailadres: $email';
-$messages['toomanyrecipients'] = 'Te veel geadresseerden. Verminder de hoeveelheid geadresseerden tot $max.';
-$messages['maxgroupmembersreached'] = 'Het aantal leden van de groep groter is dan de maximale van $max.';
+$messages['toomanyrecipients'] = 'Te veel ontvangers. Reduceer het aantal ontvangers tot $max.';
+$messages['maxgroupmembersreached'] = 'Het aantal groepsleden overschrijdt het maximale aantal van $max.';
 $messages['internalerror'] = 'Er is een interne fout opgetreden. Probeer het nogmaals.';
-$messages['contactdelerror'] = 'Kon contact(en) niet verwijderen.';
+$messages['contactdelerror'] = 'Contact(en) konden niet verwijderd worden.';
 $messages['contactdeleted'] = 'Contact(en) succesvol verwijderd.';
-$messages['contactrestoreerror'] = 'Verwijderde contactpersonen konden niet hersteld worden';
-$messages['contactrestored'] = 'Contactpersonen succesvol hersteld.';
+$messages['contactrestoreerror'] = 'Verwijderde contact(en) konden niet hersteld worden.';
+$messages['contactrestored'] = 'Contact(en) succesvol hersteld.';
 $messages['groupdeleted'] = 'Groep succesvol verwijderd.';
 $messages['grouprenamed'] = 'Groep succesvol hernoemd.';
 $messages['groupcreated'] = 'Groep succesvol aangemaakt.';
-$messages['savedsearchdeleted'] = 'Opgeslagen zoekopdracht successvol verwijderd.';
+$messages['savedsearchdeleted'] = 'Opgeslagen zoekopdracht succesvol verwijderd.';
 $messages['savedsearchdeleteerror'] = 'Opgeslagen zoekopdracht kon niet worden verwijderd.';
-$messages['savedsearchcreated'] = 'Zoekopdracht successvol opgeslagen.';
+$messages['savedsearchcreated'] = 'Zoekopdracht succesvol opgeslagen.';
 $messages['savedsearchcreateerror'] = 'Zoekopdracht kon niet worden opgeslagen.';
 $messages['messagedeleted'] = 'Bericht(en) succesvol verwijderd.';
 $messages['messagemoved'] = 'Bericht(en) succesvol verplaatst.';
 $messages['messagecopied'] = 'Bericht(en) succesvol gekopieerd.';
 $messages['messagemarked'] = 'Bericht(en) succesvol gemarkeerd.';
-$messages['autocompletechars'] = 'Voer ten minste $min karakters in voor automatisch aanvullen.';
+$messages['autocompletechars'] = 'Voer tenminste $min karakters in voor automatisch aanvullen.';
 $messages['autocompletemore'] = 'Meerdere resultaten gevonden. Verfijn uw zoekopdracht.';
-$messages['namecannotbeempty'] = 'Naam kan niet leeg zijn';
-$messages['nametoolong'] = 'Naam is te lang';
-$messages['folderupdated'] = 'Map succesvol bijgewerkt';
-$messages['foldercreated'] = 'Map succesvol aangemaakt';
-$messages['invalidimageformat'] = 'Geen geldig afbeeldings formaat';
-$messages['mispellingsfound'] = 'Spelfouten gedetecteerd in bericht';
-$messages['parentnotwritable'] = 'U heeft niet voldoende rechten een map te maken / verplaatsen in deze map.';
+$messages['namecannotbeempty'] = 'Naam kan niet leeg zijn.';
+$messages['nametoolong'] = 'Naam is te lang.';
+$messages['folderupdated'] = 'Map succesvol bijgewerkt.';
+$messages['foldercreated'] = 'Map succesvol aangemaakt.';
+$messages['invalidimageformat'] = 'Geen geldig afbeeldingsformaat.';
+$messages['mispellingsfound'] = 'Spelfouten gedetecteerd in bericht.';
+$messages['parentnotwritable'] = 'Niet in staat om map aan te maken of verplaatsen in gekozen bovenliggende map. U heeft geen toegangsrechten.';
 $messages['messagetoobig'] = 'Het bericht is te groot om te verwerken.';
 $messages['attachmentvalidationerror'] = 'WAARSCHUWING! Deze bijlage is verdacht omdat het bestandstype niet overeen komt met het bestandstype dat gespecificeerd is in het bericht. Open deze bijlage niet in uw browser als u de afzender niet vertrouwt, aangezien deze bijlage kwaadaardige inhoud kan bevatten.<br /><br /><em>Verwacht: $expected; gevonden: $detected</em>';
-$messages['noscriptwarning'] = 'Waarschuwing: deze webmailapplicatie vereist Javascript! U dient Javascript in te schakelen wanneer u gebruik wilt maken van deze webmail.';
+$messages['noscriptwarning'] = 'Waarschuwing: deze webmailapplicatie vereist Javascript! U dient Javascript in te schakelen in uw browserinstellingen wanneer u gebruik wilt maken van deze applicatie.';
 
+?>
diff --git a/program/localization/nn_NO/labels.inc b/program/localization/nn_NO/labels.inc
index 3454a7a88..d1a1c5700 100644
--- a/program/localization/nn_NO/labels.inc
+++ b/program/localization/nn_NO/labels.inc
@@ -2,60 +2,78 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/nn_NO/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Fredrik Larsen <fredrik.h.larsen@gmail.com>                   |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = 'Velkomen til $product';
-$labels['username'] = 'Brukarnamn';
-$labels['password'] = 'Passord';
-$labels['server'] = 'Tenar';
-$labels['login'] = 'Logg inn';
-$labels['logout'] = 'Logg ut';
-$labels['mail'] = 'E-post';
+
+// login page
+$labels['welcome']   = 'Velkomen til $product';
+$labels['username']  = 'Brukarnamn';
+$labels['password']  = 'Passord';
+$labels['server']    = 'Tenar';
+$labels['login']     = 'Logg inn';
+
+// taskbar
+$labels['logout']   = 'Logg ut';
+$labels['mail']     = 'E-post';
 $labels['settings'] = 'Personlege innstillingar';
 $labels['addressbook'] = 'Adressebok';
-$labels['inbox'] = 'Innboks';
+
+// mailbox names
+$labels['inbox']  = 'Innboks';
 $labels['drafts'] = 'Kladd';
-$labels['sent'] = 'Sendt';
-$labels['trash'] = 'Sletta';
-$labels['junk'] = 'Søppel';
+$labels['sent']   = 'Sendt';
+$labels['trash']  = 'Sletta';
+$labels['junk']   = 'Søppel';
+
+// message listing
 $labels['subject'] = 'Emne';
-$labels['from'] = 'Frå';
-$labels['to'] = 'Til';
-$labels['cc'] = 'Kopi til';
-$labels['bcc'] = 'Blindkopi til';
+$labels['from']    = 'Frå';
+$labels['sender']  = 'Avsendar';
+$labels['to']      = 'Til';
+$labels['cc']      = 'Kopi til';
+$labels['bcc']     = 'Blindkopi til';
 $labels['replyto'] = 'Svar til';
 $labels['followupto'] = 'Oppfølging til';
-$labels['date'] = 'Dato';
-$labels['size'] = 'Storleik';
+$labels['date']    = 'Dato';
+$labels['size']    = 'Storleik';
 $labels['priority'] = 'Prioritet';
 $labels['organization'] = 'Organisasjon';
 $labels['readstatus'] = 'Lesestatus';
 $labels['listoptions'] = 'Listeinnstillingar …';
+
 $labels['mailboxlist'] = 'Mapper';
-$labels['folders'] = 'Mapper';
 $labels['messagesfromto'] = 'Melding $from til $to av $count';
 $labels['threadsfromto'] = 'Tråd $from til $to ($count stk)';
 $labels['messagenrof'] = 'Melding $nr av $count';
 $labels['fromtoshort'] = '$from-$to av $count';
-$labels['copy'] = 'Kopier';
-$labels['move'] = 'Flytt';
-$labels['moveto'] = 'flytt til …';
+
+$labels['copy']     = 'Kopier';
+$labels['move']     = 'Flytt';
+$labels['moveto']   = 'flytt til …';
 $labels['download'] = 'Last ned';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'Vis';
 $labels['showanyway'] = 'Vis likevel';
+
 $labels['filename'] = 'Filnamn';
 $labels['filesize'] = 'Filstorleik';
+
 $labels['addtoaddressbook'] = 'Legg til i adressebok';
+
+// weekdays short
 $labels['sun'] = 'Sun';
 $labels['mon'] = 'Mån';
 $labels['tue'] = 'Tys';
@@ -63,78 +81,88 @@ $labels['wed'] = 'Ons';
 $labels['thu'] = 'Tor';
 $labels['fri'] = 'Fre';
 $labels['sat'] = 'Lau';
-$labels['sunday'] = 'Sundag';
-$labels['monday'] = 'Måndag';
-$labels['tuesday'] = 'Tysdag';
+
+// weekdays long
+$labels['sunday']    = 'Sundag';
+$labels['monday']    = 'Måndag';
+$labels['tuesday']   = 'Tysdag';
 $labels['wednesday'] = 'Onsdag';
-$labels['thursday'] = 'Torsdag';
-$labels['friday'] = 'Fredag';
-$labels['saturday'] = 'Laurdag';
-$labels['jan'] = 'Jan';
-$labels['feb'] = 'Feb';
-$labels['mar'] = 'Mar';
-$labels['apr'] = 'Apr';
-$labels['may'] = 'Mai';
-$labels['longmay'] = 'Mai';
-$labels['jun'] = 'Jun';
-$labels['jul'] = 'Jul';
-$labels['aug'] = 'Aug';
-$labels['sep'] = 'Sep';
-$labels['oct'] = 'Okt';
-$labels['nov'] = 'Nov';
-$labels['dec'] = 'Des';
-$labels['longjan'] = 'Januar';
-$labels['longfeb'] = 'Februar';
-$labels['longmar'] = 'Mars';
-$labels['longapr'] = 'April';
-$labels['longjun'] = 'Juni';
-$labels['longjul'] = 'Juli';
-$labels['longaug'] = 'August';
-$labels['longsep'] = 'September';
-$labels['longoct'] = 'Oktober';
-$labels['longnov'] = 'November';
-$labels['longdec'] = 'Desember';
+$labels['thursday']  = 'Torsdag';
+$labels['friday']    = 'Fredag';
+$labels['saturday']  = 'Laurdag';
+
+// months short
+$labels['jan']	= 'Jan';
+$labels['feb']	= 'Feb';
+$labels['mar']	= 'Mar';
+$labels['apr']	= 'Apr';
+$labels['may']	= 'Mai';
+$labels['jun']	= 'Jun';
+$labels['jul'] 	= 'Jul';
+$labels['aug']	= 'Aug';
+$labels['sep']	= 'Sep';
+$labels['oct']	= 'Okt';
+$labels['nov']	= 'Nov';
+$labels['dec']	= 'Des';
+
+// months long
+$labels['longjan']	= 'Januar';
+$labels['longfeb']	= 'Februar';
+$labels['longmar']	= 'Mars';
+$labels['longapr']	= 'April';
+$labels['longmay']	= 'Mai';
+$labels['longjun']	= 'Juni';
+$labels['longjul']	= 'Juli';
+$labels['longaug']	= 'August';
+$labels['longsep']	= 'September';
+$labels['longoct']	= 'Oktober';
+$labels['longnov']	= 'November';
+$labels['longdec']	= 'Desember';
+
 $labels['today'] = 'I dag';
-$labels['refresh'] = 'Frisk opp att';
-$labels['checkmail'] = 'Sjå etter nye meldingar';
-$labels['compose'] = 'Skriv ei melding';
-$labels['writenewmessage'] = 'Skriv ei ny melding';
-$labels['reply'] = 'Svar';
-$labels['replytomessage'] = 'Svar til avsendar';
+
+// toolbar buttons
+$labels['refresh']          = 'Frisk opp att';
+$labels['checkmail']        = 'Sjå etter nye meldingar';
+$labels['compose']          = 'Skriv ei melding';
+$labels['writenewmessage']  = 'Skriv ei ny melding';
+$labels['reply']            = 'Svar';
+$labels['replytomessage']   = 'Svar til avsendar';
 $labels['replytoallmessage'] = 'Svar til avsendar og alle mottakarar';
-$labels['replyall'] = 'Svar til alle';
-$labels['replylist'] = 'Svar til liste';
-$labels['forward'] = 'Vidaresend';
-$labels['forwardinline'] = 'Send vidare innbygd';
+$labels['replyall']         = 'Svar til alle';
+$labels['replylist']        = 'Svar til liste';
+$labels['forward']          = 'Vidaresend';
+$labels['forwardinline']    = 'Send vidare innbygd';
 $labels['forwardattachment'] = 'Vidresend som vedlegg';
-$labels['forwardmessage'] = 'Vidaresend meldinga';
-$labels['deletemessage'] = 'Slett meldinga';
+$labels['forwardmessage']   = 'Vidaresend meldinga';
+$labels['deletemessage']    = 'Slett meldinga';
 $labels['movemessagetotrash'] = 'Flytt meldinga til «sletta»';
-$labels['printmessage'] = 'Skriv ut meldinga';
-$labels['previousmessage'] = 'Vis førre melding';
-$labels['firstmessage'] = 'Vis den første meldinga';
-$labels['nextmessage'] = 'Vis den neste meldinga';
-$labels['lastmessage'] = 'Vis den siste meldinga';
-$labels['backtolist'] = 'Tilbake til meldingslista';
-$labels['viewsource'] = 'Vis kjelde';
-$labels['mark'] = 'Merke';
-$labels['markmessages'] = 'Marker meldingar';
-$labels['markread'] = 'Som lese';
-$labels['markunread'] = 'Som ulese';
-$labels['markflagged'] = 'Som flagga';
-$labels['markunflagged'] = 'Som uflagga';
-$labels['moreactions'] = 'Fleire handlingar';
-$labels['more'] = 'Meir';
-$labels['back'] = 'Tilbake';
-$labels['options'] = 'Innstillingar';
+$labels['printmessage']     = 'Skriv ut meldinga';
+$labels['previousmessage']  = 'Vis førre melding';
+$labels['firstmessage']     = 'Vis den første meldinga';
+$labels['nextmessage']      = 'Vis den neste meldinga';
+$labels['lastmessage']      = 'Vis den siste meldinga';
+$labels['backtolist']       = 'Tilbake til meldingslista';
+$labels['viewsource']       = 'Vis kjelde';
+$labels['mark']             = 'Merke';
+$labels['markmessages']     = 'Marker meldingar';
+$labels['markread']         = 'Som lese';
+$labels['markunread']       = 'Som ulese';
+$labels['markflagged']      = 'Som flagga';
+$labels['markunflagged']    = 'Som uflagga';
+$labels['moreactions']      = 'Fleire handlingar';
+$labels['more']             = 'Meir';
+$labels['back']             = 'Tilbake';
+$labels['options']          = 'Innstillingar';
+
 $labels['select'] = 'Vel';
 $labels['all'] = 'Alle';
 $labels['none'] = 'Ingen';
-$labels['nonesort'] = 'Ingen';
 $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';
@@ -145,12 +173,14 @@ $labels['expand-all'] = 'Utvid alle';
 $labels['expand-unread'] = 'Utvid ulesne';
 $labels['collapse-all'] = 'Slå saman alle';
 $labels['threaded'] = 'Tråda';
+
 $labels['autoexpand_threads'] = 'Utvid eposttråder';
 $labels['do_expand'] = 'alle tråder';
 $labels['expand_only_unread'] = 'berre med ulesne epostar';
 $labels['fromto'] = 'Sendar/Mottakar';
 $labels['flag'] = 'Flagg';
 $labels['attachment'] = 'Vedlegg';
+$labels['nonesort'] = 'Ingen';
 $labels['sentdate'] = 'Sendtdato';
 $labels['arrival'] = 'Mottaksdato';
 $labels['asc'] = 'Alfabetisk';
@@ -159,147 +189,176 @@ $labels['listcolumns'] = 'Vis kolonner';
 $labels['listsorting'] = 'Sorteringskolonne';
 $labels['listorder'] = 'Sorteringsveg';
 $labels['listmode'] = 'Listevisningmodus';
+
 $labels['folderactions'] = 'Mappehandlingar';
 $labels['compact'] = 'Kompakt';
 $labels['empty'] = 'Tom';
+
 $labels['quota'] = 'Plassbruk';
-$labels['unknown'] = 'ukjend';
-$labels['unlimited'] = 'ubegrensa';
-$labels['quicksearch'] = 'Snøggsøk';
-$labels['resetsearch'] = 'Tilbakestill søk';
-$labels['searchmod'] = 'Søkeutsagn';
-$labels['msgtext'] = 'Heile eposten';
+$labels['unknown']  = 'ukjend';
+$labels['unlimited']  = 'ubegrensa';
+
+$labels['quicksearch']  = 'Snøggsøk';
+$labels['resetsearch']  = 'Tilbakestill søk';
+$labels['searchmod']  = 'Søkeutsagn';
+$labels['msgtext']  = 'Heile eposten';
+$labels['body']  = 'Meldingstekst';
+
 $labels['openinextwin'] = 'Opna i nytt vindauga';
 $labels['emlsave'] = 'Last ned (.eml)';
-$labels['editasnew'] = 'Rediger som ny';
-$labels['send'] = 'Send';
-$labels['sendmessage'] = 'Send meldinga no';
-$labels['savemessage'] = 'Lagra kladd';
-$labels['addattachment'] = 'Legg ved ei fil';
-$labels['charset'] = 'Teiknkoding';
-$labels['editortype'] = 'Redigeringstype';
-$labels['returnreceipt'] = 'Epost-er-lest-kvittering';
-$labels['dsn'] = 'Leveringsstatus';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
+
+// message compose
+$labels['editasnew']      = 'Rediger som ny';
+$labels['send']           = 'Send';
+$labels['sendmessage']    = 'Send meldinga no';
+$labels['savemessage']    = 'Lagra kladd';
+$labels['addattachment']  = 'Legg ved ei fil';
+$labels['charset']        = 'Teiknkoding';
+$labels['editortype']     = 'Redigeringstype';
+$labels['returnreceipt']  = 'Epost-er-lest-kvittering';
+$labels['dsn']            = 'Leveringsstatus';
 $labels['mailreplyintro'] = 'Den $date skreiv $sender:';
 $labels['originalmessage'] = 'Opphavleg melding';
-$labels['editidents'] = 'Redigere identitetar';
-$labels['spellcheck'] = 'Stavekontroll';
+
+$labels['editidents']    = 'Redigere identitetar';
+$labels['spellcheck']    = 'Stavekontroll';
 $labels['checkspelling'] = 'Stavekontroll';
 $labels['resumeediting'] = 'Hald fram redigering';
-$labels['revertto'] = 'Tilbakestill til';
+$labels['revertto']      = 'Tilbakestill til';
+
 $labels['attach'] = 'Legg ved';
 $labels['attachments'] = 'Vedlegg';
 $labels['upload'] = 'Last opp';
 $labels['uploadprogress'] = '$percent ($current frå $total)';
-$labels['close'] = 'Steng';
-$labels['messageoptions'] = 'Meldingsalternativ';
-$labels['low'] = 'Låg';
-$labels['lowest'] = 'Lågast';
-$labels['normal'] = 'Normal';
-$labels['high'] = 'Høg';
+$labels['close']  = 'Steng';
+$labels['messageoptions']  = 'Meldingsalternativ';
+
+$labels['low']     = 'Låg';
+$labels['lowest']  = 'Lågast';
+$labels['normal']  = 'Normal';
+$labels['high']    = 'Høg';
 $labels['highest'] = 'Høgast';
-$labels['nosubject'] = '(ingen emne)';
+
+$labels['nosubject']  = '(ingen emne)';
 $labels['showimages'] = 'Vis bilete';
 $labels['alwaysshow'] = 'Alltid vis bilete frå $sender';
-$labels['isdraft'] = 'Dette er ein kladd.';
-$labels['andnmore'] = '$nr fleire …';
+$labels['isdraft']    = 'Dette er ein kladd.';
+$labels['andnmore']   = '$nr fleire …';
 $labels['togglemoreheaders'] = 'Vis fleire meldingshovud';
 $labels['togglefullheaders'] = 'Veksle vising av meldinga sine headere i råformat';
+
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Vanleg tekst';
 $labels['savesentmessagein'] = 'Lagra sendt epost i';
 $labels['dontsave'] = 'Ikkje lagra';
 $labels['maxuploadsize'] = 'Maksimalt tillatte storleik på filar er $size';
+
 $labels['addcc'] = 'Legg til kopi';
 $labels['addbcc'] = 'Legg til blindkopi';
 $labels['addreplyto'] = 'Legg til svaradressa';
 $labels['addfollowupto'] = 'Legg til oppfylgjing';
+
+// mdn
 $labels['mdnrequest'] = 'Sendaren av denne meldinga ynskjer å få kvittering når du har lest meldinga. Ynskjer du å senda denne kvitteringa?';
 $labels['receiptread'] = 'Svarkvittering (eposten-er-lest-kvittering)';
 $labels['yourmessage'] = 'Dette er ein retur-kvittering for meldinga di.';
 $labels['receiptnote'] = 'Hugs: Denne kvitteringa seier berre at meldinga di vart vist på mottakar sin datamaskin. Det er ingen garanti for at mottakaren faktisk har lese eller forstått innhaldet i meldinga.';
-$labels['name'] = 'Visingsnamn';
-$labels['firstname'] = 'Førenamn';
-$labels['surname'] = 'Etternamn';
-$labels['middlename'] = 'Mellomnamn';
-$labels['nameprefix'] = 'Prefiks';
-$labels['namesuffix'] = 'Suffiks';
-$labels['nickname'] = 'Kallenamn';
-$labels['jobtitle'] = 'Jobbtittel';
-$labels['department'] = 'Avdeling';
-$labels['gender'] = 'Kjønn';
-$labels['maidenname'] = 'Pikenamn';
-$labels['email'] = 'E-post';
-$labels['phone'] = 'Telefon';
-$labels['address'] = 'Adresse';
-$labels['street'] = 'Gate';
-$labels['locality'] = 'By';
-$labels['zipcode'] = 'Postnummer';
-$labels['region'] = 'Stat/provins';
-$labels['country'] = 'Land';
-$labels['birthday'] = 'Fødselsdag';
-$labels['anniversary'] = 'Bryllaupsdag';
-$labels['website'] = 'Internettside';
+
+// address boook
+$labels['name']         = 'Visingsnamn';
+$labels['firstname']    = 'Førenamn';
+$labels['surname']      = 'Etternamn';
+$labels['middlename']   = 'Mellomnamn';
+$labels['nameprefix']   = 'Prefiks';
+$labels['namesuffix']   = 'Suffiks';
+$labels['nickname']     = 'Kallenamn';
+$labels['jobtitle']     = 'Jobbtittel';
+$labels['department']   = 'Avdeling';
+$labels['gender']       = 'Kjønn';
+$labels['maidenname']   = 'Pikenamn';
+$labels['email']        = 'E-post';
+$labels['phone']        = 'Telefon';
+$labels['address']      = 'Adresse';
+$labels['street']       = 'Gate';
+$labels['locality']     = 'By';
+$labels['zipcode']      = 'Postnummer';
+$labels['region']       = 'Stat/provins';
+$labels['country']      = 'Land';
+$labels['birthday']     = 'Fødselsdag';
+$labels['anniversary']  = 'Bryllaupsdag';
+$labels['website']      = 'Internettside';
 $labels['instantmessenger'] = 'Lynmelding';
 $labels['notes'] = 'Notatar';
-$labels['male'] = 'Mann';
+$labels['male']   = 'Mann';
 $labels['female'] = 'Kvinne';
 $labels['manager'] = 'Leiar';
 $labels['assistant'] = 'Assistent';
-$labels['typeassistant'] = 'Assistent';
 $labels['spouse'] = 'Ektefelle';
 $labels['allfields'] = 'Alle felt';
 $labels['search'] = 'Søk';
 $labels['advsearch'] = 'Avansert søk';
 $labels['advanced'] = 'Avansert';
 $labels['other'] = 'Andre';
-$labels['typeother'] = 'Andre';
-$labels['typehome'] = 'Heim';
-$labels['typework'] = 'Jobb';
-$labels['typemobile'] = 'Mobil';
-$labels['typemain'] = 'Hovud';
-$labels['typehomefax'] = 'Heimefax';
-$labels['typeworkfax'] = 'Jobbfax';
-$labels['typecar'] = 'Bil';
-$labels['typepager'] = 'Personsøkjar';
-$labels['typevideo'] = 'VIdeo';
-$labels['typehomepage'] = 'Heimeside';
+
+$labels['typehome']   = 'Heim';
+$labels['typework']   = 'Jobb';
+$labels['typeother']  = 'Andre';
+$labels['typemobile']  = 'Mobil';
+$labels['typemain']  = 'Hovud';
+$labels['typehomefax']  = 'Heimefax';
+$labels['typeworkfax']  = 'Jobbfax';
+$labels['typecar']  = 'Bil';
+$labels['typepager']  = 'Personsøkjar';
+$labels['typevideo']  = 'VIdeo';
+$labels['typeassistant']  = 'Assistent';
+$labels['typehomepage']  = 'Heimeside';
 $labels['typeblog'] = 'Blogg';
 $labels['typeprofile'] = 'Profil';
+
 $labels['addfield'] = 'Legg til felt...';
 $labels['addcontact'] = 'Legg til ny kontakt';
 $labels['editcontact'] = 'Redigere kontakt';
 $labels['contacts'] = 'Kontakter';
 $labels['contactproperties'] = 'Eigenskapar';
 $labels['personalinfo'] = 'Personleg informasjon';
-$labels['edit'] = 'Redigere';
+
+$labels['edit']   = 'Redigere';
 $labels['cancel'] = 'Avbryt';
-$labels['save'] = 'Lagre';
+$labels['save']   = 'Lagre';
 $labels['delete'] = 'Slette';
 $labels['rename'] = 'Gi nytt namn';
 $labels['addphoto'] = 'Legg til';
 $labels['replacephoto'] = 'Erstatt';
 $labels['uploadphoto'] = 'Last opp bilete';
-$labels['newcontact'] = 'Opprett nytt kontaktkort';
-$labels['deletecontact'] = 'Slett valde kontaktar';
-$labels['composeto'] = 'Ny melding til';
+
+$labels['newcontact']     = 'Opprett nytt kontaktkort';
+$labels['deletecontact']  = 'Slett valde kontaktar';
+$labels['composeto']      = 'Ny melding til';
 $labels['contactsfromto'] = 'Kontaktar $from til $to av $count';
-$labels['print'] = 'Skriv ut';
-$labels['export'] = 'Eksport';
-$labels['exportvcards'] = 'Eksporter kontaktar i vCard-format';
+$labels['print']          = 'Skriv ut';
+$labels['export']         = 'Eksport';
+$labels['exportall']      = 'Eksporter alle';
+$labels['exportsel']      = 'Eksporter valde';
+$labels['exportvcards']   = 'Eksporter kontaktar i vCard-format';
 $labels['newcontactgroup'] = 'Lag ny kontaktgruppe';
-$labels['grouprename'] = 'Endre namn på gruppe';
-$labels['groupdelete'] = 'Slett gruppe';
+$labels['grouprename']    = 'Endre namn på gruppe';
+$labels['groupdelete']    = 'Slett gruppe';
 $labels['groupremoveselected'] = 'Fjern valde kontaktar frå gruppe';
-$labels['previouspage'] = 'Førre side';
-$labels['firstpage'] = 'Første side';
-$labels['nextpage'] = 'Neste side';
-$labels['lastpage'] = 'Siste side';
+
+$labels['previouspage']   = 'Førre side';
+$labels['firstpage']      = 'Første side';
+$labels['nextpage']       = 'Neste side';
+$labels['lastpage']       = 'Siste side';
+
 $labels['group'] = 'Gruppe';
 $labels['groups'] = 'Gruppar';
 $labels['personaladrbook'] = 'Personlege adresser';
+
 $labels['searchsave'] = 'Lagre søk';
 $labels['searchdelete'] = 'Slett søk';
+
 $labels['import'] = 'Importer';
 $labels['importcontacts'] = 'Importer kontaktar';
 $labels['importfromfile'] = 'Importer frå fil:';
@@ -307,35 +366,43 @@ $labels['importtarget'] = 'Legg til kontakter i adresseboka';
 $labels['importreplace'] = 'Byt ut heile adresseboka';
 $labels['importdesc'] = 'Du kan laste opp kontaktar frå ei eksisterande adressebok.<br/>Vi støttar adressebøker i formata <a href="http://no.wikipedia.org/wiki/VCard">vCard</a> og CSV (kommaseparert).';
 $labels['done'] = 'Ferdig';
+
+// settings
 $labels['settingsfor'] = 'Innstillingar for';
 $labels['about'] = 'Om';
 $labels['preferences'] = 'Innstillingar';
 $labels['userpreferences'] = 'Brukarinnstillingar';
 $labels['editpreferences'] = 'Redigere brukarinnstillingar';
+
 $labels['identities'] = 'Identitetar';
 $labels['manageidentities'] = 'Administrere identitetar for denne kontoen';
 $labels['newidentity'] = 'Ny identitet';
+
 $labels['newitem'] = 'Nytt element';
 $labels['edititem'] = 'Redigere element';
+
 $labels['preferhtml'] = 'Føretrekk HTML';
 $labels['defaultcharset'] = 'Standard karaktersett (charset)';
 $labels['htmlmessage'] = 'HTML-melding';
+$labels['messagepart'] = 'Del';
+$labels['digitalsig'] = 'Digital signatur';
 $labels['dateformat'] = 'Datoformat';
 $labels['timeformat'] = 'Tidsformat';
 $labels['prettydate'] = 'Pene datoar';
-$labels['setdefault'] = 'Set som standard';
-$labels['autodetect'] = 'Automatisk';
-$labels['language'] = 'Språk';
-$labels['timezone'] = 'Tidssone';
-$labels['pagesize'] = 'Rader pr side';
+$labels['setdefault']  = 'Set som standard';
+$labels['autodetect']  = 'Automatisk';
+$labels['language']  = 'Språk';
+$labels['timezone']  = 'Tidssone';
+$labels['pagesize']  = 'Rader pr side';
 $labels['signature'] = 'Signartur';
-$labels['dstactive'] = 'Sumartid';
+$labels['dstactive']  = 'Sumartid';
 $labels['showinextwin'] = 'Opna melding i nytt vindauge';
 $labels['composeextwin'] = 'Skriv i nytt vindauge';
 $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';
@@ -358,11 +425,11 @@ $labels['showremoteimages'] = 'Vis eksterne bilete';
 $labels['fromknownsenders'] = 'frå kjende sendarar';
 $labels['always'] = 'alltid';
 $labels['showinlineimages'] = 'Vis vedlagte bilete under meldinga';
-$labels['autosavedraft'] = 'Lagra kladd automatisk';
-$labels['everynminutes'] = 'kvart $n minutt';
-$labels['refreshinterval'] = 'Oppdater (sjekk for nye meldingar osv.)';
-$labels['never'] = 'aldri';
-$labels['immediately'] = 'med ein gong';
+$labels['autosavedraft']  = 'Lagra kladd automatisk';
+$labels['everynminutes']  = 'kvart $n minutt';
+$labels['refreshinterval']  = 'Oppdater (sjekk for nye meldingar osv.)';
+$labels['never']  = 'aldri';
+$labels['immediately']  = 'med ein gong';
 $labels['messagesdisplaying'] = 'Meldingar som viser';
 $labels['messagescomposition'] = 'Meldingar sin komposisjon';
 $labels['mimeparamfolding'] = 'Vedleggsnamn';
@@ -389,12 +456,9 @@ $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';
+$labels['previewpanemarkread']  = 'Merk forehandsviste epostar som leste';
+$labels['afternseconds']  = 'etter $n sekund';
 $labels['reqmdn'] = 'Alltid be om svarkvittering';
 $labels['reqdsn'] = 'Alltid be om leveringsstatus';
 $labels['replysamefolder'] = 'Legg svar i mappa til meldinga det vert svara på';
@@ -411,13 +475,15 @@ $labels['mailtoprotohandler'] = 'Registrer protokollhandsaming for mailto-lenkje
 $labels['forwardmode'] = 'Meldingar vidaresendast';
 $labels['inline'] = 'i teksten';
 $labels['asattachment'] = 'som vedlegg';
-$labels['folder'] = 'Mappe';
-$labels['foldername'] = 'Mappenamn';
-$labels['subscribed'] = 'Abonnert';
+
+$labels['folder']  = 'Mappe';
+$labels['folders']  = 'Mapper';
+$labels['foldername']  = 'Mappenamn';
+$labels['subscribed']  = 'Abonnert';
 $labels['messagecount'] = 'Meldingar';
-$labels['create'] = 'Opprette';
-$labels['createfolder'] = 'Opprett ny mappe';
-$labels['managefolders'] = 'Mappehandsaming';
+$labels['create']  = 'Opprette';
+$labels['createfolder']  = 'Opprett ny mappe';
+$labels['managefolders']  = 'Mappehandsaming';
 $labels['specialfolders'] = 'Spesialmapper';
 $labels['properties'] = 'Eigenskapar';
 $labels['folderproperties'] = 'Eigenskapar for mappe';
@@ -427,23 +493,29 @@ $labels['info'] = 'Informasjon';
 $labels['getfoldersize'] = 'Klikk for å få mappestørrelse';
 $labels['changesubscription'] = 'Klikk for å endre abonnement';
 $labels['foldertype'] = 'Mappetype';
-$labels['personalfolder'] = 'Privat mappe';
-$labels['otherfolder'] = 'Annan brukar si mappe';
-$labels['sharedfolder'] = 'Offentleg mappe';
+$labels['personalfolder']  = 'Privat mappe';
+$labels['otherfolder']  = 'Annan brukar si mappe';
+$labels['sharedfolder']  = 'Offentleg mappe';
+
 $labels['sortby'] = 'Sorter etter';
-$labels['sortasc'] = 'Sorter stigande';
+$labels['sortasc']  = 'Sorter stigande';
 $labels['sortdesc'] = 'Sorter søkkjande';
 $labels['undo'] = 'Gjer om';
+
 $labels['installedplugins'] = 'Installerte tillegg';
 $labels['plugin'] = 'Tilleggsmodul';
 $labels['version'] = 'Versjon';
 $labels['source'] = 'Kjelde';
 $labels['license'] = 'Lisens';
 $labels['support'] = 'Få hjelp';
+
+// units
 $labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
 $labels['GB'] = 'GB';
+
+// character sets
 $labels['unicode'] = 'UNicode';
 $labels['english'] = 'Engelsk';
 $labels['westerneuropean'] = 'Vest-europesik';
@@ -463,3 +535,4 @@ $labels['japanese'] = 'Japansk';
 $labels['korean'] = 'Koreansk';
 $labels['chinese'] = 'Kinesisk';
 
+?>
diff --git a/program/localization/nn_NO/messages.inc b/program/localization/nn_NO/messages.inc
index dbfc396db..3dce30b98 100644
--- a/program/localization/nn_NO/messages.inc
+++ b/program/localization/nn_NO/messages.inc
@@ -2,20 +2,23 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/nn_NO/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Åsmund Skjæveland <aasmunds@ulrik.uio.no>                   |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['errortitle'] = 'Noko gjekk feil.';
-$messages['loginfailed'] = 'Feil ved innlogging.';
+$messages['errortitle']  = 'Noko gjekk feil.';
+$messages['loginfailed']  = 'Feil ved innlogging.';
 $messages['cookiesdisabled'] = 'Nettlesaren din tillet ikkje informasjonskapslar (cookies).';
 $messages['sessionerror'] = 'Økta di er ugyldig eller har gått ut på tid.';
 $messages['storageerror'] = 'Tilkoplinga til lagringstenaren vart mislukka.';
@@ -25,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.';
@@ -57,11 +62,11 @@ $messages['errormoving'] = 'Klarte ikkje flytte meldinga(r).';
 $messages['errorcopying'] = 'Klarte ikkje kopiera meldinga(r).';
 $messages['errordeleting'] = 'Klarte ikkje sletta meldinga(r).';
 $messages['errormarking'] = 'Klarte ikkje markera meldinga(r).';
-$messages['deletecontactconfirm'] = 'Sletta kontakt(ar)?';
-$messages['deletegroupconfirm'] = 'Vil du sletta den valde gruppa?';
+$messages['deletecontactconfirm']  = 'Sletta kontakt(ar)?';
+$messages['deletegroupconfirm']  = 'Vil du sletta den valde gruppa?';
 $messages['deletemessagesconfirm'] = 'Sletta melding(ar)?';
-$messages['deletefolderconfirm'] = 'Sletta mappa?';
-$messages['purgefolderconfirm'] = 'Sletta alle meldingane i denne mappa?';
+$messages['deletefolderconfirm']  = 'Sletta mappa?';
+$messages['purgefolderconfirm']  = 'Sletta alle meldingane i denne mappa?';
 $messages['contactdeleting'] = 'Slettar kontakt(ar) …';
 $messages['groupdeleting'] = 'Slettar gruppe …';
 $messages['folderdeleting'] = 'Slettar mappe …';
@@ -70,11 +75,11 @@ $messages['foldersubscribing'] = 'Abonnerer på mappe …';
 $messages['folderunsubscribing'] = 'Avsluttar mappeabonnement …';
 $messages['formincomplete'] = 'Skjemaet var ikkje fullstendig fylt ut.';
 $messages['noemailwarning'] = 'Skriv ei gyldig e-postadresse.';
-$messages['nonamewarning'] = 'Skriv eit namn.';
+$messages['nonamewarning']  = 'Skriv eit namn.';
 $messages['nopagesizewarning'] = 'Oppgje sidestorleik.';
 $messages['nosenderwarning'] = 'Skriv inn avsendar si e-postadresse';
 $messages['norecipientwarning'] = 'Skriv minst ein mottakar.';
-$messages['nosubjectwarning'] = 'Emnefeltet er tomt. Vil du skriva eitt emne no?';
+$messages['nosubjectwarning']  = 'Emnefeltet er tomt. Vil du skriva eitt emne no?';
 $messages['nobodywarning'] = 'Senda meldinga utan tekst?';
 $messages['notsentwarning'] = 'Meldinga er ikkje sendt. Vil du kasta ho?';
 $messages['noldapserver'] = 'Vel LDAP-tenar å søkja i.';
@@ -163,3 +168,4 @@ $messages['messagetoobig'] = 'Meldingsdelen er for stor til å prosesserast.';
 $messages['attachmentvalidationerror'] = 'ÅTVARING: Dette vedlegget er mistenkjeleg fordi det er av ein  type som ikkje stemmer med det som er deklarert i meldinga. Viss du ikkje stolar på avsendaren bør du ikkje opna det i nettlesaren. Det kan ha skadeleg innhald.<br/><br/><em>Venta: $expected; fann: $detected</em>';
 $messages['noscriptwarning'] = 'NB: Denne webmail-klienten krev JavaScript. Skru på JavaScript i nettlesaren din for å kunna bruka klienten.';
 
+?>
diff --git a/program/localization/pl_PL/labels.inc b/program/localization/pl_PL/labels.inc
index 9f090400e..426ac381e 100644
--- a/program/localization/pl_PL/labels.inc
+++ b/program/localization/pl_PL/labels.inc
@@ -2,59 +2,78 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/pl_PL/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Aleksander Machniak <alec@alec.pl>                            |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = 'Witamy w $product';
-$labels['username'] = 'Nazwa';
-$labels['password'] = 'Hasło';
-$labels['server'] = 'Serwer';
-$labels['login'] = 'Zaloguj';
-$labels['logout'] = 'Wyloguj';
-$labels['mail'] = 'Poczta';
+
+// login page
+$labels['welcome']   = 'Witamy w $product';
+$labels['username']  = 'Nazwa';
+$labels['password']  = 'Hasło';
+$labels['server']    = 'Serwer';
+$labels['login']     = 'Zaloguj';
+
+// taskbar
+$labels['logout']   = 'Wyloguj';
+$labels['mail']     = 'Poczta';
 $labels['settings'] = 'Ustawienia';
 $labels['addressbook'] = 'Książka adresowa';
-$labels['inbox'] = 'Odebrane';
+
+// mailbox names
+$labels['inbox']  = 'Odebrane';
 $labels['drafts'] = 'Kopie robocze';
-$labels['sent'] = 'Wysłane';
-$labels['trash'] = 'Kosz';
-$labels['junk'] = 'Spam';
+$labels['sent']   = 'Wysłane';
+$labels['trash']  = 'Kosz';
+$labels['junk']   = 'Spam';
+
+// message listing
 $labels['subject'] = 'Temat';
-$labels['from'] = 'Od';
-$labels['to'] = 'Do';
-$labels['cc'] = 'Kopia';
-$labels['bcc'] = 'Ukryta kopia';
+$labels['from']    = 'Od';
+$labels['sender']  = 'Nadawca';
+$labels['to']      = 'Do';
+$labels['cc']      = 'Kopia';
+$labels['bcc']     = 'Ukryta kopia';
 $labels['replyto'] = 'Odpowiedź do';
 $labels['followupto'] = 'Kontynuacja do';
-$labels['date'] = 'Data';
-$labels['size'] = 'Rozmiar';
+$labels['date']    = 'Data';
+$labels['size']    = 'Rozmiar';
 $labels['priority'] = 'Priorytet';
 $labels['organization'] = 'Organizacja';
 $labels['readstatus'] = 'Przeczytano';
 $labels['listoptions'] = 'Opcje listy...';
+
 $labels['mailboxlist'] = 'Foldery';
-$labels['folders'] = 'Foldery';
 $labels['messagesfromto'] = 'Wiadomości od $from do $to z $count';
 $labels['threadsfromto'] = 'Wątki od $from do $to z $count';
 $labels['messagenrof'] = 'Wiadomość $nr z $count';
 $labels['fromtoshort'] = '$from - $to z $count';
-$labels['copy'] = 'Kopiuj';
-$labels['move'] = 'Przenieś';
-$labels['moveto'] = 'Przenieś do...';
+
+$labels['copy']     = 'Kopiuj';
+$labels['move']     = 'Przenieś';
+$labels['moveto']   = 'Przenieś do...';
 $labels['download'] = 'Pobierz';
+$labels['open']     = 'Otwórz';
 $labels['showattachment'] = 'Pokaż';
+$labels['showanyway'] = 'Pokaż';
+
 $labels['filename'] = 'Nazwa pliku';
 $labels['filesize'] = 'Rozmiar pliku';
+
 $labels['addtoaddressbook'] = 'Dodaj do książki adresowej';
+
+// weekdays short
 $labels['sun'] = 'Nd';
 $labels['mon'] = 'Pn';
 $labels['tue'] = 'Wt';
@@ -62,78 +81,88 @@ $labels['wed'] = 'Śr';
 $labels['thu'] = 'Czw';
 $labels['fri'] = 'Pt';
 $labels['sat'] = 'Sb';
-$labels['sunday'] = 'Niedziela';
-$labels['monday'] = 'Poniedziałek';
-$labels['tuesday'] = 'Wtorek';
+
+// weekdays long
+$labels['sunday']    = 'Niedziela';
+$labels['monday']    = 'Poniedziałek';
+$labels['tuesday']   = 'Wtorek';
 $labels['wednesday'] = 'Środa';
-$labels['thursday'] = 'Czwartek';
-$labels['friday'] = 'Piątek';
-$labels['saturday'] = 'Sobota';
-$labels['jan'] = 'sty';
-$labels['feb'] = 'lut';
-$labels['mar'] = 'mar';
-$labels['apr'] = 'Kwi';
-$labels['may'] = 'Maj';
-$labels['longmay'] = 'Maj';
-$labels['jun'] = 'Cze';
-$labels['jul'] = 'Lip';
-$labels['aug'] = 'Sie';
-$labels['sep'] = 'Wrz';
-$labels['oct'] = 'Paź';
-$labels['nov'] = 'Lis';
-$labels['dec'] = 'Gru';
-$labels['longjan'] = 'styczeń';
-$labels['longfeb'] = 'luty';
-$labels['longmar'] = 'marzec';
-$labels['longapr'] = 'kwiecień';
-$labels['longjun'] = 'czerwiec';
-$labels['longjul'] = 'lipiec';
-$labels['longaug'] = 'sierpień';
-$labels['longsep'] = 'wrzesień';
-$labels['longoct'] = 'październik';
-$labels['longnov'] = 'listopad';
-$labels['longdec'] = 'grudzień';
+$labels['thursday']  = 'Czwartek';
+$labels['friday']    = 'Piątek';
+$labels['saturday']  = 'Sobota';
+
+// months short
+$labels['jan']	= 'sty';
+$labels['feb']	= 'lut';
+$labels['mar']	= 'mar';
+$labels['apr']	= 'Kwi';
+$labels['may']	= 'Maj';
+$labels['jun']	= 'Cze';
+$labels['jul'] 	= 'Lip';
+$labels['aug']	= 'Sie';
+$labels['sep']	= 'Wrz';
+$labels['oct']	= 'Paź';
+$labels['nov']	= 'Lis';
+$labels['dec']	= 'Gru';
+
+// months long
+$labels['longjan']	= 'styczeń';
+$labels['longfeb']	= 'luty';
+$labels['longmar']	= 'marzec';
+$labels['longapr']	= 'kwiecień';
+$labels['longmay']	= 'Maj';
+$labels['longjun']	= 'czerwiec';
+$labels['longjul']	= 'lipiec';
+$labels['longaug']	= 'sierpień';
+$labels['longsep']	= 'wrzesień';
+$labels['longoct']	= 'październik';
+$labels['longnov']	= 'listopad';
+$labels['longdec']	= 'grudzień';
+
 $labels['today'] = 'Dzisiaj';
-$labels['refresh'] = 'Odśwież';
-$labels['checkmail'] = 'Sprawdź skrzynkę';
-$labels['compose'] = 'Utwórz';
-$labels['writenewmessage'] = 'Utwórz nową wiadomość';
-$labels['reply'] = 'Odpowiedz';
-$labels['replytomessage'] = 'Odpowiedz nadawcy';
+
+// toolbar buttons
+$labels['refresh']          = 'Odśwież';
+$labels['checkmail']        = 'Sprawdź skrzynkę';
+$labels['compose']          = 'Utwórz';
+$labels['writenewmessage']  = 'Utwórz nową wiadomość';
+$labels['reply']            = 'Odpowiedz';
+$labels['replytomessage']   = 'Odpowiedz nadawcy';
 $labels['replytoallmessage'] = 'Odpowiedz wszystkim';
-$labels['replyall'] = 'Odpowiedz wszystkim';
-$labels['replylist'] = 'Odpowiedz na listę';
-$labels['forward'] = 'Przekaż';
-$labels['forwardinline'] = 'Prześlij w treści';
+$labels['replyall']         = 'Odpowiedz wszystkim';
+$labels['replylist']        = 'Odpowiedz na listę';
+$labels['forward']          = 'Przekaż';
+$labels['forwardinline']    = 'Prześlij w treści';
 $labels['forwardattachment'] = 'Prześlij jako załącznik';
-$labels['forwardmessage'] = 'Prześlij dalej';
-$labels['deletemessage'] = 'Usuń wiadomości';
+$labels['forwardmessage']   = 'Prześlij dalej';
+$labels['deletemessage']    = 'Usuń wiadomości';
 $labels['movemessagetotrash'] = 'Przenieś wiadomości do Kosza';
-$labels['printmessage'] = 'Drukuj wiadomość';
-$labels['previousmessage'] = 'Poprzednia wiadomość';
-$labels['firstmessage'] = 'Pierwsza wiadomość';
-$labels['nextmessage'] = 'Następna wiadomość';
-$labels['lastmessage'] = 'Ostatnia wiadomość';
-$labels['backtolist'] = 'Pokaż listę wiadomości';
-$labels['viewsource'] = 'Pokaż źródło';
-$labels['mark'] = 'Oznacz';
-$labels['markmessages'] = 'Oznacz wiadomości';
-$labels['markread'] = 'Jako przeczytane';
-$labels['markunread'] = 'Jako nieprzeczytane';
-$labels['markflagged'] = 'Jako oflagowane';
-$labels['markunflagged'] = 'Jako nieoflagowane';
-$labels['moreactions'] = 'Więcej akcji...';
-$labels['more'] = 'Więcej';
-$labels['back'] = 'Wstecz';
-$labels['options'] = 'Ustawienia';
+$labels['printmessage']     = 'Drukuj wiadomość';
+$labels['previousmessage']  = 'Poprzednia wiadomość';
+$labels['firstmessage']     = 'Pierwsza wiadomość';
+$labels['nextmessage']      = 'Następna wiadomość';
+$labels['lastmessage']      = 'Ostatnia wiadomość';
+$labels['backtolist']       = 'Pokaż listę wiadomości';
+$labels['viewsource']       = 'Pokaż źródło';
+$labels['mark']             = 'Oznacz';
+$labels['markmessages']     = 'Oznacz wiadomości';
+$labels['markread']         = 'Jako przeczytane';
+$labels['markunread']       = 'Jako nieprzeczytane';
+$labels['markflagged']      = 'Jako oflagowane';
+$labels['markunflagged']    = 'Jako nieoflagowane';
+$labels['moreactions']      = 'Więcej akcji...';
+$labels['more']             = 'Więcej';
+$labels['back']             = 'Wstecz';
+$labels['options']          = 'Ustawienia';
+
 $labels['select'] = 'Zaznacz';
 $labels['all'] = 'Wszystkie';
 $labels['none'] = 'Brak';
-$labels['nonesort'] = 'Brak';
 $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óć';
@@ -144,12 +173,14 @@ $labels['expand-all'] = 'Rozwiń wszystkie';
 $labels['expand-unread'] = 'Rozwiń nieprzeczytane';
 $labels['collapse-all'] = 'Zwiń wszystkie';
 $labels['threaded'] = 'Powątkowane';
+
 $labels['autoexpand_threads'] = 'Rozwijaj wątki';
 $labels['do_expand'] = 'wszystkie';
 $labels['expand_only_unread'] = 'tylko nieprzeczytane';
 $labels['fromto'] = 'Od/Do';
 $labels['flag'] = 'Flaga';
 $labels['attachment'] = 'Załącznik';
+$labels['nonesort'] = 'Brak';
 $labels['sentdate'] = 'Data wysyłki';
 $labels['arrival'] = 'Data odbioru';
 $labels['asc'] = 'rosnąco';
@@ -158,147 +189,176 @@ $labels['listcolumns'] = 'Kolumny';
 $labels['listsorting'] = 'Porządek sortowania';
 $labels['listorder'] = 'Kierunek sortowania';
 $labels['listmode'] = 'Typ listy';
+
 $labels['folderactions'] = 'Działania na folderach...';
 $labels['compact'] = 'Porządkuj';
 $labels['empty'] = 'Opróżnij';
+
 $labels['quota'] = 'Użyte miejsce';
-$labels['unknown'] = 'nieznane';
-$labels['unlimited'] = 'bez limitu';
-$labels['quicksearch'] = 'Szybkie wyszukiwanie';
-$labels['resetsearch'] = 'Wyczyść filtr';
-$labels['searchmod'] = 'Parametry wyszukiwania';
-$labels['msgtext'] = 'Cała wiadomość';
+$labels['unknown']  = 'nieznane';
+$labels['unlimited']  = 'bez limitu';
+
+$labels['quicksearch']  = 'Szybkie wyszukiwanie';
+$labels['resetsearch']  = 'Wyczyść filtr';
+$labels['searchmod']  = 'Parametry wyszukiwania';
+$labels['msgtext']  = 'Cała wiadomość';
+$labels['body']  = 'Treść';
+
 $labels['openinextwin'] = 'Otwórz w nowym oknie';
 $labels['emlsave'] = 'Pobierz (.eml)';
-$labels['editasnew'] = 'Edytuj jako nową';
-$labels['send'] = 'Wyślij';
-$labels['sendmessage'] = 'Wyślij teraz';
-$labels['savemessage'] = 'Zapisz kopię roboczą';
-$labels['addattachment'] = 'Dołącz plik';
-$labels['charset'] = 'Kodowanie znaków';
-$labels['editortype'] = 'Typ edytora';
-$labels['returnreceipt'] = 'Potwierdzenie odbioru';
-$labels['dsn'] = 'Status dostarczenia (DSN)';
+$labels['changeformattext'] = 'Wyświetl w formacie tekstowym';
+$labels['changeformathtml'] = 'Wyświetl w formacie HTML';
+
+// message compose
+$labels['editasnew']      = 'Edytuj jako nową';
+$labels['send']           = 'Wyślij';
+$labels['sendmessage']    = 'Wyślij teraz';
+$labels['savemessage']    = 'Zapisz kopię roboczą';
+$labels['addattachment']  = 'Dołącz plik';
+$labels['charset']        = 'Kodowanie znaków';
+$labels['editortype']     = 'Typ edytora';
+$labels['returnreceipt']  = 'Potwierdzenie odbioru';
+$labels['dsn']            = 'Status dostarczenia (DSN)';
 $labels['mailreplyintro'] = 'W dniu $date, $sender napisał(a):';
 $labels['originalmessage'] = 'Wiadomość oryginalna';
-$labels['editidents'] = 'Edytuj tożsamości';
-$labels['spellcheck'] = 'Pisownia';
+
+$labels['editidents']    = 'Edytuj tożsamości';
+$labels['spellcheck']    = 'Pisownia';
 $labels['checkspelling'] = 'Sprawdź pisownię';
 $labels['resumeediting'] = 'Zakończ sprawdzanie pisowni';
-$labels['revertto'] = 'Powróć do';
+$labels['revertto']      = 'Powróć do';
+
 $labels['attach'] = 'Załącz';
 $labels['attachments'] = 'Załączniki';
 $labels['upload'] = 'Prześlij';
 $labels['uploadprogress'] = '$percent ($current z $total)';
-$labels['close'] = 'Zamknij';
-$labels['messageoptions'] = 'Opcje wiadomości...';
-$labels['low'] = 'Bardzo niski';
-$labels['lowest'] = 'Niski';
-$labels['normal'] = 'Normalny';
-$labels['high'] = 'Wysoki';
+$labels['close']  = 'Zamknij';
+$labels['messageoptions']  = 'Opcje wiadomości...';
+
+$labels['low']     = 'Bardzo niski';
+$labels['lowest']  = 'Niski';
+$labels['normal']  = 'Normalny';
+$labels['high']    = 'Wysoki';
 $labels['highest'] = 'Bardzo wysoki';
-$labels['nosubject'] = '(brak tematu)';
+
+$labels['nosubject']  = '(brak tematu)';
 $labels['showimages'] = 'Wyświetl obrazki';
 $labels['alwaysshow'] = 'Zawsze wyświetlaj obrazki od $sender';
-$labels['isdraft'] = 'To jest kopia robocza wiadomości.';
-$labels['andnmore'] = '$nr więcej...';
+$labels['isdraft']    = 'To jest kopia robocza wiadomości.';
+$labels['andnmore']   = '$nr więcej...';
 $labels['togglemoreheaders'] = 'Pokaż więcej nagłówków wiadomości';
 $labels['togglefullheaders'] = 'Przełącz podgląd nagłówków wiadomości';
+
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Zwykły tekst';
 $labels['savesentmessagein'] = 'Zapisz wiadomość w';
 $labels['dontsave'] = 'nie zapisuj';
 $labels['maxuploadsize'] = 'Maksymalny rozmiar pliku to $size';
+
 $labels['addcc'] = 'Dodaj Cc';
 $labels['addbcc'] = 'Dodaj Bcc';
 $labels['addreplyto'] = 'Dodaj Reply-To';
 $labels['addfollowupto'] = 'Dodaj Followup-To';
+
+// mdn
 $labels['mdnrequest'] = 'Nadawca zażądał potwierdzenia przeczytania tej wiadomości. Czy chcesz go powiadomić?';
 $labels['receiptread'] = 'Potwierdzenie otrzymania';
 $labels['yourmessage'] = 'To jest potwierdzenie dostarczenia Twojej wiadomości';
 $labels['receiptnote'] = 'Uwaga: To potwierdzenie dostarczenia wiadomości oznacza tylko, że wiadomość została wyświetlona na komputerze adresata. Nie ma żadnej gwarancji, że odbiorca przeczytał czy też zrozumiał treść wiadomości.';
-$labels['name'] = 'Nazwa';
-$labels['firstname'] = 'Imię';
-$labels['surname'] = 'Nazwisko';
-$labels['middlename'] = 'Drugie imię';
-$labels['nameprefix'] = 'Prefiks';
-$labels['namesuffix'] = 'Sufiks';
-$labels['nickname'] = 'Pseudonim';
-$labels['jobtitle'] = 'Zawód';
-$labels['department'] = 'Oddział';
-$labels['gender'] = 'Płeć';
-$labels['maidenname'] = 'N. panieńskie';
-$labels['email'] = 'E-Mail';
-$labels['phone'] = 'Telefon';
-$labels['address'] = 'Adres';
-$labels['street'] = 'Ulica';
-$labels['locality'] = 'Miasto';
-$labels['zipcode'] = 'Kod';
-$labels['region'] = 'Region';
-$labels['country'] = 'Kraj';
-$labels['birthday'] = 'Urodziny';
-$labels['anniversary'] = 'Jubileusz';
-$labels['website'] = 'Strona internetowa';
+
+// address boook
+$labels['name']         = 'Nazwa';
+$labels['firstname']    = 'Imię';
+$labels['surname']      = 'Nazwisko';
+$labels['middlename']   = 'Drugie imię';
+$labels['nameprefix']   = 'Prefiks';
+$labels['namesuffix']   = 'Sufiks';
+$labels['nickname']     = 'Pseudonim';
+$labels['jobtitle']     = 'Zawód';
+$labels['department']   = 'Oddział';
+$labels['gender']       = 'Płeć';
+$labels['maidenname']   = 'N. panieńskie';
+$labels['email']        = 'E-Mail';
+$labels['phone']        = 'Telefon';
+$labels['address']      = 'Adres';
+$labels['street']       = 'Ulica';
+$labels['locality']     = 'Miasto';
+$labels['zipcode']      = 'Kod';
+$labels['region']       = 'Region';
+$labels['country']      = 'Kraj';
+$labels['birthday']     = 'Urodziny';
+$labels['anniversary']  = 'Jubileusz';
+$labels['website']      = 'Strona internetowa';
 $labels['instantmessenger'] = 'Komunikator';
 $labels['notes'] = 'Notatki';
-$labels['male'] = 'mężczyzna';
+$labels['male']   = 'mężczyzna';
 $labels['female'] = 'kobieta';
 $labels['manager'] = 'Kierownik';
 $labels['assistant'] = 'Asystent';
-$labels['typeassistant'] = 'Asystent';
 $labels['spouse'] = 'Małżonek';
 $labels['allfields'] = 'Wszystkie pola';
 $labels['search'] = 'Szukaj';
 $labels['advsearch'] = 'Wyszukiwanie zaawansowane';
 $labels['advanced'] = 'Zaawansowane';
 $labels['other'] = 'Inne';
-$labels['typeother'] = 'Inne';
-$labels['typehome'] = 'Dom';
-$labels['typework'] = 'Praca';
-$labels['typemobile'] = 'Komórkowy';
-$labels['typemain'] = 'Główny';
-$labels['typehomefax'] = 'Fax domowy';
-$labels['typeworkfax'] = 'Fax firmowy';
-$labels['typecar'] = 'Samochód';
-$labels['typepager'] = 'Pager';
-$labels['typevideo'] = 'Wideo';
-$labels['typehomepage'] = 'Strona domowa';
+
+$labels['typehome']   = 'Dom';
+$labels['typework']   = 'Praca';
+$labels['typeother']  = 'Inne';
+$labels['typemobile']  = 'Komórkowy';
+$labels['typemain']  = 'Główny';
+$labels['typehomefax']  = 'Fax domowy';
+$labels['typeworkfax']  = 'Fax firmowy';
+$labels['typecar']  = 'Samochód';
+$labels['typepager']  = 'Pager';
+$labels['typevideo']  = 'Wideo';
+$labels['typeassistant']  = 'Asystent';
+$labels['typehomepage']  = 'Strona domowa';
 $labels['typeblog'] = 'Blog';
 $labels['typeprofile'] = 'Profil';
+
 $labels['addfield'] = 'Dodaj pole...';
 $labels['addcontact'] = 'Dodaj nowy kontakt do książki adresowej';
 $labels['editcontact'] = 'Edytuj kontakt';
 $labels['contacts'] = 'Kontakty';
 $labels['contactproperties'] = 'Właściwości';
 $labels['personalinfo'] = 'Informacje osobiste';
-$labels['edit'] = 'Edytuj';
+
+$labels['edit']   = 'Edytuj';
 $labels['cancel'] = 'Anuluj';
-$labels['save'] = 'Zapisz';
+$labels['save']   = 'Zapisz';
 $labels['delete'] = 'Usuń';
 $labels['rename'] = 'Zmień nazwę';
 $labels['addphoto'] = 'Dodaj';
 $labels['replacephoto'] = 'Zamień';
 $labels['uploadphoto'] = 'Wyślij zdjęcie';
-$labels['newcontact'] = 'Dodaj nowy kontakt';
-$labels['deletecontact'] = 'Usuń zaznaczone kontakty';
-$labels['composeto'] = 'Utwórz wiadomość do wybranych kontaktów';
+
+$labels['newcontact']     = 'Dodaj nowy kontakt';
+$labels['deletecontact']  = 'Usuń zaznaczone kontakty';
+$labels['composeto']      = 'Utwórz wiadomość do wybranych kontaktów';
 $labels['contactsfromto'] = 'Kontakty od $from do $to z $count';
-$labels['print'] = 'Drukuj';
-$labels['export'] = 'Eksportuj';
-$labels['exportvcards'] = 'Eksport kontaktów w formacie vCard';
+$labels['print']          = 'Drukuj';
+$labels['export']         = 'Eksportuj';
+$labels['exportall']      = 'Eksportuj wszystkie';
+$labels['exportsel']      = 'Eksportuj zaznaczone';
+$labels['exportvcards']   = 'Eksport kontaktów w formacie vCard';
 $labels['newcontactgroup'] = 'Utwórz nową grupę';
-$labels['grouprename'] = 'Zmień nazwę grupy';
-$labels['groupdelete'] = 'Usuń grupę';
+$labels['grouprename']    = 'Zmień nazwę grupy';
+$labels['groupdelete']    = 'Usuń grupę';
 $labels['groupremoveselected'] = 'Usuń wybrane kontakty z grupy';
-$labels['previouspage'] = 'Poprzednia strona';
-$labels['firstpage'] = 'Pierwsza strona';
-$labels['nextpage'] = 'Następna strona';
-$labels['lastpage'] = 'Ostatnia strona';
+
+$labels['previouspage']   = 'Poprzednia strona';
+$labels['firstpage']      = 'Pierwsza strona';
+$labels['nextpage']       = 'Następna strona';
+$labels['lastpage']       = 'Ostatnia strona';
+
 $labels['group'] = 'Grupa';
 $labels['groups'] = 'Grupy';
 $labels['personaladrbook'] = 'Kontakty osobiste';
+
 $labels['searchsave'] = 'Zapisz wyszukiwanie';
 $labels['searchdelete'] = 'Usuń wyszukiwanie';
+
 $labels['import'] = 'Importuj';
 $labels['importcontacts'] = 'Import kontaktów';
 $labels['importfromfile'] = 'Import z pliku:';
@@ -306,35 +366,43 @@ $labels['importtarget'] = 'Dodaj nowe kontakty do książki adresowej:';
 $labels['importreplace'] = 'Zastąp całą książkę adresową';
 $labels['importdesc'] = 'Import kontaktów z isniejącej książki adresowej.<br/>Obecnie obsługiwany jest import w formacie <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> lub CSV (pola oddzielone przecinkiem).';
 $labels['done'] = 'Wykonane';
+
+// settings
 $labels['settingsfor'] = 'Ustawienia dla';
 $labels['about'] = 'O programie';
 $labels['preferences'] = 'Preferencje';
 $labels['userpreferences'] = 'Preferencje użytkownika';
 $labels['editpreferences'] = 'Edytuj preferencje';
+
 $labels['identities'] = 'Tożsamości';
 $labels['manageidentities'] = 'Zarządzaj tożsamościami';
 $labels['newidentity'] = 'Nowa tożsamość';
+
 $labels['newitem'] = 'Nowy';
 $labels['edititem'] = 'Edytuj';
+
 $labels['preferhtml'] = 'Domyślny HTML';
 $labels['defaultcharset'] = 'Domyślny zestaw znaków';
 $labels['htmlmessage'] = 'Wiadomość HTML';
+$labels['messagepart'] = 'Część';
+$labels['digitalsig'] = 'Podpis cyfrowy';
 $labels['dateformat'] = 'Format daty';
 $labels['timeformat'] = 'Format czasu';
 $labels['prettydate'] = 'Ładne daty';
-$labels['setdefault'] = 'Domyślna';
-$labels['autodetect'] = '- wybór automatyczny -';
-$labels['language'] = 'Język';
-$labels['timezone'] = 'Strefa czasowa';
-$labels['pagesize'] = 'Liczba wierszy na stronie';
+$labels['setdefault']  = 'Domyślna';
+$labels['autodetect']  = '- wybór automatyczny -';
+$labels['language']  = 'Język';
+$labels['timezone']  = 'Strefa czasowa';
+$labels['pagesize']  = 'Liczba wierszy na stronie';
 $labels['signature'] = 'Podpis';
-$labels['dstactive'] = 'Czas letni';
+$labels['dstactive']  = 'Czas letni';
 $labels['showinextwin'] = 'Otwórz wiadomość w nowym oknie';
 $labels['composeextwin'] = 'Twórz w nowym oknie';
 $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';
@@ -357,11 +425,11 @@ $labels['showremoteimages'] = 'Wyświetlaj obrazki w wiadomościach';
 $labels['fromknownsenders'] = 'od znanych nadawców';
 $labels['always'] = 'zawsze';
 $labels['showinlineimages'] = 'Wyświetlaj załączone obrazki pod treścią wiadomości';
-$labels['autosavedraft'] = 'Automatycznie zapisuj tworzoną wiadomość';
-$labels['everynminutes'] = 'co $n minut(y)';
-$labels['refreshinterval'] = 'Odświeżanie (sprawdzanie nowych wiadomości, etc.)';
-$labels['never'] = 'nigdy';
-$labels['immediately'] = 'natychmiast';
+$labels['autosavedraft']  = 'Automatycznie zapisuj tworzoną wiadomość';
+$labels['everynminutes']  = 'co $n minut(y)';
+$labels['refreshinterval']  = 'Odświeżanie (sprawdzanie nowych wiadomości, etc.)';
+$labels['never']  = 'nigdy';
+$labels['immediately']  = 'natychmiast';
 $labels['messagesdisplaying'] = 'Wyświetlanie wiadomości';
 $labels['messagescomposition'] = 'Tworzenie wiadomości';
 $labels['mimeparamfolding'] = 'Stosuj nazwy załączników zgodne z';
@@ -388,15 +456,13 @@ $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';
+$labels['previewpanemarkread']  = 'Oznacz podglądane wiadomości jako przeczytane';
+$labels['afternseconds']  = 'po $n sekundach';
 $labels['reqmdn'] = 'Zawsze żądaj potwierdzenia odbioru';
 $labels['reqdsn'] = 'Zawsze żądaj statusu dostarczenia (DSN)';
 $labels['replysamefolder'] = 'Umieszczaj odpowiedzi w folderze wiadomości, na którą odpowiadam';
+$labels['defaultabook'] = 'Domyślna książka adresowa';
 $labels['autocompletesingle'] = 'Nie pokazuj alternatywnych adresów przy autouzupełnianiu';
 $labels['listnamedisplay'] = 'Wyświetl kontakty jako';
 $labels['spellcheckbeforesend'] = 'Przed wysłaniem wiadomości sprawdzaj pisownię';
@@ -409,13 +475,15 @@ $labels['mailtoprotohandler'] = 'Zainstaluj obsługę linków mailto:';
 $labels['forwardmode'] = 'Przekazywanie wiadomości';
 $labels['inline'] = 'w treści';
 $labels['asattachment'] = 'jako załącznik';
-$labels['folder'] = 'Folder';
-$labels['foldername'] = 'Nazwa folderu';
-$labels['subscribed'] = 'Zasubskrybowany';
+
+$labels['folder']  = 'Folder';
+$labels['folders']  = 'Foldery';
+$labels['foldername']  = 'Nazwa folderu';
+$labels['subscribed']  = 'Zasubskrybowany';
 $labels['messagecount'] = 'Wiadomości';
-$labels['create'] = 'Utwórz';
-$labels['createfolder'] = 'Utwórz nowy folder';
-$labels['managefolders'] = 'Zarządzaj folderami';
+$labels['create']  = 'Utwórz';
+$labels['createfolder']  = 'Utwórz nowy folder';
+$labels['managefolders']  = 'Zarządzaj folderami';
 $labels['specialfolders'] = 'Foldery specjalne';
 $labels['properties'] = 'Właściwości';
 $labels['folderproperties'] = 'Właściwości folderu';
@@ -425,23 +493,29 @@ $labels['info'] = 'Informacje';
 $labels['getfoldersize'] = 'Kliknij aby pobrać rozmiar folderu';
 $labels['changesubscription'] = 'Kliknij aby zmienić subskrypcję';
 $labels['foldertype'] = 'Typ folderu';
-$labels['personalfolder'] = 'Folder prywatny';
-$labels['otherfolder'] = 'Folder innego użytkownika';
-$labels['sharedfolder'] = 'Folder współdzielony';
+$labels['personalfolder']  = 'Folder prywatny';
+$labels['otherfolder']  = 'Folder innego użytkownika';
+$labels['sharedfolder']  = 'Folder współdzielony';
+
 $labels['sortby'] = 'Sortuj wg';
-$labels['sortasc'] = 'Rosnąco';
+$labels['sortasc']  = 'Rosnąco';
 $labels['sortdesc'] = 'Malejąco';
 $labels['undo'] = 'Cofnij';
+
 $labels['installedplugins'] = 'Zainstalowane wtyczki';
 $labels['plugin'] = 'Wtyczka';
 $labels['version'] = 'Wersja';
 $labels['source'] = 'Źródła';
 $labels['license'] = 'Licencja';
 $labels['support'] = 'Wsparcie techniczne';
+
+// units
 $labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
 $labels['GB'] = 'GB';
+
+// character sets
 $labels['unicode'] = 'uniwersalny';
 $labels['english'] = 'angielski';
 $labels['westerneuropean'] = 'zachodnioeuropejski';
@@ -461,3 +535,4 @@ $labels['japanese'] = 'japoński';
 $labels['korean'] = 'koreański';
 $labels['chinese'] = 'chiński';
 
+?>
diff --git a/program/localization/pl_PL/messages.inc b/program/localization/pl_PL/messages.inc
index 8e7e0b239..fb7ad6c97 100644
--- a/program/localization/pl_PL/messages.inc
+++ b/program/localization/pl_PL/messages.inc
@@ -2,20 +2,23 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/pl_PL/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Aleksander Machniak <alec@alec.pl>                            |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['errortitle'] = 'Wystąpił błąd!';
-$messages['loginfailed'] = 'Błąd logowania!';
+$messages['errortitle']  = 'Wystąpił błąd!';
+$messages['loginfailed']  = 'Błąd logowania!';
 $messages['cookiesdisabled'] = 'Twoja przeglądarka nie obsługuje ciasteczek!';
 $messages['sessionerror'] = 'Błąd sesji bądź sesja wygasła!';
 $messages['storageerror'] = 'Błąd połączenia z serwerem!';
@@ -25,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.';
@@ -40,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!';
@@ -57,11 +62,11 @@ $messages['errormoving'] = 'Nie można przenieść wiadomości!';
 $messages['errorcopying'] = 'Nie można skopiować wiadomości!';
 $messages['errordeleting'] = 'Nie można usunąć wiadomości!';
 $messages['errormarking'] = 'Nie można oznaczyć wiadomości!';
-$messages['deletecontactconfirm'] = 'Czy na pewno chcesz usunąć wybrane kontakty?';
-$messages['deletegroupconfirm'] = 'Czy na pewno chcesz usunąć wybraną grupę?';
+$messages['deletecontactconfirm']  = 'Czy na pewno chcesz usunąć wybrane kontakty?';
+$messages['deletegroupconfirm']  = 'Czy na pewno chcesz usunąć wybraną grupę?';
 $messages['deletemessagesconfirm'] = 'Czy na pewno chcesz usunąć wybrane wiadomości?';
-$messages['deletefolderconfirm'] = 'Czy na pewno chcesz usunąć wybrany folder?';
-$messages['purgefolderconfirm'] = 'Czy na pewno chcesz usunąć wszystkie wiadomości w tym folderze?';
+$messages['deletefolderconfirm']  = 'Czy na pewno chcesz usunąć wybrany folder?';
+$messages['purgefolderconfirm']  = 'Czy na pewno chcesz usunąć wszystkie wiadomości w tym folderze?';
 $messages['contactdeleting'] = 'Usuwanie kontaktów...';
 $messages['groupdeleting'] = 'Usuwanie grupy...';
 $messages['folderdeleting'] = 'Usuwanie folderu...';
@@ -70,11 +75,11 @@ $messages['foldersubscribing'] = 'Subskrybowanie folderu...';
 $messages['folderunsubscribing'] = 'Odsubskrybowanie folderu...';
 $messages['formincomplete'] = 'Uzupełnij formularz!';
 $messages['noemailwarning'] = 'Podaj poprawny adres e-mail!';
-$messages['nonamewarning'] = 'Podaj nazwę!';
+$messages['nonamewarning']  = 'Podaj nazwę!';
 $messages['nopagesizewarning'] = 'Podaj poprawną wartość!';
 $messages['nosenderwarning'] = 'Podaj adres nadawcy!';
 $messages['norecipientwarning'] = 'Podaj co najmniej jednego odbiorcę!';
-$messages['nosubjectwarning'] = 'Nie podano tematu wiadomości. Czy chcesz go teraz uzupełnić?';
+$messages['nosubjectwarning']  = 'Nie podano tematu wiadomości. Czy chcesz go teraz uzupełnić?';
 $messages['nobodywarning'] = 'Ta wiadomość jest pusta, czy mimo to chcesz ją wysłać?';
 $messages['notsentwarning'] = 'Wiadomość nie została wysłana. Czy chcesz usunąć tę wiadomość?';
 $messages['noldapserver'] = 'Wybierz serwer LDAP!';
@@ -160,4 +165,7 @@ $messages['invalidimageformat'] = 'Niepoprawny format obrazka.';
 $messages['mispellingsfound'] = 'Wykryto błędy pisowni w tej wiadomości.';
 $messages['parentnotwritable'] = 'Nie można utworzyć/przenieść folderu w wybrane miejsce. Brak upranień.';
 $messages['messagetoobig'] = 'Ta część wiadomości jest zbyt duża aby ją przetworzyć.';
+$messages['attachmentvalidationerror'] = 'UWAGA! Ten załącznik jest podejrzany ponieważ jego typ nie jest zgodny z typem zadeklarownym w wiadomości. Jeśli nie ufasz temu nadawcy nie powinieneś otwierać go w przeglądarce, bo może zawierać złośliwe oprogramowanie.<br/><br/><em>Spodziwany: $expected; znaleziono: $detected</em>';
+$messages['noscriptwarning'] = 'Uwaga: Usługa wymaga Javascriptu! Aby z niej skorzystać proszę włączyć obsługę języka Javascript w ustawieniach przeglądarki.';
 
+?>
diff --git a/program/localization/ps/labels.inc b/program/localization/ps/labels.inc
index 33c2e00fa..262e3d490 100755
--- a/program/localization/ps/labels.inc
+++ b/program/localization/ps/labels.inc
@@ -2,52 +2,78 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ps/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = '$product ته ښه راغلاست';
-$labels['username'] = 'کارن نوم';
-$labels['password'] = 'پټنوم';
-$labels['server'] = 'برابرونکی';
-$labels['login'] = 'ننوتون';
-$labels['logout'] = 'وتون';
-$labels['mail'] = 'برېښناليک';
+
+// login page
+$labels['welcome']   = '$product ته ښه راغلاست';
+$labels['username']  = 'کارن نوم';
+$labels['password']  = 'پټنوم';
+$labels['server']    = 'برابرونکی';
+$labels['login']     = 'ننوتون';
+
+// taskbar
+$labels['logout']   = 'وتون';
+$labels['mail']     = 'برېښناليک';
 $labels['settings'] = 'ځاني برابرونې';
 $labels['addressbook'] = 'پتې کتاب';
-$labels['inbox'] = 'راغلي ليکونه';
+
+// mailbox names
+$labels['inbox']  = 'راغلي ليکونه';
 $labels['drafts'] = 'بارليک';
-$labels['sent'] = 'لېږل شوي ليکونه';
-$labels['trash'] = 'کثافت دانۍ';
-$labels['junk'] = 'جنک';
+$labels['sent']   = 'لېږل شوي ليکونه';
+$labels['trash']  = 'کثافت دانۍ';
+$labels['junk']   = 'جنک';
+
+// message listing
 $labels['subject'] = 'مضمون';
-$labels['from'] = 'استوونکی';
-$labels['to'] = 'ترلاسه کوونکی';
-$labels['cc'] = 'لمېسل';
-$labels['bcc'] = 'پټليکی';
+$labels['from']    = 'استوونکی';
+$labels['sender']  = 'Sender';
+$labels['to']      = 'ترلاسه کوونکی';
+$labels['cc']      = 'لمېسل';
+$labels['bcc']     = 'پټليکی';
 $labels['replyto'] = 'ځوابول';
-$labels['date'] = 'نېټه';
-$labels['size'] = 'کچه';
+$labels['followupto'] = 'Followup-To';
+$labels['date']    = 'نېټه';
+$labels['size']    = 'کچه';
 $labels['priority'] = 'لومړيتوب';
 $labels['organization'] = 'ټولنه';
+$labels['readstatus'] = 'Read status';
+$labels['listoptions'] = 'List options...';
+
 $labels['mailboxlist'] = 'پوښۍ';
-$labels['folders'] = 'پوښۍ';
 $labels['messagesfromto'] = 'له ټاکلي استوزو څخه ټاکلي شمېرل شوو استوزو ته';
+$labels['threadsfromto'] = 'Threads $from to $to of $count';
 $labels['messagenrof'] = 'له $nr ځخه استوزو $count استوزو ته';
-$labels['copy'] = 'لمېسل';
-$labels['moveto'] = 'ته خوځوي';
+$labels['fromtoshort'] = '$from – $to of $count';
+
+$labels['copy']     = 'لمېسل';
+$labels['move']     = 'Move';
+$labels['moveto']   = 'ته خوځوي';
 $labels['download'] = 'ښکته کول';
+$labels['open']     = 'Open';
+$labels['showattachment'] = 'Show';
+$labels['showanyway'] = 'Show it anyway';
+
 $labels['filename'] = 'فايل نوم';
 $labels['filesize'] = 'فايل کچه';
+
 $labels['addtoaddressbook'] = 'د پتو کتاب ته يې ورزيات کړئ';
+
+// weekdays short
 $labels['sun'] = 'يوه نۍ';
 $labels['mon'] = 'دوه نۍ';
 $labels['tue'] = 'درې نۍ';
@@ -55,155 +81,328 @@ $labels['wed'] = 'څلورنۍ';
 $labels['thu'] = 'پنځنۍ';
 $labels['fri'] = 'جمعه';
 $labels['sat'] = 'نۍ';
-$labels['sunday'] = 'يوه نۍ';
-$labels['monday'] = 'دوه نۍ';
-$labels['tuesday'] = 'درې نۍ';
+
+// weekdays long
+$labels['sunday']    = 'يوه نۍ';
+$labels['monday']    = 'دوه نۍ';
+$labels['tuesday']   = 'درې نۍ';
 $labels['wednesday'] = 'منځنۍ';
-$labels['thursday'] = 'پنځنۍ';
-$labels['friday'] = 'جمعه';
-$labels['saturday'] = 'نۍ';
-$labels['jan'] = 'حنوري';
-$labels['feb'] = 'فبروري';
-$labels['mar'] = 'مارچ';
-$labels['apr'] = 'اپريل';
-$labels['may'] = 'مئ';
-$labels['longmay'] = 'مئ';
-$labels['jun'] = 'جون';
-$labels['jul'] = 'جولاي';
-$labels['aug'] = 'اګست';
-$labels['sep'] = 'سپتمپر';
-$labels['oct'] = 'اکتوبر';
-$labels['nov'] = 'نومبر';
-$labels['dec'] = 'ډسمبر';
-$labels['longjan'] = 'جنوري';
-$labels['longfeb'] = 'فبروري';
-$labels['longmar'] = 'مارچ';
-$labels['longapr'] = 'اپريل';
-$labels['longjun'] = 'جون';
-$labels['longjul'] = 'جولای';
-$labels['longaug'] = 'اګست';
-$labels['longsep'] = 'سپتمبر';
-$labels['longoct'] = 'اکتوبر';
-$labels['longnov'] = 'نومبر';
-$labels['longdec'] = 'ډسمبر';
+$labels['thursday']  = 'پنځنۍ';
+$labels['friday']    = 'جمعه';
+$labels['saturday']  = 'نۍ';
+
+// months short
+$labels['jan']	= 'حنوري';
+$labels['feb']	= 'فبروري';
+$labels['mar']	= 'مارچ';
+$labels['apr']	= 'اپريل';
+$labels['may']	= 'مئ';
+$labels['jun']	= 'جون';
+$labels['jul'] 	= 'جولاي';
+$labels['aug']	= 'اګست';
+$labels['sep']	= 'سپتمپر';
+$labels['oct']	= 'اکتوبر';
+$labels['nov']	= 'نومبر';
+$labels['dec']	= 'ډسمبر';
+
+// months long
+$labels['longjan']	= 'جنوري';
+$labels['longfeb']	= 'فبروري';
+$labels['longmar']	= 'مارچ';
+$labels['longapr']	= 'اپريل';
+$labels['longmay']	= 'مئ';
+$labels['longjun']	= 'جون';
+$labels['longjul']	= 'جولای';
+$labels['longaug']	= 'اګست';
+$labels['longsep']	= 'سپتمبر';
+$labels['longoct']	= 'اکتوبر';
+$labels['longnov']	= 'نومبر';
+$labels['longdec']	= 'ډسمبر';
+
 $labels['today'] = 'نن';
-$labels['checkmail'] = 'نوي استوزي وګوره';
-$labels['compose'] = 'استوزه وليکه';
-$labels['writenewmessage'] = 'نوي استوزي جوړول';
-$labels['replytomessage'] = 'استوونکي ته ځواب ورکړئ';
+
+// toolbar buttons
+$labels['refresh']          = 'Refresh';
+$labels['checkmail']        = 'نوي استوزي وګوره';
+$labels['compose']          = 'استوزه وليکه';
+$labels['writenewmessage']  = 'نوي استوزي جوړول';
+$labels['reply']            = 'Reply';
+$labels['replytomessage']   = 'استوونکي ته ځواب ورکړئ';
 $labels['replytoallmessage'] = 'استوونکي او ټولو ترلاسه کوونکو ته ځواب لېږل';
-$labels['forwardmessage'] = 'استوزه بل ته استول';
-$labels['deletemessage'] = 'استوزه ړنګول';
+$labels['replyall']         = 'Reply all';
+$labels['replylist']        = 'Reply list';
+$labels['forward']          = 'Forward';
+$labels['forwardinline']    = 'Forward inline';
+$labels['forwardattachment'] = 'Forward as attachment';
+$labels['forwardmessage']   = 'استوزه بل ته استول';
+$labels['deletemessage']    = 'استوزه ړنګول';
 $labels['movemessagetotrash'] = 'استوزه کثافت داني ته واستوه';
-$labels['printmessage'] = 'دا استوزه چاپ کړه';
-$labels['previousmessage'] = 'پخوانۍ استوزه وښيه';
-$labels['firstmessage'] = 'لومړی استوزه وښيه';
-$labels['nextmessage'] = 'ورپسې استوزه وښيه';
-$labels['lastmessage'] = 'پای /آخري استوزه وښيه';
-$labels['backtolist'] = 'بيرته د استوزو لست ته';
-$labels['viewsource'] = 'سرچينه وښيه';
-$labels['markmessages'] = 'استوزي په نښه کړئ';
-$labels['markread'] = 'لوستل شوي په توګه';
-$labels['markunread'] = 'د نالوستل شوي په توګه';
-$labels['markflagged'] = 'د بي کاره په توګه';
-$labels['markunflagged'] = 'د کارونې په توګه';
+$labels['printmessage']     = 'دا استوزه چاپ کړه';
+$labels['previousmessage']  = 'پخوانۍ استوزه وښيه';
+$labels['firstmessage']     = 'لومړی استوزه وښيه';
+$labels['nextmessage']      = 'ورپسې استوزه وښيه';
+$labels['lastmessage']      = 'پای /آخري استوزه وښيه';
+$labels['backtolist']       = 'بيرته د استوزو لست ته';
+$labels['viewsource']       = 'سرچينه وښيه';
+$labels['mark']             = 'Mark';
+$labels['markmessages']     = 'استوزي په نښه کړئ';
+$labels['markread']         = 'لوستل شوي په توګه';
+$labels['markunread']       = 'د نالوستل شوي په توګه';
+$labels['markflagged']      = 'د بي کاره په توګه';
+$labels['markunflagged']    = 'د کارونې په توګه';
+$labels['moreactions']      = 'More actions...';
+$labels['more']             = 'More';
+$labels['back']             = 'Back';
+$labels['options']          = 'Options';
+
 $labels['select'] = 'ټاکل';
 $labels['all'] = 'ټول';
 $labels['none'] = 'هېڅ';
-$labels['nonesort'] = 'هېڅ';
+$labels['currpage'] = 'Current page';
 $labels['unread'] = 'نالوستي';
 $labels['flagged'] = 'بې کاره';
 $labels['unanswered'] = 'ناځواب شوي';
+$labels['withattachment'] = 'With attachment';
+$labels['deleted'] = 'Deleted';
+$labels['undeleted'] = 'Not deleted';
+$labels['invert'] = 'Invert';
 $labels['filter'] = 'چڼول';
+$labels['list'] = 'List';
+$labels['threads'] = 'Threads';
+$labels['expand-all'] = 'Expand All';
+$labels['expand-unread'] = 'Expand Unread';
+$labels['collapse-all'] = 'Collapse All';
+$labels['threaded'] = 'Threaded';
+
+$labels['autoexpand_threads'] = 'Expand message threads';
+$labels['do_expand'] = 'all threads';
+$labels['expand_only_unread'] = 'only with unread messages';
+$labels['fromto'] = 'From/To';
+$labels['flag'] = 'Flag';
+$labels['attachment'] = 'Attachment';
+$labels['nonesort'] = 'هېڅ';
+$labels['sentdate'] = 'Sent date';
+$labels['arrival'] = 'Arrival date';
+$labels['asc'] = 'ascending';
+$labels['desc'] = 'descending';
+$labels['listcolumns'] = 'List columns';
+$labels['listsorting'] = 'Sorting column';
+$labels['listorder'] = 'Sorting order';
+$labels['listmode'] = 'List view mode';
+
+$labels['folderactions'] = 'Folder actions...';
 $labels['compact'] = 'کېښکلی';
 $labels['empty'] = 'تش';
+
 $labels['quota'] = 'ټيکلي لارښود';
-$labels['unknown'] = 'نامعلوم';
-$labels['unlimited'] = 'بي کچه';
-$labels['quicksearch'] = 'ژر پلټنه';
-$labels['resetsearch'] = 'د پلټنې بياسمون';
+$labels['unknown']  = 'نامعلوم';
+$labels['unlimited']  = 'بي کچه';
+
+$labels['quicksearch']  = 'ژر پلټنه';
+$labels['resetsearch']  = 'د پلټنې بياسمون';
+$labels['searchmod']  = 'Search modifiers';
+$labels['msgtext']  = 'Entire message';
+$labels['body']  = 'Body';
+
 $labels['openinextwin'] = 'په نوي کړکۍ کې پرانيزه';
-$labels['sendmessage'] = 'اوس يې واستوه';
-$labels['savemessage'] = 'دا ګارليک خوندي کړه';
-$labels['addattachment'] = 'يو فايل ونښلوه';
-$labels['charset'] = 'چيرست';
-$labels['editortype'] = 'د ټايب سمونګر';
-$labels['returnreceipt'] = 'د رسليک راګرځېدل';
+$labels['emlsave'] = 'Download (.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['addattachment']  = 'يو فايل ونښلوه';
+$labels['charset']        = 'چيرست';
+$labels['editortype']     = 'د ټايب سمونګر';
+$labels['returnreceipt']  = 'د رسليک راګرځېدل';
+$labels['dsn']            = 'Delivery status notification';
+$labels['mailreplyintro'] = 'On $date, $sender wrote:';
+$labels['originalmessage'] = 'Original Message';
+
+$labels['editidents']    = 'Edit identities';
+$labels['spellcheck']    = 'Spell';
 $labels['checkspelling'] = 'ليکدود کتنه';
 $labels['resumeediting'] = 'کارمخينې سمونه';
-$labels['revertto'] = 'ته بېرته اړول';
+$labels['revertto']      = 'ته بېرته اړول';
+
+$labels['attach'] = 'Attach';
 $labels['attachments'] = 'نښلني';
 $labels['upload'] = 'پورته کول';
-$labels['close'] = 'بندول';
-$labels['low'] = 'ټيټ';
-$labels['lowest'] = 'خورا ټيټ';
-$labels['normal'] = 'نورمال';
-$labels['high'] = 'لوړ';
+$labels['uploadprogress'] = '$percent ($current from $total)';
+$labels['close']  = 'بندول';
+$labels['messageoptions']  = 'Message options...';
+
+$labels['low']     = 'ټيټ';
+$labels['lowest']  = 'خورا ټيټ';
+$labels['normal']  = 'نورمال';
+$labels['high']    = 'لوړ';
 $labels['highest'] = 'خورا لوړ';
-$labels['nosubject'] = 'هېڅ موضوع';
+
+$labels['nosubject']  = 'هېڅ موضوع';
 $labels['showimages'] = 'انځورونه وښيه';
 $labels['alwaysshow'] = 'تل له $استوونکي څخه انځورونه وښيه';
+$labels['isdraft']    = 'This is a draft message.';
+$labels['andnmore']   = '$nr more...';
+$labels['togglemoreheaders'] = 'Show more message headers';
+$labels['togglefullheaders'] = 'Toggle raw message headers';
+
 $labels['htmltoggle'] = 'ايچ ټی ايمل ال';
 $labels['plaintoggle'] = 'ساده متن';
 $labels['savesentmessagein'] = 'استول شوي استوزه په خوندي کړه';
 $labels['dontsave'] = 'مه ساته';
 $labels['maxuploadsize'] = 'لږترلږه د اجازه شوي فايل کچه $وي';
+
 $labels['addcc'] = 'څرګندليک';
 $labels['addbcc'] = 'پټليک';
 $labels['addreplyto'] = 'ته ورزيات کړه';
+$labels['addfollowupto'] = 'Add Followup-To';
+
+// mdn
 $labels['mdnrequest'] = 'ددې استوزي استوونکی پوښتي چېد استوزي لوستلو سره سم تاسې خبر کړي،.    غواړئ چې استوونکی خبرشي؟';
 $labels['receiptread'] = 'رسليک راګرځېدل (لوستل';
 $labels['yourmessage'] = 'دا رسليک راګرځېدل ستاسې استوزي لپاره دی';
 $labels['receiptnote'] = 'يادونه: دا رسليک تاسې ته يوازې ددې خبرتيا درکوي چې کله استوزی د ترلاسه کوونکي په کمپيوټر کې څرګند شي،  ددې هيڅ ډاډګيرنه نشته چې ترلاسه کوونکي د  استوزي متن لوستی او يا پرې پوه شوی دی';
-$labels['name'] = 'نوم ښوونه';
-$labels['firstname'] = 'نوم';
-$labels['surname'] = 'کورنی نوم';
-$labels['email'] = 'برېښناليک';
+
+// address boook
+$labels['name']         = 'نوم ښوونه';
+$labels['firstname']    = 'نوم';
+$labels['surname']      = 'کورنی نوم';
+$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['email']        = 'برېښناليک';
+$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['typepager']  = 'Pager';
+$labels['typevideo']  = 'Video';
+$labels['typeassistant']  = 'Assistant';
+$labels['typehomepage']  = 'Home Page';
+$labels['typeblog'] = 'Blog';
+$labels['typeprofile'] = 'Profile';
+
+$labels['addfield'] = 'Add field...';
 $labels['addcontact'] = 'نوی اړيکلوری ورزيات کړه';
 $labels['editcontact'] = 'اړيکلوري سمون';
-$labels['edit'] = 'سمون';
+$labels['contacts'] = 'Contacts';
+$labels['contactproperties'] = 'Contact properties';
+$labels['personalinfo'] = 'Personal information';
+
+$labels['edit']   = 'سمون';
 $labels['cancel'] = 'لري کول';
-$labels['save'] = 'ساتل';
+$labels['save']   = 'ساتل';
 $labels['delete'] = 'ړنګول';
-$labels['newcontact'] = 'نوي اړيکلوري کارټ جوړ کړه';
-$labels['deletecontact'] = 'ټاکل شوي اړيکلوري ړنګ کړه';
-$labels['composeto'] = 'ته ليک وليکه';
+$labels['rename'] = 'Rename';
+$labels['addphoto'] = 'Add';
+$labels['replacephoto'] = 'Replace';
+$labels['uploadphoto'] = 'Upload photo';
+
+$labels['newcontact']     = 'نوي اړيکلوري کارټ جوړ کړه';
+$labels['deletecontact']  = 'ټاکل شوي اړيکلوري ړنګ کړه';
+$labels['composeto']      = 'ته ليک وليکه';
 $labels['contactsfromto'] = 'له دومره اړيکلورو څخه دومره شمېرل شوي Contacts $from to $to of $count';
-$labels['print'] = 'چاپ';
-$labels['export'] = 'بهرول';
-$labels['exportvcards'] = 'اړيکلوري د ويکارډ په بڼه واستوئ';
-$labels['previouspage'] = 'پخوانی غونډ وښيه';
-$labels['firstpage'] = 'لومړی غونډ وښيه';
-$labels['nextpage'] = 'ورپسې غونډ وښيه';
-$labels['lastpage'] = 'پای غونډ وښيه';
+$labels['print']          = 'چاپ';
+$labels['export']         = 'بهرول';
+$labels['exportall']      = 'Export all';
+$labels['exportsel']      = 'Export selected';
+$labels['exportvcards']   = 'اړيکلوري د ويکارډ په بڼه واستوئ';
+$labels['newcontactgroup'] = 'Create new contact group';
+$labels['grouprename']    = 'Rename group';
+$labels['groupdelete']    = 'Delete group';
+$labels['groupremoveselected'] = 'Remove selected contacts from group';
+
+$labels['previouspage']   = 'پخوانی غونډ وښيه';
+$labels['firstpage']      = 'لومړی غونډ وښيه';
+$labels['nextpage']       = 'ورپسې غونډ وښيه';
+$labels['lastpage']       = 'پای غونډ وښيه';
+
+$labels['group'] = 'Group';
 $labels['groups'] = 'ډلې';
 $labels['personaladrbook'] = 'ځاني پتې';
+
+$labels['searchsave'] = 'Save search';
+$labels['searchdelete'] = 'Delete search';
+
 $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['done'] = 'ترسره شو';
+
+// settings
 $labels['settingsfor'] = 'لپاره برابرونې';
+$labels['about'] = 'About';
 $labels['preferences'] = 'غورونې';
 $labels['userpreferences'] = 'کارن غورونې';
 $labels['editpreferences'] = 'د کارن غورونو سمون';
+
 $labels['identities'] = 'پېژندنې';
 $labels['manageidentities'] = 'ددې حساب پېژندنو برابرول';
 $labels['newidentity'] = 'نوي پېژندنه';
+
 $labels['newitem'] = 'نوی توک';
 $labels['edititem'] = 'توک سمون';
+
 $labels['preferhtml'] = 'ايچ ټي ام ايل ښوون';
+$labels['defaultcharset'] = 'Default Character Set';
 $labels['htmlmessage'] = 'ايچ ټي ام ايل استوزه';
+$labels['messagepart'] = 'Part';
+$labels['digitalsig'] = 'Digital Signature';
+$labels['dateformat'] = 'Date format';
+$labels['timeformat'] = 'Time format';
 $labels['prettydate'] = 'په زړه پورې نېټې';
-$labels['setdefault'] = 'تلوالي برابرول';
-$labels['autodetect'] = 'په خپلواکه توګه';
-$labels['language'] = 'ژبه';
-$labels['timezone'] = 'سيميز وخت';
-$labels['pagesize'] = 'په هر مخ پرتې کښې';
+$labels['setdefault']  = 'تلوالي برابرول';
+$labels['autodetect']  = 'په خپلواکه توګه';
+$labels['language']  = 'ژبه';
+$labels['timezone']  = 'سيميز وخت';
+$labels['pagesize']  = 'په هر مخ پرتې کښې';
 $labels['signature'] = 'لاسليک';
-$labels['dstactive'] = 'ورځنيو کارونو لنډيز ساتل';
+$labels['dstactive']  = 'ورځنيو کارونو لنډيز ساتل';
+$labels['showinextwin'] = 'Open message in a new window';
+$labels['composeextwin'] = 'Compose in a new window';
 $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'] = 'کثافت داني د وتنې په وخت کې پاکه کړه';
@@ -214,39 +413,126 @@ $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'] = 'If moving messages to Trash fails, delete them';
+$labels['deletejunk'] = 'Directly delete messages in Junk';
 $labels['showremoteimages'] = 'انځورونه له لري په ليکه کې ښکاره کړه';
 $labels['fromknownsenders'] = 'له اشنا استوونکو څخه';
 $labels['always'] = 'تل';
 $labels['showinlineimages'] = 'نښلول شوي انځورونه تر استوزې لاندې ښکاره کړه';
-$labels['autosavedraft'] = 'بارليک په خپل سري توګه  خوندي‌کړه';
-$labels['everynminutes'] = 'هر ه ګڼه په دقيقو کې';
-$labels['never'] = 'هېڅ';
+$labels['autosavedraft']  = 'بارليک په خپل سري توګه  خوندي‌کړه';
+$labels['everynminutes']  = 'هر ه ګڼه په دقيقو کې';
+$labels['refreshinterval']  = 'Refresh (check for new messages, etc.)';
+$labels['never']  = 'هېڅ';
+$labels['immediately']  = 'immediately';
 $labels['messagesdisplaying'] = 'استوزي ښيي';
 $labels['messagescomposition'] = 'استوزي ليکي';
 $labels['mimeparamfolding'] = 'د نښلول شوو نومونه';
 $labels['2231folding'] = 'بشپړ RFC 2231 (Thunderbird)';
 $labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
 $labels['2047folding'] = 'Full RFC 2047 (نور)';
+$labels['force7bit'] = 'Use MIME encoding for 8-bit characters';
 $labels['advancedoptions'] = 'پرمختللي لارې';
 $labels['focusonnewmessage'] = 'فوکاس براوسر کړکۍ په نوي استوزي کې';
 $labels['checkallfolders'] = 'په ټولو پوښيو کې نوي استوزي وګورئ';
-$labels['folder'] = 'پوښۍ';
-$labels['foldername'] = 'پوښۍ نوم';
-$labels['subscribed'] = 'ګډ شو';
+$labels['displaynext'] = 'After message delete/move display the next message';
+$labels['defaultfont'] = 'Default font of HTML message';
+$labels['mainoptions'] = 'Main Options';
+$labels['browseroptions'] = 'Browser Options';
+$labels['section'] = 'Section';
+$labels['maintenance'] = 'Maintenance';
+$labels['newmessage'] = 'New Message';
+$labels['signatureoptions'] = 'Signature Options';
+$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'] = 'Automatically add signature';
+$labels['newmessageonly'] = 'new message only';
+$labels['replyandforwardonly'] = 'replies and forwards only';
+$labels['insertsignature'] = 'Insert signature';
+$labels['previewpanemarkread']  = 'Mark previewed messages as read';
+$labels['afternseconds']  = 'after $n seconds';
+$labels['reqmdn'] = 'Always request a return receipt';
+$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'] = 'Check spelling before sending a message';
+$labels['spellcheckoptions'] = 'Spellcheck Options';
+$labels['spellcheckignoresyms'] = 'Ignore words with symbols';
+$labels['spellcheckignorenums'] = 'Ignore words with numbers';
+$labels['spellcheckignorecaps'] = 'Ignore words with all letters capitalized';
+$labels['addtodict'] = 'Add to dictionary';
+$labels['mailtoprotohandler'] = 'Register protocol handler for mailto: links';
+$labels['forwardmode'] = 'Messages forwarding';
+$labels['inline'] = 'inline';
+$labels['asattachment'] = 'as attachment';
+
+$labels['folder']  = 'پوښۍ';
+$labels['folders']  = 'پوښۍ';
+$labels['foldername']  = 'پوښۍ نوم';
+$labels['subscribed']  = 'ګډ شو';
 $labels['messagecount'] = 'استوزي';
-$labels['create'] = 'جوړول، رامنځ ته کول';
-$labels['createfolder'] = 'نوې پوښۍ جوړ کړه';
-$labels['managefolders'] = 'پوښيو څارل';
+$labels['create']  = 'جوړول، رامنځ ته کول';
+$labels['createfolder']  = 'نوې پوښۍ جوړ کړه';
+$labels['managefolders']  = 'پوښيو څارل';
 $labels['specialfolders'] = 'ځانګړي پوښۍۍ';
+$labels['properties'] = 'Properties';
+$labels['folderproperties'] = 'Folder properties';
+$labels['parentfolder'] = 'Parent folder';
+$labels['location'] = 'Location';
+$labels['info'] = 'Information';
+$labels['getfoldersize'] = 'Click to get folder size';
+$labels['changesubscription'] = 'Click to change subscription';
+$labels['foldertype'] = 'Folder Type';
+$labels['personalfolder']  = 'Private Folder';
+$labels['otherfolder']  = 'Other User\'s Folder';
+$labels['sharedfolder']  = 'Public Folder';
+
 $labels['sortby'] = 'اڼل';
-$labels['sortasc'] = 'له پورته نه ښکته خوا ته برابرول';
+$labels['sortasc']  = 'له پورته نه ښکته خوا ته برابرول';
 $labels['sortdesc'] = 'له ښکته نه پورته خوا ته برابرول';
+$labels['undo'] = 'Undo';
+
+$labels['installedplugins'] = 'Installed plugins';
+$labels['plugin'] = 'Plugin';
+$labels['version'] = 'Version';
+$labels['source'] = 'Source';
+$labels['license'] = 'License';
+$labels['support'] = 'Get support';
+
+// units
 $labels['B'] = 'بي';
 $labels['KB'] = 'کي بي';
 $labels['MB'] = 'ام بي';
 $labels['GB'] = 'جي بي';
 
+// character sets
+$labels['unicode'] = 'Unicode';
+$labels['english'] = '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['turkish'] = 'Turkish';
+$labels['nordic'] = 'Nordic';
+$labels['thai'] = 'Thai';
+$labels['celtic'] = 'Celtic';
+$labels['vietnamese'] = 'Vietnamese';
+$labels['japanese'] = 'Japanese';
+$labels['korean'] = 'Korean';
+$labels['chinese'] = 'Chinese';
+
+?>
diff --git a/program/localization/ps/messages.inc b/program/localization/ps/messages.inc
index d4b5da62c..d3a8483ee 100755
--- a/program/localization/ps/messages.inc
+++ b/program/localization/ps/messages.inc
@@ -2,27 +2,43 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ps/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['loginfailed'] = 'ننوتنه په بري سره ترسره نه شوه';
+$messages['errortitle']  = 'An error occurred!';
+$messages['loginfailed']  = 'ننوتنه په بري سره ترسره نه شوه';
 $messages['cookiesdisabled'] = 'ستاسو لټوني ککوړي ونه منل';
 $messages['sessionerror'] = 'ستاسې ناسته ناباوري يا له مينځه تللې ده';
 $messages['storageerror'] = 'له ای ميپ سرور سره پيوستون په بري سره ترسره نه شو';
+$messages['servererror'] = 'Server Error!';
+$messages['servererrormsg'] = 'Server Error: $msg';
+$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'] = 'ليکبکس کې هېڅ استوزي ونه مونده';
 $messages['loggedout'] = 'تاسې له ناستې څخه په بشپړه توګه وويستل شوئ الله په امان';
 $messages['mailboxempty'] = 'ليکبکس تش دی';
+$messages['refreshing'] = 'Refreshing...';
 $messages['loading'] = 'د کار په حال کې';
+$messages['uploading'] = 'Uploading file...';
+$messages['uploadingmany'] = 'Uploading files...';
 $messages['loadingdata'] = 'اومتوک د کار په حال کې';
 $messages['checkingmail'] = 'نوي استوزي ګوري';
 $messages['sendingmessage'] = 'استوزه استوي.';
@@ -32,39 +48,54 @@ $messages['messagesaved'] = 'استوزه په بارليک کې خوندي شو
 $messages['successfullysaved'] = 'په بري‌سره خوندي شوه';
 $messages['addedsuccessfully'] = 'اړيکلوری په بري سره پتې کتاب ته ور زيات شو';
 $messages['contactexists'] = 'يو اړيکلوری له دې برېښناليک پتې سره شتون لري';
+$messages['contactnameexists'] = 'A contact with the same name already exists.';
 $messages['blockedimages'] = 'ستاسو د پټتيآ خوندي کېدو لپاره ، له لري انځورنه په دې استوزي‌کې بند کړئ';
 $messages['encryptedmessage'] = 'دا يوه پټه استوزه ده او نه څرګندېږي. بښنه غواړو';
 $messages['nocontactsfound'] = 'هېڅ اړيکلوری يې ونه موند';
 $messages['contactnotfound'] = 'وړاندی شوی اړيکلوری ونه مونده';
+$messages['contactsearchonly'] = 'Enter some search terms to find contacts';
 $messages['sendingfailed'] = 'استوزي استونه په بري سره پای ته ونه رسېده';
 $messages['senttooquickly'] = 'مهرباني وکړئ $صبر وکړئ د دې استوزې له لېږلو مخکې';
 $messages['errorsavingsent'] = 'دخوندي کولو او لېږلو پر  مهال يوه تيروتنه رامنځ ته شوه';
 $messages['errorsaving'] = 'دخوندي کولو پر  مهال يوه تيروتنه رامنځ ته شوه';
 $messages['errormoving'] = 'استوزه ونه خوځول شوه';
+$messages['errorcopying'] = 'Could not copy the message(s).';
 $messages['errordeleting'] = 'استوزه ړنګه نه شوه';
-$messages['deletecontactconfirm'] = 'په رښتيا سره غواړئ چې ټاکل شوی اړيکلوری ړنګ کړئ؟';
+$messages['errormarking'] = 'Could not mark the message(s).';
+$messages['deletecontactconfirm']  = 'په رښتيا سره غواړئ چې ټاکل شوی اړيکلوری ړنګ کړئ؟';
+$messages['deletegroupconfirm']  = 'Do you really want to delete selected group?';
 $messages['deletemessagesconfirm'] = 'په رښتيا سره غواړئ چې ټاکل شوي استوزي‌ړنګ کړئ؟';
-$messages['deletefolderconfirm'] = 'په رښتيآ سره غواړئ چې دا پوښۍ ړنګه کړئ؟';
-$messages['purgefolderconfirm'] = 'په رښتيا سره غواړئ چې ددې پوښۍ ټول استوزي‌ړنګ کړئ؟';
+$messages['deletefolderconfirm']  = 'په رښتيآ سره غواړئ چې دا پوښۍ ړنګه کړئ؟';
+$messages['purgefolderconfirm']  = 'په رښتيا سره غواړئ چې ددې پوښۍ ټول استوزي‌ړنګ کړئ؟';
+$messages['contactdeleting'] = 'Deleting contact(s)...';
+$messages['groupdeleting'] = 'Deleting group...';
 $messages['folderdeleting'] = 'پوښۍ ړنګوي';
 $messages['foldermoving'] = 'پوښۍ خوځوي';
+$messages['foldersubscribing'] = 'Subscribing folder...';
+$messages['folderunsubscribing'] = 'Unsubscribing folder...';
 $messages['formincomplete'] = 'دا پورمه بشپړه ډکه شوې نه ده';
 $messages['noemailwarning'] = 'مهرباني وکړئ د يوه شته برېښناليک پته ورځای کړئ';
-$messages['nonamewarning'] = 'مهرباني‌وکړئ يو نوم وليکئ';
+$messages['nonamewarning']  = 'مهرباني‌وکړئ يو نوم وليکئ';
 $messages['nopagesizewarning'] = 'مهرباني‌وکړئ د پاڼې کچه ورکړئ';
 $messages['nosenderwarning'] = 'مهرباني وکړئ د استول شوي برېښناليک پته وليکئ';
 $messages['norecipientwarning'] = 'مهرباني‌وکړئ لږ تر لږه يو ترلاسه کوونکی وليکئ';
-$messages['nosubjectwarning'] = 'د مضمون ډګر تش دی يا تاسو غواړئ چې همدا اوس يو له هغو څخه وليکئ';
+$messages['nosubjectwarning']  = 'د مضمون ډګر تش دی يا تاسو غواړئ چې همدا اوس يو له هغو څخه وليکئ';
 $messages['nobodywarning'] = 'دا استوزه پرته له متن څخه استوئ؟';
 $messages['notsentwarning'] = 'استوزه نه ده لېږل شوې. غواړئ چې استوزه مو لرې وغورځوئ';
 $messages['noldapserver'] = 'مهرباني وکړئ يو ال ډپ سرور د پلټلو لپاره وټاکئ';
 $messages['nosearchname'] = 'مهرباني وکړئ  د يو اړيکلوري‌نوم يا برېښناليک پته وليکئ';
+$messages['notuploadedwarning'] = 'Not all attachments have been uploaded yet. Please wait or cancel the upload.';
 $messages['searchsuccessful'] = 'استوزي ومونده$';
+$messages['contactsearchsuccessful'] = '$nr contacts found.';
 $messages['searchnomatch'] = 'د پلټلو بيا راګرځېدل هېڅ سمون ونه خوړه';
 $messages['searching'] = 'پلټي';
 $messages['checking'] = 'ګوري';
 $messages['nospellerrors'] = 'هېڅ ليکدودي‌تيروتنه ونه مونده';
 $messages['folderdeleted'] = 'پوښۍ په بشپړه توګه ړنګه شوه';
+$messages['foldersubscribed'] = 'Folder successfully subscribed.';
+$messages['folderunsubscribed'] = 'Folder successfully unsubscribed.';
+$messages['folderpurged'] = 'Folder has successfully been emptied.';
+$messages['folderexpunged'] = 'Folder has successfully been compacted.';
 $messages['deletedsuccessfully'] = 'په بشپړه توګه ړنګ شول';
 $messages['converting'] = 'له استوزي څخه بڼې ړنګېږي';
 $messages['messageopenerror'] = 'له سرور څخه استوزي پرمخ نه شي تلی';
@@ -75,16 +106,66 @@ $messages['copyerror'] = 'هېڅ يوه پته يې کاپي‌نه شوای ک�
 $messages['sourceisreadonly'] = 'ددې پتې يوازې سرچينه لوستل کېږي';
 $messages['errorsavingcontact'] = 'د پتې اړيکلوری يې خوندي‌نه شو کړای';
 $messages['movingmessage'] = 'استوزه خوځوي';
+$messages['copyingmessage'] = 'Copying message(s)...';
+$messages['copyingcontact'] = 'Copying contact(s)...';
+$messages['deletingmessage'] = 'Deleting message(s)...';
+$messages['markingmessage'] = 'Marking message(s)...';
+$messages['addingmember'] = 'Adding contact(s) to the group...';
+$messages['removingmember'] = 'Removing contact(s) from the group...';
 $messages['receiptsent'] = 'يو لوستل شوی رسليک په بشپړه توګه واستول شو';
 $messages['errorsendingreceipt'] = 'رسليک يې ونه شوای ليږلی';
+$messages['deleteidentityconfirm'] = 'Do you really want to delete this identity?';
 $messages['nodeletelastidentity'] = 'تاسې نه شئ کولی چې دا پېژندنه ړنګه کړئ، داستاسو اخرنی پيژندنه ده';
 $messages['forbiddencharacter'] = 'د پوښۍ نوم له فوربايډن تورو څخه جوړ دی';
 $messages['selectimportfile'] = 'مهرباني وکړئ‌يو فايل د پورته کولو لپاره وټاکئ';
 $messages['addresswriterror'] = 'ټاکل شوی پتې کتاب د بياليکلو نه دی';
+$messages['contactaddedtogroup'] = 'Successfully added the contacts to this group.';
+$messages['contactremovedfromgroup'] = 'Successfully removed contacts from this group.';
+$messages['nogroupassignmentschanged'] = 'No group assignments changed.';
 $messages['importwait'] = 'نقلوي...صبر وکړئ';
-$messages['importerror'] = 'نقلول په بري سره ترسره نه شول پورته شوی فايل شته ویکارډ فايل نه دی';
+$messages['importformaterror'] = 'Import failed! The uploaded file is not a valid import data file.';
 $messages['importconfirm'] = '<b>په بشپړه توګه نقل شو $اړيکلوري داخل شول, $شته تيرشوي انټاير څخه تيرشول</b>:<p><em>$نومونه</em></p>';
+$messages['importconfirmskipped'] = '<b>Skipped $skipped existing entries</b>';
 $messages['opnotpermitted'] = 'چار اجازه نه لري';
 $messages['nofromaddress'] = 'په ټاکل شوي پيژندنه کې برېښناليک پتې له لاسه ورکړي';
 $messages['editorwarning'] = 'که د متن بڼو له منځه تللو ګواښ وي نو د متن سمون پرانيزئ. غواړئ چې دوام ورکړئ';
+$messages['httpreceivedencrypterror'] = 'A fatal configuration error occurred. Contact your administrator immediately. <b>Your message can not be sent.</b>';
+$messages['smtpconnerror'] = 'SMTP Error ($code): Connection to server failed.';
+$messages['smtpautherror'] = 'SMTP Error ($code): Authentication failed.';
+$messages['smtpfromerror'] = 'SMTP Error ($code): Failed to set sender "$from" ($msg).';
+$messages['smtptoerror'] = 'SMTP Error ($code): Failed to add recipient "$to" ($msg).';
+$messages['smtprecipientserror'] = 'SMTP Error: Unable to parse recipients list.';
+$messages['smtperror'] = 'SMTP Error: $msg';
+$messages['emailformaterror'] = 'Invalid e-mail address: $email';
+$messages['toomanyrecipients'] = 'Too many recipients. Reduce the number of recipients to $max.';
+$messages['maxgroupmembersreached'] = 'The number of group members exceeds the maximum of $max.';
+$messages['internalerror'] = 'An internal error occured. Please try again.';
+$messages['contactdelerror'] = 'Could not delete contact(s).';
+$messages['contactdeleted'] = 'Contact(s) deleted successfully.';
+$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.';
 
+?>
diff --git a/program/localization/pt_BR/labels.inc b/program/localization/pt_BR/labels.inc
index 9f3715704..9a1946eee 100644
--- a/program/localization/pt_BR/labels.inc
+++ b/program/localization/pt_BR/labels.inc
@@ -2,60 +2,78 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/pt_BR/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Victor Benincasa <vbenincasa@gmail.com>                       |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = 'Bem-vindo ao $product';
-$labels['username'] = 'Usuário';
-$labels['password'] = 'Senha';
-$labels['server'] = 'Servidor';
-$labels['login'] = 'Entrar';
-$labels['logout'] = 'Sair';
-$labels['mail'] = 'E-mail';
+
+// login page
+$labels['welcome']   = 'Bem-vindo ao $product';
+$labels['username']  = 'Usuário';
+$labels['password']  = 'Senha';
+$labels['server']    = 'Servidor';
+$labels['login']     = 'Entrar';
+
+// taskbar
+$labels['logout']   = 'Sair';
+$labels['mail']     = 'E-mail';
 $labels['settings'] = 'Configurações';
 $labels['addressbook'] = 'Catálogo de endereços';
-$labels['inbox'] = 'Caixa de entrada';
+
+// mailbox names
+$labels['inbox']  = 'Caixa de entrada';
 $labels['drafts'] = 'Rascunhos';
-$labels['sent'] = 'Enviados';
-$labels['trash'] = 'Lixeira';
-$labels['junk'] = 'Spam';
+$labels['sent']   = 'Enviados';
+$labels['trash']  = 'Lixeira';
+$labels['junk']   = 'Spam';
+
+// message listing
 $labels['subject'] = 'Assunto';
-$labels['from'] = 'De';
-$labels['to'] = 'Para';
-$labels['cc'] = 'Cópia';
-$labels['bcc'] = 'Cópia Oculta (Cco)';
+$labels['from']    = 'De';
+$labels['sender']  = 'Remetente';
+$labels['to']      = 'Para';
+$labels['cc']      = 'Cópia';
+$labels['bcc']     = 'Cópia Oculta (Cco)';
 $labels['replyto'] = 'Responder para';
 $labels['followupto'] = 'Encaminhar para';
-$labels['date'] = 'Data';
-$labels['size'] = 'Tamanho';
+$labels['date']    = 'Data';
+$labels['size']    = 'Tamanho';
 $labels['priority'] = 'Prioridade';
 $labels['organization'] = 'Organização';
 $labels['readstatus'] = 'Status de leitura';
 $labels['listoptions'] = 'Lista de opções...';
+
 $labels['mailboxlist'] = 'Pastas';
-$labels['folders'] = 'Pastas';
 $labels['messagesfromto'] = 'Mensagens $from - $to de $count';
 $labels['threadsfromto'] = 'Tópicos $from - $to de $count';
 $labels['messagenrof'] = 'Mensagem $nr de $count';
 $labels['fromtoshort'] = '$from - $to de $count';
-$labels['copy'] = 'Copiar';
-$labels['move'] = 'Mover';
-$labels['moveto'] = 'Mover para...';
+
+$labels['copy']     = 'Copiar';
+$labels['move']     = 'Mover';
+$labels['moveto']   = 'Mover para...';
 $labels['download'] = 'Baixar';
+$labels['open']     = 'Abrir';
 $labels['showattachment'] = 'Exibir';
 $labels['showanyway'] = 'Exibir mesmo assim';
+
 $labels['filename'] = 'Nome do arquivo';
 $labels['filesize'] = 'Tamanho';
+
 $labels['addtoaddressbook'] = 'Incluir no catálogo de endereços';
+
+// weekdays short
 $labels['sun'] = 'Dom.';
 $labels['mon'] = 'Seg.';
 $labels['tue'] = 'Ter.';
@@ -63,94 +81,106 @@ $labels['wed'] = 'Qua.';
 $labels['thu'] = 'Qui.';
 $labels['fri'] = 'Sex.';
 $labels['sat'] = 'Sáb.';
-$labels['sunday'] = 'Domingo';
-$labels['monday'] = 'Segunda-feira';
-$labels['tuesday'] = 'Terça-feira';
+
+// weekdays long
+$labels['sunday']    = 'Domingo';
+$labels['monday']    = 'Segunda-feira';
+$labels['tuesday']   = 'Terça-feira';
 $labels['wednesday'] = 'Quarta-feira';
-$labels['thursday'] = 'Quinta-feira';
-$labels['friday'] = 'Sexta-feira';
-$labels['saturday'] = 'Sábado';
-$labels['jan'] = 'Jan.';
-$labels['feb'] = 'Fev.';
-$labels['mar'] = 'Mar.';
-$labels['apr'] = 'Abr.';
-$labels['may'] = 'Mai.';
-$labels['longmay'] = 'Mai.';
-$labels['jun'] = 'Jun.';
-$labels['jul'] = 'Jul.';
-$labels['aug'] = 'Ago.';
-$labels['sep'] = 'Set.';
-$labels['oct'] = 'Out.';
-$labels['nov'] = 'Nov.';
-$labels['dec'] = 'Dez.';
-$labels['longjan'] = 'Janeiro';
-$labels['longfeb'] = 'Fevereiro';
-$labels['longmar'] = 'Março';
-$labels['longapr'] = 'Abril';
-$labels['longjun'] = 'Junho';
-$labels['longjul'] = 'Julho';
-$labels['longaug'] = 'Agosto';
-$labels['longsep'] = 'Setembro';
-$labels['longoct'] = 'Outubro';
-$labels['longnov'] = 'Novembro';
-$labels['longdec'] = 'Dezembro';
+$labels['thursday']  = 'Quinta-feira';
+$labels['friday']    = 'Sexta-feira';
+$labels['saturday']  = 'Sábado';
+
+// months short
+$labels['jan']	= 'Jan.';
+$labels['feb']	= 'Fev.';
+$labels['mar']	= 'Mar.';
+$labels['apr']	= 'Abr.';
+$labels['may']	= 'Mai.';
+$labels['jun']	= 'Jun.';
+$labels['jul'] 	= 'Jul.';
+$labels['aug']	= 'Ago.';
+$labels['sep']	= 'Set.';
+$labels['oct']	= 'Out.';
+$labels['nov']	= 'Nov.';
+$labels['dec']	= 'Dez.';
+
+// months long
+$labels['longjan']	= 'Janeiro';
+$labels['longfeb']	= 'Fevereiro';
+$labels['longmar']	= 'Março';
+$labels['longapr']	= 'Abril';
+$labels['longmay']	= 'Maio';
+$labels['longjun']	= 'Junho';
+$labels['longjul']	= 'Julho';
+$labels['longaug']	= 'Agosto';
+$labels['longsep']	= 'Setembro';
+$labels['longoct']	= 'Outubro';
+$labels['longnov']	= 'Novembro';
+$labels['longdec']	= 'Dezembro';
+
 $labels['today'] = 'Hoje';
-$labels['refresh'] = 'Atualizar';
-$labels['checkmail'] = 'Verificar se há novas mensagens';
-$labels['compose'] = 'Criar email';
-$labels['writenewmessage'] = 'Criar nova mensagem';
-$labels['reply'] = 'Responder';
-$labels['replytomessage'] = 'Responder para o remetente';
+
+// toolbar buttons
+$labels['refresh']          = 'Atualizar';
+$labels['checkmail']        = 'Verificar se há novas mensagens';
+$labels['compose']          = 'Criar email';
+$labels['writenewmessage']  = 'Criar nova mensagem';
+$labels['reply']            = 'Responder';
+$labels['replytomessage']   = 'Responder para o remetente';
 $labels['replytoallmessage'] = 'Responder para o remetente e todos destinatários';
-$labels['replyall'] = 'Responder a todos';
-$labels['replylist'] = 'Responder para a lista';
-$labels['forward'] = 'Encaminhar';
-$labels['forwardinline'] = 'Encaminhar junto ao corpo da mensagem';
+$labels['replyall']         = 'Responder a todos';
+$labels['replylist']        = 'Responder para a lista';
+$labels['forward']          = 'Encaminhar';
+$labels['forwardinline']    = 'Encaminhar junto ao corpo da mensagem';
 $labels['forwardattachment'] = 'Encaminhar como anexo';
-$labels['forwardmessage'] = 'Encaminhar a mensagem';
-$labels['deletemessage'] = 'Excluir a mensagem';
+$labels['forwardmessage']   = 'Encaminhar a mensagem';
+$labels['deletemessage']    = 'Excluir a mensagem';
 $labels['movemessagetotrash'] = 'Mover a mensagem para a Lixeira';
-$labels['printmessage'] = 'Imprimir a mensagem';
-$labels['previousmessage'] = 'Mensagem Anterior';
-$labels['firstmessage'] = 'Primeira Mensagem';
-$labels['nextmessage'] = 'Próxima Mensagem';
-$labels['lastmessage'] = 'Última Mensagem';
-$labels['backtolist'] = 'Voltar para a lista de mensagens';
-$labels['viewsource'] = 'Exibir código-fonte';
-$labels['mark'] = 'Marcar';
-$labels['markmessages'] = 'Marcar mensagens';
-$labels['markread'] = 'como lidas';
-$labels['markunread'] = 'como não lidas';
-$labels['markflagged'] = 'Como sinalizadas';
-$labels['markunflagged'] = 'Como não sinalizadas';
-$labels['moreactions'] = 'Mais ações...';
-$labels['more'] = 'Mais';
-$labels['back'] = 'Voltar';
-$labels['options'] = 'Opções';
+$labels['printmessage']     = 'Imprimir a mensagem';
+$labels['previousmessage']  = 'Mensagem Anterior';
+$labels['firstmessage']     = 'Primeira Mensagem';
+$labels['nextmessage']      = 'Próxima Mensagem';
+$labels['lastmessage']      = 'Última Mensagem';
+$labels['backtolist']       = 'Voltar para a lista de mensagens';
+$labels['viewsource']       = 'Exibir código-fonte';
+$labels['mark']             = 'Marcar';
+$labels['markmessages']     = 'Marcar mensagens';
+$labels['markread']         = 'Como lidas';
+$labels['markunread']       = 'Como não lidas';
+$labels['markflagged']      = 'Como sinalizadas';
+$labels['markunflagged']    = 'Como não sinalizadas';
+$labels['moreactions']      = 'Mais ações...';
+$labels['more']             = 'Mais';
+$labels['back']             = 'Voltar';
+$labels['options']          = 'Opções';
+
 $labels['select'] = 'Selecionar';
 $labels['all'] = 'Todas';
 $labels['none'] = 'Nenhuma';
-$labels['nonesort'] = 'Nenhuma';
 $labels['currpage'] = 'Página atual';
 $labels['unread'] = 'Não lidas';
-$labels['flagged'] = 'Marcada';
-$labels['unanswered'] = 'Não respondida';
-$labels['deleted'] = 'Excluída';
-$labels['undeleted'] = 'Não excluída';
+$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';
 $labels['filter'] = 'Filtrar';
 $labels['list'] = 'Lista';
-$labels['threads'] = 'Tópicos';
+$labels['threads'] = 'Agrupamento por assunto';
 $labels['expand-all'] = 'Expandir Tudo';
 $labels['expand-unread'] = 'Expandir Não Lidas';
 $labels['collapse-all'] = 'Recolher Tudo';
 $labels['threaded'] = 'Agrupado';
+
 $labels['autoexpand_threads'] = 'Expandir mensagens agrupadas';
-$labels['do_expand'] = 'todos os tópicos';
+$labels['do_expand'] = 'todos os grupos';
 $labels['expand_only_unread'] = 'somente com mensagem(s) não lidas';
 $labels['fromto'] = 'De/Para';
 $labels['flag'] = 'Sinalizador';
 $labels['attachment'] = 'Anexo';
+$labels['nonesort'] = 'Nenhuma';
 $labels['sentdate'] = 'Data de envio';
 $labels['arrival'] = 'Data de recebimento';
 $labels['asc'] = 'crescente';
@@ -159,147 +189,176 @@ $labels['listcolumns'] = 'Lista de colunas';
 $labels['listsorting'] = 'Coluna para ordenação';
 $labels['listorder'] = 'Ordem da classificação';
 $labels['listmode'] = 'Visualização em lista';
+
 $labels['folderactions'] = 'Ações para as pastas...';
 $labels['compact'] = 'Compactar';
 $labels['empty'] = 'Esvaziar';
+
 $labels['quota'] = 'Uso de disco';
-$labels['unknown'] = 'desconhecido';
-$labels['unlimited'] = 'ilimitado';
-$labels['quicksearch'] = 'Pesquisa rápida';
-$labels['resetsearch'] = 'Limpar';
-$labels['searchmod'] = 'Opções da pesquisa';
-$labels['msgtext'] = 'Mensagem inteira';
+$labels['unknown']  = 'desconhecido';
+$labels['unlimited']  = 'ilimitado';
+
+$labels['quicksearch']  = 'Pesquisa rápida';
+$labels['resetsearch']  = 'Limpar pesquisa';
+$labels['searchmod']  = 'Opções da pesquisa';
+$labels['msgtext']  = 'Mensagem inteira';
+$labels['body']  = 'Conteúdo';
+
 $labels['openinextwin'] = 'Abrir em nova janela';
 $labels['emlsave'] = 'Baixar (formato .eml)';
-$labels['editasnew'] = 'Editar como novo';
-$labels['send'] = 'Enviar';
-$labels['sendmessage'] = 'Enviar agora';
-$labels['savemessage'] = 'Salvar como Rascunho';
-$labels['addattachment'] = 'Anexar um arquivo';
-$labels['charset'] = 'Codificação';
-$labels['editortype'] = 'Tipo de editor';
-$labels['returnreceipt'] = 'Confirmação de recebimento';
-$labels['dsn'] = 'Recibo de entrega';
+$labels['changeformattext'] = 'Exibir em formato de texto simples';
+$labels['changeformathtml'] = 'Exibir com formatação HTML';
+
+// message compose
+$labels['editasnew']      = 'Editar como novo';
+$labels['send']           = 'Enviar';
+$labels['sendmessage']    = 'Enviar agora';
+$labels['savemessage']    = 'Salvar como rascunho';
+$labels['addattachment']  = 'Anexar um arquivo';
+$labels['charset']        = 'Codificação';
+$labels['editortype']     = 'Tipo de editor';
+$labels['returnreceipt']  = 'Confirmação de recebimento';
+$labels['dsn']            = 'Recibo de entrega';
 $labels['mailreplyintro'] = 'Em $date, $sender escreveu:';
 $labels['originalmessage'] = 'Mensagem original';
-$labels['editidents'] = 'Editar identidades';
-$labels['spellcheck'] = 'Revisar';
+
+$labels['editidents']    = 'Editar identidades';
+$labels['spellcheck']    = 'Revisar';
 $labels['checkspelling'] = 'Verificar ortografia';
 $labels['resumeediting'] = 'Continuar a edição';
-$labels['revertto'] = 'Reverter para';
+$labels['revertto']      = 'Reverter para';
+
 $labels['attach'] = 'Anexar';
 $labels['attachments'] = 'Anexos';
 $labels['upload'] = 'Enviar arquivo';
 $labels['uploadprogress'] = '$percent ($current de $total)';
-$labels['close'] = 'Fechar';
-$labels['messageoptions'] = 'Opções da mensagem...';
-$labels['low'] = 'Baixa';
-$labels['lowest'] = 'Mais baixa';
-$labels['normal'] = 'Normal';
-$labels['high'] = 'Alta';
+$labels['close']  = 'Fechar';
+$labels['messageoptions']  = 'Opções da mensagem...';
+
+$labels['low']     = 'Baixa';
+$labels['lowest']  = 'Mais baixa';
+$labels['normal']  = 'Normal';
+$labels['high']    = 'Alta';
 $labels['highest'] = 'Mais alta';
-$labels['nosubject'] = '(sem assunto)';
+
+$labels['nosubject']  = '(sem assunto)';
 $labels['showimages'] = 'Exibir imagens';
 $labels['alwaysshow'] = 'Sempre exibir imagens de $sender';
-$labels['isdraft'] = 'Esta é uma mensagem de rascunho.';
-$labels['andnmore'] = '$nr mais...';
+$labels['isdraft']    = 'Esta é uma mensagem salva como rascunho.';
+$labels['andnmore']   = '$nr mais...';
 $labels['togglemoreheaders'] = 'Exibir informações adicionais da mensagem (cabeçalhos)';
 $labels['togglefullheaders'] = 'Exibir cabeçalho original da mensagem';
+
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Texto simples';
 $labels['savesentmessagein'] = 'Salvar mensagens enviadas em';
 $labels['dontsave'] = 'não salvar';
 $labels['maxuploadsize'] = 'Tamanho máximo permitido do arquivo é $size';
+
 $labels['addcc'] = 'Adicionar Cópia';
 $labels['addbcc'] = 'Adicionar Cópia Oculta';
-$labels['addreplyto'] = 'Adicionar Responder para';
-$labels['addfollowupto'] = 'Adicionar Encaminhar para';
+$labels['addreplyto'] = 'Adicionar Endereço de Resposta';
+$labels['addfollowupto'] = 'Adicionar Endereço de Encaminhamento';
+
+// mdn
 $labels['mdnrequest'] = 'O remetente desta mensagem deseja ser notificado quando você ler esta mensagem. Você permite o envio desta notificação?';
 $labels['receiptread'] = 'Confirmação de Leitura (exibida)';
 $labels['yourmessage'] = 'Esta é uma confirmação de leitura da sua mensagem';
 $labels['receiptnote'] = 'Nota: Esta confirmação de leitura somente informa que a mensagem foi aberta no computador do destinatário. Não há garantia que o destinatário tenha lido ou compreendido o conteúdo da mensagem.';
-$labels['name'] = 'Nome de exibição';
-$labels['firstname'] = 'Primeiro Nome';
-$labels['surname'] = 'Sobrenome';
-$labels['middlename'] = 'Segundo Nome';
-$labels['nameprefix'] = 'Prefixo';
-$labels['namesuffix'] = 'Sufixo';
-$labels['nickname'] = 'Apelido';
-$labels['jobtitle'] = 'Ocupação';
-$labels['department'] = 'Departamento';
-$labels['gender'] = 'Sexo';
-$labels['maidenname'] = 'Nome de solteira';
-$labels['email'] = 'E-Mail';
-$labels['phone'] = 'Telefone';
-$labels['address'] = 'Endereço';
-$labels['street'] = 'Rua';
-$labels['locality'] = 'Cidade';
-$labels['zipcode'] = 'CEP';
-$labels['region'] = 'Estado';
-$labels['country'] = 'País';
-$labels['birthday'] = 'Data de nascimento';
-$labels['anniversary'] = 'Aniversário';
-$labels['website'] = 'Site';
+
+// address boook
+$labels['name']         = 'Nome de exibição';
+$labels['firstname']    = 'Primeiro Nome';
+$labels['surname']      = 'Sobrenome';
+$labels['middlename']   = 'Segundo Nome';
+$labels['nameprefix']   = 'Prefixo';
+$labels['namesuffix']   = 'Sufixo';
+$labels['nickname']     = 'Apelido';
+$labels['jobtitle']     = 'Ocupação';
+$labels['department']   = 'Departamento';
+$labels['gender']       = 'Sexo';
+$labels['maidenname']   = 'Nome de solteira';
+$labels['email']        = 'E-Mail';
+$labels['phone']        = 'Telefone';
+$labels['address']      = 'Endereço';
+$labels['street']       = 'Rua';
+$labels['locality']     = 'Cidade';
+$labels['zipcode']      = 'CEP';
+$labels['region']       = 'Estado';
+$labels['country']      = 'País';
+$labels['birthday']     = 'Data de nascimento';
+$labels['anniversary']  = 'Aniversário';
+$labels['website']      = 'Site';
 $labels['instantmessenger'] = 'Mensagem instantânea (IM)';
 $labels['notes'] = 'Anotações';
-$labels['male'] = 'masculino';
+$labels['male']   = 'masculino';
 $labels['female'] = 'feminino';
 $labels['manager'] = 'Gerente';
 $labels['assistant'] = 'Assistente';
-$labels['typeassistant'] = 'Assistente';
 $labels['spouse'] = 'Cônjuge';
 $labels['allfields'] = 'Todos os campos';
 $labels['search'] = 'Pesquisar';
 $labels['advsearch'] = 'Pesquisa Avançada';
 $labels['advanced'] = 'Avançado';
 $labels['other'] = 'Outro';
-$labels['typeother'] = 'Outro';
-$labels['typehome'] = 'Residencial';
-$labels['typework'] = 'Trabalho';
-$labels['typemobile'] = 'Celular';
-$labels['typemain'] = 'Principal';
-$labels['typehomefax'] = 'Fax Residencial';
-$labels['typeworkfax'] = 'Fax do Trabalho';
-$labels['typecar'] = 'Carro';
-$labels['typepager'] = 'Pager';
-$labels['typevideo'] = 'Vídeo';
-$labels['typehomepage'] = 'Página pessoal';
+
+$labels['typehome']   = 'Residencial';
+$labels['typework']   = 'Trabalho';
+$labels['typeother']  = 'Outro';
+$labels['typemobile']  = 'Celular';
+$labels['typemain']  = 'Principal';
+$labels['typehomefax']  = 'Fax Residencial';
+$labels['typeworkfax']  = 'Fax do Trabalho';
+$labels['typecar']  = 'Carro';
+$labels['typepager']  = 'Pager';
+$labels['typevideo']  = 'Vídeo';
+$labels['typeassistant']  = 'Assistente';
+$labels['typehomepage']  = 'Página pessoal';
 $labels['typeblog'] = 'Blog';
 $labels['typeprofile'] = 'Perfil';
+
 $labels['addfield'] = 'Adicionar campo...';
 $labels['addcontact'] = 'Adicionar novo contato';
 $labels['editcontact'] = 'Editar contato';
 $labels['contacts'] = 'Contatos';
 $labels['contactproperties'] = 'Propriedades do contato';
 $labels['personalinfo'] = 'Informações pessoais';
-$labels['edit'] = 'Editar';
+
+$labels['edit']   = 'Editar';
 $labels['cancel'] = 'Cancelar';
-$labels['save'] = 'Salvar';
+$labels['save']   = 'Salvar';
 $labels['delete'] = 'Excluir';
 $labels['rename'] = 'Renomear';
 $labels['addphoto'] = 'Adicionar';
 $labels['replacephoto'] = 'Substituir';
 $labels['uploadphoto'] = 'Enviar foto';
-$labels['newcontact'] = 'Criar novo contato';
-$labels['deletecontact'] = 'Exclui os contatos selecionados';
-$labels['composeto'] = 'Compor mensagem para';
+
+$labels['newcontact']     = 'Criar novo contato';
+$labels['deletecontact']  = 'Exclui os contatos selecionados';
+$labels['composeto']      = 'Compor mensagem para';
 $labels['contactsfromto'] = 'Contatos $from - $to de $count';
-$labels['print'] = 'Imprimir';
-$labels['export'] = 'Exportar';
-$labels['exportvcards'] = 'Exportar os contatos em formato vCard';
+$labels['print']          = 'Imprimir';
+$labels['export']         = 'Exportar';
+$labels['exportall']      = 'Exportar todos';
+$labels['exportsel']      = 'Exportar selecionados';
+$labels['exportvcards']   = 'Exportar os contatos em formato vCard';
 $labels['newcontactgroup'] = 'Criar novo grupo de contatos';
-$labels['grouprename'] = 'Renomear grupo';
-$labels['groupdelete'] = 'Excluir grupo';
+$labels['grouprename']    = 'Renomear grupo';
+$labels['groupdelete']    = 'Excluir grupo';
 $labels['groupremoveselected'] = 'Remover os contatos selecionados do grupo';
-$labels['previouspage'] = 'Página Anterior';
-$labels['firstpage'] = 'Primeira Página';
-$labels['nextpage'] = 'Próxima Página';
-$labels['lastpage'] = 'Última Página';
+
+$labels['previouspage']   = 'Página Anterior';
+$labels['firstpage']      = 'Primeira Página';
+$labels['nextpage']       = 'Próxima Página';
+$labels['lastpage']       = 'Última Página';
+
 $labels['group'] = 'Grupo';
 $labels['groups'] = 'Grupos';
 $labels['personaladrbook'] = 'Endereços pessoais';
+
 $labels['searchsave'] = 'Salvar pesquisa';
 $labels['searchdelete'] = 'Excluir pesquisa';
+
 $labels['import'] = 'Importar';
 $labels['importcontacts'] = 'Importar contatos';
 $labels['importfromfile'] = 'Importar do arquivo:';
@@ -307,35 +366,43 @@ $labels['importtarget'] = 'Adicionar novos contatos ao catálogo de endereços:'
 $labels['importreplace'] = 'Substituir o catálogo de endereços atual';
 $labels['importdesc'] = 'Você pode enviar contatos de um catálogo de endereços existente.<br/>Os contatos devem ser enviados no formato <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> ou CSV (valores separados por vírgula).';
 $labels['done'] = 'Concluído';
+
+// settings
 $labels['settingsfor'] = 'Configurações para';
 $labels['about'] = 'Sobre';
 $labels['preferences'] = 'Preferências';
 $labels['userpreferences'] = 'Preferências do usuário';
 $labels['editpreferences'] = 'Editar preferências do usuário';
+
 $labels['identities'] = 'Identidades';
 $labels['manageidentities'] = 'Gerenciar identidades desta conta';
 $labels['newidentity'] = 'Nova identidade';
+
 $labels['newitem'] = 'Novo item';
 $labels['edititem'] = 'Editar item';
+
 $labels['preferhtml'] = 'Exibir em HTML';
 $labels['defaultcharset'] = 'Conjunto padrão de caracteres';
 $labels['htmlmessage'] = 'Mensagem HTML';
+$labels['messagepart'] = 'Parte';
+$labels['digitalsig'] = 'Assinatura Digital';
 $labels['dateformat'] = 'Formato da data';
 $labels['timeformat'] = 'Formato da hora';
 $labels['prettydate'] = 'Exibir datas amigáveis';
-$labels['setdefault'] = 'Definir como padrão';
-$labels['autodetect'] = 'Automático';
-$labels['language'] = 'Idioma';
-$labels['timezone'] = 'Fuso horário';
-$labels['pagesize'] = 'Mensagens por página';
+$labels['setdefault']  = 'Definir como padrão';
+$labels['autodetect']  = 'Automático';
+$labels['language']  = 'Idioma';
+$labels['timezone']  = 'Fuso horário';
+$labels['pagesize']  = 'Mensagens por página';
 $labels['signature'] = 'Assinatura';
-$labels['dstactive'] = 'Horário de verão';
+$labels['dstactive']  = 'Horário de verão';
 $labels['showinextwin'] = 'Abrir mensagem em uma nova janela';
 $labels['composeextwin'] = 'Compor em uma nova janela';
 $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';
@@ -358,11 +425,11 @@ $labels['showremoteimages'] = 'Exibir imagens externas';
 $labels['fromknownsenders'] = 'de remetentes conhecidos';
 $labels['always'] = 'sempre';
 $labels['showinlineimages'] = 'Exibir imagens anexadas abaixo da mensagem';
-$labels['autosavedraft'] = 'Salvar rascunho automaticamente';
-$labels['everynminutes'] = 'a cada $n minuto(s)';
-$labels['refreshinterval'] = 'Atualização (verificação de novas mensagens, etc.)';
-$labels['never'] = 'nunca';
-$labels['immediately'] = 'imediatamente';
+$labels['autosavedraft']  = 'Salvar rascunho automaticamente';
+$labels['everynminutes']  = 'a cada $n minuto(s)';
+$labels['refreshinterval']  = 'Atualização (verificação de novas mensagens, etc.)';
+$labels['never']  = 'nunca';
+$labels['immediately']  = 'imediatamente';
 $labels['messagesdisplaying'] = 'Exibição de mensagens';
 $labels['messagescomposition'] = 'Redigir mensagens';
 $labels['mimeparamfolding'] = 'Nomes de anexos';
@@ -376,10 +443,10 @@ $labels['checkallfolders'] = 'Verificar se há novas mensagens em todas as pasta
 $labels['displaynext'] = 'Exibir a mensagem seguinte após excluir/mover uma mensagem';
 $labels['defaultfont'] = 'Fonte padrão para mensagens HTML';
 $labels['mainoptions'] = 'Opções Principais';
-$labels['browseroptions'] = 'Opções de navegação';
+$labels['browseroptions'] = 'Opções do navegador';
 $labels['section'] = 'Seção';
 $labels['maintenance'] = 'Manutenção';
-$labels['newmessage'] = 'Nova mensagem';
+$labels['newmessage'] = 'Nova Mensagem';
 $labels['signatureoptions'] = 'Opções de Assinatura';
 $labels['whenreplying'] = 'Quando responder';
 $labels['replyempty'] = 'Não incluir a mensagem original';
@@ -389,12 +456,9 @@ $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';
+$labels['previewpanemarkread']  = 'Marcar mensagens pré-visualizadas como lidas';
+$labels['afternseconds']  = 'depois de $n segundos';
 $labels['reqmdn'] = 'Sempre pedir confirmação de leitura';
 $labels['reqdsn'] = 'Sempre pedir confirmação de entrega';
 $labels['replysamefolder'] = 'Colocar as respostas na mesma pasta da mensagem original';
@@ -411,13 +475,15 @@ $labels['mailtoprotohandler'] = 'Associar links de e-mail (mailto:) para envio d
 $labels['forwardmode'] = 'Encaminhamento de mensagens';
 $labels['inline'] = 'Em linha (no corpo da mensagem)';
 $labels['asattachment'] = 'como anexo';
-$labels['folder'] = 'Pasta';
-$labels['foldername'] = 'Nome da pasta';
-$labels['subscribed'] = 'Inscrito';
+
+$labels['folder']  = 'Pasta';
+$labels['folders']  = 'Pastas';
+$labels['foldername']  = 'Nome da pasta';
+$labels['subscribed']  = 'Inscrito';
 $labels['messagecount'] = 'Mensagens';
-$labels['create'] = 'Criar';
-$labels['createfolder'] = 'Criar nova pasta';
-$labels['managefolders'] = 'Gerenciar pastas';
+$labels['create']  = 'Criar';
+$labels['createfolder']  = 'Criar nova pasta';
+$labels['managefolders']  = 'Gerenciar pastas';
 $labels['specialfolders'] = 'Pastas especiais';
 $labels['properties'] = 'Propriedades';
 $labels['folderproperties'] = 'Propriedades da pasta';
@@ -427,23 +493,29 @@ $labels['info'] = 'Informação';
 $labels['getfoldersize'] = 'Exibir o tamanho da pasta';
 $labels['changesubscription'] = 'Clique para ativar/desativar';
 $labels['foldertype'] = 'Tipo de Pasta';
-$labels['personalfolder'] = 'Pasta Particular';
-$labels['otherfolder'] = 'Pasta de outro Usuário';
-$labels['sharedfolder'] = 'Pasta Pública';
+$labels['personalfolder']  = 'Pasta Particular';
+$labels['otherfolder']  = 'Pasta de outro Usuário';
+$labels['sharedfolder']  = 'Pasta Pública';
+
 $labels['sortby'] = 'Ordenar por';
-$labels['sortasc'] = 'Ascendente';
+$labels['sortasc']  = 'Ascendente';
 $labels['sortdesc'] = 'Descendente';
 $labels['undo'] = 'Desfazer';
+
 $labels['installedplugins'] = 'Plugins instalados';
 $labels['plugin'] = 'Plugin';
 $labels['version'] = 'Versão';
 $labels['source'] = 'Fonte';
 $labels['license'] = 'Licença';
 $labels['support'] = 'Obter suporte';
+
+// units
 $labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
 $labels['GB'] = 'GB';
+
+// character sets
 $labels['unicode'] = 'Unicode';
 $labels['english'] = 'Inglês';
 $labels['westerneuropean'] = 'Oeste Europeu';
@@ -463,3 +535,4 @@ $labels['japanese'] = 'Japonês';
 $labels['korean'] = 'Coreano';
 $labels['chinese'] = 'Chinês';
 
+?>
diff --git a/program/localization/pt_BR/messages.inc b/program/localization/pt_BR/messages.inc
index 05be7e629..6ec481b8f 100644
--- a/program/localization/pt_BR/messages.inc
+++ b/program/localization/pt_BR/messages.inc
@@ -2,20 +2,23 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/pt_BR/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Claudio F Filho <filhocf@gmail.com>                           |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['errortitle'] = 'Ocorreu um erro!';
-$messages['loginfailed'] = 'Falha no login';
+$messages['errortitle']  = 'Ocorreu um erro!';
+$messages['loginfailed']  = 'Falha no login';
 $messages['cookiesdisabled'] = 'Seu navegador não aceita cookies';
 $messages['sessionerror'] = 'A sessão do seu navegador é inválida ou expirou';
 $messages['storageerror'] = 'Falha na conexão com o servidor. Verifique se informou os dados corretamente.';
@@ -25,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';
@@ -41,7 +46,7 @@ $messages['messagesent'] = 'Mensagem enviada com sucesso';
 $messages['savingmessage'] = 'Salvando Mensagem...';
 $messages['messagesaved'] = 'Mensagem salva em Rascunhos';
 $messages['successfullysaved'] = 'Salvo com sucesso';
-$messages['addedsuccessfully'] = 'Contato incluído com sucesso.';
+$messages['addedsuccessfully'] = 'Contato incluído com sucesso no catálogo de endereços.';
 $messages['contactexists'] = 'Já existe um contato com esse mesmo e-mail.';
 $messages['contactnameexists'] = 'Já existe um contato com o mesmo nome.';
 $messages['blockedimages'] = 'Para proteger sua privacidade, as imagens remotas desta mensagem foram bloqueadas.';
@@ -57,11 +62,11 @@ $messages['errormoving'] = 'Não foi possível mover a(s) mensagem(ns).';
 $messages['errorcopying'] = 'Não foi possível copiar a(s) mensagem(ns).';
 $messages['errordeleting'] = 'Não foi possível apagar a(s) mensagem(ns).';
 $messages['errormarking'] = 'Não foi possível marcar a(s) mensagem(ns).';
-$messages['deletecontactconfirm'] = 'Deseja realmente excluir o(s) contato(s) selecionado(s)?';
-$messages['deletegroupconfirm'] = 'Deseja realmente excluir o grupo selecionado?';
+$messages['deletecontactconfirm']  = 'Deseja realmente excluir o(s) contato(s) selecionado(s)?';
+$messages['deletegroupconfirm']  = 'Deseja realmente excluir o grupo selecionado?';
 $messages['deletemessagesconfirm'] = 'Deseja realmente excluir a(s) mensagem(s) selecionada(s)?';
-$messages['deletefolderconfirm'] = 'Deseja realmente excluir esta pasta?';
-$messages['purgefolderconfirm'] = 'Deseja realmente excluir todas mensagens desta pasta?';
+$messages['deletefolderconfirm']  = 'Deseja realmente excluir esta pasta?';
+$messages['purgefolderconfirm']  = 'Deseja realmente excluir todas mensagens desta pasta?';
 $messages['contactdeleting'] = 'Excluindo contato(s)...';
 $messages['groupdeleting'] = 'Excluindo grupo...';
 $messages['folderdeleting'] = 'Excluindo pasta...';
@@ -70,11 +75,11 @@ $messages['foldersubscribing'] = 'Ativando pasta...';
 $messages['folderunsubscribing'] = 'Desativando pasta...';
 $messages['formincomplete'] = 'Os campos não foram completamente preenchidos';
 $messages['noemailwarning'] = 'Por favor, informe um endereço de e-mail válido';
-$messages['nonamewarning'] = 'Por favor, informe o nome';
+$messages['nonamewarning']  = 'Por favor, informe o nome';
 $messages['nopagesizewarning'] = 'Por favor, informe o tamanho da página';
 $messages['nosenderwarning'] = 'Por favor, informe o e-mail do remetente';
 $messages['norecipientwarning'] = 'Por favor, informe pelo menos um destinatário';
-$messages['nosubjectwarning'] = 'O campo "Assunto" está vazio. Deseja incluí-lo agora?';
+$messages['nosubjectwarning']  = 'O campo "Assunto" está vazio. Deseja incluí-lo agora?';
 $messages['nobodywarning'] = 'Enviar a mensagem sem texto?';
 $messages['notsentwarning'] = 'A mensagem não foi enviada. Deseja descartar sua mensagem?';
 $messages['noldapserver'] = 'Por favor, selecione um servidor LDAP para a pesquisa';
@@ -163,3 +168,4 @@ $messages['messagetoobig'] = 'A mensagem é muito grande para ser processada.';
 $messages['attachmentvalidationerror'] = 'ATENÇÃO! Este anexo é suspeito porque seu tipo não combina com o tipo declarado na mensagem. Se você não confia no remetente, não deveria abri-lo no navegador porque pode conter conteúdo malicioso.<br/><br/><em>Esperado: $expected; encontrado: $detected</em>';
 $messages['noscriptwarning'] = 'Aviso: Este webmail utiliza Javascript, habilite-o nas configurações de seu navegador.';
 
+?>
diff --git a/program/localization/pt_PT/labels.inc b/program/localization/pt_PT/labels.inc
index abc815bcb..316255e5e 100644
--- a/program/localization/pt_PT/labels.inc
+++ b/program/localization/pt_PT/labels.inc
@@ -2,60 +2,78 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/pt_PT/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: David                                                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = 'Bem-vindo ao $product';
-$labels['username'] = 'Utilizador';
-$labels['password'] = 'Palavra-passe';
-$labels['server'] = 'Servidor';
-$labels['login'] = 'Entrar';
-$labels['logout'] = 'Sair';
-$labels['mail'] = 'Mensagens';
+
+// login page
+$labels['welcome']   = 'Bem-vindo ao $product';
+$labels['username']  = 'Utilizador';
+$labels['password']  = 'Palavra-passe';
+$labels['server']    = 'Servidor';
+$labels['login']     = 'Entrar';
+
+// taskbar
+$labels['logout']   = 'Sair';
+$labels['mail']     = 'Mensagens';
 $labels['settings'] = 'Definições';
 $labels['addressbook'] = 'Contactos';
-$labels['inbox'] = 'A Receber';
+
+// mailbox names
+$labels['inbox']  = 'A Receber';
 $labels['drafts'] = 'Rascunhos';
-$labels['sent'] = 'Itens Enviados';
-$labels['trash'] = 'Reciclagem';
-$labels['junk'] = 'Spam';
+$labels['sent']   = 'Itens Enviados';
+$labels['trash']  = 'Reciclagem';
+$labels['junk']   = 'Spam';
+
+// message listing
 $labels['subject'] = 'Assunto';
-$labels['from'] = 'Remetente';
-$labels['to'] = 'Para';
-$labels['cc'] = 'Cc';
-$labels['bcc'] = 'Bcc';
+$labels['from']    = 'Remetente';
+$labels['sender']  = 'Remetente';
+$labels['to']      = 'Para';
+$labels['cc']      = 'Cc';
+$labels['bcc']     = 'Bcc';
 $labels['replyto'] = 'Responder para';
 $labels['followupto'] = 'Reencaminhar-Para';
-$labels['date'] = 'Data';
-$labels['size'] = 'Tamanho';
+$labels['date']    = 'Data';
+$labels['size']    = 'Tamanho';
 $labels['priority'] = 'Prioridade';
 $labels['organization'] = 'Organização';
 $labels['readstatus'] = 'Estado de leitura';
 $labels['listoptions'] = 'Lista de opções...';
+
 $labels['mailboxlist'] = 'Pastas';
-$labels['folders'] = 'Pastas';
 $labels['messagesfromto'] = 'Mensagens de $from a $to de $count';
 $labels['threadsfromto'] = 'Tópicos de $from a $to de $count';
 $labels['messagenrof'] = 'Mensagem $nr de $count';
 $labels['fromtoshort'] = '$from – $to de $count';
-$labels['copy'] = 'Copiar';
-$labels['move'] = 'Mover';
-$labels['moveto'] = 'mover para...';
+
+$labels['copy']     = 'Copiar';
+$labels['move']     = 'Mover';
+$labels['moveto']   = 'mover para...';
 $labels['download'] = 'descarregar';
+$labels['open']     = 'Abrir';
 $labels['showattachment'] = 'Mostrar';
 $labels['showanyway'] = 'Mostrar na mesma';
+
 $labels['filename'] = 'Ficheiro';
 $labels['filesize'] = 'Tamanho';
+
 $labels['addtoaddressbook'] = 'Adicionar à lista de contactos';
+
+// weekdays short
 $labels['sun'] = 'Dom';
 $labels['mon'] = 'Seg';
 $labels['tue'] = 'Ter';
@@ -63,78 +81,88 @@ $labels['wed'] = 'Qua';
 $labels['thu'] = 'Qui';
 $labels['fri'] = 'Sex';
 $labels['sat'] = 'Sáb';
-$labels['sunday'] = 'Domingo';
-$labels['monday'] = 'Segunda-feira';
-$labels['tuesday'] = 'Terça-feira';
+
+// weekdays long
+$labels['sunday']    = 'Domingo';
+$labels['monday']    = 'Segunda-feira';
+$labels['tuesday']   = 'Terça-feira';
 $labels['wednesday'] = 'Quarta-feira';
-$labels['thursday'] = 'Quinta-feira';
-$labels['friday'] = 'Sexta-feira';
-$labels['saturday'] = 'Sábado';
-$labels['jan'] = 'Jan';
-$labels['feb'] = 'Fev';
-$labels['mar'] = 'Mar';
-$labels['apr'] = 'Abr';
-$labels['may'] = 'Maio';
-$labels['longmay'] = 'Maio';
-$labels['jun'] = 'Jun';
-$labels['jul'] = 'Jul';
-$labels['aug'] = 'Ago';
-$labels['sep'] = 'Set';
-$labels['oct'] = 'Out';
-$labels['nov'] = 'Nov';
-$labels['dec'] = 'Dez';
-$labels['longjan'] = 'Janeiro';
-$labels['longfeb'] = 'Fevereiro';
-$labels['longmar'] = 'Março';
-$labels['longapr'] = 'Abril';
-$labels['longjun'] = 'Junho';
-$labels['longjul'] = 'Julho';
-$labels['longaug'] = 'Agosto';
-$labels['longsep'] = 'Setembro';
-$labels['longoct'] = 'Outubro';
-$labels['longnov'] = 'Novembro';
-$labels['longdec'] = 'Dezembro';
+$labels['thursday']  = 'Quinta-feira';
+$labels['friday']    = 'Sexta-feira';
+$labels['saturday']  = 'Sábado';
+
+// months short
+$labels['jan']	= 'Jan';
+$labels['feb']	= 'Fev';
+$labels['mar']	= 'Mar';
+$labels['apr']	= 'Abr';
+$labels['may']	= 'Maio';
+$labels['jun']	= 'Jun';
+$labels['jul'] 	= 'Jul';
+$labels['aug']	= 'Ago';
+$labels['sep']	= 'Set';
+$labels['oct']	= 'Out';
+$labels['nov']	= 'Nov';
+$labels['dec']	= 'Dez';
+
+// months long
+$labels['longjan']	= 'Janeiro';
+$labels['longfeb']	= 'Fevereiro';
+$labels['longmar']	= 'Março';
+$labels['longapr']	= 'Abril';
+$labels['longmay']	= 'Maio';
+$labels['longjun']	= 'Junho';
+$labels['longjul']	= 'Julho';
+$labels['longaug']	= 'Agosto';
+$labels['longsep']	= 'Setembro';
+$labels['longoct']	= 'Outubro';
+$labels['longnov']	= 'Novembro';
+$labels['longdec']	= 'Dezembro';
+
 $labels['today'] = 'Hoje';
-$labels['refresh'] = 'Actualizar';
-$labels['checkmail'] = 'Verificar existência de novas mensagens';
-$labels['compose'] = 'Nova mensagem';
-$labels['writenewmessage'] = 'Criar nova mensagem';
-$labels['reply'] = 'Responder';
-$labels['replytomessage'] = 'Responder';
+
+// toolbar buttons
+$labels['refresh']          = 'Actualizar';
+$labels['checkmail']        = 'Verificar existência de novas mensagens';
+$labels['compose']          = 'Nova mensagem';
+$labels['writenewmessage']  = 'Criar nova mensagem';
+$labels['reply']            = 'Responder';
+$labels['replytomessage']   = 'Responder';
 $labels['replytoallmessage'] = 'Responder a todos';
-$labels['replyall'] = 'Responder a todos';
-$labels['replylist'] = 'Lista de resposta';
-$labels['forward'] = 'Reencaminhar';
-$labels['forwardinline'] = 'Reencaminhar';
+$labels['replyall']         = 'Responder a todos';
+$labels['replylist']        = 'Lista de resposta';
+$labels['forward']          = 'Reencaminhar';
+$labels['forwardinline']    = 'Reencaminhar';
 $labels['forwardattachment'] = 'Reencaminhar como anexo';
-$labels['forwardmessage'] = 'Reencaminhar';
-$labels['deletemessage'] = 'Eliminar';
+$labels['forwardmessage']   = 'Reencaminhar';
+$labels['deletemessage']    = 'Eliminar';
 $labels['movemessagetotrash'] = 'Mover para reciclagem';
-$labels['printmessage'] = 'Imprimir';
-$labels['previousmessage'] = 'Mensagem anterior';
-$labels['firstmessage'] = 'Primeira mensagem';
-$labels['nextmessage'] = 'Próxima mensagem';
-$labels['lastmessage'] = 'Última mensagem';
-$labels['backtolist'] = 'Voltar';
-$labels['viewsource'] = 'Mostrar código fonte';
-$labels['mark'] = 'Marcar';
-$labels['markmessages'] = 'Marcar mensagens';
-$labels['markread'] = 'Como lida(s)';
-$labels['markunread'] = 'Como não lida(s)';
-$labels['markflagged'] = 'Com sinalização';
-$labels['markunflagged'] = 'Sem sinalização';
-$labels['moreactions'] = 'Mais acções...';
-$labels['more'] = 'Mais';
-$labels['back'] = 'Voltar';
-$labels['options'] = 'Opções';
+$labels['printmessage']     = 'Imprimir';
+$labels['previousmessage']  = 'Mensagem anterior';
+$labels['firstmessage']     = 'Primeira mensagem';
+$labels['nextmessage']      = 'Próxima mensagem';
+$labels['lastmessage']      = 'Última mensagem';
+$labels['backtolist']       = 'Voltar';
+$labels['viewsource']       = 'Mostrar código fonte';
+$labels['mark']             = 'Marcar';
+$labels['markmessages']     = 'Marcar mensagens';
+$labels['markread']         = 'Como lida(s)';
+$labels['markunread']       = 'Como não lida(s)';
+$labels['markflagged']      = 'Com sinalização';
+$labels['markunflagged']    = 'Sem sinalização';
+$labels['moreactions']      = 'Mais acções...';
+$labels['more']             = 'Mais';
+$labels['back']             = 'Voltar';
+$labels['options']          = 'Opções';
+
 $labels['select'] = 'Seleccionar';
 $labels['all'] = 'Todas';
 $labels['none'] = 'Nenhum';
-$labels['nonesort'] = 'Nenhum';
 $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';
@@ -145,12 +173,14 @@ $labels['expand-all'] = 'Expandir tudo';
 $labels['expand-unread'] = 'Expandir não lidas';
 $labels['collapse-all'] = 'Recolher tudo';
 $labels['threaded'] = 'Agrupar tópicos';
+
 $labels['autoexpand_threads'] = 'Expandir tópicos das mensagens';
 $labels['do_expand'] = 'todos os tópicos';
 $labels['expand_only_unread'] = 'só com mensagens não lidas';
 $labels['fromto'] = 'Remetente/Destinatário';
 $labels['flag'] = 'Sinalizador';
 $labels['attachment'] = 'Anexo';
+$labels['nonesort'] = 'Nenhum';
 $labels['sentdate'] = 'Data de envio';
 $labels['arrival'] = 'Data de recepção';
 $labels['asc'] = 'Ascendente';
@@ -159,147 +189,176 @@ $labels['listcolumns'] = 'Lista de colunas';
 $labels['listsorting'] = 'Ordenar por';
 $labels['listorder'] = 'Ordenação';
 $labels['listmode'] = 'Modo de visualização';
+
 $labels['folderactions'] = 'Acções para pastas...';
 $labels['compact'] = 'Compactar';
 $labels['empty'] = 'Esvaziar';
+
 $labels['quota'] = 'Espaço utilizado';
-$labels['unknown'] = 'desconhecido';
-$labels['unlimited'] = 'ilimitado';
-$labels['quicksearch'] = 'Pesquisa rápida';
-$labels['resetsearch'] = 'Limpar pesquisa';
-$labels['searchmod'] = 'Pesquisar em';
-$labels['msgtext'] = 'Mensagem completa';
+$labels['unknown']  = 'desconhecido';
+$labels['unlimited']  = 'ilimitado';
+
+$labels['quicksearch']  = 'Pesquisa rápida';
+$labels['resetsearch']  = 'Limpar pesquisa';
+$labels['searchmod']  = 'Pesquisar em';
+$labels['msgtext']  = 'Mensagem completa';
+$labels['body']  = 'Corpo';
+
 $labels['openinextwin'] = 'Abrir numa nova janela';
 $labels['emlsave'] = 'Guardar como (.eml)';
-$labels['editasnew'] = 'Editar como nova';
-$labels['send'] = 'Enviar';
-$labels['sendmessage'] = 'Enviar';
-$labels['savemessage'] = 'Guardar como rascunho';
-$labels['addattachment'] = 'Adicionar anexo';
-$labels['charset'] = 'Charset';
-$labels['editortype'] = 'Tipo de editor';
-$labels['returnreceipt'] = 'Recibo de leitura';
-$labels['dsn'] = 'Recibo de entrega';
+$labels['changeformattext'] = 'Mostrar em formato de texto simples';
+$labels['changeformathtml'] = 'Mostrar em formato HTML';
+
+// message compose
+$labels['editasnew']      = 'Editar como nova';
+$labels['send']           = 'Enviar';
+$labels['sendmessage']    = 'Enviar';
+$labels['savemessage']    = 'Guardar como rascunho';
+$labels['addattachment']  = 'Adicionar anexo';
+$labels['charset']        = 'Charset';
+$labels['editortype']     = 'Tipo de editor';
+$labels['returnreceipt']  = 'Recibo de leitura';
+$labels['dsn']            = 'Recibo de entrega';
 $labels['mailreplyintro'] = 'Em $date, $sender escreveu:';
 $labels['originalmessage'] = 'Mensagem Original';
-$labels['editidents'] = 'Editar entidades';
-$labels['spellcheck'] = 'Corrector Ortográfico';
+
+$labels['editidents']    = 'Editar entidades';
+$labels['spellcheck']    = 'Corrector Ortográfico';
 $labels['checkspelling'] = 'Verificar ortografia';
 $labels['resumeediting'] = 'Continuar a edição';
-$labels['revertto'] = 'Reverter para';
+$labels['revertto']      = 'Reverter para';
+
 $labels['attach'] = 'Anexar';
 $labels['attachments'] = 'Anexos';
 $labels['upload'] = 'Carregar';
 $labels['uploadprogress'] = '$percent ($current de $total)';
-$labels['close'] = 'Fechar';
-$labels['messageoptions'] = 'Opções de mensagens...';
-$labels['low'] = 'Baixa';
-$labels['lowest'] = 'Muito baixa';
-$labels['normal'] = 'Normal';
-$labels['high'] = 'Alta';
+$labels['close']  = 'Fechar';
+$labels['messageoptions']  = 'Opções de mensagens...';
+
+$labels['low']     = 'Baixa';
+$labels['lowest']  = 'Muito baixa';
+$labels['normal']  = 'Normal';
+$labels['high']    = 'Alta';
 $labels['highest'] = 'Muito alta';
-$labels['nosubject'] = '(sem assunto)';
+
+$labels['nosubject']  = '(sem assunto)';
 $labels['showimages'] = 'Mostrar imagens';
 $labels['alwaysshow'] = 'Mostrar sempre imagens a partir de $sender';
-$labels['isdraft'] = 'Esta é uma mensagem de rascunho.';
-$labels['andnmore'] = '$nr mais...';
+$labels['isdraft']    = 'Esta é uma mensagem de rascunho.';
+$labels['andnmore']   = '$nr mais...';
 $labels['togglemoreheaders'] = 'Mostrar cabeçalhos adicionais da mensagem';
 $labels['togglefullheaders'] = 'Mostrar cabeçalho original da mensagem';
+
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Texto simples';
 $labels['savesentmessagein'] = 'Guardar mensagem enviada em';
 $labels['dontsave'] = 'não guardar';
 $labels['maxuploadsize'] = 'Tamanho máximo permitido do ficheiro é $size';
+
 $labels['addcc'] = 'Adicionar Cc';
 $labels['addbcc'] = 'Adicionar Bcc';
 $labels['addreplyto'] = 'Adicionar Responder para';
 $labels['addfollowupto'] = 'Adicionar Reencaminhar para';
+
+// mdn
 $labels['mdnrequest'] = 'O remetente desta mensagem pediu para ser notificado quando esta mensagem fosse lida. Deseja enviar uma notificação?';
 $labels['receiptread'] = 'Recibo de leitura';
 $labels['yourmessage'] = 'Isto é um recibo de leitura da sua mensagem';
 $labels['receiptnote'] = 'Nota: este recibo apenas indica que a mensagem foi aberta pelo destinatário. Não garante que a mensagem foi lida ou compreendida.';
-$labels['name'] = 'Nome completo';
-$labels['firstname'] = 'Primeiro nome';
-$labels['surname'] = 'Apelido';
-$labels['middlename'] = 'Outros nomes/apelidos';
-$labels['nameprefix'] = 'Título';
-$labels['namesuffix'] = 'Sufixo';
-$labels['nickname'] = 'Alcunha';
-$labels['jobtitle'] = 'Cargo';
-$labels['department'] = 'Departamento';
-$labels['gender'] = 'Género';
-$labels['maidenname'] = 'Nome solteiro';
-$labels['email'] = 'E-mail';
-$labels['phone'] = 'Telefone';
-$labels['address'] = 'Endereço';
-$labels['street'] = 'Rua';
-$labels['locality'] = 'Cidade';
-$labels['zipcode'] = 'Código postal';
-$labels['region'] = 'Localidade';
-$labels['country'] = 'Pais';
-$labels['birthday'] = 'Data de nascimento';
-$labels['anniversary'] = 'Aniversário';
-$labels['website'] = 'Página web';
+
+// address boook
+$labels['name']         = 'Nome completo';
+$labels['firstname']    = 'Primeiro nome';
+$labels['surname']      = 'Apelido';
+$labels['middlename']   = 'Outros nomes/apelidos';
+$labels['nameprefix']   = 'Título';
+$labels['namesuffix']   = 'Sufixo';
+$labels['nickname']     = 'Alcunha';
+$labels['jobtitle']     = 'Cargo';
+$labels['department']   = 'Departamento';
+$labels['gender']       = 'Género';
+$labels['maidenname']   = 'Nome solteiro';
+$labels['email']        = 'E-mail';
+$labels['phone']        = 'Telefone';
+$labels['address']      = 'Endereço';
+$labels['street']       = 'Rua';
+$labels['locality']     = 'Cidade';
+$labels['zipcode']      = 'Código postal';
+$labels['region']       = 'Localidade';
+$labels['country']      = 'Pais';
+$labels['birthday']     = 'Data de nascimento';
+$labels['anniversary']  = 'Aniversário';
+$labels['website']      = 'Página web';
 $labels['instantmessenger'] = 'Endereço IM';
 $labels['notes'] = 'Notas';
-$labels['male'] = 'masculino';
+$labels['male']   = 'masculino';
 $labels['female'] = 'feminino';
 $labels['manager'] = 'Gerente';
 $labels['assistant'] = 'Assistente';
-$labels['typeassistant'] = 'Assistente';
 $labels['spouse'] = 'Cônjuge';
 $labels['allfields'] = 'Todos os campos';
 $labels['search'] = 'Pesquisar';
 $labels['advsearch'] = 'Pesquisa avançada';
 $labels['advanced'] = 'Pesquisa avançada';
 $labels['other'] = 'Outro';
-$labels['typeother'] = 'Outro';
-$labels['typehome'] = 'Residência';
-$labels['typework'] = 'Empresa';
-$labels['typemobile'] = 'Telemóvel';
-$labels['typemain'] = 'Principal';
-$labels['typehomefax'] = 'Fax da residência';
-$labels['typeworkfax'] = 'Fax da empresa';
-$labels['typecar'] = 'Carro';
-$labels['typepager'] = 'Pager';
-$labels['typevideo'] = 'Vídeo';
-$labels['typehomepage'] = 'Página Inicial';
+
+$labels['typehome']   = 'Residência';
+$labels['typework']   = 'Empresa';
+$labels['typeother']  = 'Outro';
+$labels['typemobile']  = 'Telemóvel';
+$labels['typemain']  = 'Principal';
+$labels['typehomefax']  = 'Fax da residência';
+$labels['typeworkfax']  = 'Fax da empresa';
+$labels['typecar']  = 'Carro';
+$labels['typepager']  = 'Pager';
+$labels['typevideo']  = 'Vídeo';
+$labels['typeassistant']  = 'Assistente';
+$labels['typehomepage']  = 'Página Inicial';
 $labels['typeblog'] = 'Blog';
 $labels['typeprofile'] = 'Perfil';
+
 $labels['addfield'] = 'Adicionar campo...';
 $labels['addcontact'] = 'Criar novo contacto';
 $labels['editcontact'] = 'Editar contacto';
 $labels['contacts'] = 'Contactos';
 $labels['contactproperties'] = 'Dados do contacto';
 $labels['personalinfo'] = 'Informação pessoal';
-$labels['edit'] = 'Editar';
+
+$labels['edit']   = 'Editar';
 $labels['cancel'] = 'Cancelar';
-$labels['save'] = 'Guardar';
+$labels['save']   = 'Guardar';
 $labels['delete'] = 'Eliminar';
 $labels['rename'] = 'Renomear';
 $labels['addphoto'] = 'Adicionar';
 $labels['replacephoto'] = 'Substituir';
 $labels['uploadphoto'] = 'Carregar foto';
-$labels['newcontact'] = 'Criar novo contacto';
-$labels['deletecontact'] = 'Eliminar contacto(s) seleccionado(s)';
-$labels['composeto'] = 'Nova mensagem para';
+
+$labels['newcontact']     = 'Criar novo contacto';
+$labels['deletecontact']  = 'Eliminar contacto(s) seleccionado(s)';
+$labels['composeto']      = 'Nova mensagem para';
 $labels['contactsfromto'] = 'Contactos $from - $to of $count';
-$labels['print'] = 'Imprimir';
-$labels['export'] = 'Exportar';
-$labels['exportvcards'] = 'Exportar contactos no formato vCard';
+$labels['print']          = 'Imprimir';
+$labels['export']         = 'Exportar';
+$labels['exportall']      = 'Exportar todos';
+$labels['exportsel']      = 'Exportar selecionados';
+$labels['exportvcards']   = 'Exportar contactos no formato vCard';
 $labels['newcontactgroup'] = 'Criar novo grupo de contactos';
-$labels['grouprename'] = 'Renomear grupo';
-$labels['groupdelete'] = 'Eliminar grupo';
+$labels['grouprename']    = 'Renomear grupo';
+$labels['groupdelete']    = 'Eliminar grupo';
 $labels['groupremoveselected'] = 'Remover o(s) contacto(s) seleccionado(s) do grupo';
-$labels['previouspage'] = 'Página anterior';
-$labels['firstpage'] = 'Primeira página';
-$labels['nextpage'] = 'Página seguinte';
-$labels['lastpage'] = 'Última página';
+
+$labels['previouspage']   = 'Página anterior';
+$labels['firstpage']      = 'Primeira página';
+$labels['nextpage']       = 'Página seguinte';
+$labels['lastpage']       = 'Última página';
+
 $labels['group'] = 'Grupo';
 $labels['groups'] = 'Grupos';
 $labels['personaladrbook'] = 'Endereços pessoais';
+
 $labels['searchsave'] = 'Guardar pesquisa';
 $labels['searchdelete'] = 'Eliminar pesquisa';
+
 $labels['import'] = 'Importar';
 $labels['importcontacts'] = 'Importação de contactos';
 $labels['importfromfile'] = 'Importar do ficheiro:';
@@ -307,35 +366,43 @@ $labels['importtarget'] = 'Adicionar novo contacto ao livro de endereços:';
 $labels['importreplace'] = 'Substituir todo o livro de endereços.';
 $labels['importdesc'] = 'Pode enviar/carregar contactos de um livro de endereços existente.<br/>Neste momento suportamos a importação nos seguintes formatos: <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> ou CSV (valores separados por vírgula).';
 $labels['done'] = 'Terminado';
+
+// settings
 $labels['settingsfor'] = 'Configurações para';
 $labels['about'] = 'Acerca';
 $labels['preferences'] = 'Preferências';
 $labels['userpreferences'] = 'Preferências do utilizador';
 $labels['editpreferences'] = 'Editar preferências do utilizador';
+
 $labels['identities'] = 'Identidades';
 $labels['manageidentities'] = 'Gerir identidades para esta conta';
 $labels['newidentity'] = 'Nova identidade';
+
 $labels['newitem'] = 'Novo item';
 $labels['edititem'] = 'Editar item';
+
 $labels['preferhtml'] = 'Mostrar mensagens em HTML';
 $labels['defaultcharset'] = 'Conjunto de caracteres predefinido';
 $labels['htmlmessage'] = 'Mensagem em HTML';
+$labels['messagepart'] = 'Parte';
+$labels['digitalsig'] = 'Assinatura Digital';
 $labels['dateformat'] = 'Formato da data';
 $labels['timeformat'] = 'Formato da hora';
 $labels['prettydate'] = 'Formatar datas';
-$labels['setdefault'] = 'Marcar como predefinido';
-$labels['autodetect'] = 'Auto';
-$labels['language'] = 'Idioma';
-$labels['timezone'] = 'Fuso horário';
-$labels['pagesize'] = 'Linhas por página';
+$labels['setdefault']  = 'Marcar como predefinido';
+$labels['autodetect']  = 'Auto';
+$labels['language']  = 'Idioma';
+$labels['timezone']  = 'Fuso horário';
+$labels['pagesize']  = 'Linhas por página';
 $labels['signature'] = 'Assinatura';
-$labels['dstactive'] = 'Horário de verão';
+$labels['dstactive']  = 'Horário de verão';
 $labels['showinextwin'] = 'Abrir mensagem numa nova janela';
 $labels['composeextwin'] = 'Compor numa nova janela';
 $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';
@@ -358,11 +425,11 @@ $labels['showremoteimages'] = 'Mostrar imagens externas';
 $labels['fromknownsenders'] = 'de remetentes conhecidos';
 $labels['always'] = 'sempre';
 $labels['showinlineimages'] = 'Mostrar imagens anexadas abaixo da mensagem';
-$labels['autosavedraft'] = 'Guardar rascunho automaticamente';
-$labels['everynminutes'] = 'a cada $n minuto(s)';
-$labels['refreshinterval'] = 'Actualizar (verificar por novas mensagens, etc.)';
-$labels['never'] = 'nunca';
-$labels['immediately'] = 'imediatamente';
+$labels['autosavedraft']  = 'Guardar rascunho automaticamente';
+$labels['everynminutes']  = 'a cada $n minuto(s)';
+$labels['refreshinterval']  = 'Actualizar (verificar por novas mensagens, etc.)';
+$labels['never']  = 'nunca';
+$labels['immediately']  = 'imediatamente';
 $labels['messagesdisplaying'] = 'Visualização de mensagens';
 $labels['messagescomposition'] = 'Composição de mensagens';
 $labels['mimeparamfolding'] = 'Nome dos anexos';
@@ -389,12 +456,9 @@ $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';
+$labels['previewpanemarkread']  = 'Marcar mensagem como lida';
+$labels['afternseconds']  = 'após $n segundos';
 $labels['reqmdn'] = 'Pedir sempre um recibo de leitura';
 $labels['reqdsn'] = 'Pedir sempre um recibo de entrega';
 $labels['replysamefolder'] = 'Guardar respostas na mesma pasta da mensagem original';
@@ -411,13 +475,15 @@ $labels['mailtoprotohandler'] = 'Registar manipulador de protocolo para mailto:
 $labels['forwardmode'] = 'Reencaminhamento de mensagens';
 $labels['inline'] = 'em linha';
 $labels['asattachment'] = 'como anexo';
-$labels['folder'] = 'Pasta';
-$labels['foldername'] = 'Nome da pasta';
-$labels['subscribed'] = 'Subscrita';
+
+$labels['folder']  = 'Pasta';
+$labels['folders']  = 'Pastas';
+$labels['foldername']  = 'Nome da pasta';
+$labels['subscribed']  = 'Subscrita';
 $labels['messagecount'] = 'Mensagens';
-$labels['create'] = 'Criar';
-$labels['createfolder'] = 'Criar nova pasta';
-$labels['managefolders'] = 'Gerir pastas';
+$labels['create']  = 'Criar';
+$labels['createfolder']  = 'Criar nova pasta';
+$labels['managefolders']  = 'Gerir pastas';
 $labels['specialfolders'] = 'Pastas especiais (predefinidas)';
 $labels['properties'] = 'Propriedades';
 $labels['folderproperties'] = 'Propriedades da pasta';
@@ -427,23 +493,29 @@ $labels['info'] = 'Informação';
 $labels['getfoldersize'] = 'Clique para obter o tamanho da pasta';
 $labels['changesubscription'] = 'Clique para alterar a subscrição';
 $labels['foldertype'] = 'Tipo de pasta';
-$labels['personalfolder'] = 'Pasta privada';
-$labels['otherfolder'] = 'Outro tipo de pasta';
-$labels['sharedfolder'] = 'Pasta pública';
+$labels['personalfolder']  = 'Pasta privada';
+$labels['otherfolder']  = 'Outro tipo de pasta';
+$labels['sharedfolder']  = 'Pasta pública';
+
 $labels['sortby'] = 'Ordenar por';
-$labels['sortasc'] = 'Ordenação Ascendente';
+$labels['sortasc']  = 'Ordenação Ascendente';
 $labels['sortdesc'] = 'Ordenação Descendente';
 $labels['undo'] = 'Anular';
+
 $labels['installedplugins'] = 'Plugins instalados';
 $labels['plugin'] = 'Plugin';
 $labels['version'] = 'Versão';
 $labels['source'] = 'Fonte';
 $labels['license'] = 'Licença';
 $labels['support'] = 'Obter suporte';
+
+// units
 $labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
 $labels['GB'] = 'GB';
+
+// character sets
 $labels['unicode'] = 'Unicode';
 $labels['english'] = 'Inglês';
 $labels['westerneuropean'] = 'Europa Ocidental';
@@ -463,3 +535,4 @@ $labels['japanese'] = 'Japonês';
 $labels['korean'] = 'Coreano';
 $labels['chinese'] = 'Chinês';
 
+?>
diff --git a/program/localization/pt_PT/messages.inc b/program/localization/pt_PT/messages.inc
index 87e04ef6b..88b96e60e 100644
--- a/program/localization/pt_PT/messages.inc
+++ b/program/localization/pt_PT/messages.inc
@@ -2,20 +2,23 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/pt_PT/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: David                                                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['errortitle'] = 'Ocorreu um erro!';
-$messages['loginfailed'] = 'O utilizador ou palavra-passe que introduziu não correspondem.';
+$messages['errortitle']  = 'Ocorreu um erro!';
+$messages['loginfailed']  = 'O utilizador ou palavra-passe que introduziu não correspondem.';
 $messages['cookiesdisabled'] = 'O seu navegador não suporta cookies';
 $messages['sessionerror'] = 'A sua sessão é inválida ou expirou.';
 $messages['storageerror'] = 'A ligação ao servidor IMAP falhou';
@@ -25,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.';
@@ -57,11 +62,11 @@ $messages['errormoving'] = 'Não foi possível mover a mensagem';
 $messages['errorcopying'] = 'Não foi possível copiar a mensagem';
 $messages['errordeleting'] = 'Não foi possível eliminar a mensagem';
 $messages['errormarking'] = 'Não foi possível marcar a mensagem.';
-$messages['deletecontactconfirm'] = 'Deseja realmente eliminar o(s) contacto(s) seleccionado(s)?';
-$messages['deletegroupconfirm'] = 'Tem a certeza que pretende eliminar o grupo seleccionado?';
+$messages['deletecontactconfirm']  = 'Deseja realmente eliminar o(s) contacto(s) seleccionado(s)?';
+$messages['deletegroupconfirm']  = 'Tem a certeza que pretende eliminar o grupo seleccionado?';
 $messages['deletemessagesconfirm'] = 'Deseja realmente eliminar a(s) mensagem(ns) seleccionada(s)?';
-$messages['deletefolderconfirm'] = 'Deseja realmente eliminar esta pasta?';
-$messages['purgefolderconfirm'] = 'Deseja realmente eliminar todas mensagens desta pasta?';
+$messages['deletefolderconfirm']  = 'Deseja realmente eliminar esta pasta?';
+$messages['purgefolderconfirm']  = 'Deseja realmente eliminar todas mensagens desta pasta?';
 $messages['contactdeleting'] = 'A eliminar contacto(s)...';
 $messages['groupdeleting'] = 'A eliminar grupo...';
 $messages['folderdeleting'] = 'A eliminar pasta...';
@@ -70,11 +75,11 @@ $messages['foldersubscribing'] = 'A subscrever pasta...';
 $messages['folderunsubscribing'] = 'A cancelar subscrição da pasta...';
 $messages['formincomplete'] = 'Os campos não foram completamente preenchidos';
 $messages['noemailwarning'] = 'Por favor, introduza um endereço de e-mail válido.';
-$messages['nonamewarning'] = 'Por favor, escreva um nome.';
+$messages['nonamewarning']  = 'Por favor, escreva um nome.';
 $messages['nopagesizewarning'] = 'Por favor, escreva o tamanho da página';
 $messages['nosenderwarning'] = 'Por favor, introsuza o endereço de e-mail do remetente';
 $messages['norecipientwarning'] = 'Por favor, insira pelo menos um destinatário';
-$messages['nosubjectwarning'] = 'O campo "Assunto" não foi preenchido. Deseja incluí-lo agora?';
+$messages['nosubjectwarning']  = 'O campo "Assunto" não foi preenchido. Deseja incluí-lo agora?';
 $messages['nobodywarning'] = 'Enviar a mensagem sem texto?';
 $messages['notsentwarning'] = 'A mensagem não foi enviada, deseja apagá-la?';
 $messages['noldapserver'] = 'Seleccione um servidor LDAP para efectuar a pesquisa';
@@ -163,3 +168,4 @@ $messages['messagetoobig'] = 'A mensagem é demasiado grande para ser processada
 $messages['attachmentvalidationerror'] = 'ATENÇÃO! Este anexo é suspeito porque o seu tipo não coincide com o tipo declarado na mensagem. Se não confiar no remetente, não o deve abrir no navegador, pois pode ter conteúdos maliciosos.<br/><br/><em>Esperado: $expected; Encontrado: $detected</em>';
 $messages['noscriptwarning'] = 'Aviso: Este serviço de webmail utiliza Javascript! Para o poder utilizar, active o Javascript nas definições do seu navegador.';
 
+?>
diff --git a/program/localization/ro_RO/labels.inc b/program/localization/ro_RO/labels.inc
index d41103aec..6b59da313 100644
--- a/program/localization/ro_RO/labels.inc
+++ b/program/localization/ro_RO/labels.inc
@@ -2,58 +2,78 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ro_RO/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = 'Bine aţi venit la $product';
-$labels['username'] = 'Utilizator';
-$labels['password'] = 'Parolă';
-$labels['server'] = 'Server';
-$labels['login'] = 'Autentificare';
-$labels['logout'] = 'Deconectare';
-$labels['mail'] = 'E-Mail';
+
+// login page
+$labels['welcome']   = 'Bine aţi venit la $product';
+$labels['username']  = 'Utilizator';
+$labels['password']  = 'Parolă';
+$labels['server']    = 'Server';
+$labels['login']     = 'Autentificare';
+
+// taskbar
+$labels['logout']   = 'Deconectare';
+$labels['mail']     = 'E-Mail';
 $labels['settings'] = 'Setări personale';
 $labels['addressbook'] = 'Agendă';
-$labels['inbox'] = 'Primite';
+
+// mailbox names
+$labels['inbox']  = 'Primite';
 $labels['drafts'] = 'Ciorne';
-$labels['sent'] = 'Trimise';
-$labels['trash'] = 'Gunoi';
-$labels['junk'] = 'Spam';
+$labels['sent']   = 'Trimise';
+$labels['trash']  = 'Gunoi';
+$labels['junk']   = 'Spam';
+
+// message listing
 $labels['subject'] = 'Subiect';
-$labels['from'] = 'Expeditor';
-$labels['to'] = 'Destinatar';
-$labels['cc'] = 'Copie (CC)';
-$labels['bcc'] = 'Copie oarbă (BCC)';
+$labels['from']    = 'Expeditor';
+$labels['sender']  = 'Expeditor';
+$labels['to']      = 'Destinatar';
+$labels['cc']      = 'Copie (CC)';
+$labels['bcc']     = 'Copie oarbă (BCC)';
 $labels['replyto'] = 'Răspunde la';
 $labels['followupto'] = 'Followup-To';
-$labels['date'] = 'Data';
-$labels['size'] = 'Mărime';
+$labels['date']    = 'Data';
+$labels['size']    = 'Mărime';
 $labels['priority'] = 'Prioritate';
 $labels['organization'] = 'Organizaţie';
 $labels['readstatus'] = 'Starea de citit';
 $labels['listoptions'] = 'Listează opţiunile...';
+
 $labels['mailboxlist'] = 'Dosare';
-$labels['folders'] = 'Dosare';
 $labels['messagesfromto'] = 'Mesaje de la $from până la $to din $count';
 $labels['threadsfromto'] = 'Grupuri de la $from până la $to din $count';
 $labels['messagenrof'] = '$nr mesaje din $count';
 $labels['fromtoshort'] = '$from - $to din $count';
-$labels['copy'] = 'Copiază';
-$labels['move'] = 'Mută';
-$labels['moveto'] = 'Mută in...';
+
+$labels['copy']     = 'Copiază';
+$labels['move']     = 'Mută';
+$labels['moveto']   = 'Mută in...';
 $labels['download'] = 'Descarcă';
+$labels['open']     = 'Open';
+$labels['showattachment'] = 'Arată';
+$labels['showanyway'] = 'Arată oricum';
+
 $labels['filename'] = 'Nume fişier';
 $labels['filesize'] = 'Mărime fişier';
+
 $labels['addtoaddressbook'] = 'Adaugă în agendă';
+
+// weekdays short
 $labels['sun'] = 'Dum';
 $labels['mon'] = 'Lun';
 $labels['tue'] = 'Mar';
@@ -61,79 +81,90 @@ $labels['wed'] = 'Mie';
 $labels['thu'] = 'Joi';
 $labels['fri'] = 'Vin';
 $labels['sat'] = 'Sâm';
-$labels['sunday'] = 'Duminică';
-$labels['monday'] = 'Luni';
-$labels['tuesday'] = 'Marţi';
+
+// weekdays long
+$labels['sunday']    = 'Duminică';
+$labels['monday']    = 'Luni';
+$labels['tuesday']   = 'Marţi';
 $labels['wednesday'] = 'Miercuri';
-$labels['thursday'] = 'Joi';
-$labels['friday'] = 'Vineri';
-$labels['saturday'] = 'Sâmbătă';
-$labels['jan'] = 'Ian';
-$labels['feb'] = 'Feb';
-$labels['mar'] = 'Mar';
-$labels['apr'] = 'Apr';
-$labels['may'] = 'Mai';
-$labels['longmay'] = 'Mai';
-$labels['jun'] = 'Iun';
-$labels['jul'] = 'Iul';
-$labels['aug'] = 'Aug';
-$labels['sep'] = 'Sep';
-$labels['oct'] = 'Oct';
-$labels['nov'] = 'Noi';
-$labels['dec'] = 'Dec';
-$labels['longjan'] = 'Ianuarie';
-$labels['longfeb'] = 'Februarie';
-$labels['longmar'] = 'Martie';
-$labels['longapr'] = 'Aprilie';
-$labels['longjun'] = 'Iunie';
-$labels['longjul'] = 'Iulie';
-$labels['longaug'] = 'August';
-$labels['longsep'] = 'Septembrie';
-$labels['longoct'] = 'Octombrie';
-$labels['longnov'] = 'Noiembrie';
-$labels['longdec'] = 'Decembrie';
+$labels['thursday']  = 'Joi';
+$labels['friday']    = 'Vineri';
+$labels['saturday']  = 'Sâmbătă';
+
+// months short
+$labels['jan']	= 'Ian';
+$labels['feb']	= 'Feb';
+$labels['mar']	= 'Mar';
+$labels['apr']	= 'Apr';
+$labels['may']	= 'Mai';
+$labels['jun']	= 'Iun';
+$labels['jul'] 	= 'Iul';
+$labels['aug']	= 'Aug';
+$labels['sep']	= 'Sep';
+$labels['oct']	= 'Oct';
+$labels['nov']	= 'Noi';
+$labels['dec']	= 'Dec';
+
+// months long
+$labels['longjan']	= 'Ianuarie';
+$labels['longfeb']	= 'Februarie';
+$labels['longmar']	= 'Martie';
+$labels['longapr']	= 'Aprilie';
+$labels['longmay']	= 'Mai';
+$labels['longjun']	= 'Iunie';
+$labels['longjul']	= 'Iulie';
+$labels['longaug']	= 'August';
+$labels['longsep']	= 'Septembrie';
+$labels['longoct']	= 'Octombrie';
+$labels['longnov']	= 'Noiembrie';
+$labels['longdec']	= 'Decembrie';
+
 $labels['today'] = 'Astăzi';
-$labels['refresh'] = 'Actualizează';
-$labels['checkmail'] = 'Verifică mesaje noi';
-$labels['compose'] = 'Scrie un mesaj';
-$labels['writenewmessage'] = 'Scrie mesaj nou';
-$labels['reply'] = 'Răspunde';
-$labels['replytomessage'] = 'Răspunde la mesaj';
+
+// toolbar buttons
+$labels['refresh']          = 'Actualizează';
+$labels['checkmail']        = 'Verifică mesaje noi';
+$labels['compose']          = 'Scrie un mesaj';
+$labels['writenewmessage']  = 'Scrie mesaj nou';
+$labels['reply']            = 'Răspunde';
+$labels['replytomessage']   = 'Răspunde la mesaj';
 $labels['replytoallmessage'] = 'Răspunde la toţi';
-$labels['replyall'] = 'Răspunde la toţi';
-$labels['replylist'] = 'Lista de răspuns';
-$labels['forward'] = 'Înaintează';
-$labels['forwardinline'] = 'Înaintează ca citat';
+$labels['replyall']         = 'Răspunde la toţi';
+$labels['replylist']        = 'Lista de răspuns';
+$labels['forward']          = 'Înaintează';
+$labels['forwardinline']    = 'Înaintează ca citat';
 $labels['forwardattachment'] = 'Înaintează ca ataşament';
-$labels['forwardmessage'] = 'Trimite mesajul mai departe';
-$labels['deletemessage'] = 'Trimite mesajul la gunoi';
+$labels['forwardmessage']   = 'Trimite mesajul mai departe';
+$labels['deletemessage']    = 'Trimite mesajul la gunoi';
 $labels['movemessagetotrash'] = 'Mută mesajul la gunoi';
-$labels['printmessage'] = 'Listează mesajul';
-$labels['previousmessage'] = 'Afişează mesajul anterior';
-$labels['firstmessage'] = 'Afişează primul mesaj';
-$labels['nextmessage'] = 'Afişează următorul mesaj';
-$labels['lastmessage'] = 'Afişează ultimul mesaj';
-$labels['backtolist'] = 'Înapoi la lista cu mesaje';
-$labels['viewsource'] = 'Afişează sursa';
-$labels['mark'] = 'Marchează';
-$labels['markmessages'] = 'Marchează mesajele';
-$labels['markread'] = 'Ca citit';
-$labels['markunread'] = 'Ca necitit';
-$labels['markflagged'] = 'Ca marcat';
-$labels['markunflagged'] = 'Ca nemarcat';
-$labels['moreactions'] = 'Mai multe acțiuni...';
-$labels['more'] = 'Mai multe';
-$labels['back'] = 'Înapoi';
-$labels['options'] = 'Opţiuni';
+$labels['printmessage']     = 'Listează mesajul';
+$labels['previousmessage']  = 'Afişează mesajul anterior';
+$labels['firstmessage']     = 'Afişează primul mesaj';
+$labels['nextmessage']      = 'Afişează următorul mesaj';
+$labels['lastmessage']      = 'Afişează ultimul mesaj';
+$labels['backtolist']       = 'Înapoi la lista cu mesaje';
+$labels['viewsource']       = 'Afişează sursa';
+$labels['mark']             = 'Marchează';
+$labels['markmessages']     = 'Marchează mesajele';
+$labels['markread']         = 'Ca citit';
+$labels['markunread']       = 'Ca necitit';
+$labels['markflagged']      = 'Ca marcat';
+$labels['markunflagged']    = 'Ca nemarcat';
+$labels['moreactions']      = 'Mai multe acțiuni...';
+$labels['more']             = 'Mai multe';
+$labels['back']             = 'Înapoi';
+$labels['options']          = 'Opţiuni';
+
 $labels['select'] = 'Selectează';
 $labels['all'] = 'Toate';
 $labels['none'] = 'Fără sortare';
-$labels['nonesort'] = 'Fără sortare';
 $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ă';
 $labels['filter'] = 'Filtru';
 $labels['list'] = 'Listă';
@@ -142,12 +173,14 @@ $labels['expand-all'] = 'Extinde toate';
 $labels['expand-unread'] = 'Extinde necitite';
 $labels['collapse-all'] = 'Compactează toate';
 $labels['threaded'] = 'Grupate';
+
 $labels['autoexpand_threads'] = 'Extinde mesajele grupate';
 $labels['do_expand'] = 'toate grupările';
 $labels['expand_only_unread'] = 'doar pe cele cu mesaje necitite';
 $labels['fromto'] = 'Expeditor/Destinatar';
 $labels['flag'] = 'Marcaj';
 $labels['attachment'] = 'Ataşament';
+$labels['nonesort'] = 'Fără sortare';
 $labels['sentdate'] = 'Data trimiterii';
 $labels['arrival'] = 'Data primirii';
 $labels['asc'] = 'ascendent';
@@ -156,174 +189,220 @@ $labels['listcolumns'] = 'Arată coloane';
 $labels['listsorting'] = 'Sortează după';
 $labels['listorder'] = 'Ordinea de sortare';
 $labels['listmode'] = 'Mod de vizualizare';
+
 $labels['folderactions'] = 'Actiuni asupra folder-ului...';
 $labels['compact'] = 'Compactează';
 $labels['empty'] = 'Goleşte';
+
 $labels['quota'] = 'Spaţiu folosit';
-$labels['unknown'] = 'necunoscut';
-$labels['unlimited'] = 'nelimitat';
-$labels['quicksearch'] = 'Căutare rapidă';
-$labels['resetsearch'] = 'Anulează căutarea';
-$labels['searchmod'] = 'Parametrii de căutare';
-$labels['msgtext'] = 'Tot mesajul';
+$labels['unknown']  = 'necunoscut';
+$labels['unlimited']  = 'nelimitat';
+
+$labels['quicksearch']  = 'Căutare rapidă';
+$labels['resetsearch']  = 'Anulează căutarea';
+$labels['searchmod']  = 'Parametrii de căutare';
+$labels['msgtext']  = 'Tot mesajul';
+$labels['body']  = 'Corp';
+
 $labels['openinextwin'] = 'Deschide într-o fereastră nouă';
 $labels['emlsave'] = 'Salvează în format .eml';
-$labels['editasnew'] = 'Editează ca nou';
-$labels['sendmessage'] = 'Trimite mesaj';
-$labels['savemessage'] = 'Salvează această ciornă';
-$labels['addattachment'] = 'Ataşează fişier';
-$labels['charset'] = 'Set de caractere';
-$labels['editortype'] = 'Tip de editor';
-$labels['returnreceipt'] = 'Returnează confirmare de primire';
-$labels['dsn'] = 'Notificare despre starea trimiterii';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
+
+// message compose
+$labels['editasnew']      = 'Editează ca nou';
+$labels['send']           = 'Trimite';
+$labels['sendmessage']    = 'Trimite mesaj';
+$labels['savemessage']    = 'Salvează această ciornă';
+$labels['addattachment']  = 'Ataşează fişier';
+$labels['charset']        = 'Set de caractere';
+$labels['editortype']     = 'Tip de editor';
+$labels['returnreceipt']  = 'Returnează confirmare de primire';
+$labels['dsn']            = 'Notificare despre starea trimiterii';
 $labels['mailreplyintro'] = 'În $date, $sender a scris:';
 $labels['originalmessage'] = 'Mesaj original';
-$labels['editidents'] = 'Editează identităţi';
-$labels['spellcheck'] = 'Ortografie';
+
+$labels['editidents']    = 'Editează identităţi';
+$labels['spellcheck']    = 'Ortografie';
 $labels['checkspelling'] = 'Verifică ortografie';
 $labels['resumeediting'] = 'Reia editarea';
-$labels['revertto'] = 'Revino la';
+$labels['revertto']      = 'Revino la';
+
 $labels['attach'] = 'Ataşează';
 $labels['attachments'] = 'Ataşamente';
 $labels['upload'] = 'Încarcă';
 $labels['uploadprogress'] = '$percent ($current din $total)';
-$labels['close'] = 'Închide';
-$labels['messageoptions'] = 'Opţiuni mesaj...';
-$labels['low'] = 'Mică';
-$labels['lowest'] = 'Cea mai mică';
-$labels['normal'] = 'Normală';
-$labels['high'] = 'Mare';
+$labels['close']  = 'Închide';
+$labels['messageoptions']  = 'Opţiuni mesaj...';
+
+$labels['low']     = 'Mică';
+$labels['lowest']  = 'Cea mai mică';
+$labels['normal']  = 'Normală';
+$labels['high']    = 'Mare';
 $labels['highest'] = 'Cea mai mare';
-$labels['nosubject'] = '(fără subiect)';
+
+$labels['nosubject']  = '(fără subiect)';
 $labels['showimages'] = 'Afişează imagini';
 $labels['alwaysshow'] = 'Afişează întotdeauna imaginile de la $sender';
-$labels['isdraft'] = 'Acesta este un mesaj schiţă.';
+$labels['isdraft']    = 'Acesta este un mesaj schiţă.';
+$labels['andnmore']   = '$nr mai multe...';
+$labels['togglemoreheaders'] = 'Arată mai mult din antet';
+$labels['togglefullheaders'] = 'Arată mai puțin din antet';
+
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Text simplu';
 $labels['savesentmessagein'] = 'Salvează mesajele în';
 $labels['dontsave'] = 'Nu salva';
 $labels['maxuploadsize'] = 'Mărimea maximă admisă a fişierului este $size';
+
 $labels['addcc'] = 'Adaugă Cc';
 $labels['addbcc'] = 'Adaugă Bcc';
 $labels['addreplyto'] = 'Adaugă Raspunde-La';
 $labels['addfollowupto'] = 'Adaugă Followup-To';
+
+// mdn
 $labels['mdnrequest'] = 'Expeditorul acestui mesaj a solicitat să fie notificat la cititrea mesajului. Doriţi să notificaţi expeditorul?';
 $labels['receiptread'] = 'Returnează confirmare (citit)';
 $labels['yourmessage'] = 'Aceasta este o confirmare de primire a mesajului dumneavoastră.';
 $labels['receiptnote'] = 'Notă: Această confirmare doar vă informează că mesajul a fost afişat pe calculatorul destinatarului. Nu există nici o garanţie că destinatarul a citit sau a inţeles conţinutul mesajului.';
-$labels['name'] = 'Numele Contactului';
-$labels['firstname'] = 'Nume';
-$labels['surname'] = 'Prenume';
-$labels['middlename'] = 'Iniţiala tatălui';
-$labels['nameprefix'] = 'Prefix';
-$labels['namesuffix'] = 'Sufix';
-$labels['nickname'] = 'Poreclă';
-$labels['jobtitle'] = 'Funcția';
-$labels['department'] = 'Departament';
-$labels['gender'] = 'Sex';
-$labels['maidenname'] = 'Nume de fată';
-$labels['email'] = 'E-Mail';
-$labels['phone'] = 'Telefon';
-$labels['address'] = 'Adresă';
-$labels['street'] = 'Stradă';
-$labels['locality'] = 'Oraș';
-$labels['zipcode'] = 'Cod poştal';
-$labels['region'] = 'Stat/Judeţ';
-$labels['country'] = 'Țară';
-$labels['birthday'] = 'Ziua de naştere:';
-$labels['anniversary'] = 'Aniversare';
-$labels['website'] = 'Pagină web';
+
+// address boook
+$labels['name']         = 'Numele Contactului';
+$labels['firstname']    = 'Nume';
+$labels['surname']      = 'Prenume';
+$labels['middlename']   = 'Iniţiala tatălui';
+$labels['nameprefix']   = 'Prefix';
+$labels['namesuffix']   = 'Sufix';
+$labels['nickname']     = 'Poreclă';
+$labels['jobtitle']     = 'Funcția';
+$labels['department']   = 'Departament';
+$labels['gender']       = 'Sex';
+$labels['maidenname']   = 'Nume de fată';
+$labels['email']        = 'E-Mail';
+$labels['phone']        = 'Telefon';
+$labels['address']      = 'Adresă';
+$labels['street']       = 'Stradă';
+$labels['locality']     = 'Oraș';
+$labels['zipcode']      = 'Cod poştal';
+$labels['region']       = 'Stat/Judeţ';
+$labels['country']      = 'Țară';
+$labels['birthday']     = 'Ziua de naştere:';
+$labels['anniversary']  = 'Aniversare';
+$labels['website']      = 'Pagină web';
 $labels['instantmessenger'] = 'IM (Mesaj Instant)';
 $labels['notes'] = 'Notițe';
-$labels['male'] = 'masculin';
+$labels['male']   = 'masculin';
 $labels['female'] = 'feminin';
 $labels['manager'] = 'Manager';
 $labels['assistant'] = 'Asistent';
-$labels['typeassistant'] = 'Asistent';
 $labels['spouse'] = 'Soț/soție';
 $labels['allfields'] = 'Toate câmpurile';
 $labels['search'] = 'Căutare';
 $labels['advsearch'] = 'Căutare avansată';
 $labels['advanced'] = 'Avansat';
 $labels['other'] = 'Altele';
-$labels['typeother'] = 'Altele';
-$labels['typehome'] = 'Pagina Principală';
-$labels['typework'] = 'Servici';
-$labels['typemobile'] = 'Mobil';
-$labels['typemain'] = 'Principal';
-$labels['typehomefax'] = 'Fax acasă';
-$labels['typeworkfax'] = 'Fax serviciu';
-$labels['typecar'] = 'Mașină';
-$labels['typepager'] = 'Pager';
-$labels['typevideo'] = 'Video';
-$labels['typehomepage'] = 'Pagină de pornire';
+
+$labels['typehome']   = 'Pagina Principală';
+$labels['typework']   = 'Servici';
+$labels['typeother']  = 'Altele';
+$labels['typemobile']  = 'Mobil';
+$labels['typemain']  = 'Principal';
+$labels['typehomefax']  = 'Fax acasă';
+$labels['typeworkfax']  = 'Fax serviciu';
+$labels['typecar']  = 'Mașină';
+$labels['typepager']  = 'Pager';
+$labels['typevideo']  = 'Video';
+$labels['typeassistant']  = 'Asistent';
+$labels['typehomepage']  = 'Pagină de pornire';
 $labels['typeblog'] = 'Blog';
 $labels['typeprofile'] = 'Profil';
+
 $labels['addfield'] = 'Adaugă câmp...';
 $labels['addcontact'] = 'Adaugă contactul selectat în agendă';
 $labels['editcontact'] = 'Modifică contact';
 $labels['contacts'] = 'Contacte';
 $labels['contactproperties'] = 'Proprietăţile contactului...';
 $labels['personalinfo'] = 'Informații personale';
-$labels['edit'] = 'Editează';
+
+$labels['edit']   = 'Editează';
 $labels['cancel'] = 'Renunţă';
-$labels['save'] = 'Salvează';
+$labels['save']   = 'Salvează';
 $labels['delete'] = 'Şterge';
 $labels['rename'] = 'Redenumeşte';
 $labels['addphoto'] = 'Adaugă';
 $labels['replacephoto'] = 'Înlocuiește';
 $labels['uploadphoto'] = 'Încarcă poya';
-$labels['newcontact'] = 'Creează contact nou';
-$labels['deletecontact'] = 'Şterge contactul selectat';
-$labels['composeto'] = 'Compune e-mail pentru';
+
+$labels['newcontact']     = 'Creează contact nou';
+$labels['deletecontact']  = 'Şterge contactul selectat';
+$labels['composeto']      = 'Compune e-mail pentru';
 $labels['contactsfromto'] = 'Contacte de la $from până la $to din $count';
-$labels['print'] = 'Listează';
-$labels['export'] = 'Exportă';
-$labels['exportvcards'] = 'Exportă contactele în format vCard';
+$labels['print']          = 'Listează';
+$labels['export']         = 'Exportă';
+$labels['exportall']      = 'Exportă tot';
+$labels['exportsel']      = 'Exportă partea selectată';
+$labels['exportvcards']   = 'Exportă contactele în format vCard';
 $labels['newcontactgroup'] = 'Creează un nou grup de contacte';
-$labels['grouprename'] = 'Redenumește grupul';
-$labels['groupdelete'] = 'Șterge grupul';
-$labels['previouspage'] = 'Pagina anterioară';
-$labels['firstpage'] = 'Arată primul set';
-$labels['nextpage'] = 'Pagina următoare';
-$labels['lastpage'] = 'Arată ultimul set';
+$labels['grouprename']    = 'Redenumește grupul';
+$labels['groupdelete']    = 'Șterge grupul';
+$labels['groupremoveselected'] = 'Șterge contactele selectate din grup';
+
+$labels['previouspage']   = 'Pagina anterioară';
+$labels['firstpage']      = 'Arată primul set';
+$labels['nextpage']       = 'Pagina următoare';
+$labels['lastpage']       = 'Arată ultimul set';
+
 $labels['group'] = 'Grup';
 $labels['groups'] = 'Grupuri';
 $labels['personaladrbook'] = 'Adrese personale';
+
 $labels['searchsave'] = 'Salvează căutarea';
 $labels['searchdelete'] = 'Şterge căutarea';
+
 $labels['import'] = 'Importă';
 $labels['importcontacts'] = 'Importă contacte';
 $labels['importfromfile'] = 'Importă din fişier:';
 $labels['importtarget'] = 'Adaugă contactele noi în agenda:';
 $labels['importreplace'] = 'Înlocuieşte întreaga agendă';
+$labels['importdesc'] = 'Puteți încărcat contacte dintr-o agendă existentă.<br/>Momentan este suportat importul în formatul <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> sau în formatul CSV (comma-separated).';
 $labels['done'] = 'Finalizat';
+
+// settings
 $labels['settingsfor'] = 'Setări pentru';
 $labels['about'] = 'Despre';
 $labels['preferences'] = 'Preferinţe';
 $labels['userpreferences'] = 'Preferinţe utilizator';
 $labels['editpreferences'] = 'Modifică preferinţe utilizator';
+
 $labels['identities'] = 'Identităţi';
 $labels['manageidentities'] = 'Administrează identităţi pentru acest cont';
 $labels['newidentity'] = 'Identitate nouă';
+
 $labels['newitem'] = 'Obiect nou';
 $labels['edititem'] = 'Editează obiect';
+
 $labels['preferhtml'] = 'Format HTML';
 $labels['defaultcharset'] = 'Set implicit de caractere';
 $labels['htmlmessage'] = 'Mesaj HTML';
+$labels['messagepart'] = 'Parte';
+$labels['digitalsig'] = 'Semnătură digitală';
 $labels['dateformat'] = 'Format dată';
 $labels['timeformat'] = 'Format oră';
 $labels['prettydate'] = 'Dată formatată';
-$labels['setdefault'] = 'Setează implicit';
-$labels['autodetect'] = 'Automat';
-$labels['language'] = 'Limba';
-$labels['timezone'] = 'Fus orar';
-$labels['pagesize'] = 'Rânduri pe pagină';
+$labels['setdefault']  = 'Setează implicit';
+$labels['autodetect']  = 'Automat';
+$labels['language']  = 'Limba';
+$labels['timezone']  = 'Fus orar';
+$labels['pagesize']  = 'Rânduri pe pagină';
 $labels['signature'] = 'Semnătură';
-$labels['dstactive'] = 'Reglare automată oră de vară';
+$labels['dstactive']  = 'Reglare automată oră de vară';
+$labels['showinextwin'] = 'Deschide mesajul în fereastră nouă';
+$labels['composeextwin'] = 'Compune mesajul în fereastră nouă';
 $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';
@@ -341,14 +420,16 @@ $labels['readwhendeleted'] = 'Marchează mesajul ca şi citit la ştergere';
 $labels['flagfordeletion'] = 'Marchează mesajul pentru ştergere în loc de a-l şterge direct';
 $labels['skipdeleted'] = 'Nu arăta mesajele şterse';
 $labels['deletealways'] = 'Dacă mutarea mesajelor în coş eşuează, se vor şterge';
+$labels['deletejunk'] = 'Șterge direct mesajele în Junk';
 $labels['showremoteimages'] = 'Arată imaginile care nu fac parte din e-mail';
 $labels['fromknownsenders'] = 'de la expeditori cunoscuţi';
 $labels['always'] = 'întotdeauna';
 $labels['showinlineimages'] = 'Arată imaginile ataşate sub mesaj';
-$labels['autosavedraft'] = 'Salvează ciorna automat';
-$labels['everynminutes'] = 'la fiecare $n minut(e)';
-$labels['never'] = 'niciodată';
-$labels['immediately'] = 'imediat';
+$labels['autosavedraft']  = 'Salvează ciorna automat';
+$labels['everynminutes']  = 'la fiecare $n minut(e)';
+$labels['refreshinterval']  = 'Actualizare (verificare mesaje noi, etc.)';
+$labels['never']  = 'niciodată';
+$labels['immediately']  = 'imediat';
 $labels['messagesdisplaying'] = 'Afişarea mesajelor';
 $labels['messagescomposition'] = 'Compunerea mesajelor';
 $labels['mimeparamfolding'] = 'Nume ataşamente';
@@ -368,22 +449,20 @@ $labels['maintenance'] = 'Mentenanţă';
 $labels['newmessage'] = 'Mesaj nou';
 $labels['signatureoptions'] = 'Opţiuni semnătură';
 $labels['whenreplying'] = 'Când răspundeţi';
+$labels['replyempty'] = 'nu cita mesajul original';
 $labels['replytopposting'] = 'începeţi mesajul nou deasupra originalului';
 $labels['replybottomposting'] = 'începeţi mesajul nou dedesubtul originalului';
 $labels['replyremovesignature'] = 'Când răspundeţi, se şterge semnătura originală din mesaj';
 $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';
+$labels['previewpanemarkread']  = 'Marchează mesajele previzualizate ca citite';
+$labels['afternseconds']  = 'după $n secunde';
 $labels['reqmdn'] = 'Cere întotdeauna o confirmare de primire';
 $labels['reqdsn'] = 'Cere întotdeauna o notificare a stării de trimitere';
 $labels['replysamefolder'] = 'Pune răspunsurile în folder-ul mesajului la care se răspunde';
-$labels['defaultaddressbook'] = 'Adaugă noile contacte la agenda selectată';
+$labels['defaultabook'] = 'Agenda implicită';
 $labels['autocompletesingle'] = 'Sari peste adresele e-mail alternative la autocompletare';
 $labels['listnamedisplay'] = 'Listează contactele ca';
 $labels['spellcheckbeforesend'] = 'Verifică ortografia înainte de a trimite un mesaj';
@@ -393,13 +472,18 @@ $labels['spellcheckignorenums'] = 'Ignoră cuvintele cu numere';
 $labels['spellcheckignorecaps'] = 'Ignoră cuvintele din litere mari';
 $labels['addtodict'] = 'Adaugă la dicţionar';
 $labels['mailtoprotohandler'] = 'Îregistrează handler protocol pentru mailto: link-uri';
-$labels['folder'] = 'Dosar';
-$labels['foldername'] = 'Nume dosar';
-$labels['subscribed'] = 'Înscris';
+$labels['forwardmode'] = 'Trimitere mai departe mesaj';
+$labels['inline'] = 'într-e linii';
+$labels['asattachment'] = 'ca atașament';
+
+$labels['folder']  = 'Dosar';
+$labels['folders']  = 'Dosare';
+$labels['foldername']  = 'Nume dosar';
+$labels['subscribed']  = 'Înscris';
 $labels['messagecount'] = 'Mesaje';
-$labels['create'] = 'Creează';
-$labels['createfolder'] = 'Creează dosar nou';
-$labels['managefolders'] = 'Administrează dosare';
+$labels['create']  = 'Creează';
+$labels['createfolder']  = 'Creează dosar nou';
+$labels['managefolders']  = 'Administrează dosare';
 $labels['specialfolders'] = 'Dosare speciale';
 $labels['properties'] = 'Proprietăți';
 $labels['folderproperties'] = 'Proprietăţile folder-ului';
@@ -409,22 +493,29 @@ $labels['info'] = 'Informații';
 $labels['getfoldersize'] = 'Click pentru dimensiunea dosarului';
 $labels['changesubscription'] = 'Click pentru a modifica abonarea';
 $labels['foldertype'] = 'Tip dosar';
-$labels['personalfolder'] = 'Dosar privat';
-$labels['otherfolder'] = 'Dosarul altui utilizator';
-$labels['sharedfolder'] = 'Dosar public';
+$labels['personalfolder']  = 'Dosar privat';
+$labels['otherfolder']  = 'Dosarul altui utilizator';
+$labels['sharedfolder']  = 'Dosar public';
+
 $labels['sortby'] = 'Sortează după';
-$labels['sortasc'] = 'Sortează ascendent';
+$labels['sortasc']  = 'Sortează ascendent';
 $labels['sortdesc'] = 'Sortează descendent';
 $labels['undo'] = 'Anulaţi/Revocați';
+
+$labels['installedplugins'] = 'Instalare module';
 $labels['plugin'] = 'Plugin';
 $labels['version'] = 'Versiune';
 $labels['source'] = 'Sursă';
 $labels['license'] = 'Licență';
 $labels['support'] = 'Cere asistenţă';
+
+// units
 $labels['B'] = 'O';
 $labels['KB'] = 'KO';
 $labels['MB'] = 'MO';
 $labels['GB'] = 'GO';
+
+// character sets
 $labels['unicode'] = 'Unicode';
 $labels['english'] = 'Englezesc';
 $labels['westerneuropean'] = 'Europa de Vest';
@@ -444,3 +535,4 @@ $labels['japanese'] = 'Japonez';
 $labels['korean'] = 'Coreean';
 $labels['chinese'] = 'Chinezesc';
 
+?>
diff --git a/program/localization/ro_RO/messages.inc b/program/localization/ro_RO/messages.inc
index 93fa05f97..96b9de593 100644
--- a/program/localization/ro_RO/messages.inc
+++ b/program/localization/ro_RO/messages.inc
@@ -2,33 +2,40 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ro_RO/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Raduta Alex <raduta.alex@gmail.com>                           |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['errortitle'] = 'A avut loc o EROARE!';
-$messages['loginfailed'] = 'Autentificare eşuată';
+$messages['errortitle']  = 'A avut loc o EROARE!';
+$messages['loginfailed']  = 'Autentificare eşuată';
 $messages['cookiesdisabled'] = 'Browserul dumneavoastră nu acceptă cookies';
 $messages['sessionerror'] = 'Sesiunea dumneavoastră este invalidă sau a expirat';
 $messages['storageerror'] = 'Conectarea la serverul IMAP a eşuat';
 $messages['servererror'] = 'Eroare de server!';
 $messages['servererrormsg'] = 'Eroare Server: $msg';
 $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ă';
 $messages['loggedout'] = 'Sesiune încheiată cu succes. La revedere!';
 $messages['mailboxempty'] = 'Căsuţa poştală este goală';
+$messages['refreshing'] = 'Reîmprospătare...';
 $messages['loading'] = 'Se încarcă...';
 $messages['uploading'] = 'Fişierul se încarcă...';
 $messages['uploadingmany'] = 'Încarc fişierele...';
@@ -55,11 +62,11 @@ $messages['errormoving'] = 'Mesajul(e) nu a(u) putut fi mutat(e)';
 $messages['errorcopying'] = 'Mesajul(e) nu a(u) putut fi copiat(e)';
 $messages['errordeleting'] = 'Mesajul(e) nu a(u) putut fi şters(e)';
 $messages['errormarking'] = 'Mesajul(e) nu a(u) putut fi marcat(e)';
-$messages['deletecontactconfirm'] = 'Sunteţi sigur că doriţi să ştergeţi contactul(ele) selectate?';
-$messages['deletegroupconfirm'] = 'Chiar vrei să ştergi grupul selectat?';
+$messages['deletecontactconfirm']  = 'Sunteţi sigur că doriţi să ştergeţi contactul(ele) selectate?';
+$messages['deletegroupconfirm']  = 'Chiar vrei să ştergi grupul selectat?';
 $messages['deletemessagesconfirm'] = 'Chiar doriţi să ştergeţi mesajele selectate ?';
-$messages['deletefolderconfirm'] = 'Sunteţi sigur că doriţi să ştergeţi acest dosar?';
-$messages['purgefolderconfirm'] = 'Sunteţi sigur că doriţi să ştergeţi toate mesajele din acest dosar?';
+$messages['deletefolderconfirm']  = 'Sunteţi sigur că doriţi să ştergeţi acest dosar?';
+$messages['purgefolderconfirm']  = 'Sunteţi sigur că doriţi să ştergeţi toate mesajele din acest dosar?';
 $messages['contactdeleting'] = 'Şterg contactul(ele)...';
 $messages['groupdeleting'] = 'Şterg grupul...';
 $messages['folderdeleting'] = 'Se şterge dosarul...';
@@ -68,11 +75,11 @@ $messages['foldersubscribing'] = 'Abonez dosarul...';
 $messages['folderunsubscribing'] = 'Dezabonez dosarul...';
 $messages['formincomplete'] = 'Formularul nu a fost completat corect';
 $messages['noemailwarning'] = 'Vă rugăm să introduceţi o adresă de e-mail validă';
-$messages['nonamewarning'] = 'Vă rugăm să introduceţi un nume';
+$messages['nonamewarning']  = 'Vă rugăm să introduceţi un nume';
 $messages['nopagesizewarning'] = 'Vă rugăm să introduceţi mărimea paginii';
 $messages['nosenderwarning'] = 'Vă rugăm să introduceţi adresa expeditorului';
 $messages['norecipientwarning'] = 'Vă rugăm să introduceţi cel puţin un destinatar';
-$messages['nosubjectwarning'] = 'Mesajul nu are subiect. Vreţi să introduceţi unul acum?';
+$messages['nosubjectwarning']  = 'Mesajul nu are subiect. Vreţi să introduceţi unul acum?';
 $messages['nobodywarning'] = 'Trimiteţi acest mesaj fără text?';
 $messages['notsentwarning'] = 'Mesajul nu a fost trimis. Vreţi să renunţaţi la el?';
 $messages['noldapserver'] = 'Vă rugăm să alegeţi un server ldap pentru căutare';
@@ -114,7 +121,9 @@ $messages['selectimportfile'] = 'Va rugăm să selectaţi fişierul pentru înc�
 $messages['addresswriterror'] = 'Agenda selectată nu poate fi actualizată';
 $messages['contactaddedtogroup'] = 'Contactele au fost adăugate cu succes la acest grup';
 $messages['contactremovedfromgroup'] = 'Contactele au fost şterse cu succes din acest grup';
+$messages['nogroupassignmentschanged'] = 'Atribuirile la grupuri nu au fost modificate.';
 $messages['importwait'] = 'Datele sunt importate, vă rugăm să aşteptaţi...';
+$messages['importformaterror'] = 'Importul a eșuat! Fișierul încărcat nu este un fișier valid pentru import de date.';
 $messages['importconfirm'] = 'Contactele $inserted au fost importate cu succes, $skipped intrări au fost ignorate deoarece ele există deja:$names';
 $messages['importconfirmskipped'] = '<b>Am sărit peste $skipped înregistrări</b>';
 $messages['opnotpermitted'] = 'Operaţia nu este permisă!';
@@ -156,4 +165,7 @@ $messages['invalidimageformat'] = 'Tip invalid de imagine.';
 $messages['mispellingsfound'] = 'Au fost găsite greşeli de ortografie în mesaj.';
 $messages['parentnotwritable'] = 'Nu pot crea/muta dosarul în dosarul părinte selectat. Fără drepturi de acces.';
 $messages['messagetoobig'] = 'Partea de mesaj este prea mare pentru a o procesa.';
+$messages['attachmentvalidationerror'] = 'ATENȚIE! Acest atașament este suspect, fiindcă tipul lui nu coincide cu tipul declarat în mesaj. Dacă nu aveți încredere în expeditor, nu vă recomandăm să deschideți fișierul, fiindcă poate avea conținut malițios. <br/><br/><em>Așteptat: $expected; găsit: $detected</em>';
+$messages['noscriptwarning'] = 'Atenție: Serviciul de webmail necesită Javascript! Pentru al utiliza vă rugăm activați Javascript în navigator.';
 
+?>
diff --git a/program/localization/ru_RU/labels.inc b/program/localization/ru_RU/labels.inc
index 43d673b28..8a136aa77 100644
--- a/program/localization/ru_RU/labels.inc
+++ b/program/localization/ru_RU/labels.inc
@@ -2,60 +2,78 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ru_RU/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Orkhan Guliyev <proger@box.az>                                |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = 'Добро пожаловать в $product!';
-$labels['username'] = 'Имя пользователя';
-$labels['password'] = 'Пароль';
-$labels['server'] = 'Сервер';
-$labels['login'] = 'Войти';
-$labels['logout'] = 'Выход';
-$labels['mail'] = 'Почта';
+
+// login page
+$labels['welcome']   = 'Добро пожаловать в $product!';
+$labels['username']  = 'Имя пользователя';
+$labels['password']  = 'Пароль';
+$labels['server']    = 'Сервер';
+$labels['login']     = 'Войти';
+
+// taskbar
+$labels['logout']   = 'Выход';
+$labels['mail']     = 'Почта';
 $labels['settings'] = 'Настройки';
 $labels['addressbook'] = 'Контакты';
-$labels['inbox'] = 'Входящие';
+
+// mailbox names
+$labels['inbox']  = 'Входящие';
 $labels['drafts'] = 'Черновики';
-$labels['sent'] = 'Отправленные';
-$labels['trash'] = 'Корзина';
-$labels['junk'] = 'СПАМ';
+$labels['sent']   = 'Отправленные';
+$labels['trash']  = 'Корзина';
+$labels['junk']   = 'СПАМ';
+
+// message listing
 $labels['subject'] = 'Тема';
-$labels['from'] = 'От';
-$labels['to'] = 'Кому';
-$labels['cc'] = 'Копия';
-$labels['bcc'] = 'Скрытая';
+$labels['from']    = 'От';
+$labels['sender']  = 'Отправитель';
+$labels['to']      = 'Кому';
+$labels['cc']      = 'Копия';
+$labels['bcc']     = 'Скрытая';
 $labels['replyto'] = 'Ответить';
 $labels['followupto'] = 'Followup-To';
-$labels['date'] = 'Дата';
-$labels['size'] = 'Размер';
+$labels['date']    = 'Дата';
+$labels['size']    = 'Размер';
 $labels['priority'] = 'Приоритет';
 $labels['organization'] = 'Организация';
 $labels['readstatus'] = 'Статус прочтения';
 $labels['listoptions'] = 'Настройки списка...';
+
 $labels['mailboxlist'] = 'Папки';
-$labels['folders'] = 'Папки';
 $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['copy']     = 'Копировать';
+$labels['move']     = 'Переместить';
+$labels['moveto']   = 'Переместить в...';
 $labels['download'] = 'Загрузить';
+$labels['open']     = 'Открыть';
 $labels['showattachment'] = 'Показать';
 $labels['showanyway'] = 'Все равно показать';
+
 $labels['filename'] = 'Имя файла';
 $labels['filesize'] = 'Размер файла';
+
 $labels['addtoaddressbook'] = 'Добавить в контакты';
+
+// weekdays short
 $labels['sun'] = 'Вс';
 $labels['mon'] = 'Пн';
 $labels['tue'] = 'Вт';
@@ -63,78 +81,88 @@ $labels['wed'] = 'Ср';
 $labels['thu'] = 'Чт';
 $labels['fri'] = 'Пт';
 $labels['sat'] = 'Сб';
-$labels['sunday'] = 'Воскресенье';
-$labels['monday'] = 'Понедельник';
-$labels['tuesday'] = 'Вторник';
+
+// weekdays long
+$labels['sunday']    = 'Воскресенье';
+$labels['monday']    = 'Понедельник';
+$labels['tuesday']   = 'Вторник';
 $labels['wednesday'] = 'Среда';
-$labels['thursday'] = 'Четверг';
-$labels['friday'] = 'Пятница';
-$labels['saturday'] = 'Суббота';
-$labels['jan'] = 'Янв';
-$labels['feb'] = 'Фев';
-$labels['mar'] = 'Мар';
-$labels['apr'] = 'Апр';
-$labels['may'] = 'Май';
-$labels['longmay'] = 'Май';
-$labels['jun'] = 'Июн';
-$labels['jul'] = 'Июл';
-$labels['aug'] = 'Авг';
-$labels['sep'] = 'Сен';
-$labels['oct'] = 'Окт';
-$labels['nov'] = 'Ноя';
-$labels['dec'] = 'Дек';
-$labels['longjan'] = 'Январь';
-$labels['longfeb'] = 'Февраль';
-$labels['longmar'] = 'Март';
-$labels['longapr'] = 'Апрель';
-$labels['longjun'] = 'Июнь';
-$labels['longjul'] = 'Июль';
-$labels['longaug'] = 'Август';
-$labels['longsep'] = 'Сентябрь';
-$labels['longoct'] = 'Октябрь';
-$labels['longnov'] = 'Ноябрь';
-$labels['longdec'] = 'Декабрь';
+$labels['thursday']  = 'Четверг';
+$labels['friday']    = 'Пятница';
+$labels['saturday']  = 'Суббота';
+
+// months short
+$labels['jan']	= 'Янв';
+$labels['feb']	= 'Фев';
+$labels['mar']	= 'Мар';
+$labels['apr']	= 'Апр';
+$labels['may']	= 'Май';
+$labels['jun']	= 'Июн';
+$labels['jul'] 	= 'Июл';
+$labels['aug']	= 'Авг';
+$labels['sep']	= 'Сен';
+$labels['oct']	= 'Окт';
+$labels['nov']	= 'Ноя';
+$labels['dec']	= 'Дек';
+
+// months long
+$labels['longjan']	= 'Январь';
+$labels['longfeb']	= 'Февраль';
+$labels['longmar']	= 'Март';
+$labels['longapr']	= 'Апрель';
+$labels['longmay']	= 'Май';
+$labels['longjun']	= 'Июнь';
+$labels['longjul']	= 'Июль';
+$labels['longaug']	= 'Август';
+$labels['longsep']	= 'Сентябрь';
+$labels['longoct']	= 'Октябрь';
+$labels['longnov']	= 'Ноябрь';
+$labels['longdec']	= 'Декабрь';
+
 $labels['today'] = 'Сегодня';
-$labels['refresh'] = 'Обновить';
-$labels['checkmail'] = 'Доставить почту';
-$labels['compose'] = 'Написать сообщение';
-$labels['writenewmessage'] = 'Новое сообщение';
-$labels['reply'] = 'Ответить';
-$labels['replytomessage'] = 'Ответить';
+
+// toolbar buttons
+$labels['refresh']          = 'Обновить';
+$labels['checkmail']        = 'Доставить почту';
+$labels['compose']          = 'Написать сообщение';
+$labels['writenewmessage']  = 'Новое сообщение';
+$labels['reply']            = 'Ответить';
+$labels['replytomessage']   = 'Ответить';
 $labels['replytoallmessage'] = 'Ответить по списку или отправителю и всем получателям';
-$labels['replyall'] = 'Ответить всем';
-$labels['replylist'] = 'Ответить в список рассылки';
-$labels['forward'] = 'Переслать';
-$labels['forwardinline'] = 'Переслать в теле письма';
+$labels['replyall']         = 'Ответить всем';
+$labels['replylist']        = 'Ответить в список рассылки';
+$labels['forward']          = 'Переслать';
+$labels['forwardinline']    = 'Переслать в теле письма';
 $labels['forwardattachment'] = 'Переслать как вложение';
-$labels['forwardmessage'] = 'Переслать';
-$labels['deletemessage'] = 'В корзину';
+$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['more'] = 'Еще';
-$labels['back'] = 'Назад';
-$labels['options'] = 'Параметры';
+$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['more']             = 'Еще';
+$labels['back']             = 'Назад';
+$labels['options']          = 'Параметры';
+
 $labels['select'] = 'Выбрать';
 $labels['all'] = 'Все';
 $labels['none'] = 'Отсутствует';
-$labels['nonesort'] = 'Отсутствует';
 $labels['currpage'] = 'Текущая страница';
 $labels['unread'] = 'Непрочитанные';
 $labels['flagged'] = 'Помеченные';
 $labels['unanswered'] = 'Неотвеченные';
+$labels['withattachment'] = 'С вложением';
 $labels['deleted'] = 'Удаленное';
 $labels['undeleted'] = 'Не удалено';
 $labels['invert'] = 'Инвертное';
@@ -145,12 +173,14 @@ $labels['expand-all'] = 'Развернуть все';
 $labels['expand-unread'] = 'Развернуть непрочитанные';
 $labels['collapse-all'] = 'Свернуть все';
 $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['asc'] = 'по возрастанию';
@@ -159,147 +189,176 @@ $labels['listcolumns'] = 'Колонки';
 $labels['listsorting'] = 'Сортировать по';
 $labels['listorder'] = 'Порядок сортировки';
 $labels['listmode'] = 'Режим просмотра';
+
 $labels['folderactions'] = 'Операции над папкой...';
 $labels['compact'] = 'Сжать';
 $labels['empty'] = 'Опустошить';
+
 $labels['quota'] = 'Квота';
-$labels['unknown'] = 'неизвестно';
-$labels['unlimited'] = 'без ограничений';
-$labels['quicksearch'] = 'Быстрый поиск';
-$labels['resetsearch'] = 'Сброс';
-$labels['searchmod'] = 'Варианты поиска';
-$labels['msgtext'] = 'Всё сообщение';
+$labels['unknown']  = 'неизвестно';
+$labels['unlimited']  = 'без ограничений';
+
+$labels['quicksearch']  = 'Быстрый поиск';
+$labels['resetsearch']  = 'Сброс';
+$labels['searchmod']  = 'Варианты поиска';
+$labels['msgtext']  = 'Всё сообщение';
+$labels['body']  = 'Тело письма';
+
 $labels['openinextwin'] = 'Открыть в новом окне';
 $labels['emlsave'] = 'Сохранить (.eml)';
-$labels['editasnew'] = 'Редактировать как новое';
-$labels['send'] = 'Отправлено';
-$labels['sendmessage'] = 'Отправить сейчас';
-$labels['savemessage'] = 'Сохранить черновик';
-$labels['addattachment'] = 'Добавить вложение';
-$labels['charset'] = 'Кодировка';
-$labels['editortype'] = 'Редактор';
-$labels['returnreceipt'] = 'Запрос ответа';
-$labels['dsn'] = 'Уведомление о состоянии доставки';
+$labels['changeformattext'] = 'Показать в формате обычного текста';
+$labels['changeformathtml'] = 'Показать в HTML формате';
+
+// message compose
+$labels['editasnew']      = 'Редактировать как новое';
+$labels['send']           = 'Отправить';
+$labels['sendmessage']    = 'Отправить сейчас';
+$labels['savemessage']    = 'Сохранить черновик';
+$labels['addattachment']  = 'Добавить вложение';
+$labels['charset']        = 'Кодировка';
+$labels['editortype']     = 'Редактор';
+$labels['returnreceipt']  = 'Запрос ответа';
+$labels['dsn']            = 'Уведомление о состоянии доставки';
 $labels['mailreplyintro'] = '$sender писал $date:';
 $labels['originalmessage'] = 'Исходное сообщение';
-$labels['editidents'] = 'Изменить данные';
-$labels['spellcheck'] = 'Орфография';
+
+$labels['editidents']    = 'Изменить данные';
+$labels['spellcheck']    = 'Орфография';
 $labels['checkspelling'] = 'Проверить орфографию';
 $labels['resumeediting'] = 'Продолжить редактирование';
-$labels['revertto'] = 'Отменить правки';
+$labels['revertto']      = 'Отменить правки';
+
 $labels['attach'] = 'Вложить';
 $labels['attachments'] = 'Вложения';
 $labels['upload'] = 'Загрузить';
 $labels['uploadprogress'] = '$percent ($current из $total)';
-$labels['close'] = 'Закрыть';
-$labels['messageoptions'] = 'Настройки сообщений...';
-$labels['low'] = 'Низкий';
-$labels['lowest'] = 'Нижайш.';
-$labels['normal'] = 'Норм.';
-$labels['high'] = 'Высокий';
+$labels['close']  = 'Закрыть';
+$labels['messageoptions']  = 'Настройки сообщений...';
+
+$labels['low']     = 'Низкий';
+$labels['lowest']  = 'Нижайш.';
+$labels['normal']  = 'Норм.';
+$labels['high']    = 'Высокий';
 $labels['highest'] = 'Высоч.';
-$labels['nosubject'] = '(без темы)';
+
+$labels['nosubject']  = '(без темы)';
 $labels['showimages'] = 'Показать изображения';
 $labels['alwaysshow'] = 'Всегда показывать изображенияв письмах от $sender';
-$labels['isdraft'] = 'Это черновик.';
-$labels['andnmore'] = 'ещё $nr...';
+$labels['isdraft']    = 'Это черновик.';
+$labels['andnmore']   = 'ещё $nr...';
 $labels['togglemoreheaders'] = 'Загрузить ещё заголовки сообщений';
 $labels['togglefullheaders'] = 'Показать оригинальные заголовки сообщения';
+
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Текст';
 $labels['savesentmessagein'] = 'Сохранить в';
 $labels['dontsave'] = 'не сохранять';
 $labels['maxuploadsize'] = 'Максимальный размер файла $size';
+
 $labels['addcc'] = 'Копия';
 $labels['addbcc'] = 'Скрытая копия';
 $labels['addreplyto'] = 'Кому ответить';
 $labels['addfollowupto'] = 'Добавить Followup-To';
+
+// mdn
 $labels['mdnrequest'] = 'Отправитель этого сообщения запросил уведомление о прочтении. Отправить уведомление?';
 $labels['receiptread'] = 'Уведомление о прочтении';
 $labels['yourmessage'] = 'Это уведомление о прочтении вашего сообщения';
 $labels['receiptnote'] = 'Это уведомление означает только, что сообщение было открыто получателем, и не гарантирует того, что оно было прочитано и (или) понято.';
-$labels['name'] = 'Отображаемое имя';
-$labels['firstname'] = 'Имя';
-$labels['surname'] = 'Фамилия';
-$labels['middlename'] = 'Отчество';
-$labels['nameprefix'] = 'Префикс';
-$labels['namesuffix'] = 'Суффикс';
-$labels['nickname'] = 'Прозвище';
-$labels['jobtitle'] = 'Должность';
-$labels['department'] = 'Отдел';
-$labels['gender'] = 'Пол';
-$labels['maidenname'] = 'Девичья фамилия';
-$labels['email'] = 'E-Mail';
-$labels['phone'] = 'Телефон';
-$labels['address'] = 'Адрес';
-$labels['street'] = 'Улица';
-$labels['locality'] = 'Город';
-$labels['zipcode'] = 'Индекс';
-$labels['region'] = 'Область';
-$labels['country'] = 'Страна';
-$labels['birthday'] = 'День рождения';
-$labels['anniversary'] = 'Годовщина';
-$labels['website'] = 'Веб-сайт';
+
+// address boook
+$labels['name']         = 'Отображаемое имя';
+$labels['firstname']    = 'Имя';
+$labels['surname']      = 'Фамилия';
+$labels['middlename']   = 'Отчество';
+$labels['nameprefix']   = 'Префикс';
+$labels['namesuffix']   = 'Суффикс';
+$labels['nickname']     = 'Прозвище';
+$labels['jobtitle']     = 'Должность';
+$labels['department']   = 'Отдел';
+$labels['gender']       = 'Пол';
+$labels['maidenname']   = 'Девичья фамилия';
+$labels['email']        = 'E-Mail';
+$labels['phone']        = 'Телефон';
+$labels['address']      = 'Адрес';
+$labels['street']       = 'Улица';
+$labels['locality']     = 'Город';
+$labels['zipcode']      = 'Индекс';
+$labels['region']       = 'Область';
+$labels['country']      = 'Страна';
+$labels['birthday']     = 'День рождения';
+$labels['anniversary']  = 'Годовщина';
+$labels['website']      = 'Веб-сайт';
 $labels['instantmessenger'] = 'IM';
 $labels['notes'] = 'Заметки';
-$labels['male'] = 'мужской';
+$labels['male']   = 'мужской';
 $labels['female'] = 'женский';
 $labels['manager'] = 'Менеджер';
 $labels['assistant'] = 'Помощник';
-$labels['typeassistant'] = 'Помощник';
 $labels['spouse'] = 'Супруг';
 $labels['allfields'] = 'Все поля';
 $labels['search'] = 'Поиск';
 $labels['advsearch'] = 'Расширенный поиск';
 $labels['advanced'] = 'Дополнительно';
 $labels['other'] = 'Другое';
-$labels['typeother'] = 'Другое';
-$labels['typehome'] = 'Дом';
-$labels['typework'] = 'Работа';
-$labels['typemobile'] = 'Мобильный';
-$labels['typemain'] = 'Основной';
-$labels['typehomefax'] = 'Домашний факс';
-$labels['typeworkfax'] = 'Рабочий факс';
-$labels['typecar'] = 'Автомобиль';
-$labels['typepager'] = 'Пэйджер';
-$labels['typevideo'] = 'Видео';
-$labels['typehomepage'] = 'Домашняя страница';
+
+$labels['typehome']   = 'Дом';
+$labels['typework']   = 'Работа';
+$labels['typeother']  = 'Другое';
+$labels['typemobile']  = 'Мобильный';
+$labels['typemain']  = 'Основной';
+$labels['typehomefax']  = 'Домашний факс';
+$labels['typeworkfax']  = 'Рабочий факс';
+$labels['typecar']  = 'Автомобиль';
+$labels['typepager']  = 'Пэйджер';
+$labels['typevideo']  = 'Видео';
+$labels['typeassistant']  = 'Помощник';
+$labels['typehomepage']  = 'Домашняя страница';
 $labels['typeblog'] = 'Блог';
 $labels['typeprofile'] = 'Профиль';
+
 $labels['addfield'] = 'Добавить поле...';
 $labels['addcontact'] = 'Добавить выбранные контакты в список контактов';
 $labels['editcontact'] = 'Редактировать контакт';
 $labels['contacts'] = 'Контакты';
 $labels['contactproperties'] = 'Свойства контакта';
 $labels['personalinfo'] = 'Личная информация';
-$labels['edit'] = 'Правка';
+
+$labels['edit']   = 'Правка';
 $labels['cancel'] = 'Отмена';
-$labels['save'] = 'Сохранить';
+$labels['save']   = 'Сохранить';
 $labels['delete'] = 'Удалить';
 $labels['rename'] = 'Переименовать';
 $labels['addphoto'] = 'Добавить';
 $labels['replacephoto'] = 'Заменить';
 $labels['uploadphoto'] = 'Загрузить фотографию';
-$labels['newcontact'] = 'Создать новый контакт';
-$labels['deletecontact'] = 'Удалить выбранные контакты';
-$labels['composeto'] = 'Создать сообщение для выбранных контактов';
+
+$labels['newcontact']     = 'Создать новый контакт';
+$labels['deletecontact']  = 'Удалить выбранные контакты';
+$labels['composeto']      = 'Создать сообщение для выбранных контактов';
 $labels['contactsfromto'] = 'Контакты с $from по $to из $count';
-$labels['print'] = 'Печать';
-$labels['export'] = 'Экспорт';
-$labels['exportvcards'] = 'Экспортировать контакты в формате vCard';
+$labels['print']          = 'Печать';
+$labels['export']         = 'Экспорт';
+$labels['exportall']      = 'Экспортировать все';
+$labels['exportsel']      = 'Экспортировать выделенные';
+$labels['exportvcards']   = 'Экспортировать контакты в формате vCard';
 $labels['newcontactgroup'] = 'Создать группу контактов';
-$labels['grouprename'] = 'Переименовать группу';
-$labels['groupdelete'] = 'Удалить группу';
+$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'] = 'Сохранить запрос';
 $labels['searchdelete'] = 'Удалить запрос';
+
 $labels['import'] = 'Импортировать';
 $labels['importcontacts'] = 'Импортировать контакты';
 $labels['importfromfile'] = 'Импортировать из файла:';
@@ -307,35 +366,43 @@ $labels['importtarget'] = 'Добавить новые контакты в ад�
 $labels['importreplace'] = 'Заменить всю адресную книгу';
 $labels['importdesc'] = 'Вы можете загрузить контакты из существующей адресной книги. <br/>В настоящее время мы поддерживаем импорт адресов в формате визитной карточки <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['identities'] = 'Профили';
 $labels['manageidentities'] = 'Управление профилями';
 $labels['newidentity'] = 'Новый профиль';
+
 $labels['newitem'] = 'Новый';
 $labels['edititem'] = 'Правка';
+
 $labels['preferhtml'] = 'Предпочитать HTML';
 $labels['defaultcharset'] = 'Набор символов по-умолчанию';
 $labels['htmlmessage'] = 'Сообщение HTML';
+$labels['messagepart'] = 'Часть';
+$labels['digitalsig'] = 'Цифровая подпись';
 $labels['dateformat'] = 'Формат даты';
 $labels['timeformat'] = 'Формат времени';
 $labels['prettydate'] = 'Красивые даты';
-$labels['setdefault'] = 'Использовать по умолчанию';
-$labels['autodetect'] = 'Определять автоматически';
-$labels['language'] = 'Язык';
-$labels['timezone'] = 'Часовой пояс';
-$labels['pagesize'] = 'Строк на странице';
+$labels['setdefault']  = 'Использовать по умолчанию';
+$labels['autodetect']  = 'Определять автоматически';
+$labels['language']  = 'Язык';
+$labels['timezone']  = 'Часовой пояс';
+$labels['pagesize']  = 'Строк на странице';
 $labels['signature'] = 'Подпись';
-$labels['dstactive'] = 'Летнее время';
+$labels['dstactive']  = 'Летнее время';
 $labels['showinextwin'] = 'Открыть сообщение в новом окне';
 $labels['composeextwin'] = 'Создать в новом окне';
 $labels['htmleditor'] = 'Создавать сообщения в HTML';
 $labels['htmlonreply'] = 'только в ответ на сообщение в HTML';
 $labels['htmlonreplyandforward'] = 'при пересылке или ответе на HTML сообщение';
 $labels['htmlsignature'] = 'Подпись в HTML';
+$labels['showemail'] = 'Показывать адрес электронной почты и имя адресата';
 $labels['previewpane'] = 'Показать панель превью';
 $labels['skin'] = 'Стиль оформления';
 $labels['logoutclear'] = 'Очищать корзину при выходе';
@@ -358,11 +425,11 @@ $labels['showremoteimages'] = 'Показывать удаленные изоб�
 $labels['fromknownsenders'] = 'от известных отправителей';
 $labels['always'] = 'всегда';
 $labels['showinlineimages'] = 'Показывать вложенные изображения внизу сообщения';
-$labels['autosavedraft'] = 'Автосохранение черновика';
-$labels['everynminutes'] = 'каждые $n минут';
-$labels['refreshinterval'] = 'Обновить (проверить новые сообщения и т.п.)';
-$labels['never'] = 'никогда';
-$labels['immediately'] = 'немедленно';
+$labels['autosavedraft']  = 'Автосохранение черновика';
+$labels['everynminutes']  = 'каждые $n минут';
+$labels['refreshinterval']  = 'Обновить (проверить новые сообщения и т.п.)';
+$labels['never']  = 'никогда';
+$labels['immediately']  = 'немедленно';
 $labels['messagesdisplaying'] = 'Отображение сообщений';
 $labels['messagescomposition'] = 'Создание сообщений';
 $labels['mimeparamfolding'] = 'Имена вложений';
@@ -389,12 +456,9 @@ $labels['replyremovesignature'] = 'Удалить подпись при отве
 $labels['autoaddsignature'] = 'Автоматически добавлять подпись';
 $labels['newmessageonly'] = 'только в новых сообщениях';
 $labels['replyandforwardonly'] = 'только в ответах и пересылках';
-$labels['replysignaturepos'] = 'Прикрепить подпись при ответе и пересылке';
-$labels['belowquote'] = 'после цитаты';
-$labels['abovequote'] = 'до цитаты';
 $labels['insertsignature'] = 'Вставить подпись';
-$labels['previewpanemarkread'] = 'Отмечать просмотренные сообщения как прочитанные';
-$labels['afternseconds'] = 'через $n секунд';
+$labels['previewpanemarkread']  = 'Отмечать просмотренные сообщения как прочитанные';
+$labels['afternseconds']  = 'через $n секунд';
 $labels['reqmdn'] = 'Всегда запрашивать уведомление о доставке';
 $labels['reqdsn'] = 'Всегда запрашивать уведомление о состоянии доставки';
 $labels['replysamefolder'] = 'Помещать ответы в ту же папку, где находится оригинал';
@@ -411,13 +475,15 @@ $labels['mailtoprotohandler'] = 'Зарегистрировать обработ
 $labels['forwardmode'] = 'Пересылка сообщений';
 $labels['inline'] = 'в тексте';
 $labels['asattachment'] = 'как вложение';
-$labels['folder'] = 'Папка';
-$labels['foldername'] = 'Имя папки';
-$labels['subscribed'] = 'Подписан';
+
+$labels['folder']  = 'Папка';
+$labels['folders']  = 'Папки';
+$labels['foldername']  = 'Имя папки';
+$labels['subscribed']  = 'Подписан';
 $labels['messagecount'] = 'Сообщения';
-$labels['create'] = 'Создать';
-$labels['createfolder'] = 'Создать новую папку';
-$labels['managefolders'] = 'Управление папками';
+$labels['create']  = 'Создать';
+$labels['createfolder']  = 'Создать новую папку';
+$labels['managefolders']  = 'Управление папками';
 $labels['specialfolders'] = 'Особые папки';
 $labels['properties'] = 'Свойства';
 $labels['folderproperties'] = 'Свойства папки';
@@ -427,23 +493,29 @@ $labels['info'] = 'Информация';
 $labels['getfoldersize'] = 'Показать размер папки';
 $labels['changesubscription'] = 'Изменить подписку';
 $labels['foldertype'] = 'Тип каталога';
-$labels['personalfolder'] = 'Приватный каталог';
-$labels['otherfolder'] = 'Каталог другого пользователя';
-$labels['sharedfolder'] = 'Совместный каталог';
+$labels['personalfolder']  = 'Приватный каталог';
+$labels['otherfolder']  = 'Каталог другого пользователя';
+$labels['sharedfolder']  = 'Совместный каталог';
+
 $labels['sortby'] = 'Сортировать по';
-$labels['sortasc'] = 'Возрастанию';
+$labels['sortasc']  = 'Возрастанию';
 $labels['sortdesc'] = 'Убыванию';
 $labels['undo'] = 'Отмена';
+
 $labels['installedplugins'] = 'Установленные дополнения';
 $labels['plugin'] = 'Дополнение';
 $labels['version'] = 'Версия';
 $labels['source'] = 'Источник';
 $labels['license'] = 'Лицензия';
 $labels['support'] = 'Поддержка';
+
+// units
 $labels['B'] = 'Б';
 $labels['KB'] = 'КБ';
 $labels['MB'] = 'МБ';
 $labels['GB'] = 'ГБ';
+
+// character sets
 $labels['unicode'] = 'Unicode';
 $labels['english'] = 'Английский';
 $labels['westerneuropean'] = 'Западноевропейский';
@@ -463,3 +535,4 @@ $labels['japanese'] = 'Японский';
 $labels['korean'] = 'Корейский';
 $labels['chinese'] = 'Китайский';
 
+?>
diff --git a/program/localization/ru_RU/messages.inc b/program/localization/ru_RU/messages.inc
index e4363d11e..f9c8c433a 100644
--- a/program/localization/ru_RU/messages.inc
+++ b/program/localization/ru_RU/messages.inc
@@ -2,20 +2,23 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ru_RU/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Orkhan Guliyev <proger@box.az>                                |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['errortitle'] = 'Произошла ошибка!';
-$messages['loginfailed'] = 'Неудачная попытка входа';
+$messages['errortitle']  = 'Произошла ошибка!';
+$messages['loginfailed']  = 'Неудачная попытка входа';
 $messages['cookiesdisabled'] = 'Ваш броузер не принимает cookie';
 $messages['sessionerror'] = 'Ваша сессия устарела';
 $messages['storageerror'] = 'Неудачное соединение с IMAP сервером';
@@ -25,6 +28,8 @@ $messages['dberror'] = 'Ошибка базы данных!';
 $messages['requesttimedout'] = 'Превышено время ожидания запроса';
 $messages['errorreadonly'] = 'Невозможно выполнить операцию. Папка доступна только для чтения';
 $messages['errornoperm'] = 'Невозможно выполнить операцию. Доступ запрещён';
+$messages['erroroverquota'] = 'Невозможно выполнить операцию. Нет свободного места на диске.';
+$messages['erroroverquotadelete'] = 'Нет свободного места на диске. Используйте SHIFT+DEL для удаления сообщения.';
 $messages['invalidrequest'] = 'Неверный запрос! Информация не сохранена.';
 $messages['invalidhost'] = 'Неверное имя сервера.';
 $messages['nomessagesfound'] = 'Сообщений не найдено';
@@ -57,11 +62,11 @@ $messages['errormoving'] = 'Не удалось переместить сооб�
 $messages['errorcopying'] = 'Не удалось скопировать сообщение';
 $messages['errordeleting'] = 'Не удалось удалить сообщение';
 $messages['errormarking'] = 'Невозможно пометить сообщение';
-$messages['deletecontactconfirm'] = 'Вы действительно хотите удалить выделенные контакты?';
-$messages['deletegroupconfirm'] = 'Вы действительно хотите удалить группу?';
+$messages['deletecontactconfirm']  = 'Вы действительно хотите удалить выделенные контакты?';
+$messages['deletegroupconfirm']  = 'Вы действительно хотите удалить группу?';
 $messages['deletemessagesconfirm'] = 'Вы действительно хотите удалить выбранные сообщения?';
-$messages['deletefolderconfirm'] = 'Вы действительно хотите удалить эту папку?';
-$messages['purgefolderconfirm'] = 'Вы действительно хотите удалить все сообщения в этой папке?';
+$messages['deletefolderconfirm']  = 'Вы действительно хотите удалить эту папку?';
+$messages['purgefolderconfirm']  = 'Вы действительно хотите удалить все сообщения в этой папке?';
 $messages['contactdeleting'] = 'Удаление контакта(ов)...';
 $messages['groupdeleting'] = 'Удаление группы...';
 $messages['folderdeleting'] = 'Удаление папки...';
@@ -70,11 +75,11 @@ $messages['foldersubscribing'] = 'Подписать папку...';
 $messages['folderunsubscribing'] = 'Отписать папку...';
 $messages['formincomplete'] = 'Заполнены не все поля';
 $messages['noemailwarning'] = 'Пожалуйста, введите корректный адрес электронной почты';
-$messages['nonamewarning'] = 'Пожалуйста, введите имя';
+$messages['nonamewarning']  = 'Пожалуйста, введите имя';
 $messages['nopagesizewarning'] = 'Пожалуйста, введите размер страницы';
 $messages['nosenderwarning'] = 'Пожалуйста, введите адрес электронной почты отправителя';
 $messages['norecipientwarning'] = 'Пожалуйста, введите имя получателя';
-$messages['nosubjectwarning'] = 'Поле Тема не заполнено. Хотите заполнить его сейчас?';
+$messages['nosubjectwarning']  = 'Поле Тема не заполнено. Хотите заполнить его сейчас?';
 $messages['nobodywarning'] = 'Отправить сообщение без текста?';
 $messages['notsentwarning'] = 'Сообщение не было отправлено. Вы хотите отказаться от отправки?';
 $messages['noldapserver'] = 'Пожалуйста, выберите LDAP сервер для поиска';
@@ -163,3 +168,4 @@ $messages['messagetoobig'] = 'Часть сообщения слишком ве�
 $messages['attachmentvalidationerror'] = 'ВНИМАНИЕ! Это приложение является подозрительной, потому что его тип не совпадает с типом, объявленным в сообщении. Если вы не доверяете отправителю, вы не должны открывать его в браузере, поскольку он может содержать вредоносный содержание.<br/><br/><em>Expected: $expected; found: $detected</em>';
 $messages['noscriptwarning'] = 'Внимание: Данному сервису веб-почты требуется Javascript! Для того, чтобы его использовать необходимо включить поддержку Javascript в настройках вашего браузера.';
 
+?>
diff --git a/program/localization/si_LK/labels.inc b/program/localization/si_LK/labels.inc
index 533f64d87..d8cd71662 100644
--- a/program/localization/si_LK/labels.inc
+++ b/program/localization/si_LK/labels.inc
@@ -2,53 +2,78 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/si_LK/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: පසිඳු කාවින්ද <info@pk-soft.tk>       |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = '$product වෙත පිළිගනිමු';
-$labels['username'] = 'පරිශීලක නාමය';
-$labels['password'] = 'මුරපදය';
-$labels['server'] = 'පද්ධතිය';
-$labels['login'] = 'පිවිසුම';
-$labels['logout'] = 'පිටවීම';
-$labels['mail'] = 'විද්‍යුත් තැපැල';
+
+// login page
+$labels['welcome']   = '$product වෙත පිළිගනිමු';
+$labels['username']  = 'පරිශීලක නාමය';
+$labels['password']  = 'මුරපදය';
+$labels['server']    = 'පද්ධතිය';
+$labels['login']     = 'පිවිසුම';
+
+// taskbar
+$labels['logout']   = 'පිටවීම';
+$labels['mail']     = 'විද්‍යුත් තැපැල';
 $labels['settings'] = 'සැකසුම්';
 $labels['addressbook'] = 'ලිපින පොත';
-$labels['inbox'] = 'Inbox';
+
+// mailbox names
+$labels['inbox']  = 'Inbox';
 $labels['drafts'] = 'කටු සටහන්';
-$labels['sent'] = 'යැවූ';
-$labels['trash'] = 'ඉවතලන බඳුන';
-$labels['junk'] = 'සුන්බුන්';
+$labels['sent']   = 'යැවූ';
+$labels['trash']  = 'ඉවතලන බඳුන';
+$labels['junk']   = 'සුන්බුන්';
+
+// message listing
 $labels['subject'] = 'මාතෘකාව';
-$labels['from'] = 'වෙතින්';
-$labels['to'] = 'වෙත';
-$labels['cc'] = 'Cc';
-$labels['bcc'] = 'Bcc';
+$labels['from']    = 'වෙතින්';
+$labels['sender']  = 'Sender';
+$labels['to']      = 'වෙත';
+$labels['cc']      = 'Cc';
+$labels['bcc']     = 'Bcc';
 $labels['replyto'] = 'පිළිතුරු සඳහා';
-$labels['date'] = 'දිනය';
-$labels['size'] = 'ප්‍රමාණය';
+$labels['followupto'] = 'Followup-To';
+$labels['date']    = 'දිනය';
+$labels['size']    = 'ප්‍රමාණය';
 $labels['priority'] = 'ප්‍රමුඛත්වය';
 $labels['organization'] = 'සංවිධානය';
+$labels['readstatus'] = 'Read status';
+$labels['listoptions'] = 'List options...';
+
 $labels['mailboxlist'] = 'බහාලුම්';
-$labels['folders'] = 'බහාලුම්';
 $labels['messagesfromto'] = '$from වෙතින් $to වෙත පණිවිඩ $count';
+$labels['threadsfromto'] = 'Threads $from to $to of $count';
 $labels['messagenrof'] = 'පණිවිඩ $count න් $nr';
-$labels['copy'] = 'පිටපත් කරන්න';
-$labels['move'] = 'ගෙනයන්න';
-$labels['moveto'] = 'ගෙන යන්න...';
+$labels['fromtoshort'] = '$from – $to of $count';
+
+$labels['copy']     = 'පිටපත් කරන්න';
+$labels['move']     = 'ගෙනයන්න';
+$labels['moveto']   = 'ගෙන යන්න...';
 $labels['download'] = 'බාගත කරන්න';
+$labels['open']     = 'Open';
+$labels['showattachment'] = 'Show';
+$labels['showanyway'] = 'Show it anyway';
+
 $labels['filename'] = 'ගොනුවේ නම';
 $labels['filesize'] = 'ගොනුවේ ප්‍රමාණය';
+
 $labels['addtoaddressbook'] = 'ලිපින පොතට එක් කරන්න';
+
+// weekdays short
 $labels['sun'] = 'ඉ';
 $labels['mon'] = 'ස';
 $labels['tue'] = 'අ';
@@ -56,252 +81,448 @@ $labels['wed'] = 'බ';
 $labels['thu'] = 'බ්‍ර';
 $labels['fri'] = 'සි';
 $labels['sat'] = 'සෙ';
-$labels['sunday'] = 'ඉරිදා';
-$labels['monday'] = 'සඳුදා';
-$labels['tuesday'] = 'අඟහරුවාදා';
+
+// weekdays long
+$labels['sunday']    = 'ඉරිදා';
+$labels['monday']    = 'සඳුදා';
+$labels['tuesday']   = 'අඟහරුවාදා';
 $labels['wednesday'] = 'බදාදා';
-$labels['thursday'] = 'බ්‍රහස්පතින්දා';
-$labels['friday'] = 'සිකුරාදා';
-$labels['saturday'] = 'සෙනසුරාදා';
-$labels['jan'] = 'ජන';
-$labels['feb'] = 'පෙබ';
-$labels['mar'] = 'මාර්';
-$labels['apr'] = 'අප්‍රේ';
-$labels['may'] = 'මැයි';
-$labels['longmay'] = 'මැයි';
-$labels['jun'] = 'ජූනි';
-$labels['jul'] = 'ජූලි';
-$labels['aug'] = 'අගෝ';
-$labels['sep'] = 'සැප්';
-$labels['oct'] = 'ඔක්';
-$labels['nov'] = 'නොවැ';
-$labels['dec'] = 'දෙසැ';
-$labels['longjan'] = 'ජනවාරි';
-$labels['longfeb'] = 'පෙබරවාරි';
-$labels['longmar'] = 'මාර්තු';
-$labels['longapr'] = 'අප්‍රේල්';
-$labels['longjun'] = 'ජූනි';
-$labels['longjul'] = 'ජූලි';
-$labels['longaug'] = 'අගෝස්තු';
-$labels['longsep'] = 'සැප්තැම්බර්';
-$labels['longoct'] = 'ඔක්තෝම්බර්';
-$labels['longnov'] = 'නොවැම්බර්';
-$labels['longdec'] = 'දෙසැම්බර්';
+$labels['thursday']  = 'බ්‍රහස්පතින්දා';
+$labels['friday']    = 'සිකුරාදා';
+$labels['saturday']  = 'සෙනසුරාදා';
+
+// months short
+$labels['jan']	= 'ජන';
+$labels['feb']	= 'පෙබ';
+$labels['mar']	= 'මාර්';
+$labels['apr']	= 'අප්‍රේ';
+$labels['may']	= 'මැයි';
+$labels['jun']	= 'ජූනි';
+$labels['jul'] 	= 'ජූලි';
+$labels['aug']	= 'අගෝ';
+$labels['sep']	= 'සැප්';
+$labels['oct']	= 'ඔක්';
+$labels['nov']	= 'නොවැ';
+$labels['dec']	= 'දෙසැ';
+
+// months long
+$labels['longjan']	= 'ජනවාරි';
+$labels['longfeb']	= 'පෙබරවාරි';
+$labels['longmar']	= 'මාර්තු';
+$labels['longapr']	= 'අප්‍රේල්';
+$labels['longmay']	= 'මැයි';
+$labels['longjun']	= 'ජූනි';
+$labels['longjul']	= 'ජූලි';
+$labels['longaug']	= 'අගෝස්තු';
+$labels['longsep']	= 'සැප්තැම්බර්';
+$labels['longoct']	= 'ඔක්තෝම්බර්';
+$labels['longnov']	= 'නොවැම්බර්';
+$labels['longdec']	= 'දෙසැම්බර්';
+
 $labels['today'] = 'අද';
-$labels['checkmail'] = 'අඵත් පණිවිඩ සඳහා පිරික්සීම';
-$labels['compose'] = 'පණිවිඩයක් සෑදීම';
-$labels['writenewmessage'] = 'අඵත් පණිවිඩයක්';
-$labels['reply'] = 'පිළිතුරු දෙන්න';
-$labels['replytomessage'] = 'පණිවිඩයට පිළිතුරු';
+
+// toolbar buttons
+$labels['refresh']          = 'Refresh';
+$labels['checkmail']        = 'අඵත් පණිවිඩ සඳහා පිරික්සීම';
+$labels['compose']          = 'පණිවිඩයක් සෑදීම';
+$labels['writenewmessage']  = 'අඵත් පණිවිඩයක්';
+$labels['reply']            = 'පිළිතුරු දෙන්න';
+$labels['replytomessage']   = 'පණිවිඩයට පිළිතුරු';
 $labels['replytoallmessage'] = 'එවන්නාට සහ සැමට පිළිතුරු';
-$labels['forward'] = 'ඉදිරියට';
-$labels['forwardmessage'] = 'පණිවිඩය ඉදිරියට';
-$labels['deletemessage'] = 'පණිවිඩය මකන්න';
+$labels['replyall']         = 'Reply all';
+$labels['replylist']        = 'Reply list';
+$labels['forward']          = 'ඉදිරියට';
+$labels['forwardinline']    = 'Forward inline';
+$labels['forwardattachment'] = 'Forward as attachment';
+$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['moreactions'] = 'තවත් ක්‍රියා...';
-$labels['more'] = 'තවත්';
-$labels['back'] = 'ආපසු';
-$labels['options'] = 'විකල්ප';
+$labels['printmessage']     = 'මෙම පණිවිඩය මුද්‍රණය කරන්න';
+$labels['previousmessage']  = 'කලින් පණිවිඩය පෙන්නන්න';
+$labels['firstmessage']     = 'පළමුවන පණිවිඩය පෙන්නන්න';
+$labels['nextmessage']      = 'මීළඟ පණිවිඩය පෙන්නන්න';
+$labels['lastmessage']      = 'අවසාන පණිවිඩය පෙන්නන්න';
+$labels['backtolist']       = 'නැවතත් පණිවිඩ ලැයිස්තුවට';
+$labels['viewsource']       = 'මූලාශ්‍රය පෙන්වන්න';
+$labels['mark']             = 'සලකුණු කරන්න';
+$labels['markmessages']     = 'පණිවිඩ සලකුණු කරන්න';
+$labels['markread']         = 'කියවු ලෙස';
+$labels['markunread']       = 'නොකියවු ලෙස';
+$labels['markflagged']      = 'As flagged';
+$labels['markunflagged']    = 'As unflagged';
+$labels['moreactions']      = 'තවත් ක්‍රියා...';
+$labels['more']             = 'තවත්';
+$labels['back']             = 'ආපසු';
+$labels['options']          = 'විකල්ප';
+
 $labels['select'] = 'තෝරන්න';
 $labels['all'] = 'සියල්ල';
 $labels['none'] = 'කිසිවක් නැත';
-$labels['nonesort'] = 'කිසිවක් නැත';
 $labels['currpage'] = 'දැනට ඇති පිටුව';
 $labels['unread'] = 'නොකියවූ';
+$labels['flagged'] = 'Flagged';
+$labels['unanswered'] = 'Unanswered';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'මකා දැමූ';
+$labels['undeleted'] = 'Not deleted';
+$labels['invert'] = 'Invert';
 $labels['filter'] = 'පෙරන්න';
 $labels['list'] = 'ලැයිස්තුව';
+$labels['threads'] = 'Threads';
 $labels['expand-all'] = 'සියල්ල දිගහරින්න';
+$labels['expand-unread'] = 'Expand Unread';
 $labels['collapse-all'] = 'සියල්ල හකුළන්න';
+$labels['threaded'] = 'Threaded';
+
+$labels['autoexpand_threads'] = 'Expand message threads';
+$labels['do_expand'] = 'all threads';
+$labels['expand_only_unread'] = 'only with unread messages';
 $labels['fromto'] = 'වෙතින්/වෙත';
+$labels['flag'] = 'Flag';
 $labels['attachment'] = 'ඇමුණුම';
+$labels['nonesort'] = 'කිසිවක් නැත';
 $labels['sentdate'] = 'යැවූ දිනය';
 $labels['arrival'] = 'ලගාවූ දිනය';
 $labels['asc'] = 'ආරෝහණ';
 $labels['desc'] = 'අවරෝහණ';
+$labels['listcolumns'] = 'List columns';
+$labels['listsorting'] = 'Sorting column';
+$labels['listorder'] = 'Sorting order';
+$labels['listmode'] = 'List view mode';
+
 $labels['folderactions'] = 'බහාලුම් ක්‍රියා...';
 $labels['compact'] = 'සංයුක්ත';
 $labels['empty'] = 'හිස්';
-$labels['unknown'] = 'නොදනී';
-$labels['unlimited'] = 'අසීමිත';
-$labels['quicksearch'] = 'ඉක්මන් සෙවුම';
-$labels['resetsearch'] = 'සෙවුම යලි පිහිටවීම';
-$labels['msgtext'] = 'සම්පූර්ණ පණිවිඩය';
+
+$labels['quota'] = 'Disk usage';
+$labels['unknown']  = 'නොදනී';
+$labels['unlimited']  = 'අසීමිත';
+
+$labels['quicksearch']  = 'ඉක්මන් සෙවුම';
+$labels['resetsearch']  = 'සෙවුම යලි පිහිටවීම';
+$labels['searchmod']  = 'Search modifiers';
+$labels['msgtext']  = 'සම්පූර්ණ පණිවිඩය';
+$labels['body']  = 'Body';
+
 $labels['openinextwin'] = 'නව කවුළුවක විවෘත කරන්න';
-$labels['sendmessage'] = 'පණිවිඩය යවන්න';
-$labels['savemessage'] = 'කටු සටහනක් ලෙස සුරකින්න';
-$labels['addattachment'] = 'ගොනුවක් අමුණන්න';
-$labels['charset'] = 'අකුරැ කට්ටලය';
-$labels['editortype'] = 'සම්පාදන ආකාරය';
-$labels['returnreceipt'] = 'නැවත ලබන්නා';
+$labels['emlsave'] = 'Download (.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['addattachment']  = 'ගොනුවක් අමුණන්න';
+$labels['charset']        = 'අකුරැ කට්ටලය';
+$labels['editortype']     = 'සම්පාදන ආකාරය';
+$labels['returnreceipt']  = 'නැවත ලබන්නා';
+$labels['dsn']            = 'Delivery status notification';
+$labels['mailreplyintro'] = 'On $date, $sender wrote:';
+$labels['originalmessage'] = 'Original Message';
+
+$labels['editidents']    = 'Edit identities';
+$labels['spellcheck']    = 'Spell';
 $labels['checkspelling'] = 'අක්‍ෂර වින්‍යාසය පරික්‍ෂාකරන්න';
 $labels['resumeediting'] = 'සම්පාදන නැවත ඇරඹීම';
-$labels['revertto'] = 'ආපසු ඒම';
+$labels['revertto']      = 'ආපසු ඒම';
+
 $labels['attach'] = 'අමුණන්න';
 $labels['attachments'] = 'ඇමුණුම්';
 $labels['upload'] = 'ඇතුල් කරීම';
-$labels['close'] = 'වසන්න';
-$labels['low'] = 'අඩු';
-$labels['lowest'] = 'අඩුම';
-$labels['normal'] = 'සාමාන්‍ය';
-$labels['high'] = 'ඉහළ';
+$labels['uploadprogress'] = '$percent ($current from $total)';
+$labels['close']  = 'වසන්න';
+$labels['messageoptions']  = 'Message options...';
+
+$labels['low']     = 'අඩු';
+$labels['lowest']  = 'අඩුම';
+$labels['normal']  = 'සාමාන්‍ය';
+$labels['high']    = 'ඉහළ';
 $labels['highest'] = 'ඉහළම';
-$labels['nosubject'] = '(මාතෘකාව නොමැත)';
+
+$labels['nosubject']  = '(මාතෘකාව නොමැත)';
 $labels['showimages'] = 'රූප පෙන්වන්න';
+$labels['alwaysshow'] = 'Always show images from $sender';
+$labels['isdraft']    = 'This is a draft message.';
+$labels['andnmore']   = '$nr more...';
+$labels['togglemoreheaders'] = 'Show more message headers';
+$labels['togglefullheaders'] = 'Toggle raw message headers';
+
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'පැහැදිලි අකුරු';
+$labels['savesentmessagein'] = 'Save sent message in';
+$labels['dontsave'] = 'don\'t save';
+$labels['maxuploadsize'] = 'Maximum allowed file size is $size';
+
 $labels['addcc'] = 'Cc එක් කරන්න';
 $labels['addbcc'] = 'Bcc එක් කරන්න';
 $labels['addreplyto'] = '\'පිළිතුරු සඳහා\' එක් කරන්න';
+$labels['addfollowupto'] = 'Add Followup-To';
+
+// mdn
 $labels['mdnrequest'] = 'මෙම පණිවුඩය එවන්නා ඔබ එය කියවු බව අසයි. එය දැන්වීමට ඔබ කැමතිද?';
 $labels['receiptread'] = 'ලැබීම් ලදුපත (කියවීම)';
 $labels['yourmessage'] = 'මෙය ඔබගේ පණිවුඩයේ ලැබීම් ලදුපතයි';
 $labels['receiptnote'] = 'සටහන: ලැබීම් ලදුපත මගින් මෙම පණිවුඩය කියවූ බව හෝ තේරුම් ගත් බව ගම්‍ය නොවේ. පණිවුඩය ලබන්නාට පෙන්නුම් කල බවටට සාක්ෂියක් පමණි';
-$labels['name'] = 'ප්‍රදර්ශනය වන නම';
-$labels['firstname'] = 'මුල් නම';
-$labels['surname'] = 'අවසන් නම';
-$labels['nickname'] = 'සුරතල් නම';
-$labels['jobtitle'] = 'රැකියා තනතුර';
-$labels['department'] = 'දෙපාර්තමේන්තුව';
-$labels['gender'] = 'ස්ත්‍රි/පුරුෂ භාවය';
-$labels['email'] = 'විද්‍යුත් තැපෑල';
-$labels['phone'] = 'දුරකථනය';
-$labels['address'] = 'ලිපිනය';
-$labels['locality'] = 'නගරය';
-$labels['region'] = 'ප්‍රාන්තය/පළාත';
-$labels['country'] = 'රට';
-$labels['birthday'] = 'උපන්දිනය';
-$labels['anniversary'] = 'සංවත්සරය';
-$labels['website'] = 'වෙබ් අඩවිය';
+
+// address boook
+$labels['name']         = 'ප්‍රදර්ශනය වන නම';
+$labels['firstname']    = 'මුල් නම';
+$labels['surname']      = 'අවසන් නම';
+$labels['middlename']   = 'Middle Name';
+$labels['nameprefix']   = 'Prefix';
+$labels['namesuffix']   = 'Suffix';
+$labels['nickname']     = 'සුරතල් නම';
+$labels['jobtitle']     = 'රැකියා තනතුර';
+$labels['department']   = 'දෙපාර්තමේන්තුව';
+$labels['gender']       = 'ස්ත්‍රි/පුරුෂ භාවය';
+$labels['maidenname']   = 'Maiden Name';
+$labels['email']        = 'විද්‍යුත් තැපෑල';
+$labels['phone']        = 'දුරකථනය';
+$labels['address']      = 'ලිපිනය';
+$labels['street']       = 'Street';
+$labels['locality']     = 'නගරය';
+$labels['zipcode']      = 'ZIP Code';
+$labels['region']       = 'ප්‍රාන්තය/පළාත';
+$labels['country']      = 'රට';
+$labels['birthday']     = 'උපන්දිනය';
+$labels['anniversary']  = 'සංවත්සරය';
+$labels['website']      = 'වෙබ් අඩවිය';
 $labels['instantmessenger'] = 'IM';
 $labels['notes'] = 'සටහන්';
-$labels['male'] = 'පුරුෂ';
+$labels['male']   = 'පුරුෂ';
 $labels['female'] = 'ස්ත්‍රී';
 $labels['manager'] = 'කළමණාකරු';
 $labels['assistant'] = 'සහායක';
-$labels['typeassistant'] = 'සහායක';
+$labels['spouse'] = 'Spouse';
+$labels['allfields'] = 'All fields';
 $labels['search'] = 'සොයන්න';
+$labels['advsearch'] = 'Advanced Search';
 $labels['advanced'] = 'සංකීර්ණ‍';
 $labels['other'] = 'වෙනත්';
-$labels['typeother'] = 'වෙනත්';
-$labels['typehome'] = 'නිවස';
-$labels['typework'] = 'රක්ෂාව';
-$labels['typemobile'] = 'ජංගම';
-$labels['typemain'] = 'ප්‍රධාන';
-$labels['typehomefax'] = 'ගෘහස්ථ ෆැක්ස්';
-$labels['typepager'] = 'පේජරය';
-$labels['typevideo'] = 'වීඩියෝ';
+
+$labels['typehome']   = 'නිවස';
+$labels['typework']   = 'රක්ෂාව';
+$labels['typeother']  = 'වෙනත්';
+$labels['typemobile']  = 'ජංගම';
+$labels['typemain']  = 'ප්‍රධාන';
+$labels['typehomefax']  = 'ගෘහස්ථ ෆැක්ස්';
+$labels['typeworkfax']  = 'Work Fax';
+$labels['typecar']  = 'Car';
+$labels['typepager']  = 'පේජරය';
+$labels['typevideo']  = 'වීඩියෝ';
+$labels['typeassistant']  = 'සහායක';
+$labels['typehomepage']  = 'Home Page';
 $labels['typeblog'] = 'බ්ලොග්';
 $labels['typeprofile'] = 'පැතිකඩ';
+
+$labels['addfield'] = 'Add field...';
 $labels['addcontact'] = 'නව සබඳතාවය එක් කරන්න';
 $labels['editcontact'] = 'ලිපිනය වෙනස් කිරීම';
 $labels['contacts'] = 'සබඳතා';
+$labels['contactproperties'] = 'Contact properties';
 $labels['personalinfo'] = 'පුද්ගලික තොරතුරු';
-$labels['edit'] = 'සංස්කරණය';
+
+$labels['edit']   = 'සංස්කරණය';
 $labels['cancel'] = 'අවලංගු කරන්න';
-$labels['save'] = 'සුරකින්න';
+$labels['save']   = 'සුරකින්න';
 $labels['delete'] = 'මකන්න';
 $labels['rename'] = 'නම වෙනස් කරන්න';
 $labels['addphoto'] = 'එක් කරන්න';
-$labels['newcontact'] = 'අඵත් ලිපින පතක් සෑදීම';
-$labels['deletecontact'] = 'තෝරාගත් ලිපින මකාදමන්න';
-$labels['composeto'] = 'පනිවුඩයක් සෑදීම';
+$labels['replacephoto'] = 'Replace';
+$labels['uploadphoto'] = 'Upload photo';
+
+$labels['newcontact']     = 'අඵත් ලිපින පතක් සෑදීම';
+$labels['deletecontact']  = 'තෝරාගත් ලිපින මකාදමන්න';
+$labels['composeto']      = 'පනිවුඩයක් සෑදීම';
 $labels['contactsfromto'] = '$from ගෙන් $to ලිපින $count';
-$labels['print'] = 'මුද්‍රණය කරන්න';
-$labels['export'] = 'අපනයනය';
-$labels['previouspage'] = 'පෙර පිටුව පෙන්වන්න';
-$labels['firstpage'] = 'පළමුවන පිටුව පෙන්වන්න';
-$labels['nextpage'] = 'මීළඟ පිටුව පෙන්වන්න';
-$labels['lastpage'] = 'අවසාන පිටුව පෙන්වන්න';
+$labels['print']          = 'මුද්‍රණය කරන්න';
+$labels['export']         = 'අපනයනය';
+$labels['exportall']      = 'Export all';
+$labels['exportsel']      = 'Export selected';
+$labels['exportvcards']   = 'Export contacts in vCard format';
+$labels['newcontactgroup'] = 'Create new contact group';
+$labels['grouprename']    = 'Rename group';
+$labels['groupdelete']    = 'Delete group';
+$labels['groupremoveselected'] = 'Remove selected contacts from group';
+
+$labels['previouspage']   = 'පෙර පිටුව පෙන්වන්න';
+$labels['firstpage']      = 'පළමුවන පිටුව පෙන්වන්න';
+$labels['nextpage']       = 'මීළඟ පිටුව පෙන්වන්න';
+$labels['lastpage']       = 'අවසාන පිටුව පෙන්වන්න';
+
 $labels['group'] = 'කණ්ඩායම';
 $labels['groups'] = 'කණ්ඩායම්';
 $labels['personaladrbook'] = 'පුද්ගලික ලිපිනය';
+
+$labels['searchsave'] = 'Save search';
+$labels['searchdelete'] = 'Delete search';
+
 $labels['import'] = 'ආනයනය කරන්න';
+$labels['importcontacts'] = 'Import contacts';
+$labels['importfromfile'] = 'Import from file:';
+$labels['importtarget'] = 'Add new contacts to address book:';
+$labels['importreplace'] = 'Replace the entire address book';
+$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['done'] = 'අවසානයි';
+
+// settings
 $labels['settingsfor'] = 'සඳහා සැකසුම්';
 $labels['about'] = 'පිළිබඳ';
 $labels['preferences'] = 'අභිමතය';
 $labels['userpreferences'] = 'පරිශීලක අභිමතය';
 $labels['editpreferences'] = 'පරිශීලක අභිමතය වෙනස් කිරීම්';
+
 $labels['identities'] = 'අනන්‍යතාවන්';
 $labels['manageidentities'] = 'මෙම ගිණුමෙ අනන්නයතාව හැසිරවීම';
 $labels['newidentity'] = 'අඵත් අනන්නයතාව';
+
 $labels['newitem'] = 'අඵත් අයිතම';
 $labels['edititem'] = 'අයිතම වෙනස් කිරීම්';
+
 $labels['preferhtml'] = 'HTML විදහා පෙන්වීම';
+$labels['defaultcharset'] = 'Default Character Set';
 $labels['htmlmessage'] = 'HTML පණිවිඩය';
+$labels['messagepart'] = 'Part';
+$labels['digitalsig'] = 'Digital Signature';
+$labels['dateformat'] = 'Date format';
+$labels['timeformat'] = 'Time format';
 $labels['prettydate'] = 'සුරුබුහුටි දින';
-$labels['setdefault'] = 'පළමු තත්වයට';
-$labels['autodetect'] = 'ස්වයංක්‍රීය';
-$labels['language'] = 'භාෂාව';
-$labels['timezone'] = 'කාල කලාපය';
+$labels['setdefault']  = 'පළමු තත්වයට';
+$labels['autodetect']  = 'ස්වයංක්‍රීය';
+$labels['language']  = 'භාෂාව';
+$labels['timezone']  = 'කාල කලාපය';
+$labels['pagesize']  = 'Rows per page';
 $labels['signature'] = 'අත්සන';
-$labels['dstactive'] = 'දිවා එළිය ඉතිරි කිරීම';
+$labels['dstactive']  = 'දිවා එළිය ඉතිරි කිරීම';
+$labels['showinextwin'] = 'Open message in a new window';
+$labels['composeextwin'] = 'Compose in a new window';
 $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';
+$labels['logoutcompact'] = 'Compact Inbox on logout';
 $labels['uisettings'] = 'පරිශීලක අතුරුමුහුණත';
+$labels['serversettings'] = 'Server Settings';
+$labels['mailboxview'] = 'Mailbox View';
+$labels['mdnrequests'] = 'On request for return receipt';
 $labels['askuser'] = 'මගෙන් විමසන්න';
+$labels['autosend'] = 'send receipt';
+$labels['autosendknown'] = 'send receipt to my contacts, otherwise ask me';
+$labels['autosendknownignore'] = 'send receipt to my contacts, otherwise ignore';
 $labels['ignore'] = 'නොසලකා හරින්න';
+$labels['readwhendeleted'] = 'Mark the message as read on delete';
+$labels['flagfordeletion'] = 'Flag the message for deletion instead of delete';
+$labels['skipdeleted'] = 'Do not show deleted messages';
+$labels['deletealways'] = 'If moving messages to Trash fails, delete them';
+$labels['deletejunk'] = 'Directly delete messages in Junk';
+$labels['showremoteimages'] = 'Display remote inline images';
+$labels['fromknownsenders'] = 'from known senders';
 $labels['always'] = 'සැමවිට';
-$labels['autosavedraft'] = 'ස්වයංක්‍රීයව කටු සටහන සුරකින්න';
-$labels['never'] = 'කිසි විටෙකත් නැති';
-$labels['immediately'] = 'හැකි ඉක්මනින්';
+$labels['showinlineimages'] = 'Display attached images below the message';
+$labels['autosavedraft']  = 'ස්වයංක්‍රීයව කටු සටහන සුරකින්න';
+$labels['everynminutes']  = 'every $n minute(s)';
+$labels['refreshinterval']  = 'Refresh (check for new messages, etc.)';
+$labels['never']  = 'කිසි විටෙකත් නැති';
+$labels['immediately']  = 'හැකි ඉක්මනින්';
+$labels['messagesdisplaying'] = 'Displaying Messages';
+$labels['messagescomposition'] = 'Composing Messages';
+$labels['mimeparamfolding'] = 'Attachment names';
 $labels['2231folding'] = 'Full RFC 2231 (Thunderbird)';
 $labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
 $labels['2047folding'] = 'Full RFC 2047 (වෙනත්)';
+$labels['force7bit'] = 'Use MIME encoding for 8-bit characters';
+$labels['advancedoptions'] = 'Advanced options';
+$labels['focusonnewmessage'] = 'Focus browser window on new message';
+$labels['checkallfolders'] = 'Check all folders for new messages';
+$labels['displaynext'] = 'After message delete/move display the next message';
+$labels['defaultfont'] = 'Default font of HTML message';
+$labels['mainoptions'] = 'Main Options';
+$labels['browseroptions'] = 'Browser Options';
 $labels['section'] = 'අංශය';
 $labels['maintenance'] = 'නඩත්තු කිරීම';
 $labels['newmessage'] = 'අලුත් පණිවිඩයක්';
+$labels['signatureoptions'] = 'Signature Options';
+$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'] = 'replies and forwards only';
 $labels['insertsignature'] = 'අත්සන ඇතුලත් කරන්න';
-$labels['afternseconds'] = 'තත්පර $nකට පසු';
+$labels['previewpanemarkread']  = 'Mark previewed messages as read';
+$labels['afternseconds']  = 'තත්පර $nකට පසු';
+$labels['reqmdn'] = 'Always request a return receipt';
+$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'] = 'Check spelling before sending a message';
+$labels['spellcheckoptions'] = 'Spellcheck Options';
 $labels['spellcheckignoresyms'] = 'සලකුණු සහිත වචන නොසලකා හරින්න';
 $labels['spellcheckignorenums'] = 'අංක සහිත වචන නොසලකා හරින්න';
+$labels['spellcheckignorecaps'] = 'Ignore words with all letters capitalized';
 $labels['addtodict'] = 'ශබ්ද කෝෂයට එක් කරන්න';
-$labels['folder'] = 'බහාලුම';
-$labels['foldername'] = 'බහාලුමේ නම';
-$labels['subscribed'] = 'සාමාජික';
+$labels['mailtoprotohandler'] = 'Register protocol handler for mailto: links';
+$labels['forwardmode'] = 'Messages forwarding';
+$labels['inline'] = 'inline';
+$labels['asattachment'] = 'as attachment';
+
+$labels['folder']  = 'බහාලුම';
+$labels['folders']  = 'බහාලුම්';
+$labels['foldername']  = 'බහාලුමේ නම';
+$labels['subscribed']  = 'සාමාජික';
 $labels['messagecount'] = 'පණිවිඩ';
-$labels['create'] = 'තනන්න';
-$labels['createfolder'] = 'නව බහාලුමක් තනන්න';
-$labels['managefolders'] = 'බහාලුම් කළමනාකරණය කරන්න';
+$labels['create']  = 'තනන්න';
+$labels['createfolder']  = 'නව බහාලුමක් තනන්න';
+$labels['managefolders']  = 'බහාලුම් කළමනාකරණය කරන්න';
 $labels['specialfolders'] = 'විශේෂ බහාලුම්';
 $labels['properties'] = 'වත්කම්';
 $labels['folderproperties'] = 'බහාලුමේ වත්කම්';
+$labels['parentfolder'] = 'Parent folder';
 $labels['location'] = 'ස්ථානය';
 $labels['info'] = 'තොරතුරු';
+$labels['getfoldersize'] = 'Click to get folder size';
+$labels['changesubscription'] = 'Click to change subscription';
 $labels['foldertype'] = 'බහාලුම් වර්ගය';
-$labels['personalfolder'] = 'පුද්ගලික බහාලුම';
-$labels['sharedfolder'] = 'පොදු බහාලුම';
+$labels['personalfolder']  = 'පුද්ගලික බහාලුම';
+$labels['otherfolder']  = 'Other User\'s Folder';
+$labels['sharedfolder']  = 'පොදු බහාලුම';
+
 $labels['sortby'] = 'වර්ග කරන්න';
-$labels['sortasc'] = 'ආරෝහණ වර්ග කිරීම';
+$labels['sortasc']  = 'ආරෝහණ වර්ග කිරීම';
 $labels['sortdesc'] = 'අවරෝහණ වර්ග කිරීම';
+$labels['undo'] = 'Undo';
+
+$labels['installedplugins'] = 'Installed plugins';
 $labels['plugin'] = 'ප්ලගිනය';
 $labels['version'] = 'අනුවාදය';
 $labels['source'] = 'මූලාශ්‍රය';
 $labels['license'] = 'බලපත්‍රය';
 $labels['support'] = 'සහය ලබාගන්න';
+
+// units
 $labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
 $labels['GB'] = 'GB';
+
+// character sets
 $labels['unicode'] = 'යුනිකේත';
 $labels['english'] = 'ඉංග්‍රීසි';
 $labels['westerneuropean'] = 'බටහිර යුරෝපීය';
+$labels['easterneuropean'] = 'Eastern European';
+$labels['southeasterneuropean'] = 'South-Eastern European';
 $labels['baltic'] = 'බෝල්ටික්';
+$labels['cyrillic'] = 'Cyrillic';
 $labels['arabic'] = 'අරාබි';
 $labels['greek'] = 'ග්‍රීක';
 $labels['hebrew'] = 'හීබෲ';
@@ -314,3 +535,4 @@ $labels['japanese'] = 'ජපන්';
 $labels['korean'] = 'කොරියානු';
 $labels['chinese'] = 'චීන';
 
+?>
diff --git a/program/localization/si_LK/messages.inc b/program/localization/si_LK/messages.inc
index 23a701935..c3828bc64 100644
--- a/program/localization/si_LK/messages.inc
+++ b/program/localization/si_LK/messages.inc
@@ -2,28 +2,43 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/si_LK/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Mohamed Rizmi <Unknown>                                       |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['errortitle'] = 'දෝෂයක් මතුවිය!';
-$messages['loginfailed'] = 'ඇතුල්වීම අසාර්ථකයි.';
+$messages['errortitle']  = 'දෝෂයක් මතුවිය!';
+$messages['loginfailed']  = 'ඇතුල්වීම අසාර්ථකයි.';
 $messages['cookiesdisabled'] = 'ඔබේ බෞසරය කුකී බාර ගන්නේ නැත';
 $messages['sessionerror'] = 'ඔබේ වාරය අවලංගු හෝ කාලය ඉකුත් වී ඇත';
+$messages['storageerror'] = 'Connection to storage server failed.';
+$messages['servererror'] = 'Server Error!';
+$messages['servererrormsg'] = 'Server Error: $msg';
 $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'] = 'ලියුම් පෙට්ටියේ පනිවුඩ නැත';
 $messages['loggedout'] = 'ඔබගේ වාරය සාර්ථකව අවසන් විය. අයුබොවන්!';
 $messages['mailboxempty'] = 'ලියුම් පෙට්ටිය හිස්';
+$messages['refreshing'] = 'Refreshing...';
 $messages['loading'] = 'පූරනය...';
+$messages['uploading'] = 'Uploading file...';
+$messages['uploadingmany'] = 'Uploading files...';
 $messages['loadingdata'] = 'දත්ත පූරනය...';
 $messages['checkingmail'] = 'අලුත් පණිවිඩ පරීක්ෂා කරමින්...';
 $messages['sendingmessage'] = 'පණිවිඩය යවමින්...';
@@ -33,58 +48,124 @@ $messages['messagesaved'] = 'පනිවුඩය කටු සටහනේ ත
 $messages['successfullysaved'] = 'සුරැකීම සාර්ථකයි.';
 $messages['addedsuccessfully'] = 'ලිපිනය සාර්ථකව ලිපින පොතට එකතු කරන ලදී.';
 $messages['contactexists'] = 'ඉහත ලිපිනය සහිත විද්යුත් තැපැල් ලිපිනයක් ලිපින පොතේ ඇත.';
+$messages['contactnameexists'] = 'A contact with the same name already exists.';
 $messages['blockedimages'] = 'ඔබගෙ පොද්ගලිකත්වය හේතුවෙන්, දුරස්ථ රූප අවහිර කර ඇත.';
 $messages['encryptedmessage'] = 'මෙම පනිවුඩය රහස් කේතනය කර ඇති බැවින් පෙන්විය නොහැක. සමාවන්න!';
 $messages['nocontactsfound'] = 'ලිපින සොයා ගත නොහැක';
 $messages['contactnotfound'] = 'ඉල්ලූ ලිපිනය සොයාගත නොහැක';
+$messages['contactsearchonly'] = 'Enter some search terms to find contacts';
 $messages['sendingfailed'] = 'පණිවිඩය යැවීම අසාර්ථකයි.';
 $messages['senttooquickly'] = 'කරුණාකර මෙම පණිවිඩය යැවීමට පෙර තත්පර $secක් රැදී සිටින්න.';
+$messages['errorsavingsent'] = 'An error occured while saving sent message.';
 $messages['errorsaving'] = 'පණිවිඩය සුරැකීමේදී දෝෂයක් මතුවිය.';
 $messages['errormoving'] = 'පනිවුඩය ගෙන යාමට නොහැක';
 $messages['errorcopying'] = 'පණිවිඩ(ය) පිටපත් කල නොහැක.';
 $messages['errordeleting'] = 'පණිවිඩ(ය) මකා දැමීමට නොහැක.';
 $messages['errormarking'] = 'පණිවිඩ(ය) සලකුණු කල නොහැක.';
-$messages['deletecontactconfirm'] = 'තෝරා ඇති ලිපින ඔබට මකා දැමීමට සැබවින්ම වුවමනාද?';
+$messages['deletecontactconfirm']  = 'තෝරා ඇති ලිපින ඔබට මකා දැමීමට සැබවින්ම වුවමනාද?';
+$messages['deletegroupconfirm']  = 'Do you really want to delete selected group?';
 $messages['deletemessagesconfirm'] = 'තෝරා ඇති පණිවිඩ(ය) ඔබට මකා දැමීමට සැබවින්ම වුවමනාද?';
-$messages['deletefolderconfirm'] = 'ඔබට මෙම බහාලුම මකා දැමීමට සැබවින්ම වුවමනාද?';
-$messages['purgefolderconfirm'] = 'මෙම බහාලමේ ඇති සියලුම පණිවිඩ ඔබට මකා දැමීමට සැබවින්ම වුවමනාද?';
+$messages['deletefolderconfirm']  = 'ඔබට මෙම බහාලුම මකා දැමීමට සැබවින්ම වුවමනාද?';
+$messages['purgefolderconfirm']  = 'මෙම බහාලමේ ඇති සියලුම පණිවිඩ ඔබට මකා දැමීමට සැබවින්ම වුවමනාද?';
+$messages['contactdeleting'] = 'Deleting contact(s)...';
+$messages['groupdeleting'] = 'Deleting group...';
 $messages['folderdeleting'] = 'බහාලුම මකාදමමින්...';
+$messages['foldermoving'] = 'Moving folder...';
+$messages['foldersubscribing'] = 'Subscribing folder...';
+$messages['folderunsubscribing'] = 'Unsubscribing folder...';
 $messages['formincomplete'] = 'පෝරමය සම්පූර්ණයෙන් පුරවා නොමැත.';
 $messages['noemailwarning'] = 'කරුණාකර වලංගු විද්යුත් ලිපිනයක් ඇතුලත් කරන්න.';
-$messages['nonamewarning'] = 'කරුණාකර නම ඇතුලත් කරන්න.';
+$messages['nonamewarning']  = 'කරුණාකර නම ඇතුලත් කරන්න.';
 $messages['nopagesizewarning'] = 'කරුණාකර පිටුවේ ප්‍රමාණය ඇතුලත් කරන්න.';
+$messages['nosenderwarning'] = 'Please enter sender e-mail address.';
 $messages['norecipientwarning'] = 'කරුණාකර යටත් පිරිසෙයින් එක් ලබන්නෙකු හෝ ඇතුලත් කරන්න';
-$messages['nosubjectwarning'] = '"මාතෘකාව" හිස්. මාතෘකාවක් ඇතුලත් කිරීමට ඔබ කැමතිද?';
+$messages['nosubjectwarning']  = '"මාතෘකාව" හිස්. මාතෘකාවක් ඇතුලත් කිරීමට ඔබ කැමතිද?';
 $messages['nobodywarning'] = 'මෙම හිස් පනිවුඩය යවන්නද?';
 $messages['notsentwarning'] = 'පණිවිඩය යැවීමට නොහැකි විය. ඔබට එය බැහැර කිරීමට වුවමනාද?';
 $messages['noldapserver'] = 'සෙවුම සඳහා කරුණාකර ldap සම්බන්ධතාවයක් තෝරා ගන්න';
 $messages['nosearchname'] = 'කරුණාකර ලිපිනයෙහි නම හෝ විද්යුත් තැපැල් ලිපිනය ඇතුලත් කරන්න';
+$messages['notuploadedwarning'] = 'Not all attachments have been uploaded yet. Please wait or cancel the upload.';
 $messages['searchsuccessful'] = '$nr පනිවුඩය හමු විය';
+$messages['contactsearchsuccessful'] = '$nr contacts found.';
 $messages['searchnomatch'] = 'සෙවුමට අදාල ගැලපීමක් නොමැත.';
 $messages['searching'] = 'සොයමින්...';
 $messages['checking'] = 'පරික්‍ෂාකරමින්...';
 $messages['nospellerrors'] = 'වියාකරන දොෂ නොමැත';
 $messages['folderdeleted'] = 'බහාලුම සාර්ථකව මකා දමන ලදී.';
+$messages['foldersubscribed'] = 'Folder successfully subscribed.';
+$messages['folderunsubscribed'] = 'Folder successfully unsubscribed.';
+$messages['folderpurged'] = 'Folder has successfully been emptied.';
+$messages['folderexpunged'] = 'Folder has successfully been compacted.';
 $messages['deletedsuccessfully'] = 'සාර්ථකව මකාදමන ලදී.';
 $messages['converting'] = 'පනිවුඩයෙන් ආකෘතීකරණය ඉවත් කිරීම';
 $messages['messageopenerror'] = 'පනිවුඩය පූරනය කිරීමට නොහැක';
 $messages['fileuploaderror'] = 'ගොනුව ඇතුලත් කිරීමට නොහැක';
 $messages['filesizeerror'] = 'ඇතුලත් කල ගොනුවෙ ප්රමාණය උපරිම අගය $size ඉක්මවා ඇත';
 $messages['copysuccess'] = '$nr ලිපිනය සාර්ථකව පිටපත් කරන ලදී';
+$messages['copyerror'] = 'Could not copy any addresses.';
 $messages['sourceisreadonly'] = 'මෙම ලිපින මූලාශ්රය කියවීම සඳහා පමනි';
 $messages['errorsavingcontact'] = 'ලිපිනය තැන්පත් කීරීමට නොහැක';
 $messages['movingmessage'] = 'පණිවිඩ(ය) ගෙනයමින්...';
 $messages['copyingmessage'] = 'පණිවිඩ(ය) පිටපත් කරමින්...';
+$messages['copyingcontact'] = 'Copying contact(s)...';
 $messages['deletingmessage'] = 'පණිවිඩ(ය) මකා දමමින්...';
 $messages['markingmessage'] = 'පණිවිඩ(ය) සලකුණු කරමින්...';
+$messages['addingmember'] = 'Adding contact(s) to the group...';
+$messages['removingmember'] = 'Removing contact(s) from the group...';
+$messages['receiptsent'] = 'Successfully sent a read receipt.';
 $messages['errorsendingreceipt'] = 'කියවීම් භාර ගැනීම යැවීමට නොහැක';
+$messages['deleteidentityconfirm'] = 'Do you really want to delete this identity?';
 $messages['nodeletelastidentity'] = 'අවසාන අනන්‍යතාවය මකා දැමිය නොහැක';
+$messages['forbiddencharacter'] = 'Folder name contains a forbidden character.';
+$messages['selectimportfile'] = 'Please select a file to upload.';
+$messages['addresswriterror'] = 'The selected address book is not writeable.';
+$messages['contactaddedtogroup'] = 'Successfully added the contacts to this group.';
+$messages['contactremovedfromgroup'] = 'Successfully removed contacts from this group.';
+$messages['nogroupassignmentschanged'] = 'No group assignments changed.';
 $messages['importwait'] = 'ආනයනය කරමින්, කරුණාකර රැදී සිටින්න...';
+$messages['importformaterror'] = 'Import failed! The uploaded file is not a valid import data file.';
+$messages['importconfirm'] = '<b>Successfully imported $inserted contacts</b>';
+$messages['importconfirmskipped'] = '<b>Skipped $skipped existing entries</b>';
+$messages['opnotpermitted'] = 'Operation not permitted!';
+$messages['nofromaddress'] = 'Missing e-mail address in selected identity.';
+$messages['editorwarning'] = 'Switching to the plain text editor will cause all text formatting to be lost. Do you wish to continue?';
+$messages['httpreceivedencrypterror'] = 'A fatal configuration error occurred. Contact your administrator immediately. <b>Your message can not be sent.</b>';
+$messages['smtpconnerror'] = 'SMTP Error ($code): Connection to server failed.';
+$messages['smtpautherror'] = 'SMTP Error ($code): Authentication failed.';
+$messages['smtpfromerror'] = 'SMTP Error ($code): Failed to set sender "$from" ($msg).';
+$messages['smtptoerror'] = 'SMTP Error ($code): Failed to add recipient "$to" ($msg).';
+$messages['smtprecipientserror'] = 'SMTP Error: Unable to parse recipients list.';
+$messages['smtperror'] = 'SMTP Error: $msg';
 $messages['emailformaterror'] = 'අවලංගු විද්‍යුත් තැපැල් ලිපිනය: $email';
+$messages['toomanyrecipients'] = 'Too many recipients. Reduce the number of recipients to $max.';
+$messages['maxgroupmembersreached'] = 'The number of group members exceeds the maximum of $max.';
+$messages['internalerror'] = 'An internal error occured. Please try again.';
+$messages['contactdelerror'] = 'Could not delete contact(s).';
+$messages['contactdeleted'] = 'Contact(s) deleted successfully.';
+$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'] = 'පණිවිඩ(ය) මකා දැමීම සාර්ථකයි.';
 $messages['messagemoved'] = 'පණිවිඩ(ය) ගෙනයෑම සාර්ථකයි.';
 $messages['messagecopied'] = 'පණිවිඩ(ය) පිටපත් කිරීම සාර්ථකයි.';
 $messages['messagemarked'] = 'පණිවිඩ(ය) සලකුණු කිරීම සාර්ථකයි.';
+$messages['autocompletechars'] = 'Enter at least $min characters for autocompletion.';
+$messages['autocompletemore'] = 'More matching entries found. Please type more characters.';
 $messages['namecannotbeempty'] = 'නම හිස්ව තැබිය නොහැක.';
 $messages['nametoolong'] = 'නම දිග වැඩිය.';
+$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.';
 
+?>
diff --git a/program/localization/sk_SK/labels.inc b/program/localization/sk_SK/labels.inc
index f21e376f3..10673382a 100644
--- a/program/localization/sk_SK/labels.inc
+++ b/program/localization/sk_SK/labels.inc
@@ -2,58 +2,78 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/sk_SK/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Miroslav Ďurian                                              |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = 'Vitajte v $product';
-$labels['username'] = 'Prihlasovacie meno';
-$labels['password'] = 'Heslo';
-$labels['server'] = 'Server';
-$labels['login'] = 'Prihlásiť';
-$labels['logout'] = 'Odhlásiť';
-$labels['mail'] = 'E-Mail';
+
+// login page
+$labels['welcome']   = 'Vitajte v $product';
+$labels['username']  = 'Prihlasovacie meno';
+$labels['password']  = 'Heslo';
+$labels['server']    = 'Server';
+$labels['login']     = 'Prihlásiť';
+
+// taskbar
+$labels['logout']   = 'Odhlásiť';
+$labels['mail']     = 'E-Mail';
 $labels['settings'] = 'Nastavenia';
 $labels['addressbook'] = 'Kontakty';
-$labels['inbox'] = 'Doručená pošta';
+
+// mailbox names
+$labels['inbox']  = 'Doručená pošta';
 $labels['drafts'] = 'Rozpísané';
-$labels['sent'] = 'Odoslané';
-$labels['trash'] = 'Kôš';
-$labels['junk'] = 'Nevyžiadaná pošta';
+$labels['sent']   = 'Odoslané';
+$labels['trash']  = 'Kôš';
+$labels['junk']   = 'Nevyžiadaná pošta';
+
+// message listing
 $labels['subject'] = 'Predmet';
-$labels['from'] = 'Odosielateľ';
-$labels['to'] = 'Adresát';
-$labels['cc'] = 'Kópia';
-$labels['bcc'] = 'Tajná kópia';
+$labels['from']    = 'Odosielateľ';
+$labels['sender']  = 'Sender';
+$labels['to']      = 'Adresát';
+$labels['cc']      = 'Kópia';
+$labels['bcc']     = 'Tajná kópia';
 $labels['replyto'] = 'Odpovedať na';
 $labels['followupto'] = 'Pokračovať na';
-$labels['date'] = 'Dátum';
-$labels['size'] = 'Veľkosť';
+$labels['date']    = 'Dátum';
+$labels['size']    = 'Veľkosť';
 $labels['priority'] = 'Priorita';
 $labels['organization'] = 'Organizácia';
 $labels['readstatus'] = 'Čítať stav';
 $labels['listoptions'] = 'Nastavenia zoznamu...';
+
 $labels['mailboxlist'] = 'Priečinky';
-$labels['folders'] = 'Priečinky';
 $labels['messagesfromto'] = 'Správy od $from do $to z $count';
 $labels['threadsfromto'] = 'Konverzácie od $from do $to z $count';
 $labels['messagenrof'] = 'Správa $nr z $count';
 $labels['fromtoshort'] = '$from – $to z $count';
-$labels['copy'] = 'Kopírovať';
-$labels['move'] = 'Presunúť';
-$labels['moveto'] = 'presunúť do...';
+
+$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';
+
 $labels['filename'] = 'Meno súboru';
 $labels['filesize'] = 'Veľkosť súboru';
+
 $labels['addtoaddressbook'] = 'Pridať do adresára';
+
+// weekdays short
 $labels['sun'] = 'Ne';
 $labels['mon'] = 'Po';
 $labels['tue'] = 'Ut';
@@ -61,78 +81,88 @@ $labels['wed'] = 'St';
 $labels['thu'] = 'Št';
 $labels['fri'] = 'Pi';
 $labels['sat'] = 'So';
-$labels['sunday'] = 'Nedeľa';
-$labels['monday'] = 'Pondelok';
-$labels['tuesday'] = 'Utorok';
+
+// weekdays long
+$labels['sunday']    = 'Nedeľa';
+$labels['monday']    = 'Pondelok';
+$labels['tuesday']   = 'Utorok';
 $labels['wednesday'] = 'Streda';
-$labels['thursday'] = 'Štvrtok';
-$labels['friday'] = 'Piatok';
-$labels['saturday'] = 'Sobota';
-$labels['jan'] = 'Jan';
-$labels['feb'] = 'Feb';
-$labels['mar'] = 'Mar';
-$labels['apr'] = 'Apr';
-$labels['may'] = 'Máj';
-$labels['longmay'] = 'Máj';
-$labels['jun'] = 'Jún';
-$labels['jul'] = 'Júl';
-$labels['aug'] = 'Aug';
-$labels['sep'] = 'Sep';
-$labels['oct'] = 'Okt';
-$labels['nov'] = 'Nov';
-$labels['dec'] = 'Dec';
-$labels['longjan'] = 'Január';
-$labels['longfeb'] = 'Február';
-$labels['longmar'] = 'Marec';
-$labels['longapr'] = 'Apríl';
-$labels['longjun'] = 'Jún';
-$labels['longjul'] = 'Júl';
-$labels['longaug'] = 'August';
-$labels['longsep'] = 'September';
-$labels['longoct'] = 'Október';
-$labels['longnov'] = 'November';
-$labels['longdec'] = 'December';
+$labels['thursday']  = 'Štvrtok';
+$labels['friday']    = 'Piatok';
+$labels['saturday']  = 'Sobota';
+
+// months short
+$labels['jan']	= 'Jan';
+$labels['feb']	= 'Feb';
+$labels['mar']	= 'Mar';
+$labels['apr']	= 'Apr';
+$labels['may']	= 'Máj';
+$labels['jun']	= 'Jún';
+$labels['jul'] 	= 'Júl';
+$labels['aug']	= 'Aug';
+$labels['sep']	= 'Sep';
+$labels['oct']	= 'Okt';
+$labels['nov']	= 'Nov';
+$labels['dec']	= 'Dec';
+
+// months long
+$labels['longjan']	= 'Január';
+$labels['longfeb']	= 'Február';
+$labels['longmar']	= 'Marec';
+$labels['longapr']	= 'Apríl';
+$labels['longmay']	= 'Máj';
+$labels['longjun']	= 'Jún';
+$labels['longjul']	= 'Júl';
+$labels['longaug']	= 'August';
+$labels['longsep']	= 'September';
+$labels['longoct']	= 'Október';
+$labels['longnov']	= 'November';
+$labels['longdec']	= 'December';
+
 $labels['today'] = 'Dnes';
-$labels['refresh'] = 'Obnoviť';
-$labels['checkmail'] = 'Skontrolovať nové správy';
-$labels['compose'] = 'Vytvoriť správu';
-$labels['writenewmessage'] = 'Vytvoriť novú správu';
-$labels['reply'] = 'Odpovedať';
-$labels['replytomessage'] = 'Odpovedať';
+
+// toolbar buttons
+$labels['refresh']          = 'Obnoviť';
+$labels['checkmail']        = 'Skontrolovať nové správy';
+$labels['compose']          = 'Vytvoriť správu';
+$labels['writenewmessage']  = 'Vytvoriť novú správu';
+$labels['reply']            = 'Odpovedať';
+$labels['replytomessage']   = 'Odpovedať';
 $labels['replytoallmessage'] = 'Odpovedať všetkým';
-$labels['replyall'] = 'Odpovedať všetkým';
-$labels['replylist'] = 'Zoznam odpovedí';
-$labels['forward'] = 'Dopredu';
-$labels['forwardinline'] = 'Poslať ďalej';
+$labels['replyall']         = 'Odpovedať všetkým';
+$labels['replylist']        = 'Zoznam odpovedí';
+$labels['forward']          = 'Dopredu';
+$labels['forwardinline']    = 'Poslať ďalej';
 $labels['forwardattachment'] = 'Poslať ďalej ako prílohu';
-$labels['forwardmessage'] = 'Poslať ďalej';
-$labels['deletemessage'] = 'Zmazať správu';
+$labels['forwardmessage']   = 'Poslať ďalej';
+$labels['deletemessage']    = 'Zmazať správu';
 $labels['movemessagetotrash'] = 'Presunúť správu do koša';
-$labels['printmessage'] = 'Vytlačiť správu';
-$labels['previousmessage'] = 'Zobraziť predchádzajúcu správu';
-$labels['firstmessage'] = 'Zobraziť prvú správu';
-$labels['nextmessage'] = 'Zobraziť ďalšiu správu';
-$labels['lastmessage'] = 'Zobraziť poslednú správu';
-$labels['backtolist'] = 'Späť na zoznam správ';
-$labels['viewsource'] = 'Ukázať zdroj správy';
-$labels['mark'] = 'Označiť';
-$labels['markmessages'] = 'Označiť správy';
-$labels['markread'] = 'Ako prečítané';
-$labels['markunread'] = 'Ako neprečítané';
-$labels['markflagged'] = 'Ako označené';
-$labels['markunflagged'] = 'Ako neoznačené';
-$labels['moreactions'] = 'Ďalšie akcie...';
-$labels['more'] = 'Ďalšie';
-$labels['back'] = 'Dozadu';
-$labels['options'] = 'Možnosti';
+$labels['printmessage']     = 'Vytlačiť správu';
+$labels['previousmessage']  = 'Zobraziť predchádzajúcu správu';
+$labels['firstmessage']     = 'Zobraziť prvú správu';
+$labels['nextmessage']      = 'Zobraziť ďalšiu správu';
+$labels['lastmessage']      = 'Zobraziť poslednú správu';
+$labels['backtolist']       = 'Späť na zoznam správ';
+$labels['viewsource']       = 'Ukázať zdroj správy';
+$labels['mark']             = 'Označiť';
+$labels['markmessages']     = 'Označiť správy';
+$labels['markread']         = 'Ako prečítané';
+$labels['markunread']       = 'Ako neprečítané';
+$labels['markflagged']      = 'Ako označené';
+$labels['markunflagged']    = 'Ako neoznačené';
+$labels['moreactions']      = 'Ďalšie akcie...';
+$labels['more']             = 'Ďalšie';
+$labels['back']             = 'Dozadu';
+$labels['options']          = 'Možnosti';
+
 $labels['select'] = 'Výber';
 $labels['all'] = 'Všetky';
 $labels['none'] = 'Nič';
-$labels['nonesort'] = 'Nič';
 $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ť';
@@ -143,12 +173,14 @@ $labels['expand-all'] = 'Rozbaliť všetko';
 $labels['expand-unread'] = 'Rozbaliť neprečítané';
 $labels['collapse-all'] = 'Zbaliť všetko';
 $labels['threaded'] = 'Spájať do konverzácií';
+
 $labels['autoexpand_threads'] = 'Rozbaliť konverzácie';
 $labels['do_expand'] = 'všetky konverzácie';
 $labels['expand_only_unread'] = 'len s neprečítanými správami';
 $labels['fromto'] = 'Odosielateľ/Príjemca';
 $labels['flag'] = 'Vlajka';
 $labels['attachment'] = 'Príloha';
+$labels['nonesort'] = 'Nič';
 $labels['sentdate'] = 'Dátum odoslania';
 $labels['arrival'] = 'Dátum prijatia';
 $labels['asc'] = 'vzostupne';
@@ -157,182 +189,220 @@ $labels['listcolumns'] = 'Zoznam stĺpcov';
 $labels['listsorting'] = 'Triedenie stĺpcov';
 $labels['listorder'] = 'Usporiadanie';
 $labels['listmode'] = 'Režim zobrazenia zoznamu';
+
 $labels['folderactions'] = 'Akcie so zložkou...';
 $labels['compact'] = 'Zhustiť priečinok';
 $labels['empty'] = 'Vyprázdniť';
+
 $labels['quota'] = 'Zaplnenie schránky';
-$labels['unknown'] = 'neznáme';
-$labels['unlimited'] = 'neobmedzené';
-$labels['quicksearch'] = 'Rýchle vyhľadávanie';
-$labels['resetsearch'] = 'Vyčistiť vyhľadávanie';
-$labels['searchmod'] = 'Parametre hľadanie';
-$labels['msgtext'] = 'Celá správa';
+$labels['unknown']  = 'neznáme';
+$labels['unlimited']  = 'neobmedzené';
+
+$labels['quicksearch']  = 'Rýchle vyhľadávanie';
+$labels['resetsearch']  = 'Vyčistiť vyhľadávanie';
+$labels['searchmod']  = 'Parametre hľadanie';
+$labels['msgtext']  = 'Celá správa';
+$labels['body']  = 'Body';
+
 $labels['openinextwin'] = 'Otvoriť v novom okne';
 $labels['emlsave'] = 'Stiahnuť';
-$labels['editasnew'] = 'Upraviť ako novú';
-$labels['send'] = 'Odoslať';
-$labels['sendmessage'] = 'Odoslať správu';
-$labels['savemessage'] = 'Uložiť do rozpísaných';
-$labels['addattachment'] = 'Pridať prílohu';
-$labels['charset'] = 'Znaková sada';
-$labels['editortype'] = 'Typ editora';
-$labels['returnreceipt'] = 'Potvrdenie o doručení';
-$labels['dsn'] = 'Doručenie oznámenia o stave';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
+
+// message compose
+$labels['editasnew']      = 'Upraviť ako novú';
+$labels['send']           = 'Odoslať';
+$labels['sendmessage']    = 'Odoslať správu';
+$labels['savemessage']    = 'Uložiť do rozpísaných';
+$labels['addattachment']  = 'Pridať prílohu';
+$labels['charset']        = 'Znaková sada';
+$labels['editortype']     = 'Typ editora';
+$labels['returnreceipt']  = 'Potvrdenie o doručení';
+$labels['dsn']            = 'Doručenie oznámenia o stave';
 $labels['mailreplyintro'] = '$date odosielateľ napísal:';
 $labels['originalmessage'] = 'Pôvodná správa';
-$labels['editidents'] = 'Editovať identity';
-$labels['spellcheck'] = 'Pravopis';
+
+$labels['editidents']    = 'Editovať identity';
+$labels['spellcheck']    = 'Pravopis';
 $labels['checkspelling'] = 'Skontrolovať pravopis';
 $labels['resumeediting'] = 'Pokračovať v úpravách';
-$labels['revertto'] = 'Vrátiť sa na';
+$labels['revertto']      = 'Vrátiť sa na';
+
 $labels['attach'] = 'Priložiť';
 $labels['attachments'] = 'Prílohy';
 $labels['upload'] = 'Nahrať';
 $labels['uploadprogress'] = '$percent ($current z $total)';
-$labels['close'] = 'Zatvoriť';
-$labels['messageoptions'] = 'Nastavenia správy...';
-$labels['low'] = 'Nízka';
-$labels['lowest'] = 'Najnižšia';
-$labels['normal'] = 'Normálna';
-$labels['high'] = 'Vysoká';
+$labels['close']  = 'Zatvoriť';
+$labels['messageoptions']  = 'Nastavenia správy...';
+
+$labels['low']     = 'Nízka';
+$labels['lowest']  = 'Najnižšia';
+$labels['normal']  = 'Normálna';
+$labels['high']    = 'Vysoká';
 $labels['highest'] = 'Najvyššia';
-$labels['nosubject'] = '(bez predmetu)';
+
+$labels['nosubject']  = '(bez predmetu)';
 $labels['showimages'] = 'Ukázať obrázky';
 $labels['alwaysshow'] = 'Vždy zobraziť obrázky od $sender';
-$labels['isdraft'] = 'Toto je rozpísaná správa';
-$labels['andnmore'] = '$nr viac...';
+$labels['isdraft']    = 'Toto je rozpísaná správa';
+$labels['andnmore']   = '$nr viac...';
 $labels['togglemoreheaders'] = 'Zobraziť viac záhlaví správ';
 $labels['togglefullheaders'] = 'Prepnúť zobrazenie nespracovaných záhlaví správ';
+
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Čistý text';
 $labels['savesentmessagein'] = 'Ukladať odoslané správy do';
 $labels['dontsave'] = 'Neukladať';
 $labels['maxuploadsize'] = 'Maximálna povolená veľkosť súboru je $size';
+
 $labels['addcc'] = 'Pridať kópiu';
 $labels['addbcc'] = 'Pridať skrytú kopiu';
 $labels['addreplyto'] = 'Pridať odpoveď';
 $labels['addfollowupto'] = 'Pridať pokračovať na';
+
+// mdn
 $labels['mdnrequest'] = 'Odosielateľ tejto správy chce byť upozornený na to, že ste správu obdržali. Chcete potvrdiť prijatie správy?';
 $labels['receiptread'] = 'Potvrdenie o prijatí správy';
 $labels['yourmessage'] = 'Toto je potvrdenie o prijatí Vašej správy';
 $labels['receiptnote'] = 'Poznámka: Toto potvrdenie negarantuje, že správa bola príjemcom prečítaná a porozumel jej obsahu.';
-$labels['name'] = 'Názov';
-$labels['firstname'] = 'Meno';
-$labels['surname'] = 'Priezvisko';
-$labels['middlename'] = 'Stredné meno';
-$labels['nameprefix'] = 'Titul';
-$labels['namesuffix'] = 'Prípona';
-$labels['nickname'] = 'Prezývka';
-$labels['jobtitle'] = 'Názov práce';
-$labels['department'] = 'Oddelenie';
-$labels['gender'] = 'Pohlavie';
-$labels['maidenname'] = 'Dievčenské meno';
-$labels['email'] = 'E-Mail';
-$labels['phone'] = 'Telefón';
-$labels['address'] = 'Adresa';
-$labels['street'] = 'Ulica';
-$labels['locality'] = 'Mesto';
-$labels['zipcode'] = 'Smerovacie čéslo';
-$labels['region'] = 'Kraj';
-$labels['country'] = 'Krajina';
-$labels['birthday'] = 'Dátum narodenia';
-$labels['anniversary'] = 'Výročie';
-$labels['website'] = 'Web stránka';
+
+// address boook
+$labels['name']         = 'Názov';
+$labels['firstname']    = 'Meno';
+$labels['surname']      = 'Priezvisko';
+$labels['middlename']   = 'Stredné meno';
+$labels['nameprefix']   = 'Titul';
+$labels['namesuffix']   = 'Prípona';
+$labels['nickname']     = 'Prezývka';
+$labels['jobtitle']     = 'Názov práce';
+$labels['department']   = 'Oddelenie';
+$labels['gender']       = 'Pohlavie';
+$labels['maidenname']   = 'Dievčenské meno';
+$labels['email']        = 'E-Mail';
+$labels['phone']        = 'Telefón';
+$labels['address']      = 'Adresa';
+$labels['street']       = 'Ulica';
+$labels['locality']     = 'Mesto';
+$labels['zipcode']      = 'Smerovacie čéslo';
+$labels['region']       = 'Kraj';
+$labels['country']      = 'Krajina';
+$labels['birthday']     = 'Dátum narodenia';
+$labels['anniversary']  = 'Výročie';
+$labels['website']      = 'Web stránka';
 $labels['instantmessenger'] = 'IM';
 $labels['notes'] = 'Poznámky';
-$labels['male'] = 'muž';
+$labels['male']   = 'muž';
 $labels['female'] = 'žena';
 $labels['manager'] = 'Manažér';
 $labels['assistant'] = 'Asistent';
-$labels['typeassistant'] = 'Asistent';
 $labels['spouse'] = 'Partner';
 $labels['allfields'] = 'Všetky polia';
 $labels['search'] = 'Hľadať';
 $labels['advsearch'] = 'Rozšírené vyhľadávanie';
 $labels['advanced'] = 'Rozšírené';
 $labels['other'] = 'Ostatné';
-$labels['typeother'] = 'Ostatné';
-$labels['typehome'] = 'Domov';
-$labels['typework'] = 'Práca';
-$labels['typemobile'] = 'Mobil';
-$labels['typemain'] = 'Hlavný';
-$labels['typehomefax'] = 'Domáci fax';
-$labels['typeworkfax'] = 'Fax - práca';
-$labels['typecar'] = 'Auto';
-$labels['typepager'] = 'Pager';
-$labels['typevideo'] = 'Video';
-$labels['typehomepage'] = 'Domovská stránka';
+
+$labels['typehome']   = 'Domov';
+$labels['typework']   = 'Práca';
+$labels['typeother']  = 'Ostatné';
+$labels['typemobile']  = 'Mobil';
+$labels['typemain']  = 'Hlavný';
+$labels['typehomefax']  = 'Domáci fax';
+$labels['typeworkfax']  = 'Fax - práca';
+$labels['typecar']  = 'Auto';
+$labels['typepager']  = 'Pager';
+$labels['typevideo']  = 'Video';
+$labels['typeassistant']  = 'Asistent';
+$labels['typehomepage']  = 'Domovská stránka';
 $labels['typeblog'] = 'Blog';
 $labels['typeprofile'] = 'Profil';
+
 $labels['addfield'] = 'Pridať položku...';
 $labels['addcontact'] = 'Pridať nový kontakt';
 $labels['editcontact'] = 'Upraviť kontakt';
 $labels['contacts'] = 'Kontakty';
 $labels['contactproperties'] = 'Vlastnosti kontaktu';
 $labels['personalinfo'] = 'Osobné informácie';
-$labels['edit'] = 'Upraviť';
+
+$labels['edit']   = 'Upraviť';
 $labels['cancel'] = 'Zrušiť';
-$labels['save'] = 'Uložiť';
+$labels['save']   = 'Uložiť';
 $labels['delete'] = 'Zmazať';
 $labels['rename'] = 'Premenovať';
 $labels['addphoto'] = 'Pridať';
 $labels['replacephoto'] = 'Nahradiť';
 $labels['uploadphoto'] = 'Nahrať fotku';
-$labels['newcontact'] = 'Vytvoriť nový kontakt';
-$labels['deletecontact'] = 'Zmazať zvolené kontakty';
-$labels['composeto'] = 'Vytvoriť správu pre';
+
+$labels['newcontact']     = 'Vytvoriť nový kontakt';
+$labels['deletecontact']  = 'Zmazať zvolené kontakty';
+$labels['composeto']      = 'Vytvoriť správu pre';
 $labels['contactsfromto'] = 'Kontakty od $from do $to z $count';
-$labels['print'] = 'Tlač';
-$labels['export'] = 'Export';
-$labels['exportvcards'] = 'Exportovať kontakty vo formáte vCard';
+$labels['print']          = 'Tlač';
+$labels['export']         = 'Export';
+$labels['exportall']      = 'Export all';
+$labels['exportsel']      = 'Export selected';
+$labels['exportvcards']   = 'Exportovať kontakty vo formáte vCard';
 $labels['newcontactgroup'] = 'Vytvoriť novú skupinu kontaktov';
-$labels['grouprename'] = 'Premenovať skupinu';
-$labels['groupdelete'] = 'Zmazať skupinu';
+$labels['grouprename']    = 'Premenovať skupinu';
+$labels['groupdelete']    = 'Zmazať skupinu';
 $labels['groupremoveselected'] = 'Odstrániť vybrané kontakty zo skupiny';
-$labels['previouspage'] = 'Predchádzajúca stránka';
-$labels['firstpage'] = 'Prvá stránka';
-$labels['nextpage'] = 'Nasledujúca stránka';
-$labels['lastpage'] = 'Posledná stránka';
+
+$labels['previouspage']   = 'Predchádzajúca stránka';
+$labels['firstpage']      = 'Prvá stránka';
+$labels['nextpage']       = 'Nasledujúca stránka';
+$labels['lastpage']       = 'Posledná stránka';
+
 $labels['group'] = 'Skupina';
 $labels['groups'] = 'Skupiny';
 $labels['personaladrbook'] = 'Osobné adresy';
+
 $labels['searchsave'] = 'Uložiť vyhľadávanie';
 $labels['searchdelete'] = 'Zmazať vyhľadávanie';
+
 $labels['import'] = 'Import';
 $labels['importcontacts'] = 'Importovať kontakty';
 $labels['importfromfile'] = 'Importovať zo súboru:';
 $labels['importtarget'] = 'Pridať nové kontakty do adresára:';
 $labels['importreplace'] = 'Nahradiť celý zoznam kontaktov';
+$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['done'] = 'Hotovo';
+
+// settings
 $labels['settingsfor'] = 'Nastavenia pre';
 $labels['about'] = 'O programe';
 $labels['preferences'] = 'Vlastnosti';
 $labels['userpreferences'] = 'Používateľské nastavenia';
 $labels['editpreferences'] = 'Upraviť používateľské nastavenia';
+
 $labels['identities'] = 'Profily';
 $labels['manageidentities'] = 'Spravovať profily pre tento účet';
 $labels['newidentity'] = 'Nový profil';
+
 $labels['newitem'] = 'Nová položka';
 $labels['edititem'] = 'Upraviť položku';
+
 $labels['preferhtml'] = 'Uprednostniť HTML zobrazenie';
 $labels['defaultcharset'] = 'Predvolené kódovanie';
 $labels['htmlmessage'] = 'HTML správa';
+$labels['messagepart'] = 'Part';
+$labels['digitalsig'] = 'Digital Signature';
 $labels['dateformat'] = 'Formát dátumu';
 $labels['timeformat'] = 'Formát času';
 $labels['prettydate'] = 'Krajší dátum';
-$labels['setdefault'] = 'Obnoviť pôvodné';
-$labels['autodetect'] = 'Automaticky';
-$labels['language'] = 'Jazyk';
-$labels['timezone'] = 'Časová zóna';
-$labels['pagesize'] = 'Riadky na stránku';
+$labels['setdefault']  = 'Obnoviť pôvodné';
+$labels['autodetect']  = 'Automaticky';
+$labels['language']  = 'Jazyk';
+$labels['timezone']  = 'Časová zóna';
+$labels['pagesize']  = 'Riadky na stránku';
 $labels['signature'] = 'Podpis';
-$labels['dstactive'] = 'Letný čas';
+$labels['dstactive']  = 'Letný čas';
 $labels['showinextwin'] = 'Otvoriť správu v novom okne';
 $labels['composeextwin'] = 'Písať v novom okne';
 $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í';
@@ -355,10 +425,11 @@ $labels['showremoteimages'] = 'Zobrazovať obrázky uložené mimo mail';
 $labels['fromknownsenders'] = 'od známych užívateľov';
 $labels['always'] = 'vždy';
 $labels['showinlineimages'] = 'Zobraziť pripojené obrázky pod správou';
-$labels['autosavedraft'] = 'Automaticky uložiť koncept';
-$labels['everynminutes'] = 'každých $n minút';
-$labels['never'] = 'nikdy';
-$labels['immediately'] = 'ihneď';
+$labels['autosavedraft']  = 'Automaticky uložiť koncept';
+$labels['everynminutes']  = 'každých $n minút';
+$labels['refreshinterval']  = 'Refresh (check for new messages, etc.)';
+$labels['never']  = 'nikdy';
+$labels['immediately']  = 'ihneď';
 $labels['messagesdisplaying'] = 'Zobrazovanie správ';
 $labels['messagescomposition'] = 'Vytváranie správ';
 $labels['mimeparamfolding'] = 'Názvy príloh';
@@ -385,16 +456,13 @@ $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';
+$labels['previewpanemarkread']  = 'Označiť zobrazenej správy ako prečítané';
+$labels['afternseconds']  = 'po $n sekundách';
 $labels['reqmdn'] = 'Vždy požadovať doručenku';
 $labels['reqdsn'] = 'Vždy vyžadovať potvrdenie o doručení správy';
 $labels['replysamefolder'] = 'Umietniť odpoveď do adresára, kde je umiestnená správa, na ktorú sa odpovedalo';
-$labels['defaultaddressbook'] = 'Pridať nové kontakty do zvoleného adresára';
+$labels['defaultabook'] = 'Default address book';
 $labels['autocompletesingle'] = 'Vynechať alternatívnu emailovú adresu pri automatickom dopĺňaní';
 $labels['listnamedisplay'] = 'Zobraziť kontakt ako';
 $labels['spellcheckbeforesend'] = 'Skontrolovať pravopis pred odoslaním správy';
@@ -407,13 +475,15 @@ $labels['mailtoprotohandler'] = 'Zaregistrovať handler pre odkazy „mailto:“
 $labels['forwardmode'] = 'Preposielanie správ';
 $labels['inline'] = 'v tele spávy';
 $labels['asattachment'] = 'ako príloha';
-$labels['folder'] = 'Priečinok';
-$labels['foldername'] = 'Názov priečinku';
-$labels['subscribed'] = 'Prihlásený k odberu';
+
+$labels['folder']  = 'Priečinok';
+$labels['folders']  = 'Priečinky';
+$labels['foldername']  = 'Názov priečinku';
+$labels['subscribed']  = 'Prihlásený k odberu';
 $labels['messagecount'] = 'Počet správ';
-$labels['create'] = 'Vytvoriť';
-$labels['createfolder'] = 'Vytvor nový priečinok';
-$labels['managefolders'] = 'Spravovať priečinky';
+$labels['create']  = 'Vytvoriť';
+$labels['createfolder']  = 'Vytvor nový priečinok';
+$labels['managefolders']  = 'Spravovať priečinky';
 $labels['specialfolders'] = 'Špeciálne priečinky';
 $labels['properties'] = 'Vlastnosti';
 $labels['folderproperties'] = 'Vlastnosti adresára';
@@ -423,23 +493,29 @@ $labels['info'] = 'Informácia';
 $labels['getfoldersize'] = 'Kliknúť pre získanie leľkosti adresára';
 $labels['changesubscription'] = 'Kliknúť pre zmenu prihlásenia odberu';
 $labels['foldertype'] = 'Typ priečinka';
-$labels['personalfolder'] = 'Súkromný priečinok';
-$labels['otherfolder'] = 'Iné užívateľove adresáre';
-$labels['sharedfolder'] = 'Verejný adresár';
+$labels['personalfolder']  = 'Súkromný priečinok';
+$labels['otherfolder']  = 'Iné užívateľove adresáre';
+$labels['sharedfolder']  = 'Verejný adresár';
+
 $labels['sortby'] = 'Triediť podľa';
-$labels['sortasc'] = 'Triediť vzostupne';
+$labels['sortasc']  = 'Triediť vzostupne';
 $labels['sortdesc'] = 'Triediť zostupne';
 $labels['undo'] = 'Vrátiť';
+
 $labels['installedplugins'] = 'Nainštalované zásuvné moduly';
 $labels['plugin'] = 'Zásuvný modul';
 $labels['version'] = 'Verzia';
 $labels['source'] = 'Zdroj';
 $labels['license'] = 'Licencia';
 $labels['support'] = 'Získať podporu';
+
+// units
 $labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
 $labels['GB'] = 'GB';
+
+// character sets
 $labels['unicode'] = 'Unicode';
 $labels['english'] = 'Angličtina';
 $labels['westerneuropean'] = 'Západná Európa';
@@ -459,3 +535,4 @@ $labels['japanese'] = 'Japončina';
 $labels['korean'] = 'Korejčina';
 $labels['chinese'] = 'Čínština';
 
+?>
diff --git a/program/localization/sk_SK/messages.inc b/program/localization/sk_SK/messages.inc
index 2a2f73ec9..a6f319db6 100644
--- a/program/localization/sk_SK/messages.inc
+++ b/program/localization/sk_SK/messages.inc
@@ -2,20 +2,23 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/sk_SK/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Miroslav Ďurian                                              |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['errortitle'] = 'Vyskytla sa chyba!';
-$messages['loginfailed'] = 'Chybné prihlásenie';
+$messages['errortitle']  = 'Vyskytla sa chyba!';
+$messages['loginfailed']  = 'Chybné prihlásenie';
 $messages['cookiesdisabled'] = 'Váš internetový prehliadač nepodporuje cookies, ktoré sú potrebné pre prihlásenie';
 $messages['sessionerror'] = 'Vaše prihlásenie je neplatné alebo vypršala jeho platnosť';
 $messages['storageerror'] = 'Nepodarilo sa spojiť s IMAP serverom';
@@ -25,11 +28,14 @@ $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';
 $messages['loggedout'] = 'Odhlásenie prebehlo úspešne. Dovidenia.';
 $messages['mailboxempty'] = 'Schránka je prázdna';
+$messages['refreshing'] = 'Refreshing...';
 $messages['loading'] = 'Načítava sa...';
 $messages['uploading'] = 'Nahrávám súbor...';
 $messages['uploadingmany'] = 'Nahrávam súbory...';
@@ -56,11 +62,11 @@ $messages['errormoving'] = 'Správa sa nedá presunúť';
 $messages['errorcopying'] = 'Správa sa nedá skopírovať';
 $messages['errordeleting'] = 'Správa sa nedá zmazať';
 $messages['errormarking'] = 'Správa sa nedá označiť';
-$messages['deletecontactconfirm'] = 'Ste si istý, že chcete zmazať zvolený(é) kontakt(y)?';
-$messages['deletegroupconfirm'] = 'Skutočne chceš zmazať vybranú skupinu?';
+$messages['deletecontactconfirm']  = 'Ste si istý, že chcete zmazať zvolený(é) kontakt(y)?';
+$messages['deletegroupconfirm']  = 'Skutočne chceš zmazať vybranú skupinu?';
 $messages['deletemessagesconfirm'] = 'Ste si istý, že chcete zmazať zvolenú(é) správu(y)?';
-$messages['deletefolderconfirm'] = 'Ste si istý, že chcete zmazať tento priečinok?';
-$messages['purgefolderconfirm'] = 'Ste si istý, že chcete zmazať všetky správy v tomto priečinku?';
+$messages['deletefolderconfirm']  = 'Ste si istý, že chcete zmazať tento priečinok?';
+$messages['purgefolderconfirm']  = 'Ste si istý, že chcete zmazať všetky správy v tomto priečinku?';
 $messages['contactdeleting'] = 'Mažem kontakt(y)...';
 $messages['groupdeleting'] = 'Mažem skupinu...';
 $messages['folderdeleting'] = 'Odstraňuje sa priečinok ...';
@@ -69,11 +75,11 @@ $messages['foldersubscribing'] = 'Prihlasujem sa k adresáru...';
 $messages['folderunsubscribing'] = 'Odhlasujem sa z adresára...';
 $messages['formincomplete'] = 'Formulár nie je kompletne vyplnený';
 $messages['noemailwarning'] = 'Prosím, vložte platnú emailovú adresu';
-$messages['nonamewarning'] = 'Prosím, zadajte meno';
+$messages['nonamewarning']  = 'Prosím, zadajte meno';
 $messages['nopagesizewarning'] = 'Prosím, zadajte veľkosť strany';
 $messages['nosenderwarning'] = 'Prosím, zadajte adresu odosielateľa';
 $messages['norecipientwarning'] = 'Prosím, vložte aspoň jedného príjemcu';
-$messages['nosubjectwarning'] = 'Predmet správy je prázdny. Chcete ho teraz zadať?';
+$messages['nosubjectwarning']  = 'Predmet správy je prázdny. Chcete ho teraz zadať?';
 $messages['nobodywarning'] = 'Chcete odoslať správu bez textu?';
 $messages['notsentwarning'] = 'Správa nebola odoslaná, chcete ju zrušiť?';
 $messages['noldapserver'] = 'Prosím, zvoľte LDAP server na vyhľadávanie';
@@ -117,6 +123,7 @@ $messages['contactaddedtogroup'] = 'Kontakty boli úspešne presunuty do tejto s
 $messages['contactremovedfromgroup'] = 'Kontakty boli úspešne odstráneny z tejto skupiny';
 $messages['nogroupassignmentschanged'] = 'Priradenia do skupín neboli zmenené.';
 $messages['importwait'] = 'Prebieha import, počkajte ...';
+$messages['importformaterror'] = 'Import failed! The uploaded file is not a valid import data file.';
 $messages['importconfirm'] = '<b>Úspešne sa načítalo $inserted kontaktov, preskočilo sa $skipped existujúcich záznamov</b>:<p><em>$names</em></p>';
 $messages['importconfirmskipped'] = '<b>Preskočených $skipped existujúcich záznamov</b>';
 $messages['opnotpermitted'] = 'Operácia nie je povolená!';
@@ -158,4 +165,7 @@ $messages['invalidimageformat'] = 'Zlý formát obrázku';
 $messages['mispellingsfound'] = 'V správe boli nájdené pravopisné chyby';
 $messages['parentnotwritable'] = 'Nemôžem vytvoriť/presunúť adresár do zvoleného nadradeného adresára. Nemáte oprávnenia na zmenu.';
 $messages['messagetoobig'] = 'Časť správy je príliš veľká na spracovanie.';
+$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.';
 
+?>
diff --git a/program/localization/sl_SI/labels.inc b/program/localization/sl_SI/labels.inc
index f220c77f1..6b9ba2d41 100644
--- a/program/localization/sl_SI/labels.inc
+++ b/program/localization/sl_SI/labels.inc
@@ -2,138 +2,169 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/sl_SI/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = 'Dobrodošli v $product';
-$labels['username'] = 'Uporabniško ime';
-$labels['password'] = 'Geslo';
-$labels['server'] = 'Strežnik';
-$labels['login'] = 'Prijava';
-$labels['logout'] = 'Odjava';
-$labels['mail'] = 'E-Pošta';
+
+// login page
+$labels['welcome']   = 'Dobrodošli v $product';
+$labels['username']  = 'Uporabniško ime';
+$labels['password']  = 'Geslo';
+$labels['server']    = 'Strežnik';
+$labels['login']     = 'Prijava';
+
+// taskbar
+$labels['logout']   = 'Odjava';
+$labels['mail']     = 'E-Pošta';
 $labels['settings'] = 'Osebne nastavitve';
 $labels['addressbook'] = 'Stiki';
-$labels['inbox'] = 'Prejeto';
+
+// mailbox names
+$labels['inbox']  = 'Prejeto';
 $labels['drafts'] = 'Osnutki';
-$labels['sent'] = 'Poslano';
-$labels['trash'] = 'Smeti';
-$labels['junk'] = 'Nezaželena sporočila';
+$labels['sent']   = 'Poslano';
+$labels['trash']  = 'Smeti';
+$labels['junk']   = 'Nezaželena sporočila';
+
+// message listing
 $labels['subject'] = 'Zadeva';
-$labels['from'] = 'Pošiljatelj';
-$labels['to'] = 'Prejemnik';
-$labels['cc'] = 'Kp';
-$labels['bcc'] = 'Skp';
+$labels['from']    = 'Pošiljatelj';
+$labels['sender']  = 'Pošiljatelj';
+$labels['to']      = 'Prejemnik';
+$labels['cc']      = 'Kp';
+$labels['bcc']     = 'Skp';
 $labels['replyto'] = 'Odgovor na';
 $labels['followupto'] = 'Odgovor na';
-$labels['date'] = 'Datum';
-$labels['size'] = 'Velikost';
+$labels['date']    = 'Datum';
+$labels['size']    = 'Velikost';
 $labels['priority'] = 'Prioriteta';
 $labels['organization'] = 'Organizacija';
 $labels['readstatus'] = 'Status';
 $labels['listoptions'] = 'Možnosti prikaza...';
+
 $labels['mailboxlist'] = 'Mape';
-$labels['folders'] = 'Mape';
 $labels['messagesfromto'] = 'Sporočila $from do $to od $count';
 $labels['threadsfromto'] = 'Nit $from do $to od $count';
 $labels['messagenrof'] = 'Sporočilo $nr od $count';
 $labels['fromtoshort'] = '$from – $to od $count';
-$labels['copy'] = 'Kopiraj';
-$labels['move'] = 'Premakni';
-$labels['moveto'] = 'Premakni v...';
+
+$labels['copy']     = 'Kopiraj';
+$labels['move']     = 'Premakni';
+$labels['moveto']   = 'Premakni v...';
 $labels['download'] = 'Prenesi';
+$labels['open']     = 'Odpri';
+$labels['showattachment'] = 'Prikaži';
+$labels['showanyway'] = 'Prikaži';
+
 $labels['filename'] = 'Ime datoteke';
 $labels['filesize'] = 'Velikost datoteke';
+
 $labels['addtoaddressbook'] = 'Dodaj med stike';
-$labels['sun'] = 'Ned';
-$labels['mon'] = 'Pon';
-$labels['tue'] = 'Tor';
-$labels['wed'] = 'Sre';
-$labels['thu'] = 'Čet';
-$labels['fri'] = 'Pet';
-$labels['sat'] = 'Sob';
-$labels['sunday'] = 'Nedelja';
-$labels['monday'] = 'Ponedeljek';
-$labels['tuesday'] = 'Torek';
-$labels['wednesday'] = 'Sreda';
-$labels['thursday'] = 'Četrtek';
-$labels['friday'] = 'Petek';
-$labels['saturday'] = 'Sobota';
-$labels['jan'] = 'Jan';
-$labels['feb'] = 'Feb';
-$labels['mar'] = 'Mar';
-$labels['apr'] = 'Apr';
-$labels['may'] = 'Maj';
-$labels['longmay'] = 'Maj';
-$labels['jun'] = 'Jun';
-$labels['jul'] = 'Jul';
-$labels['aug'] = 'Avg';
-$labels['sep'] = 'Sep';
-$labels['oct'] = 'Okt';
-$labels['nov'] = 'Nov';
-$labels['dec'] = 'Dec';
-$labels['longjan'] = 'Januar';
-$labels['longfeb'] = 'Februar';
-$labels['longmar'] = 'Marec';
-$labels['longapr'] = 'April';
-$labels['longjun'] = 'Junij';
-$labels['longjul'] = 'Julij';
-$labels['longaug'] = 'Avgust';
-$labels['longsep'] = 'September';
-$labels['longoct'] = 'Oktober';
-$labels['longnov'] = 'November';
-$labels['longdec'] = 'December';
+
+// weekdays short
+$labels['sun'] = 'ned';
+$labels['mon'] = 'pon';
+$labels['tue'] = 'tor';
+$labels['wed'] = 'sre';
+$labels['thu'] = 'čet';
+$labels['fri'] = 'pet';
+$labels['sat'] = 'sob';
+
+// weekdays long
+$labels['sunday']    = 'nedelja';
+$labels['monday']    = 'ponedeljek';
+$labels['tuesday']   = 'torek';
+$labels['wednesday'] = 'sreda';
+$labels['thursday']  = 'četrtek';
+$labels['friday']    = 'petek';
+$labels['saturday']  = 'sobota';
+
+// months short
+$labels['jan']	= 'jan';
+$labels['feb']	= 'feb';
+$labels['mar']	= 'mar';
+$labels['apr']	= 'Apr';
+$labels['may']	= 'maj';
+$labels['jun']	= 'jun';
+$labels['jul'] 	= 'jul';
+$labels['aug']	= 'avg';
+$labels['sep']	= 'sep';
+$labels['oct']	= 'okt';
+$labels['nov']	= 'nov';
+$labels['dec']	= 'dec';
+
+// months long
+$labels['longjan']	= 'januar';
+$labels['longfeb']	= 'februar';
+$labels['longmar']	= 'marec';
+$labels['longapr']	= 'April';
+$labels['longmay']	= 'maj';
+$labels['longjun']	= 'junij';
+$labels['longjul']	= 'julij';
+$labels['longaug']	= 'avgust';
+$labels['longsep']	= 'september';
+$labels['longoct']	= 'oktober';
+$labels['longnov']	= 'november';
+$labels['longdec']	= 'december';
+
 $labels['today'] = 'Danes';
-$labels['refresh'] = 'Osveži';
-$labels['checkmail'] = 'Preglej nova sporočila';
-$labels['compose'] = 'Sestavi sporočilo';
-$labels['writenewmessage'] = 'Novo sporočilo';
-$labels['reply'] = 'Odgovori';
-$labels['replytomessage'] = 'Odgovori';
+
+// toolbar buttons
+$labels['refresh']          = 'Osveži';
+$labels['checkmail']        = 'Preglej nova sporočila';
+$labels['compose']          = 'Sestavi sporočilo';
+$labels['writenewmessage']  = 'Novo sporočilo';
+$labels['reply']            = 'Odgovori';
+$labels['replytomessage']   = 'Odgovori';
 $labels['replytoallmessage'] = 'Odgovori listi ali vsem prejemnikom';
-$labels['replyall'] = 'Odgovori vsem';
-$labels['replylist'] = 'Odgovori listi';
-$labels['forward'] = 'Posreduj';
-$labels['forwardinline'] = 'Posreduj medvrstično';
+$labels['replyall']         = 'Odgovori vsem';
+$labels['replylist']        = 'Odgovori listi';
+$labels['forward']          = 'Posreduj';
+$labels['forwardinline']    = 'Posreduj medvrstično';
 $labels['forwardattachment'] = 'Posreduj kot priponko';
-$labels['forwardmessage'] = 'Posreduj';
-$labels['deletemessage'] = 'Izbriši';
+$labels['forwardmessage']   = 'Posreduj';
+$labels['deletemessage']    = 'Izbriši';
 $labels['movemessagetotrash'] = 'Premakni v smeti';
-$labels['printmessage'] = 'Natisni';
-$labels['previousmessage'] = 'Prikaži prejšnje sporočilo';
-$labels['firstmessage'] = 'Prikaži prvo sporočilo';
-$labels['nextmessage'] = 'Prikaži naslednje sporočilo';
-$labels['lastmessage'] = 'Prikaži zadnje sporočilo';
-$labels['backtolist'] = 'Nazaj na seznam sporočil';
-$labels['viewsource'] = 'Prikaži izvirno kodo';
-$labels['mark'] = 'Označi';
-$labels['markmessages'] = 'Označi sporočilo';
-$labels['markread'] = 'Kot prebrano';
-$labels['markunread'] = 'Kot neprebrano';
-$labels['markflagged'] = 'Kot označeno';
-$labels['markunflagged'] = 'Kot neoznačeno';
-$labels['moreactions'] = 'Več možnosti...';
-$labels['more'] = 'Več';
-$labels['back'] = 'Nazaj';
-$labels['options'] = 'Možnosti';
+$labels['printmessage']     = 'Natisni';
+$labels['previousmessage']  = 'Prikaži prejšnje sporočilo';
+$labels['firstmessage']     = 'Prikaži prvo sporočilo';
+$labels['nextmessage']      = 'Prikaži naslednje sporočilo';
+$labels['lastmessage']      = 'Prikaži zadnje sporočilo';
+$labels['backtolist']       = 'Nazaj na seznam sporočil';
+$labels['viewsource']       = 'Prikaži izvirno kodo';
+$labels['mark']             = 'Označi';
+$labels['markmessages']     = 'Označi sporočilo';
+$labels['markread']         = 'Kot prebrano';
+$labels['markunread']       = 'Kot neprebrano';
+$labels['markflagged']      = 'Kot označeno';
+$labels['markunflagged']    = 'Kot neoznačeno';
+$labels['moreactions']      = 'Več možnosti...';
+$labels['more']             = 'Več';
+$labels['back']             = 'Nazaj';
+$labels['options']          = 'Možnosti';
+
 $labels['select'] = 'Izberi';
 $labels['all'] = 'Vse';
 $labels['none'] = 'Brez';
-$labels['nonesort'] = 'Brez';
 $labels['currpage'] = 'Trenutna stran';
 $labels['unread'] = 'Neprebrano';
 $labels['flagged'] = 'Označeno';
 $labels['unanswered'] = 'Neoznačeno';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Izbrisano';
+$labels['undeleted'] = 'Ni izbrisano';
 $labels['invert'] = 'Zamenjaj';
 $labels['filter'] = 'Prikaži';
 $labels['list'] = 'Seznam';
@@ -142,12 +173,14 @@ $labels['expand-all'] = 'Razširi vse';
 $labels['expand-unread'] = 'Razširi neprebrano';
 $labels['collapse-all'] = 'Zloži vse';
 $labels['threaded'] = 'Nitno';
+
 $labels['autoexpand_threads'] = 'Razširi niti';
 $labels['do_expand'] = 'vse niti';
 $labels['expand_only_unread'] = 'samo niti z neprebranimi sporočili';
 $labels['fromto'] = 'Pošiljatelj/Prejemnik';
 $labels['flag'] = 'Oznaka';
 $labels['attachment'] = 'Priponka';
+$labels['nonesort'] = 'Brez';
 $labels['sentdate'] = 'Datum pošiljanja';
 $labels['arrival'] = 'Datum prejema';
 $labels['asc'] = 'naraščajoče';
@@ -156,175 +189,220 @@ $labels['listcolumns'] = 'Seznam stolpcev';
 $labels['listsorting'] = 'Urejanje stolpcev';
 $labels['listorder'] = 'Vrstni red';
 $labels['listmode'] = 'Način prikaza seznama';
+
 $labels['folderactions'] = 'Upravljanje map...';
 $labels['compact'] = 'Stisni';
 $labels['empty'] = 'Izprazni';
+
 $labels['quota'] = 'Poraba prostora';
-$labels['unknown'] = 'neznana';
-$labels['unlimited'] = 'neomejena';
-$labels['quicksearch'] = 'Hitri iskalnik';
-$labels['resetsearch'] = 'Prekliči iskanje';
-$labels['searchmod'] = 'Spremembe iskanja';
-$labels['msgtext'] = 'Celotno sporočilo';
+$labels['unknown']  = 'neznana';
+$labels['unlimited']  = 'neomejena';
+
+$labels['quicksearch']  = 'Hitri iskalnik';
+$labels['resetsearch']  = 'Prekliči iskanje';
+$labels['searchmod']  = 'Spremembe iskanja';
+$labels['msgtext']  = 'Celotno sporočilo';
+$labels['body']  = 'Vsebina sporočila';
+
 $labels['openinextwin'] = 'Odpri v novem oknu';
 $labels['emlsave'] = 'Prenos datoteke (.eml)';
-$labels['editasnew'] = 'Uredi kot novo';
-$labels['sendmessage'] = 'Pošlji sporočilo';
-$labels['savemessage'] = 'Shrani kot osnutek';
-$labels['addattachment'] = 'Pripni datoteko';
-$labels['charset'] = 'Nabor znakov';
-$labels['editortype'] = 'Vrsta urejevalnika';
-$labels['returnreceipt'] = 'Potrdilo prejemnika';
-$labels['dsn'] = 'Status dostave sporočila';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
+
+// message compose
+$labels['editasnew']      = 'Uredi kot novo';
+$labels['send']           = 'Pošlji';
+$labels['sendmessage']    = 'Pošlji sporočilo';
+$labels['savemessage']    = 'Shrani kot osnutek';
+$labels['addattachment']  = 'Pripni datoteko';
+$labels['charset']        = 'Nabor znakov';
+$labels['editortype']     = 'Vrsta urejevalnika';
+$labels['returnreceipt']  = 'Potrdilo prejemnika';
+$labels['dsn']            = 'Status dostave sporočila';
 $labels['mailreplyintro'] = '$date, je $sender napisal';
 $labels['originalmessage'] = 'Izvorno sporočilo';
-$labels['editidents'] = 'Uredi identitete';
-$labels['spellcheck'] = 'Črkovanje';
+
+$labels['editidents']    = 'Uredi identitete';
+$labels['spellcheck']    = 'Črkovanje';
 $labels['checkspelling'] = 'Preglej pravopis';
 $labels['resumeediting'] = 'Nadaljuj z urejanjem';
-$labels['revertto'] = 'Razveljavi';
+$labels['revertto']      = 'Razveljavi';
+
 $labels['attach'] = 'Pripni';
 $labels['attachments'] = 'Priponke';
 $labels['upload'] = 'Naloži';
 $labels['uploadprogress'] = '$percent ($current od $total)';
-$labels['close'] = 'Zapri';
-$labels['messageoptions'] = 'Možnosti';
-$labels['low'] = 'Nizka';
-$labels['lowest'] = 'Najnižja';
-$labels['normal'] = 'Običajna';
-$labels['high'] = 'Visoka';
+$labels['close']  = 'Zapri';
+$labels['messageoptions']  = 'Možnosti';
+
+$labels['low']     = 'Nizka';
+$labels['lowest']  = 'Najnižja';
+$labels['normal']  = 'Običajna';
+$labels['high']    = 'Visoka';
 $labels['highest'] = 'Najvišja';
-$labels['nosubject'] = '(brez naslova)';
+
+$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['isdraft']    = 'To je osnutek sporočila.';
+$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';
 $labels['savesentmessagein'] = 'Shrani poslana sporočila v';
 $labels['dontsave'] = 'Ne shrani';
 $labels['maxuploadsize'] = 'Največja dovoljena velikost datoteke je $size';
+
 $labels['addcc'] = 'Dodaj Kp';
 $labels['addbcc'] = 'Dodaj Skp';
 $labels['addreplyto'] = 'Dodaj naslov za odgovor';
 $labels['addfollowupto'] = 'Dodaj naslov za odgovor';
+
+// mdn
 $labels['mdnrequest'] = 'Pošiljatelj tega sporočila je zaprosil za potrdilo o branju. Želite o tem obvestiti pošiljatelja?';
 $labels['receiptread'] = 'Potrdilo o branju';
 $labels['yourmessage'] = 'To je potrdilo o branju.';
 $labels['receiptnote'] = 'Pozor: to je samo potrdilo, da je bilo vaše sporočilo prikazano na prejemnikovem računalniku. To še ne pomeni, da je prejemnik prebral ali razumel vsebino vašega sporočila.';
-$labels['name'] = 'Ime za prikaz';
-$labels['firstname'] = 'Ime';
-$labels['surname'] = 'Priimek';
-$labels['middlename'] = 'Drugo ime';
-$labels['nameprefix'] = 'Predpona';
-$labels['namesuffix'] = 'Pripona';
-$labels['nickname'] = 'Vzdevek';
-$labels['jobtitle'] = 'Naziv';
-$labels['department'] = 'Oddelek';
-$labels['gender'] = 'Spol';
-$labels['maidenname'] = 'Dekliški priimek';
-$labels['email'] = 'E-Pošta';
-$labels['phone'] = 'Telefon';
-$labels['address'] = 'Naslov';
-$labels['street'] = 'Ulica';
-$labels['locality'] = 'Mesto';
-$labels['zipcode'] = 'Poštna številka';
-$labels['region'] = 'Regija';
-$labels['country'] = 'Država';
-$labels['birthday'] = 'Rojstni dan';
-$labels['anniversary'] = 'Rojstni dan';
-$labels['website'] = 'Spletna stran';
+
+// address boook
+$labels['name']         = 'Ime za prikaz';
+$labels['firstname']    = 'Ime';
+$labels['surname']      = 'Priimek';
+$labels['middlename']   = 'Drugo ime';
+$labels['nameprefix']   = 'Predpona';
+$labels['namesuffix']   = 'Pripona';
+$labels['nickname']     = 'Vzdevek';
+$labels['jobtitle']     = 'Naziv';
+$labels['department']   = 'Oddelek';
+$labels['gender']       = 'Spol';
+$labels['maidenname']   = 'Dekliški priimek';
+$labels['email']        = 'E-Pošta';
+$labels['phone']        = 'Telefon';
+$labels['address']      = 'Naslov';
+$labels['street']       = 'Ulica';
+$labels['locality']     = 'Mesto';
+$labels['zipcode']      = 'Poštna številka';
+$labels['region']       = 'Regija';
+$labels['country']      = 'Država';
+$labels['birthday']     = 'Rojstni dan';
+$labels['anniversary']  = 'Rojstni dan';
+$labels['website']      = 'Spletna stran';
 $labels['instantmessenger'] = 'IM';
 $labels['notes'] = 'Opombe';
-$labels['male'] = 'moški';
+$labels['male']   = 'moški';
 $labels['female'] = 'ženska';
 $labels['manager'] = 'Vodja';
 $labels['assistant'] = 'Pomoč';
-$labels['typeassistant'] = 'Pomoč';
 $labels['spouse'] = 'Zakonec';
 $labels['allfields'] = 'Vsa polja';
 $labels['search'] = 'Iskanje';
 $labels['advsearch'] = 'Napredno iskanje';
 $labels['advanced'] = 'Napredno';
 $labels['other'] = 'Ostalo';
-$labels['typeother'] = 'Ostalo';
-$labels['typehome'] = 'Doma';
-$labels['typework'] = 'Služba';
-$labels['typemobile'] = 'Mobilni telefon';
-$labels['typemain'] = 'Osnovno';
-$labels['typehomefax'] = 'Domači fax';
-$labels['typeworkfax'] = 'Službeni fax';
-$labels['typecar'] = 'Avto';
-$labels['typepager'] = 'Pozivnik';
-$labels['typevideo'] = 'Video';
-$labels['typehomepage'] = 'Domača stran';
+
+$labels['typehome']   = 'Doma';
+$labels['typework']   = 'Služba';
+$labels['typeother']  = 'Ostalo';
+$labels['typemobile']  = 'Mobilni telefon';
+$labels['typemain']  = 'Osnovno';
+$labels['typehomefax']  = 'Domači fax';
+$labels['typeworkfax']  = 'Službeni fax';
+$labels['typecar']  = 'Avto';
+$labels['typepager']  = 'Pozivnik';
+$labels['typevideo']  = 'Video';
+$labels['typeassistant']  = 'Pomoč';
+$labels['typehomepage']  = 'Domača stran';
 $labels['typeblog'] = 'Blog';
 $labels['typeprofile'] = 'Profil';
+
 $labels['addfield'] = 'Dodaj polje...';
 $labels['addcontact'] = 'Dodaj izbrane stike v imenik';
 $labels['editcontact'] = 'Uredi vizitko';
 $labels['contacts'] = 'Stiki';
 $labels['contactproperties'] = 'Lastnosti stika';
 $labels['personalinfo'] = 'Osebni podatki';
-$labels['edit'] = 'Uredi';
+
+$labels['edit']   = 'Uredi';
 $labels['cancel'] = 'Prekliči';
-$labels['save'] = 'Shrani';
+$labels['save']   = 'Shrani';
 $labels['delete'] = 'Izbriši';
 $labels['rename'] = 'Preimenuj';
 $labels['addphoto'] = 'Dodaj';
 $labels['replacephoto'] = 'Zamenjaj';
 $labels['uploadphoto'] = 'Naloži sliko';
-$labels['newcontact'] = 'Dodaj vizitko';
-$labels['deletecontact'] = 'Izbriši izbrane vizitke';
-$labels['composeto'] = 'Sestavi sporočilo za';
+
+$labels['newcontact']     = 'Dodaj vizitko';
+$labels['deletecontact']  = 'Izbriši izbrane vizitke';
+$labels['composeto']      = 'Sestavi sporočilo za';
 $labels['contactsfromto'] = 'Vizitke $from od $to do $count';
-$labels['print'] = 'Natisni';
-$labels['export'] = 'Izvozi';
-$labels['exportvcards'] = 'Izvozi stike v formatu vCard';
+$labels['print']          = 'Natisni';
+$labels['export']         = 'Izvozi';
+$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';
-$labels['groupdelete'] = 'Izbriši skupino';
+$labels['grouprename']    = 'Preimenuj skupino';
+$labels['groupdelete']    = 'Izbriši skupino';
 $labels['groupremoveselected'] = 'Odstrani izbrane stike iz skupine';
-$labels['previouspage'] = 'Prejšnja stran';
-$labels['firstpage'] = 'Prva stran';
-$labels['nextpage'] = 'Naslednja stran';
-$labels['lastpage'] = 'Zadnja stran';
+
+$labels['previouspage']   = 'Prejšnja stran';
+$labels['firstpage']      = 'Prva stran';
+$labels['nextpage']       = 'Naslednja stran';
+$labels['lastpage']       = 'Zadnja stran';
+
 $labels['group'] = 'Skupina';
 $labels['groups'] = 'Skupine';
 $labels['personaladrbook'] = 'Stiki';
+
 $labels['searchsave'] = 'Shrani iskanje';
 $labels['searchdelete'] = 'Izbriši iskanje';
+
 $labels['import'] = 'Uvozi';
 $labels['importcontacts'] = 'Uvozi stike';
 $labels['importfromfile'] = 'Uvozi iz datoteke:';
 $labels['importtarget'] = 'Dodaj nove stike v imenik:';
 $labels['importreplace'] = 'Zamenjaj celoten imenik';
+$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
 $labels['settingsfor'] = 'Nastavitve za';
 $labels['about'] = 'Vizitka';
 $labels['preferences'] = 'Nastavitve';
 $labels['userpreferences'] = 'Uporabniške nastavitve';
 $labels['editpreferences'] = 'Uredi uporabniške nastavitve';
+
 $labels['identities'] = 'Identitete';
 $labels['manageidentities'] = 'Upravljaj identitete za ta račun';
 $labels['newidentity'] = 'Nova identiteta';
+
 $labels['newitem'] = 'Nov predmet';
 $labels['edititem'] = 'Uredi predmet';
+
 $labels['preferhtml'] = 'Prednostno HTML';
 $labels['defaultcharset'] = 'Privzeto kodiranje znakov';
 $labels['htmlmessage'] = 'HTML sporočilo';
+$labels['messagepart'] = 'Del';
+$labels['digitalsig'] = 'Digitalni podpis';
 $labels['dateformat'] = 'Prikaz datuma';
 $labels['timeformat'] = 'Prikaz časa';
 $labels['prettydate'] = 'Bolj čitljivi datumi';
-$labels['setdefault'] = 'Nastavi privzeto';
-$labels['autodetect'] = 'Samodejno';
-$labels['language'] = 'Jezik';
-$labels['timezone'] = 'Časovni pas';
-$labels['pagesize'] = 'Vrstic na stran';
+$labels['setdefault']  = 'Nastavi privzeto';
+$labels['autodetect']  = 'Samodejno';
+$labels['language']  = 'Jezik';
+$labels['timezone']  = 'Časovni pas';
+$labels['pagesize']  = 'Vrstic na stran';
 $labels['signature'] = 'Podpis';
-$labels['dstactive'] = 'Samodejna nastavitev zimskega/letnega časa';
+$labels['dstactive']  = 'Samodejna nastavitev zimskega/letnega časa';
+$labels['showinextwin'] = 'Odpri v novem oknu';
+$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'] = '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';
@@ -347,10 +425,11 @@ $labels['showremoteimages'] = 'Prikaži medvrstične slike';
 $labels['fromknownsenders'] = 'od znanih pošiljateljev';
 $labels['always'] = 'vedno';
 $labels['showinlineimages'] = 'Prikaži priponke na dnu sporočila';
-$labels['autosavedraft'] = 'Samodejno shrani osnutke';
-$labels['everynminutes'] = '$n minut';
-$labels['never'] = 'nikoli';
-$labels['immediately'] = 'takoj';
+$labels['autosavedraft']  = 'Samodejno shrani osnutke';
+$labels['everynminutes']  = '$n minut';
+$labels['refreshinterval']  = 'Osveži (preglej nova sporočila)';
+$labels['never']  = 'nikoli';
+$labels['immediately']  = 'takoj';
 $labels['messagesdisplaying'] = 'Prikazovanje sporočil';
 $labels['messagescomposition'] = 'Sestavljanje sporočil';
 $labels['mimeparamfolding'] = 'Imena priponk';
@@ -370,22 +449,20 @@ $labels['maintenance'] = 'Vzdrževanje';
 $labels['newmessage'] = 'Novo sporočilo';
 $labels['signatureoptions'] = 'Nastavitve podpisa';
 $labels['whenreplying'] = 'Pri odgovoru';
+$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['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['defaultaddressbook'] = 'Dodaj nove stike v izbran imenik';
+$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';
@@ -395,13 +472,18 @@ $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['folder'] = 'Mapa';
-$labels['foldername'] = 'Ime mape';
-$labels['subscribed'] = 'Vpisan';
+$labels['forwardmode'] = 'Posredovanje sporočil';
+$labels['inline'] = 'medvrstično';
+$labels['asattachment'] = 'Kot priponka';
+
+$labels['folder']  = 'Mapa';
+$labels['folders']  = 'Mape';
+$labels['foldername']  = 'Ime mape';
+$labels['subscribed']  = 'Vpisan';
 $labels['messagecount'] = 'Sporočila';
-$labels['create'] = 'Ustvari';
-$labels['createfolder'] = 'Ustvari novo mapo';
-$labels['managefolders'] = 'Uredi mape';
+$labels['create']  = 'Ustvari';
+$labels['createfolder']  = 'Ustvari novo mapo';
+$labels['managefolders']  = 'Uredi mape';
 $labels['specialfolders'] = 'Posebne mape';
 $labels['properties'] = 'Lastnosti';
 $labels['folderproperties'] = 'Lastnosti mape';
@@ -411,22 +493,29 @@ $labels['info'] = 'Podatki';
 $labels['getfoldersize'] = 'Klikni za prikaz velikosti mape';
 $labels['changesubscription'] = 'Klikni za spremembo prijave mape';
 $labels['foldertype'] = 'Tip mape';
-$labels['personalfolder'] = 'Zasebna mapa';
-$labels['otherfolder'] = 'Mapa drugega uporabnika';
-$labels['sharedfolder'] = 'Javna mapa';
+$labels['personalfolder']  = 'Zasebna mapa';
+$labels['otherfolder']  = 'Mapa drugega uporabnika';
+$labels['sharedfolder']  = 'Javna mapa';
+
 $labels['sortby'] = 'Uredi po';
-$labels['sortasc'] = 'Uredi naraščajoče';
+$labels['sortasc']  = 'Uredi naraščajoče';
 $labels['sortdesc'] = 'Uredi padajoče';
 $labels['undo'] = 'Prekliči';
+
+$labels['installedplugins'] = 'Nameščeni vtičniki';
 $labels['plugin'] = 'Vtičnik';
 $labels['version'] = 'Različica';
 $labels['source'] = 'Vir';
 $labels['license'] = 'Licenca';
 $labels['support'] = 'Podpora';
+
+// units
 $labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
 $labels['GB'] = 'GB';
+
+// character sets
 $labels['unicode'] = 'Unicode';
 $labels['english'] = 'Angleško';
 $labels['westerneuropean'] = 'Zahodnoevropsko';
@@ -446,3 +535,4 @@ $labels['japanese'] = 'Japonsko';
 $labels['korean'] = 'Korejsko';
 $labels['chinese'] = 'Kitajsko';
 
+?>
diff --git a/program/localization/sl_SI/messages.inc b/program/localization/sl_SI/messages.inc
index a360e952f..081d912c1 100644
--- a/program/localization/sl_SI/messages.inc
+++ b/program/localization/sl_SI/messages.inc
@@ -2,20 +2,23 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/sl_SI/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Teja Cetinski <teja.cetinski@gmail.com>                       |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['errortitle'] = 'Prišlo je do napake!';
-$messages['loginfailed'] = 'Prijava ni uspela';
+$messages['errortitle']  = 'Prišlo je do napake!';
+$messages['loginfailed']  = 'Prijava ni uspela';
 $messages['cookiesdisabled'] = 'Vaš spletni brskalnik ne sprejema piškotkov.';
 $messages['sessionerror'] = 'Seja je neveljavna ali je potekla.';
 $messages['storageerror'] = 'Povezava z IMAP strežnikom je spodletela.';
@@ -25,10 +28,14 @@ $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.';
 $messages['loggedout'] = 'Odjava je bila uspešna.';
 $messages['mailboxempty'] = 'Poštni predal je prazen.';
+$messages['refreshing'] = 'Osvežujem...';
 $messages['loading'] = 'Nalaganje...';
 $messages['uploading'] = 'Prenos dokumenta na strežnik...';
 $messages['uploadingmany'] = 'Nalaganje dokumentov..';
@@ -55,11 +62,11 @@ $messages['errormoving'] = 'Sporočila ni bilo mogoče premakniti.';
 $messages['errorcopying'] = 'Sporočila ni bilo mogoče kopirati.';
 $messages['errordeleting'] = 'Sporočila ni bilo mogoče izbrisati.';
 $messages['errormarking'] = 'Sporočila ni bilo mogoče označiti.';
-$messages['deletecontactconfirm'] = 'Ste prepričani, da želite izbrisati označen(e) stik(e)?';
-$messages['deletegroupconfirm'] = 'Ste prepričani, da želite izbrisati izbrano skupino?';
+$messages['deletecontactconfirm']  = 'Ste prepričani, da želite izbrisati označen(e) stik(e)?';
+$messages['deletegroupconfirm']  = 'Ste prepričani, da želite izbrisati izbrano skupino?';
 $messages['deletemessagesconfirm'] = 'Ste prepričani, da želite izbrisati označeno(a) sporočilo(a)?';
-$messages['deletefolderconfirm'] = 'Ste prepričani, da želite to mapo izbrisati?';
-$messages['purgefolderconfirm'] = 'Ste prepričani, da želite izbrisati vsa sporočila v mapi?';
+$messages['deletefolderconfirm']  = 'Ste prepričani, da želite to mapo izbrisati?';
+$messages['purgefolderconfirm']  = 'Ste prepričani, da želite izbrisati vsa sporočila v mapi?';
 $messages['contactdeleting'] = 'Brisanje stika/ov...';
 $messages['groupdeleting'] = 'Brisanje skupine...';
 $messages['folderdeleting'] = 'Brisanje mape...';
@@ -68,11 +75,11 @@ $messages['foldersubscribing'] = 'Prijavljanje mape...';
 $messages['folderunsubscribing'] = 'Odjavljanje mape...';
 $messages['formincomplete'] = 'Obrazec ni v celoti izpolnjen';
 $messages['noemailwarning'] = 'Vnesite veljaven elektronski naslov';
-$messages['nonamewarning'] = 'Vnesite ime';
+$messages['nonamewarning']  = 'Vnesite ime';
 $messages['nopagesizewarning'] = 'Vnesite velikost strani';
 $messages['nosenderwarning'] = 'Vnesite elektronski naslov pošiljatelja';
 $messages['norecipientwarning'] = 'Vnesite vsaj enega prejemnika sporočila';
-$messages['nosubjectwarning'] = 'Polje "Zadeva" je prazno. Želite dodati tekst v to polje?';
+$messages['nosubjectwarning']  = 'Polje "Zadeva" je prazno. Želite dodati tekst v to polje?';
 $messages['nobodywarning'] = 'Želite poslati sporočilo brez vsebine?';
 $messages['notsentwarning'] = 'Sporočilo ni bilo poslano. Želite zavreči to sporočilo?';
 $messages['noldapserver'] = 'Izberite LDAP strežnik, v katerem želite iskati?';
@@ -114,8 +121,9 @@ $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'] = 'Dodeljevanje skupini ni bilo spremenjeno.';
 $messages['importwait'] = 'Uvažanje poteka...';
-$messages['importerror'] = 'Uvažanje je spodletelo. Naložena datoteka ni veljavna vCard datoteka.';
+$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>';
 $messages['importconfirmskipped'] = '<b>Preskočeni že obstoječi vnosi $skipped </b>';
 $messages['opnotpermitted'] = 'Operacija ni dovoljena.';
@@ -157,4 +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'] = '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 da23fdf4e..ba9b559d8 100644
--- a/program/localization/sq_AL/labels.inc
+++ b/program/localization/sq_AL/labels.inc
@@ -2,52 +2,78 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/sq_AL/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = 'Mirëseerdhe te $product';
-$labels['username'] = 'Përdoruesi';
-$labels['password'] = 'Fjalëkalimi';
-$labels['server'] = 'Serveri';
-$labels['login'] = 'Hyr';
-$labels['logout'] = 'Dil';
-$labels['mail'] = 'Mesazhet';
+
+// login page
+$labels['welcome']   = 'Mirëseerdhe te $product';
+$labels['username']  = 'Përdoruesi';
+$labels['password']  = 'Fjalëkalimi';
+$labels['server']    = 'Serveri';
+$labels['login']     = 'Hyr';
+
+// taskbar
+$labels['logout']   = 'Dil';
+$labels['mail']     = 'Mesazhet';
 $labels['settings'] = 'Konfigurimi Personal';
 $labels['addressbook'] = 'Libri i Adresave';
-$labels['inbox'] = 'Ardhjet';
+
+// mailbox names
+$labels['inbox']  = 'Ardhjet';
 $labels['drafts'] = 'Drafte';
-$labels['sent'] = 'Dërguar';
-$labels['trash'] = 'Fshirë';
-$labels['junk'] = 'Reklama';
+$labels['sent']   = 'Dërguar';
+$labels['trash']  = 'Fshirë';
+$labels['junk']   = 'Reklama';
+
+// message listing
 $labels['subject'] = 'Tema';
-$labels['from'] = 'Dërguesi';
-$labels['to'] = 'Marrësi';
-$labels['cc'] = 'Kopje';
-$labels['bcc'] = 'Bcc';
+$labels['from']    = 'Dërguesi';
+$labels['sender']  = 'Sender';
+$labels['to']      = 'Marrësi';
+$labels['cc']      = 'Kopje';
+$labels['bcc']     = 'Bcc';
 $labels['replyto'] = 'Reply-To';
-$labels['date'] = 'Data';
-$labels['size'] = 'Madhësia';
+$labels['followupto'] = 'Followup-To';
+$labels['date']    = 'Data';
+$labels['size']    = 'Madhësia';
 $labels['priority'] = 'Përparësia';
 $labels['organization'] = 'Organizata';
+$labels['readstatus'] = 'Read status';
+$labels['listoptions'] = 'List options...';
+
 $labels['mailboxlist'] = 'Kutitë';
-$labels['folders'] = 'Kutitë';
 $labels['messagesfromto'] = 'Mesazhet $from në $to nga $count';
+$labels['threadsfromto'] = 'Threads $from to $to of $count';
 $labels['messagenrof'] = 'Mesazhi $nr nga $count';
-$labels['copy'] = 'Kopje';
-$labels['moveto'] = 'ço te...';
+$labels['fromtoshort'] = '$from – $to of $count';
+
+$labels['copy']     = 'Kopje';
+$labels['move']     = 'Move';
+$labels['moveto']   = 'ço te...';
 $labels['download'] = 'shkarko';
+$labels['open']     = 'Open';
+$labels['showattachment'] = 'Show';
+$labels['showanyway'] = 'Show it anyway';
+
 $labels['filename'] = 'Emër skedari';
 $labels['filesize'] = 'Madhësi skedari';
+
 $labels['addtoaddressbook'] = 'Shto në librin e adresave';
+
+// weekdays short
 $labels['sun'] = 'Dje';
 $labels['mon'] = 'Hën';
 $labels['tue'] = 'Mar';
@@ -55,125 +81,458 @@ $labels['wed'] = 'Mër';
 $labels['thu'] = 'Enj';
 $labels['fri'] = 'Pre';
 $labels['sat'] = 'Sht';
-$labels['sunday'] = 'e djelë';
-$labels['monday'] = 'e hënë';
-$labels['tuesday'] = 'e martë';
+
+// weekdays long
+$labels['sunday']    = 'e djelë';
+$labels['monday']    = 'e hënë';
+$labels['tuesday']   = 'e martë';
 $labels['wednesday'] = 'e mërkurë';
-$labels['thursday'] = 'e enjte';
-$labels['friday'] = 'e premte';
-$labels['saturday'] = 'e shtunë';
+$labels['thursday']  = 'e enjte';
+$labels['friday']    = 'e premte';
+$labels['saturday']  = 'e shtunë';
+
+// months short
+$labels['jan']	= 'Jan';
+$labels['feb']	= 'Feb';
+$labels['mar']	= 'Mar';
+$labels['apr']	= 'Apr';
+$labels['may']	= 'May';
+$labels['jun']	= 'Jun';
+$labels['jul'] 	= 'Jul';
+$labels['aug']	= 'Aug';
+$labels['sep']	= 'Sep';
+$labels['oct']	= 'Oct';
+$labels['nov']	= 'Nov';
+$labels['dec']	= 'Dec';
+
+// months long
+$labels['longjan']	= 'January';
+$labels['longfeb']	= 'February';
+$labels['longmar']	= 'March';
+$labels['longapr']	= 'April';
+$labels['longmay']	= 'May';
+$labels['longjun']	= 'June';
+$labels['longjul']	= 'July';
+$labels['longaug']	= 'August';
+$labels['longsep']	= 'September';
+$labels['longoct']	= 'October';
+$labels['longnov']	= 'November';
+$labels['longdec']	= 'December';
+
 $labels['today'] = 'sot';
-$labels['checkmail'] = 'Shiko për mesazhe të reja';
-$labels['compose'] = 'Shkruaj një mesazh';
-$labels['writenewmessage'] = 'Krijo një mesazh të ri';
-$labels['replytomessage'] = 'Ktheji përgjigje mesazhit';
+
+// toolbar buttons
+$labels['refresh']          = 'Refresh';
+$labels['checkmail']        = 'Shiko për mesazhe të reja';
+$labels['compose']          = 'Shkruaj një mesazh';
+$labels['writenewmessage']  = 'Krijo një mesazh të ri';
+$labels['reply']            = 'Reply';
+$labels['replytomessage']   = 'Ktheji përgjigje mesazhit';
 $labels['replytoallmessage'] = 'Ktheji përgjigje dërguesit dhe të gjithë marrësve';
-$labels['forwardmessage'] = 'Pasoje mesazhin';
-$labels['deletemessage'] = 'Fshije mesazhin';
+$labels['replyall']         = 'Reply all';
+$labels['replylist']        = 'Reply list';
+$labels['forward']          = 'Forward';
+$labels['forwardinline']    = 'Forward inline';
+$labels['forwardattachment'] = 'Forward as attachment';
+$labels['forwardmessage']   = 'Pasoje mesazhin';
+$labels['deletemessage']    = 'Fshije mesazhin';
 $labels['movemessagetotrash'] = 'Hidhe mesazhin në kosh';
-$labels['printmessage'] = 'Shtype këtë mesazh';
-$labels['previousmessage'] = 'Shfaq mesazhin e mëparshëm';
-$labels['firstmessage'] = 'Shfaq mesazhin e parë';
-$labels['nextmessage'] = 'Shfaq mesazhin pasardhës';
-$labels['lastmessage'] = 'Shfaq mesazhin e fundit';
-$labels['backtolist'] = 'Kthehu te lista e mesazheve';
-$labels['viewsource'] = 'Shfaq tekstin';
-$labels['markmessages'] = 'Shëno mesazhet';
-$labels['markread'] = 'Si të lexuara';
-$labels['markunread'] = 'Si të palexuara';
+$labels['printmessage']     = 'Shtype këtë mesazh';
+$labels['previousmessage']  = 'Shfaq mesazhin e mëparshëm';
+$labels['firstmessage']     = 'Shfaq mesazhin e parë';
+$labels['nextmessage']      = 'Shfaq mesazhin pasardhës';
+$labels['lastmessage']      = 'Shfaq mesazhin e fundit';
+$labels['backtolist']       = 'Kthehu te lista e mesazheve';
+$labels['viewsource']       = 'Shfaq tekstin';
+$labels['mark']             = 'Mark';
+$labels['markmessages']     = 'Shëno mesazhet';
+$labels['markread']         = 'Si të lexuara';
+$labels['markunread']       = 'Si të palexuara';
+$labels['markflagged']      = 'As flagged';
+$labels['markunflagged']    = 'As unflagged';
+$labels['moreactions']      = 'More actions...';
+$labels['more']             = 'More';
+$labels['back']             = 'Back';
+$labels['options']          = 'Options';
+
 $labels['select'] = 'Zgjidh';
 $labels['all'] = 'Të gjitha';
 $labels['none'] = 'Asnjë';
-$labels['nonesort'] = 'Asnjë';
+$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';
+$labels['filter'] = 'Filter';
+$labels['list'] = 'List';
+$labels['threads'] = 'Threads';
+$labels['expand-all'] = 'Expand All';
+$labels['expand-unread'] = 'Expand Unread';
+$labels['collapse-all'] = 'Collapse All';
+$labels['threaded'] = 'Threaded';
+
+$labels['autoexpand_threads'] = 'Expand message threads';
+$labels['do_expand'] = 'all threads';
+$labels['expand_only_unread'] = 'only with unread messages';
+$labels['fromto'] = 'From/To';
+$labels['flag'] = 'Flag';
+$labels['attachment'] = 'Attachment';
+$labels['nonesort'] = 'Asnjë';
+$labels['sentdate'] = 'Sent date';
+$labels['arrival'] = 'Arrival date';
+$labels['asc'] = 'ascending';
+$labels['desc'] = 'descending';
+$labels['listcolumns'] = 'List columns';
+$labels['listsorting'] = 'Sorting column';
+$labels['listorder'] = 'Sorting order';
+$labels['listmode'] = 'List view mode';
+
+$labels['folderactions'] = 'Folder actions...';
 $labels['compact'] = 'Zvogëlo';
 $labels['empty'] = 'Boshatis';
+
 $labels['quota'] = 'Përdorimi i diskut';
-$labels['unknown'] = 'i panjohur';
-$labels['unlimited'] = 'i pakufizuar';
-$labels['quicksearch'] = 'Kërkim i shpejtë';
-$labels['resetsearch'] = 'Pastro kërkimin';
-$labels['sendmessage'] = 'Dërgoje mesazhin tani';
-$labels['savemessage'] = 'Ruaje si draft';
-$labels['addattachment'] = 'Bashkangjit një skedar';
-$labels['charset'] = 'Bashkësi shkronjash';
-$labels['editortype'] = 'Lloj editori';
-$labels['returnreceipt'] = 'Njoftim marrje';
+$labels['unknown']  = 'i panjohur';
+$labels['unlimited']  = 'i pakufizuar';
+
+$labels['quicksearch']  = 'Kërkim i shpejtë';
+$labels['resetsearch']  = 'Pastro kërkimin';
+$labels['searchmod']  = 'Search modifiers';
+$labels['msgtext']  = 'Entire message';
+$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';
+$labels['send']           = 'Send';
+$labels['sendmessage']    = 'Dërgoje mesazhin tani';
+$labels['savemessage']    = 'Ruaje si draft';
+$labels['addattachment']  = 'Bashkangjit një skedar';
+$labels['charset']        = 'Bashkësi shkronjash';
+$labels['editortype']     = 'Lloj editori';
+$labels['returnreceipt']  = 'Njoftim marrje';
+$labels['dsn']            = 'Delivery status notification';
+$labels['mailreplyintro'] = 'On $date, $sender wrote:';
+$labels['originalmessage'] = 'Original Message';
+
+$labels['editidents']    = 'Edit identities';
+$labels['spellcheck']    = 'Spell';
 $labels['checkspelling'] = 'Kontroll gabimesh';
 $labels['resumeediting'] = 'Vazhdo editimin';
-$labels['revertto'] = 'Ktheje te';
+$labels['revertto']      = 'Ktheje te';
+
+$labels['attach'] = 'Attach';
 $labels['attachments'] = 'Bashkangjitjet';
 $labels['upload'] = 'Ngarko';
-$labels['close'] = 'Mbyll';
-$labels['low'] = 'I ulët';
-$labels['lowest'] = 'Më i ulëti';
-$labels['normal'] = 'Normal';
-$labels['high'] = 'I lartë';
+$labels['uploadprogress'] = '$percent ($current from $total)';
+$labels['close']  = 'Mbyll';
+$labels['messageoptions']  = 'Message options...';
+
+$labels['low']     = 'I ulët';
+$labels['lowest']  = 'Më i ulëti';
+$labels['normal']  = 'Normal';
+$labels['high']    = 'I lartë';
 $labels['highest'] = 'Më i larti';
-$labels['nosubject'] = '(pa subjekt)';
+
+$labels['nosubject']  = '(pa subjekt)';
 $labels['showimages'] = 'Shfaq imazhet';
+$labels['alwaysshow'] = 'Always show images from $sender';
+$labels['isdraft']    = 'This is a draft message.';
+$labels['andnmore']   = '$nr more...';
+$labels['togglemoreheaders'] = 'Show more message headers';
+$labels['togglefullheaders'] = 'Toggle raw message headers';
+
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'TEXT';
+$labels['savesentmessagein'] = 'Save sent message in';
+$labels['dontsave'] = 'don\'t save';
+$labels['maxuploadsize'] = 'Maximum allowed file size is $size';
+
 $labels['addcc'] = 'Shto Cc';
 $labels['addbcc'] = 'Shto Bcc';
 $labels['addreplyto'] = 'Shto Reply-To';
+$labels['addfollowupto'] = 'Add Followup-To';
+
+// mdn
 $labels['mdnrequest'] = 'Dërguesi i këtij mesazhi ka kërkuar që të njoftohet kur ju të lexoni këtë mesazh. Dëshironi ta njoftoni dërguesin?';
 $labels['receiptread'] = 'Njoftim Leximi';
 $labels['yourmessage'] = 'Ky është një njoftim leximi për mesazhin tuaj';
 $labels['receiptnote'] = 'Shënim: Ky njoftim tregon vetëm që mesazhi u shfaq në kompjuterin e marrësit. Nuk ka siguri që marrësi e ka lexuar ose e ka kuptuar përmbajtjen e mesazhit.';
-$labels['name'] = 'Emri që thirret';
-$labels['firstname'] = 'Emri';
-$labels['surname'] = 'Mbiemri';
-$labels['email'] = 'E-Mail';
+
+// address boook
+$labels['name']         = 'Emri që thirret';
+$labels['firstname']    = 'Emri';
+$labels['surname']      = 'Mbiemri';
+$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['email']        = 'E-Mail';
+$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['typepager']  = 'Pager';
+$labels['typevideo']  = 'Video';
+$labels['typeassistant']  = 'Assistant';
+$labels['typehomepage']  = 'Home Page';
+$labels['typeblog'] = 'Blog';
+$labels['typeprofile'] = 'Profile';
+
+$labels['addfield'] = 'Add field...';
 $labels['addcontact'] = 'Shto një kontakt të ri';
 $labels['editcontact'] = 'Ndrysho kontaktin';
-$labels['edit'] = 'Ndrysho';
+$labels['contacts'] = 'Contacts';
+$labels['contactproperties'] = 'Contact properties';
+$labels['personalinfo'] = 'Personal information';
+
+$labels['edit']   = 'Ndrysho';
 $labels['cancel'] = 'Anullo';
-$labels['save'] = 'Ruaj';
+$labels['save']   = 'Ruaj';
 $labels['delete'] = 'Fshi';
-$labels['newcontact'] = 'Krijo nje kartë të re kontakti';
-$labels['deletecontact'] = 'Fshi kontaktet e zgjedhura';
-$labels['composeto'] = 'Shkruaj email për';
+$labels['rename'] = 'Rename';
+$labels['addphoto'] = 'Add';
+$labels['replacephoto'] = 'Replace';
+$labels['uploadphoto'] = 'Upload photo';
+
+$labels['newcontact']     = 'Krijo nje kartë të re kontakti';
+$labels['deletecontact']  = 'Fshi kontaktet e zgjedhura';
+$labels['composeto']      = 'Shkruaj email për';
 $labels['contactsfromto'] = 'Kontaktet $from në $to nga $count';
-$labels['print'] = 'Shtyp';
-$labels['export'] = 'Eksporto';
-$labels['previouspage'] = 'Shfaq grupin e mëparshëm';
-$labels['firstpage'] = 'Shfaq grupin e parë';
-$labels['nextpage'] = 'Shfaq grupin tjetër';
-$labels['lastpage'] = 'Shfaq grupin e fundit';
+$labels['print']          = 'Shtyp';
+$labels['export']         = 'Eksporto';
+$labels['exportall']      = 'Export all';
+$labels['exportsel']      = 'Export selected';
+$labels['exportvcards']   = 'Export contacts in vCard format';
+$labels['newcontactgroup'] = 'Create new contact group';
+$labels['grouprename']    = 'Rename group';
+$labels['groupdelete']    = 'Delete group';
+$labels['groupremoveselected'] = 'Remove selected contacts from group';
+
+$labels['previouspage']   = 'Shfaq grupin e mëparshëm';
+$labels['firstpage']      = 'Shfaq grupin e parë';
+$labels['nextpage']       = 'Shfaq grupin tjetër';
+$labels['lastpage']       = 'Shfaq grupin e fundit';
+
+$labels['group'] = 'Group';
 $labels['groups'] = 'Grupet';
 $labels['personaladrbook'] = 'Adresat Personale';
+
+$labels['searchsave'] = 'Save search';
+$labels['searchdelete'] = 'Delete search';
+
+$labels['import'] = 'Import';
+$labels['importcontacts'] = 'Import contacts';
+$labels['importfromfile'] = 'Import from file:';
+$labels['importtarget'] = 'Add new contacts to address book:';
+$labels['importreplace'] = 'Replace the entire address book';
+$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['done'] = 'Done';
+
+// settings
 $labels['settingsfor'] = 'Konfigurimet për';
+$labels['about'] = 'About';
 $labels['preferences'] = 'Preferencat';
 $labels['userpreferences'] = 'Preferencat e përdoruesit';
 $labels['editpreferences'] = 'Ndrysho preferencat e përdoruesit';
+
 $labels['identities'] = 'Identitetet';
 $labels['manageidentities'] = 'Manaxho identitetet per këtë llogari';
 $labels['newidentity'] = 'Identitet i ri';
+
 $labels['newitem'] = 'Element i ri';
 $labels['edititem'] = 'Ndrysho element';
+
 $labels['preferhtml'] = 'Shfaq HTML';
+$labels['defaultcharset'] = 'Default Character Set';
 $labels['htmlmessage'] = 'Mesazh HTML';
+$labels['messagepart'] = 'Part';
+$labels['digitalsig'] = 'Digital Signature';
+$labels['dateformat'] = 'Date format';
+$labels['timeformat'] = 'Time format';
 $labels['prettydate'] = 'Data të këndshme';
-$labels['setdefault'] = 'Bëje identitet kryesor';
-$labels['language'] = 'Gjuha';
-$labels['timezone'] = 'Brezi orar';
-$labels['pagesize'] = 'Rreshtat për faqe';
+$labels['setdefault']  = 'Bëje identitet kryesor';
+$labels['autodetect']  = 'Auto';
+$labels['language']  = 'Gjuha';
+$labels['timezone']  = 'Brezi orar';
+$labels['pagesize']  = 'Rreshtat për faqe';
 $labels['signature'] = 'Nënshkrim';
-$labels['dstactive'] = 'Ndryshim ore';
+$labels['dstactive']  = 'Ndryshim ore';
+$labels['showinextwin'] = 'Open message in a new window';
+$labels['composeextwin'] = 'Compose in a new window';
 $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['autosavedraft'] = 'Ruaje automatikisht si draft';
-$labels['never'] = 'kurrë';
-$labels['folder'] = 'Kutia';
-$labels['foldername'] = 'Emër kutie';
-$labels['subscribed'] = 'Regjistruar';
+$labels['skin'] = 'Interface skin';
+$labels['logoutclear'] = 'Clear Trash on logout';
+$labels['logoutcompact'] = 'Compact Inbox on logout';
+$labels['uisettings'] = 'User Interface';
+$labels['serversettings'] = 'Server Settings';
+$labels['mailboxview'] = 'Mailbox View';
+$labels['mdnrequests'] = 'On request for return receipt';
+$labels['askuser'] = 'ask me';
+$labels['autosend'] = 'send receipt';
+$labels['autosendknown'] = 'send receipt to my contacts, otherwise ask me';
+$labels['autosendknownignore'] = 'send receipt to my contacts, otherwise ignore';
+$labels['ignore'] = 'ignore';
+$labels['readwhendeleted'] = 'Mark the message as read on delete';
+$labels['flagfordeletion'] = 'Flag the message for deletion instead of delete';
+$labels['skipdeleted'] = 'Do not show deleted messages';
+$labels['deletealways'] = 'If moving messages to Trash fails, delete them';
+$labels['deletejunk'] = 'Directly delete messages in Junk';
+$labels['showremoteimages'] = 'Display remote inline images';
+$labels['fromknownsenders'] = 'from known senders';
+$labels['always'] = 'always';
+$labels['showinlineimages'] = 'Display attached images below the message';
+$labels['autosavedraft']  = 'Ruaje automatikisht si draft';
+$labels['everynminutes']  = 'every $n minute(s)';
+$labels['refreshinterval']  = 'Refresh (check for new messages, etc.)';
+$labels['never']  = 'kurrë';
+$labels['immediately']  = 'immediately';
+$labels['messagesdisplaying'] = 'Displaying Messages';
+$labels['messagescomposition'] = 'Composing Messages';
+$labels['mimeparamfolding'] = 'Attachment names';
+$labels['2231folding'] = 'Full RFC 2231 (Thunderbird)';
+$labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
+$labels['2047folding'] = 'Full RFC 2047 (other)';
+$labels['force7bit'] = 'Use MIME encoding for 8-bit characters';
+$labels['advancedoptions'] = 'Advanced options';
+$labels['focusonnewmessage'] = 'Focus browser window on new message';
+$labels['checkallfolders'] = 'Check all folders for new messages';
+$labels['displaynext'] = 'After message delete/move display the next message';
+$labels['defaultfont'] = 'Default font of HTML message';
+$labels['mainoptions'] = 'Main Options';
+$labels['browseroptions'] = 'Browser Options';
+$labels['section'] = 'Section';
+$labels['maintenance'] = 'Maintenance';
+$labels['newmessage'] = 'New Message';
+$labels['signatureoptions'] = 'Signature Options';
+$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'] = 'Automatically add signature';
+$labels['newmessageonly'] = 'new message only';
+$labels['replyandforwardonly'] = 'replies and forwards only';
+$labels['insertsignature'] = 'Insert signature';
+$labels['previewpanemarkread']  = 'Mark previewed messages as read';
+$labels['afternseconds']  = 'after $n seconds';
+$labels['reqmdn'] = 'Always request a return receipt';
+$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'] = 'Check spelling before sending a message';
+$labels['spellcheckoptions'] = 'Spellcheck Options';
+$labels['spellcheckignoresyms'] = 'Ignore words with symbols';
+$labels['spellcheckignorenums'] = 'Ignore words with numbers';
+$labels['spellcheckignorecaps'] = 'Ignore words with all letters capitalized';
+$labels['addtodict'] = 'Add to dictionary';
+$labels['mailtoprotohandler'] = 'Register protocol handler for mailto: links';
+$labels['forwardmode'] = 'Messages forwarding';
+$labels['inline'] = 'inline';
+$labels['asattachment'] = 'as attachment';
+
+$labels['folder']  = 'Kutia';
+$labels['folders']  = 'Kutitë';
+$labels['foldername']  = 'Emër kutie';
+$labels['subscribed']  = 'Regjistruar';
 $labels['messagecount'] = 'Mesazhe';
-$labels['create'] = 'Krijo';
-$labels['createfolder'] = 'Krijo kuti të re';
-$labels['managefolders'] = 'Sistemo kutitë';
+$labels['create']  = 'Krijo';
+$labels['createfolder']  = 'Krijo kuti të re';
+$labels['managefolders']  = 'Sistemo kutitë';
+$labels['specialfolders'] = 'Special Folders';
+$labels['properties'] = 'Properties';
+$labels['folderproperties'] = 'Folder properties';
+$labels['parentfolder'] = 'Parent folder';
+$labels['location'] = 'Location';
+$labels['info'] = 'Information';
+$labels['getfoldersize'] = 'Click to get folder size';
+$labels['changesubscription'] = 'Click to change subscription';
+$labels['foldertype'] = 'Folder Type';
+$labels['personalfolder']  = 'Private Folder';
+$labels['otherfolder']  = 'Other User\'s Folder';
+$labels['sharedfolder']  = 'Public Folder';
+
 $labels['sortby'] = 'Rradhit sipas';
-$labels['sortasc'] = 'Rradhitje rritëse';
+$labels['sortasc']  = 'Rradhitje rritëse';
 $labels['sortdesc'] = 'Rradhitje zbritëse';
+$labels['undo'] = 'Undo';
+
+$labels['installedplugins'] = 'Installed plugins';
+$labels['plugin'] = 'Plugin';
+$labels['version'] = 'Version';
+$labels['source'] = 'Source';
+$labels['license'] = 'License';
+$labels['support'] = 'Get support';
+
+// units
+$labels['B'] = 'B';
+$labels['KB'] = 'KB';
+$labels['MB'] = 'MB';
+$labels['GB'] = 'GB';
+
+// character sets
+$labels['unicode'] = 'Unicode';
+$labels['english'] = '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['turkish'] = 'Turkish';
+$labels['nordic'] = 'Nordic';
+$labels['thai'] = 'Thai';
+$labels['celtic'] = 'Celtic';
+$labels['vietnamese'] = 'Vietnamese';
+$labels['japanese'] = 'Japanese';
+$labels['korean'] = 'Korean';
+$labels['chinese'] = 'Chinese';
 
+?>
diff --git a/program/localization/sq_AL/messages.inc b/program/localization/sq_AL/messages.inc
index feb3c6e74..56bb9feb2 100644
--- a/program/localization/sq_AL/messages.inc
+++ b/program/localization/sq_AL/messages.inc
@@ -2,27 +2,43 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/sq_AL/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['loginfailed'] = 'Hyrja dështoi';
+$messages['errortitle']  = 'An error occurred!';
+$messages['loginfailed']  = 'Hyrja dështoi';
 $messages['cookiesdisabled'] = 'Shfletuesi juaj nuk i pranon sheqerkat';
 $messages['sessionerror'] = 'Sesioni juaj është i pavlefshëm ose i ka kaluar afati';
 $messages['storageerror'] = 'Lidhja me serverin IMAP dështoi';
+$messages['servererror'] = 'Server Error!';
+$messages['servererrormsg'] = 'Server Error: $msg';
+$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';
 $messages['loggedout'] = 'Sesionin e mbyllët me sukses. Mirupafshim!';
 $messages['mailboxempty'] = 'Kutia postare është bosh';
+$messages['refreshing'] = 'Refreshing...';
 $messages['loading'] = 'Po ngarkohet...';
+$messages['uploading'] = 'Uploading file...';
+$messages['uploadingmany'] = 'Uploading files...';
 $messages['loadingdata'] = 'Po ngarkohen të dhëna...';
 $messages['checkingmail'] = 'Po shoh për mesazhe të reja...';
 $messages['sendingmessage'] = 'Po dërgoj mesazhin...';
@@ -32,34 +48,54 @@ $messages['messagesaved'] = 'Mesazhi u ruajt te kutia Drafte';
 $messages['successfullysaved'] = 'U ruajt me sukses';
 $messages['addedsuccessfully'] = 'Kontakti u shtua me sukses në librin e adresave';
 $messages['contactexists'] = 'Këtë adresë e-mail e ka një kontakt tjetër';
+$messages['contactnameexists'] = 'A contact with the same name already exists.';
 $messages['blockedimages'] = 'Për të mbrojtur fshehtësinë tuaj, imazhet e largëta të këtij mesazhi janë bllokuar.';
 $messages['encryptedmessage'] = 'Ky është një mesazh i koduar dhe nuk mund te shfaqet. Më vjen keq!';
 $messages['nocontactsfound'] = 'Nuk ka kontakte';
 $messages['contactnotfound'] = 'Kontakti që kërkoni nuk gjendet';
+$messages['contactsearchonly'] = 'Enter some search terms to find contacts';
 $messages['sendingfailed'] = 'Dërgimi i mesazhit dështoi';
+$messages['senttooquickly'] = 'Please wait $sec sec(s). before sending this message.';
+$messages['errorsavingsent'] = 'An error occured while saving sent message.';
 $messages['errorsaving'] = 'Pati nje problem gjatë ruajtjes';
 $messages['errormoving'] = 'Nuk e lëviza dot mesazhin';
+$messages['errorcopying'] = 'Could not copy the message(s).';
 $messages['errordeleting'] = 'Nuk e fshiva dot mesazhin';
-$messages['deletecontactconfirm'] = 'Me të vërtetë doni ti fshini kontaktet e zgjedhura?';
+$messages['errormarking'] = 'Could not mark the message(s).';
+$messages['deletecontactconfirm']  = 'Me të vërtetë doni ti fshini kontaktet e zgjedhura?';
+$messages['deletegroupconfirm']  = 'Do you really want to delete selected group?';
 $messages['deletemessagesconfirm'] = 'Me të vërtetë doni ti fshini mesazhet e zgjedhura?';
-$messages['deletefolderconfirm'] = 'Me të vërtetë doni ta fshini këtë kuti?';
-$messages['purgefolderconfirm'] = 'Me të vërtetë doni ti fshini të gjitha mesazhet në këtë kuti?';
+$messages['deletefolderconfirm']  = 'Me të vërtetë doni ta fshini këtë kuti?';
+$messages['purgefolderconfirm']  = 'Me të vërtetë doni ti fshini të gjitha mesazhet në këtë kuti?';
+$messages['contactdeleting'] = 'Deleting contact(s)...';
+$messages['groupdeleting'] = 'Deleting group...';
+$messages['folderdeleting'] = 'Deleting folder...';
+$messages['foldermoving'] = 'Moving folder...';
+$messages['foldersubscribing'] = 'Subscribing folder...';
+$messages['folderunsubscribing'] = 'Unsubscribing folder...';
 $messages['formincomplete'] = 'Formulari nuk ishte i gjithi i plotësuar';
 $messages['noemailwarning'] = 'Ju lutem jepni një adresë email të rregullt';
-$messages['nonamewarning'] = 'Ju lutem jepni një emër';
+$messages['nonamewarning']  = 'Ju lutem jepni një emër';
 $messages['nopagesizewarning'] = 'Ju lutem jepni nje madhësi për faqen';
+$messages['nosenderwarning'] = 'Please enter sender e-mail address.';
 $messages['norecipientwarning'] = 'Ju lutem shënoni të paktën një marrës';
-$messages['nosubjectwarning'] = 'Fusha e temës është bosh. Dëshironi të shënoni një temë tani?';
+$messages['nosubjectwarning']  = 'Fusha e temës është bosh. Dëshironi të shënoni një temë tani?';
 $messages['nobodywarning'] = 'Ta dërgoj mesazhin pa tekst?';
 $messages['notsentwarning'] = 'Mesazhi nuk u dërgua. Doni ta hidhni poshtë mesazhin?';
 $messages['noldapserver'] = 'Ju lutem jepni një server ldap për të kërkuar';
 $messages['nosearchname'] = 'Ju lutem jepni një adresë email ose një emër kontakti';
+$messages['notuploadedwarning'] = 'Not all attachments have been uploaded yet. Please wait or cancel the upload.';
 $messages['searchsuccessful'] = 'U gjetën $nr mesazhe';
+$messages['contactsearchsuccessful'] = '$nr contacts found.';
 $messages['searchnomatch'] = 'Kërkimi nuk gjeti gjë';
 $messages['searching'] = 'Po kërkoj...';
 $messages['checking'] = 'Po kontrolloj...';
 $messages['nospellerrors'] = 'Nuk u gjetën gabime';
 $messages['folderdeleted'] = 'Kutia u fshi me sukses';
+$messages['foldersubscribed'] = 'Folder successfully subscribed.';
+$messages['folderunsubscribed'] = 'Folder successfully unsubscribed.';
+$messages['folderpurged'] = 'Folder has successfully been emptied.';
+$messages['folderexpunged'] = 'Folder has successfully been compacted.';
 $messages['deletedsuccessfully'] = 'U fshi me sukses';
 $messages['converting'] = 'Po i heq formatimin mesazhit...';
 $messages['messageopenerror'] = 'Nuk marr dot mesazhe nga serveri';
@@ -70,7 +106,66 @@ $messages['copyerror'] = 'Nuk munda të kopjoj adresat';
 $messages['sourceisreadonly'] = 'Ky burim adrese është vetëm i lexueshëm';
 $messages['errorsavingcontact'] = 'Nuk e ruajta dot adresën e kontaktit';
 $messages['movingmessage'] = 'Po lëviz mesazhin...';
+$messages['copyingmessage'] = 'Copying message(s)...';
+$messages['copyingcontact'] = 'Copying contact(s)...';
+$messages['deletingmessage'] = 'Deleting message(s)...';
+$messages['markingmessage'] = 'Marking message(s)...';
+$messages['addingmember'] = 'Adding contact(s) to the group...';
+$messages['removingmember'] = 'Removing contact(s) from the group...';
 $messages['receiptsent'] = 'U dërgua me sukses një njoftim leximi';
 $messages['errorsendingreceipt'] = 'Nuk mund të dërgohet njoftimi';
+$messages['deleteidentityconfirm'] = 'Do you really want to delete this identity?';
 $messages['nodeletelastidentity'] = 'Ju nuk mund ta fshini këtë identitet sepse nuk ju ka mbetur tjetër.';
+$messages['forbiddencharacter'] = 'Folder name contains a forbidden character.';
+$messages['selectimportfile'] = 'Please select a file to upload.';
+$messages['addresswriterror'] = 'The selected address book is not writeable.';
+$messages['contactaddedtogroup'] = 'Successfully added the contacts to this group.';
+$messages['contactremovedfromgroup'] = 'Successfully removed contacts from this group.';
+$messages['nogroupassignmentschanged'] = 'No group assignments changed.';
+$messages['importwait'] = 'Importing, please wait...';
+$messages['importformaterror'] = 'Import failed! The uploaded file is not a valid import data file.';
+$messages['importconfirm'] = '<b>Successfully imported $inserted contacts</b>';
+$messages['importconfirmskipped'] = '<b>Skipped $skipped existing entries</b>';
+$messages['opnotpermitted'] = 'Operation not permitted!';
+$messages['nofromaddress'] = 'Missing e-mail address in selected identity.';
+$messages['editorwarning'] = 'Switching to the plain text editor will cause all text formatting to be lost. Do you wish to continue?';
+$messages['httpreceivedencrypterror'] = 'A fatal configuration error occurred. Contact your administrator immediately. <b>Your message can not be sent.</b>';
+$messages['smtpconnerror'] = 'SMTP Error ($code): Connection to server failed.';
+$messages['smtpautherror'] = 'SMTP Error ($code): Authentication failed.';
+$messages['smtpfromerror'] = 'SMTP Error ($code): Failed to set sender "$from" ($msg).';
+$messages['smtptoerror'] = 'SMTP Error ($code): Failed to add recipient "$to" ($msg).';
+$messages['smtprecipientserror'] = 'SMTP Error: Unable to parse recipients list.';
+$messages['smtperror'] = 'SMTP Error: $msg';
+$messages['emailformaterror'] = 'Invalid e-mail address: $email';
+$messages['toomanyrecipients'] = 'Too many recipients. Reduce the number of recipients to $max.';
+$messages['maxgroupmembersreached'] = 'The number of group members exceeds the maximum of $max.';
+$messages['internalerror'] = 'An internal error occured. Please try again.';
+$messages['contactdelerror'] = 'Could not delete contact(s).';
+$messages['contactdeleted'] = 'Contact(s) deleted successfully.';
+$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.';
 
+?>
diff --git a/program/localization/sr_CS/labels.inc b/program/localization/sr_CS/labels.inc
index fb89ca200..130d3a7a6 100644
--- a/program/localization/sr_CS/labels.inc
+++ b/program/localization/sr_CS/labels.inc
@@ -2,57 +2,78 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/sr_CS/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: gpredrag <gavrilovic@gmail.com>                               |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = 'Добродошли на $product';
-$labels['username'] = 'Корисничко име';
-$labels['password'] = 'Лозинка';
-$labels['server'] = 'Сервер';
-$labels['login'] = 'Пријава';
-$labels['logout'] = 'Одјава';
-$labels['mail'] = 'Сандуче';
+
+// login page
+$labels['welcome']   = 'Добродошли на $product';
+$labels['username']  = 'Корисничко име';
+$labels['password']  = 'Лозинка';
+$labels['server']    = 'Сервер';
+$labels['login']     = 'Пријава';
+
+// taskbar
+$labels['logout']   = 'Одјава';
+$labels['mail']     = 'Сандуче';
 $labels['settings'] = 'Подешавања';
 $labels['addressbook'] = 'Именик';
-$labels['inbox'] = 'Примљене';
+
+// mailbox names
+$labels['inbox']  = 'Примљене';
 $labels['drafts'] = 'U pripremi';
-$labels['sent'] = 'Послате';
-$labels['trash'] = 'Канта';
-$labels['junk'] = 'Смеће';
+$labels['sent']   = 'Послате';
+$labels['trash']  = 'Канта';
+$labels['junk']   = 'Смеће';
+
+// message listing
 $labels['subject'] = 'Наслов';
-$labels['from'] = 'Од';
-$labels['to'] = 'За';
-$labels['cc'] = 'Cc';
-$labels['bcc'] = 'Bcc';
+$labels['from']    = 'Од';
+$labels['sender']  = 'Sender';
+$labels['to']      = 'За';
+$labels['cc']      = 'Cc';
+$labels['bcc']     = 'Bcc';
 $labels['replyto'] = 'Одговори';
-$labels['date'] = 'Датум';
-$labels['size'] = 'Величина';
+$labels['followupto'] = 'Followup-To';
+$labels['date']    = 'Датум';
+$labels['size']    = 'Величина';
 $labels['priority'] = 'Приоритет';
 $labels['organization'] = 'Организација';
 $labels['readstatus'] = 'Статус поруке';
 $labels['listoptions'] = 'Излистај опције...';
+
 $labels['mailboxlist'] = 'Фасцикле';
-$labels['folders'] = 'Фасцикле';
 $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['copy']     = 'Копирај';
+$labels['move']     = 'Пребаци';
+$labels['moveto']   = 'Пребаци у...';
 $labels['download'] = 'Преузми (скидање)';
+$labels['open']     = 'Open';
+$labels['showattachment'] = 'Show';
+$labels['showanyway'] = 'Show it anyway';
+
 $labels['filename'] = 'Име датотекеe';
 $labels['filesize'] = 'Величина датотеке';
+
 $labels['addtoaddressbook'] = 'Додај у именик';
+
+// weekdays short
 $labels['sun'] = 'Нед';
 $labels['mon'] = 'Пон';
 $labels['tue'] = 'Уто';
@@ -60,260 +81,328 @@ $labels['wed'] = 'Сре';
 $labels['thu'] = 'Чет';
 $labels['fri'] = 'Пет';
 $labels['sat'] = 'Суб';
-$labels['sunday'] = 'Недеља';
-$labels['monday'] = 'Понедељак';
-$labels['tuesday'] = 'Уторак';
+
+// weekdays long
+$labels['sunday']    = 'Недеља';
+$labels['monday']    = 'Понедељак';
+$labels['tuesday']   = 'Уторак';
 $labels['wednesday'] = 'Среда';
-$labels['thursday'] = 'Четвртак';
-$labels['friday'] = 'Петак';
-$labels['saturday'] = 'Субота';
-$labels['jan'] = 'Јан';
-$labels['feb'] = 'Феб';
-$labels['mar'] = 'Мар';
-$labels['apr'] = 'Апр';
-$labels['may'] = 'Мај';
-$labels['longmay'] = 'Мај';
-$labels['jun'] = 'Јун';
-$labels['jul'] = 'Јул';
-$labels['aug'] = 'Авг';
-$labels['sep'] = 'Сеп';
-$labels['oct'] = 'Окт';
-$labels['nov'] = 'Нов';
-$labels['dec'] = 'Дец';
-$labels['longjan'] = 'Јануар';
-$labels['longfeb'] = 'Фебруар';
-$labels['longmar'] = 'Март';
-$labels['longapr'] = 'Април';
-$labels['longjun'] = 'Јуни';
-$labels['longjul'] = 'Јули';
-$labels['longaug'] = 'Август';
-$labels['longsep'] = 'Септембар';
-$labels['longoct'] = 'Октобар';
-$labels['longnov'] = 'Новембар';
-$labels['longdec'] = 'Децембар';
+$labels['thursday']  = 'Четвртак';
+$labels['friday']    = 'Петак';
+$labels['saturday']  = 'Субота';
+
+// months short
+$labels['jan']	= 'Јан';
+$labels['feb']	= 'Феб';
+$labels['mar']	= 'Мар';
+$labels['apr']	= 'Апр';
+$labels['may']	= 'Мај';
+$labels['jun']	= 'Јун';
+$labels['jul'] 	= 'Јул';
+$labels['aug']	= 'Авг';
+$labels['sep']	= 'Сеп';
+$labels['oct']	= 'Окт';
+$labels['nov']	= 'Нов';
+$labels['dec']	= 'Дец';
+
+// months long
+$labels['longjan']	= 'Јануар';
+$labels['longfeb']	= 'Фебруар';
+$labels['longmar']	= 'Март';
+$labels['longapr']	= 'Април';
+$labels['longmay']	= 'Мај';
+$labels['longjun']	= 'Јуни';
+$labels['longjul']	= 'Јули';
+$labels['longaug']	= 'Август';
+$labels['longsep']	= 'Септембар';
+$labels['longoct']	= 'Октобар';
+$labels['longnov']	= 'Новембар';
+$labels['longdec']	= 'Децембар';
+
 $labels['today'] = 'Данас';
-$labels['refresh'] = 'Освежи';
-$labels['checkmail'] = 'Провера нових порука';
-$labels['compose'] = 'Нова порука';
-$labels['writenewmessage'] = 'Нова порука';
-$labels['reply'] = 'Одговори';
-$labels['replytomessage'] = 'Одговори на поруку';
+
+// toolbar buttons
+$labels['refresh']          = 'Освежи';
+$labels['checkmail']        = 'Провера нових порука';
+$labels['compose']          = 'Нова порука';
+$labels['writenewmessage']  = 'Нова порука';
+$labels['reply']            = 'Одговори';
+$labels['replytomessage']   = 'Одговори на поруку';
 $labels['replytoallmessage'] = 'Одговори пошиљаоцу и свим примаоцима';
-$labels['replyall'] = 'Одговори свима';
-$labels['replylist'] = 'Листа за одговоре';
-$labels['forward'] = 'Проследи';
+$labels['replyall']         = 'Одговори свима';
+$labels['replylist']        = 'Листа за одговоре';
+$labels['forward']          = 'Проследи';
+$labels['forwardinline']    = 'Forward inline';
 $labels['forwardattachment'] = 'Проследи као прилог';
-$labels['forwardmessage'] = 'Проследи поруку';
-$labels['deletemessage'] = 'Избриши поруку';
+$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['more'] = 'Више';
-$labels['back'] = 'Назад';
-$labels['options'] = 'Опције';
+$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['more']             = 'Више';
+$labels['back']             = 'Назад';
+$labels['options']          = 'Опције';
+
 $labels['select'] = 'Одабери';
 $labels['all'] = 'Све';
 $labels['none'] = 'Ништа';
-$labels['nonesort'] = 'Ништа';
 $labels['currpage'] = 'Тренутна страница';
 $labels['unread'] = 'Непрочитане';
 $labels['flagged'] = 'Означено';
 $labels['unanswered'] = 'Неодговорено';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Обрисано';
+$labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'Уведи';
 $labels['filter'] = 'Филтер';
 $labels['list'] = 'Листа';
 $labels['threads'] = 'Нити';
 $labels['expand-all'] = 'Прошири све';
+$labels['expand-unread'] = 'Expand Unread';
 $labels['collapse-all'] = 'Сажми све';
+$labels['threaded'] = 'Threaded';
+
+$labels['autoexpand_threads'] = 'Expand message threads';
+$labels['do_expand'] = 'all threads';
 $labels['expand_only_unread'] = 'само са непрочитаним порукама';
 $labels['fromto'] = 'Од/За';
 $labels['flag'] = 'Застава';
 $labels['attachment'] = 'Прилог';
+$labels['nonesort'] = 'Ништа';
 $labels['sentdate'] = 'Датум послато';
 $labels['arrival'] = 'Датум стигло';
 $labels['asc'] = 'растући';
 $labels['desc'] = 'опадајући';
 $labels['listcolumns'] = 'Лист колона';
 $labels['listsorting'] = 'Сортирање колонe';
+$labels['listorder'] = 'Sorting order';
 $labels['listmode'] = 'Лист режим приказивања';
+
 $labels['folderactions'] = 'Поставке фасцикле';
 $labels['compact'] = 'Компакција';
 $labels['empty'] = 'Испразни';
+
 $labels['quota'] = 'Квота';
-$labels['unknown'] = 'непозната';
-$labels['unlimited'] = 'бесконачна';
-$labels['quicksearch'] = 'Брза претрага';
-$labels['resetsearch'] = 'Прикажи све поруке';
-$labels['msgtext'] = 'Цела порука';
+$labels['unknown']  = 'непозната';
+$labels['unlimited']  = 'бесконачна';
+
+$labels['quicksearch']  = 'Брза претрага';
+$labels['resetsearch']  = 'Прикажи све поруке';
+$labels['searchmod']  = 'Search modifiers';
+$labels['msgtext']  = 'Цела порука';
+$labels['body']  = 'Body';
+
 $labels['openinextwin'] = 'Отвори у новом прозору';
 $labels['emlsave'] = 'Довнлоад (.eml)';
-$labels['editasnew'] = 'Модификуј као ново';
-$labels['sendmessage'] = 'Пошаљи поруку';
-$labels['savemessage'] = 'Сачувај у Снимљене';
-$labels['addattachment'] = 'Приложи датотеку';
-$labels['charset'] = 'Скуп карактера';
-$labels['editortype'] = 'Врста едитора';
-$labels['returnreceipt'] = 'Потврда о приспећу';
-$labels['dsn'] = 'Обавештење о статусу слања поруке';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
+
+// message compose
+$labels['editasnew']      = 'Модификуј као ново';
+$labels['send']           = 'Send';
+$labels['sendmessage']    = 'Пошаљи поруку';
+$labels['savemessage']    = 'Сачувај у Снимљене';
+$labels['addattachment']  = 'Приложи датотеку';
+$labels['charset']        = 'Скуп карактера';
+$labels['editortype']     = 'Врста едитора';
+$labels['returnreceipt']  = 'Потврда о приспећу';
+$labels['dsn']            = 'Обавештење о статусу слања поруке';
 $labels['mailreplyintro'] = 'Дана $date, $sender је написао:';
 $labels['originalmessage'] = 'Оригинална порука';
-$labels['editidents'] = 'Модификуј псеудониме';
-$labels['spellcheck'] = 'Провера правописа';
+
+$labels['editidents']    = 'Модификуј псеудониме';
+$labels['spellcheck']    = 'Провера правописа';
 $labels['checkspelling'] = 'Провера правописа';
 $labels['resumeediting'] = 'Повратак у режим писања';
-$labels['revertto'] = 'Врати се на';
+$labels['revertto']      = 'Врати се на';
+
 $labels['attach'] = 'Приложи';
 $labels['attachments'] = 'Прилози';
 $labels['upload'] = 'Додај';
 $labels['uploadprogress'] = '$percent ($current од $total)';
-$labels['close'] = 'Затвори';
-$labels['messageoptions'] = 'Опције поруке';
-$labels['low'] = 'Низак';
-$labels['lowest'] = 'Најнижи';
-$labels['normal'] = 'Средњи';
-$labels['high'] = 'Висок';
+$labels['close']  = 'Затвори';
+$labels['messageoptions']  = 'Опције поруке';
+
+$labels['low']     = 'Низак';
+$labels['lowest']  = 'Најнижи';
+$labels['normal']  = 'Средњи';
+$labels['high']    = 'Висок';
 $labels['highest'] = 'Највиши';
-$labels['nosubject'] = '(без наслова)';
+
+$labels['nosubject']  = '(без наслова)';
 $labels['showimages'] = 'Прикажи слике';
 $labels['alwaysshow'] = 'Увек покажи слике од $sender';
+$labels['isdraft']    = 'This is a draft message.';
+$labels['andnmore']   = '$nr more...';
+$labels['togglemoreheaders'] = 'Show more message headers';
+$labels['togglefullheaders'] = 'Toggle raw message headers';
+
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Обичан текст';
 $labels['savesentmessagein'] = 'Послате поруке сачувај у';
 $labels['dontsave'] = 'Не сачувај';
 $labels['maxuploadsize'] = 'Максимална величина податка је $size';
+
 $labels['addcc'] = 'Додај Cc';
 $labels['addbcc'] = 'Додај Bcc';
 $labels['addreplyto'] = 'Додај Одговор-за';
+$labels['addfollowupto'] = 'Add Followup-To';
+
+// mdn
 $labels['mdnrequest'] = 'Пошиљалац ове поруке је замолио да буде обавештен када прочитате ову поруку. Да ли желите да обавестите пошиљаоца?';
 $labels['receiptread'] = 'Обавештење о приспећу (прочитана порука)';
 $labels['yourmessage'] = 'Ово је обавештење о приспећу за вашу поруку';
 $labels['receiptnote'] = 'Пажња: Ово обавештење само потврђује да је порука приказана на рачунару примаоца. Не постоји гаранција да је прималац прочитао или разумео садржај поруке.';
-$labels['name'] = 'Пуно име';
-$labels['firstname'] = 'Име';
-$labels['surname'] = 'Презиме';
-$labels['middlename'] = 'Средње име';
-$labels['nameprefix'] = 'Префикс';
-$labels['namesuffix'] = 'Суфикс';
-$labels['nickname'] = 'Надимак';
-$labels['jobtitle'] = 'Пословна титула';
-$labels['department'] = 'Оделење';
-$labels['gender'] = 'Пол';
-$labels['maidenname'] = 'Девојачко име';
-$labels['email'] = 'Имејл';
-$labels['phone'] = 'Телефон';
-$labels['address'] = 'Адреса';
-$labels['street'] = 'Улица';
-$labels['locality'] = 'Град';
-$labels['zipcode'] = 'Поштански број';
-$labels['region'] = 'република/провинција';
-$labels['country'] = 'Држава';
-$labels['birthday'] = 'Датум рођења';
-$labels['anniversary'] = 'Годишњица';
-$labels['website'] = 'Вебсајт';
+
+// address boook
+$labels['name']         = 'Пуно име';
+$labels['firstname']    = 'Име';
+$labels['surname']      = 'Презиме';
+$labels['middlename']   = 'Средње име';
+$labels['nameprefix']   = 'Префикс';
+$labels['namesuffix']   = 'Суфикс';
+$labels['nickname']     = 'Надимак';
+$labels['jobtitle']     = 'Пословна титула';
+$labels['department']   = 'Оделење';
+$labels['gender']       = 'Пол';
+$labels['maidenname']   = 'Девојачко име';
+$labels['email']        = 'Имејл';
+$labels['phone']        = 'Телефон';
+$labels['address']      = 'Адреса';
+$labels['street']       = 'Улица';
+$labels['locality']     = 'Град';
+$labels['zipcode']      = 'Поштански број';
+$labels['region']       = 'република/провинција';
+$labels['country']      = 'Држава';
+$labels['birthday']     = 'Датум рођења';
+$labels['anniversary']  = 'Годишњица';
+$labels['website']      = 'Вебсајт';
 $labels['instantmessenger'] = 'ИМ';
 $labels['notes'] = 'Белешке';
-$labels['male'] = 'мушко';
+$labels['male']   = 'мушко';
 $labels['female'] = 'женско';
 $labels['manager'] = 'Менаџер';
 $labels['assistant'] = 'Асистент';
-$labels['typeassistant'] = 'Асистент';
 $labels['spouse'] = 'Супружник';
 $labels['allfields'] = 'Сва поља';
 $labels['search'] = 'Тражи';
 $labels['advsearch'] = 'Напредна претрага';
 $labels['advanced'] = 'Напредно';
 $labels['other'] = 'Остало';
-$labels['typeother'] = 'Остало';
-$labels['typehome'] = 'Кућа';
-$labels['typework'] = 'Посао';
-$labels['typemobile'] = 'Мобилни Телефон';
-$labels['typemain'] = 'Главна';
-$labels['typehomefax'] = 'Кућни факс';
-$labels['typeworkfax'] = 'Пословни факс';
-$labels['typecar'] = 'Ауто';
-$labels['typepager'] = 'Пејџер';
-$labels['typevideo'] = 'Видео';
-$labels['typehomepage'] = 'Почетна страница';
+
+$labels['typehome']   = 'Кућа';
+$labels['typework']   = 'Посао';
+$labels['typeother']  = 'Остало';
+$labels['typemobile']  = 'Мобилни Телефон';
+$labels['typemain']  = 'Главна';
+$labels['typehomefax']  = 'Кућни факс';
+$labels['typeworkfax']  = 'Пословни факс';
+$labels['typecar']  = 'Ауто';
+$labels['typepager']  = 'Пејџер';
+$labels['typevideo']  = 'Видео';
+$labels['typeassistant']  = 'Асистент';
+$labels['typehomepage']  = 'Почетна страница';
 $labels['typeblog'] = 'Блог';
 $labels['typeprofile'] = 'Профил';
+
 $labels['addfield'] = 'Додај поље';
 $labels['addcontact'] = 'Додај нови контакт';
 $labels['editcontact'] = 'Измени контакт';
 $labels['contacts'] = 'Конакти';
 $labels['contactproperties'] = 'Својства контакта';
 $labels['personalinfo'] = 'Личне информације';
-$labels['edit'] = 'Измени';
+
+$labels['edit']   = 'Измени';
 $labels['cancel'] = 'Откажи';
-$labels['save'] = 'Сачувај';
+$labels['save']   = 'Сачувај';
 $labels['delete'] = 'Обриши';
 $labels['rename'] = 'Преименуј';
 $labels['addphoto'] = 'Додај';
 $labels['replacephoto'] = 'Измени';
 $labels['uploadphoto'] = 'Постави фотографију';
-$labels['newcontact'] = 'Додај нови контакт';
-$labels['deletecontact'] = 'Обриши одабране контакте';
-$labels['composeto'] = 'Напиши поруку...';
+
+$labels['newcontact']     = 'Додај нови контакт';
+$labels['deletecontact']  = 'Обриши одабране контакте';
+$labels['composeto']      = 'Напиши поруку...';
 $labels['contactsfromto'] = 'Контакти $from до $to од укупно $count';
-$labels['print'] = 'Штампај';
-$labels['export'] = 'Извези';
-$labels['exportvcards'] = 'Извези конакте у vCard формату';
+$labels['print']          = 'Штампај';
+$labels['export']         = 'Извези';
+$labels['exportall']      = 'Export all';
+$labels['exportsel']      = 'Export selected';
+$labels['exportvcards']   = 'Извези конакте у vCard формату';
 $labels['newcontactgroup'] = 'Креирај нову контакт групу';
-$labels['grouprename'] = 'Преименуј групу';
-$labels['groupdelete'] = 'Обриши групу';
+$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'] = 'Сачувај претрагу';
 $labels['searchdelete'] = 'Избриши претрагу';
+
 $labels['import'] = 'Увези';
 $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['done'] = 'Готово';
+
+// settings
 $labels['settingsfor'] = 'Подешавања за';
 $labels['about'] = 'Инфо';
 $labels['preferences'] = 'Подешавања';
 $labels['userpreferences'] = 'Општа подешавања';
 $labels['editpreferences'] = 'Измена општих подешавања';
+
 $labels['identities'] = 'Идентитети';
 $labels['manageidentities'] = 'Подеси идентитете за овај налог';
 $labels['newidentity'] = 'Додај идентитет';
+
 $labels['newitem'] = 'Нова ставка';
 $labels['edititem'] = 'Измена ставке';
+
 $labels['preferhtml'] = 'Предност дај ХТМЛ формату';
+$labels['defaultcharset'] = 'Default Character Set';
 $labels['htmlmessage'] = 'ХТМЛ формат поруке';
+$labels['messagepart'] = 'Part';
+$labels['digitalsig'] = 'Digital Signature';
 $labels['dateformat'] = 'Формат датума';
 $labels['timeformat'] = 'Формат времена';
 $labels['prettydate'] = 'Форматирани датум';
-$labels['setdefault'] = 'Подеси подразумевано';
-$labels['autodetect'] = 'Аутоматски';
-$labels['language'] = 'Језик';
-$labels['timezone'] = 'Временска зона';
-$labels['pagesize'] = 'Редова по страни';
+$labels['setdefault']  = 'Подеси подразумевано';
+$labels['autodetect']  = 'Аутоматски';
+$labels['language']  = 'Језик';
+$labels['timezone']  = 'Временска зона';
+$labels['pagesize']  = 'Редова по страни';
 $labels['signature'] = 'Потпис';
-$labels['dstactive'] = 'Летње померање времена';
+$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['htmlsignature'] = 'HTML потпис';
+$labels['showemail'] = 'Show email address with display name';
 $labels['previewpane'] = 'Прикажи панел за преглед';
 $labels['skin'] = 'Интерфејс';
 $labels['logoutclear'] = 'Избриши смеће при логовању';
@@ -321,21 +410,33 @@ $labels['logoutcompact'] = 'Компактно сандуче при логов�
 $labels['uisettings'] = 'Кориснички интерфејс';
 $labels['serversettings'] = 'Поставке сервера';
 $labels['mailboxview'] = 'Преглед сандучета';
+$labels['mdnrequests'] = 'On request for return receipt';
 $labels['askuser'] = 'питај ме';
+$labels['autosend'] = 'send receipt';
+$labels['autosendknown'] = 'send receipt to my contacts, otherwise ask me';
+$labels['autosendknownignore'] = 'send receipt to my contacts, otherwise ignore';
 $labels['ignore'] = 'игнорисати';
+$labels['readwhendeleted'] = 'Mark the message as read on delete';
+$labels['flagfordeletion'] = 'Flag the message for deletion instead of delete';
 $labels['skipdeleted'] = 'Не приказуј избрисане поруке';
 $labels['deletealways'] = 'Ако слање поруке у отпад не успе, обришите их';
+$labels['deletejunk'] = 'Directly delete messages in Junk';
+$labels['showremoteimages'] = 'Display remote inline images';
+$labels['fromknownsenders'] = 'from known senders';
 $labels['always'] = 'увек';
 $labels['showinlineimages'] = 'Покажи приложене слике испод поруке';
-$labels['autosavedraft'] = 'Аутоматски чувај у Снимљене';
-$labels['never'] = 'никад';
-$labels['immediately'] = 'одмах';
+$labels['autosavedraft']  = 'Аутоматски чувај у Снимљене';
+$labels['everynminutes']  = 'every $n minute(s)';
+$labels['refreshinterval']  = 'Refresh (check for new messages, etc.)';
+$labels['never']  = 'никад';
+$labels['immediately']  = 'одмах';
 $labels['messagesdisplaying'] = 'прикажи поруке';
 $labels['messagescomposition'] = 'састави поруке';
 $labels['mimeparamfolding'] = 'имена прилога';
 $labels['2231folding'] = 'Full RFC 2231 (тхундербирд )';
 $labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
 $labels['2047folding'] = 'Full RFC 2047 (други)';
+$labels['force7bit'] = 'Use MIME encoding for 8-bit characters';
 $labels['advancedoptions'] = 'Напредне опције';
 $labels['focusonnewmessage'] = 'Фокусирати прозор претраживача на новој поруци';
 $labels['checkallfolders'] = 'Проверите све фасцикле за нове поруке';
@@ -348,35 +449,41 @@ $labels['maintenance'] = 'Поправке';
 $labels['newmessage'] = 'Нова порука';
 $labels['signatureoptions'] = 'Опције потписа';
 $labels['whenreplying'] = 'При одговору';
+$labels['replyempty'] = 'do not quote the original message';
 $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 секунди';
+$labels['previewpanemarkread']  = 'Прегледану поруку означи као прочитану';
+$labels['afternseconds']  = 'након $n секунди';
 $labels['reqmdn'] = 'Увек затражи повратну скрипту';
 $labels['reqdsn'] = 'Увек затражи обавештење о статусу слања поруке';
 $labels['replysamefolder'] = 'Сачувај одговоре у фасциклу поруке на коју се одговара';
-$labels['defaultaddressbook'] = 'Додајте нове контакте у изабрани Адресар';
+$labels['defaultabook'] = 'Default address book';
+$labels['autocompletesingle'] = 'Skip alternative email addresses in autocompletion';
 $labels['listnamedisplay'] = 'Листи контакате као';
 $labels['spellcheckbeforesend'] = 'Проверите правопис пре слања поруке';
 $labels['spellcheckoptions'] = 'Опције  Провере  правописа';
 $labels['spellcheckignoresyms'] = 'игнориши  речи са симболима';
 $labels['spellcheckignorenums'] = 'игнориши  речи са бројевима';
+$labels['spellcheckignorecaps'] = 'Ignore words with all letters capitalized';
 $labels['addtodict'] = 'Додај у речник';
-$labels['folder'] = 'Фасцикла';
-$labels['foldername'] = 'Име фасцикле';
-$labels['subscribed'] = 'Потписана';
+$labels['mailtoprotohandler'] = 'Register protocol handler for mailto: links';
+$labels['forwardmode'] = 'Messages forwarding';
+$labels['inline'] = 'inline';
+$labels['asattachment'] = 'as attachment';
+
+$labels['folder']  = 'Фасцикла';
+$labels['folders']  = 'Фасцикле';
+$labels['foldername']  = 'Име фасцикле';
+$labels['subscribed']  = 'Потписана';
 $labels['messagecount'] = 'Поруке';
-$labels['create'] = 'Креирај';
-$labels['createfolder'] = 'Креирај нову фасциклу';
-$labels['managefolders'] = 'Подеси фасциклу';
+$labels['create']  = 'Креирај';
+$labels['createfolder']  = 'Креирај нову фасциклу';
+$labels['managefolders']  = 'Подеси фасциклу';
 $labels['specialfolders'] = 'Посебне фасцикле';
 $labels['properties'] = 'Својства';
 $labels['folderproperties'] = 'Својства фасцикле';
@@ -386,22 +493,29 @@ $labels['info'] = 'Информација';
 $labels['getfoldersize'] = 'Кликните за приказ величине фасцикле';
 $labels['changesubscription'] = 'Кликните да бисте променили опис';
 $labels['foldertype'] = 'типа фасцикле';
-$labels['personalfolder'] = 'Приватна фасцикла';
-$labels['otherfolder'] = 'Фасцикла Других Корисникa';
-$labels['sharedfolder'] = 'Јавна фасцикла';
+$labels['personalfolder']  = 'Приватна фасцикла';
+$labels['otherfolder']  = 'Фасцикла Других Корисникa';
+$labels['sharedfolder']  = 'Јавна фасцикла';
+
 $labels['sortby'] = 'Сортирај по';
-$labels['sortasc'] = 'Сортирај растуће';
+$labels['sortasc']  = 'Сортирај растуће';
 $labels['sortdesc'] = 'Сортирај опадајуће';
 $labels['undo'] = 'Унатраг';
+
+$labels['installedplugins'] = 'Installed plugins';
 $labels['plugin'] = 'Додаци';
 $labels['version'] = 'Верзија';
 $labels['source'] = 'Извор';
 $labels['license'] = 'Лиценца';
 $labels['support'] = 'подршка';
+
+// units
 $labels['B'] = 'Б';
 $labels['KB'] = 'КБ';
 $labels['MB'] = 'МБ';
 $labels['GB'] = 'ГБ';
+
+// character sets
 $labels['unicode'] = 'Универзални код';
 $labels['english'] = 'Енглески';
 $labels['westerneuropean'] = 'Западна Европа';
@@ -421,3 +535,4 @@ $labels['japanese'] = 'Јапански';
 $labels['korean'] = 'Кореански';
 $labels['chinese'] = 'Кинески';
 
+?>
diff --git a/program/localization/sr_CS/messages.inc b/program/localization/sr_CS/messages.inc
index 02669c611..32007e6f2 100644
--- a/program/localization/sr_CS/messages.inc
+++ b/program/localization/sr_CS/messages.inc
@@ -2,20 +2,23 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/sr_CS/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Данило Шеган                                       |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['errortitle'] = 'Дошло је до грешке!';
-$messages['loginfailed'] = 'Неуспешно пријављивање';
+$messages['errortitle']  = 'Дошло је до грешке!';
+$messages['loginfailed']  = 'Неуспешно пријављивање';
 $messages['cookiesdisabled'] = 'Ваш интернет прегледач не подржава колачиће';
 $messages['sessionerror'] = 'Сесија није валидна или је истекла';
 $messages['storageerror'] = 'Неуспешна конекција на IMAP сервер';
@@ -25,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'] = 'Немате порука у сандучету.';
@@ -57,11 +62,11 @@ $messages['errormoving'] = 'Грешка при премештању порук�
 $messages['errorcopying'] = 'Копирање поруке није било успешно';
 $messages['errordeleting'] = 'Грешка при брисању поруке';
 $messages['errormarking'] = 'Маркирање поруке неуспешно';
-$messages['deletecontactconfirm'] = 'Да ли стварно желите да обришете изабране контакте?';
-$messages['deletegroupconfirm'] = 'Да ли заиста желите да обришете изабрану групу?';
+$messages['deletecontactconfirm']  = 'Да ли стварно желите да обришете изабране контакте?';
+$messages['deletegroupconfirm']  = 'Да ли заиста желите да обришете изабрану групу?';
 $messages['deletemessagesconfirm'] = 'Да ли стварно желите да обришете изабране поруке?';
-$messages['deletefolderconfirm'] = 'Да ли заиста желите да обришете изабрану фасциклу?';
-$messages['purgefolderconfirm'] = 'Да ли заиста желите да обришете све поруке у фасцикли?';
+$messages['deletefolderconfirm']  = 'Да ли заиста желите да обришете изабрану фасциклу?';
+$messages['purgefolderconfirm']  = 'Да ли заиста желите да обришете све поруке у фасцикли?';
 $messages['contactdeleting'] = 'Брише контакте...';
 $messages['groupdeleting'] = 'Брише групу...';
 $messages['folderdeleting'] = 'Брисање фасцикле...';
@@ -70,11 +75,11 @@ $messages['foldersubscribing'] = 'претплаћивање фасцикле...
 $messages['folderunsubscribing'] = 'одјављивање претплате на фасциклу...';
 $messages['formincomplete'] = 'Формулар није у целости попуњен';
 $messages['noemailwarning'] = 'Унесите валидну е-мејл адресу';
-$messages['nonamewarning'] = 'Унесите име';
+$messages['nonamewarning']  = 'Унесите име';
 $messages['nopagesizewarning'] = 'Унесите величину странице';
 $messages['nosenderwarning'] = 'Унесите имејл адресу пошиљаоца';
 $messages['norecipientwarning'] = 'Унесите примаоца/примаоце (За)';
-$messages['nosubjectwarning'] = 'Поље \'Наслов\' је празно. Желите ли да унесете наслов?';
+$messages['nosubjectwarning']  = 'Поље \'Наслов\' је празно. Желите ли да унесете наслов?';
 $messages['nobodywarning'] = 'Да ли желите да пошаљете поруку без текста?';
 $messages['notsentwarning'] = 'Порука није послата. Да ли желите да одбаците ову поруку?';
 $messages['noldapserver'] = 'Унесите LDAP сервер за претрагу';
@@ -163,3 +168,4 @@ $messages['messagetoobig'] = 'Део са поруком је превелик �
 $messages['attachmentvalidationerror'] = 'УПОЗОРЕЊЕ! Овај прилог је сумњив зато што се његов тип не поклапа са типом објављеним у поруци. Уколико немате поверења у пошиљаоца, не отварајте је у прегледачу зато што може садржати злонамерни садржај.<br/><br/><em>Очекивао: $expected; нашао: $detected</em>';
 $messages['noscriptwarning'] = 'Упозорење: ова поштанска услуга захтева Јаваскрипт! Да бисте је користили, укључите Јаваскрипт у подешавањима вашег прегледача.';
 
+?>
diff --git a/program/localization/sv_SE/labels.inc b/program/localization/sv_SE/labels.inc
index 68e6894bc..f61433527 100644
--- a/program/localization/sv_SE/labels.inc
+++ b/program/localization/sv_SE/labels.inc
@@ -2,60 +2,78 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/sv_SE/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Jonas Nasholm                                                 |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = 'Välkommen till $product';
-$labels['username'] = 'Användarnamn';
-$labels['password'] = 'Lösenord';
-$labels['server'] = 'Server';
-$labels['login'] = 'Logga in';
-$labels['logout'] = 'Logga ut';
-$labels['mail'] = 'Meddelanden';
+
+// login page
+$labels['welcome']   = 'Välkommen till $product';
+$labels['username']  = 'Användarnamn';
+$labels['password']  = 'Lösenord';
+$labels['server']    = 'Server';
+$labels['login']     = 'Logga in';
+
+// taskbar
+$labels['logout']   = 'Logga ut';
+$labels['mail']     = 'Meddelanden';
 $labels['settings'] = 'Inställningar';
 $labels['addressbook'] = 'Adressbok';
-$labels['inbox'] = 'Inkorg';
+
+// mailbox names
+$labels['inbox']  = 'Inkorg';
 $labels['drafts'] = 'Utkast';
-$labels['sent'] = 'Skickat';
-$labels['trash'] = 'Papperskorg';
-$labels['junk'] = 'Skräp';
+$labels['sent']   = 'Skickat';
+$labels['trash']  = 'Papperskorg';
+$labels['junk']   = 'Skräp';
+
+// message listing
 $labels['subject'] = 'Ämne';
-$labels['from'] = 'Avsändare';
-$labels['to'] = 'Mottagare';
-$labels['cc'] = 'Kopia';
-$labels['bcc'] = 'Dold kopia';
+$labels['from']    = 'Avsändare';
+$labels['sender']  = 'Avsändare';
+$labels['to']      = 'Mottagare';
+$labels['cc']      = 'Kopia';
+$labels['bcc']     = 'Dold kopia';
 $labels['replyto'] = 'Svar till';
 $labels['followupto'] = 'Uppföljning till';
-$labels['date'] = 'Datum';
-$labels['size'] = 'Storlek';
+$labels['date']    = 'Datum';
+$labels['size']    = 'Storlek';
 $labels['priority'] = 'Prioritet';
 $labels['organization'] = 'Organisation';
 $labels['readstatus'] = 'Lässtatus';
 $labels['listoptions'] = 'Listalternativ...';
+
 $labels['mailboxlist'] = 'Kataloger';
-$labels['folders'] = 'Kataloger';
 $labels['messagesfromto'] = 'Meddelande $from till $to av $count';
 $labels['threadsfromto'] = 'Tråd $from till $to av $count';
 $labels['messagenrof'] = 'Meddelande $nr av $count';
 $labels['fromtoshort'] = '$from – $to av $count';
-$labels['copy'] = 'Kopiera';
-$labels['move'] = 'Flytta';
-$labels['moveto'] = 'Flytta till:';
+
+$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å';
+
 $labels['filename'] = 'Filnamn';
 $labels['filesize'] = 'Filstorlek';
+
 $labels['addtoaddressbook'] = 'Lägg till i adressbok';
+
+// weekdays short
 $labels['sun'] = 'sön';
 $labels['mon'] = 'mån';
 $labels['tue'] = 'tis';
@@ -63,78 +81,88 @@ $labels['wed'] = 'ons';
 $labels['thu'] = 'tor';
 $labels['fri'] = 'fre';
 $labels['sat'] = 'lör';
-$labels['sunday'] = 'söndag';
-$labels['monday'] = 'måndag';
-$labels['tuesday'] = 'tisdag';
+
+// weekdays long
+$labels['sunday']    = 'söndag';
+$labels['monday']    = 'måndag';
+$labels['tuesday']   = 'tisdag';
 $labels['wednesday'] = 'onsdag';
-$labels['thursday'] = 'torsdag';
-$labels['friday'] = 'fredag';
-$labels['saturday'] = 'lördag';
-$labels['jan'] = 'jan';
-$labels['feb'] = 'feb';
-$labels['mar'] = 'mar';
-$labels['apr'] = 'apr';
-$labels['may'] = 'maj';
-$labels['longmay'] = 'maj';
-$labels['jun'] = 'jun';
-$labels['jul'] = 'jul';
-$labels['aug'] = 'aug';
-$labels['sep'] = 'sep';
-$labels['oct'] = 'okt';
-$labels['nov'] = 'nov';
-$labels['dec'] = 'dec';
-$labels['longjan'] = 'januari';
-$labels['longfeb'] = 'februari';
-$labels['longmar'] = 'mars';
-$labels['longapr'] = 'april';
-$labels['longjun'] = 'juni';
-$labels['longjul'] = 'juli';
-$labels['longaug'] = 'augusti';
-$labels['longsep'] = 'september';
-$labels['longoct'] = 'oktober';
-$labels['longnov'] = 'november';
-$labels['longdec'] = 'december';
+$labels['thursday']  = 'torsdag';
+$labels['friday']    = 'fredag';
+$labels['saturday']  = 'lördag';
+
+// months short
+$labels['jan']	= 'jan';
+$labels['feb']	= 'feb';
+$labels['mar']	= 'mar';
+$labels['apr']	= 'apr';
+$labels['may']	= 'maj';
+$labels['jun']	= 'jun';
+$labels['jul'] 	= 'jul';
+$labels['aug']	= 'aug';
+$labels['sep']	= 'sep';
+$labels['oct']	= 'okt';
+$labels['nov']	= 'nov';
+$labels['dec']	= 'dec';
+
+// months long
+$labels['longjan']	= 'januari';
+$labels['longfeb']	= 'februari';
+$labels['longmar']	= 'mars';
+$labels['longapr']	= 'april';
+$labels['longmay']	= 'maj';
+$labels['longjun']	= 'juni';
+$labels['longjul']	= 'juli';
+$labels['longaug']	= 'augusti';
+$labels['longsep']	= 'september';
+$labels['longoct']	= 'oktober';
+$labels['longnov']	= 'november';
+$labels['longdec']	= 'december';
+
 $labels['today'] = 'idag';
-$labels['refresh'] = 'Uppdatera';
-$labels['checkmail'] = 'Hämta nya meddelanden';
-$labels['compose'] = 'Nytt meddelande';
-$labels['writenewmessage'] = 'Nytt meddelande';
-$labels['reply'] = 'Svara';
-$labels['replytomessage'] = 'Svara avsändaren';
+
+// toolbar buttons
+$labels['refresh']          = 'Uppdatera';
+$labels['checkmail']        = 'Hämta nya meddelanden';
+$labels['compose']          = 'Nytt meddelande';
+$labels['writenewmessage']  = 'Nytt meddelande';
+$labels['reply']            = 'Svara';
+$labels['replytomessage']   = 'Svara avsändaren';
 $labels['replytoallmessage'] = 'Svara avsändaren och alla mottagare';
-$labels['replyall'] = 'Svara alla';
-$labels['replylist'] = 'Svara lista';
-$labels['forward'] = 'Vidarebefordra';
-$labels['forwardinline'] = 'Vidarebefordra infogat';
+$labels['replyall']         = 'Svara alla';
+$labels['replylist']        = 'Svara lista';
+$labels['forward']          = 'Vidarebefordra';
+$labels['forwardinline']    = 'Vidarebefordra infogat';
 $labels['forwardattachment'] = 'Vidarebefordra som bilaga';
-$labels['forwardmessage'] = 'Vidarebefordra meddelande';
-$labels['deletemessage'] = 'Ta bort meddelande';
+$labels['forwardmessage']   = 'Vidarebefordra meddelande';
+$labels['deletemessage']    = 'Ta bort meddelande';
 $labels['movemessagetotrash'] = 'Flytta meddelande till papperskorgen';
-$labels['printmessage'] = 'Skriv ut';
-$labels['previousmessage'] = 'Visa föregående meddelande';
-$labels['firstmessage'] = 'Visa första meddelandet';
-$labels['nextmessage'] = 'Visa nästa meddelande';
-$labels['lastmessage'] = 'Visa sista meddelandet';
-$labels['backtolist'] = 'Tillbaka till meddelandelistan';
-$labels['viewsource'] = 'Visa källkod';
-$labels['mark'] = 'Märk';
-$labels['markmessages'] = 'Märk meddelande';
-$labels['markread'] = 'Läst';
-$labels['markunread'] = 'Oläst';
-$labels['markflagged'] = 'Flaggat';
-$labels['markunflagged'] = 'Oflaggat';
-$labels['moreactions'] = 'Ytterligare hantering...';
-$labels['more'] = 'Fler';
-$labels['back'] = 'Tillbaka';
-$labels['options'] = 'Alternativ';
+$labels['printmessage']     = 'Skriv ut';
+$labels['previousmessage']  = 'Visa föregående meddelande';
+$labels['firstmessage']     = 'Visa första meddelandet';
+$labels['nextmessage']      = 'Visa nästa meddelande';
+$labels['lastmessage']      = 'Visa sista meddelandet';
+$labels['backtolist']       = 'Tillbaka till meddelandelistan';
+$labels['viewsource']       = 'Visa källkod';
+$labels['mark']             = 'Märk';
+$labels['markmessages']     = 'Märk meddelande';
+$labels['markread']         = 'Läst';
+$labels['markunread']       = 'Oläst';
+$labels['markflagged']      = 'Flaggat';
+$labels['markunflagged']    = 'Oflaggat';
+$labels['moreactions']      = 'Fler åtgärder';
+$labels['more']             = 'Fler';
+$labels['back']             = 'Tillbaka';
+$labels['options']          = 'Alternativ';
+
 $labels['select'] = 'Välj';
 $labels['all'] = 'Alla';
 $labels['none'] = 'Ingen';
-$labels['nonesort'] = 'Ingen';
 $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';
@@ -145,12 +173,14 @@ $labels['expand-all'] = 'Visa alla';
 $labels['expand-unread'] = 'Visa olästa';
 $labels['collapse-all'] = 'Dölj alla';
 $labels['threaded'] = 'Trådat';
+
 $labels['autoexpand_threads'] = 'Visa trådade meddelanden';
 $labels['do_expand'] = 'Alla trådar';
 $labels['expand_only_unread'] = 'Trådar med olästa meddelanden';
 $labels['fromto'] = 'Avsändare/Mottagare';
 $labels['flag'] = 'Flagga';
 $labels['attachment'] = 'Bilaga';
+$labels['nonesort'] = 'Ingen';
 $labels['sentdate'] = 'Datum skickat';
 $labels['arrival'] = 'Datum mottaget';
 $labels['asc'] = 'Stigande';
@@ -159,183 +189,220 @@ $labels['listcolumns'] = 'Kolumner';
 $labels['listsorting'] = 'Sortering';
 $labels['listorder'] = 'Ordning';
 $labels['listmode'] = 'Visningsläge';
+
 $labels['folderactions'] = 'Hantera kataloger';
 $labels['compact'] = 'Packa';
 $labels['empty'] = 'Töm';
+
 $labels['quota'] = 'Diskutrymme';
-$labels['unknown'] = 'okänt';
-$labels['unlimited'] = 'obegränsat';
-$labels['quicksearch'] = 'Snabbsök';
-$labels['resetsearch'] = 'Återställ sökning';
-$labels['searchmod'] = 'Sökalternativ';
-$labels['msgtext'] = 'Hela meddelandet';
+$labels['unknown']  = 'okänt';
+$labels['unlimited']  = 'obegränsat';
+
+$labels['quicksearch']  = 'Snabbsök';
+$labels['resetsearch']  = 'Återställ sökning';
+$labels['searchmod']  = 'Sökalternativ';
+$labels['msgtext']  = 'Hela meddelandet';
+$labels['body']  = 'Innehåll';
+
 $labels['openinextwin'] = 'Öppna i nytt fönster';
 $labels['emlsave'] = 'Spara (.eml)';
-$labels['editasnew'] = 'Redigera som nytt';
-$labels['send'] = 'Skicka';
-$labels['sendmessage'] = 'Skicka meddelande';
-$labels['savemessage'] = 'Spara utkast';
-$labels['addattachment'] = 'Bifoga fil';
-$labels['charset'] = 'Teckenkodning';
-$labels['editortype'] = 'Textredigerare';
-$labels['returnreceipt'] = 'Mottagarkvitto';
-$labels['dsn'] = 'Leveransstatusmeddelande';
+$labels['changeformattext'] = 'Visa i text-format';
+$labels['changeformathtml'] = 'Visa i HTML-format';
+
+// message compose
+$labels['editasnew']      = 'Redigera som nytt';
+$labels['send']           = 'Skicka';
+$labels['sendmessage']    = 'Skicka meddelande';
+$labels['savemessage']    = 'Spara utkast';
+$labels['addattachment']  = 'Bifoga fil';
+$labels['charset']        = 'Teckenkodning';
+$labels['editortype']     = 'Textredigerare';
+$labels['returnreceipt']  = 'Mottagarkvitto';
+$labels['dsn']            = 'Leveransstatusmeddelande';
 $labels['mailreplyintro'] = '$date skrev $sender:';
 $labels['originalmessage'] = 'Ursprungligt meddelande';
-$labels['editidents'] = 'Ändra identiteter';
-$labels['spellcheck'] = 'Rättstava';
+
+$labels['editidents']    = 'Ändra identiteter';
+$labels['spellcheck']    = 'Rättstava';
 $labels['checkspelling'] = 'Kontrollera stavning';
 $labels['resumeediting'] = 'Återuppta redigering';
-$labels['revertto'] = 'Återgå till';
+$labels['revertto']      = 'Återgå till';
+
 $labels['attach'] = 'Bifoga';
 $labels['attachments'] = 'Bilagor';
 $labels['upload'] = 'Bifoga';
 $labels['uploadprogress'] = '$percent ($current av $total)';
-$labels['close'] = 'Stäng';
-$labels['messageoptions'] = 'Meddelandealternativ';
-$labels['low'] = 'Låg';
-$labels['lowest'] = 'Lägst';
-$labels['normal'] = 'Normal';
-$labels['high'] = 'Hög';
+$labels['close']  = 'Stäng';
+$labels['messageoptions']  = 'Meddelandealternativ';
+
+$labels['low']     = 'Låg';
+$labels['lowest']  = 'Lägst';
+$labels['normal']  = 'Normal';
+$labels['high']    = 'Hög';
 $labels['highest'] = 'Högst';
-$labels['nosubject'] = '(inget ämne)';
+
+$labels['nosubject']  = '(inget ämne)';
 $labels['showimages'] = 'Visa bilder';
 $labels['alwaysshow'] = 'Visa alltid bilder från $sender';
-$labels['isdraft'] = 'Detta meddelande är ett utkast.';
-$labels['andnmore'] = '$nr fler...';
+$labels['isdraft']    = 'Detta meddelande är ett utkast.';
+$labels['andnmore']   = '$nr fler...';
 $labels['togglemoreheaders'] = 'Visa fler meddelandehuvuden';
 $labels['togglefullheaders'] = 'Växla meddelandehuvuden';
+
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Text';
 $labels['savesentmessagein'] = 'Spara kopia i';
 $labels['dontsave'] = 'Spara inte';
 $labels['maxuploadsize'] = 'Tillåten filstorlek är $size';
+
 $labels['addcc'] = 'Kopia';
 $labels['addbcc'] = 'Dold kopia';
 $labels['addreplyto'] = 'Svar till';
 $labels['addfollowupto'] = 'Uppföljning till';
+
+// mdn
 $labels['mdnrequest'] = 'Avsändaren har begärt mottagarkvitto för det här meddelandet. Vill du skicka ett mottagarkvitto?';
 $labels['receiptread'] = 'Mottagarkvitto (läst)';
 $labels['yourmessage'] = 'Det här är ett mottagarkvitto för ditt meddelande';
 $labels['receiptnote'] = 'Notera: Mottagarkvittot innebär bara att meddelandet visats på mottagarens dator. Därmed finns ingen garanti att mottagaren har läst och förstått meddelandet.';
-$labels['name'] = 'Namn';
-$labels['firstname'] = 'Förnamn';
-$labels['surname'] = 'Efternamn';
-$labels['middlename'] = 'Mellannamn';
-$labels['nameprefix'] = 'Prefix';
-$labels['namesuffix'] = 'Suffix';
-$labels['nickname'] = 'Smeknamn';
-$labels['jobtitle'] = 'Titel';
-$labels['department'] = 'Avdelning';
-$labels['gender'] = 'Kön';
-$labels['maidenname'] = 'Flicknamn';
-$labels['email'] = 'E-post';
-$labels['phone'] = 'Telefon';
-$labels['address'] = 'Adress';
-$labels['street'] = 'Gata';
-$labels['locality'] = 'Ort';
-$labels['zipcode'] = 'Postnummer';
-$labels['region'] = 'Region';
-$labels['country'] = 'Land';
-$labels['birthday'] = 'Födelsedag';
-$labels['anniversary'] = 'Årsdag';
-$labels['website'] = 'Webbplats';
+
+// address boook
+$labels['name']         = 'Namn';
+$labels['firstname']    = 'Förnamn';
+$labels['surname']      = 'Efternamn';
+$labels['middlename']   = 'Mellannamn';
+$labels['nameprefix']   = 'Prefix';
+$labels['namesuffix']   = 'Suffix';
+$labels['nickname']     = 'Smeknamn';
+$labels['jobtitle']     = 'Titel';
+$labels['department']   = 'Avdelning';
+$labels['gender']       = 'Kön';
+$labels['maidenname']   = 'Flicknamn';
+$labels['email']        = 'E-post';
+$labels['phone']        = 'Telefon';
+$labels['address']      = 'Adress';
+$labels['street']       = 'Gata';
+$labels['locality']     = 'Ort';
+$labels['zipcode']      = 'Postnummer';
+$labels['region']       = 'Region';
+$labels['country']      = 'Land';
+$labels['birthday']     = 'Födelsedag';
+$labels['anniversary']  = 'Årsdag';
+$labels['website']      = 'Webbplats';
 $labels['instantmessenger'] = 'IM';
 $labels['notes'] = 'Anteckningar';
-$labels['male'] = 'Man';
+$labels['male']   = 'Man';
 $labels['female'] = 'Kvinna';
 $labels['manager'] = 'Chef';
 $labels['assistant'] = 'Assistent';
-$labels['typeassistant'] = 'Assistent';
 $labels['spouse'] = 'Make/Maka';
 $labels['allfields'] = 'Alla fält';
 $labels['search'] = 'Sök';
 $labels['advsearch'] = 'Avancerad sökning';
 $labels['advanced'] = 'Avancerad';
 $labels['other'] = 'Annat';
-$labels['typeother'] = 'Annat';
-$labels['typehome'] = 'Hem';
-$labels['typework'] = 'Arbete';
-$labels['typemobile'] = 'Mobil';
-$labels['typemain'] = 'Huvudsakligt';
-$labels['typehomefax'] = 'Fax hem';
-$labels['typeworkfax'] = 'Fax arbete';
-$labels['typecar'] = 'Bil';
-$labels['typepager'] = 'Personsökare';
-$labels['typevideo'] = 'Video';
-$labels['typehomepage'] = 'Webbsida';
+
+$labels['typehome']   = 'Hem';
+$labels['typework']   = 'Arbete';
+$labels['typeother']  = 'Annat';
+$labels['typemobile']  = 'Mobil';
+$labels['typemain']  = 'Huvudsakligt';
+$labels['typehomefax']  = 'Fax hem';
+$labels['typeworkfax']  = 'Fax arbete';
+$labels['typecar']  = 'Bil';
+$labels['typepager']  = 'Personsökare';
+$labels['typevideo']  = 'Video';
+$labels['typeassistant']  = 'Assistent';
+$labels['typehomepage']  = 'Webbsida';
 $labels['typeblog'] = 'Blogg';
 $labels['typeprofile'] = 'Profil';
+
 $labels['addfield'] = 'Lägg till fält...';
 $labels['addcontact'] = 'Lägg till ny kontakt';
 $labels['editcontact'] = 'Ändra kontakt';
 $labels['contacts'] = 'Kontakter';
 $labels['contactproperties'] = 'Kontaktegenskaper';
 $labels['personalinfo'] = 'Personlig information';
-$labels['edit'] = 'Redigera';
+
+$labels['edit']   = 'Redigera';
 $labels['cancel'] = 'Avbryt';
-$labels['save'] = 'Spara';
+$labels['save']   = 'Spara';
 $labels['delete'] = 'Ta bort';
 $labels['rename'] = 'Ändra namn';
 $labels['addphoto'] = 'Lägg till';
 $labels['replacephoto'] = 'Ersätt';
 $labels['uploadphoto'] = 'Ladda upp foto';
-$labels['newcontact'] = 'Ny kontakt';
-$labels['deletecontact'] = 'Ta bort vald kontakt';
-$labels['composeto'] = 'Nytt meddelande till vald kontakt';
+
+$labels['newcontact']     = 'Ny kontakt';
+$labels['deletecontact']  = 'Ta bort vald kontakt';
+$labels['composeto']      = 'Nytt meddelande till';
 $labels['contactsfromto'] = 'Kontakt $from till $to av $count';
-$labels['print'] = 'Skriv ut';
-$labels['export'] = 'Exportera';
-$labels['exportvcards'] = 'Exportera kontakter';
+$labels['print']          = 'Skriv ut';
+$labels['export']         = 'Exportera';
+$labels['exportall']      = 'Exportera alla';
+$labels['exportsel']      = 'Exportera markerade';
+$labels['exportvcards']   = 'Exportera kontakter';
 $labels['newcontactgroup'] = 'Ny kontaktgrupp';
-$labels['grouprename'] = 'Ändra gruppnamn';
-$labels['groupdelete'] = 'Ta bort grupp';
+$labels['grouprename']    = 'Ändra gruppnamn';
+$labels['groupdelete']    = 'Ta bort grupp';
 $labels['groupremoveselected'] = 'Ta bort markerade kontakter från gruppen';
-$labels['previouspage'] = 'Visa föregående sida';
-$labels['firstpage'] = 'Visa första sidan';
-$labels['nextpage'] = 'Visa nästa sida';
-$labels['lastpage'] = 'Visa sista sidan';
+
+$labels['previouspage']   = 'Visa föregående sida';
+$labels['firstpage']      = 'Visa första sidan';
+$labels['nextpage']       = 'Visa nästa sida';
+$labels['lastpage']       = 'Visa sista sidan';
+
 $labels['group'] = 'Grupp';
 $labels['groups'] = 'Kontaktgrupper';
 $labels['personaladrbook'] = 'Personliga adresser';
+
 $labels['searchsave'] = 'Lägg till sökning';
 $labels['searchdelete'] = 'Ta bort sökning';
+
 $labels['import'] = 'Importera';
 $labels['importcontacts'] = 'Importera kontakter';
 $labels['importfromfile'] = 'Importera från fil:';
 $labels['importtarget'] = 'Lägg till nya kontakter till adressbok:';
 $labels['importreplace'] = 'Ersätt samtliga kontakter i adressboken';
-$labels['importdesc'] = 'Du kan läsa in kontakter från en befintlig adressbok.<br/>Programmet stödjer inläsning av kontakter i formatet <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> eller formatet CSV (kommaseparerad data).';
+$labels['importdesc'] = 'Kontakter kan importeras från en befintlig adressbok.<br/>Programmet stödjer inläsning av kontakter i formatet <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> eller formatet CSV (kommaseparerad data).';
 $labels['done'] = 'Klart';
+
+// settings
 $labels['settingsfor'] = 'Inställningar för';
 $labels['about'] = 'Om';
 $labels['preferences'] = 'Inställningar';
 $labels['userpreferences'] = 'Användarinställningar';
 $labels['editpreferences'] = 'Ändra användarinställningar';
+
 $labels['identities'] = 'Identiteter';
 $labels['manageidentities'] = 'Hantera identiteter';
 $labels['newidentity'] = 'Ny identitet';
+
 $labels['newitem'] = 'Ny information';
 $labels['edititem'] = 'Ändra information';
+
 $labels['preferhtml'] = 'Visa meddelanden i HTML-format';
 $labels['defaultcharset'] = 'Förvald teckenkodning';
 $labels['htmlmessage'] = 'HTML-meddelande';
+$labels['messagepart'] = 'Del';
+$labels['digitalsig'] = 'Digital signatur';
 $labels['dateformat'] = 'Datumformat';
 $labels['timeformat'] = 'Tidformat';
 $labels['prettydate'] = 'Fina datum';
-$labels['setdefault'] = 'Sätt som standard';
-$labels['autodetect'] = 'Automatiskt';
-$labels['language'] = 'Språk';
-$labels['timezone'] = 'Tidszon';
-$labels['pagesize'] = 'Rader per sida';
+$labels['setdefault']  = 'Sätt som förval';
+$labels['autodetect']  = 'Automatiskt';
+$labels['language']  = 'Språk';
+$labels['timezone']  = 'Tidszon';
+$labels['pagesize']  = 'Rader per sida';
 $labels['signature'] = 'Signatur';
-$labels['dstactive'] = 'Sommartid';
+$labels['dstactive']  = 'Sommartid';
 $labels['showinextwin'] = 'Öppna i nytt fönster';
 $labels['composeextwin'] = 'Skriv i nytt fönster';
 $labels['htmleditor'] = 'Skriv meddelanden i HTML-format';
 $labels['htmlonreply'] = 'Endast vid svar på meddelande i HTML-format';
-$labels['htmlonreplyandforward'] = 'vid vidarebefordring eller svar till HTML-meddelande';
+$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';
@@ -358,11 +425,11 @@ $labels['showremoteimages'] = 'Visa externt länkade bilder i meddelande';
 $labels['fromknownsenders'] = 'Från kända avsändare';
 $labels['always'] = 'Alltid';
 $labels['showinlineimages'] = 'Visa bifogade bilder efter meddelande';
-$labels['autosavedraft'] = 'Spara utkast med automatiskt intervall';
-$labels['everynminutes'] = '$n min';
-$labels['refreshinterval'] = 'Uppdatera (hämta nya meddelanden, etc.)';
-$labels['never'] = 'Aldrig';
-$labels['immediately'] = 'Direkt';
+$labels['autosavedraft']  = 'Spara utkast med automatiskt intervall';
+$labels['everynminutes']  = '$n min';
+$labels['refreshinterval']  = 'Uppdatera (hämta nya meddelanden, etc.)';
+$labels['never']  = 'Aldrig';
+$labels['immediately']  = 'Direkt';
 $labels['messagesdisplaying'] = 'Visning av meddelanden';
 $labels['messagescomposition'] = 'Redigering av meddelanden';
 $labels['mimeparamfolding'] = 'Kodning av namn på bifogade filer';
@@ -374,7 +441,7 @@ $labels['advancedoptions'] = 'Avancerade inställningar';
 $labels['focusonnewmessage'] = 'Fokusera webbläsarens fönster vid nytt meddelande';
 $labels['checkallfolders'] = 'Genomsök samtliga kataloger efter nya meddelanden';
 $labels['displaynext'] = 'Visa nästa meddelande efter borttagning/flyttning av meddelande';
-$labels['defaultfont'] = 'Standardtypsnitt i HTML-meddelande';
+$labels['defaultfont'] = 'Förvalt typsnitt i HTML-meddelande';
 $labels['mainoptions'] = 'Huvudalternativ';
 $labels['browseroptions'] = 'Webbläsaralternativ';
 $labels['section'] = 'Avdelning';
@@ -389,12 +456,9 @@ $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';
+$labels['previewpanemarkread']  = 'Märk meddelande som läst vid visning';
+$labels['afternseconds']  = 'Efter $n sekunder';
 $labels['reqmdn'] = 'Begär alltid mottagarkvitto';
 $labels['reqdsn'] = 'Begär alltid leveransstatusmeddelande';
 $labels['replysamefolder'] = 'Placera svar i samma katalog som besvarat meddelande';
@@ -411,13 +475,15 @@ $labels['mailtoprotohandler'] = 'Ange program för hantering av mailto-länkar';
 $labels['forwardmode'] = 'Vidarebefordra meddelande';
 $labels['inline'] = 'Infogat';
 $labels['asattachment'] = 'Bilaga';
-$labels['folder'] = 'Katalog';
-$labels['foldername'] = 'Katalognamn';
-$labels['subscribed'] = 'Prenumererad';
+
+$labels['folder']  = 'Katalog';
+$labels['folders']  = 'Kataloger';
+$labels['foldername']  = 'Katalognamn';
+$labels['subscribed']  = 'Prenumererad';
 $labels['messagecount'] = 'Meddelanden';
-$labels['create'] = 'Skapa';
-$labels['createfolder'] = 'Ny katalog';
-$labels['managefolders'] = 'Hantera kataloger';
+$labels['create']  = 'Skapa';
+$labels['createfolder']  = 'Ny katalog';
+$labels['managefolders']  = 'Hantera kataloger';
 $labels['specialfolders'] = 'Speciella kataloger';
 $labels['properties'] = 'Egenskaper';
 $labels['folderproperties'] = 'Katalogegenskaper';
@@ -427,23 +493,29 @@ $labels['info'] = 'Information';
 $labels['getfoldersize'] = 'Beräkna katalogstorlek';
 $labels['changesubscription'] = 'Klicka för att ändra prenumeration';
 $labels['foldertype'] = 'Katalogtyp';
-$labels['personalfolder'] = 'Privat katalog';
-$labels['otherfolder'] = 'Annan användares katalog';
-$labels['sharedfolder'] = 'Publik katalog';
+$labels['personalfolder']  = 'Privat katalog';
+$labels['otherfolder']  = 'Annan användares katalog';
+$labels['sharedfolder']  = 'Publik katalog';
+
 $labels['sortby'] = 'Sortera på';
-$labels['sortasc'] = 'Sortera stigande';
+$labels['sortasc']  = 'Sortera stigande';
 $labels['sortdesc'] = 'Sortera fallande';
 $labels['undo'] = 'Ångra';
+
 $labels['installedplugins'] = 'Installerade tillägg';
 $labels['plugin'] = 'Tillägg';
 $labels['version'] = 'Version';
 $labels['source'] = 'Källkod';
 $labels['license'] = 'Licens';
 $labels['support'] = 'Hjälp';
+
+// units
 $labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
 $labels['GB'] = 'GB';
+
+// character sets
 $labels['unicode'] = 'Unicode';
 $labels['english'] = 'Engelsk';
 $labels['westerneuropean'] = 'Västeuropeisk';
@@ -463,3 +535,4 @@ $labels['japanese'] = 'Japansk';
 $labels['korean'] = 'Koreansk';
 $labels['chinese'] = 'Kinesisk';
 
+?>
diff --git a/program/localization/sv_SE/messages.inc b/program/localization/sv_SE/messages.inc
index 297f7cf3c..63dddc548 100644
--- a/program/localization/sv_SE/messages.inc
+++ b/program/localization/sv_SE/messages.inc
@@ -2,20 +2,23 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/sv_SE/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Jonas Nasholm                                                 |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['errortitle'] = 'Ett fel uppstod!';
-$messages['loginfailed'] = 'Inloggningen misslyckades';
+$messages['errortitle']  = 'Ett fel uppstod!';
+$messages['loginfailed']  = 'Inloggningen misslyckades';
 $messages['cookiesdisabled'] = 'Din webbläsare accepterar inte cookies';
 $messages['sessionerror'] = 'Din inloggning är felaktig eller har gått ut';
 $messages['storageerror'] = 'Anslutning till IMAP-servern misslyckades';
@@ -25,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';
@@ -57,11 +62,11 @@ $messages['errormoving'] = 'Meddelandet kunde inte flyttas';
 $messages['errorcopying'] = 'Meddelandet kunde inte kopieras';
 $messages['errordeleting'] = 'Meddelandet kunde inte tas bort';
 $messages['errormarking'] = 'Meddelandet kunde inte markeras';
-$messages['deletecontactconfirm'] = 'Vill du verkligen ta bort valda kontakter?';
-$messages['deletegroupconfirm'] = 'Vill du verkligen ta bort den valda gruppen?';
+$messages['deletecontactconfirm']  = 'Vill du verkligen ta bort valda kontakter?';
+$messages['deletegroupconfirm']  = 'Vill du verkligen ta bort den valda gruppen?';
 $messages['deletemessagesconfirm'] = 'Vill du verkligen ta bort valda meddelanden?';
-$messages['deletefolderconfirm'] = 'Vill du verkligen ta bort den här katalogen?';
-$messages['purgefolderconfirm'] = 'Vill du verkligen ta bort alla meddelanden i den här katalogen?';
+$messages['deletefolderconfirm']  = 'Vill du verkligen ta bort den här katalogen?';
+$messages['purgefolderconfirm']  = 'Vill du verkligen ta bort alla meddelanden i den här katalogen?';
 $messages['contactdeleting'] = 'Tar bort kontakt...';
 $messages['groupdeleting'] = 'Tar bort grupp...';
 $messages['folderdeleting'] = 'Tar bort katalog...';
@@ -70,11 +75,11 @@ $messages['foldersubscribing'] = 'Startar prenumeration på katalog...';
 $messages['folderunsubscribing'] = 'Avslutar prenumeration på katalog...';
 $messages['formincomplete'] = 'Formuläret var inte komplett ifyllt';
 $messages['noemailwarning'] = 'Ange en giltig adress';
-$messages['nonamewarning'] = 'Ange ett namn';
+$messages['nonamewarning']  = 'Ange ett namn';
 $messages['nopagesizewarning'] = 'Ange en sidstorlek';
 $messages['nosenderwarning'] = 'Ange en avsändaradress';
 $messages['norecipientwarning'] = 'Ange minst en mottagare';
-$messages['nosubjectwarning'] = 'Ämnesraden är tom. Vill du ange ämne nu?';
+$messages['nosubjectwarning']  = 'Ämnesraden är tom. Vill du ange ämne nu?';
 $messages['nobodywarning'] = 'Skicka det här meddelandet utan text?';
 $messages['notsentwarning'] = 'Meddelandet har inte skickats. Vill du avbryta meddelandet?';
 $messages['noldapserver'] = 'Ange en LDAP-server för att söka';
@@ -118,7 +123,7 @@ $messages['contactaddedtogroup'] = 'Kontakterna har lagts till i gruppen';
 $messages['contactremovedfromgroup'] = 'Kontakterna har tagits bort från gruppen';
 $messages['nogroupassignmentschanged'] = 'Ingen grupptillhörighet ändrades.';
 $messages['importwait'] = 'Importerar, var god vänta...';
-$messages['importformaterror'] = 'Inläsningen misslyckades! Filen har inte korrekt dataformat.';
+$messages['importformaterror'] = 'Importen misslyckades! Filen har inte korrekt dataformat.';
 $messages['importconfirm'] = '<b>Lyckad import av $inserted kontakter</b>';
 $messages['importconfirmskipped'] = '<b>Hoppade över $skipped befintliga poster</b>';
 $messages['opnotpermitted'] = 'Otillåten operation!';
@@ -163,3 +168,4 @@ $messages['messagetoobig'] = 'Denna del av meddelandet är alltför stor för at
 $messages['attachmentvalidationerror'] = 'VARNING! Bilagan misstänks vara av annan typ än vad som anges i meddelandet. Om du inte litar på avsändaren ska du inte öppna bilagan.<br/><br/><em>Angiven typ: $expected; funnen typ: $detected</em>';
 $messages['noscriptwarning'] = 'Varning: Denna webbmailtjänst fungerar inte utan Javascript! Aktivera Javascript i webbläsarens inställningar.';
 
+?>
diff --git a/program/localization/ta_IN/labels.inc b/program/localization/ta_IN/labels.inc
index ecd971012..bc1db7d00 100644
--- a/program/localization/ta_IN/labels.inc
+++ b/program/localization/ta_IN/labels.inc
@@ -2,52 +2,78 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ta_IN/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = 'நல்வரவு';
-$labels['username'] = 'பயனர்';
-$labels['password'] = 'கடவுச்சொல்';
-$labels['server'] = 'சேவையகம்';
-$labels['login'] = 'நுழை';
-$labels['logout'] = 'வெளியேறு';
-$labels['mail'] = 'மின்னஞ்சல்';
+
+// login page
+$labels['welcome']   = 'நல்வரவு';
+$labels['username']  = 'பயனர்';
+$labels['password']  = 'கடவுச்சொல்';
+$labels['server']    = 'சேவையகம்';
+$labels['login']     = 'நுழை';
+
+// taskbar
+$labels['logout']   = 'வெளியேறு';
+$labels['mail']     = 'மின்னஞ்சல்';
 $labels['settings'] = 'அமைப்புகள்';
 $labels['addressbook'] = 'தொடர்புகள்';
-$labels['inbox'] = 'அகப்பெட்டி';
+
+// mailbox names
+$labels['inbox']  = 'அகப்பெட்டி';
 $labels['drafts'] = 'வரைவுகள்';
-$labels['sent'] = 'அனுப்பிய அஞ்சல்';
-$labels['trash'] = 'குப்பை';
-$labels['junk'] = 'எரிதம்';
+$labels['sent']   = 'அனுப்பிய அஞ்சல்';
+$labels['trash']  = 'குப்பை';
+$labels['junk']   = 'எரிதம்';
+
+// message listing
 $labels['subject'] = 'தலைப்பு';
-$labels['from'] = 'அனுப்புனர்';
-$labels['to'] = 'பெறுனர்';
-$labels['cc'] = 'நகல்';
-$labels['bcc'] = 'மறை நகல்';
+$labels['from']    = 'அனுப்புனர்';
+$labels['sender']  = 'Sender';
+$labels['to']      = 'பெறுனர்';
+$labels['cc']      = 'நகல்';
+$labels['bcc']     = 'மறை நகல்';
 $labels['replyto'] = 'பதிலளி';
-$labels['date'] = 'தேதி';
-$labels['size'] = 'அளவு';
+$labels['followupto'] = 'Followup-To';
+$labels['date']    = 'தேதி';
+$labels['size']    = 'அளவு';
 $labels['priority'] = 'முக்கியத்துவம்';
 $labels['organization'] = 'நிறுவனம்';
+$labels['readstatus'] = 'Read status';
+$labels['listoptions'] = 'List options...';
+
 $labels['mailboxlist'] = 'அடைவுகள்';
-$labels['folders'] = 'அடைவுகள்';
 $labels['messagesfromto'] = 'செய்திகள் $countல் $from லிருந்து $to வரை';
+$labels['threadsfromto'] = 'Threads $from to $to of $count';
 $labels['messagenrof'] = '$countல் $nr வது செய்தி';
-$labels['copy'] = 'நகல்';
-$labels['moveto'] = 'இதற்கு அனுப்பு...';
+$labels['fromtoshort'] = '$from – $to of $count';
+
+$labels['copy']     = 'நகல்';
+$labels['move']     = 'Move';
+$labels['moveto']   = 'இதற்கு அனுப்பு...';
 $labels['download'] = 'பதிவிறக்கு';
+$labels['open']     = 'Open';
+$labels['showattachment'] = 'Show';
+$labels['showanyway'] = 'Show it anyway';
+
 $labels['filename'] = 'கோப்பு பெயர்';
 $labels['filesize'] = 'கோப்பு அளவு';
+
 $labels['addtoaddressbook'] = 'தொடர்புகளுக்கு சேர்க்கவும்';
+
+// weekdays short
 $labels['sun'] = 'ஞாயிறு';
 $labels['mon'] = 'திங்கள்';
 $labels['tue'] = 'செவ்வாய்';
@@ -55,161 +81,328 @@ $labels['wed'] = 'புதன்';
 $labels['thu'] = 'வியாழன்';
 $labels['fri'] = 'வெள்ளி';
 $labels['sat'] = 'சனி';
-$labels['sunday'] = 'ஞாயிறு';
-$labels['monday'] = 'திங்கள்';
-$labels['tuesday'] = 'செவ்வாய்';
+
+// weekdays long
+$labels['sunday']    = 'ஞாயிறு';
+$labels['monday']    = 'திங்கள்';
+$labels['tuesday']   = 'செவ்வாய்';
 $labels['wednesday'] = 'புதன்';
-$labels['thursday'] = 'வியாழன்';
-$labels['friday'] = 'வெள்ளி';
-$labels['saturday'] = 'சனி';
-$labels['jan'] = 'சனவரி';
-$labels['feb'] = 'பிப்ரவரி';
-$labels['mar'] = 'மார்ச்';
-$labels['apr'] = 'ஏப்ரல்';
-$labels['may'] = 'மே';
-$labels['longmay'] = 'மே';
-$labels['jun'] = 'சூன்';
-$labels['jul'] = 'சூலை';
-$labels['aug'] = 'ஆகஸ்ட்';
-$labels['sep'] = 'செப்டம்பர்';
-$labels['oct'] = 'அக்டோபர்';
-$labels['nov'] = 'நவம்பர்';
-$labels['dec'] = 'டிசம்பர்';
-$labels['longjan'] = 'சனவரி';
-$labels['longfeb'] = 'பிப்ரவரி';
-$labels['longmar'] = 'மார்ச்';
-$labels['longapr'] = 'ஏப்ரல்';
-$labels['longjun'] = 'சூன்';
-$labels['longjul'] = 'சூலை';
-$labels['longaug'] = 'ஆகஸ்ட்';
-$labels['longsep'] = 'செப்டம்பர்';
-$labels['longoct'] = 'அக்டோபர்';
-$labels['longnov'] = 'நவம்பர்';
-$labels['longdec'] = 'டிசம்பர்';
+$labels['thursday']  = 'வியாழன்';
+$labels['friday']    = 'வெள்ளி';
+$labels['saturday']  = 'சனி';
+
+// months short
+$labels['jan']	= 'சனவரி';
+$labels['feb']	= 'பிப்ரவரி';
+$labels['mar']	= 'மார்ச்';
+$labels['apr']	= 'ஏப்ரல்';
+$labels['may']	= 'மே';
+$labels['jun']	= 'சூன்';
+$labels['jul'] 	= 'சூலை';
+$labels['aug']	= 'ஆகஸ்ட்';
+$labels['sep']	= 'செப்டம்பர்';
+$labels['oct']	= 'அக்டோபர்';
+$labels['nov']	= 'நவம்பர்';
+$labels['dec']	= 'டிசம்பர்';
+
+// months long
+$labels['longjan']	= 'சனவரி';
+$labels['longfeb']	= 'பிப்ரவரி';
+$labels['longmar']	= 'மார்ச்';
+$labels['longapr']	= 'ஏப்ரல்';
+$labels['longmay']	= 'மே';
+$labels['longjun']	= 'சூன்';
+$labels['longjul']	= 'சூலை';
+$labels['longaug']	= 'ஆகஸ்ட்';
+$labels['longsep']	= 'செப்டம்பர்';
+$labels['longoct']	= 'அக்டோபர்';
+$labels['longnov']	= 'நவம்பர்';
+$labels['longdec']	= 'டிசம்பர்';
+
 $labels['today'] = 'இன்று';
-$labels['checkmail'] = 'புது அஞ்சல்களை பார்க்கவும்';
-$labels['compose'] = 'அஞ்சல் எழுது';
-$labels['writenewmessage'] = 'புது அஞ்சல் எழுதவும்';
-$labels['replytomessage'] = 'அனுப்புனருக்கு பதிலளி';
+
+// toolbar buttons
+$labels['refresh']          = 'Refresh';
+$labels['checkmail']        = 'புது அஞ்சல்களை பார்க்கவும்';
+$labels['compose']          = 'அஞ்சல் எழுது';
+$labels['writenewmessage']  = 'புது அஞ்சல் எழுதவும்';
+$labels['reply']            = 'Reply';
+$labels['replytomessage']   = 'அனுப்புனருக்கு பதிலளி';
 $labels['replytoallmessage'] = 'அனுப்புனர் மற்றும் எல்லா பெறுனர்களுக்கும் பதிலளி';
-$labels['forwardmessage'] = 'செய்தியை முன்அனுப்பு';
-$labels['deletemessage'] = 'செய்தியை நீக்கு';
+$labels['replyall']         = 'Reply all';
+$labels['replylist']        = 'Reply list';
+$labels['forward']          = 'Forward';
+$labels['forwardinline']    = 'Forward inline';
+$labels['forwardattachment'] = 'Forward as attachment';
+$labels['forwardmessage']   = 'செய்தியை முன்அனுப்பு';
+$labels['deletemessage']    = 'செய்தியை நீக்கு';
 $labels['movemessagetotrash'] = 'செய்தியை குப்பைக்கு நகர்த்து';
-$labels['printmessage'] = 'செய்தியை அச்சிடவும்';
-$labels['previousmessage'] = 'முந்திய செய்தியை காட்டவும்';
-$labels['firstmessage'] = 'முதல் செய்தியை காட்டவும்';
-$labels['nextmessage'] = 'அடுத்த செய்தியை காட்டு';
-$labels['lastmessage'] = 'கடைசி செய்தியை காட்டு';
-$labels['backtolist'] = 'செய்தி பட்டியலுக்கு செல்லவும்';
-$labels['viewsource'] = 'மூலத்தை காட்டு';
-$labels['markmessages'] = 'செய்திகளை குறியிடு';
-$labels['markread'] = 'படித்ததாக குறியிடு';
-$labels['markunread'] = 'படிக்காததாக குறியிடு';
-$labels['markflagged'] = 'நட்சத்திரமிட்டதாக குறியிடு';
-$labels['markunflagged'] = 'நட்சத்திரமிடாததாக குறியிடு';
+$labels['printmessage']     = 'செய்தியை அச்சிடவும்';
+$labels['previousmessage']  = 'முந்திய செய்தியை காட்டவும்';
+$labels['firstmessage']     = 'முதல் செய்தியை காட்டவும்';
+$labels['nextmessage']      = 'அடுத்த செய்தியை காட்டு';
+$labels['lastmessage']      = 'கடைசி செய்தியை காட்டு';
+$labels['backtolist']       = 'செய்தி பட்டியலுக்கு செல்லவும்';
+$labels['viewsource']       = 'மூலத்தை காட்டு';
+$labels['mark']             = 'Mark';
+$labels['markmessages']     = 'செய்திகளை குறியிடு';
+$labels['markread']         = 'படித்ததாக குறியிடு';
+$labels['markunread']       = 'படிக்காததாக குறியிடு';
+$labels['markflagged']      = 'நட்சத்திரமிட்டதாக குறியிடு';
+$labels['markunflagged']    = 'நட்சத்திரமிடாததாக குறியிடு';
+$labels['moreactions']      = 'More actions...';
+$labels['more']             = 'More';
+$labels['back']             = 'Back';
+$labels['options']          = 'Options';
+
 $labels['select'] = 'தேர்ந்தெடு';
 $labels['all'] = 'எல்லாம்';
 $labels['none'] = 'எதுவுமில்லை';
-$labels['nonesort'] = 'எதுவுமில்லை';
+$labels['currpage'] = 'Current page';
 $labels['unread'] = 'படிக்காதது';
 $labels['flagged'] = 'நட்சத்திரமிட்டது';
 $labels['unanswered'] = 'பதிலளிக்காதது';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'நீக்கியது';
+$labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'தலைகீழ்';
 $labels['filter'] = 'வடிப்பான்';
+$labels['list'] = 'List';
+$labels['threads'] = 'Threads';
+$labels['expand-all'] = 'Expand All';
+$labels['expand-unread'] = 'Expand Unread';
+$labels['collapse-all'] = 'Collapse All';
+$labels['threaded'] = 'Threaded';
+
+$labels['autoexpand_threads'] = 'Expand message threads';
+$labels['do_expand'] = 'all threads';
+$labels['expand_only_unread'] = 'only with unread messages';
+$labels['fromto'] = 'From/To';
+$labels['flag'] = 'Flag';
+$labels['attachment'] = 'Attachment';
+$labels['nonesort'] = 'எதுவுமில்லை';
+$labels['sentdate'] = 'Sent date';
+$labels['arrival'] = 'Arrival date';
+$labels['asc'] = 'ascending';
+$labels['desc'] = 'descending';
+$labels['listcolumns'] = 'List columns';
+$labels['listsorting'] = 'Sorting column';
+$labels['listorder'] = 'Sorting order';
+$labels['listmode'] = 'List view mode';
+
+$labels['folderactions'] = 'Folder actions...';
 $labels['compact'] = 'குறுகிய';
 $labels['empty'] = 'காலி';
+
 $labels['quota'] = 'பயன்பாட்டு அளவு';
-$labels['unknown'] = 'தெரியாத';
-$labels['unlimited'] = 'அளவில்லா';
-$labels['quicksearch'] = 'விரைவு தேடல்';
-$labels['resetsearch'] = 'தேடலை மறுஅமை';
-$labels['searchmod'] = 'மாற்றிகளை தேடு';
-$labels['msgtext'] = 'முழு செய்தி';
+$labels['unknown']  = 'தெரியாத';
+$labels['unlimited']  = 'அளவில்லா';
+
+$labels['quicksearch']  = 'விரைவு தேடல்';
+$labels['resetsearch']  = 'தேடலை மறுஅமை';
+$labels['searchmod']  = 'மாற்றிகளை தேடு';
+$labels['msgtext']  = 'முழு செய்தி';
+$labels['body']  = 'Body';
+
 $labels['openinextwin'] = 'புது சாளரத்தில் திற';
 $labels['emlsave'] = 'பதிவிறக்கு (.eml)';
-$labels['editasnew'] = 'புதியதாக திருத்து';
-$labels['sendmessage'] = 'இப்போது அனுப்பு';
-$labels['savemessage'] = 'இந்த வரைவை சேமி';
-$labels['addattachment'] = 'ஒரு கோப்பை இணைக்கவும்';
-$labels['charset'] = 'எழுத்து குறிமுறை';
-$labels['editortype'] = 'திருத்தும் வகை';
-$labels['returnreceipt'] = 'திரும்பு சீட்டு';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
+
+// message compose
+$labels['editasnew']      = 'புதியதாக திருத்து';
+$labels['send']           = 'Send';
+$labels['sendmessage']    = 'இப்போது அனுப்பு';
+$labels['savemessage']    = 'இந்த வரைவை சேமி';
+$labels['addattachment']  = 'ஒரு கோப்பை இணைக்கவும்';
+$labels['charset']        = 'எழுத்து குறிமுறை';
+$labels['editortype']     = 'திருத்தும் வகை';
+$labels['returnreceipt']  = 'திரும்பு சீட்டு';
+$labels['dsn']            = 'Delivery status notification';
+$labels['mailreplyintro'] = 'On $date, $sender wrote:';
+$labels['originalmessage'] = 'Original Message';
+
+$labels['editidents']    = 'Edit identities';
+$labels['spellcheck']    = 'Spell';
 $labels['checkspelling'] = 'எழுத்துப்பிழை சரிபார்';
 $labels['resumeediting'] = 'திருத்துவதை தொடரவும்';
-$labels['revertto'] = 'முந்திய நிலைக்கு திரும்பவும்';
+$labels['revertto']      = 'முந்திய நிலைக்கு திரும்பவும்';
+
+$labels['attach'] = 'Attach';
 $labels['attachments'] = 'கோப்பு இணைப்புகள்';
 $labels['upload'] = 'பதிவேற்று';
-$labels['close'] = 'மூடு';
-$labels['low'] = 'குறைந்த';
-$labels['lowest'] = 'மிக குறைந்த';
-$labels['normal'] = 'சாதாரண';
-$labels['high'] = 'அதிக';
+$labels['uploadprogress'] = '$percent ($current from $total)';
+$labels['close']  = 'மூடு';
+$labels['messageoptions']  = 'Message options...';
+
+$labels['low']     = 'குறைந்த';
+$labels['lowest']  = 'மிக குறைந்த';
+$labels['normal']  = 'சாதாரண';
+$labels['high']    = 'அதிக';
 $labels['highest'] = 'மிக அதிக';
-$labels['nosubject'] = '(தலைப்பில்லா)';
+
+$labels['nosubject']  = '(தலைப்பில்லா)';
 $labels['showimages'] = 'படங்களை காட்டு';
 $labels['alwaysshow'] = '$-னிடமிருந்து வரும் படங்களை காட்டு';
+$labels['isdraft']    = 'This is a draft message.';
+$labels['andnmore']   = '$nr more...';
+$labels['togglemoreheaders'] = 'Show more message headers';
+$labels['togglefullheaders'] = 'Toggle raw message headers';
+
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'எளிய உரை';
 $labels['savesentmessagein'] = 'அனுப்பிய அஞ்சலை இங்கு சேமிக்கவும்';
 $labels['dontsave'] = 'சேமிக்காதே';
 $labels['maxuploadsize'] = 'அனுமதிக்கப்படும் அதிகபட்ச கோப்பு அளவு $';
+
 $labels['addcc'] = 'நகல் சேர்';
 $labels['addbcc'] = 'மறை நகல் சேர்';
 $labels['addreplyto'] = 'பதிலளிக்க வேண்டியவர்களை சேர்';
+$labels['addfollowupto'] = 'Add Followup-To';
+
+// mdn
 $labels['mdnrequest'] = 'இந்த செய்தியின் அனுப்புனர் இதை படித்தவுடன் அறிவிக்கும்படி கேட்டார். அறிவிக்க விரும்புகிறீர்களா ?';
 $labels['receiptread'] = 'திரும்பு சீட்டு (படி)';
 $labels['yourmessage'] = 'இது உங்கள் செய்தியின் திரும்பு சீட்டு';
 $labels['receiptnote'] = 'குறிப்பு: இந்த ஒப்புகை பெறுனரிடம் செய்தியை காட்டியதற்காக வருகிறது. அவர் அதை படித்ததற்கு எந்த உத்திரவாதமும் இல்லை';
-$labels['name'] = 'காட்சி பெயர்';
-$labels['firstname'] = 'முதற் பெயர்';
-$labels['surname'] = 'கடைசி பெயர்';
-$labels['email'] = 'மின்னஞ்சல்';
+
+// address boook
+$labels['name']         = 'காட்சி பெயர்';
+$labels['firstname']    = 'முதற் பெயர்';
+$labels['surname']      = 'கடைசி பெயர்';
+$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['email']        = 'மின்னஞ்சல்';
+$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['typepager']  = 'Pager';
+$labels['typevideo']  = 'Video';
+$labels['typeassistant']  = 'Assistant';
+$labels['typehomepage']  = 'Home Page';
+$labels['typeblog'] = 'Blog';
+$labels['typeprofile'] = 'Profile';
+
+$labels['addfield'] = 'Add field...';
 $labels['addcontact'] = 'புது தொடர்பை சேர்';
 $labels['editcontact'] = 'தொடர்பை திருத்து';
-$labels['edit'] = 'திருத்து';
+$labels['contacts'] = 'Contacts';
+$labels['contactproperties'] = 'Contact properties';
+$labels['personalinfo'] = 'Personal information';
+
+$labels['edit']   = 'திருத்து';
 $labels['cancel'] = 'ரத்து';
-$labels['save'] = 'சேமி';
+$labels['save']   = 'சேமி';
 $labels['delete'] = 'நீக்கு';
-$labels['newcontact'] = 'புது தொடர்பு அட்டையை உருவாக்கு';
-$labels['deletecontact'] = 'தேர்ந்தெடுத்த தொடர்புகளை நீக்கு';
-$labels['composeto'] = 'இவர்-கு அஞ்சல் எழுது';
+$labels['rename'] = 'Rename';
+$labels['addphoto'] = 'Add';
+$labels['replacephoto'] = 'Replace';
+$labels['uploadphoto'] = 'Upload photo';
+
+$labels['newcontact']     = 'புது தொடர்பு அட்டையை உருவாக்கு';
+$labels['deletecontact']  = 'தேர்ந்தெடுத்த தொடர்புகளை நீக்கு';
+$labels['composeto']      = 'இவர்-கு அஞ்சல் எழுது';
 $labels['contactsfromto'] = 'தொடர்புகள் $countல் $from லிருந்து $to வரை';
-$labels['print'] = 'அச்சிடு';
-$labels['export'] = 'ஏற்றுமதி';
-$labels['exportvcards'] = 'தொடர்புகளை vCard வடிவத்தில் ஏற்றுமதி செய்யவும்';
-$labels['previouspage'] = 'முந்திய குழுவை காட்டு';
-$labels['firstpage'] = 'முதல் குழுவை காட்டு';
-$labels['nextpage'] = 'அடுத்த குழுவை காட்டு';
-$labels['lastpage'] = 'கடைசி குழுவை காட்டு';
+$labels['print']          = 'அச்சிடு';
+$labels['export']         = 'ஏற்றுமதி';
+$labels['exportall']      = 'Export all';
+$labels['exportsel']      = 'Export selected';
+$labels['exportvcards']   = 'தொடர்புகளை vCard வடிவத்தில் ஏற்றுமதி செய்யவும்';
+$labels['newcontactgroup'] = 'Create new contact group';
+$labels['grouprename']    = 'Rename group';
+$labels['groupdelete']    = 'Delete group';
+$labels['groupremoveselected'] = 'Remove selected contacts from group';
+
+$labels['previouspage']   = 'முந்திய குழுவை காட்டு';
+$labels['firstpage']      = 'முதல் குழுவை காட்டு';
+$labels['nextpage']       = 'அடுத்த குழுவை காட்டு';
+$labels['lastpage']       = 'கடைசி குழுவை காட்டு';
+
+$labels['group'] = 'Group';
 $labels['groups'] = 'குழுக்கள்';
 $labels['personaladrbook'] = 'சுய முகவரி';
+
+$labels['searchsave'] = 'Save search';
+$labels['searchdelete'] = 'Delete search';
+
 $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['done'] = 'முடிந்தது';
+
+// settings
 $labels['settingsfor'] = 'இதற்கான அமைப்புகள்';
+$labels['about'] = 'About';
 $labels['preferences'] = 'விருப்பங்கள்';
 $labels['userpreferences'] = 'பயனர் விருப்பங்கள்';
 $labels['editpreferences'] = 'பயனர் விருப்பங்களை திருத்து';
+
 $labels['identities'] = 'அடையாளங்கள்';
 $labels['manageidentities'] = 'இந்த கணக்கிற்கான அடையாளங்களை நிற்வாகிக்கவும்';
 $labels['newidentity'] = 'புது அடையாளம்';
+
 $labels['newitem'] = 'புது உருப்படி';
 $labels['edititem'] = 'உருப்படியை திருத்து';
+
 $labels['preferhtml'] = 'HTML காட்டு';
+$labels['defaultcharset'] = 'Default Character Set';
 $labels['htmlmessage'] = 'HTML செய்தி';
+$labels['messagepart'] = 'Part';
+$labels['digitalsig'] = 'Digital Signature';
+$labels['dateformat'] = 'Date format';
+$labels['timeformat'] = 'Time format';
 $labels['prettydate'] = 'நல்ல தேதி';
-$labels['setdefault'] = 'இயல்பை அமை';
-$labels['autodetect'] = 'தானியங்கி';
-$labels['language'] = 'மொழி';
-$labels['timezone'] = 'நேர மண்டலம்';
-$labels['pagesize'] = 'ஒரு பக்கத்திற்கான வரிகள்';
+$labels['setdefault']  = 'இயல்பை அமை';
+$labels['autodetect']  = 'தானியங்கி';
+$labels['language']  = 'மொழி';
+$labels['timezone']  = 'நேர மண்டலம்';
+$labels['pagesize']  = 'ஒரு பக்கத்திற்கான வரிகள்';
 $labels['signature'] = 'கையொப்பம்';
-$labels['dstactive'] = 'பகல் ஒளி சேமிப்பு நேரம்';
+$labels['dstactive']  = 'பகல் ஒளி சேமிப்பு நேரம்';
+$labels['showinextwin'] = 'Open message in a new window';
+$labels['composeextwin'] = 'Compose in a new window';
 $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'] = 'வெளியேறும் போது குப்பையை காலி செய்';
@@ -220,56 +413,126 @@ $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'] = 'If moving messages to Trash fails, delete them';
+$labels['deletejunk'] = 'Directly delete messages in Junk';
 $labels['showremoteimages'] = 'தொலை தூர துணை படங்களை காட்டு';
 $labels['fromknownsenders'] = 'தெரிந்த அனுப்புனரிடமிருந்து';
 $labels['always'] = 'எப்போதும்';
 $labels['showinlineimages'] = 'இணைத்த படங்களை செய்திகளுக்கு கீழே காட்டவும்';
-$labels['autosavedraft'] = 'தானாக வரைவுகளை சேமி';
-$labels['everynminutes'] = 'ஒவ்வொரு $n நிமிடங்களுக்கும்';
-$labels['never'] = 'எப்போதுமில்லை';
+$labels['autosavedraft']  = 'தானாக வரைவுகளை சேமி';
+$labels['everynminutes']  = 'ஒவ்வொரு $n நிமிடங்களுக்கும்';
+$labels['refreshinterval']  = 'Refresh (check for new messages, etc.)';
+$labels['never']  = 'எப்போதுமில்லை';
+$labels['immediately']  = 'immediately';
 $labels['messagesdisplaying'] = 'செய்திகளை காட்டுகிறது';
 $labels['messagescomposition'] = 'செய்திகளை எழுதுகிறது';
 $labels['mimeparamfolding'] = 'இணைப்பு பெயர்கள்';
 $labels['2231folding'] = 'முழு RFC 2231 (Thunderbird)';
 $labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
 $labels['2047folding'] = 'முழு RFC 2047 (மற்ற)';
+$labels['force7bit'] = 'Use MIME encoding for 8-bit characters';
 $labels['advancedoptions'] = 'மேம்பட்ட விருப்பங்கள்';
 $labels['focusonnewmessage'] = 'உலாவி சாளரத்தை புது செய்திக்காக கவனி';
 $labels['checkallfolders'] = 'புது செய்திகளுக்காக எல்லா அடைவுகளையும் சரிபார்';
 $labels['displaynext'] = 'செய்தியை நீக்கு/நகர் பிறகு அடுத்த செய்தியை காட்டு';
+$labels['defaultfont'] = 'Default font of HTML message';
 $labels['mainoptions'] = 'முக்கிய விருப்பங்கள்';
+$labels['browseroptions'] = 'Browser Options';
 $labels['section'] = 'பிரிவு';
 $labels['maintenance'] = 'பராமரிப்பு';
 $labels['newmessage'] = 'புது செய்தி';
 $labels['signatureoptions'] = 'கையொப்ப விருப்பங்கள்';
 $labels['whenreplying'] = 'பதிலளிக்கும் போது';
+$labels['replyempty'] = 'do not quote the original message';
 $labels['replytopposting'] = 'புது செய்தியை அசலின் மேல் துவக்கு';
 $labels['replybottomposting'] = 'புது செய்தியை அசலின் கீழ் துவக்கு';
 $labels['replyremovesignature'] = 'பதிலளிக்கும் போது அசல் கையெழுத்தை செய்தியிலிருந்து நீக்கவும்';
 $labels['autoaddsignature'] = 'தானாக கையொப்பத்தை சேர்';
 $labels['newmessageonly'] = 'புது செய்தி மட்டும்';
 $labels['replyandforwardonly'] = 'பதிலளிப்பு முன்அனுப்பு மட்டும்';
-$labels['replysignaturepos'] = 'பதிலளிக்கும் போதும் முன்அனுப்பும் போதும் கையோப்பமிடு';
-$labels['belowquote'] = 'மேற்கோளுக்கு கீழே';
-$labels['abovequote'] = 'மேற்கோளுக்கு மேலே';
 $labels['insertsignature'] = 'கையோப்பமிடு';
-$labels['folder'] = 'அடைவு';
-$labels['foldername'] = 'அடைவு பெயர்';
-$labels['subscribed'] = 'சந்தா';
+$labels['previewpanemarkread']  = 'Mark previewed messages as read';
+$labels['afternseconds']  = 'after $n seconds';
+$labels['reqmdn'] = 'Always request a return receipt';
+$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'] = 'Check spelling before sending a message';
+$labels['spellcheckoptions'] = 'Spellcheck Options';
+$labels['spellcheckignoresyms'] = 'Ignore words with symbols';
+$labels['spellcheckignorenums'] = 'Ignore words with numbers';
+$labels['spellcheckignorecaps'] = 'Ignore words with all letters capitalized';
+$labels['addtodict'] = 'Add to dictionary';
+$labels['mailtoprotohandler'] = 'Register protocol handler for mailto: links';
+$labels['forwardmode'] = 'Messages forwarding';
+$labels['inline'] = 'inline';
+$labels['asattachment'] = 'as attachment';
+
+$labels['folder']  = 'அடைவு';
+$labels['folders']  = 'அடைவுகள்';
+$labels['foldername']  = 'அடைவு பெயர்';
+$labels['subscribed']  = 'சந்தா';
 $labels['messagecount'] = 'செய்திகள்';
-$labels['create'] = 'உருவாக்கு';
-$labels['createfolder'] = 'புது அடைவு உருவாக்கு';
-$labels['managefolders'] = 'அடைவுகளை நிற்வகி';
+$labels['create']  = 'உருவாக்கு';
+$labels['createfolder']  = 'புது அடைவு உருவாக்கு';
+$labels['managefolders']  = 'அடைவுகளை நிற்வகி';
 $labels['specialfolders'] = 'சிறப்பு அடைவுகள்';
+$labels['properties'] = 'Properties';
+$labels['folderproperties'] = 'Folder properties';
+$labels['parentfolder'] = 'Parent folder';
+$labels['location'] = 'Location';
+$labels['info'] = 'Information';
+$labels['getfoldersize'] = 'Click to get folder size';
+$labels['changesubscription'] = 'Click to change subscription';
+$labels['foldertype'] = 'Folder Type';
+$labels['personalfolder']  = 'Private Folder';
+$labels['otherfolder']  = 'Other User\'s Folder';
+$labels['sharedfolder']  = 'Public Folder';
+
 $labels['sortby'] = 'வாரியாக அடுக்கு';
-$labels['sortasc'] = 'ஏறு வரிசையாக அடுக்கு';
+$labels['sortasc']  = 'ஏறு வரிசையாக அடுக்கு';
 $labels['sortdesc'] = 'இறங்கு வரிசையாக அடுக்கு';
+$labels['undo'] = 'Undo';
+
+$labels['installedplugins'] = 'Installed plugins';
+$labels['plugin'] = 'Plugin';
+$labels['version'] = 'Version';
+$labels['source'] = 'Source';
+$labels['license'] = 'License';
+$labels['support'] = 'Get support';
+
+// units
 $labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
 $labels['GB'] = 'GB';
 
+// character sets
+$labels['unicode'] = 'Unicode';
+$labels['english'] = '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['turkish'] = 'Turkish';
+$labels['nordic'] = 'Nordic';
+$labels['thai'] = 'Thai';
+$labels['celtic'] = 'Celtic';
+$labels['vietnamese'] = 'Vietnamese';
+$labels['japanese'] = 'Japanese';
+$labels['korean'] = 'Korean';
+$labels['chinese'] = 'Chinese';
+
+?>
diff --git a/program/localization/ta_IN/messages.inc b/program/localization/ta_IN/messages.inc
index 7322542c2..65e611f88 100644
--- a/program/localization/ta_IN/messages.inc
+++ b/program/localization/ta_IN/messages.inc
@@ -2,30 +2,43 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ta_IN/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['loginfailed'] = 'நுழைவு தோல்வியடைந்தது';
+$messages['errortitle']  = 'An error occurred!';
+$messages['loginfailed']  = 'நுழைவு தோல்வியடைந்தது';
 $messages['cookiesdisabled'] = 'உங்கள் உலாவி நினைவிகளை அனுமதிப்பதில்லை';
 $messages['sessionerror'] = 'உங்கள் அமர்வு செல்லாது அல்லது முடிவுற்றது';
 $messages['storageerror'] = 'IMAP சேவையகத்திற்கான இணைப்பு தோல்வியடைந்தது';
 $messages['servererror'] = 'சேவையக பிழை!';
+$messages['servererrormsg'] = 'Server Error: $msg';
+$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'] = 'இந்த தபால் பெட்டியில் எந்த தரவும் சேமிக்கப்படவில்லை';
 $messages['loggedout'] = 'நீங்கள் அமர்வை வெற்றிகரமாக முடித்தீர்கள். வணக்கம்';
 $messages['mailboxempty'] = 'தபால் பெட்டி காலியாக உள்ளது';
+$messages['refreshing'] = 'Refreshing...';
 $messages['loading'] = 'ஏற்றுகிறது...';
 $messages['uploading'] = 'கோப்பை ஏற்றுகிறது...';
+$messages['uploadingmany'] = 'Uploading files...';
 $messages['loadingdata'] = 'தரவை ஏற்றுகிறது...';
 $messages['checkingmail'] = 'புது செய்திகளை சரிபார்க்கிறது...';
 $messages['sendingmessage'] = 'செய்தியை அனுப்புகிறது...';
@@ -35,41 +48,54 @@ $messages['messagesaved'] = 'செய்தி வரைவில் சேம�
 $messages['successfullysaved'] = 'வெற்றிகரமாக சேமிக்கப்பட்டது';
 $messages['addedsuccessfully'] = 'தொடர்பு சேமிக்கப்பட்டது';
 $messages['contactexists'] = 'இந்த மின்னஞ்சல் முகவரியுடன் ஒரு தொடர்பு ஏற்கனவே உள்ளது';
+$messages['contactnameexists'] = 'A contact with the same name already exists.';
 $messages['blockedimages'] = 'உங்கள் தனிப்பட்ட தகவலை பாதுகாக்க, தொலை தூரப் படங்கள் இந்த செய்தியில் தடுக்கப்பட்டது';
 $messages['encryptedmessage'] = 'மன்னிக்கவும்! இந்த செய்தி குறிமுறையாக்கப்பட்டது அதனால் காட்ட முடியாது.';
 $messages['nocontactsfound'] = 'எந்த தொடர்புகளும் காணப்படவில்லை';
 $messages['contactnotfound'] = 'நீங்கள் வேண்டிய தொடர்பு காணப்படவில்லை';
+$messages['contactsearchonly'] = 'Enter some search terms to find contacts';
 $messages['sendingfailed'] = 'செய்தி அனுப்புவது தோல்வியுற்றது';
 $messages['senttooquickly'] = 'இந்த செய்தி அனுப்புவதற்கு முன்பு தயவு செய்து $sec வினாடி(கள்) காத்திருக்கவும்.';
 $messages['errorsavingsent'] = 'அனுப்பிய அஞ்சலை சேமிக்கும் போது பிழை ஏற்பட்டது';
 $messages['errorsaving'] = 'சேமிக்கும் போது பிழை ஏற்பட்டது';
 $messages['errormoving'] = 'செய்தியை நகர்த்த முடியவில்லை';
+$messages['errorcopying'] = 'Could not copy the message(s).';
 $messages['errordeleting'] = 'செய்தியை நீக்க முடியவில்லை';
 $messages['errormarking'] = 'செய்தியை நட்சத்திரமிட முடியவில்லை';
-$messages['deletecontactconfirm'] = 'நீங்கள் தேர்ந்தெடுத்த தொடர்புகளை நீக்க விரும்புகிறீர்களா ?';
+$messages['deletecontactconfirm']  = 'நீங்கள் தேர்ந்தெடுத்த தொடர்புகளை நீக்க விரும்புகிறீர்களா ?';
+$messages['deletegroupconfirm']  = 'Do you really want to delete selected group?';
 $messages['deletemessagesconfirm'] = 'நீங்கள் தேர்ந்தெடுத்த செய்திகளை நீக்க விரும்புகிறீர்களா ?';
-$messages['deletefolderconfirm'] = 'நீங்கள் இந்த அடைவை நீக்க விரும்புகிறீர்களா ?';
-$messages['purgefolderconfirm'] = 'நீங்கள் இந்த அடைவிலிருக்கும் எல்லா செய்திகளையும் நீக்க விரும்புகிறீர்களா ?';
+$messages['deletefolderconfirm']  = 'நீங்கள் இந்த அடைவை நீக்க விரும்புகிறீர்களா ?';
+$messages['purgefolderconfirm']  = 'நீங்கள் இந்த அடைவிலிருக்கும் எல்லா செய்திகளையும் நீக்க விரும்புகிறீர்களா ?';
+$messages['contactdeleting'] = 'Deleting contact(s)...';
+$messages['groupdeleting'] = 'Deleting group...';
 $messages['folderdeleting'] = 'அடைவை நீக்குகிறது...';
 $messages['foldermoving'] = 'அடைவை நகர்த்துகிறது...';
+$messages['foldersubscribing'] = 'Subscribing folder...';
+$messages['folderunsubscribing'] = 'Unsubscribing folder...';
 $messages['formincomplete'] = 'விண்ணப்பத்தை முழுமையாக நிறைவு செய்யவில்லை';
 $messages['noemailwarning'] = 'தயவு செய்து உண்மையான மின்னஞ்சலை எழுதுங்கள்';
-$messages['nonamewarning'] = 'தயவு செய்து பெயரை எழுதுங்கள்';
+$messages['nonamewarning']  = 'தயவு செய்து பெயரை எழுதுங்கள்';
 $messages['nopagesizewarning'] = 'தயவு செய்து தாழின் அளவை எழுதுங்கள்';
 $messages['nosenderwarning'] = 'தயவு செய்து ஒரு அனுப்புனரின் மின்னஞ்சல் முகவரியாவது எழுதுங்கள்';
 $messages['norecipientwarning'] = 'தயவு செய்து ஒரு பெறுனரையாவது எழுதுங்கள்';
-$messages['nosubjectwarning'] = 'தலைப்பு காலியாக உள்ளது. இப்போது எழுத விரும்புகிறீர்களா?';
+$messages['nosubjectwarning']  = 'தலைப்பு காலியாக உள்ளது. இப்போது எழுத விரும்புகிறீர்களா?';
 $messages['nobodywarning'] = 'உரையில்லாமல் இந்த செய்தியை அனுப்ப வேண்டுமா?';
 $messages['notsentwarning'] = 'செய்தி அனுப்பப்படவில்லை. உங்கள் செய்தியை நிராகரிக்க விரும்புகிறீர்களா?';
 $messages['noldapserver'] = 'தயவு செய்து தேடுவதற்கு Idap சேவையகத்தை தேர்ந்தெடுங்கள்';
 $messages['nosearchname'] = 'தயவு செய்து தொடர்பின் பெயரோ மின்னஞ்சல் முகவரியோ எழுதுங்கள்';
 $messages['notuploadedwarning'] = 'எல்லா இணைப்புகளும் ஏற்றப்படவில்லை. தயவு செய்து காத்திருங்கள் அல்லது ஏற்றத்தை ரத்து செய்யுங்கள்.';
 $messages['searchsuccessful'] = '$nr செய்திகள் கண்டுபிடிக்கப்பட்டது';
+$messages['contactsearchsuccessful'] = '$nr contacts found.';
 $messages['searchnomatch'] = 'தேடுதல் எந்த பொருத்தத்தையும் அனுப்பவில்லை';
 $messages['searching'] = 'தேடுகிறது...';
 $messages['checking'] = 'சரி பார்க்கிறது...';
 $messages['nospellerrors'] = 'எழுத்து பிழைகள் இல்லை';
 $messages['folderdeleted'] = 'அடைவு வெற்றிகரமாக நீக்கப்பட்டது';
+$messages['foldersubscribed'] = 'Folder successfully subscribed.';
+$messages['folderunsubscribed'] = 'Folder successfully unsubscribed.';
+$messages['folderpurged'] = 'Folder has successfully been emptied.';
+$messages['folderexpunged'] = 'Folder has successfully been compacted.';
 $messages['deletedsuccessfully'] = 'வெற்றிகரமாக நீக்கப்பட்டது';
 $messages['converting'] = 'வடிவத்தை நீக்குகிறது...';
 $messages['messageopenerror'] = 'சேவையகத்திலிருந்து செய்தியை ஏற்ற முடியவில்லை';
@@ -80,15 +106,26 @@ $messages['copyerror'] = 'எந்த முகவரியையும் ந�
 $messages['sourceisreadonly'] = 'இந்த முகவரியின் மூலத்தை படிக்க மட்டும்தான் முடியும்';
 $messages['errorsavingcontact'] = 'தொடர்பு முகவரியை சேமிக்க முடியவில்லை';
 $messages['movingmessage'] = 'செய்தியை நகர்த்துகிறது...';
+$messages['copyingmessage'] = 'Copying message(s)...';
+$messages['copyingcontact'] = 'Copying contact(s)...';
+$messages['deletingmessage'] = 'Deleting message(s)...';
+$messages['markingmessage'] = 'Marking message(s)...';
+$messages['addingmember'] = 'Adding contact(s) to the group...';
+$messages['removingmember'] = 'Removing contact(s) from the group...';
 $messages['receiptsent'] = 'படித்த சீட்டு வெற்றிகரமாக அனுப்பப்பட்டது';
 $messages['errorsendingreceipt'] = 'சீட்டை அனுப்ப முடியவில்லை';
+$messages['deleteidentityconfirm'] = 'Do you really want to delete this identity?';
 $messages['nodeletelastidentity'] = 'நீங்கள் இந்த அடையாளத்தை நீக்க முடியாது இது தான் கடைசி';
 $messages['forbiddencharacter'] = 'அடைவு பெயரில் தடை செய்யப்பட்ட எழுத்துக்கள் உள்ளது';
 $messages['selectimportfile'] = 'தயவு செய்து ஏற்றுவதற்கு ஒரு கோப்பை தேர்ந்தெடுங்கள்';
 $messages['addresswriterror'] = 'நீங்கள் தேர்ந்தெடுத்த தொடர்புகளில் எழுத முடியாது';
+$messages['contactaddedtogroup'] = 'Successfully added the contacts to this group.';
+$messages['contactremovedfromgroup'] = 'Successfully removed contacts from this group.';
+$messages['nogroupassignmentschanged'] = 'No group assignments changed.';
 $messages['importwait'] = 'ஏற்றுகிறது, தயவு செய்து காத்திருங்கள்...';
-$messages['importerror'] = 'ஏற்றுவது தோல்வியடைந்தது! ஏற்றிய கோப்பு ஒரு செல்லுபடியாகும் vCard கோப்பு இல்லை';
+$messages['importformaterror'] = 'Import failed! The uploaded file is not a valid import data file.';
 $messages['importconfirm'] = '<b>வெற்றிகரமாக $inserted தொடர்புகள் ஏற்றப்பட்டது, ஏற்கனவே உள்ள $skipped தொடர்புகள் தவிர்க்கப்பட்டது</b>: <p><em>$names</em></p>';
+$messages['importconfirmskipped'] = '<b>Skipped $skipped existing entries</b>';
 $messages['opnotpermitted'] = 'பணி அனுமதிக்கப்படவில்லை!';
 $messages['nofromaddress'] = 'நீங்கள் தேர்ந்தெடுத்த அடையாளத்தில் மின்னஞ்சல் இல்லை';
 $messages['editorwarning'] = 'எளிய உரை திருத்திக்கு மாறுவதன் மூலம் எல்லா உரை வடிவங்களும் தொலைந்து போகக் கூடும். தொடர விரும்புகிறீர்களா ?';
@@ -100,4 +137,35 @@ $messages['smtptoerror'] = 'SMTP பிழை ($code): "$to" பெறுனர�
 $messages['smtprecipientserror'] = 'SMTP பிழை : பெறுனர் பட்டியலை பிரிக்க முடியவில்லை';
 $messages['smtperror'] = 'SMTP பிழை: $msg';
 $messages['emailformaterror'] = 'தவறான மின்னஞ்சல் முகவரி: $email';
+$messages['toomanyrecipients'] = 'Too many recipients. Reduce the number of recipients to $max.';
+$messages['maxgroupmembersreached'] = 'The number of group members exceeds the maximum of $max.';
+$messages['internalerror'] = 'An internal error occured. Please try again.';
+$messages['contactdelerror'] = 'Could not delete contact(s).';
+$messages['contactdeleted'] = 'Contact(s) deleted successfully.';
+$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.';
 
+?>
diff --git a/program/localization/th_TH/labels.inc b/program/localization/th_TH/labels.inc
index aa7e53880..03b4161fb 100644
--- a/program/localization/th_TH/labels.inc
+++ b/program/localization/th_TH/labels.inc
@@ -2,54 +2,78 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/th_TH/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Lazlo                                                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = 'ยินดีต้อนรับสู่ $product';
-$labels['username'] = 'บัญชีผู้ใช้';
-$labels['password'] = 'รหัสผ่าน';
-$labels['server'] = 'เซิร์ฟเวอร์';
-$labels['login'] = 'เข้าสู่ระบบ';
-$labels['logout'] = 'ออกจากระบบ';
-$labels['mail'] = 'อีเมล์';
+
+// login page
+$labels['welcome']   = 'ยินดีต้อนรับสู่ $product';
+$labels['username']  = 'บัญชีผู้ใช้';
+$labels['password']  = 'รหัสผ่าน';
+$labels['server']    = 'เซิร์ฟเวอร์';
+$labels['login']     = 'เข้าสู่ระบบ';
+
+// taskbar
+$labels['logout']   = 'ออกจากระบบ';
+$labels['mail']     = 'อีเมล์';
 $labels['settings'] = 'ปรับแต่งค่าส่วนตัว';
 $labels['addressbook'] = 'สมุดรายชื่อ';
-$labels['inbox'] = 'กล่องขาเข้า';
+
+// mailbox names
+$labels['inbox']  = 'กล่องขาเข้า';
 $labels['drafts'] = 'กล่องจดหมายร่าง';
-$labels['sent'] = 'กล่องขาออก';
-$labels['trash'] = 'ถังขยะ';
-$labels['junk'] = 'กล่องจดหมายขยะ';
+$labels['sent']   = 'กล่องขาออก';
+$labels['trash']  = 'ถังขยะ';
+$labels['junk']   = 'กล่องจดหมายขยะ';
+
+// message listing
 $labels['subject'] = 'หัวจดหมาย';
-$labels['from'] = 'ผู้ส่ง';
-$labels['to'] = 'ผู้รับ';
-$labels['cc'] = 'คัดลอก';
-$labels['bcc'] = 'แอบสำเนาถึง';
+$labels['from']    = 'ผู้ส่ง';
+$labels['sender']  = 'ผู้ส่ง';
+$labels['to']      = 'ผู้รับ';
+$labels['cc']      = 'คัดลอก';
+$labels['bcc']     = 'แอบสำเนาถึง';
 $labels['replyto'] = 'ตอบกลับ';
-$labels['date'] = 'วันที่';
-$labels['size'] = 'ขนาด';
+$labels['followupto'] = 'Followup-To';
+$labels['date']    = 'วันที่';
+$labels['size']    = 'ขนาด';
 $labels['priority'] = 'ระดับความสำคัญ';
 $labels['organization'] = 'องค์กร';
+$labels['readstatus'] = 'สถานะการเปิดอ่าน';
+$labels['listoptions'] = 'ตัวเลือกการแสดงรายการ';
+
 $labels['mailboxlist'] = 'กล่องจดหมาย';
-$labels['folders'] = 'กล่องจดหมาย';
 $labels['messagesfromto'] = 'จดหมายจาก $from ถึง $to จำนวน $count ฉบับ';
+$labels['threadsfromto'] = 'Threads $from to $to of $count';
 $labels['messagenrof'] = 'จดหมายฉบับที่ $nr จาก $count ฉบับ';
-$labels['copy'] = 'คัดลอก';
-$labels['move'] = 'เลื่อน';
-$labels['moveto'] = 'ย้ายไป...';
+$labels['fromtoshort'] = '$from – $to of $count';
+
+$labels['copy']     = 'คัดลอก';
+$labels['move']     = 'เลื่อน';
+$labels['moveto']   = 'ย้ายไป...';
 $labels['download'] = 'ดาวน์โหลด';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'แสดง';
+$labels['showanyway'] = 'Show it anyway';
+
 $labels['filename'] = 'ชื่อไฟล์';
 $labels['filesize'] = 'ขนาดไฟล์';
+
 $labels['addtoaddressbook'] = 'บันทึกในสมุดรายชื่อ';
+
+// weekdays short
 $labels['sun'] = 'อ';
 $labels['mon'] = 'จ';
 $labels['tue'] = 'อ';
@@ -57,132 +81,458 @@ $labels['wed'] = 'พ';
 $labels['thu'] = 'พฤ';
 $labels['fri'] = 'ศ';
 $labels['sat'] = 'ส';
-$labels['sunday'] = 'วันอาทิตย์';
-$labels['monday'] = 'วันจันทร์';
-$labels['tuesday'] = 'วันอังคาร';
+
+// weekdays long
+$labels['sunday']    = 'วันอาทิตย์';
+$labels['monday']    = 'วันจันทร์';
+$labels['tuesday']   = 'วันอังคาร';
 $labels['wednesday'] = 'วันพุธ';
-$labels['thursday'] = 'วันพฤหัสบดี';
-$labels['friday'] = 'วันศุกร์';
-$labels['saturday'] = 'วันเสาร์';
-$labels['jan'] = 'ม.ค.';
-$labels['feb'] = 'ก.พ.';
-$labels['mar'] = 'มี.ค.';
-$labels['apr'] = 'เม.ย.';
-$labels['may'] = 'พ.ค.';
-$labels['longmay'] = 'พ.ค.';
-$labels['jun'] = 'มิ.ย.';
-$labels['jul'] = 'ก.ค.';
-$labels['aug'] = 'ส.ค.';
-$labels['sep'] = 'ก.ย.';
-$labels['oct'] = 'ต.ค.';
-$labels['nov'] = 'พ.ย.';
-$labels['dec'] = 'ธ.ค.';
-$labels['longjan'] = 'มกราคม';
-$labels['longfeb'] = 'กุมภาพันธ์';
-$labels['longmar'] = 'มีนาคม';
-$labels['longapr'] = 'เมษายน';
-$labels['longjun'] = 'มิถุนายน';
-$labels['longjul'] = 'กรกฎาคม';
-$labels['longaug'] = 'สิงหาคม';
-$labels['longsep'] = 'กันยายน';
-$labels['longoct'] = 'ตุลาคม';
-$labels['longnov'] = 'พฤศจิกายน';
-$labels['longdec'] = 'ธันวาคม';
+$labels['thursday']  = 'วันพฤหัสบดี';
+$labels['friday']    = 'วันศุกร์';
+$labels['saturday']  = 'วันเสาร์';
+
+// months short
+$labels['jan']	= 'ม.ค.';
+$labels['feb']	= 'ก.พ.';
+$labels['mar']	= 'มี.ค.';
+$labels['apr']	= 'เม.ย.';
+$labels['may']	= 'พ.ค.';
+$labels['jun']	= 'มิ.ย.';
+$labels['jul'] 	= 'ก.ค.';
+$labels['aug']	= 'ส.ค.';
+$labels['sep']	= 'ก.ย.';
+$labels['oct']	= 'ต.ค.';
+$labels['nov']	= 'พ.ย.';
+$labels['dec']	= 'ธ.ค.';
+
+// months long
+$labels['longjan']	= 'มกราคม';
+$labels['longfeb']	= 'กุมภาพันธ์';
+$labels['longmar']	= 'มีนาคม';
+$labels['longapr']	= 'เมษายน';
+$labels['longmay']	= 'พ.ค.';
+$labels['longjun']	= 'มิถุนายน';
+$labels['longjul']	= 'กรกฎาคม';
+$labels['longaug']	= 'สิงหาคม';
+$labels['longsep']	= 'กันยายน';
+$labels['longoct']	= 'ตุลาคม';
+$labels['longnov']	= 'พฤศจิกายน';
+$labels['longdec']	= 'ธันวาคม';
+
 $labels['today'] = 'วันนี้';
-$labels['checkmail'] = 'ตรวจสอบจดหมายใหม่';
-$labels['compose'] = 'เขียนจดหมายใหม่';
-$labels['writenewmessage'] = 'สร้างจดหมายใหม่';
-$labels['replytomessage'] = 'ตอบกลับจดหมาย';
+
+// toolbar buttons
+$labels['refresh']          = 'รีเฟรช';
+$labels['checkmail']        = 'ตรวจสอบจดหมายใหม่';
+$labels['compose']          = 'เขียนจดหมายใหม่';
+$labels['writenewmessage']  = 'สร้างจดหมายใหม่';
+$labels['reply']            = 'ตอบกลับ';
+$labels['replytomessage']   = 'ตอบกลับจดหมาย';
 $labels['replytoallmessage'] = 'ตอบกลับถึงทุกคนในจดหมาย';
-$labels['forwardmessage'] = 'ส่งต่อจดหมาย';
-$labels['deletemessage'] = 'ลบจดหมาย';
-$labels['printmessage'] = 'พิมพ์จดหมาย';
-$labels['previousmessage'] = 'แสดงจดหมายฉบับที่แล้ว';
-$labels['firstmessage'] = 'แสดงจดหมายฉบับแรก';
-$labels['nextmessage'] = 'แสดงจดหมายฉบับต่อไป';
-$labels['lastmessage'] = 'แสดงจดหมายฉบับล่าสุด';
-$labels['backtolist'] = 'กลับไปยังรายการจดหมาย';
-$labels['viewsource'] = 'แสดง source';
+$labels['replyall']         = 'ตอบกลับทั้งหมด';
+$labels['replylist']        = 'รายชื่อตอบกลับ';
+$labels['forward']          = 'ส่งต่อ';
+$labels['forwardinline']    = 'Forward inline';
+$labels['forwardattachment'] = 'ส่งต่อเป็นไฟล์แนบ';
+$labels['forwardmessage']   = 'ส่งต่อจดหมาย';
+$labels['deletemessage']    = 'ลบจดหมาย';
+$labels['movemessagetotrash'] = 'ย้ายข้อความไปไว้ในถังขยะ';
+$labels['printmessage']     = 'พิมพ์จดหมาย';
+$labels['previousmessage']  = 'แสดงจดหมายฉบับที่แล้ว';
+$labels['firstmessage']     = 'แสดงจดหมายฉบับแรก';
+$labels['nextmessage']      = 'แสดงจดหมายฉบับต่อไป';
+$labels['lastmessage']      = 'แสดงจดหมายฉบับล่าสุด';
+$labels['backtolist']       = 'กลับไปยังรายการจดหมาย';
+$labels['viewsource']       = 'แสดง source';
+$labels['mark']             = 'ทำเครื่องหมาย';
+$labels['markmessages']     = 'ทำเครื่องหมายข้อความ';
+$labels['markread']         = 'ว่าอ่านแล้ว';
+$labels['markunread']       = 'ว่ายังไม่ได้อ่าน';
+$labels['markflagged']      = 'As flagged';
+$labels['markunflagged']    = 'As unflagged';
+$labels['moreactions']      = 'การกระทำเพิ่มเติม...';
+$labels['more']             = 'เพิ่มเติม';
+$labels['back']             = 'ย้อนกลับ';
+$labels['options']          = 'ตัวเลือก';
+
 $labels['select'] = 'เลือก';
 $labels['all'] = 'ทั้งหมด';
 $labels['none'] = 'ไม่เลือก';
-$labels['nonesort'] = 'ไม่เลือก';
+$labels['currpage'] = 'หน้าปัจจุบัน';
 $labels['unread'] = 'จดหมายที่ไม่ได้อ่าน';
+$labels['flagged'] = 'Flagged';
+$labels['unanswered'] = 'ยังไม่ได้ตอบ';
+$labels['withattachment'] = 'With attachment';
+$labels['deleted'] = 'ลบแล้ว';
+$labels['undeleted'] = 'ยังไม่ได้ลบ';
+$labels['invert'] = 'Invert';
+$labels['filter'] = 'ตัวกรองข้อมูล';
+$labels['list'] = 'รายการ';
+$labels['threads'] = 'Threads';
+$labels['expand-all'] = 'แสดงทั้งหมด';
+$labels['expand-unread'] = 'แสดงเฉพาะที่ยังไม่ได้อ่าน';
+$labels['collapse-all'] = 'ปิดทั้งหมด';
+$labels['threaded'] = 'Threaded';
+
+$labels['autoexpand_threads'] = 'Expand message threads';
+$labels['do_expand'] = 'all threads';
+$labels['expand_only_unread'] = 'only with unread messages';
+$labels['fromto'] = 'จาก/ถึง';
+$labels['flag'] = 'Flag';
+$labels['attachment'] = 'ไฟล์แนบ';
+$labels['nonesort'] = 'ไม่เลือก';
+$labels['sentdate'] = 'วันที่ส่ง';
+$labels['arrival'] = 'วันที่มาถึง';
+$labels['asc'] = 'เรียงจากน้อยมามาก';
+$labels['desc'] = 'เรีียงจากมากไปน้อย';
+$labels['listcolumns'] = 'List columns';
+$labels['listsorting'] = 'จัดเรียงคอลัมน์';
+$labels['listorder'] = 'Sorting order';
+$labels['listmode'] = 'List view mode';
+
+$labels['folderactions'] = 'Folder actions...';
 $labels['compact'] = 'แบบย่อ';
 $labels['empty'] = 'ว่างเปล่า';
+
 $labels['quota'] = 'พื้นที่ใช้งาน';
-$labels['unknown'] = 'ไม่ทราบ';
-$labels['unlimited'] = 'ไม่จำกัด';
-$labels['quicksearch'] = 'ค้นหาแบบด่วน';
-$labels['resetsearch'] = 'ล้างการค้นหา';
-$labels['sendmessage'] = 'ส่งจดหมาย';
-$labels['savemessage'] = 'บันทึกฉบับร่าง';
-$labels['addattachment'] = 'แนบไฟล์';
-$labels['charset'] = 'Charset';
-$labels['returnreceipt'] = 'ตอบกลับผู้รับ';
+$labels['unknown']  = 'ไม่ทราบ';
+$labels['unlimited']  = 'ไม่จำกัด';
+
+$labels['quicksearch']  = 'ค้นหาแบบด่วน';
+$labels['resetsearch']  = 'ล้างการค้นหา';
+$labels['searchmod']  = 'Search modifiers';
+$labels['msgtext']  = 'Entire message';
+$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';
+$labels['send']           = 'Send';
+$labels['sendmessage']    = 'ส่งจดหมาย';
+$labels['savemessage']    = 'บันทึกฉบับร่าง';
+$labels['addattachment']  = 'แนบไฟล์';
+$labels['charset']        = 'Charset';
+$labels['editortype']     = 'Editor type';
+$labels['returnreceipt']  = 'ตอบกลับผู้รับ';
+$labels['dsn']            = 'Delivery status notification';
+$labels['mailreplyintro'] = 'On $date, $sender wrote:';
+$labels['originalmessage'] = 'Original Message';
+
+$labels['editidents']    = 'Edit identities';
+$labels['spellcheck']    = 'Spell';
 $labels['checkspelling'] = 'ตรวจสอบคำผิด';
 $labels['resumeediting'] = 'แก้ไขต่อ';
-$labels['revertto'] = 'ย้นกลับไปยัง';
+$labels['revertto']      = 'ย้นกลับไปยัง';
+
+$labels['attach'] = 'Attach';
 $labels['attachments'] = 'ไฟล์แนบ';
 $labels['upload'] = 'อัพโหลด';
-$labels['close'] = 'ปิด';
-$labels['low'] = 'ต่ำ';
-$labels['lowest'] = 'ต่ำสุด';
-$labels['normal'] = 'ปกติ';
-$labels['high'] = 'สูง';
+$labels['uploadprogress'] = '$percent ($current from $total)';
+$labels['close']  = 'ปิด';
+$labels['messageoptions']  = 'Message options...';
+
+$labels['low']     = 'ต่ำ';
+$labels['lowest']  = 'ต่ำสุด';
+$labels['normal']  = 'ปกติ';
+$labels['high']    = 'สูง';
 $labels['highest'] = 'สูงสุด';
-$labels['nosubject'] = '(ไม่มีหัวข้อ)';
+
+$labels['nosubject']  = '(ไม่มีหัวข้อ)';
 $labels['showimages'] = 'แสดงรูป';
+$labels['alwaysshow'] = 'Always show images from $sender';
+$labels['isdraft']    = 'This is a draft message.';
+$labels['andnmore']   = '$nr more...';
+$labels['togglemoreheaders'] = 'Show more message headers';
+$labels['togglefullheaders'] = 'Toggle raw message headers';
+
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Plain text';
-$labels['name'] = 'ชื่อแสดง';
-$labels['firstname'] = 'ชื่อ';
-$labels['surname'] = 'สกุล';
-$labels['email'] = 'อีเมล์';
+$labels['savesentmessagein'] = 'Save sent message in';
+$labels['dontsave'] = 'don\'t save';
+$labels['maxuploadsize'] = 'Maximum allowed file size is $size';
+
+$labels['addcc'] = 'Add Cc';
+$labels['addbcc'] = 'Add Bcc';
+$labels['addreplyto'] = 'Add Reply-To';
+$labels['addfollowupto'] = 'Add Followup-To';
+
+// mdn
+$labels['mdnrequest'] = 'The sender of this message has asked to be notified when you read this message. Do you wish to notify the sender?';
+$labels['receiptread'] = 'Return Receipt (read)';
+$labels['yourmessage'] = 'This is a Return Receipt for your message';
+$labels['receiptnote'] = 'Note: This receipt only acknowledges that the message was displayed on the recipient\'s computer. There is no guarantee that the recipient has read or understood the message contents.';
+
+// address boook
+$labels['name']         = 'ชื่อแสดง';
+$labels['firstname']    = 'ชื่อ';
+$labels['surname']      = 'สกุล';
+$labels['middlename']   = 'ชื่อกลาง';
+$labels['nameprefix']   = 'คำนำหน้า';
+$labels['namesuffix']   = 'คำต่อท้ายชื่อ';
+$labels['nickname']     = 'ชื่อเล่น';
+$labels['jobtitle']     = 'ตำแหน่งงาน';
+$labels['department']   = 'แผนก';
+$labels['gender']       = 'เพศ';
+$labels['maidenname']   = 'Maiden Name';
+$labels['email']        = 'อีเมล์';
+$labels['phone']        = 'โทรศัพท์';
+$labels['address']      = 'ที่อยู่';
+$labels['street']       = 'ถนน';
+$labels['locality']     = 'เมือง';
+$labels['zipcode']      = 'รหัสไปรษณีย์';
+$labels['region']       = 'รัฐ/จังหวัด';
+$labels['country']      = 'ประเทศ';
+$labels['birthday']     = 'วันเกิด';
+$labels['anniversary']  = 'Anniversary';
+$labels['website']      = 'เว็บไซต์';
+$labels['instantmessenger'] = 'IM';
+$labels['notes'] = 'Notes';
+$labels['male']   = 'ชาย';
+$labels['female'] = 'หญิง';
+$labels['manager'] = 'ผู้จัดการ';
+$labels['assistant'] = 'ผู้ช่วย';
+$labels['spouse'] = 'Spouse';
+$labels['allfields'] = 'ช่องข้อมูลทั้่งหมด';
+$labels['search'] = 'ค้นหา';
+$labels['advsearch'] = 'ค้นหาขั้นสูง';
+$labels['advanced'] = 'ขั้นสูง';
+$labels['other'] = 'อื่นๆ';
+
+$labels['typehome']   = 'บ้าน';
+$labels['typework']   = 'สถานที่ทำงาน';
+$labels['typeother']  = 'อื่นๆ';
+$labels['typemobile']  = 'มือถือ';
+$labels['typemain']  = 'Main';
+$labels['typehomefax']  = 'โทรสารที่บ้าน';
+$labels['typeworkfax']  = 'โทรสารที่ทำงาน';
+$labels['typecar']  = 'รถ';
+$labels['typepager']  = 'เพจเจอร์';
+$labels['typevideo']  = 'วีดีโอ';
+$labels['typeassistant']  = 'Assistant';
+$labels['typehomepage']  = 'โฮมเพจ';
+$labels['typeblog'] = 'บล็อก';
+$labels['typeprofile'] = 'โปรไฟล์';
+
+$labels['addfield'] = 'เพิ่มช่องข้อมูล...';
 $labels['addcontact'] = 'เพิ่มรายชื่อ';
 $labels['editcontact'] = 'แก้ไขรายชื่อ';
-$labels['edit'] = 'แก้ไข';
+$labels['contacts'] = 'Contacts';
+$labels['contactproperties'] = 'Contact properties';
+$labels['personalinfo'] = 'Personal information';
+
+$labels['edit']   = 'แก้ไข';
 $labels['cancel'] = 'ยกเลิก';
-$labels['save'] = 'บันทึก';
+$labels['save']   = 'บันทึก';
 $labels['delete'] = 'ลบ';
-$labels['newcontact'] = 'สร้างรายชื่อใหม่';
-$labels['deletecontact'] = 'ลบรายชื่อที่เลือก';
-$labels['composeto'] = 'เขียนจดหมายถึง';
+$labels['rename'] = 'เปลี่ยนชื่อ';
+$labels['addphoto'] = 'เพิ่ม';
+$labels['replacephoto'] = 'Replace';
+$labels['uploadphoto'] = 'Upload photo';
+
+$labels['newcontact']     = 'สร้างรายชื่อใหม่';
+$labels['deletecontact']  = 'ลบรายชื่อที่เลือก';
+$labels['composeto']      = 'เขียนจดหมายถึง';
 $labels['contactsfromto'] = 'รายชื่อ $from ถึง $to จำนวน $count';
-$labels['print'] = 'พิมพ์';
-$labels['export'] = 'ส่งออก';
-$labels['previouspage'] = 'หน้าที่แล้ว';
-$labels['nextpage'] = 'หน้าถัดไป';
+$labels['print']          = 'พิมพ์';
+$labels['export']         = 'ส่งออก';
+$labels['exportall']      = 'ส่งออกทั้งหมด';
+$labels['exportsel']      = 'ส่งออกเฉพาะที่เลือก';
+$labels['exportvcards']   = 'Export contacts in vCard format';
+$labels['newcontactgroup'] = 'Create new contact group';
+$labels['grouprename']    = 'Rename group';
+$labels['groupdelete']    = 'Delete group';
+$labels['groupremoveselected'] = 'Remove selected contacts from group';
+
+$labels['previouspage']   = 'หน้าที่แล้ว';
+$labels['firstpage']      = 'Show first page';
+$labels['nextpage']       = 'หน้าถัดไป';
+$labels['lastpage']       = 'Show last page';
+
+$labels['group'] = 'Group';
+$labels['groups'] = 'Groups';
+$labels['personaladrbook'] = 'Personal Addresses';
+
+$labels['searchsave'] = 'Save search';
+$labels['searchdelete'] = 'Delete search';
+
+$labels['import'] = 'Import';
+$labels['importcontacts'] = 'Import contacts';
+$labels['importfromfile'] = 'Import from file:';
+$labels['importtarget'] = 'Add new contacts to address book:';
+$labels['importreplace'] = 'Replace the entire address book';
+$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['done'] = 'Done';
+
+// settings
 $labels['settingsfor'] = 'ตั้งค่าสำหรับ';
+$labels['about'] = 'About';
 $labels['preferences'] = 'ปรับแต่ง';
 $labels['userpreferences'] = 'ข้อมูลส่วนตัว';
 $labels['editpreferences'] = 'แก้ไขข้อมูลส่วนตัว';
+
 $labels['identities'] = 'ชื่อแสดงตัว';
 $labels['manageidentities'] = 'จัดการชื่อแสดงตัวสำหรับรายชื่อนี้';
 $labels['newidentity'] = 'ชื่อแสดงตัวใหม่';
+
 $labels['newitem'] = 'New item';
 $labels['edititem'] = 'Edit item';
+
 $labels['preferhtml'] = 'อ่านแบบ HTML';
+$labels['defaultcharset'] = 'Default Character Set';
 $labels['htmlmessage'] = 'จดหมาย HTML';
+$labels['messagepart'] = 'Part';
+$labels['digitalsig'] = 'Digital Signature';
+$labels['dateformat'] = 'Date format';
+$labels['timeformat'] = 'Time format';
 $labels['prettydate'] = 'แสดงวันที่แบบย่อ';
-$labels['setdefault'] = 'ตั้งเป็นค่าใช้งาน';
-$labels['language'] = 'ภาษา';
-$labels['timezone'] = 'เขตเวลา';
-$labels['pagesize'] = 'จำนวนจดหมายต่อหน้า';
+$labels['setdefault']  = 'ตั้งเป็นค่าใช้งาน';
+$labels['autodetect']  = 'Auto';
+$labels['language']  = 'ภาษา';
+$labels['timezone']  = 'เขตเวลา';
+$labels['pagesize']  = 'จำนวนจดหมายต่อหน้า';
 $labels['signature'] = 'ลายมือชื่อ';
-$labels['dstactive'] = 'Daylight savings';
+$labels['dstactive']  = 'Daylight savings';
+$labels['showinextwin'] = 'Open message in a new window';
+$labels['composeextwin'] = 'Compose in a new window';
 $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['autosavedraft'] = 'บันทึกเป็นจดหมายร่างอัตโนมัติ';
-$labels['never'] = 'ไม่ใช้';
-$labels['folder'] = 'กล่องจดหมาย';
-$labels['foldername'] = 'ชื่อกล่องจดหมาย';
-$labels['subscribed'] = 'ลงชื่อ';
-$labels['create'] = 'สร้าง';
-$labels['createfolder'] = 'สร้างกล่องจดหมาย';
-$labels['managefolders'] = 'จัดการกล่องจดหมาย';
+$labels['skin'] = 'Interface skin';
+$labels['logoutclear'] = 'Clear Trash on logout';
+$labels['logoutcompact'] = 'Compact Inbox on logout';
+$labels['uisettings'] = 'User Interface';
+$labels['serversettings'] = 'Server Settings';
+$labels['mailboxview'] = 'Mailbox View';
+$labels['mdnrequests'] = 'On request for return receipt';
+$labels['askuser'] = 'ask me';
+$labels['autosend'] = 'send receipt';
+$labels['autosendknown'] = 'send receipt to my contacts, otherwise ask me';
+$labels['autosendknownignore'] = 'send receipt to my contacts, otherwise ignore';
+$labels['ignore'] = 'ignore';
+$labels['readwhendeleted'] = 'Mark the message as read on delete';
+$labels['flagfordeletion'] = 'Flag the message for deletion instead of delete';
+$labels['skipdeleted'] = 'Do not show deleted messages';
+$labels['deletealways'] = 'If moving messages to Trash fails, delete them';
+$labels['deletejunk'] = 'Directly delete messages in Junk';
+$labels['showremoteimages'] = 'Display remote inline images';
+$labels['fromknownsenders'] = 'from known senders';
+$labels['always'] = 'always';
+$labels['showinlineimages'] = 'Display attached images below the message';
+$labels['autosavedraft']  = 'บันทึกเป็นจดหมายร่างอัตโนมัติ';
+$labels['everynminutes']  = 'every $n minute(s)';
+$labels['refreshinterval']  = 'Refresh (check for new messages, etc.)';
+$labels['never']  = 'ไม่ใช้';
+$labels['immediately']  = 'immediately';
+$labels['messagesdisplaying'] = 'Displaying Messages';
+$labels['messagescomposition'] = 'Composing Messages';
+$labels['mimeparamfolding'] = 'Attachment names';
+$labels['2231folding'] = 'Full RFC 2231 (Thunderbird)';
+$labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
+$labels['2047folding'] = 'Full RFC 2047 (other)';
+$labels['force7bit'] = 'Use MIME encoding for 8-bit characters';
+$labels['advancedoptions'] = 'ตัวเลือกขั้นสูง';
+$labels['focusonnewmessage'] = 'Focus browser window on new message';
+$labels['checkallfolders'] = 'Check all folders for new messages';
+$labels['displaynext'] = 'After message delete/move display the next message';
+$labels['defaultfont'] = 'Default font of HTML message';
+$labels['mainoptions'] = 'Main Options';
+$labels['browseroptions'] = 'Browser Options';
+$labels['section'] = 'Section';
+$labels['maintenance'] = 'Maintenance';
+$labels['newmessage'] = 'ข้อความใหม่';
+$labels['signatureoptions'] = 'ตัวเลือกสำหรับลายเซ็็นต์';
+$labels['whenreplying'] = 'เมื่อตอบกลับ';
+$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['insertsignature'] = 'แทรกลายเซ็นต์';
+$labels['previewpanemarkread']  = 'Mark previewed messages as read';
+$labels['afternseconds']  = 'after $n seconds';
+$labels['reqmdn'] = 'Always request a return receipt';
+$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'] = 'Check spelling before sending a message';
+$labels['spellcheckoptions'] = 'Spellcheck Options';
+$labels['spellcheckignoresyms'] = 'Ignore words with symbols';
+$labels['spellcheckignorenums'] = 'Ignore words with numbers';
+$labels['spellcheckignorecaps'] = 'Ignore words with all letters capitalized';
+$labels['addtodict'] = 'Add to dictionary';
+$labels['mailtoprotohandler'] = 'Register protocol handler for mailto: links';
+$labels['forwardmode'] = 'Messages forwarding';
+$labels['inline'] = 'inline';
+$labels['asattachment'] = 'เป็นไฟล์แนบ';
+
+$labels['folder']  = 'กล่องจดหมาย';
+$labels['folders']  = 'กล่องจดหมาย';
+$labels['foldername']  = 'ชื่อกล่องจดหมาย';
+$labels['subscribed']  = 'ลงชื่อ';
+$labels['messagecount'] = 'ข้อความ';
+$labels['create']  = 'สร้าง';
+$labels['createfolder']  = 'สร้างกล่องจดหมาย';
+$labels['managefolders']  = 'จัดการกล่องจดหมาย';
+$labels['specialfolders'] = 'โฟลเดอร์พิเศษ';
+$labels['properties'] = 'คุณสมบัติ';
+$labels['folderproperties'] = 'คุณสมบัติเกี่ยวกับโฟลเดอร์';
+$labels['parentfolder'] = 'โฟลเดอร์แม่';
+$labels['location'] = 'Location';
+$labels['info'] = 'ข้อมูล';
+$labels['getfoldersize'] = 'Click to get folder size';
+$labels['changesubscription'] = 'Click to change subscription';
+$labels['foldertype'] = 'ประเภทโฟลเดอร์';
+$labels['personalfolder']  = 'โฟลเดอร์ส่วนตัว';
+$labels['otherfolder']  = 'Other User\'s Folder';
+$labels['sharedfolder']  = 'โฟลเดอร์สาธารณะ';
+
 $labels['sortby'] = 'เรียงตาม';
-$labels['sortasc'] = 'เรียงจากหน้าไปหลัง';
+$labels['sortasc']  = 'เรียงจากหน้าไปหลัง';
 $labels['sortdesc'] = 'เรียงจากหลังไปหน้า';
+$labels['undo'] = 'เลิกทำ';
+
+$labels['installedplugins'] = 'ปลั๊กอินที่ติดตั้ง';
+$labels['plugin'] = 'ปลั๊กอิน';
+$labels['version'] = 'รุ่น';
+$labels['source'] = 'Source';
+$labels['license'] = 'สัญญาอนุญาต';
+$labels['support'] = 'Get support';
+
+// units
+$labels['B'] = 'B';
+$labels['KB'] = 'KB';
+$labels['MB'] = 'MB';
+$labels['GB'] = 'GB';
+
+// character sets
+$labels['unicode'] = 'Unicode';
+$labels['english'] = '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['turkish'] = 'Turkish';
+$labels['nordic'] = 'Nordic';
+$labels['thai'] = 'Thai';
+$labels['celtic'] = 'Celtic';
+$labels['vietnamese'] = 'Vietnamese';
+$labels['japanese'] = 'Japanese';
+$labels['korean'] = 'Korean';
+$labels['chinese'] = 'Chinese';
 
+?>
diff --git a/program/localization/th_TH/messages.inc b/program/localization/th_TH/messages.inc
index 5673b031b..826930c0e 100644
--- a/program/localization/th_TH/messages.inc
+++ b/program/localization/th_TH/messages.inc
@@ -2,27 +2,43 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/th_TH/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['loginfailed'] = 'ไม่สามารถเข้าสู่ระบบได้';
+$messages['errortitle']  = 'เกิดข้อผิดพลาดบางประการ!';
+$messages['loginfailed']  = 'ไม่สามารถเข้าสู่ระบบได้';
 $messages['cookiesdisabled'] = 'Browser ของคุณไม่ได้เปิดการใช้งาน Cookie ไว้';
 $messages['sessionerror'] = 'Your session is invalid or expired';
 $messages['storageerror'] = 'ไม่สามารถติดต่อ IMAP Server ได้';
+$messages['servererror'] = 'เกิดข้อผิดพลาดเกี่ยวกับเซิร์ฟเวอร์';
+$messages['servererrormsg'] = 'Server Error: $msg';
+$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'] = 'ไม่มีจดหมายในกล่องจดหมายนี้';
 $messages['loggedout'] = 'ทำการออกจากระบบเรียบร้อย';
 $messages['mailboxempty'] = 'กล่องจดหมายนี้ว่างเปล่า';
+$messages['refreshing'] = 'กำลังรีเฟรช...';
 $messages['loading'] = 'Loading...';
+$messages['uploading'] = 'กำลังอัพโหลดไฟล์...';
+$messages['uploadingmany'] = 'กำลังอัพโหลดไฟล์...';
 $messages['loadingdata'] = 'กำลังโหลดข้อมูล...';
 $messages['checkingmail'] = 'กำลังเช็คจดหมายใหม่...';
 $messages['sendingmessage'] = 'กำลังส่งจดหมาย...';
@@ -32,34 +48,54 @@ $messages['messagesaved'] = 'จดหมายถูกบันทึกเป
 $messages['successfullysaved'] = 'บันทึกเรียบร้อยแล้ว';
 $messages['addedsuccessfully'] = 'รายชื่อถูกบันทึกเรียบร้อยแล้ว';
 $messages['contactexists'] = 'อีเมล์นี้มีอยู่แล้ว';
+$messages['contactnameexists'] = 'A contact with the same name already exists.';
 $messages['blockedimages'] = 'เพื่อปกป้องความส่วนตัว รูปจากภายนอกในจดหมายนี้จะถูกปิดบังไว้';
 $messages['encryptedmessage'] = 'จดหมายถูกเข้ารหัสไม่สามารถแสดงผลได้';
 $messages['nocontactsfound'] = 'ไม่พบรายชื่อที่ค้นหา';
 $messages['contactnotfound'] = 'ไม่พบรายชื่อที่ค้นหา';
+$messages['contactsearchonly'] = 'Enter some search terms to find contacts';
 $messages['sendingfailed'] = 'การส่งจดหมายล้มเหลว';
+$messages['senttooquickly'] = 'Please wait $sec sec(s). before sending this message.';
+$messages['errorsavingsent'] = 'An error occured while saving sent message.';
 $messages['errorsaving'] = 'เกิดข้อผิดพลาดระหว่างการบันทึก';
 $messages['errormoving'] = 'ไม่สามารถย้ายจดหมายได้';
+$messages['errorcopying'] = 'Could not copy the message(s).';
 $messages['errordeleting'] = 'ไม่สามารถลบจดหมายได้';
-$messages['deletecontactconfirm'] = 'คุณมั่นใจที่ต้องการลบรายชื่อที่เลือกใช่หรือไม่?';
+$messages['errormarking'] = 'Could not mark the message(s).';
+$messages['deletecontactconfirm']  = 'คุณมั่นใจที่ต้องการลบรายชื่อที่เลือกใช่หรือไม่?';
+$messages['deletegroupconfirm']  = 'Do you really want to delete selected group?';
 $messages['deletemessagesconfirm'] = 'คุณมั่นใจที่ต้องการลบจดหมายที่เลือกใช่หรือไม่?';
-$messages['deletefolderconfirm'] = 'คุณมั่นใจที่ต้องการลบแฟ้มนี้หรือไม่?';
-$messages['purgefolderconfirm'] = 'คุณมั่นใจที่ต้องการลบจดหมายทั้งหมดในแฟ้มนี้ใช่หรือไม่?';
+$messages['deletefolderconfirm']  = 'คุณมั่นใจที่ต้องการลบแฟ้มนี้หรือไม่?';
+$messages['purgefolderconfirm']  = 'คุณมั่นใจที่ต้องการลบจดหมายทั้งหมดในแฟ้มนี้ใช่หรือไม่?';
+$messages['contactdeleting'] = 'กำลังลบรายชื่อผู้ติดต่อ...';
+$messages['groupdeleting'] = 'กำลังลบกลุ่ม...';
+$messages['folderdeleting'] = 'กำลังลบโฟลเดอร์...';
+$messages['foldermoving'] = 'กำลังย้ายโฟลเดอร์...';
+$messages['foldersubscribing'] = 'Subscribing folder...';
+$messages['folderunsubscribing'] = 'Unsubscribing folder...';
 $messages['formincomplete'] = 'ฟอร์มยังไม่ครบถ้วนสมบูรณ์';
 $messages['noemailwarning'] = 'โปรดใส่อีเมล์ให้ถูกต้อง';
-$messages['nonamewarning'] = 'โปรดใส่ชื่อ';
+$messages['nonamewarning']  = 'โปรดใส่ชื่อ';
 $messages['nopagesizewarning'] = 'โปรดใส่จำนวนหน้า';
+$messages['nosenderwarning'] = 'Please enter sender e-mail address.';
 $messages['norecipientwarning'] = 'โปรดใส่ผู้รับอย่างน้อย 1 ชื่อ';
-$messages['nosubjectwarning'] = 'หัวจดหมายว่างเปล่า คุณต้องการใส่หัวจดหมายเดี๋ยวนี้หรือไม่?';
+$messages['nosubjectwarning']  = 'หัวจดหมายว่างเปล่า คุณต้องการใส่หัวจดหมายเดี๋ยวนี้หรือไม่?';
 $messages['nobodywarning'] = 'คุณต้องการส่งจดหมายโดยไม่มีข้อความใช่หรือไม่?';
 $messages['notsentwarning'] = 'จดหมายยังไม่ถูกส่ง คุณต้องการยกเลิกหรือไม่?';
 $messages['noldapserver'] = 'โปรดเลือก LDAP Server เพื่อค้นหา';
 $messages['nosearchname'] = 'โปรดใสชื่อหรืออีเมล์';
+$messages['notuploadedwarning'] = 'Not all attachments have been uploaded yet. Please wait or cancel the upload.';
 $messages['searchsuccessful'] = 'พบจดหมายจำนวน $nr ฉบับ';
+$messages['contactsearchsuccessful'] = '$nr contacts found.';
 $messages['searchnomatch'] = 'การค้นหาไม่พบ';
 $messages['searching'] = 'กำลังค้นหา...';
 $messages['checking'] = 'กำลังตรวจสอบ...';
 $messages['nospellerrors'] = 'ไม่พบคำที่สะกดผิด';
 $messages['folderdeleted'] = 'ลบแฟ้มเสร็จสมบูรณ์';
+$messages['foldersubscribed'] = 'Folder successfully subscribed.';
+$messages['folderunsubscribed'] = 'Folder successfully unsubscribed.';
+$messages['folderpurged'] = 'Folder has successfully been emptied.';
+$messages['folderexpunged'] = 'Folder has successfully been compacted.';
 $messages['deletedsuccessfully'] = 'ลบเสร็จสมบูรณ์';
 $messages['converting'] = 'นำเอาหารจัดรูปแบบในจดหมายออก...';
 $messages['messageopenerror'] = 'ไม่สามารถอ่านจดหมายจาก Server ได้';
@@ -69,4 +105,67 @@ $messages['copysuccess'] = 'คัดลอกจดหมายจำนวน
 $messages['copyerror'] = 'ไม่สามารถคัดลอกได้';
 $messages['sourceisreadonly'] = 'จดหมายนี้เป็นแบบอ่านอย่างเดียว';
 $messages['errorsavingcontact'] = 'ไม่สามารถบันทึกรายชื่อได้';
+$messages['movingmessage'] = 'กำลังย้ายข้อความ...';
+$messages['copyingmessage'] = 'กำลังคัดลอกข้อความ...';
+$messages['copyingcontact'] = 'กำลังคัดลอกรายชื่อผู้ติดต่อ...';
+$messages['deletingmessage'] = 'กำลังลบข้อความ...';
+$messages['markingmessage'] = 'Marking message(s)...';
+$messages['addingmember'] = 'Adding contact(s) to the group...';
+$messages['removingmember'] = 'Removing contact(s) from the group...';
+$messages['receiptsent'] = 'Successfully sent a read receipt.';
+$messages['errorsendingreceipt'] = 'Could not send the receipt.';
+$messages['deleteidentityconfirm'] = 'Do you really want to delete this identity?';
+$messages['nodeletelastidentity'] = 'You cannot delete this identity, it\'s your last one.';
+$messages['forbiddencharacter'] = 'Folder name contains a forbidden character.';
+$messages['selectimportfile'] = 'Please select a file to upload.';
+$messages['addresswriterror'] = 'The selected address book is not writeable.';
+$messages['contactaddedtogroup'] = 'Successfully added the contacts to this group.';
+$messages['contactremovedfromgroup'] = 'Successfully removed contacts from this group.';
+$messages['nogroupassignmentschanged'] = 'No group assignments changed.';
+$messages['importwait'] = 'กำลังนำเข้าข้อมูล, โปรดรอสักครู่';
+$messages['importformaterror'] = 'Import failed! The uploaded file is not a valid import data file.';
+$messages['importconfirm'] = '<b>Successfully imported $inserted contacts</b>';
+$messages['importconfirmskipped'] = '<b>Skipped $skipped existing entries</b>';
+$messages['opnotpermitted'] = 'Operation not permitted!';
+$messages['nofromaddress'] = 'Missing e-mail address in selected identity.';
+$messages['editorwarning'] = 'Switching to the plain text editor will cause all text formatting to be lost. Do you wish to continue?';
+$messages['httpreceivedencrypterror'] = 'A fatal configuration error occurred. Contact your administrator immediately. <b>Your message can not be sent.</b>';
+$messages['smtpconnerror'] = 'SMTP Error ($code): Connection to server failed.';
+$messages['smtpautherror'] = 'SMTP Error ($code): Authentication failed.';
+$messages['smtpfromerror'] = 'SMTP Error ($code): Failed to set sender "$from" ($msg).';
+$messages['smtptoerror'] = 'SMTP Error ($code): Failed to add recipient "$to" ($msg).';
+$messages['smtprecipientserror'] = 'SMTP Error: Unable to parse recipients list.';
+$messages['smtperror'] = 'SMTP Error: $msg';
+$messages['emailformaterror'] = 'Invalid e-mail address: $email';
+$messages['toomanyrecipients'] = 'Too many recipients. Reduce the number of recipients to $max.';
+$messages['maxgroupmembersreached'] = 'The number of group members exceeds the maximum of $max.';
+$messages['internalerror'] = 'An internal error occured. Please try again.';
+$messages['contactdelerror'] = 'Could not delete contact(s).';
+$messages['contactdeleted'] = 'Contact(s) deleted successfully.';
+$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.';
 
+?>
diff --git a/program/localization/tr_TR/labels.inc b/program/localization/tr_TR/labels.inc
index dfac9010e..9e78ea3fa 100644
--- a/program/localization/tr_TR/labels.inc
+++ b/program/localization/tr_TR/labels.inc
@@ -2,60 +2,78 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/tr_TR/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: ismail yenigul                                                |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = '$product, Hoş Geldiniz';
-$labels['username'] = 'Kullanıcı Adı';
-$labels['password'] = 'Parola';
-$labels['server'] = 'Sunucu';
-$labels['login'] = 'Oturum Aç';
-$labels['logout'] = 'Oturumu Kapat';
-$labels['mail'] = 'E-Posta';
+
+// login page
+$labels['welcome']   = '$product, Hoş Geldiniz';
+$labels['username']  = 'Kullanıcı Adı';
+$labels['password']  = 'Parola';
+$labels['server']    = 'Sunucu';
+$labels['login']     = 'Oturum Aç';
+
+// taskbar
+$labels['logout']   = 'Oturumu Kapat';
+$labels['mail']     = 'E-Posta';
 $labels['settings'] = 'Kişisel Ayarlar';
 $labels['addressbook'] = 'Adres Defteri';
-$labels['inbox'] = 'Gelen';
+
+// mailbox names
+$labels['inbox']  = 'Gelen';
 $labels['drafts'] = 'Taslaklar';
-$labels['sent'] = 'Giden';
-$labels['trash'] = 'Çöp';
-$labels['junk'] = 'İstenmeyen';
+$labels['sent']   = 'Giden';
+$labels['trash']  = 'Çöp';
+$labels['junk']   = 'İstenmeyen';
+
+// message listing
 $labels['subject'] = 'Konu';
-$labels['from'] = 'Gönderen';
-$labels['to'] = 'Alıcı';
-$labels['cc'] = 'İlgili Kopyası';
-$labels['bcc'] = 'Gizli Kopya';
+$labels['from']    = 'Gönderen';
+$labels['sender']  = 'Gönderici';
+$labels['to']      = 'Alıcı';
+$labels['cc']      = 'İlgili Kopyası';
+$labels['bcc']     = 'Gizli Kopya';
 $labels['replyto'] = 'Yanıtla';
 $labels['followupto'] = 'Takip adresi';
-$labels['date'] = 'Tarih';
-$labels['size'] = 'Boyut';
+$labels['date']    = 'Tarih';
+$labels['size']    = 'Boyut';
 $labels['priority'] = 'Öncelik';
 $labels['organization'] = 'Kuruluş';
 $labels['readstatus'] = 'Okunma durumu';
 $labels['listoptions'] = 'Seçenekleri listele...';
+
 $labels['mailboxlist'] = 'Klasörler';
-$labels['folders'] = 'Klasörler';
 $labels['messagesfromto'] = 'Postalar: $from - $to , Toplam: $count';
 $labels['threadsfromto'] = 'Postalar: $from - $to, Toplam $count';
 $labels['messagenrof'] = 'Posta: $nr / $count';
 $labels['fromtoshort'] = '$from - $to , Toplam: $count';
-$labels['copy'] = 'Kopyala';
-$labels['move'] = 'Taşı';
-$labels['moveto'] = 'Şuraya taşı...';
+
+$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';
+
 $labels['filename'] = 'Dosya Adı';
 $labels['filesize'] = 'Dosya Boyutu';
+
 $labels['addtoaddressbook'] = 'Adres Defterine Ekle';
+
+// weekdays short
 $labels['sun'] = 'Paz';
 $labels['mon'] = 'Pzt';
 $labels['tue'] = 'Sal';
@@ -63,78 +81,88 @@ $labels['wed'] = 'Çrş';
 $labels['thu'] = 'Per';
 $labels['fri'] = 'Cum';
 $labels['sat'] = 'Cts';
-$labels['sunday'] = 'Paz';
-$labels['monday'] = 'Pazartesi';
-$labels['tuesday'] = 'Salı';
+
+// weekdays long
+$labels['sunday']    = 'Paz';
+$labels['monday']    = 'Pazartesi';
+$labels['tuesday']   = 'Salı';
 $labels['wednesday'] = 'Çarşamba';
-$labels['thursday'] = 'Perşembe';
-$labels['friday'] = 'Cuma';
-$labels['saturday'] = 'Cumartesi';
-$labels['jan'] = 'Oca';
-$labels['feb'] = 'Şub';
-$labels['mar'] = 'Mar';
-$labels['apr'] = 'Nis';
-$labels['may'] = 'May';
-$labels['longmay'] = 'May';
-$labels['jun'] = 'Haz';
-$labels['jul'] = 'Tem';
-$labels['aug'] = 'Ağu';
-$labels['sep'] = 'Eyl';
-$labels['oct'] = 'Eki';
-$labels['nov'] = 'Kas';
-$labels['dec'] = 'Ara';
-$labels['longjan'] = 'Ocak';
-$labels['longfeb'] = 'Şubat';
-$labels['longmar'] = 'Mart';
-$labels['longapr'] = 'Nisan';
-$labels['longjun'] = 'Haziran';
-$labels['longjul'] = 'Temmuz';
-$labels['longaug'] = 'Ağustos';
-$labels['longsep'] = 'Eylül';
-$labels['longoct'] = 'Ekim';
-$labels['longnov'] = 'Kasım';
-$labels['longdec'] = 'Aralık';
+$labels['thursday']  = 'Perşembe';
+$labels['friday']    = 'Cuma';
+$labels['saturday']  = 'Cumartesi';
+
+// months short
+$labels['jan']	= 'Oca';
+$labels['feb']	= 'Şub';
+$labels['mar']	= 'Mar';
+$labels['apr']	= 'Nis';
+$labels['may']	= 'May';
+$labels['jun']	= 'Haz';
+$labels['jul'] 	= 'Tem';
+$labels['aug']	= 'Ağu';
+$labels['sep']	= 'Eyl';
+$labels['oct']	= 'Eki';
+$labels['nov']	= 'Kas';
+$labels['dec']	= 'Ara';
+
+// months long
+$labels['longjan']	= 'Ocak';
+$labels['longfeb']	= 'Şubat';
+$labels['longmar']	= 'Mart';
+$labels['longapr']	= 'Nisan';
+$labels['longmay']	= 'May';
+$labels['longjun']	= 'Haziran';
+$labels['longjul']	= 'Temmuz';
+$labels['longaug']	= 'Ağustos';
+$labels['longsep']	= 'Eylül';
+$labels['longoct']	= 'Ekim';
+$labels['longnov']	= 'Kasım';
+$labels['longdec']	= 'Aralık';
+
 $labels['today'] = 'Bugün';
-$labels['refresh'] = 'Yenile';
-$labels['checkmail'] = 'Yeni Postaları Kontrol Et';
-$labels['compose'] = 'E-Posta Yaz';
-$labels['writenewmessage'] = 'Yeni posta oluştur';
-$labels['reply'] = 'Yanıtla';
-$labels['replytomessage'] = 'Gönderene Yanıt Ver';
+
+// toolbar buttons
+$labels['refresh']          = 'Yenile';
+$labels['checkmail']        = 'Yeni Postaları Kontrol Et';
+$labels['compose']          = 'E-Posta Yaz';
+$labels['writenewmessage']  = 'Yeni posta oluştur';
+$labels['reply']            = 'Yanıtla';
+$labels['replytomessage']   = 'Gönderene Yanıt Ver';
 $labels['replytoallmessage'] = 'Gönderene ve Tüm Alıcılara Yanıt Ver';
-$labels['replyall'] = 'Tümüne Yanıt Ver';
-$labels['replylist'] = 'Listeye Yanıt Ver';
-$labels['forward'] = 'İlet';
-$labels['forwardinline'] = 'Postanın içinde ilet';
+$labels['replyall']         = 'Tümüne Yanıt Ver';
+$labels['replylist']        = 'Listeye Yanıt Ver';
+$labels['forward']          = 'İlet';
+$labels['forwardinline']    = 'Postanın içinde ilet';
 $labels['forwardattachment'] = 'Eklenti Olarak İlet';
-$labels['forwardmessage'] = 'Postayı İlet';
-$labels['deletemessage'] = 'Postayı Sil';
+$labels['forwardmessage']   = 'Postayı İlet';
+$labels['deletemessage']    = 'Postayı Sil';
 $labels['movemessagetotrash'] = 'Postayı Çöpe Taşı';
-$labels['printmessage'] = 'Bu Postayı Yazdır';
-$labels['previousmessage'] = 'Önceki Postayı Göster';
-$labels['firstmessage'] = 'İlk Postayı Göster';
-$labels['nextmessage'] = 'Sonraki Postayı Göster';
-$labels['lastmessage'] = 'Son Postayı Göster';
-$labels['backtolist'] = 'Posta Listesine Dön';
-$labels['viewsource'] = 'Kaynağı Göster';
-$labels['mark'] = 'İşaretle';
-$labels['markmessages'] = 'Postaları İşaretle';
-$labels['markread'] = 'Okunmuş Olarak';
-$labels['markunread'] = 'Okunmamış Olarak';
-$labels['markflagged'] = 'İşaretli Olarak';
-$labels['markunflagged'] = 'İşaretsiz Olarak';
-$labels['moreactions'] = 'Diğer İşlemler';
-$labels['more'] = 'Daha Fazla';
-$labels['back'] = 'Geri';
-$labels['options'] = 'Seçenekler';
+$labels['printmessage']     = 'Bu Postayı Yazdır';
+$labels['previousmessage']  = 'Önceki Postayı Göster';
+$labels['firstmessage']     = 'İlk Postayı Göster';
+$labels['nextmessage']      = 'Sonraki Postayı Göster';
+$labels['lastmessage']      = 'Son Postayı Göster';
+$labels['backtolist']       = 'Posta Listesine Dön';
+$labels['viewsource']       = 'Kaynağı Göster';
+$labels['mark']             = 'İşaretle';
+$labels['markmessages']     = 'Postaları İşaretle';
+$labels['markread']         = 'Okunmuş Olarak';
+$labels['markunread']       = 'Okunmamış Olarak';
+$labels['markflagged']      = 'İşaretli Olarak';
+$labels['markunflagged']    = 'İşaretsiz Olarak';
+$labels['moreactions']      = 'Diğer İşlemler';
+$labels['more']             = 'Daha Fazla';
+$labels['back']             = 'Geri';
+$labels['options']          = 'Seçenekler';
+
 $labels['select'] = 'Seç';
 $labels['all'] = 'Hepsini';
 $labels['none'] = 'Yok';
-$labels['nonesort'] = 'Yok';
 $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';
@@ -145,12 +173,14 @@ $labels['expand-all'] = 'Tümünü genişlet';
 $labels['expand-unread'] = 'Okunmamışları genişlet';
 $labels['collapse-all'] = 'Tümünü daralt';
 $labels['threaded'] = 'Dizilimli';
+
 $labels['autoexpand_threads'] = 'Dizilimleri aç';
 $labels['do_expand'] = 'tüm dizilimler';
 $labels['expand_only_unread'] = 'sadece okunmamış posta içeren dizilimler';
 $labels['fromto'] = 'Gönderici/Alıcı';
 $labels['flag'] = 'İşaret';
 $labels['attachment'] = 'Eklenti';
+$labels['nonesort'] = 'Yok';
 $labels['sentdate'] = 'Gönderim tarihi';
 $labels['arrival'] = 'Alım tarihi';
 $labels['asc'] = 'artan';
@@ -159,147 +189,176 @@ $labels['listcolumns'] = 'Sütunları listele';
 $labels['listsorting'] = 'Sıralama sütunu';
 $labels['listorder'] = 'Sıralama düzeni';
 $labels['listmode'] = 'Liste görünümü';
+
 $labels['folderactions'] = 'Klasör eylemleri...';
 $labels['compact'] = 'Sıklaştır';
 $labels['empty'] = 'Boşalt';
+
 $labels['quota'] = 'Disk kullanımı';
-$labels['unknown'] = 'bilinmeyen';
-$labels['unlimited'] = 'sınırsız';
-$labels['quicksearch'] = 'Hızlı arama';
-$labels['resetsearch'] = 'Aramayı bitir';
-$labels['searchmod'] = 'Arama detayları';
-$labels['msgtext'] = 'Tüm posta gövdesi';
+$labels['unknown']  = 'bilinmeyen';
+$labels['unlimited']  = 'sınırsız';
+
+$labels['quicksearch']  = 'Hızlı arama';
+$labels['resetsearch']  = 'Aramayı bitir';
+$labels['searchmod']  = 'Arama detayları';
+$labels['msgtext']  = 'Tüm posta gövdesi';
+$labels['body']  = 'Gövde';
+
 $labels['openinextwin'] = 'Yeni pencerede aç';
 $labels['emlsave'] = 'İndir (.eml)';
-$labels['editasnew'] = 'Postayı yeni olarak düzenle';
-$labels['send'] = 'Gönder';
-$labels['sendmessage'] = 'Postayı gönder';
-$labels['savemessage'] = 'Taslak olarak kaydet';
-$labels['addattachment'] = 'Dosya ekle';
-$labels['charset'] = 'Karakter kodlaması';
-$labels['editortype'] = 'Düzenleyici';
-$labels['returnreceipt'] = 'Alındı onayı';
-$labels['dsn'] = 'Teslimat durumu bildirisi';
+$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';
+$labels['send']           = 'Gönder';
+$labels['sendmessage']    = 'Postayı gönder';
+$labels['savemessage']    = 'Taslak olarak kaydet';
+$labels['addattachment']  = 'Dosya ekle';
+$labels['charset']        = 'Karakter kodlaması';
+$labels['editortype']     = 'Düzenleyici';
+$labels['returnreceipt']  = 'Alındı onayı';
+$labels['dsn']            = 'Teslimat durumu bildirisi';
 $labels['mailreplyintro'] = '$date, $sender yazmış:';
 $labels['originalmessage'] = 'Özgün ileti';
-$labels['editidents'] = 'Kimlikleri düzenle';
-$labels['spellcheck'] = 'Yazım denetimi';
+
+$labels['editidents']    = 'Kimlikleri düzenle';
+$labels['spellcheck']    = 'Yazım denetimi';
 $labels['checkspelling'] = 'Yazım denetimi yap';
 $labels['resumeediting'] = 'Düzenlemeye devam et';
-$labels['revertto'] = 'Geri çevir:';
+$labels['revertto']      = 'Geri çevir:';
+
 $labels['attach'] = 'Ekle';
 $labels['attachments'] = 'Ekler';
 $labels['upload'] = 'Yükle';
 $labels['uploadprogress'] = '$percent ($current / $total)';
-$labels['close'] = 'Kapat';
-$labels['messageoptions'] = 'İleti seçenekleri...';
-$labels['low'] = 'Düşük';
-$labels['lowest'] = 'En Düşük';
-$labels['normal'] = 'Normal';
-$labels['high'] = 'Yüksek';
+$labels['close']  = 'Kapat';
+$labels['messageoptions']  = 'İleti seçenekleri...';
+
+$labels['low']     = 'Düşük';
+$labels['lowest']  = 'En Düşük';
+$labels['normal']  = 'Normal';
+$labels['high']    = 'Yüksek';
 $labels['highest'] = 'En yüksek';
-$labels['nosubject'] = '(Konu Belirtilmemiş)';
+
+$labels['nosubject']  = '(Konu Belirtilmemiş)';
 $labels['showimages'] = 'Resimleri göster';
 $labels['alwaysshow'] = '$sender tarafından gönderilen resimleri her zaman göster';
-$labels['isdraft'] = 'Bu posta taslaktır.';
-$labels['andnmore'] = '$nr daha...';
+$labels['isdraft']    = 'Bu posta taslaktır.';
+$labels['andnmore']   = '$nr daha...';
 $labels['togglemoreheaders'] = 'Daha fazla posta başlığı göster';
 $labels['togglefullheaders'] = 'Posta başlıklarını göster/gizle';
+
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Düz metin';
 $labels['savesentmessagein'] = 'Gönderileni buraya kaydet';
 $labels['dontsave'] = 'kaydetme';
 $labels['maxuploadsize'] = 'İzin verilen en büyük dosya boyutu $size';
+
 $labels['addcc'] = 'İlgili kopyası ekle';
 $labels['addbcc'] = 'Gizli kopya ekle';
 $labels['addreplyto'] = 'Yanıtlama adresi ekle';
 $labels['addfollowupto'] = 'Takip adresi ekle';
+
+// mdn
 $labels['mdnrequest'] = 'Bu postayı gönderen kişi, postayı okuduğunuza dair alındı onayı istedi. Alındı onayını göndermek ister misiniz ?';
 $labels['receiptread'] = 'Alındı Onayı (okundu)';
 $labels['yourmessage'] = 'Bu, postanız için alındı onayıdır';
 $labels['receiptnote'] = 'Not: Bu alındı onayı sadece postanızın alıcının bilgisayarında gösterildiğini belirtir. Alıcının posta içeriğini okuduğunu veya anladığını garantilemez.';
-$labels['name'] = 'Görüntülenen isim';
-$labels['firstname'] = 'Ad';
-$labels['surname'] = 'Soyad';
-$labels['middlename'] = 'Göbek adı';
-$labels['nameprefix'] = 'Ön ek';
-$labels['namesuffix'] = 'Son ek';
-$labels['nickname'] = 'Takma ad';
-$labels['jobtitle'] = 'Ünvan';
-$labels['department'] = 'Bölüm';
-$labels['gender'] = 'Cinsiyet';
-$labels['maidenname'] = 'Eski soyadı';
-$labels['email'] = 'E-Posta';
-$labels['phone'] = 'Telefon';
-$labels['address'] = 'Adres';
-$labels['street'] = 'Sokak';
-$labels['locality'] = 'Şehir';
-$labels['zipcode'] = 'Posta Kodu';
-$labels['region'] = 'Bölge';
-$labels['country'] = 'Ülke';
-$labels['birthday'] = 'Doğum günü';
-$labels['anniversary'] = 'Yıl dönümü';
-$labels['website'] = 'Web sayfası';
+
+// address boook
+$labels['name']         = 'Görüntülenen isim';
+$labels['firstname']    = 'Ad';
+$labels['surname']      = 'Soyad';
+$labels['middlename']   = 'Göbek adı';
+$labels['nameprefix']   = 'Ön ek';
+$labels['namesuffix']   = 'Son ek';
+$labels['nickname']     = 'Takma ad';
+$labels['jobtitle']     = 'Ünvan';
+$labels['department']   = 'Bölüm';
+$labels['gender']       = 'Cinsiyet';
+$labels['maidenname']   = 'Eski soyadı';
+$labels['email']        = 'E-Posta';
+$labels['phone']        = 'Telefon';
+$labels['address']      = 'Adres';
+$labels['street']       = 'Sokak';
+$labels['locality']     = 'Şehir';
+$labels['zipcode']      = 'Posta Kodu';
+$labels['region']       = 'Bölge';
+$labels['country']      = 'Ülke';
+$labels['birthday']     = 'Doğum günü';
+$labels['anniversary']  = 'Yıl dönümü';
+$labels['website']      = 'Web sayfası';
 $labels['instantmessenger'] = 'Anında mesajlaşma';
 $labels['notes'] = 'Notlar';
-$labels['male'] = 'erkek';
+$labels['male']   = 'erkek';
 $labels['female'] = 'kadın';
 $labels['manager'] = 'Yönetici';
 $labels['assistant'] = 'Asistan';
-$labels['typeassistant'] = 'Asistan';
 $labels['spouse'] = 'Eş';
 $labels['allfields'] = 'Tüm alanlar';
 $labels['search'] = 'Ara';
 $labels['advsearch'] = 'Gelişmiş ara';
 $labels['advanced'] = 'Gelişmiş';
 $labels['other'] = 'Diğer';
-$labels['typeother'] = 'Diğer';
-$labels['typehome'] = 'Ev';
-$labels['typework'] = 'İş';
-$labels['typemobile'] = 'Cep telefonu';
-$labels['typemain'] = 'Ana';
-$labels['typehomefax'] = 'Ev Faks';
-$labels['typeworkfax'] = 'İş Faks';
-$labels['typecar'] = 'Araba';
-$labels['typepager'] = 'Çağrı cihazı';
-$labels['typevideo'] = 'Görüntülü';
-$labels['typehomepage'] = 'Ev sayfası';
+
+$labels['typehome']   = 'Ev';
+$labels['typework']   = 'İş';
+$labels['typeother']  = 'Diğer';
+$labels['typemobile']  = 'Cep telefonu';
+$labels['typemain']  = 'Ana';
+$labels['typehomefax']  = 'Ev Faks';
+$labels['typeworkfax']  = 'İş Faks';
+$labels['typecar']  = 'Araba';
+$labels['typepager']  = 'Çağrı cihazı';
+$labels['typevideo']  = 'Görüntülü';
+$labels['typeassistant']  = 'Asistan';
+$labels['typehomepage']  = 'Ev sayfası';
 $labels['typeblog'] = 'Günlük';
 $labels['typeprofile'] = 'Profil';
+
 $labels['addfield'] = 'Alan ekle...';
 $labels['addcontact'] = 'Adres defterine ekle';
 $labels['editcontact'] = 'Kişiyi düzenle';
 $labels['contacts'] = 'Kişiler';
 $labels['contactproperties'] = 'Kişi özellikleri';
 $labels['personalinfo'] = 'Kişisel bilgiler';
-$labels['edit'] = 'Düzenle';
+
+$labels['edit']   = 'Düzenle';
 $labels['cancel'] = 'İptal';
-$labels['save'] = 'Kaydet';
+$labels['save']   = 'Kaydet';
 $labels['delete'] = 'Sil';
 $labels['rename'] = 'Yeniden adlandır';
 $labels['addphoto'] = 'Ekle';
 $labels['replacephoto'] = 'Değiştir';
 $labels['uploadphoto'] = 'Fotoğraf yükle';
-$labels['newcontact'] = 'Yeni adres kartı ekle';
-$labels['deletecontact'] = 'Seçili kişileri sil';
-$labels['composeto'] = 'Seçili kişiye posta gönder';
+
+$labels['newcontact']     = 'Yeni adres kartı ekle';
+$labels['deletecontact']  = 'Seçili kişileri sil';
+$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['exportvcards'] = 'vCard olarak dışa aktar';
+$labels['print']          = 'Yazdır';
+$labels['export']         = 'Dışa aktar';
+$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';
-$labels['groupdelete'] = 'Grubu sil';
+$labels['grouprename']    = 'Grubu yeniden adlandır';
+$labels['groupdelete']    = 'Grubu sil';
 $labels['groupremoveselected'] = 'Seçili kişileri gruptan sil';
-$labels['previouspage'] = 'Öncekileri göster';
-$labels['firstpage'] = 'İlkini göster';
-$labels['nextpage'] = 'Sonrakileri göster';
-$labels['lastpage'] = 'Sonuncuyu göster';
+
+$labels['previouspage']   = 'Öncekileri göster';
+$labels['firstpage']      = 'İlkini göster';
+$labels['nextpage']       = 'Sonrakileri göster';
+$labels['lastpage']       = 'Sonuncuyu göster';
+
 $labels['group'] = 'Grup';
 $labels['groups'] = 'Gruplar';
 $labels['personaladrbook'] = 'Adresler';
+
 $labels['searchsave'] = 'Aramayı kaydet';
 $labels['searchdelete'] = 'Aramayı sil';
+
 $labels['import'] = 'İçe aktar';
 $labels['importcontacts'] = 'Kişileri içe aktar';
 $labels['importfromfile'] = 'Dosyadan içe aktar:';
@@ -307,35 +366,43 @@ $labels['importtarget'] = 'Yeni kişiler eklenecek adres defteri:';
 $labels['importreplace'] = 'Tüm adres defterinin yerine geçsin';
 $labels['importdesc'] = 'Mevcut bir adres defterinden kişileri yükleyebilirsiniz.<br/> Şu anda <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> veya CSV (virgülle ayrılmış) veri formatları desteklenmektedir.';
 $labels['done'] = 'Tamam';
+
+// settings
 $labels['settingsfor'] = 'Ayarlar';
 $labels['about'] = 'Hakkında';
 $labels['preferences'] = 'Tercihler';
 $labels['userpreferences'] = 'Kullanıcı tercihleri';
 $labels['editpreferences'] = 'Kullanıcı tercihlerini düzenle';
+
 $labels['identities'] = 'Kimlikler';
 $labels['manageidentities'] = 'Bu hesap için kimlikleri düzenle';
 $labels['newidentity'] = 'Yeni kimlik';
+
 $labels['newitem'] = 'Yeni öğe';
 $labels['edititem'] = 'Öğe düzenle';
+
 $labels['preferhtml'] = 'HTML görüntüle';
 $labels['defaultcharset'] = 'Varsayılan Karakter Kümesi';
 $labels['htmlmessage'] = 'HTML Posta';
+$labels['messagepart'] = 'Parça';
+$labels['digitalsig'] = 'Dijital İmza';
 $labels['dateformat'] = 'Tarih biçimi';
 $labels['timeformat'] = 'Zaman biçimi';
 $labels['prettydate'] = 'Tarihi kısaltarak göster';
-$labels['setdefault'] = 'Varsayılan olarak ata';
-$labels['autodetect'] = 'Otomatik';
-$labels['language'] = 'Dil';
-$labels['timezone'] = 'Saat dilimi';
-$labels['pagesize'] = 'Bir sayfadaki satır sayısı';
+$labels['setdefault']  = 'Varsayılan olarak ata';
+$labels['autodetect']  = 'Otomatik';
+$labels['language']  = 'Dil';
+$labels['timezone']  = 'Saat dilimi';
+$labels['pagesize']  = 'Bir sayfadaki satır sayısı';
 $labels['signature'] = 'İmza';
-$labels['dstactive'] = 'Yaz saati uygulaması';
+$labels['dstactive']  = 'Yaz saati uygulaması';
 $labels['showinextwin'] = 'Postayı yeni pencerede aç';
 $labels['composeextwin'] = 'Postayı yeni pencerede yaz';
 $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';
@@ -358,11 +425,11 @@ $labels['showremoteimages'] = 'Uzaktan yüklenen resimleri göster';
 $labels['fromknownsenders'] = 'bilinen göndericilerden';
 $labels['always'] = 'her zaman';
 $labels['showinlineimages'] = 'Postanın ekindeki resimleri postanın altında göster';
-$labels['autosavedraft'] = 'Taslağı otomatik kaydet:';
-$labels['everynminutes'] = 'her $n dakikada bir';
-$labels['refreshinterval'] = 'Yenile (yeni postaları kontrol et, vb.)';
-$labels['never'] = 'asla';
-$labels['immediately'] = 'hemen';
+$labels['autosavedraft']  = 'Taslağı otomatik kaydet:';
+$labels['everynminutes']  = 'her $n dakikada bir';
+$labels['refreshinterval']  = 'Yenile (yeni postaları kontrol et, vb.)';
+$labels['never']  = 'asla';
+$labels['immediately']  = 'hemen';
 $labels['messagesdisplaying'] = 'Posta Görüntüleme';
 $labels['messagescomposition'] = 'Yeni Posta Oluşturma';
 $labels['mimeparamfolding'] = 'Eklenti isimleri';
@@ -389,12 +456,9 @@ $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';
+$labels['previewpanemarkread']  = 'Önzilemede görünen postaları okunmuş işaretle';
+$labels['afternseconds']  = '$n saniye sonra';
 $labels['reqmdn'] = 'Her zaman alındı onayı iste';
 $labels['reqdsn'] = 'Her zaman teslimat durumu bildirisi iste';
 $labels['replysamefolder'] = 'Yanıtları, yanıtlanan postanın bulunduğu klasöre kaydet';
@@ -411,13 +475,15 @@ $labels['mailtoprotohandler'] = 'mailto: bağlantıları için protokol işleyic
 $labels['forwardmode'] = 'Posta yönlendirme';
 $labels['inline'] = 'postanın içinde';
 $labels['asattachment'] = 'ek olarak';
-$labels['folder'] = 'Klasör';
-$labels['foldername'] = 'Klasör Adı';
-$labels['subscribed'] = 'Abonelik';
+
+$labels['folder']  = 'Klasör';
+$labels['folders']  = 'Klasörler';
+$labels['foldername']  = 'Klasör Adı';
+$labels['subscribed']  = 'Abonelik';
 $labels['messagecount'] = 'Postalar';
-$labels['create'] = 'Oluştur';
-$labels['createfolder'] = 'Yeni Klasör Oluştur';
-$labels['managefolders'] = 'Klasörleri Düzenle';
+$labels['create']  = 'Oluştur';
+$labels['createfolder']  = 'Yeni Klasör Oluştur';
+$labels['managefolders']  = 'Klasörleri Düzenle';
 $labels['specialfolders'] = 'Özel Klasörler';
 $labels['properties'] = 'Özellikler';
 $labels['folderproperties'] = 'Klasör Özellikleri';
@@ -427,23 +493,29 @@ $labels['info'] = 'Bilgi';
 $labels['getfoldersize'] = 'Klasör büyüklüğünü öğrenmek için tıklayın';
 $labels['changesubscription'] = 'Abonelik durumunu değiştirmek için tıklayın';
 $labels['foldertype'] = 'Klasör Türü';
-$labels['personalfolder'] = 'Kişisel Klasör';
-$labels['otherfolder'] = 'Diğer Kullanıcıların Klasörü';
-$labels['sharedfolder'] = 'Genel Klasör';
+$labels['personalfolder']  = 'Kişisel Klasör';
+$labels['otherfolder']  = 'Diğer Kullanıcıların Klasörü';
+$labels['sharedfolder']  = 'Genel Klasör';
+
 $labels['sortby'] = 'Sırala';
-$labels['sortasc'] = 'Artarak';
+$labels['sortasc']  = 'Artarak';
 $labels['sortdesc'] = 'Azalarak';
 $labels['undo'] = 'Geri al';
+
 $labels['installedplugins'] = 'Yüklü eklentiler';
 $labels['plugin'] = 'Eklenti';
 $labels['version'] = 'Sürüm';
 $labels['source'] = 'Kaynak';
 $labels['license'] = 'Lisans';
 $labels['support'] = 'Destek Al';
+
+// units
 $labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
 $labels['GB'] = 'GB';
+
+// character sets
 $labels['unicode'] = 'Unicode';
 $labels['english'] = 'İngilizce';
 $labels['westerneuropean'] = 'Batı Avrupa';
@@ -463,3 +535,4 @@ $labels['japanese'] = 'Japonca';
 $labels['korean'] = 'Korece';
 $labels['chinese'] = 'Çince';
 
+?>
diff --git a/program/localization/tr_TR/messages.inc b/program/localization/tr_TR/messages.inc
index a9b4c616a..3b451d556 100644
--- a/program/localization/tr_TR/messages.inc
+++ b/program/localization/tr_TR/messages.inc
@@ -2,20 +2,23 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/tr_TR/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: ismail yenigul                                                |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['errortitle'] = 'Bir hata oluştu!';
-$messages['loginfailed'] = 'Giriş Başarısız';
+$messages['errortitle']  = 'Bir hata oluştu!';
+$messages['loginfailed']  = 'Giriş Başarısız';
 $messages['cookiesdisabled'] = 'Tarayıcınız çerezleri kabul etmiyor';
 $messages['sessionerror'] = 'Oturumunuz sona ermiş veya hatalı';
 $messages['storageerror'] = 'IMAP sunucusuna bağlanılamadı';
@@ -25,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ı';
@@ -57,11 +62,11 @@ $messages['errormoving'] = 'Posta taşınamadı';
 $messages['errorcopying'] = 'Posta kopyalanamadı';
 $messages['errordeleting'] = 'Posta silinemedi';
 $messages['errormarking'] = 'Posta işaretlenemedi';
-$messages['deletecontactconfirm'] = 'Seçili kişileri silmek istediğinizden emin misiniz?';
-$messages['deletegroupconfirm'] = 'Seçili grupları silmek istediğinizden emin misiniz?';
+$messages['deletecontactconfirm']  = 'Seçili kişileri silmek istediğinizden emin misiniz?';
+$messages['deletegroupconfirm']  = 'Seçili grupları silmek istediğinizden emin misiniz?';
 $messages['deletemessagesconfirm'] = 'Seçili postaları silmek istediğinizden emin misiniz?';
-$messages['deletefolderconfirm'] = 'Bu klasörü silmek istediğinizden emin misiniz?';
-$messages['purgefolderconfirm'] = 'Bu klasördeki tüm postaları silmek istediğinizden emin misiniz?';
+$messages['deletefolderconfirm']  = 'Bu klasörü silmek istediğinizden emin misiniz?';
+$messages['purgefolderconfirm']  = 'Bu klasördeki tüm postaları silmek istediğinizden emin misiniz?';
 $messages['contactdeleting'] = 'Kişi(er) siliniyor...';
 $messages['groupdeleting'] = 'Grup siliniyor...';
 $messages['folderdeleting'] = 'Klasör siliniyor...';
@@ -70,11 +75,11 @@ $messages['foldersubscribing'] = 'Klasöre abone olunuyor...';
 $messages['folderunsubscribing'] = 'Klasör aboneliği kaldırılıyor...';
 $messages['formincomplete'] = 'Form tam olarak doldurulmadı';
 $messages['noemailwarning'] = 'Lütfen geçerli bir e-posta adresi girin';
-$messages['nonamewarning'] = 'Lütfen bir isim girin';
+$messages['nonamewarning']  = 'Lütfen bir isim girin';
 $messages['nopagesizewarning'] = 'Lütfen bir sayfa boyutu girin';
 $messages['nosenderwarning'] = 'Lütfen gönderici e-posta adresini girin';
 $messages['norecipientwarning'] = 'Lütfen en az bir alıcı belirtin';
-$messages['nosubjectwarning'] = '"Konu" kutusu boş bırakılmış. Şimdi bir konu belirtmek ister misiniz?';
+$messages['nosubjectwarning']  = '"Konu" kutusu boş bırakılmış. Şimdi bir konu belirtmek ister misiniz?';
 $messages['nobodywarning'] = 'Postayı boş olarak gönder?';
 $messages['notsentwarning'] = 'Posta gönderilmedi. Postanızı iptal etmek istiyor musunuz?';
 $messages['noldapserver'] = 'Lütfen arama için bir LDAP sunucu seçin';
@@ -163,3 +168,4 @@ $messages['messagetoobig'] = 'Bu ileti parçası işlenemeyecek kadar büyük.';
 $messages['attachmentvalidationerror'] = 'UYARI! Bu eklenti mesajda belirtilenden farklı olduğu için şüpheli bulundu. Eğer göndericiye güvenmiyorsanız eki web tarayıcısında açmayın. Şüpheli içerik bulunabilir.';
 $messages['noscriptwarning'] = 'Uyarı: Bu e-posta servisi Javascript gerektirmektedir! Servisi kullanabilmek için lütfen web tarayıcınızın ayarlarından Javascript\'i etkinleştiriniz.';
 
+?>
diff --git a/program/localization/uk_UA/labels.inc b/program/localization/uk_UA/labels.inc
index fd46ee5bb..4605bb98d 100644
--- a/program/localization/uk_UA/labels.inc
+++ b/program/localization/uk_UA/labels.inc
@@ -2,56 +2,78 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/uk_UA/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = 'Ласкаво просимо до $product';
-$labels['username'] = 'Ім\'я користувача';
-$labels['password'] = 'Пароль';
-$labels['server'] = 'Сервер';
-$labels['login'] = 'Увійти';
-$labels['logout'] = 'Вийти';
-$labels['mail'] = 'Пошта';
+
+// login page
+$labels['welcome']   = 'Ласкаво просимо до $product';
+$labels['username']  = 'Ім\'я користувача';
+$labels['password']  = 'Пароль';
+$labels['server']    = 'Сервер';
+$labels['login']     = 'Увійти';
+
+// taskbar
+$labels['logout']   = 'Вийти';
+$labels['mail']     = 'Пошта';
 $labels['settings'] = 'Налаштування';
 $labels['addressbook'] = 'Контакти';
-$labels['inbox'] = 'Вхідні';
+
+// mailbox names
+$labels['inbox']  = 'Вхідні';
 $labels['drafts'] = 'Чернетки';
-$labels['sent'] = 'Надіслані';
-$labels['trash'] = 'Кошик';
-$labels['junk'] = 'Спам';
+$labels['sent']   = 'Надіслані';
+$labels['trash']  = 'Кошик';
+$labels['junk']   = 'Спам';
+
+// message listing
 $labels['subject'] = 'Тема';
-$labels['from'] = 'Відправник';
-$labels['to'] = 'Кому';
-$labels['cc'] = 'Копія';
-$labels['bcc'] = 'Прихована';
+$labels['from']    = 'Відправник';
+$labels['sender']  = 'Відправник';
+$labels['to']      = 'Кому';
+$labels['cc']      = 'Копія';
+$labels['bcc']     = 'Прихована';
 $labels['replyto'] = 'Зворотня адреса';
 $labels['followupto'] = 'Followup-To';
-$labels['date'] = 'Дата';
-$labels['size'] = 'Розмір';
+$labels['date']    = 'Дата';
+$labels['size']    = 'Розмір';
 $labels['priority'] = 'Пріоритет';
 $labels['organization'] = 'Організація';
 $labels['readstatus'] = 'Статус прочитання';
+$labels['listoptions'] = 'Налаштування списку...';
+
 $labels['mailboxlist'] = 'Папки';
-$labels['folders'] = 'Папки';
 $labels['messagesfromto'] = 'Повідомлення з $from по $to із $count';
 $labels['threadsfromto'] = 'Обговорення з $from по $to із $count';
 $labels['messagenrof'] = 'Лист $nr із $count';
-$labels['copy'] = 'Копіювати';
-$labels['move'] = 'Перемістити';
-$labels['moveto'] = 'Перемістити до...';
+$labels['fromtoshort'] = '$from – $to з $count';
+
+$labels['copy']     = 'Копіювати';
+$labels['move']     = 'Перемістити';
+$labels['moveto']   = 'Перемістити до...';
 $labels['download'] = 'Завантажити';
+$labels['open']     = 'Open';
+$labels['showattachment'] = 'Показати';
+$labels['showanyway'] = 'Все одно показати';
+
 $labels['filename'] = 'Ім\'я файлу';
 $labels['filesize'] = 'Розмір файлу';
+
 $labels['addtoaddressbook'] = 'Додати до контактів';
+
+// weekdays short
 $labels['sun'] = 'Нд';
 $labels['mon'] = 'Пн';
 $labels['tue'] = 'Вт';
@@ -59,72 +81,90 @@ $labels['wed'] = 'Ср';
 $labels['thu'] = 'Чт';
 $labels['fri'] = 'Пт';
 $labels['sat'] = 'Сб';
-$labels['sunday'] = 'Неділя';
-$labels['monday'] = 'Понеділок';
-$labels['tuesday'] = 'Вівторок';
+
+// weekdays long
+$labels['sunday']    = 'Неділя';
+$labels['monday']    = 'Понеділок';
+$labels['tuesday']   = 'Вівторок';
 $labels['wednesday'] = 'Середа';
-$labels['thursday'] = 'Четвер';
-$labels['friday'] = 'П\'ятниця';
-$labels['saturday'] = 'Субота';
-$labels['jan'] = 'січ';
-$labels['feb'] = 'лют';
-$labels['mar'] = 'бер';
-$labels['apr'] = 'квіт';
-$labels['may'] = 'Травень';
-$labels['longmay'] = 'Травень';
-$labels['jun'] = 'чер';
-$labels['jul'] = 'лип';
-$labels['aug'] = 'сер';
-$labels['sep'] = 'вер';
-$labels['oct'] = 'жов';
-$labels['nov'] = 'лис';
-$labels['dec'] = 'гр';
-$labels['longjan'] = 'Січень';
-$labels['longfeb'] = 'Лютий';
-$labels['longmar'] = 'Березень';
-$labels['longapr'] = 'Квітень';
-$labels['longjun'] = 'Червень';
-$labels['longjul'] = 'Липень';
-$labels['longaug'] = 'Серпень';
-$labels['longsep'] = 'Вересень';
-$labels['longoct'] = 'Жовтень';
-$labels['longnov'] = 'Листопад';
-$labels['longdec'] = 'Грудень';
+$labels['thursday']  = 'Четвер';
+$labels['friday']    = 'П\'ятниця';
+$labels['saturday']  = 'Субота';
+
+// months short
+$labels['jan']	= 'січ';
+$labels['feb']	= 'лют';
+$labels['mar']	= 'бер';
+$labels['apr']	= 'квіт';
+$labels['may']	= 'Травень';
+$labels['jun']	= 'чер';
+$labels['jul'] 	= 'лип';
+$labels['aug']	= 'сер';
+$labels['sep']	= 'вер';
+$labels['oct']	= 'жов';
+$labels['nov']	= 'лис';
+$labels['dec']	= 'гр';
+
+// months long
+$labels['longjan']	= 'Січень';
+$labels['longfeb']	= 'Лютий';
+$labels['longmar']	= 'Березень';
+$labels['longapr']	= 'Квітень';
+$labels['longmay']	= 'Травень';
+$labels['longjun']	= 'Червень';
+$labels['longjul']	= 'Липень';
+$labels['longaug']	= 'Серпень';
+$labels['longsep']	= 'Вересень';
+$labels['longoct']	= 'Жовтень';
+$labels['longnov']	= 'Листопад';
+$labels['longdec']	= 'Грудень';
+
 $labels['today'] = 'Сьогодні';
-$labels['checkmail'] = 'Перевірити пошту';
-$labels['compose'] = 'Написати листа';
-$labels['writenewmessage'] = 'Написати листа';
-$labels['replytomessage'] = 'Відповісти відправнику';
+
+// toolbar buttons
+$labels['refresh']          = 'Оновити';
+$labels['checkmail']        = 'Перевірити пошту';
+$labels['compose']          = 'Написати листа';
+$labels['writenewmessage']  = 'Написати листа';
+$labels['reply']            = 'Відповісти';
+$labels['replytomessage']   = 'Відповісти відправнику';
 $labels['replytoallmessage'] = 'Відповісти до листа або відправнику та усім отримувачам';
-$labels['replyall'] = 'Відповісти усім';
-$labels['replylist'] = 'Відповісти до листа';
-$labels['forwardinline'] = 'Переслати у тілі листа';
+$labels['replyall']         = 'Відповісти усім';
+$labels['replylist']        = 'Відповісти до листа';
+$labels['forward']          = 'Переслати';
+$labels['forwardinline']    = 'Переслати у тілі листа';
 $labels['forwardattachment'] = 'Переслати як прикріплення';
-$labels['forwardmessage'] = 'Переслати повідомлення';
-$labels['deletemessage'] = 'У кошик';
+$labels['forwardmessage']   = 'Переслати повідомлення';
+$labels['deletemessage']    = 'У кошик';
 $labels['movemessagetotrash'] = 'Перемістити лист у кошик';
-$labels['printmessage'] = 'Друкувати';
-$labels['previousmessage'] = 'Показати попередній лист';
-$labels['firstmessage'] = 'Показати перший лист';
-$labels['nextmessage'] = 'Показати наступний лист';
-$labels['lastmessage'] = 'Показати останній лист';
-$labels['backtolist'] = 'До переліку листів';
-$labels['viewsource'] = 'Вихідний текст';
-$labels['markmessages'] = 'Позначити листи';
-$labels['markread'] = 'Позначити як прочитане';
-$labels['markunread'] = 'Позначити як непрочитане';
-$labels['markflagged'] = 'Додати зірочку';
-$labels['markunflagged'] = 'Зняти зірочку';
-$labels['moreactions'] = 'Інші дії...';
+$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['more']             = 'Ще';
+$labels['back']             = 'Назад';
+$labels['options']          = 'Параметри';
+
 $labels['select'] = 'Вибрати';
 $labels['all'] = 'Всі';
 $labels['none'] = 'Не сортувати';
-$labels['nonesort'] = 'Не сортувати';
 $labels['currpage'] = 'Поточна сторінка';
 $labels['unread'] = 'Непрочитані';
 $labels['flagged'] = 'Із зірочкою';
 $labels['unanswered'] = 'Без відповіді';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = 'Видалені';
+$labels['undeleted'] = 'Не видалено';
 $labels['invert'] = 'Інвертувати виділення';
 $labels['filter'] = 'Фільтр';
 $labels['list'] = 'Списком';
@@ -133,12 +173,14 @@ $labels['expand-all'] = 'Розкрити всі';
 $labels['expand-unread'] = 'Розкрити непрочитані';
 $labels['collapse-all'] = 'Згорнути всі';
 $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['asc'] = 'за зростанням';
@@ -147,170 +189,220 @@ $labels['listcolumns'] = 'Атрибути для відображення';
 $labels['listsorting'] = 'Сортувати за атрибутом';
 $labels['listorder'] = 'Порядок сортування';
 $labels['listmode'] = 'Режим перегляду';
+
 $labels['folderactions'] = 'Операції з папкою...';
 $labels['compact'] = 'Стиснути';
 $labels['empty'] = 'Спорожнити';
+
 $labels['quota'] = 'Використано';
-$labels['unknown'] = 'невідомо';
-$labels['unlimited'] = 'без обмеження';
-$labels['quicksearch'] = 'Швидкий пошук';
-$labels['resetsearch'] = 'Очистити пошук';
-$labels['searchmod'] = 'Де шукати';
-$labels['msgtext'] = 'В усьому листі';
+$labels['unknown']  = 'невідомо';
+$labels['unlimited']  = 'без обмеження';
+
+$labels['quicksearch']  = 'Швидкий пошук';
+$labels['resetsearch']  = 'Очистити пошук';
+$labels['searchmod']  = 'Де шукати';
+$labels['msgtext']  = 'В усьому листі';
+$labels['body']  = 'Тіло повідомлення';
+
 $labels['openinextwin'] = 'Відкрити в новому вікні';
 $labels['emlsave'] = 'Зберегти (.eml)';
-$labels['editasnew'] = 'Редагувати як новий';
-$labels['sendmessage'] = 'Надіслати зараз';
-$labels['savemessage'] = 'Зберегти чернетку';
-$labels['addattachment'] = 'Вкласти файл';
-$labels['charset'] = 'Кодування';
-$labels['editortype'] = 'Редактор';
-$labels['returnreceipt'] = 'Запит відповіді';
-$labels['dsn'] = 'Повідомлення про доставку';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
+
+// message compose
+$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['editidents'] = 'Змінити данні';
+
+$labels['editidents']    = 'Змінити данні';
+$labels['spellcheck']    = 'Орфографія';
 $labels['checkspelling'] = 'Перевірити орфографію';
 $labels['resumeediting'] = 'Продовжити редагування';
-$labels['revertto'] = 'Відмінити редагування';
+$labels['revertto']      = 'Відмінити редагування';
+
+$labels['attach'] = 'Вкласти';
 $labels['attachments'] = 'Вкладені файли';
 $labels['upload'] = 'Вкласти';
 $labels['uploadprogress'] = '$percent ($current з $total)';
-$labels['close'] = 'Закрити';
-$labels['messageoptions'] = 'Налаштування листів';
-$labels['low'] = 'Низький';
-$labels['lowest'] = 'Найнижчий';
-$labels['normal'] = 'Нормальний';
-$labels['high'] = 'Високий';
+$labels['close']  = 'Закрити';
+$labels['messageoptions']  = 'Налаштування листів';
+
+$labels['low']     = 'Низький';
+$labels['lowest']  = 'Найнижчий';
+$labels['normal']  = 'Нормальний';
+$labels['high']    = 'Високий';
 $labels['highest'] = 'Найвищий';
-$labels['nosubject'] = '(без теми)';
+
+$labels['nosubject']  = '(без теми)';
 $labels['showimages'] = 'Показувати зображення';
 $labels['alwaysshow'] = 'Завжди показувати зображення від $sender';
-$labels['isdraft'] = 'Це чернетка.';
+$labels['isdraft']    = 'Це чернетка.';
+$labels['andnmore']   = 'ще $nr...';
+$labels['togglemoreheaders'] = 'Завантажити ще заголовки повідомлень';
+$labels['togglefullheaders'] = 'Показати оригінальні заголовки повідомлення';
+
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Звичайний текст';
 $labels['savesentmessagein'] = 'зберегти надісланого листа в';
 $labels['dontsave'] = 'не зберігати';
 $labels['maxuploadsize'] = 'Максимальний розмір файлу $size';
+
 $labels['addcc'] = 'Додати копію';
 $labels['addbcc'] = 'Додати приховану копію';
 $labels['addreplyto'] = 'Додати зворотню адресу';
 $labels['addfollowupto'] = 'Додати Followup-To';
+
+// mdn
 $labels['mdnrequest'] = 'Відправник цього листа запитав про прочитання. Повідомити відправника?';
 $labels['receiptread'] = 'Повідомлення про прочитання';
 $labels['yourmessage'] = 'Повідомлення про прочитання Вашого листа';
 $labels['receiptnote'] = 'Зауваження: Це повідомлення означає лише, що листа було відкрито одержувачем, і не гарантує того, що його було прочитано.';
-$labels['name'] = 'Ім`я для відображення';
-$labels['firstname'] = 'Ім`я';
-$labels['surname'] = 'Прізвище';
-$labels['middlename'] = 'По-батькові';
-$labels['nameprefix'] = 'Префікс';
-$labels['namesuffix'] = 'Суфікс';
-$labels['nickname'] = 'Нікнейм';
-$labels['jobtitle'] = 'Посада';
-$labels['department'] = 'Відділ';
-$labels['gender'] = 'Стать';
-$labels['maidenname'] = 'Дівоче прізвище';
-$labels['email'] = 'Електронна адреса';
-$labels['phone'] = 'Телефон';
-$labels['address'] = 'Адреса';
-$labels['street'] = 'Вулиця';
-$labels['locality'] = 'Місто';
-$labels['zipcode'] = 'Індекс';
-$labels['region'] = 'Область';
-$labels['country'] = 'Страна';
-$labels['birthday'] = 'Дата народження';
-$labels['anniversary'] = 'Ювілей';
-$labels['website'] = 'Веб-сайт';
+
+// address boook
+$labels['name']         = 'Ім`я для відображення';
+$labels['firstname']    = 'Ім`я';
+$labels['surname']      = 'Прізвище';
+$labels['middlename']   = 'По-батькові';
+$labels['nameprefix']   = 'Префікс';
+$labels['namesuffix']   = 'Суфікс';
+$labels['nickname']     = 'Нікнейм';
+$labels['jobtitle']     = 'Посада';
+$labels['department']   = 'Відділ';
+$labels['gender']       = 'Стать';
+$labels['maidenname']   = 'Дівоче прізвище';
+$labels['email']        = 'Електронна адреса';
+$labels['phone']        = 'Телефон';
+$labels['address']      = 'Адреса';
+$labels['street']       = 'Вулиця';
+$labels['locality']     = 'Місто';
+$labels['zipcode']      = 'Індекс';
+$labels['region']       = 'Область';
+$labels['country']      = 'Страна';
+$labels['birthday']     = 'Дата народження';
+$labels['anniversary']  = 'Ювілей';
+$labels['website']      = 'Веб-сайт';
 $labels['instantmessenger'] = 'IM';
 $labels['notes'] = 'Примітки';
-$labels['male'] = 'чоловічий';
+$labels['male']   = 'чоловічий';
 $labels['female'] = 'жіночий';
 $labels['manager'] = 'Менеждер';
 $labels['assistant'] = 'Помічник';
-$labels['typeassistant'] = 'Помічник';
 $labels['spouse'] = 'Шлюбний партнер';
 $labels['allfields'] = 'Усі поля';
 $labels['search'] = 'Пошук';
 $labels['advsearch'] = 'Розширений пошук';
+$labels['advanced'] = 'Додатково';
 $labels['other'] = 'Інше';
-$labels['typeother'] = 'Інше';
-$labels['typehome'] = 'Дім';
-$labels['typework'] = 'Робота';
-$labels['typemobile'] = 'Мобільний';
-$labels['typemain'] = 'Основний';
-$labels['typehomefax'] = 'Домашній факс';
-$labels['typeworkfax'] = 'Робочий факс';
-$labels['typecar'] = 'Автомобіль';
-$labels['typepager'] = 'Пейджер';
-$labels['typevideo'] = 'Відео';
-$labels['typehomepage'] = 'Домашня сторінка';
+
+$labels['typehome']   = 'Дім';
+$labels['typework']   = 'Робота';
+$labels['typeother']  = 'Інше';
+$labels['typemobile']  = 'Мобільний';
+$labels['typemain']  = 'Основний';
+$labels['typehomefax']  = 'Домашній факс';
+$labels['typeworkfax']  = 'Робочий факс';
+$labels['typecar']  = 'Автомобіль';
+$labels['typepager']  = 'Пейджер';
+$labels['typevideo']  = 'Відео';
+$labels['typeassistant']  = 'Помічник';
+$labels['typehomepage']  = 'Домашня сторінка';
 $labels['typeblog'] = 'Блог';
 $labels['typeprofile'] = 'Профіль';
+
 $labels['addfield'] = 'Додати поле...';
 $labels['addcontact'] = 'Додати вибрані контакти до списку контактів';
 $labels['editcontact'] = 'Редагувати контакт';
 $labels['contacts'] = 'Контакти';
 $labels['contactproperties'] = 'Властивості контакта';
 $labels['personalinfo'] = 'Особова інформація';
-$labels['edit'] = 'Правка';
+
+$labels['edit']   = 'Правка';
 $labels['cancel'] = 'Скасувати';
-$labels['save'] = 'Зберегти';
+$labels['save']   = 'Зберегти';
 $labels['delete'] = 'Видалити';
 $labels['rename'] = 'Перейменувати';
 $labels['addphoto'] = 'Додати';
 $labels['replacephoto'] = 'Замінити';
-$labels['newcontact'] = 'Створити новий контакт';
-$labels['deletecontact'] = 'Видалити вибрані контакти';
-$labels['composeto'] = 'Створити листа для вибранних контактів';
+$labels['uploadphoto'] = 'Завантажити фотографію';
+
+$labels['newcontact']     = 'Створити новий контакт';
+$labels['deletecontact']  = 'Видалити вибрані контакти';
+$labels['composeto']      = 'Створити листа для вибранних контактів';
 $labels['contactsfromto'] = 'Контакти  $from - $to / $count';
-$labels['print'] = 'Друкувати';
-$labels['export'] = 'Експортувати';
-$labels['exportvcards'] = 'Експортувати контакти у формат vCard';
+$labels['print']          = 'Друкувати';
+$labels['export']         = 'Експортувати';
+$labels['exportall']      = 'Експортувати все';
+$labels['exportsel']      = 'Експортувати виділені';
+$labels['exportvcards']   = 'Експортувати контакти у формат vCard';
 $labels['newcontactgroup'] = 'Створити нову групу контактів';
-$labels['grouprename'] = 'Перейменувати групу';
-$labels['groupdelete'] = 'Видалити групу';
-$labels['previouspage'] = 'Попередня сторінка';
-$labels['firstpage'] = 'Перша сторінка';
-$labels['nextpage'] = 'Наступна сторінка';
-$labels['lastpage'] = 'Остання сторінка';
+$labels['grouprename']    = 'Перейменувати групу';
+$labels['groupdelete']    = 'Видалити групу';
+$labels['groupremoveselected'] = 'Видалити обрані контакти з групи';
+
+$labels['previouspage']   = 'Попередня сторінка';
+$labels['firstpage']      = 'Перша сторінка';
+$labels['nextpage']       = 'Наступна сторінка';
+$labels['lastpage']       = 'Остання сторінка';
+
 $labels['group'] = 'Група';
 $labels['groups'] = 'Групи';
 $labels['personaladrbook'] = 'Персональні адреси';
+
 $labels['searchsave'] = 'Зберегти пошук';
 $labels['searchdelete'] = 'Видалити пошук';
+
 $labels['import'] = 'Імпорт';
 $labels['importcontacts'] = 'Імпортувати контакти';
 $labels['importfromfile'] = 'Імпортувати з файлу:';
 $labels['importtarget'] = 'Додати нові контакти до адресної книги';
 $labels['importreplace'] = 'Замінити всю адресну книгу';
+$labels['importdesc'] = 'Ви можете завантажити контакти з існуючої адресної книги.<br/>В даний час ми підтримуємо імпорт адрес в форматі візитної картки <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['identities'] = 'Профілі';
 $labels['manageidentities'] = 'Керування профілями';
 $labels['newidentity'] = 'Новий профіль';
+
 $labels['newitem'] = 'Новий';
 $labels['edititem'] = 'Редагувати';
+
 $labels['preferhtml'] = 'Показувати в HTML';
 $labels['defaultcharset'] = 'Кодування за замовчуваннням';
 $labels['htmlmessage'] = 'Лист у HTML';
+$labels['messagepart'] = 'Частина';
+$labels['digitalsig'] = 'Цифровий підпис';
 $labels['dateformat'] = 'Формат дати';
 $labels['timeformat'] = 'Формат часу';
 $labels['prettydate'] = 'Дати у зручному форматі';
-$labels['setdefault'] = 'Встановити за замовчуванням';
-$labels['autodetect'] = 'Визначати автоматично';
-$labels['language'] = 'Мова';
-$labels['timezone'] = 'Часовий пояс';
-$labels['pagesize'] = 'Рядків на сторінці';
+$labels['setdefault']  = 'Встановити за замовчуванням';
+$labels['autodetect']  = 'Визначати автоматично';
+$labels['language']  = 'Мова';
+$labels['timezone']  = 'Часовий пояс';
+$labels['pagesize']  = 'Рядків на сторінці';
 $labels['signature'] = 'Підпис';
-$labels['dstactive'] = 'Літній/зимовий час';
+$labels['dstactive']  = 'Літній/зимовий час';
+$labels['showinextwin'] = 'Відкрити повідомлення в новому вікні';
+$labels['composeextwin'] = 'Створити в новому вікні';
 $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'] = 'Очищати кошик при виході';
@@ -328,14 +420,16 @@ $labels['readwhendeleted'] = 'Позначати як прочитане при
 $labels['flagfordeletion'] = 'Позначати для видалення замість видалення';
 $labels['skipdeleted'] = 'Не показувати видалені листи';
 $labels['deletealways'] = 'Видаляти листи при невдалому переміщенні до кошика';
+$labels['deletejunk'] = 'Видаляти повідомлення з папки СПАМ минаючи Корзину';
 $labels['showremoteimages'] = 'Показувати віддалені зображення';
 $labels['fromknownsenders'] = 'від відомих відправників';
 $labels['always'] = 'завжди';
 $labels['showinlineimages'] = 'Показувати вкладені зображення внизу листа';
-$labels['autosavedraft'] = 'Автозбереження чернетки';
-$labels['everynminutes'] = 'кожні $n хвилин';
-$labels['never'] = 'ніколи';
-$labels['immediately'] = 'одразу';
+$labels['autosavedraft']  = 'Автозбереження чернетки';
+$labels['everynminutes']  = 'кожні $n хвилин';
+$labels['refreshinterval']  = 'Оновити (перевірити нові повідомлення, тощо)';
+$labels['never']  = 'ніколи';
+$labels['immediately']  = 'одразу';
 $labels['messagesdisplaying'] = 'Відображення листів';
 $labels['messagescomposition'] = 'Створення листів';
 $labels['mimeparamfolding'] = 'Імена вкладень';
@@ -349,41 +443,47 @@ $labels['checkallfolders'] = 'Перевіряти нові листи у всі
 $labels['displaynext'] = 'Після видалення/переміщення листа відображати наступний';
 $labels['defaultfont'] = 'Шрифт за замовчуванням HTML повідомлення';
 $labels['mainoptions'] = 'Основні налаштування';
+$labels['browseroptions'] = 'Налаштування браузера';
 $labels['section'] = 'Розділ';
 $labels['maintenance'] = 'Додатково';
 $labels['newmessage'] = 'Новий лист';
 $labels['signatureoptions'] = 'Налаштування підпису';
 $labels['whenreplying'] = 'При відповіді';
+$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 секунд';
+$labels['previewpanemarkread']  = 'Позначити переглянуті листи як прочитані';
+$labels['afternseconds']  = 'через $n секунд';
 $labels['reqmdn'] = 'Завжди вимагати повідомлення про доставку';
 $labels['reqdsn'] = 'Завжди вимагати повідомлення про статус доставки';
 $labels['replysamefolder'] = 'Розмістити відповіді у тій же папці, де знаходиться оригінал';
-$labels['defaultaddressbook'] = 'Додати нові контакти до обраної адресної книги';
+$labels['defaultabook'] = 'Адресна книга за замовчуванням';
 $labels['autocompletesingle'] = 'Пропускати додаткові адреси в автозавершенні';
+$labels['listnamedisplay'] = 'Виводити список контактів як';
 $labels['spellcheckbeforesend'] = 'Перевірити орфографію перед відправкою повідомлення';
 $labels['spellcheckoptions'] = 'Налаштування перевірки орфографії';
 $labels['spellcheckignoresyms'] = 'Ігнорувати слова із символами';
 $labels['spellcheckignorenums'] = 'Ігнорувати слова із числами';
 $labels['spellcheckignorecaps'] = 'Ігнорувати слова із великими буквами';
 $labels['addtodict'] = 'Додати до словника';
-$labels['folder'] = 'Папка';
-$labels['foldername'] = 'Назва папки';
-$labels['subscribed'] = 'Підписані';
+$labels['mailtoprotohandler'] = 'Зареєструвати обробник для посилань mailto';
+$labels['forwardmode'] = 'Пересилання повідомлень';
+$labels['inline'] = 'у тексті';
+$labels['asattachment'] = 'як вкладення';
+
+$labels['folder']  = 'Папка';
+$labels['folders']  = 'Папки';
+$labels['foldername']  = 'Назва папки';
+$labels['subscribed']  = 'Підписані';
 $labels['messagecount'] = 'Листи';
-$labels['create'] = 'Створити';
-$labels['createfolder'] = 'Створити нову папку';
-$labels['managefolders'] = 'Керування папками';
+$labels['create']  = 'Створити';
+$labels['createfolder']  = 'Створити нову папку';
+$labels['managefolders']  = 'Керування папками';
 $labels['specialfolders'] = 'Особливі папки';
 $labels['properties'] = 'Властивості';
 $labels['folderproperties'] = 'Властивості папки';
@@ -393,22 +493,29 @@ $labels['info'] = 'Інформація';
 $labels['getfoldersize'] = 'Показати розмір папки';
 $labels['changesubscription'] = 'Змінити підписку';
 $labels['foldertype'] = 'Тип каталогу';
-$labels['personalfolder'] = 'Приватний каталог';
-$labels['otherfolder'] = 'Каталог іншого користувача';
-$labels['sharedfolder'] = 'Публічний каталог';
+$labels['personalfolder']  = 'Приватний каталог';
+$labels['otherfolder']  = 'Каталог іншого користувача';
+$labels['sharedfolder']  = 'Публічний каталог';
+
 $labels['sortby'] = 'Відсортувати за';
-$labels['sortasc'] = 'Сортувати за зростанням';
+$labels['sortasc']  = 'Сортувати за зростанням';
 $labels['sortdesc'] = 'Сортувати за спаданням';
 $labels['undo'] = 'Відмінити';
+
+$labels['installedplugins'] = 'Встановлені плагіни';
 $labels['plugin'] = 'Доповнення';
 $labels['version'] = 'Версія';
 $labels['source'] = 'Джерело';
 $labels['license'] = 'Ліцензія';
 $labels['support'] = 'Отримати підтримку';
+
+// units
 $labels['B'] = 'б';
 $labels['KB'] = 'Кб';
 $labels['MB'] = 'Мб';
 $labels['GB'] = 'Гб';
+
+// character sets
 $labels['unicode'] = 'Юнікод';
 $labels['english'] = 'Англійське';
 $labels['westerneuropean'] = 'Західноєвропейське';
@@ -428,3 +535,4 @@ $labels['japanese'] = 'Японське';
 $labels['korean'] = 'Корейське';
 $labels['chinese'] = 'Китайське';
 
+?>
diff --git a/program/localization/uk_UA/messages.inc b/program/localization/uk_UA/messages.inc
index d3e90f777..521492d99 100644
--- a/program/localization/uk_UA/messages.inc
+++ b/program/localization/uk_UA/messages.inc
@@ -2,32 +2,40 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/uk_UA/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas <Unknown>                                              |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['loginfailed'] = 'Невдала спроба входу';
+$messages['errortitle']  = 'Виникла помилка!';
+$messages['loginfailed']  = 'Невдала спроба входу';
 $messages['cookiesdisabled'] = 'Ваш переглядач не приймає cookie';
 $messages['sessionerror'] = 'Ваша сесія застаріла';
 $messages['storageerror'] = 'Невдале з`єднання з IMAP сервером';
 $messages['servererror'] = 'Помилка сервера!';
 $messages['servererrormsg'] = 'Помилка сервера: $msg';
 $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'] = 'Листів не знайдено';
 $messages['loggedout'] = 'Вашу сесію завершено. Всього найкращого!';
 $messages['mailboxempty'] = 'Поштова скринька порожня';
+$messages['refreshing'] = 'Оновлення...';
 $messages['loading'] = 'Завантаження...';
 $messages['uploading'] = 'Файл відправляється...';
 $messages['uploadingmany'] = 'Завантаження файлів...';
@@ -54,11 +62,11 @@ $messages['errormoving'] = 'Не вдалося перемістити лист�
 $messages['errorcopying'] = 'Не вдалося зкопіювати листи';
 $messages['errordeleting'] = 'Не вдалося видалити листи';
 $messages['errormarking'] = 'Не вдалося позначити листи';
-$messages['deletecontactconfirm'] = 'Ви дійсно бажаєте видалити вибрані контакти?';
-$messages['deletegroupconfirm'] = 'Ви дійсно хочете видалити обрану групу?';
+$messages['deletecontactconfirm']  = 'Ви дійсно бажаєте видалити вибрані контакти?';
+$messages['deletegroupconfirm']  = 'Ви дійсно хочете видалити обрану групу?';
 $messages['deletemessagesconfirm'] = 'Ви дійсно бажаєте видалити вибрані листи?';
-$messages['deletefolderconfirm'] = 'Ви дійсно бажаєте видалити цю папку?';
-$messages['purgefolderconfirm'] = 'Ви дійсно бажаєте видалити всі листи у цій папці?';
+$messages['deletefolderconfirm']  = 'Ви дійсно бажаєте видалити цю папку?';
+$messages['purgefolderconfirm']  = 'Ви дійсно бажаєте видалити всі листи у цій папці?';
 $messages['contactdeleting'] = 'Видалення контакту(ів)...';
 $messages['groupdeleting'] = 'Видалення групи...';
 $messages['folderdeleting'] = 'Видалення папки...';
@@ -67,11 +75,11 @@ $messages['foldersubscribing'] = 'Підписати папку...';
 $messages['folderunsubscribing'] = 'Відписати папку...';
 $messages['formincomplete'] = 'Заповнено не всі поля';
 $messages['noemailwarning'] = 'Будь ласка, введіть коректну адресу електронної пошти';
-$messages['nonamewarning'] = 'Будь ласка, введіть ім`я';
+$messages['nonamewarning']  = 'Будь ласка, введіть ім`я';
 $messages['nopagesizewarning'] = 'Будь ласка, введіть розмір сторінки';
 $messages['nosenderwarning'] = 'Будь ласка, введіть адресу електронної пошти відправника';
 $messages['norecipientwarning'] = 'Будь ласка, вкажіть принаймні одного отримувача';
-$messages['nosubjectwarning'] = 'Не вказано тему листа. Бажаєте вказати її зараз?';
+$messages['nosubjectwarning']  = 'Не вказано тему листа. Бажаєте вказати її зараз?';
 $messages['nobodywarning'] = 'Відправити листа без тексту?';
 $messages['notsentwarning'] = 'Лист не було відправлено. Ви бажаєте відхилити відправку?';
 $messages['noldapserver'] = 'Будь ласка, виберіть LDAP сервер для пошуку';
@@ -106,14 +114,16 @@ $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['importerror'] = 'Імпорт завершився невдало! Завантажений файл не є правильним файлом vCard';
+$messages['importformaterror'] = 'Помилка імпорту! Завантажений файл має невідомий формат даних.';
 $messages['importconfirm'] = '<b>Успішно імпортовано $inserted контактів, пропущено $skipped існуючих</b>:<p><em>$names</em></p>';
 $messages['importconfirmskipped'] = '<b>Пропущені $skipped наявні записи</b>';
 $messages['opnotpermitted'] = 'Дія заборонена!';
@@ -155,4 +165,7 @@ $messages['invalidimageformat'] = 'Невірний формат зображе�
 $messages['mispellingsfound'] = 'Знайдено орфографічні помилки у повідомленні.';
 $messages['parentnotwritable'] = 'Неможливо створити/перемістити папку до обраної батьківської папки. Нема прав доступу.';
 $messages['messagetoobig'] = 'Частина повідомлення занадто велика для опрацювання.';
+$messages['attachmentvalidationerror'] = 'УВАГА! Це вкладення є підозрілим, тому що його тип не збігається з типом, оголошеним у повідомленні. Якщо ви не довіряєте відправнику, ви не повинні відкривати його в браузері, оскільки його вміст може бути шкідливим.<br/><br/><em>Очікуване: $expected; знайдене: $detected </em>';
+$messages['noscriptwarning'] = 'Увага: Даний клієнт електронної пошти потрібує Javascript! Для того, щоб використовувати його необхідно включити підтримку Javascript в налаштуваннях вашого браузера.';
 
+?>
diff --git a/program/localization/vi_VN/labels.inc b/program/localization/vi_VN/labels.inc
index 1edffbc1d..f1cf95149 100644
--- a/program/localization/vi_VN/labels.inc
+++ b/program/localization/vi_VN/labels.inc
@@ -2,58 +2,78 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/vi_VN/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Tran Khai Hoang <hanhvansu@yahoo.com>                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = 'Chào bạn đã đến với $product';
-$labels['username'] = 'Tên đăng nhập';
-$labels['password'] = 'Mật khẩu';
-$labels['server'] = 'Máy chủ';
-$labels['login'] = 'Đăng nhập';
-$labels['logout'] = 'Thoát';
-$labels['mail'] = 'Thư';
+
+// login page
+$labels['welcome']   = 'Chào bạn đã đến với $product';
+$labels['username']  = 'Tên đăng nhập';
+$labels['password']  = 'Mật khẩu';
+$labels['server']    = 'Máy chủ';
+$labels['login']     = 'Đăng nhập';
+
+// taskbar
+$labels['logout']   = 'Thoát';
+$labels['mail']     = 'Thư';
 $labels['settings'] = 'Tùy chọn';
 $labels['addressbook'] = 'Sổ địa chỉ';
-$labels['inbox'] = 'Hộp thư';
+
+// mailbox names
+$labels['inbox']  = 'Hộp thư';
 $labels['drafts'] = 'Thư nháp';
-$labels['sent'] = 'Đã gửi';
-$labels['trash'] = 'Sọt rác';
-$labels['junk'] = 'Thư rác';
+$labels['sent']   = 'Đã gửi';
+$labels['trash']  = 'Sọt rác';
+$labels['junk']   = 'Thư rác';
+
+// message listing
 $labels['subject'] = 'Tiêu đề';
-$labels['from'] = 'Người gửi';
-$labels['to'] = 'Người nhận';
-$labels['cc'] = 'Đồng kính gửi';
-$labels['bcc'] = 'Người đồng nhận (ngừoi nhận không thấy email của người khác cùng được nhận thư)';
+$labels['from']    = 'Người gửi';
+$labels['sender']  = 'Người gửi';
+$labels['to']      = 'Người nhận';
+$labels['cc']      = 'Đồng kính gửi';
+$labels['bcc']     = 'Người đồng nhận (ngừoi nhận không thấy email của người khác cùng được nhận thư)';
 $labels['replyto'] = 'Trả lời cho';
 $labels['followupto'] = 'Đánh dấu thư cần theo dõi';
-$labels['date'] = 'Ngày';
-$labels['size'] = 'Dung lượng';
+$labels['date']    = 'Ngày';
+$labels['size']    = 'Dung lượng';
 $labels['priority'] = 'Độ ưu tiên';
 $labels['organization'] = 'Tổ chức';
 $labels['readstatus'] = 'Trạng thái của thư';
 $labels['listoptions'] = 'Danh sách lựa chọn';
+
 $labels['mailboxlist'] = 'Các thư mục';
-$labels['folders'] = 'Các thư mục';
 $labels['messagesfromto'] = 'Thư từ $from đến $to trong tổng số $count';
 $labels['threadsfromto'] = 'Dòng thư từ $from đến $to của tổng số $count';
 $labels['messagenrof'] = 'Thư thứ $nr trong tổng số $count';
 $labels['fromtoshort'] = '$from - $to của $count';
-$labels['copy'] = 'Sao chép';
-$labels['move'] = 'Di Chuyển';
-$labels['moveto'] = 'Di chuyển tới...';
+
+$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ị';
+
 $labels['filename'] = 'Tên tập tin';
 $labels['filesize'] = 'Kích cỡ tập tin';
+
 $labels['addtoaddressbook'] = 'Thêm vào danh bạ';
+
+// weekdays short
 $labels['sun'] = 'Chủ Nhật';
 $labels['mon'] = 'Thứ Hai';
 $labels['tue'] = 'Thứ Ba';
@@ -61,78 +81,88 @@ $labels['wed'] = 'Thứ Tư';
 $labels['thu'] = 'Thứ Năm';
 $labels['fri'] = 'Thứ Sáu';
 $labels['sat'] = 'Thứ Bảy';
-$labels['sunday'] = 'Chủ Nhật';
-$labels['monday'] = 'Thứ Hai';
-$labels['tuesday'] = 'Thứ Ba';
+
+// weekdays long
+$labels['sunday']    = 'Chủ Nhật';
+$labels['monday']    = 'Thứ Hai';
+$labels['tuesday']   = 'Thứ Ba';
 $labels['wednesday'] = 'Thứ Tư';
-$labels['thursday'] = 'Thứ Năm';
-$labels['friday'] = 'Thứ Sáu';
-$labels['saturday'] = 'Thứ Bảy';
-$labels['jan'] = 'Tháng Một';
-$labels['feb'] = 'Tháng Hai';
-$labels['mar'] = 'Tháng Ba';
-$labels['apr'] = 'Tháng Tư';
-$labels['may'] = 'Tháng Năm';
-$labels['longmay'] = 'Tháng Năm';
-$labels['jun'] = 'Tháng Sáu';
-$labels['jul'] = 'Tháng Bảy';
-$labels['aug'] = 'Tháng Tám';
-$labels['sep'] = 'Tháng Chín';
-$labels['oct'] = 'Tháng Mười';
-$labels['nov'] = 'Tháng Mười Một';
-$labels['dec'] = 'Tháng Mười Hai';
-$labels['longjan'] = 'Tháng Một';
-$labels['longfeb'] = 'Tháng Hai';
-$labels['longmar'] = 'Tháng Ba';
-$labels['longapr'] = 'Tháng Tư';
-$labels['longjun'] = 'Tháng Sáu';
-$labels['longjul'] = 'Tháng Bảy';
-$labels['longaug'] = 'Tháng Tám';
-$labels['longsep'] = 'Tháng Chín';
-$labels['longoct'] = 'Tháng Mười';
-$labels['longnov'] = 'Tháng Mười Một';
-$labels['longdec'] = 'Tháng Mười Hai';
+$labels['thursday']  = 'Thứ Năm';
+$labels['friday']    = 'Thứ Sáu';
+$labels['saturday']  = 'Thứ Bảy';
+
+// months short
+$labels['jan']	= 'Tháng Một';
+$labels['feb']	= 'Tháng Hai';
+$labels['mar']	= 'Tháng Ba';
+$labels['apr']	= 'Tháng Tư';
+$labels['may']	= 'Tháng Năm';
+$labels['jun']	= 'Tháng Sáu';
+$labels['jul'] 	= 'Tháng Bảy';
+$labels['aug']	= 'Tháng Tám';
+$labels['sep']	= 'Tháng Chín';
+$labels['oct']	= 'Tháng Mười';
+$labels['nov']	= 'Tháng Mười Một';
+$labels['dec']	= 'Tháng Mười Hai';
+
+// months long
+$labels['longjan']	= 'Tháng Một';
+$labels['longfeb']	= 'Tháng Hai';
+$labels['longmar']	= 'Tháng Ba';
+$labels['longapr']	= 'Tháng Tư';
+$labels['longmay']	= 'Tháng Năm';
+$labels['longjun']	= 'Tháng Sáu';
+$labels['longjul']	= 'Tháng Bảy';
+$labels['longaug']	= 'Tháng Tám';
+$labels['longsep']	= 'Tháng Chín';
+$labels['longoct']	= 'Tháng Mười';
+$labels['longnov']	= 'Tháng Mười Một';
+$labels['longdec']	= 'Tháng Mười Hai';
+
 $labels['today'] = 'Hôm nay';
-$labels['refresh'] = 'Nạp lại';
-$labels['checkmail'] = 'Kiểm tra thư mới';
-$labels['compose'] = 'Soạn thư';
-$labels['writenewmessage'] = 'Viết thư mới';
-$labels['reply'] = 'Trả lời thư';
-$labels['replytomessage'] = 'Trả lời thư người gửi';
+
+// toolbar buttons
+$labels['refresh']          = 'Nạp lại';
+$labels['checkmail']        = 'Kiểm tra thư mới';
+$labels['compose']          = 'Soạn thư';
+$labels['writenewmessage']  = 'Viết thư mới';
+$labels['reply']            = 'Trả lời thư';
+$labels['replytomessage']   = 'Trả lời thư người gửi';
 $labels['replytoallmessage'] = 'Trả lời lại danh sách hoặc tới tất cả người gửi và người nhận của thư này';
-$labels['replyall'] = 'Trả lời tất cả';
-$labels['replylist'] = 'Danh sách trả lời';
-$labels['forward'] = 'Chuyển tiếp';
-$labels['forwardinline'] = 'Chuyển tiếp thư';
+$labels['replyall']         = 'Trả lời tất cả';
+$labels['replylist']        = 'Danh sách trả lời';
+$labels['forward']          = 'Chuyển tiếp';
+$labels['forwardinline']    = 'Chuyển tiếp thư';
 $labels['forwardattachment'] = 'Chuyển tiếp theo phương cách đính kèm';
-$labels['forwardmessage'] = 'Chuyển tiếp thư';
-$labels['deletemessage'] = 'Xóa thư';
+$labels['forwardmessage']   = 'Chuyển tiếp thư';
+$labels['deletemessage']    = 'Xóa thư';
 $labels['movemessagetotrash'] = 'Chuyển thư vào thùng rác';
-$labels['printmessage'] = 'In thư này';
-$labels['previousmessage'] = 'Hiển thị thư trước đó';
-$labels['firstmessage'] = 'Hiển thị thư đầu tiên';
-$labels['nextmessage'] = 'Hiển thị thư tiếp theo';
-$labels['lastmessage'] = 'Hiển thị thư cuối';
-$labels['backtolist'] = 'Quay lại danh sách thư';
-$labels['viewsource'] = 'Hiển thị nguồn';
-$labels['mark'] = 'Đánh dấu';
-$labels['markmessages'] = 'Đánh dấu các thư';
-$labels['markread'] = 'Là đã đọc';
-$labels['markunread'] = 'Là chưa đọc';
-$labels['markflagged'] = 'Là quan trọng';
-$labels['markunflagged'] = 'Là không quan trọng';
-$labels['moreactions'] = 'Thêm hành động...';
-$labels['more'] = 'Thêm';
-$labels['back'] = 'Quay lại';
-$labels['options'] = 'Tuỳ chọn';
+$labels['printmessage']     = 'In thư này';
+$labels['previousmessage']  = 'Hiển thị thư trước đó';
+$labels['firstmessage']     = 'Hiển thị thư đầu tiên';
+$labels['nextmessage']      = 'Hiển thị thư tiếp theo';
+$labels['lastmessage']      = 'Hiển thị thư cuối';
+$labels['backtolist']       = 'Quay lại danh sách thư';
+$labels['viewsource']       = 'Hiển thị nguồn';
+$labels['mark']             = 'Đánh dấu';
+$labels['markmessages']     = 'Đánh dấu các thư';
+$labels['markread']         = 'Là đã đọc';
+$labels['markunread']       = 'Là chưa đọc';
+$labels['markflagged']      = 'Là quan trọng';
+$labels['markunflagged']    = 'Là không quan trọng';
+$labels['moreactions']      = 'Thêm hành động...';
+$labels['more']             = 'Thêm';
+$labels['back']             = 'Quay lại';
+$labels['options']          = 'Tuỳ chọn';
+
 $labels['select'] = 'Lựa chọn';
 $labels['all'] = 'Tất cả';
 $labels['none'] = 'Không có';
-$labels['nonesort'] = 'Không có';
 $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';
@@ -143,12 +173,14 @@ $labels['expand-all'] = 'Mở rộng tất cả';
 $labels['expand-unread'] = 'Mở rộng thư chưa đọc';
 $labels['collapse-all'] = 'Đóng hết';
 $labels['threaded'] = 'Đã nhóm theo chủ đề thư';
+
 $labels['autoexpand_threads'] = 'Mở rộng các chủ đề thư';
 $labels['do_expand'] = 'Tất cả các chủ đề thư';
 $labels['expand_only_unread'] = 'Chỉ với những thư chưa đọc';
 $labels['fromto'] = 'Từ/Đến';
 $labels['flag'] = 'Đánh dấu';
 $labels['attachment'] = 'Đính kèm';
+$labels['nonesort'] = 'Không có';
 $labels['sentdate'] = 'Ngày đã gửi';
 $labels['arrival'] = 'Ngày đến';
 $labels['asc'] = 'Tăng dần';
@@ -157,182 +189,220 @@ $labels['listcolumns'] = 'Các cột danh sách';
 $labels['listsorting'] = 'Cột sắp xếp';
 $labels['listorder'] = 'Thứ tự sắp xếp';
 $labels['listmode'] = 'Xem dạng danh sách';
+
 $labels['folderactions'] = 'Thao tác với thư mục';
 $labels['compact'] = 'Nén';
 $labels['empty'] = 'Trống';
+
 $labels['quota'] = 'Lượng đĩa sử dụng';
-$labels['unknown'] = 'Không rõ';
-$labels['unlimited'] = 'không giới hạn';
-$labels['quicksearch'] = 'Tìm nhanh';
-$labels['resetsearch'] = 'Thiết lập lại tìm kiếm';
-$labels['searchmod'] = 'Tìm kiếm với từ khóa và ký tự đặc biệt [() : " - ]';
-$labels['msgtext'] = 'Toàn bộ thư';
+$labels['unknown']  = 'Không rõ';
+$labels['unlimited']  = 'không giới hạn';
+
+$labels['quicksearch']  = 'Tìm nhanh';
+$labels['resetsearch']  = 'Thiết lập lại tìm kiếm';
+$labels['searchmod']  = 'Tìm kiếm với từ khóa và ký tự đặc biệt [() : " - ]';
+$labels['msgtext']  = 'Toàn bộ thư';
+$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['editasnew'] = 'Sửa như một email mới';
-$labels['send'] = 'Gửi';
-$labels['sendmessage'] = 'Gửi thư';
-$labels['savemessage'] = 'Lưu dạng nháp';
-$labels['addattachment'] = 'Kèm theo tập tin';
-$labels['charset'] = 'Bộ ký tự';
-$labels['editortype'] = 'Loại trình soạn thảo';
-$labels['returnreceipt'] = 'Báo nhận';
-$labels['dsn'] = 'Thông báo trạng thái gửi thư';
+$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';
+$labels['send']           = 'Gửi';
+$labels['sendmessage']    = 'Gửi thư';
+$labels['savemessage']    = 'Lưu dạng nháp';
+$labels['addattachment']  = 'Kèm theo tập tin';
+$labels['charset']        = 'Bộ ký tự';
+$labels['editortype']     = 'Loại trình soạn thảo';
+$labels['returnreceipt']  = 'Báo nhận';
+$labels['dsn']            = 'Thông báo trạng thái gửi thư';
 $labels['mailreplyintro'] = 'Vào ngày $date, $sender viết:';
 $labels['originalmessage'] = 'Thư gốc';
-$labels['editidents'] = 'Chỉnh sửa nhận diện';
-$labels['spellcheck'] = 'Đánh vần';
+
+$labels['editidents']    = 'Chỉnh sửa nhận diện';
+$labels['spellcheck']    = 'Đánh vần';
 $labels['checkspelling'] = 'Kiểm tra chính tả';
 $labels['resumeediting'] = 'Tiếp tục soạn thảo';
-$labels['revertto'] = 'Trở lại với';
+$labels['revertto']      = 'Trở lại với';
+
 $labels['attach'] = 'Đính kèm';
 $labels['attachments'] = 'Các đính kèm';
 $labels['upload'] = 'Tải lên';
 $labels['uploadprogress'] = '$percent ($current từ $total)';
-$labels['close'] = 'Đóng';
-$labels['messageoptions'] = 'Tùy chọn cho thư...';
-$labels['low'] = 'Thấp';
-$labels['lowest'] = 'Thấp nhất';
-$labels['normal'] = 'Bình thường';
-$labels['high'] = 'Cao';
+$labels['close']  = 'Đóng';
+$labels['messageoptions']  = 'Tùy chọn cho thư...';
+
+$labels['low']     = 'Thấp';
+$labels['lowest']  = 'Thấp nhất';
+$labels['normal']  = 'Bình thường';
+$labels['high']    = 'Cao';
 $labels['highest'] = 'Cao nhất';
-$labels['nosubject'] = '(Không có chủ đề)';
+
+$labels['nosubject']  = '(Không có chủ đề)';
 $labels['showimages'] = 'Hiển thị ảnh';
 $labels['alwaysshow'] = 'Luôn luôn hiển thị ảnh từ $sender';
-$labels['isdraft'] = 'Đây là thư nháp';
-$labels['andnmore'] = 'Thêm $nr';
+$labels['isdraft']    = 'Đây là thư nháp';
+$labels['andnmore']   = 'Thêm $nr';
 $labels['togglemoreheaders'] = 'Hiển thị chi tiết thông tin thư';
 $labels['togglefullheaders'] = 'Mở/đóng chi tiết thông tin thư';
+
 $labels['htmltoggle'] = 'Mã HTML';
 $labels['plaintoggle'] = 'Văn bản thô';
 $labels['savesentmessagein'] = 'Lưu thư đã gửi trong';
 $labels['dontsave'] = 'Không lưu';
 $labels['maxuploadsize'] = 'Dung lượng tập tin tối đa cho phép là $size';
+
 $labels['addcc'] = 'Thêm Cc';
 $labels['addbcc'] = 'Thêm Bcc';
 $labels['addreplyto'] = 'Thêm trả lời tới';
 $labels['addfollowupto'] = 'Thêm sự theo dõi tới';
+
+// mdn
 $labels['mdnrequest'] = 'Người gửi thư này muốn nhận được thông báo khi bạn đọc thư. Bạn có muốn cho người gửi biết thông báo này không?';
 $labels['receiptread'] = 'Biên nhận (đã đọc)';
 $labels['yourmessage'] = 'Đây là sự trả lại xác nhận cho thư của bạn';
 $labels['receiptnote'] = 'Lưu ý: Biên nhận này chỉ báo rằng thư đã được hiển thị trên máy tính của người nhận. Không bảo đảm rằng người nhận đó đã có đọc hoặc hiểu nội dung thư.';
-$labels['name'] = 'Tên hiển thị';
-$labels['firstname'] = 'Tên Gọi';
-$labels['surname'] = 'Tên Họ';
-$labels['middlename'] = 'Tên đệm';
-$labels['nameprefix'] = 'Tiền tố';
-$labels['namesuffix'] = 'Hậu tố';
-$labels['nickname'] = 'Biệt danh';
-$labels['jobtitle'] = 'Chức danh Công việc';
-$labels['department'] = 'Khoa/Ban';
-$labels['gender'] = 'Giới tính';
-$labels['maidenname'] = 'Tên thời con gái';
-$labels['email'] = 'Thư điện tử';
-$labels['phone'] = 'Điện thoại';
-$labels['address'] = 'Địa chỉ';
-$labels['street'] = 'Đường';
-$labels['locality'] = 'Thành phố';
-$labels['zipcode'] = 'Mã bưu điện';
-$labels['region'] = 'Bang/Tỉnh';
-$labels['country'] = 'Quốc gia';
-$labels['birthday'] = 'Ngày sinh';
-$labels['anniversary'] = 'Kỷ niệm';
-$labels['website'] = 'Trang Web';
+
+// address boook
+$labels['name']         = 'Tên hiển thị';
+$labels['firstname']    = 'Tên Gọi';
+$labels['surname']      = 'Tên Họ';
+$labels['middlename']   = 'Tên đệm';
+$labels['nameprefix']   = 'Tiền tố';
+$labels['namesuffix']   = 'Hậu tố';
+$labels['nickname']     = 'Biệt danh';
+$labels['jobtitle']     = 'Chức danh Công việc';
+$labels['department']   = 'Khoa/Ban';
+$labels['gender']       = 'Giới tính';
+$labels['maidenname']   = 'Tên thời con gái';
+$labels['email']        = 'Thư điện tử';
+$labels['phone']        = 'Điện thoại';
+$labels['address']      = 'Địa chỉ';
+$labels['street']       = 'Đường';
+$labels['locality']     = 'Thành phố';
+$labels['zipcode']      = 'Mã bưu điện';
+$labels['region']       = 'Bang/Tỉnh';
+$labels['country']      = 'Quốc gia';
+$labels['birthday']     = 'Ngày sinh';
+$labels['anniversary']  = 'Kỷ niệm';
+$labels['website']      = 'Trang Web';
 $labels['instantmessenger'] = 'Tin nhắn nhanh';
 $labels['notes'] = 'Các ghi chú';
-$labels['male'] = 'Nam';
+$labels['male']   = 'Nam';
 $labels['female'] = 'Nữ';
 $labels['manager'] = 'Người quản lý';
 $labels['assistant'] = 'Trợ lý';
-$labels['typeassistant'] = 'Trợ lý';
 $labels['spouse'] = 'Vợ/Chồng';
 $labels['allfields'] = 'Tất cả các lĩnh vực';
 $labels['search'] = 'Tìm kiếm';
 $labels['advsearch'] = 'Tìm kiếm chi tiết';
 $labels['advanced'] = 'Nâng cao';
 $labels['other'] = 'Loại khác';
-$labels['typeother'] = 'Loại khác';
-$labels['typehome'] = 'Thư mục chính';
-$labels['typework'] = 'Cơ quan';
-$labels['typemobile'] = 'Số di động';
-$labels['typemain'] = 'Chính';
-$labels['typehomefax'] = 'Điện thư ở Nhà';
-$labels['typeworkfax'] = 'Điện thư cơ quan';
-$labels['typecar'] = 'Xe';
-$labels['typepager'] = 'Máy nhắn tin';
-$labels['typevideo'] = 'Phim';
-$labels['typehomepage'] = 'Trang nhà';
+
+$labels['typehome']   = 'Thư mục chính';
+$labels['typework']   = 'Cơ quan';
+$labels['typeother']  = 'Loại khác';
+$labels['typemobile']  = 'Số di động';
+$labels['typemain']  = 'Chính';
+$labels['typehomefax']  = 'Điện thư ở Nhà';
+$labels['typeworkfax']  = 'Điện thư cơ quan';
+$labels['typecar']  = 'Xe';
+$labels['typepager']  = 'Máy nhắn tin';
+$labels['typevideo']  = 'Phim';
+$labels['typeassistant']  = 'Trợ lý';
+$labels['typehomepage']  = 'Trang nhà';
 $labels['typeblog'] = 'Trang nhật ký';
 $labels['typeprofile'] = 'Lý lịch';
+
 $labels['addfield'] = 'Thêm lĩnh vực...';
 $labels['addcontact'] = 'Thêm một liên hệ mới';
 $labels['editcontact'] = 'Sửa liên lạc';
 $labels['contacts'] = 'Danh bạ';
 $labels['contactproperties'] = 'Tính chất của liên hệ';
 $labels['personalinfo'] = 'Thông tin cá nhân';
-$labels['edit'] = 'Chỉnh sửa';
+
+$labels['edit']   = 'Chỉnh sửa';
 $labels['cancel'] = 'Huỷ';
-$labels['save'] = 'Lưu';
+$labels['save']   = 'Lưu';
 $labels['delete'] = 'Xóa';
 $labels['rename'] = 'Đổi tên';
 $labels['addphoto'] = 'Thêm';
 $labels['replacephoto'] = 'Thay thế';
 $labels['uploadphoto'] = 'Tải ảnh lên';
-$labels['newcontact'] = 'Tạo danh bạ mới';
-$labels['deletecontact'] = 'Xoá các liên lạc đã chọn';
-$labels['composeto'] = 'Soạn thư cho';
+
+$labels['newcontact']     = 'Tạo danh bạ mới';
+$labels['deletecontact']  = 'Xoá các liên lạc đã chọn';
+$labels['composeto']      = 'Soạn thư cho';
 $labels['contactsfromto'] = 'Liên hệ từ $from - $to / $count';
-$labels['print'] = 'In ra';
-$labels['export'] = 'Trích xuất';
-$labels['exportvcards'] = 'Tải dữ liệu máy theo định dạng vCard';
+$labels['print']          = 'In ra';
+$labels['export']         = 'Trích xuất';
+$labels['exportall']      = 'Xuất tất cả';
+$labels['exportsel']      = 'Xuất mục chọn';
+$labels['exportvcards']   = 'Tải dữ liệu máy theo định dạng vCard';
 $labels['newcontactgroup'] = 'Tạo nhóm liên lạc mới';
-$labels['grouprename'] = 'Đổi tên nhóm';
-$labels['groupdelete'] = 'Xóa nhóm';
+$labels['grouprename']    = 'Đổi tên nhóm';
+$labels['groupdelete']    = 'Xóa nhóm';
 $labels['groupremoveselected'] = 'Xóa bỏ các liên lạc được chọn từ nhóm';
-$labels['previouspage'] = 'Hiển thị trang trước';
-$labels['firstpage'] = 'Hiển thị trang đầu tiên';
-$labels['nextpage'] = 'Hiển thị trang kế tiếp';
-$labels['lastpage'] = 'Hiển thị trang cuối';
+
+$labels['previouspage']   = 'Hiển thị trang trước';
+$labels['firstpage']      = 'Hiển thị trang đầu tiên';
+$labels['nextpage']       = 'Hiển thị trang kế tiếp';
+$labels['lastpage']       = 'Hiển thị trang cuối';
+
 $labels['group'] = 'Nhóm';
 $labels['groups'] = 'Các nhóm';
 $labels['personaladrbook'] = 'Các địa chỉ cá nhân';
+
 $labels['searchsave'] = 'Lưu tìm kiếm';
 $labels['searchdelete'] = 'Xóa tìm kiếm';
+
 $labels['import'] = 'Nhập';
 $labels['importcontacts'] = 'Nhập liên lạc';
 $labels['importfromfile'] = 'Nhập từ tập tin:';
 $labels['importtarget'] = 'Thêm liên lạc mới vào sổ địa chỉ';
 $labels['importreplace'] = 'Thay thế toàn bộ sổ địa chỉ';
+$labels['importdesc'] = 'Bạn có thể cập nhật các liên hệ từ một sổ địa chỉ có sẵn.<br />Hiện tại, chúng tôi hỗ trợ nhập địa chỉ từ dạng dữ liệu <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> hoặc CSV (dạng thức dữ liệu ngăn cách bằng dấu phẩy)';
 $labels['done'] = 'Hoàn tất';
+
+// settings
 $labels['settingsfor'] = 'Thiết lập cho';
 $labels['about'] = 'Lời ngõ';
 $labels['preferences'] = 'Sở thích';
 $labels['userpreferences'] = 'Sở thích người dùng';
 $labels['editpreferences'] = 'Chỉnh sửa sở thích';
+
 $labels['identities'] = 'Các nhận diện';
 $labels['manageidentities'] = 'Quản lý nhận diện cho trương mục này';
 $labels['newidentity'] = 'Nhận diện mới';
+
 $labels['newitem'] = 'Mục mới';
 $labels['edititem'] = 'Sửa đổi mục';
+
 $labels['preferhtml'] = 'Hiển thị HTML';
 $labels['defaultcharset'] = 'Bộ ký tự mặc định';
 $labels['htmlmessage'] = 'Thư theo định dạng HTML';
+$labels['messagepart'] = 'Một phần';
+$labels['digitalsig'] = 'Chữ ký điện tử';
 $labels['dateformat'] = 'Định dạng ngày tháng';
 $labels['timeformat'] = 'Định dạng thời gian';
 $labels['prettydate'] = 'Ngày tháng đầy đủ';
-$labels['setdefault'] = 'Thiết lập mặc định';
-$labels['autodetect'] = 'Tự động';
-$labels['language'] = 'Ngôn ngữ';
-$labels['timezone'] = 'Múi giờ';
-$labels['pagesize'] = 'Số dòng trên trang';
+$labels['setdefault']  = 'Thiết lập mặc định';
+$labels['autodetect']  = 'Tự động';
+$labels['language']  = 'Ngôn ngữ';
+$labels['timezone']  = 'Múi giờ';
+$labels['pagesize']  = 'Số dòng trên trang';
 $labels['signature'] = 'Chữ ký';
-$labels['dstactive'] = 'Giờ mùa hè';
+$labels['dstactive']  = 'Giờ mùa hè';
 $labels['showinextwin'] = 'Mở thư trong khung mới';
 $labels['composeextwin'] = 'Soạn thư trong khung mới';
 $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';
@@ -355,10 +425,11 @@ $labels['showremoteimages'] = 'Hiển thị ảnh nội tuyến từ xa';
 $labels['fromknownsenders'] = 'Từ người gửi đã biết';
 $labels['always'] = 'luôn luôn';
 $labels['showinlineimages'] = 'Hiển thị ảnh đính kèm phía dưới thư';
-$labels['autosavedraft'] = 'Tự động lưu bản nháp';
-$labels['everynminutes'] = '$n phút một lần';
-$labels['never'] = 'không bao giờ';
-$labels['immediately'] = 'ngay lập tức';
+$labels['autosavedraft']  = 'Tự động lưu bản nháp';
+$labels['everynminutes']  = '$n phút một lần';
+$labels['refreshinterval']  = 'Tải dữ liệu mới (ví dụ: kiểm tra thư mới)';
+$labels['never']  = 'không bao giờ';
+$labels['immediately']  = 'ngay lập tức';
 $labels['messagesdisplaying'] = 'Đang hiển thị thư';
 $labels['messagescomposition'] = 'Đang viết thư';
 $labels['mimeparamfolding'] = 'Tên đính kèm';
@@ -385,15 +456,13 @@ $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';
+$labels['previewpanemarkread']  = 'Đánh dẫu thư xem thử là đã đọc';
+$labels['afternseconds']  = 'sau $n giây';
 $labels['reqmdn'] = 'Luôn luôn yêu cầu biên nhận khi gửi thư';
 $labels['reqdsn'] = 'Luôn yêu cầu xác nhận trạng thái thư cho người gửi';
 $labels['replysamefolder'] = 'Đưa các thư phản hồi  vào cùng thư mục của thư đang trả lời';
+$labels['defaultabook'] = 'Sổ địa chỉ mặc định';
 $labels['autocompletesingle'] = 'Bỏ qua địa chỉ email thay thế trong năng tự động gõ';
 $labels['listnamedisplay'] = 'Hiện thị danh sách liên lạc như là';
 $labels['spellcheckbeforesend'] = 'Kiểm tra chính tả trước khi gửi thư';
@@ -406,13 +475,15 @@ $labels['mailtoprotohandler'] = 'Xác định cách xử lý giao thức mailto:
 $labels['forwardmode'] = 'Chuyển tiếp thư';
 $labels['inline'] = 'nội tuyến';
 $labels['asattachment'] = 'dạng gửi kèm';
-$labels['folder'] = 'Thư mục';
-$labels['foldername'] = 'Tên thư mục';
-$labels['subscribed'] = 'Đã đăng ký';
+
+$labels['folder']  = 'Thư mục';
+$labels['folders']  = 'Các thư mục';
+$labels['foldername']  = 'Tên thư mục';
+$labels['subscribed']  = 'Đã đăng ký';
 $labels['messagecount'] = 'Các tin nhắn';
-$labels['create'] = 'Tạo';
-$labels['createfolder'] = 'Tạo thư mục mới';
-$labels['managefolders'] = 'Quản lý các thư mục';
+$labels['create']  = 'Tạo';
+$labels['createfolder']  = 'Tạo thư mục mới';
+$labels['managefolders']  = 'Quản lý các thư mục';
 $labels['specialfolders'] = 'Thư mục đặc biệt';
 $labels['properties'] = 'Các thuộc tính';
 $labels['folderproperties'] = 'Thuộc tính thư mục';
@@ -422,22 +493,29 @@ $labels['info'] = 'Thông tin';
 $labels['getfoldersize'] = 'Nhấp chuột để xem kích thước thư mục';
 $labels['changesubscription'] = 'Nhấp chuột để đổi cách đóng góp';
 $labels['foldertype'] = 'Kiểu thư mục';
-$labels['personalfolder'] = 'Thư mục cá nhân';
-$labels['otherfolder'] = 'Thư mục khác của Người dùng';
-$labels['sharedfolder'] = 'Thư mục công khai';
+$labels['personalfolder']  = 'Thư mục cá nhân';
+$labels['otherfolder']  = 'Thư mục khác của Người dùng';
+$labels['sharedfolder']  = 'Thư mục công khai';
+
 $labels['sortby'] = 'Soạn theo';
-$labels['sortasc'] = 'Soạn tăng dần';
+$labels['sortasc']  = 'Soạn tăng dần';
 $labels['sortdesc'] = 'Soạn giảm dần';
 $labels['undo'] = 'Hoàn lại';
+
+$labels['installedplugins'] = 'Các chương trình phụ trợ đã được cài đặt';
 $labels['plugin'] = 'Phần bổ sung';
 $labels['version'] = 'Phiên bản';
 $labels['source'] = 'Nguồn';
 $labels['license'] = 'Bản quyền';
 $labels['support'] = 'Yêu cầu hỗ trợ';
+
+// units
 $labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
 $labels['GB'] = 'GB';
+
+// character sets
 $labels['unicode'] = 'Unicode';
 $labels['english'] = 'Tiếng Anh';
 $labels['westerneuropean'] = 'Tiếng Tây Âu';
@@ -457,3 +535,4 @@ $labels['japanese'] = 'Tiếng Nhật';
 $labels['korean'] = 'Tiếng Hàn';
 $labels['chinese'] = 'Tiếng Hoa';
 
+?>
diff --git a/program/localization/vi_VN/messages.inc b/program/localization/vi_VN/messages.inc
index 73435b6e3..50bf71846 100644
--- a/program/localization/vi_VN/messages.inc
+++ b/program/localization/vi_VN/messages.inc
@@ -2,20 +2,23 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/vi_VN/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Kenny Tran <kennethanh@gmail.com>                             |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['errortitle'] = 'Xuất hiện 1 lỗi';
-$messages['loginfailed'] = 'Không đăng nhập được';
+$messages['errortitle']  = 'Xuất hiện 1 lỗi';
+$messages['loginfailed']  = 'Không đăng nhập được';
 $messages['cookiesdisabled'] = 'Trình duyệt không hỗ trợ cookies';
 $messages['sessionerror'] = 'Phiên làm việc không hợp lệ hoặc đã hết hạn';
 $messages['storageerror'] = 'Không kết nối được với máy chủ IMAP';
@@ -23,13 +26,16 @@ $messages['servererror'] = 'Lỗi máy chủ';
 $messages['servererrormsg'] = 'Lỗi máy chủ';
 $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. Giữ liệu chỉ cho phép đọc.';
-$messages['errornoperm'] = 'Không thể thực hiện thao tác. Sự cho phép bị từ chối.';
+$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.';
 $messages['loggedout'] = 'Phiên làm việc đã kết thúc thành công. Hẹn gặp lại!';
 $messages['mailboxempty'] = 'Hộp thư rỗng';
+$messages['refreshing'] = 'Đang tải xuống bản cập nhật mới...';
 $messages['loading'] = 'Đang tải...';
 $messages['uploading'] = 'Đang tải lên tập tin...';
 $messages['uploadingmany'] = 'Đang tải lên các tập tin';
@@ -56,11 +62,11 @@ $messages['errormoving'] = 'Không thể chuyển được thư';
 $messages['errorcopying'] = 'Không thể sao chép thư';
 $messages['errordeleting'] = 'Không thể xóa được thư';
 $messages['errormarking'] = 'Không thể đánh dấu (các) thư';
-$messages['deletecontactconfirm'] = 'Bạn có thực sự muốn xoá liên hệ đã chọn?';
-$messages['deletegroupconfirm'] = 'Bạn có thực sự muốn xóa nhóm đã chọn?';
+$messages['deletecontactconfirm']  = 'Bạn có thực sự muốn xoá liên hệ đã chọn?';
+$messages['deletegroupconfirm']  = 'Bạn có thực sự muốn xóa nhóm đã chọn?';
 $messages['deletemessagesconfirm'] = 'Bạn thực sự có muốn xóa (các) thư đã chọn?';
-$messages['deletefolderconfirm'] = 'Bạn có thực sự muốn xóa giữ liệu này?';
-$messages['purgefolderconfirm'] = 'Bạn có thực sự muốn xóa toàn bộ thư trong giữ liệu này?';
+$messages['deletefolderconfirm']  = 'Bạn có thực sự muốn xóa giữ liệu này?';
+$messages['purgefolderconfirm']  = 'Bạn có thực sự muốn xóa toàn bộ thư trong giữ liệu này?';
 $messages['contactdeleting'] = 'Đang xóa (các) liên lạc...';
 $messages['groupdeleting'] = 'Đang xóa nhóm...';
 $messages['folderdeleting'] = 'Đang xóa giữ liệu...';
@@ -69,11 +75,11 @@ $messages['foldersubscribing'] = 'Nhập vào giữ liệu...';
 $messages['folderunsubscribing'] = 'Không nhập giữ liệu...';
 $messages['formincomplete'] = 'Mẫu đơn chưa được hoàn toàn điền xong.';
 $messages['noemailwarning'] = 'Xin nhập địa chỉ email hợp lệ.';
-$messages['nonamewarning'] = 'Xin nhập tên.';
+$messages['nonamewarning']  = 'Xin nhập tên.';
 $messages['nopagesizewarning'] = 'Xin nhập kích cỡ của trang.';
 $messages['nosenderwarning'] = 'Xin nhập địa chỉ email người gửi';
 $messages['norecipientwarning'] = 'Xin nhập it nhất 1 người nhận.';
-$messages['nosubjectwarning'] = 'Mục "Tiêu đề" vẫn còn trống. Bạn có muốn nhập tiêu đề bây giờ không?';
+$messages['nosubjectwarning']  = 'Mục "Tiêu đề" vẫn còn trống. Bạn có muốn nhập tiêu đề bây giờ không?';
 $messages['nobodywarning'] = 'Gửi thư không có nội dung?';
 $messages['notsentwarning'] = 'Thư chưa được gửi. Bỏ qua thư đang soạn?';
 $messages['noldapserver'] = 'Chọn máy chủ ldap server để tìm';
@@ -117,12 +123,13 @@ $messages['contactaddedtogroup'] = 'Thêm liên lạc vào nhóm này thành cô
 $messages['contactremovedfromgroup'] = 'Xóa liên lạc khỏi nhóm này thành công';
 $messages['nogroupassignmentschanged'] = 'Không quy nhóm nào đả được thay đổi';
 $messages['importwait'] = 'Đang nhập, xin chờ...';
+$messages['importformaterror'] = 'Nhập dữ liệu lỗi. Tệp tin vừa tải lên không phải tệp dữ liệu chính xác.';
 $messages['importconfirm'] = 'Đã nhập $inserted liên hệ đã chèn vào thành công.';
 $messages['importconfirmskipped'] = 'Đã bỏ qua được $skipped mục tồn tại.';
 $messages['opnotpermitted'] = 'Thao tác không được cho phép!';
 $messages['nofromaddress'] = 'Địa chỉ email mất ở trong nhận dạng đã chọn';
 $messages['editorwarning'] = 'Việc chuyển soạn thảo text gốc sẽ gây ra toàn bộ định dạng text đã có bị mất. Bạn có muốn tiếp tục không?';
-$messages['httpreceivedencrypterror'] = 'Xuất hiện một lỗi cấu hình  tai hại. Hãy liên hệ với ngừoi quản trị ngay. <b> Thư của bạn không thể gửi được </b>';
+$messages['httpreceivedencrypterror'] = 'Xuất hiện một lỗi cấu hình  tai hại. Hãy liên hệ với người quản trị ngay. <b> Thư của bạn không thể gửi được </b>';
 $messages['smtpconnerror'] = 'Lỗi SMTP ($code): Kết nỗi tới máy chủ bị lỗi.';
 $messages['smtpautherror'] = 'Lỗi SMTP ($code): Xác thực thất bại.';
 $messages['smtpfromerror'] = 'Lỗi SMTP ($code):  Không thể bố trí người gửi "$from" ($msg).';
@@ -158,4 +165,7 @@ $messages['invalidimageformat'] = 'Không phải là định dạng ảnh hợp
 $messages['mispellingsfound'] = 'Lỗi chính tả được phát hiện trong thư';
 $messages['parentnotwritable'] = 'Không thể tạo/chuyển folder vào folder gốc đã chọn. Không có quyền truy cập.';
 $messages['messagetoobig'] = 'Một phần thư quá lớn để xử lý nó.';
+$messages['attachmentvalidationerror'] = 'Cảnh báo: Tệp tin đính kèm có dấu hiệu nguy hiểm, vì kiểu tệp tin không trùng với kiểu được khai báo sử dụng trong thư. Nếu bạn không biết người gửi, bạn không nên mở thư vì nó có thể có các dữ liệu gây hại. <br/><br/><em>Dự kiến: $expected; được tìm thấy: $detected</em>';
+$messages['noscriptwarning'] = 'Cảnh báo: Dịch vụ webmail này yêu cầu sử dụng Javascript. Để sử dụng, bạn cần kích hoạt hỗ trợ Javascript trong cấu hình trình duyệt Internet đang sử dụng.';
 
+?>
diff --git a/program/localization/zh_CN/labels.inc b/program/localization/zh_CN/labels.inc
index 1de39e491..23a42b96d 100644
--- a/program/localization/zh_CN/labels.inc
+++ b/program/localization/zh_CN/labels.inc
@@ -2,151 +2,185 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/zh_CN/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Christopher Meng <cickumqt@gmail.com>                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = '欢迎使用 $product';
-$labels['username'] = '用户名';
-$labels['password'] = '密码';
-$labels['server'] = '服务器';
-$labels['login'] = '登录';
-$labels['logout'] = '注销';
-$labels['mail'] = '邮件';
+
+// login page
+$labels['welcome']   = '欢迎使用 $product';
+$labels['username']  = '用户名';
+$labels['password']  = '密码';
+$labels['server']    = '服务器';
+$labels['login']     = '登录';
+
+// taskbar
+$labels['logout']   = '注销';
+$labels['mail']     = '邮件';
 $labels['settings'] = '设置';
 $labels['addressbook'] = '通讯录';
-$labels['inbox'] = '收件箱';
-$labels['drafts'] = '草稿';
-$labels['sent'] = '已发送';
-$labels['trash'] = '已删除邮件';
-$labels['junk'] = '垃圾邮件';
+
+// mailbox names
+$labels['inbox']  = '收件箱';
+$labels['drafts'] = '草稿箱';
+$labels['sent']   = '已发送邮件';
+$labels['trash']  = '已删除邮件';
+$labels['junk']   = '垃圾邮件';
+
+// message listing
 $labels['subject'] = '主题';
-$labels['from'] = '发件人';
-$labels['to'] = '收件人';
-$labels['cc'] = '抄送';
-$labels['bcc'] = '密送';
+$labels['from']    = '发件人';
+$labels['sender']  = '发件人';
+$labels['to']      = '收件人';
+$labels['cc']      = '抄送';
+$labels['bcc']     = '密送';
 $labels['replyto'] = '回复至';
 $labels['followupto'] = '投递组';
-$labels['date'] = '日期';
-$labels['size'] = '大小';
+$labels['date']    = '日期';
+$labels['size']    = '大小';
 $labels['priority'] = '优先级';
-$labels['organization'] = '公司';
+$labels['organization'] = '组织';
 $labels['readstatus'] = '阅读状态';
-$labels['mailboxlist'] = '目录管理';
-$labels['folders'] = '目录管理';
-$labels['messagesfromto'] = '第 $from 到 $to，共 $count 封邮件';
-$labels['threadsfromto'] = '第 $from 到 $to，共 $count 个主题';
-$labels['messagenrof'] = '第 $nr 封邮件，共 $count 封';
+$labels['listoptions'] = '列表选项';
+
+$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['copy']     = '复制';
+$labels['move']     = '移动';
+$labels['moveto']   = '移至...';
 $labels['download'] = '下载';
+$labels['open']     = '打开';
+$labels['showattachment'] = '显示';
+$labels['showanyway'] = '总是显示';
+
 $labels['filename'] = '文件名';
 $labels['filesize'] = '文件大小';
+
 $labels['addtoaddressbook'] = '添加至通讯录';
-$labels['sun'] = '周日';
+
+// weekdays short
+$labels['sun'] = '星期日';
 $labels['mon'] = '星期一';
 $labels['tue'] = '星期二';
 $labels['wed'] = '星期三';
 $labels['thu'] = '星期四';
 $labels['fri'] = '星期五';
 $labels['sat'] = '星期六';
-$labels['sunday'] = '星期日';
-$labels['monday'] = '星期一';
-$labels['tuesday'] = '星期二';
+
+// weekdays long
+$labels['sunday']    = '星期日';
+$labels['monday']    = '星期一';
+$labels['tuesday']   = '星期二';
 $labels['wednesday'] = '星期三';
-$labels['thursday'] = '星期四';
-$labels['friday'] = '星期五';
-$labels['saturday'] = '星期六';
-$labels['jan'] = '一月';
-$labels['feb'] = '二月';
-$labels['mar'] = '三月';
-$labels['apr'] = '四月';
-$labels['may'] = '五月';
-$labels['longmay'] = '五月';
-$labels['jun'] = '六月';
-$labels['jul'] = '七月';
-$labels['aug'] = '八月';
-$labels['sep'] = '九月';
-$labels['oct'] = '十月';
-$labels['nov'] = '十一月';
-$labels['dec'] = '十二月';
-$labels['longjan'] = '一月';
-$labels['longfeb'] = '二月';
-$labels['longmar'] = '三月';
-$labels['longapr'] = '四月';
-$labels['longjun'] = '六月';
-$labels['longjul'] = '七月';
-$labels['longaug'] = '八月';
-$labels['longsep'] = '九月';
-$labels['longoct'] = '十月';
-$labels['longnov'] = '十一月';
-$labels['longdec'] = '十二月';
+$labels['thursday']  = '星期四';
+$labels['friday']    = '星期五';
+$labels['saturday']  = '星期六';
+
+// months short
+$labels['jan']	= '一月';
+$labels['feb']	= '二月';
+$labels['mar']	= '三月';
+$labels['apr']	= '四月';
+$labels['may']	= '五月';
+$labels['jun']	= '六月';
+$labels['jul'] 	= '七月';
+$labels['aug']	= '八月';
+$labels['sep']	= '九月';
+$labels['oct']	= '十月';
+$labels['nov']	= '十一月';
+$labels['dec']	= '十二月';
+
+// months long
+$labels['longjan']	= '一月';
+$labels['longfeb']	= '二月';
+$labels['longmar']	= '三月';
+$labels['longapr']	= '四月';
+$labels['longmay']	= '五月';
+$labels['longjun']	= '六月';
+$labels['longjul']	= '七月';
+$labels['longaug']	= '八月';
+$labels['longsep']	= '九月';
+$labels['longoct']	= '十月';
+$labels['longnov']	= '十一月';
+$labels['longdec']	= '十二月';
+
 $labels['today'] = '今天';
-$labels['refresh'] = '刷新';
-$labels['checkmail'] = '收取新邮件';
-$labels['compose'] = '写邮件';
-$labels['writenewmessage'] = '写邮件';
-$labels['reply'] = '回复';
-$labels['replytomessage'] = '回复发件人';
+
+// toolbar buttons
+$labels['refresh']          = '刷新';
+$labels['checkmail']        = '检查新邮件';
+$labels['compose']          = '撰写新邮件';
+$labels['writenewmessage']  = '写邮件';
+$labels['reply']            = '回复';
+$labels['replytomessage']   = '回复发件人';
 $labels['replytoallmessage'] = '回复所有';
-$labels['replyall'] = '回复全部';
-$labels['replylist'] = '回复列表';
-$labels['forward'] = '转发';
-$labels['forwardinline'] = '直接转发';
+$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['viewsource'] = '显示邮件源文件';
-$labels['mark'] = '标记';
-$labels['markmessages'] = '标记邮件';
-$labels['markread'] = '已读';
-$labels['markunread'] = '未读';
-$labels['markflagged'] = '已标记';
-$labels['markunflagged'] = '未标记';
-$labels['moreactions'] = '更多动作...';
-$labels['more'] = '更多';
-$labels['back'] = '后退';
-$labels['options'] = '选项';
+$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['more']             = '更多';
+$labels['back']             = '返回';
+$labels['options']          = '选项';
+
 $labels['select'] = '选择';
 $labels['all'] = '全部';
 $labels['none'] = '无';
-$labels['nonesort'] = '无';
 $labels['currpage'] = '当前页';
-$labels['unread'] = '未读';
-$labels['flagged'] = '已标记';
-$labels['unanswered'] = '未回复';
-$labels['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'] = '所有主题';
 $labels['expand_only_unread'] = '仅未读消息';
 $labels['fromto'] = '发件人/收件人';
 $labels['flag'] = '标志';
 $labels['attachment'] = '附件';
+$labels['nonesort'] = '无';
 $labels['sentdate'] = '发送日期';
 $labels['arrival'] = '到达日期';
 $labels['asc'] = '升序';
@@ -155,175 +189,220 @@ $labels['listcolumns'] = '列表列';
 $labels['listsorting'] = '排序列';
 $labels['listorder'] = '排序';
 $labels['listmode'] = '列表视图样式';
-$labels['folderactions'] = '目录操作...';
+
+$labels['folderactions'] = '文件夹操作...';
 $labels['compact'] = '压缩';
 $labels['empty'] = '清空';
+
 $labels['quota'] = '邮箱容量';
-$labels['unknown'] = '未知';
-$labels['unlimited'] = '无限制';
-$labels['quicksearch'] = '快速查找';
-$labels['resetsearch'] = '清空查找内容';
-$labels['searchmod'] = '搜寻模式';
-$labels['msgtext'] = '整个邮件';
+$labels['unknown']  = '未知';
+$labels['unlimited']  = '无限制';
+
+$labels['quicksearch']  = '快速查找';
+$labels['resetsearch']  = '清空';
+$labels['searchmod']  = '修改搜索';
+$labels['msgtext']  = '整封邮件';
+$labels['body']  = '正文';
+
 $labels['openinextwin'] = '在新窗口中打开';
-$labels['emlsave'] = '下载（.eml）';
-$labels['editasnew'] = '编辑为新邮件';
-$labels['sendmessage'] = '立即发送';
-$labels['savemessage'] = '保存为草稿';
-$labels['addattachment'] = '添加附件';
-$labels['charset'] = '字符集';
-$labels['editortype'] = '编辑器类型';
-$labels['returnreceipt'] = '邮件回执';
-$labels['dsn'] = '投递状态提示';
-$labels['mailreplyintro'] = '于 $date, $sender 回复:';
-$labels['originalmessage'] = '原始信件';
-$labels['editidents'] = '编辑身份';
-$labels['spellcheck'] = '拼写';
+$labels['emlsave'] = '下载(.eml)';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
+
+// message compose
+$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['editidents']    = '编辑身份';
+$labels['spellcheck']    = '拼写';
 $labels['checkspelling'] = '拼写检查';
-$labels['resumeediting'] = '重新编辑';
-$labels['revertto'] = '恢复至';
+$labels['resumeediting'] = '继续编辑';
+$labels['revertto']      = '恢复至';
+
 $labels['attach'] = '附加';
 $labels['attachments'] = '附件';
 $labels['upload'] = '上传';
 $labels['uploadprogress'] = '$percent ($current / $total)';
-$labels['close'] = '关闭';
-$labels['messageoptions'] = '邮件选项...';
-$labels['low'] = '低';
-$labels['lowest'] = '最低';
-$labels['normal'] = '普通';
-$labels['high'] = '高';
+$labels['close']  = '关闭';
+$labels['messageoptions']  = '邮件选项...';
+
+$labels['low']     = '低';
+$labels['lowest']  = '最低';
+$labels['normal']  = '普通';
+$labels['high']    = '高';
 $labels['highest'] = '最高';
-$labels['nosubject'] = '（无主题）';
+
+$labels['nosubject']  = '(无主题)';
 $labels['showimages'] = '显示图片';
 $labels['alwaysshow'] = '总是在来自 $sender 的邮件中显示图片';
-$labels['isdraft'] = '这是邮件草稿';
+$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'] = '添加投递组';
-$labels['mdnrequest'] = '发件人要求在您阅读这封邮件时发送通知。您是否希望通知发件人？';
-$labels['receiptread'] = '发送回执（已读）';
+
+// mdn
+$labels['mdnrequest'] = '发件人要求在您阅读这封邮件时发送已读通知。您是否希望通知发件人？';
+$labels['receiptread'] = '发送回执(已读)';
 $labels['yourmessage'] = '这是您的邮件回执';
-$labels['receiptnote'] = '注意：回执只表示邮件在收件人的电脑上被打开过，不表示收件人已经阅读或已理解邮件的内容。';
-$labels['name'] = '显示名称';
-$labels['firstname'] = '名字';
-$labels['surname'] = '姓氏';
-$labels['middlename'] = '中名';
-$labels['nameprefix'] = '前缀';
-$labels['namesuffix'] = '后缀';
-$labels['nickname'] = '昵称';
-$labels['jobtitle'] = '职位';
-$labels['department'] = '部门';
-$labels['gender'] = 'Gender';
-$labels['maidenname'] = '娘家姓';
-$labels['email'] = 'Email';
-$labels['phone'] = '电话';
-$labels['address'] = '地址';
-$labels['street'] = '街道';
-$labels['locality'] = '城市';
-$labels['zipcode'] = '邮编';
-$labels['region'] = '省份';
-$labels['country'] = '国家';
-$labels['birthday'] = '生日';
-$labels['anniversary'] = '纪念日';
-$labels['website'] = '主页';
-$labels['instantmessenger'] = 'QQ';
+$labels['receiptnote'] = '注意：回执只表示邮件在收件人的电脑上被打开过，不表示收件人已经阅读或了解邮件内容。';
+
+// address boook
+$labels['name']         = '显示名称';
+$labels['firstname']    = '名字';
+$labels['surname']      = '姓氏';
+$labels['middlename']   = '中名';
+$labels['nameprefix']   = '前缀';
+$labels['namesuffix']   = '后缀';
+$labels['nickname']     = '昵称';
+$labels['jobtitle']     = '职位';
+$labels['department']   = '部门';
+$labels['gender']       = '性别';
+$labels['maidenname']   = '娘家姓';
+$labels['email']        = '邮件地址';
+$labels['phone']        = '电话';
+$labels['address']      = '地址';
+$labels['street']       = '街道';
+$labels['locality']     = '城市';
+$labels['zipcode']      = '邮编';
+$labels['region']       = '省份';
+$labels['country']      = '国家';
+$labels['birthday']     = '生日';
+$labels['anniversary']  = '纪念日';
+$labels['website']      = '主页';
+$labels['instantmessenger'] = '即时通讯';
 $labels['notes'] = '备注';
-$labels['male'] = '男';
+$labels['male']   = '男';
 $labels['female'] = '女';
 $labels['manager'] = '经理';
 $labels['assistant'] = '助理';
-$labels['typeassistant'] = '助理';
 $labels['spouse'] = '配偶';
-$labels['allfields'] = '所有项目';
+$labels['allfields'] = '所有栏目';
 $labels['search'] = '查询';
 $labels['advsearch'] = '高级查询';
 $labels['advanced'] = '高级选项';
 $labels['other'] = '其他';
-$labels['typeother'] = '其他';
-$labels['typehome'] = '家庭';
-$labels['typework'] = '工作';
-$labels['typemobile'] = '手机';
-$labels['typemain'] = '主';
-$labels['typehomefax'] = '家庭传真';
-$labels['typeworkfax'] = '工作传真';
-$labels['typecar'] = '车牌';
-$labels['typepager'] = '呼机';
-$labels['typevideo'] = '视频';
-$labels['typehomepage'] = '主页';
+
+$labels['typehome']   = '家庭';
+$labels['typework']   = '工作';
+$labels['typeother']  = '其他';
+$labels['typemobile']  = '手机';
+$labels['typemain']  = '主要';
+$labels['typehomefax']  = '家庭传真';
+$labels['typeworkfax']  = '工作传真';
+$labels['typecar']  = '车牌';
+$labels['typepager']  = '呼机';
+$labels['typevideo']  = '视频';
+$labels['typeassistant']  = '助理';
+$labels['typehomepage']  = '主页';
 $labels['typeblog'] = '博客';
-$labels['typeprofile'] = '资历';
-$labels['addfield'] = '增加项..';
-$labels['addcontact'] = '添加联系人';
+$labels['typeprofile'] = '资料';
+
+$labels['addfield'] = '新增条目...';
+$labels['addcontact'] = '新建联系人';
 $labels['editcontact'] = '编辑联系人';
 $labels['contacts'] = '联系人';
 $labels['contactproperties'] = '联系人信息';
 $labels['personalinfo'] = '个人信息';
-$labels['edit'] = '编辑';
+
+$labels['edit']   = '编辑';
 $labels['cancel'] = '取消';
-$labels['save'] = '保存';
+$labels['save']   = '保存';
 $labels['delete'] = '删除';
-$labels['rename'] = '更名';
+$labels['rename'] = '重命名';
 $labels['addphoto'] = '上传';
-$labels['replacephoto'] = '覆盖';
+$labels['replacephoto'] = '替换照片';
 $labels['uploadphoto'] = '上传照片';
-$labels['newcontact'] = '新建联系人';
-$labels['deletecontact'] = '删除选中的联系人';
-$labels['composeto'] = '写信给';
+
+$labels['newcontact']     = '新建联系人';
+$labels['deletecontact']  = '删除选中的联系人';
+$labels['composeto']      = '写信至选中的联系人';
 $labels['contactsfromto'] = '第 $from 到 $to 个联系人，共 $count 个';
-$labels['print'] = '打印';
-$labels['export'] = '导出';
-$labels['exportvcards'] = '以 vCard 格式导出联系人';
-$labels['newcontactgroup'] = '创建新的组';
-$labels['grouprename'] = '重命名组';
-$labels['groupdelete'] = '删除组';
-$labels['groupremoveselected'] = '从分组中移除选中的联系人';
-$labels['previouspage'] = '上一页';
-$labels['firstpage'] = '第一页';
-$labels['nextpage'] = '下一页';
-$labels['lastpage'] = '最后一页';
+$labels['print']          = '打印';
+$labels['export']         = '导出';
+$labels['exportall']      = '导出全部';
+$labels['exportsel']      = '导出选中';
+$labels['exportvcards']   = '导出联系人为 vCard 格式';
+$labels['newcontactgroup'] = '创建新的联系人群组';
+$labels['grouprename']    = '重命名群组';
+$labels['groupdelete']    = '删除群组组';
+$labels['groupremoveselected'] = '删除选中';
+
+$labels['previouspage']   = '上一页';
+$labels['firstpage']      = '第一页';
+$labels['nextpage']       = '下一页';
+$labels['lastpage']       = '最后一页';
+
 $labels['group'] = '分组';
 $labels['groups'] = '分组';
 $labels['personaladrbook'] = '个人通讯录';
+
 $labels['searchsave'] = '保存搜索';
 $labels['searchdelete'] = '删除搜索';
+
 $labels['import'] = '导入';
-$labels['importcontacts'] = '导入联系人';
+$labels['importcontacts'] = '导入通讯录';
 $labels['importfromfile'] = '从文件导入';
-$labels['importtarget'] = '增加新联系人到通讯录:';
-$labels['importreplace'] = '替换整个地址簿';
+$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'] = '管理此账号的身份';
 $labels['newidentity'] = '添加身份';
+
 $labels['newitem'] = '添加条目';
 $labels['edititem'] = '编辑条目';
+
 $labels['preferhtml'] = '以 HTML 格式显示';
 $labels['defaultcharset'] = '默认字符集';
 $labels['htmlmessage'] = 'HTML 邮件';
+$labels['messagepart'] = '部分';
+$labels['digitalsig'] = '数字签名';
 $labels['dateformat'] = '日期格式';
 $labels['timeformat'] = '时间格式';
 $labels['prettydate'] = '短日期格式';
-$labels['setdefault'] = '设为默认';
-$labels['autodetect'] = '自动';
-$labels['language'] = '语言';
-$labels['timezone'] = '时区';
-$labels['pagesize'] = '每页显示的邮件数量';
+$labels['setdefault']  = '设为默认';
+$labels['autodetect']  = '自动';
+$labels['language']  = '语言';
+$labels['timezone']  = '时区';
+$labels['pagesize']  = '每页显示的邮件数量';
 $labels['signature'] = '签名';
-$labels['dstactive'] = '夏令时';
+$labels['dstactive']  = '夏令时';
+$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'] = '退出时清空回收站';
@@ -346,22 +425,23 @@ $labels['showremoteimages'] = '显示内嵌的图片';
 $labels['fromknownsenders'] = '来自已知发件人';
 $labels['always'] = '总是';
 $labels['showinlineimages'] = '在邮件下方显示附件中的图片';
-$labels['autosavedraft'] = '自动保存到草稿箱';
-$labels['everynminutes'] = '每隔 $n 分钟';
-$labels['never'] = '从不';
-$labels['immediately'] = '立即';
+$labels['autosavedraft']  = '自动保存到草稿箱';
+$labels['everynminutes']  = '每隔 $n 分钟';
+$labels['refreshinterval']  = '刷新间隔';
+$labels['never']  = '从不';
+$labels['immediately']  = '立即';
 $labels['messagesdisplaying'] = '显示参数';
 $labels['messagescomposition'] = '撰写邮件';
 $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'] = '项目';
@@ -369,36 +449,41 @@ $labels['maintenance'] = '维护';
 $labels['newmessage'] = '新邮件';
 $labels['signatureoptions'] = '签名选项';
 $labels['whenreplying'] = '当回复时';
+$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 秒之后';
+$labels['previewpanemarkread']  = '标记预览邮件为已读';
+$labels['afternseconds']  = '$n 秒之后';
 $labels['reqmdn'] = '总是要求回执';
 $labels['reqdsn'] = '总是要求投递状态通知';
 $labels['replysamefolder'] = '保存回复邮件到邮件相同的目录';
-$labels['defaultaddressbook'] = '增加联系人到所选通讯录';
+$labels['defaultabook'] = '默认地址薄';
 $labels['autocompletesingle'] = '跳过自动完成的电子邮件地址';
+$labels['listnamedisplay'] = '列出联系人为';
 $labels['spellcheckbeforesend'] = '发邮件前进行拼写检查';
 $labels['spellcheckoptions'] = '拼写检查选项';
 $labels['spellcheckignoresyms'] = '忽略带符号的单词';
 $labels['spellcheckignorenums'] = '忽略带数字的单词';
 $labels['spellcheckignorecaps'] = '忽略所有大写字母的单词';
 $labels['addtodict'] = '添加到字典中';
-$labels['folder'] = '目录管理';
-$labels['foldername'] = '邮件夹名称';
-$labels['subscribed'] = '已订阅';
+$labels['mailtoprotohandler'] = 'Register protocol handler for mailto: links';
+$labels['forwardmode'] = '邮件转发方式';
+$labels['inline'] = '内嵌';
+$labels['asattachment'] = '作为附件';
+
+$labels['folder']  = '目录管理';
+$labels['folders']  = '目录管理';
+$labels['foldername']  = '邮件夹名称';
+$labels['subscribed']  = '已订阅';
 $labels['messagecount'] = '邮件数量';
-$labels['create'] = '建立';
-$labels['createfolder'] = '建立新邮件夹';
-$labels['managefolders'] = '管理邮件夹';
+$labels['create']  = '建立';
+$labels['createfolder']  = '建立新邮件夹';
+$labels['managefolders']  = '管理邮件夹';
 $labels['specialfolders'] = '定义邮件夹';
 $labels['properties'] = '属性';
 $labels['folderproperties'] = '文件夹属性';
@@ -408,28 +493,35 @@ $labels['info'] = '信息';
 $labels['getfoldersize'] = '获得文件夹容量';
 $labels['changesubscription'] = '更改订阅';
 $labels['foldertype'] = '目录类型';
-$labels['personalfolder'] = '私有目录';
-$labels['otherfolder'] = '他人目录';
-$labels['sharedfolder'] = '共享目录';
+$labels['personalfolder']  = '私有目录';
+$labels['otherfolder']  = '他人目录';
+$labels['sharedfolder']  = '共享目录';
+
 $labels['sortby'] = '排序';
-$labels['sortasc'] = '递增排序';
+$labels['sortasc']  = '递增排序';
 $labels['sortdesc'] = '递减排序';
 $labels['undo'] = '撤销';
+
+$labels['installedplugins'] = '已安装插件';
 $labels['plugin'] = '插件';
 $labels['version'] = '版本';
-$labels['source'] = '源';
+$labels['source'] = '源代码';
 $labels['license'] = '许可协议';
-$labels['support'] = '获取支持';
+$labels['support'] = '支持';
+
+// units
 $labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
 $labels['GB'] = 'GB';
+
+// character sets
 $labels['unicode'] = 'Unicode';
 $labels['english'] = '英语';
 $labels['westerneuropean'] = '西欧';
 $labels['easterneuropean'] = '东欧';
 $labels['southeasterneuropean'] = '东南欧';
-$labels['baltic'] = '波罗的海';
+$labels['baltic'] = '波罗的语';
 $labels['cyrillic'] = '西里尔语';
 $labels['arabic'] = '阿拉伯语';
 $labels['greek'] = '希腊语';
@@ -437,9 +529,10 @@ $labels['hebrew'] = '希伯来语';
 $labels['turkish'] = '土耳其语';
 $labels['nordic'] = '北欧';
 $labels['thai'] = '泰语';
-$labels['celtic'] = '塞尔特';
+$labels['celtic'] = '塞尔特语';
 $labels['vietnamese'] = '越南语';
 $labels['japanese'] = '日文';
 $labels['korean'] = '韩语';
 $labels['chinese'] = '中文';
 
+?>
diff --git a/program/localization/zh_CN/messages.inc b/program/localization/zh_CN/messages.inc
index f15f77997..4c47f833e 100644
--- a/program/localization/zh_CN/messages.inc
+++ b/program/localization/zh_CN/messages.inc
@@ -2,20 +2,23 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/zh_CN/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Christopher Meng <cickumqt@gmail.com>                         |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['errortitle'] = '发生错误！';
-$messages['loginfailed'] = '登录失败。';
+$messages['errortitle']  = '发生错误！';
+$messages['loginfailed']  = '登录失败。';
 $messages['cookiesdisabled'] = '您的浏览器不接受 cookies。';
 $messages['sessionerror'] = '会话已过期。';
 $messages['storageerror'] = '连接到邮件服务器失败。';
@@ -26,9 +29,11 @@ $messages['requesttimedout'] = '请求超时';
 $messages['errorreadonly'] = '不可对只读文件夹进行操作。';
 $messages['errornoperm'] = '无权限操作';
 $messages['invalidrequest'] = '无效的请求！数据保存失败。';
+$messages['invalidhost'] = '非法主机名。';
 $messages['nomessagesfound'] = '此邮件夹内无邮件。';
 $messages['loggedout'] = '您已成功注销，再见！';
 $messages['mailboxempty'] = '邮件夹为空';
+$messages['refreshing'] = '刷新中...';
 $messages['loading'] = '正在载入...';
 $messages['uploading'] = '正在上传文件...';
 $messages['uploadingmany'] = '正在上传文件...';
@@ -55,11 +60,11 @@ $messages['errormoving'] = '无法移动邮件。';
 $messages['errorcopying'] = '无法复制邮件。';
 $messages['errordeleting'] = '无法删除邮件。';
 $messages['errormarking'] = '无法标记邮件。';
-$messages['deletecontactconfirm'] = '确定要删除已选中的联系人？';
-$messages['deletegroupconfirm'] = '确定要删除以选中的组?';
+$messages['deletecontactconfirm']  = '确定要删除已选中的联系人？';
+$messages['deletegroupconfirm']  = '确定要删除以选中的组?';
 $messages['deletemessagesconfirm'] = '确定要删除已选中的邮件？';
-$messages['deletefolderconfirm'] = '确定要删除已选中的邮件夹？';
-$messages['purgefolderconfirm'] = '是否确认要删除当前邮件夹中的所有邮件？';
+$messages['deletefolderconfirm']  = '确定要删除已选中的邮件夹？';
+$messages['purgefolderconfirm']  = '是否确认要删除当前邮件夹中的所有邮件？';
 $messages['contactdeleting'] = '正在删除联系人...';
 $messages['groupdeleting'] = '正在删除组...';
 $messages['folderdeleting'] = '正在删除文件夹...';
@@ -68,11 +73,11 @@ $messages['foldersubscribing'] = '订阅文件夹中...';
 $messages['folderunsubscribing'] = '退订中...';
 $messages['formincomplete'] = '当前表单未填写完整，请完整填写。';
 $messages['noemailwarning'] = '请输入一个有效的邮件地址。';
-$messages['nonamewarning'] = '请输入名字。';
+$messages['nonamewarning']  = '请输入名字。';
 $messages['nopagesizewarning'] = '请输入每页显示的邮件数量';
 $messages['nosenderwarning'] = '请输入发件人地址。';
 $messages['norecipientwarning'] = '至少需要一个收件人。';
-$messages['nosubjectwarning'] = '主题为空。您要输入一个主题吗？';
+$messages['nosubjectwarning']  = '主题为空。您要输入一个主题吗？';
 $messages['nobodywarning'] = '要发送无正文的邮件吗？';
 $messages['notsentwarning'] = '邮件未发送。您确定要离开并舍弃当前邮件吗？';
 $messages['noldapserver'] = '请选择一个LDAP服务器进行查找。';
@@ -114,8 +119,9 @@ $messages['selectimportfile'] = '请选择要上传的文件。';
 $messages['addresswriterror'] = '已选择的地址簿不可写。';
 $messages['contactaddedtogroup'] = '成功添加联系人至该分组。';
 $messages['contactremovedfromgroup'] = '成功从该分组移除联系人。';
+$messages['nogroupassignmentschanged'] = 'No group assignments changed.';
 $messages['importwait'] = '正在导入，请稍后...';
-$messages['importerror'] = '导入失败！所上传的文件不是有效的 vCard 文件。';
+$messages['importformaterror'] = 'Import failed! The uploaded file is not a valid import data file.';
 $messages['importconfirm'] = '<b>成功导入 $inserted 联系人</b>';
 $messages['importconfirmskipped'] = '<b>跳过已存在的 $skipped 项目</b>';
 $messages['opnotpermitted'] = '不允许的操作!';
@@ -157,4 +163,7 @@ $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['noscriptwarning'] = 'Warning: This webmail service requires Javascript! In order to use it please enable Javascript in your browser\'s settings.';
 
+?>
diff --git a/program/localization/zh_TW/labels.inc b/program/localization/zh_TW/labels.inc
index cb4ef77ed..a545f2f81 100644
--- a/program/localization/zh_TW/labels.inc
+++ b/program/localization/zh_TW/labels.inc
@@ -2,58 +2,78 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/zh_TW/labels.inc                                         |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = '歡迎使用 $product';
-$labels['username'] = '使用者名稱';
-$labels['password'] = '使用者密碼';
-$labels['server'] = '伺服器';
-$labels['login'] = '登入';
-$labels['logout'] = '登出';
-$labels['mail'] = '電子郵件';
+
+// login page
+$labels['welcome']   = '歡迎使用 $product';
+$labels['username']  = '使用者名稱';
+$labels['password']  = '使用者密碼';
+$labels['server']    = '伺服器';
+$labels['login']     = '登入';
+
+// taskbar
+$labels['logout']   = '登出';
+$labels['mail']     = '電子郵件';
 $labels['settings'] = '設定';
 $labels['addressbook'] = '通訊錄';
-$labels['inbox'] = '收件匣';
+
+// mailbox names
+$labels['inbox']  = '收件匣';
 $labels['drafts'] = '草稿匣';
-$labels['sent'] = '寄件備份';
-$labels['trash'] = '垃圾桶';
-$labels['junk'] = '垃圾郵件';
+$labels['sent']   = '寄件備份';
+$labels['trash']  = '垃圾桶';
+$labels['junk']   = '垃圾郵件';
+
+// message listing
 $labels['subject'] = '主旨';
-$labels['from'] = '寄件者';
-$labels['to'] = '收件者';
-$labels['cc'] = '副本';
-$labels['bcc'] = '密件副本';
+$labels['from']    = '寄件者';
+$labels['sender']  = '寄件者';
+$labels['to']      = '收件者';
+$labels['cc']      = '副本';
+$labels['bcc']     = '密件副本';
 $labels['replyto'] = '回覆至';
 $labels['followupto'] = '信件跟隨至';
-$labels['date'] = '日期';
-$labels['size'] = '大小';
+$labels['date']    = '日期';
+$labels['size']    = '大小';
 $labels['priority'] = '優先順序';
 $labels['organization'] = '組織';
 $labels['readstatus'] = '讀信狀態';
 $labels['listoptions'] = '列表選項...';
+
 $labels['mailboxlist'] = '資料夾';
-$labels['folders'] = '資料夾';
 $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['copy']     = '複製';
+$labels['move']     = '移動';
+$labels['moveto']   = '移至...';
 $labels['download'] = '下載';
+$labels['open']     = 'Open';
+$labels['showattachment'] = '顯示';
+$labels['showanyway'] = '總是顯示';
+
 $labels['filename'] = '檔案名稱';
 $labels['filesize'] = '檔案大小';
+
 $labels['addtoaddressbook'] = '新增至通訊錄';
+
+// weekdays short
 $labels['sun'] = '週日';
 $labels['mon'] = '週一';
 $labels['tue'] = '週二';
@@ -61,79 +81,90 @@ $labels['wed'] = '週三';
 $labels['thu'] = '週四';
 $labels['fri'] = '週五';
 $labels['sat'] = '週六';
-$labels['sunday'] = '星期日';
-$labels['monday'] = '星期一';
-$labels['tuesday'] = '星期二';
+
+// weekdays long
+$labels['sunday']    = '星期日';
+$labels['monday']    = '星期一';
+$labels['tuesday']   = '星期二';
 $labels['wednesday'] = '星期三';
-$labels['thursday'] = '星期四';
-$labels['friday'] = '星期五';
-$labels['saturday'] = '星期六';
-$labels['jan'] = '一';
-$labels['feb'] = '二';
-$labels['mar'] = '三';
-$labels['apr'] = '四';
-$labels['may'] = '五月';
-$labels['longmay'] = '五月';
-$labels['jun'] = '六';
-$labels['jul'] = '七';
-$labels['aug'] = '八';
-$labels['sep'] = '九';
-$labels['oct'] = '十';
-$labels['nov'] = '十一';
-$labels['dec'] = '十二';
-$labels['longjan'] = '一月';
-$labels['longfeb'] = '二月';
-$labels['longmar'] = '三月';
-$labels['longapr'] = '四月';
-$labels['longjun'] = '六月';
-$labels['longjul'] = '七月';
-$labels['longaug'] = '八月';
-$labels['longsep'] = '九月';
-$labels['longoct'] = '十月';
-$labels['longnov'] = '十一月';
-$labels['longdec'] = '十二月';
+$labels['thursday']  = '星期四';
+$labels['friday']    = '星期五';
+$labels['saturday']  = '星期六';
+
+// months short
+$labels['jan']	= '一';
+$labels['feb']	= '二';
+$labels['mar']	= '三';
+$labels['apr']	= '四';
+$labels['may']	= '五月';
+$labels['jun']	= '六';
+$labels['jul'] 	= '七';
+$labels['aug']	= '八';
+$labels['sep']	= '九';
+$labels['oct']	= '十';
+$labels['nov']	= '十一';
+$labels['dec']	= '十二';
+
+// months long
+$labels['longjan']	= '一月';
+$labels['longfeb']	= '二月';
+$labels['longmar']	= '三月';
+$labels['longapr']	= '四月';
+$labels['longmay']	= '五月';
+$labels['longjun']	= '六月';
+$labels['longjul']	= '七月';
+$labels['longaug']	= '八月';
+$labels['longsep']	= '九月';
+$labels['longoct']	= '十月';
+$labels['longnov']	= '十一月';
+$labels['longdec']	= '十二月';
+
 $labels['today'] = '今日';
-$labels['refresh'] = '重新整理';
-$labels['checkmail'] = '檢查新郵件';
-$labels['compose'] = '撰寫新郵件';
-$labels['writenewmessage'] = '撰寫新郵件';
-$labels['reply'] = '回覆';
-$labels['replytomessage'] = '回覆';
+
+// toolbar buttons
+$labels['refresh']          = '重新整理';
+$labels['checkmail']        = '檢查新郵件';
+$labels['compose']          = '撰寫新郵件';
+$labels['writenewmessage']  = '撰寫新郵件';
+$labels['reply']            = '回覆';
+$labels['replytomessage']   = '回覆';
 $labels['replytoallmessage'] = '全部回覆';
-$labels['replyall'] = '全部回覆';
-$labels['replylist'] = '清單回覆';
-$labels['forward'] = '轉寄';
-$labels['forwardinline'] = '轉寄';
+$labels['replyall']         = '全部回覆';
+$labels['replylist']        = '清單回覆';
+$labels['forward']          = '轉寄';
+$labels['forwardinline']    = '轉寄';
 $labels['forwardattachment'] = '以附件方式轉寄';
-$labels['forwardmessage'] = '轉寄';
-$labels['deletemessage'] = '刪除郵件';
+$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['more'] = '更多';
-$labels['back'] = '上一頁';
-$labels['options'] = '選項';
+$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['more']             = '更多';
+$labels['back']             = '上一頁';
+$labels['options']          = '選項';
+
 $labels['select'] = '選取';
 $labels['all'] = '全部郵件';
 $labels['none'] = '無';
-$labels['nonesort'] = '無';
 $labels['currpage'] = '目前頁面';
 $labels['unread'] = '未讀取的郵件';
 $labels['flagged'] = '已加標記的郵件';
 $labels['unanswered'] = '未回覆的郵件';
+$labels['withattachment'] = 'With attachment';
 $labels['deleted'] = '已刪除的郵件';
+$labels['undeleted'] = '未刪除的郵件';
 $labels['invert'] = '反選';
 $labels['filter'] = '篩選範圍';
 $labels['list'] = '清單';
@@ -142,12 +173,14 @@ $labels['expand-all'] = '全部展開';
 $labels['expand-unread'] = '展開未讀取';
 $labels['collapse-all'] = '全部收起';
 $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['asc'] = '遞增';
@@ -156,175 +189,220 @@ $labels['listcolumns'] = '列出欄位';
 $labels['listsorting'] = '排序欄位';
 $labels['listorder'] = '排序順序';
 $labels['listmode'] = '清單檢視模式';
+
 $labels['folderactions'] = '資料夾動作...';
 $labels['compact'] = '壓縮';
 $labels['empty'] = '清空';
+
 $labels['quota'] = '磁碟使用量';
-$labels['unknown'] = '未知';
-$labels['unlimited'] = '無限制';
-$labels['quicksearch'] = '快速搜尋';
-$labels['resetsearch'] = '重設搜尋';
-$labels['searchmod'] = '修改搜尋';
-$labels['msgtext'] = '整封郵件';
+$labels['unknown']  = '未知';
+$labels['unlimited']  = '無限制';
+
+$labels['quicksearch']  = '快速搜尋';
+$labels['resetsearch']  = '重設搜尋';
+$labels['searchmod']  = '修改搜尋';
+$labels['msgtext']  = '整封郵件';
+$labels['body']  = '內文';
+
 $labels['openinextwin'] = '在新視窗開啟';
 $labels['emlsave'] = '下載（.eml）';
-$labels['editasnew'] = '以新郵件編輯';
-$labels['sendmessage'] = '立即寄出';
-$labels['savemessage'] = '儲存成草稿';
-$labels['addattachment'] = '增加附件檔案';
-$labels['charset'] = '郵件編碼';
-$labels['editortype'] = '編輯器類型';
-$labels['returnreceipt'] = '要求讀取回條';
-$labels['dsn'] = '傳送狀態通知';
+$labels['changeformattext'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
+
+// message compose
+$labels['editasnew']      = '以新郵件編輯';
+$labels['send']           = '寄出';
+$labels['sendmessage']    = '立即寄出';
+$labels['savemessage']    = '儲存成草稿';
+$labels['addattachment']  = '增加附件檔案';
+$labels['charset']        = '郵件編碼';
+$labels['editortype']     = '編輯器類型';
+$labels['returnreceipt']  = '要求讀取回條';
+$labels['dsn']            = '傳送狀態通知';
 $labels['mailreplyintro'] = '$sender 於 $date 寫到:';
 $labels['originalmessage'] = '郵件顯示設定';
-$labels['editidents'] = '編輯身份資訊';
-$labels['spellcheck'] = '拼字';
+
+$labels['editidents']    = '編輯身份資訊';
+$labels['spellcheck']    = '拼字';
 $labels['checkspelling'] = '拼字檢查';
 $labels['resumeediting'] = '繼續編輯';
-$labels['revertto'] = '恢復至';
+$labels['revertto']      = '恢復至';
+
 $labels['attach'] = '附件';
 $labels['attachments'] = '附加檔案';
 $labels['upload'] = '上傳';
 $labels['uploadprogress'] = '$percent ($current / $total)';
-$labels['close'] = '關閉';
-$labels['messageoptions'] = '郵件選項...';
-$labels['low'] = '低';
-$labels['lowest'] = '最低';
-$labels['normal'] = '普通';
-$labels['high'] = '高';
+$labels['close']  = '關閉';
+$labels['messageoptions']  = '郵件選項...';
+
+$labels['low']     = '低';
+$labels['lowest']  = '最低';
+$labels['normal']  = '普通';
+$labels['high']    = '高';
 $labels['highest'] = '最高';
-$labels['nosubject'] = '（沒有主旨）';
+
+$labels['nosubject']  = '（沒有主旨）';
 $labels['showimages'] = '顯示圖片';
 $labels['alwaysshow'] = '永遠顯示來自 $sender 的圖片';
-$labels['isdraft'] = '這是一封草稿';
+$labels['isdraft']    = '這是一封草稿';
+$labels['andnmore']   = '第$nr封或是更多...';
+$labels['togglemoreheaders'] = '顯示更多的訊息表頭';
+$labels['togglefullheaders'] = '切換原始訊息表頭';
+
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = '純文字';
 $labels['savesentmessagein'] = '儲存寄件備份至';
 $labels['dontsave'] = '不要儲存';
 $labels['maxuploadsize'] = '上傳檔案大小限制為 $size';
+
 $labels['addcc'] = '新增副本';
 $labels['addbcc'] = '新增密件副本';
 $labels['addreplyto'] = '新增回覆地址';
 $labels['addfollowupto'] = '新增 信件跟隨至';
+
+// mdn
 $labels['mdnrequest'] = '此郵件的寄件者希望在你閱讀此郵件時受到通知。你想要通知寄件者嗎？';
 $labels['receiptread'] = '郵件回條（已閱讀）';
 $labels['yourmessage'] = '這是你郵件的郵件回條';
 $labels['receiptnote'] = '注意：此回條只能確認收件者的電腦顯示了郵件，並不能保證收件者已閱讀或了解郵件的內容。';
-$labels['name'] = '顯示名稱';
-$labels['firstname'] = '名稱';
-$labels['surname'] = '姓氏';
-$labels['middlename'] = '中名';
-$labels['nameprefix'] = '名';
-$labels['namesuffix'] = '姓';
-$labels['nickname'] = '暱稱';
-$labels['jobtitle'] = '職位';
-$labels['department'] = '部門';
-$labels['gender'] = '性別';
-$labels['maidenname'] = '姓';
-$labels['email'] = '電子郵件';
-$labels['phone'] = '電話';
-$labels['address'] = '地址';
-$labels['street'] = '街道';
-$labels['locality'] = '城市';
-$labels['zipcode'] = '郵遞區號';
-$labels['region'] = '地區';
-$labels['country'] = '國家';
-$labels['birthday'] = '生日';
-$labels['anniversary'] = '周年纪念日';
-$labels['website'] = '網站';
+
+// address boook
+$labels['name']         = '顯示名稱';
+$labels['firstname']    = '名稱';
+$labels['surname']      = '姓氏';
+$labels['middlename']   = '中名';
+$labels['nameprefix']   = '名';
+$labels['namesuffix']   = '姓';
+$labels['nickname']     = '暱稱';
+$labels['jobtitle']     = '職位';
+$labels['department']   = '部門';
+$labels['gender']       = '性別';
+$labels['maidenname']   = '姓';
+$labels['email']        = '電子郵件';
+$labels['phone']        = '電話';
+$labels['address']      = '地址';
+$labels['street']       = '街道';
+$labels['locality']     = '城市';
+$labels['zipcode']      = '郵遞區號';
+$labels['region']       = '地區';
+$labels['country']      = '國家';
+$labels['birthday']     = '生日';
+$labels['anniversary']  = '周年纪念日';
+$labels['website']      = '網站';
 $labels['instantmessenger'] = '即時通訊';
 $labels['notes'] = '註解';
-$labels['male'] = '男';
+$labels['male']   = '男';
 $labels['female'] = '女';
 $labels['manager'] = '經理';
 $labels['assistant'] = '助理';
-$labels['typeassistant'] = '助理';
 $labels['spouse'] = '配偶';
 $labels['allfields'] = '所有欄位';
 $labels['search'] = '搜尋';
 $labels['advsearch'] = '進階搜尋';
 $labels['advanced'] = '進階設定';
 $labels['other'] = '其他';
-$labels['typeother'] = '其他';
-$labels['typehome'] = '住家';
-$labels['typework'] = '工作';
-$labels['typemobile'] = '行動電話';
-$labels['typemain'] = '主要';
-$labels['typehomefax'] = '住家傳真';
-$labels['typeworkfax'] = '工作傳真';
-$labels['typecar'] = '汽車';
-$labels['typepager'] = '傳呼機';
-$labels['typevideo'] = '影片';
-$labels['typehomepage'] = '首頁';
+
+$labels['typehome']   = '住家';
+$labels['typework']   = '工作';
+$labels['typeother']  = '其他';
+$labels['typemobile']  = '行動電話';
+$labels['typemain']  = '主要';
+$labels['typehomefax']  = '住家傳真';
+$labels['typeworkfax']  = '工作傳真';
+$labels['typecar']  = '汽車';
+$labels['typepager']  = '傳呼機';
+$labels['typevideo']  = '影片';
+$labels['typeassistant']  = '助理';
+$labels['typehomepage']  = '首頁';
 $labels['typeblog'] = '部落格';
 $labels['typeprofile'] = '設定檔';
+
 $labels['addfield'] = '新增欄位...';
 $labels['addcontact'] = '新增聯絡人';
 $labels['editcontact'] = '編輯聯絡人';
 $labels['contacts'] = '聯絡人';
 $labels['contactproperties'] = '聯絡人資訊';
 $labels['personalinfo'] = '個人資訊';
-$labels['edit'] = '編輯';
+
+$labels['edit']   = '編輯';
 $labels['cancel'] = '取消';
-$labels['save'] = '儲存';
+$labels['save']   = '儲存';
 $labels['delete'] = '刪除';
 $labels['rename'] = '重新命名';
 $labels['addphoto'] = '新增';
 $labels['replacephoto'] = '取代';
 $labels['uploadphoto'] = '上傳相片';
-$labels['newcontact'] = '建立新聯絡人資料';
-$labels['deletecontact'] = '刪除所選擇的聯絡人';
-$labels['composeto'] = '寄信至所選擇的聯絡人';
+
+$labels['newcontact']     = '建立新聯絡人資料';
+$labels['deletecontact']  = '刪除所選擇的聯絡人';
+$labels['composeto']      = '寄信至所選擇的聯絡人';
 $labels['contactsfromto'] = '聯絡人 $from 至 $to，共有 $count 人';
-$labels['print'] = '列印';
-$labels['export'] = '匯出通訊錄';
-$labels['exportvcards'] = '匯出通訊錄為 vCard 格式';
+$labels['print']          = '列印';
+$labels['export']         = '匯出通訊錄';
+$labels['exportall']      = '匯出全部';
+$labels['exportsel']      = '匯出選擇項目';
+$labels['exportvcards']   = '匯出通訊錄為 vCard 格式';
 $labels['newcontactgroup'] = '新增聯絡人群組';
-$labels['grouprename'] = '重新命名群組';
-$labels['groupdelete'] = '刪除群組';
+$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'] = '儲存搜尋結果';
 $labels['searchdelete'] = '刪除搜尋結果';
+
 $labels['import'] = '匯入通訊錄';
 $labels['importcontacts'] = '由檔案匯入通訊錄';
 $labels['importfromfile'] = '選擇你要匯入的檔案:';
 $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['identities'] = '身份資訊';
 $labels['manageidentities'] = '管理此帳號的身份資訊';
 $labels['newidentity'] = '新增身份資訊';
+
 $labels['newitem'] = '新增項目';
 $labels['edititem'] = '編輯項目';
+
 $labels['preferhtml'] = '使用 HTML 顯示';
 $labels['defaultcharset'] = '預設編碼';
 $labels['htmlmessage'] = 'HTML 郵件';
+$labels['messagepart'] = '部分';
+$labels['digitalsig'] = '數位簽章';
 $labels['dateformat'] = '日期格式';
 $labels['timeformat'] = '時間格式';
 $labels['prettydate'] = '簡短日期顯示';
-$labels['setdefault'] = '設成預設i值';
-$labels['autodetect'] = '自動選擇';
-$labels['language'] = '語言';
-$labels['timezone'] = '時區';
-$labels['pagesize'] = '每頁郵件數';
+$labels['setdefault']  = '設成預設值';
+$labels['autodetect']  = '自動選擇';
+$labels['language']  = '語言';
+$labels['timezone']  = '時區';
+$labels['pagesize']  = '每頁郵件數';
 $labels['signature'] = '簽名檔';
-$labels['dstactive'] = '日光節約時間';
+$labels['dstactive']  = '日光節約時間';
+$labels['showinextwin'] = '在新視窗中顯示郵件';
+$labels['composeextwin'] = '在新視窗中撰寫郵件';
 $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'] = '登出時清空垃圾桶';
@@ -347,10 +425,11 @@ $labels['showremoteimages'] = '顯示遠端郵件內文中的圖片';
 $labels['fromknownsenders'] = '從已知的寄件者';
 $labels['always'] = '總是接受';
 $labels['showinlineimages'] = '將附加檔案的圖片顯示於郵件最後';
-$labels['autosavedraft'] = '自動儲存草稿';
-$labels['everynminutes'] = '每 $n 分鐘';
-$labels['never'] = '絕對不要';
-$labels['immediately'] = '馬上';
+$labels['autosavedraft']  = '自動儲存草稿';
+$labels['everynminutes']  = '每 $n 分鐘';
+$labels['refreshinterval']  = '重新整理 (確認是否新郵件)';
+$labels['never']  = '絕對不要';
+$labels['immediately']  = '馬上';
 $labels['messagesdisplaying'] = '郵件顯示設定';
 $labels['messagescomposition'] = '撰寫郵件設定';
 $labels['mimeparamfolding'] = '附加檔案名稱的編碼方式';
@@ -370,22 +449,20 @@ $labels['maintenance'] = '管理';
 $labels['newmessage'] = '新郵件';
 $labels['signatureoptions'] = '簽名檔選項';
 $labels['whenreplying'] = '回覆時';
+$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 秒之後';
+$labels['previewpanemarkread']  = '標示已預覽訊息為已讀取';
+$labels['afternseconds']  = '$n 秒之後';
 $labels['reqmdn'] = '永遠索取讀取回條';
 $labels['reqdsn'] = '總是要求傳送狀態通知';
 $labels['replysamefolder'] = '將回覆與回覆信件放置於相同資料夾';
-$labels['defaultaddressbook'] = '新增連絡人至指定通訊錄';
+$labels['defaultabook'] = '預設通訊錄';
 $labels['autocompletesingle'] = '在自動完成中略過另一個email';
 $labels['listnamedisplay'] = '標記聯絡人為';
 $labels['spellcheckbeforesend'] = '寄送前執行拼字檢查';
@@ -395,13 +472,18 @@ $labels['spellcheckignorenums'] = '忽略數字';
 $labels['spellcheckignorecaps'] = '忽略大寫字母';
 $labels['addtodict'] = '加入詞典';
 $labels['mailtoprotohandler'] = '註冊mailto:協定處理程式';
-$labels['folder'] = '資料夾';
-$labels['foldername'] = '資料夾名稱';
-$labels['subscribed'] = '顯示';
+$labels['forwardmode'] = '郵件轉寄方式';
+$labels['inline'] = '放入內文';
+$labels['asattachment'] = '當成附件';
+
+$labels['folder']  = '資料夾';
+$labels['folders']  = '資料夾';
+$labels['foldername']  = '資料夾名稱';
+$labels['subscribed']  = '顯示';
 $labels['messagecount'] = '郵件數目';
-$labels['create'] = '建立';
-$labels['createfolder'] = '建立新資料夾';
-$labels['managefolders'] = '管理資料夾';
+$labels['create']  = '建立';
+$labels['createfolder']  = '建立新資料夾';
+$labels['managefolders']  = '管理資料夾';
 $labels['specialfolders'] = '預設資料夾設定';
 $labels['properties'] = '屬性';
 $labels['folderproperties'] = '資料夾屬性';
@@ -411,22 +493,29 @@ $labels['info'] = '資訊';
 $labels['getfoldersize'] = '點擊顯示資料夾大小';
 $labels['changesubscription'] = '點擊以改變訂閱';
 $labels['foldertype'] = '資料夾類型';
-$labels['personalfolder'] = '私人資料夾';
-$labels['otherfolder'] = '其他使用者資料夾';
-$labels['sharedfolder'] = '公用資料夾';
+$labels['personalfolder']  = '私人資料夾';
+$labels['otherfolder']  = '其他使用者資料夾';
+$labels['sharedfolder']  = '公用資料夾';
+
 $labels['sortby'] = '排序';
-$labels['sortasc'] = '遞增排序';
+$labels['sortasc']  = '遞增排序';
 $labels['sortdesc'] = '遞減排序';
 $labels['undo'] = '復原';
+
+$labels['installedplugins'] = '已安裝的插件';
 $labels['plugin'] = '擴充套件';
 $labels['version'] = '版本';
 $labels['source'] = '來源';
 $labels['license'] = '授權許可';
 $labels['support'] = '取得支援';
+
+// units
 $labels['B'] = 'B';
 $labels['KB'] = 'KB';
 $labels['MB'] = 'MB';
 $labels['GB'] = 'GB';
+
+// character sets
 $labels['unicode'] = '萬國碼';
 $labels['english'] = '英語';
 $labels['westerneuropean'] = '西歐語系';
@@ -446,3 +535,4 @@ $labels['japanese'] = '日本';
 $labels['korean'] = '韓國';
 $labels['chinese'] = '國語';
 
+?>
diff --git a/program/localization/zh_TW/messages.inc b/program/localization/zh_TW/messages.inc
index 753f6adb6..5605ba815 100644
--- a/program/localization/zh_TW/messages.inc
+++ b/program/localization/zh_TW/messages.inc
@@ -2,20 +2,23 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/zh_TW/messages.inc                                       |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Nansen                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['errortitle'] = '發生錯誤！';
-$messages['loginfailed'] = '登入失敗';
+$messages['errortitle']  = '發生錯誤！';
+$messages['loginfailed']  = '登入失敗';
 $messages['cookiesdisabled'] = '你的瀏覽器不接受 cookies';
 $messages['sessionerror'] = '你的工作階段已失效或過期';
 $messages['storageerror'] = '連線到 IMAP 伺服器失敗';
@@ -25,6 +28,8 @@ $messages['dberror'] = '資料庫錯誤!';
 $messages['requesttimedout'] = '要求逾時';
 $messages['errorreadonly'] = '動作無法完成。資料夾唯讀';
 $messages['errornoperm'] = '動作無法完成。權限不符';
+$messages['erroroverquota'] = '動作無法完成。硬碟空間不夠';
+$messages['erroroverquotadelete'] = '硬碟空間不夠,請使用SHIFT+DEL來刪除訊息';
 $messages['invalidrequest'] = '要求無效！未儲存任何資料。';
 $messages['invalidhost'] = '無效的伺服器名稱';
 $messages['nomessagesfound'] = '此郵件匣沒有任何郵件';
@@ -57,11 +62,11 @@ $messages['errormoving'] = '無法移動此郵件';
 $messages['errorcopying'] = '無法訊息';
 $messages['errordeleting'] = '無法刪除此郵件';
 $messages['errormarking'] = '無法標上旗標';
-$messages['deletecontactconfirm'] = '你確定要刪除已選擇的聯絡人？';
-$messages['deletegroupconfirm'] = '您確定要刪除選擇的群組嗎?';
+$messages['deletecontactconfirm']  = '你確定要刪除已選擇的聯絡人？';
+$messages['deletegroupconfirm']  = '您確定要刪除選擇的群組嗎?';
 $messages['deletemessagesconfirm'] = '你確定要刪除已選擇的郵件？';
-$messages['deletefolderconfirm'] = '你確定要刪除這個資料夾嗎？';
-$messages['purgefolderconfirm'] = '你確定要刪除這個資料夾裡面所有的郵件嗎？';
+$messages['deletefolderconfirm']  = '你確定要刪除這個資料夾嗎？';
+$messages['purgefolderconfirm']  = '你確定要刪除這個資料夾裡面所有的郵件嗎？';
 $messages['contactdeleting'] = '刪除連絡人...';
 $messages['groupdeleting'] = '刪除存組...';
 $messages['folderdeleting'] = '刪除資料夾中...';
@@ -70,11 +75,11 @@ $messages['foldersubscribing'] = '訂閱資料夾...';
 $messages['folderunsubscribing'] = '取消訂閱資料夾...';
 $messages['formincomplete'] = '這個表單有部分未填，請完整填寫';
 $messages['noemailwarning'] = '請輸入一個有效的電子郵件位址';
-$messages['nonamewarning'] = '請輸入名字';
+$messages['nonamewarning']  = '請輸入名字';
 $messages['nopagesizewarning'] = '請輸入一頁顯示多少郵件';
 $messages['nosenderwarning'] = '請輸入寄件者的電子郵件位址';
 $messages['norecipientwarning'] = '請輸入至少一位收信者';
-$messages['nosubjectwarning'] = '「主旨」欄是空的。你要輸入一個主旨嗎？';
+$messages['nosubjectwarning']  = '「主旨」欄是空的。你要輸入一個主旨嗎？';
 $messages['nobodywarning'] = '要傳送沒有內文的郵件嗎？';
 $messages['notsentwarning'] = '郵件尚未寄出。你確定要離開並且捨棄此郵件？';
 $messages['noldapserver'] = '請選擇一個 LDAP 伺服器進行搜尋';
@@ -116,6 +121,7 @@ $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>';
@@ -159,4 +165,8 @@ $messages['invalidimageformat'] = '圖片格式錯誤';
 $messages['mispellingsfound'] = '郵件中偵測到拼字錯誤';
 $messages['parentnotwritable'] = '無法建立/移動資料夾至指定的上層目錄 (No access rights)';
 $messages['messagetoobig'] = '郵件太大無法處理';
+$messages['attachmentvalidationerror'] = '警告！這個附件是可疑的，因為它的檔案類型與其宣稱的不同。如果您不能相信寄件者請不要開啟附件，它可能含有惡意的內容。<br /><br />
+<em>Expected: $expected; found: $detected</em>';
+$messages['noscriptwarning'] = '警告：使用Webmail需要Javascript支援，請檢查您瀏覽器的Javascript設定';
 
+?>
diff --git a/program/steps/addressbook/export.inc b/program/steps/addressbook/export.inc
index 15bf8b0d4..761f26b75 100644
--- a/program/steps/addressbook/export.inc
+++ b/program/steps/addressbook/export.inc
@@ -138,7 +138,9 @@ header('Content-Disposition: attachment; filename="contacts.vcf"');
 while ($result && ($row = $result->next())) {
     // we already have a vcard record
     if ($row['vcard'] && $row['name']) {
-        $row['vcard'] = preg_replace('/\r?\n/', rcube_vcard::$eol, $row['vcard']);
+        // fix folding and end-of-line chars
+        $row['vcard'] = preg_replace('/\r|\n\s+/', '', $row['vcard']);
+        $row['vcard'] = preg_replace('/\n/', rcube_vcard::$eol, $row['vcard']);
         echo rcube_vcard::rfc2425_fold($row['vcard']) . rcube_vcard::$eol;
     }
     // copy values into vcard object
diff --git a/program/steps/addressbook/func.inc b/program/steps/addressbook/func.inc
index 7fb862d5e..3db2409e8 100644
--- a/program/steps/addressbook/func.inc
+++ b/program/steps/addressbook/func.inc
@@ -26,7 +26,7 @@ $CONTACT_COLTYPES = array(
   'name'         => array('type' => 'text', 'size' => 40, 'maxlength' => 50, 'limit' => 1, 'label' => rcube_label('name'), 'category' => 'main'),
   'firstname'    => array('type' => 'text', 'size' => 19, 'maxlength' => 50, 'limit' => 1, 'label' => rcube_label('firstname'), 'category' => 'main'),
   'surname'      => array('type' => 'text', 'size' => 19, 'maxlength' => 50, 'limit' => 1, 'label' => rcube_label('surname'), 'category' => 'main'),
-  'email'        => array('type' => 'text', 'size' => 40, 'maxlength' => 50, 'label' => rcube_label('email'), 'subtypes' => array('home','work','other'), 'category' => 'main'),
+  'email'        => array('type' => 'text', 'size' => 40, 'maxlength' => 254, 'label' => rcube_label('email'), 'subtypes' => array('home','work','other'), 'category' => 'main'),
   'middlename'   => array('type' => 'text', 'size' => 19, 'maxlength' => 50, 'limit' => 1, 'label' => rcube_label('middlename'), 'category' => 'main'),
   'prefix'       => array('type' => 'text', 'size' => 8,  'maxlength' => 20, 'limit' => 1, 'label' => rcube_label('nameprefix'), 'category' => 'main'),
   'suffix'       => array('type' => 'text', 'size' => 8,  'maxlength' => 20, 'limit' => 1, 'label' => rcube_label('namesuffix'), 'category' => 'main'),
@@ -167,7 +167,7 @@ function rcmail_set_sourcename($abook)
     // get address book name (for display)
     if ($abook && $_SESSION['addressbooks_count'] > 1) {
         $name = $abook->get_name();
-        if (!$name && $source == 0) {
+        if (!$name) {
             $name = rcube_label('personaladrbook');
         }
         $OUTPUT->set_env('sourcename', html_entity_decode($name, ENT_COMPAT, 'UTF-8'));
@@ -183,11 +183,10 @@ function rcmail_directory_list($attrib)
         $attrib['id'] = 'rcmdirectorylist';
 
     $out = '';
-    $local_id = '0';
     $jsdata = array();
 
     $line_templ = html::tag('li', array(
-        'id' => 'rcmli%s', 'class' => '%s'),
+        'id' => 'rcmli%s', 'class' => '%s', 'noclose' => true),
         html::a(array('href' => '%s',
             'rel' => '%s',
             'onclick' => "return ".JS_OBJECT_NAME.".command('list','%s',this)"), '%s'));
@@ -213,7 +212,7 @@ function rcmail_directory_list($attrib)
 
         $name = !empty($source['name']) ? $source['name'] : $id;
         $out .= sprintf($line_templ,
-            html_identifier($id),
+            rcube_utils::html_identifier($id, true),
             $class_name,
             Q(rcmail_url(null, array('_source' => $id))),
             $source['id'],
@@ -224,10 +223,11 @@ function rcmail_directory_list($attrib)
             $groupdata = rcmail_contact_groups($groupdata);
         $jsdata = $groupdata['jsdata'];
         $out = $groupdata['out'];
+        $out .= '</li>';
     }
 
     $line_templ = html::tag('li', array(
-        'id' => 'rcmliS%s', 'class' => '%s'),
+        'id' => 'rcmli%s', 'class' => '%s'),
         html::a(array('href' => '#', 'rel' => 'S%s',
             'onclick' => "return ".JS_OBJECT_NAME.".command('listsearch', '%s', this)"), '%s'));
 
@@ -245,14 +245,17 @@ function rcmail_directory_list($attrib)
             $class_name .= ' ' . $source['class_name'];
 
         $out .= sprintf($line_templ,
-            html_identifier($id),
+            rcube_utils::html_identifier('S'.$id, true),
             $class_name,
             $id,
             $js_id, (!empty($source['name']) ? Q($source['name']) : Q($id)));
     }
 
     $OUTPUT->set_env('contactgroups', $jsdata);
+    $OUTPUT->set_env('collapsed_abooks', (string)$RCMAIL->config->get('collapsed_abooks',''));
     $OUTPUT->add_gui_object('folderlist', $attrib['id']);
+    $OUTPUT->include_script('treelist.js');
+
     // add some labels to client
     $OUTPUT->add_label('deletegroupconfirm', 'groupdeleting', 'addingmember', 'removingmember');
 
@@ -264,19 +267,23 @@ function rcmail_contact_groups($args)
 {
     global $RCMAIL;
 
+    $groups_html = '';
     $groups = $RCMAIL->get_address_book($args['source'])->list_groups();
 
     if (!empty($groups)) {
         $line_templ = html::tag('li', array(
-            'id' => 'rcmliG%s', 'class' => 'contactgroup'),
+            'id' => 'rcmli%s', 'class' => 'contactgroup'),
             html::a(array('href' => '#',
                 'rel' => '%s:%s',
                 'onclick' => "return ".JS_OBJECT_NAME.".command('listgroup',{'source':'%s','id':'%s'},this)"), '%s'));
 
-        $jsdata = array();
+        // append collapse/expand toggle and open a new <ul>
+        $is_collapsed = strpos($RCMAIL->config->get('collapsed_abooks',''), '&'.rawurlencode($args['source']).'&') !== false;
+        $args['out'] .= html::div('treetoggle ' . ($is_collapsed ? 'collapsed' : 'expanded'), '&nbsp;');
+
         foreach ($groups as $group) {
-            $args['out'] .= sprintf($line_templ,
-                html_identifier($args['source'] . $group['ID']),
+            $groups_html .= sprintf($line_templ,
+                rcube_utils::html_identifier('G' . $args['source'] . $group['ID'], true),
                 $args['source'], $group['ID'],
                 $args['source'], $group['ID'], Q($group['name'])
             );
@@ -286,6 +293,10 @@ function rcmail_contact_groups($args)
         }
     }
 
+    $args['out'] .= html::tag('ul',
+      array('class' => 'groups', 'style' => ($is_collapsed || empty($groups) ? "display:none;" : null)),
+      $groups_html);
+
     return $args;
 }
 
@@ -540,22 +551,13 @@ function rcmail_contact_form($form, $record, $attrib = null)
                     // iterate over possible subtypes and collect values with their subtype
                     if (is_array($colprop['subtypes'])) {
                         $values = $subtypes = array();
-                        foreach ($colprop['subtypes'] as $i => $st) {
-                            $newval = false;
-                            if ($record[$field.':'.$st]) {
-                                $subtypes[count($values)] = $st;
-                                $newval = $record[$field.':'.$st];
-                            }
-                            else if ($i == 0 && $record[$field]) {
-                                $subtypes[count($values)] = $st;
-                                $newval = $record[$field];
-                            }
-                            if ($newval !== false) {
-                                if (is_array($newval) && isset($newval[0]))
-                                    $values = array_merge($values, $newval);
-                                else
-                                    $values[] = $newval;
+                        foreach (rcube_addressbook::get_col_values($field, $record) as $st => $vals) {
+                            foreach((array)$vals as $value) {
+                                $i = count($values);
+                                $subtypes[$i] = $st;
+                                $values[$i] = $value;
                             }
+                            // TODO: add $st to $select_subtype if missing ?
                         }
                     }
                     else {
@@ -755,20 +757,27 @@ function rcmail_get_cids($filter = null)
         return array();
     }
 
-    $cid    = explode(',', $cid);
-    $result = array();
+    $cid        = explode(',', $cid);
+    $got_source = strlen($source);
+    $result     = array();
 
     // create per-source contact IDs array
     foreach ($cid as $id) {
-        // get source from decoded ID
-        if ($sep = strrpos($id, '-')) {
-            $contact_id = substr($id, 0, $sep);
-            $source_id  = substr($id, $sep+1);
-            if (strlen($source_id)) {
-                $result[(string)$source_id][] = $contact_id;
+        // extract source ID from contact ID (it's there in search mode)
+        // see #1488959 and #1488862 for reference
+        if (!$got_source) {
+            if ($sep = strrpos($id, '-')) {
+                $contact_id = substr($id, 0, $sep);
+                $source_id  = (string) substr($id, $sep+1);
+                if (strlen($source_id)) {
+                    $result[$source_id][] = $contact_id;
+                }
             }
         }
         else {
+            if (substr($id, -($got_source+1)) === "-$source") {
+                $id = substr($id, 0, -($got_source+1));
+            }
             $result[$source][] = $id;
         }
     }
diff --git a/program/steps/addressbook/import.inc b/program/steps/addressbook/import.inc
index df07d64bc..915aac884 100644
--- a/program/steps/addressbook/import.inc
+++ b/program/steps/addressbook/import.inc
@@ -88,7 +88,7 @@ function rcmail_import_confirm($attrib)
 
   $content = html::p(null, rcube_label(array(
       'name' => 'importconfirm',
-      'nr' => $IMORT_STATS->inserted,
+      'nr' => $IMPORT_STATS->inserted,
       'vars' => $vars,
     )) . ($IMPORT_STATS->names ? ':' : '.'));
 
@@ -98,7 +98,7 @@ function rcmail_import_confirm($attrib)
   if ($IMPORT_STATS->skipped) {
       $content .= html::p(null, rcube_label(array(
           'name' => 'importconfirmskipped',
-          'nr' => $IMORT_STATS->skipped,
+          'nr' => $IMPORT_STATS->skipped,
           'vars' => $vars,
         )) . ':');
       $content .= html::p('em', join(', ', array_map('Q', $IMPORT_STATS->skipped_names)));
@@ -209,6 +209,15 @@ if (is_array($_FILES['_file'])) {
         foreach ($vcards as $vcard) {
             $a_record = $vcard->get_assoc();
 
+            // Generate contact's display name (must be before validation), the same we do in save.inc
+            if (empty($a_record['name'])) {
+                $a_record['name'] = rcube_addressbook::compose_display_name($a_record, true);
+                // Reset it if equals to email address (from compose_display_name())
+                if ($a_record['name'] == $a_record['email'][0]) {
+                    $a_record['name'] = '';
+                }
+            }
+
             // skip invalid (incomplete) entries
             if (!$CONTACTS->validate($a_record, true)) {
                 $IMPORT_STATS->invalid++;
@@ -250,7 +259,7 @@ if (is_array($_FILES['_file'])) {
 
             if ($success) {
                 $IMPORT_STATS->inserted++;
-                $IMPORT_STATS->names[] = $vcard->displayname ? $vcard->displayname : $email;
+                $IMPORT_STATS->names[] = $a_record['name'] ? $a_record['name'] : $email;
             }
             else {
                 $IMPORT_STATS->errors++;
diff --git a/program/steps/addressbook/save.inc b/program/steps/addressbook/save.inc
index 901ea0190..25bfbd48b 100644
--- a/program/steps/addressbook/save.inc
+++ b/program/steps/addressbook/save.inc
@@ -82,7 +82,7 @@ if (empty($a_record['name'])) {
 // do input checks (delegated to $CONTACTS instance)
 if (!$CONTACTS->validate($a_record)) {
     $err = (array)$CONTACTS->get_error();
-    $OUTPUT->show_message($err['message'] ? $err['message'] : 'formincomplete', 'warning');
+    $OUTPUT->show_message($err['message'] ? Q($err['message']) : 'formincomplete', 'warning');
     $GLOBALS['EDIT_RECORD'] = $a_record;  // store submitted data to be used in edit form
     rcmail_overwrite_action($return_action);
     return;
@@ -192,7 +192,7 @@ else {
         if (($maxnum = $RCMAIL->config->get('max_group_members', 0)) && ($counts->count + 1 > $maxnum))
           $OUTPUT->show_message('maxgroupmembersreached', 'warning', array('max' => $maxnum));
 
-        $CONTACTS->add_to_group($gid, $plugin['ids']);
+        $CONTACTS->add_to_group($plugin['group_id'], $plugin['ids']);
       }
     }
     else
diff --git a/program/steps/addressbook/show.inc b/program/steps/addressbook/show.inc
index 16be89f94..1a97c65b1 100644
--- a/program/steps/addressbook/show.inc
+++ b/program/steps/addressbook/show.inc
@@ -101,8 +101,6 @@ function rcmail_contact_head($attrib)
         return false;
     }
 
-    $microformats = array('name' => 'fn', 'email' => 'email');
-
     $form = array(
         'head' => array(  // section 'head' is magic!
             'content' => array(
@@ -177,7 +175,7 @@ function rcmail_contact_details($attrib)
 }
 
 
-function rcmail_render_email_value($email, $col)
+function rcmail_render_email_value($email)
 {
     return html::a(array(
         'href' => 'mailto:' . $email,
@@ -188,7 +186,7 @@ function rcmail_render_email_value($email, $col)
 }
 
 
-function rcmail_render_url_value($url, $col)
+function rcmail_render_url_value($url)
 {
     $prefix = preg_match('!^(http|ftp)s?://!', $url) ? '' : 'http://';
     return html::a(array(
@@ -223,7 +221,7 @@ function rcmail_contact_record_groups($contact_id)
     }
 
     $hiddenfields = new html_hiddenfield(array('name' => '_source', 'value' => get_input_value('_source', RCUBE_INPUT_GPC)));
-    $hiddenfields->add(array('name' => '_cid', 'value' => $record['ID']));
+    $hiddenfields->add(array('name' => '_cid', 'value' => $contact_id));
 
     $form_start = $RCMAIL->output->request_form(array(
         'name' => "form", 'method' => "post",
diff --git a/program/steps/mail/attachments.inc b/program/steps/mail/attachments.inc
index 180fc0bb9..f83f6892e 100644
--- a/program/steps/mail/attachments.inc
+++ b/program/steps/mail/attachments.inc
@@ -27,8 +27,10 @@ if (!empty($_GET['_progress'])) {
 $COMPOSE_ID = get_input_value('_id', RCUBE_INPUT_GPC);
 $COMPOSE    = null;
 
-if ($COMPOSE_ID && $_SESSION['compose_data_'.$COMPOSE_ID])
-  $COMPOSE =& $_SESSION['compose_data_'.$COMPOSE_ID];
+if ($COMPOSE_ID && $_SESSION['compose_data_' . $COMPOSE_ID]) {
+  $SESSION_KEY = 'compose_data_' . $COMPOSE_ID;
+  $COMPOSE =& $_SESSION[$SESSION_KEY];
+}
 
 if (!$COMPOSE) {
   die("Invalid session var!");
@@ -45,7 +47,7 @@ if ($RCMAIL->action=='remove-attachment')
     $attachment = $RCMAIL->plugins->exec_hook('attachment_delete', $attachment);
   if ($attachment['status']) {
     if (is_array($COMPOSE['attachments'][$id])) {
-      unset($COMPOSE['attachments'][$id]);
+      $RCMAIL->session->remove($SESSION_KEY.'.attachments.'.$id);
       $OUTPUT->command('remove_from_attachment_list', "rcmfile$id");
     }
   }
@@ -77,11 +79,7 @@ if ($RCMAIL->action=='display-attachment')
   exit;
 }
 
-// attachment upload action
-
-if (!is_array($COMPOSE['attachments'])) {
-  $COMPOSE['attachments'] = array();
-}
+/*****  attachment upload action  *****/
 
 // clear all stored output properties (like scripts and env vars)
 $OUTPUT->reset();
@@ -112,7 +110,7 @@ if (is_array($_FILES['_attachments']['tmp_name'])) {
 
       // store new attachment in session
       unset($attachment['status'], $attachment['abort']);
-      $COMPOSE['attachments'][$id] = $attachment;
+      $RCMAIL->session->append($SESSION_KEY.'.attachments', $id, $attachment);
 
       if (($icon = $COMPOSE['deleteicon']) && is_file($icon)) {
         $button = html::img(array(
diff --git a/program/steps/mail/autocomplete.inc b/program/steps/mail/autocomplete.inc
index 55579814c..f9e8d71a4 100644
--- a/program/steps/mail/autocomplete.inc
+++ b/program/steps/mail/autocomplete.inc
@@ -102,7 +102,7 @@ if (!empty($book_types) && strlen($search)) {
 
     // also list matching contact groups
     if ($abook->groups && count($contacts) < $MAXNUM) {
-      foreach ($abook->list_groups($search) as $group) {
+      foreach ($abook->list_groups($search, $mode) as $group) {
         $abook->reset();
         $abook->set_group($group['ID']);
         $group_prop = $abook->get_group($group['ID']);
diff --git a/program/steps/mail/check_recent.inc b/program/steps/mail/check_recent.inc
index 4befbf275..8c0b1ffc0 100644
--- a/program/steps/mail/check_recent.inc
+++ b/program/steps/mail/check_recent.inc
@@ -52,12 +52,12 @@ foreach ($a_mailboxes as $mbox_name) {
     }
 
     // Get mailbox status
-    $status = $RCMAIL->storage->folder_status($mbox_name);
+    $status = $RCMAIL->storage->folder_status($mbox_name, $diff);
 
     if ($status & 1) {
         // trigger plugin hook
         $RCMAIL->plugins->exec_hook('new_messages',
-            array('mailbox' => $mbox_name, 'is_current' => $is_current));
+            array('mailbox' => $mbox_name, 'is_current' => $is_current, 'diff' => $diff));
     }
 
     rcmail_send_unread_count($mbox_name, true, null,
@@ -81,9 +81,10 @@ foreach ($a_mailboxes as $mbox_name) {
         if (empty($_GET['_list']))
             continue;
 
-        // get overall message count; allow caching because rcube_storage::folder_status() did a refresh
+        // get overall message count; allow caching because rcube_storage::folder_status()
+        // did a refresh but only in list mode
         $list_mode = $RCMAIL->storage->get_threading() ? 'THREADS' : 'ALL';
-        $all_count = $RCMAIL->storage->count($mbox_name, $list_mode, false, false);
+        $all_count = $RCMAIL->storage->count($mbox_name, $list_mode, $list_mode == 'THREADS', false);
         $page      = $RCMAIL->storage->get_page();
         $page_size = $RCMAIL->storage->get_pagesize();
 
@@ -115,4 +116,7 @@ foreach ($a_mailboxes as $mbox_name) {
     }
 }
 
+// trigger refresh hook
+$RCMAIL->plugins->exec_hook('refresh', array());
+
 $OUTPUT->send();
diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc
index 74c6d5f29..d3bc7fe72 100644
--- a/program/steps/mail/compose.inc
+++ b/program/steps/mail/compose.inc
@@ -139,12 +139,11 @@ if (!empty($CONFIG['drafts_mbox'])) {
 }
 // set current mailbox in client environment
 $OUTPUT->set_env('mailbox', $RCMAIL->storage->get_folder());
-$OUTPUT->set_env('sig_above', $RCMAIL->config->get('sig_above', false));
 $OUTPUT->set_env('top_posting', intval($RCMAIL->config->get('reply_mode')) > 0);
 $OUTPUT->set_env('recipients_separator', trim($RCMAIL->config->get('recipients_separator', ',')));
 
 // default font for HTML editor
-$font = rcube_fontdefs($RCMAIL->config->get('default_font', 'Verdana'));
+$font = rcube_fontdefs($RCMAIL->config->get('default_font'));
 if ($font && !is_array($font)) {
   $OUTPUT->set_env('default_font', $font);
 }
@@ -152,6 +151,7 @@ if ($font && !is_array($font)) {
 // get reference message and set compose mode
 if ($msg_uid = $COMPOSE['param']['draft_uid']) {
   $compose_mode = RCUBE_COMPOSE_DRAFT;
+  $OUTPUT->set_env('draft_id', $msg_uid);
   $RCMAIL->storage->set_folder($CONFIG['drafts_mbox']);
 }
 else if ($msg_uid = $COMPOSE['param']['reply_uid']) {
@@ -183,9 +183,18 @@ $LINE_LENGTH = $RCMAIL->config->get('line_length', 72);
 
 if (!empty($msg_uid) && empty($COMPOSE['as_attachment']))
 {
-  // similar as in program/steps/mail/show.inc
-  // re-set 'prefer_html' to have possibility to use html part for compose
-  $CONFIG['prefer_html'] = $CONFIG['prefer_html'] || $CONFIG['htmleditor'] || $compose_mode == RCUBE_COMPOSE_DRAFT || $compose_mode == RCUBE_COMPOSE_EDIT;
+  $mbox_name = $RCMAIL->storage->get_folder();
+
+  // set format before rcube_message construction
+  // use the same format as for the message view
+  if (isset($_SESSION['msg_formats'][$mbox_name.':'.$msg_uid])) {
+    $RCMAIL->config->set('prefer_html', $_SESSION['msg_formats'][$mbox_name.':'.$msg_uid]);
+  }
+  else {
+    $prefer_html = $CONFIG['prefer_html'] || $CONFIG['htmleditor'] || $compose_mode == RCUBE_COMPOSE_DRAFT || $compose_mode == RCUBE_COMPOSE_EDIT;
+    $RCMAIL->config->set('prefer_html', $prefer_html);
+  }
+
   $MESSAGE = new rcube_message($msg_uid);
 
   // make sure message is marked as read
@@ -211,9 +220,9 @@ if (!empty($msg_uid) && empty($COMPOSE['as_attachment']))
     }
   }
   else if ($compose_mode == RCUBE_COMPOSE_DRAFT) {
-    if ($MESSAGE->headers->others['x-draft-info']) {
+    if ($draft_info = $MESSAGE->headers->get('x-draft-info')) {
       // get reply_uid/forward_uid to flag the original message when sending
-      $info = rcmail_draftinfo_decode($MESSAGE->headers->others['x-draft-info']);
+      $info = rcmail_draftinfo_decode($draft_info);
 
       if ($info['type'] == 'reply')
         $COMPOSE['reply_uid'] = $info['uid'];
@@ -230,8 +239,8 @@ if (!empty($msg_uid) && empty($COMPOSE['as_attachment']))
       }
     }
 
-    if ($MESSAGE->headers->in_reply_to)
-      $COMPOSE['reply_msgid'] = '<'.$MESSAGE->headers->in_reply_to.'>';
+    if ($in_reply_to = $MESSAGE->headers->get('in-reply-to'))
+      $COMPOSE['reply_msgid'] = '<' . $in_reply_to . '>';
 
     $COMPOSE['references']  = $MESSAGE->headers->references;
   }
@@ -318,6 +327,20 @@ foreach ($parts as $header) {
         $fvalue .= $v;
       if ($v = $MESSAGE->headers->cc)
         $fvalue .= (!empty($fvalue) ? $separator : '') . $v;
+      // Use Sender header (#1489011)
+      if (($v = $MESSAGE->headers->get('Sender', false)) && strpos($v, '-bounces@') === false)
+        $fvalue .= (!empty($fvalue) ? $separator : '') . $v;
+
+      // When To: and Reply-To: are the same we add From: address to the list (#1489037)
+      if ($v = $MESSAGE->headers->from) {
+        $from    = rcube_mime::decode_address_list($v, null, false, $MESSAGE->headers->charset, true);
+        $to      = rcube_mime::decode_address_list($MESSAGE->headers->to, null, false, $MESSAGE->headers->charset, true);
+        $replyto = rcube_mime::decode_address_list($MESSAGE->headers->replyto, null, false, $MESSAGE->headers->charset, true);
+
+        if (count($replyto) && !count(array_diff($to, $replyto)) && count(array_diff($from, $to))) {
+          $fvalue .= (!empty($fvalue) ? $separator : '') . $v;
+        }
+      }
     }
   }
   else if (in_array($compose_mode, array(RCUBE_COMPOSE_DRAFT, RCUBE_COMPOSE_EDIT))) {
@@ -377,7 +400,7 @@ function rcmail_compose_headers($attrib)
 {
   global $MESSAGE;
 
-  list($form_start, $form_end) = get_form_tags($attrib);
+  list($form_start,) = get_form_tags($attrib);
 
   $out  = '';
   $part = strtolower($attrib['part']);
@@ -441,7 +464,7 @@ function rcmail_compose_headers($attrib)
 
 function rcmail_compose_header_from($attrib)
 {
-  global $MESSAGE, $OUTPUT, $RCMAIL, $compose_mode;
+  global $MESSAGE, $OUTPUT, $RCMAIL, $COMPOSE, $compose_mode;
 
   // pass the following attributes to the form class
   $field_attrib = array('name' => '_from');
@@ -452,7 +475,8 @@ function rcmail_compose_header_from($attrib)
   if (count($MESSAGE->identities))
   {
     $a_signatures = array();
-    $separator    = $RCMAIL->config->get('sig_above')
+    $identities   = array();
+    $separator    = intval($RCMAIL->config->get('reply_mode')) > 0
       && ($compose_mode == RCUBE_COMPOSE_REPLY || $compose_mode == RCUBE_COMPOSE_FORWARD) ? '---' : '-- ';
 
     $field_attrib['onchange'] = JS_OBJECT_NAME.".change_identity(this)";
@@ -489,12 +513,21 @@ function rcmail_compose_header_from($attrib)
         $a_signatures[$identity_id]['text'] = $text;
         $a_signatures[$identity_id]['html'] = $html;
       }
+
+      // add bcc and reply-to
+      if (!empty($sql_arr['reply-to'])) {
+        $identities[$identity_id]['replyto'] = $sql_arr['reply-to'];
+      }
+      if (!empty($sql_arr['bcc'])) {
+        $identities[$identity_id]['bcc'] = $sql_arr['bcc'];
+      }
     }
 
     $out = $select_from->show($MESSAGE->compose['from']);
 
     // add signatures to client
     $OUTPUT->set_env('signatures', $a_signatures);
+    $OUTPUT->set_env('identities', $identities);
   }
   // no identities, display text input field
   else {
@@ -509,7 +542,7 @@ function rcmail_compose_header_from($attrib)
 
 function rcmail_compose_editor_mode()
 {
-  global $RCMAIL, $MESSAGE, $compose_mode;
+  global $RCMAIL, $compose_mode;
   static $useHtml;
 
   if ($useHtml !== null)
@@ -521,13 +554,13 @@ function rcmail_compose_editor_mode()
     $useHtml = !empty($_POST['_is_html']);
   }
   else if ($compose_mode == RCUBE_COMPOSE_DRAFT || $compose_mode == RCUBE_COMPOSE_EDIT) {
-    $useHtml = $MESSAGE->has_html_part(false, true);
+    $useHtml = rcmail_message_is_html();
   }
   else if ($compose_mode == RCUBE_COMPOSE_REPLY) {
-    $useHtml = ($html_editor == 1 || ($html_editor >= 2 && $MESSAGE->has_html_part(false, true)));
+    $useHtml = ($html_editor == 1 || ($html_editor >= 2 && rcmail_message_is_html()));
   }
   else if ($compose_mode == RCUBE_COMPOSE_FORWARD) {
-    $useHtml = ($html_editor == 1 || ($html_editor == 3 && $MESSAGE->has_html_part(false, true)));
+    $useHtml = ($html_editor == 1 || ($html_editor == 3 && rcmail_message_is_html()));
   }
   else {
     $useHtml = ($html_editor == 1);
@@ -536,10 +569,15 @@ function rcmail_compose_editor_mode()
   return $useHtml;
 }
 
+function rcmail_message_is_html()
+{
+    global $RCMAIL, $MESSAGE;
+    return $RCMAIL->config->get('prefer_html') && ($MESSAGE instanceof rcube_message) && $MESSAGE->has_html_part(true);
+}
 
 function rcmail_prepare_message_body()
 {
-  global $RCMAIL, $MESSAGE, $COMPOSE, $compose_mode, $LINE_LENGTH, $HTML_MODE;
+  global $RCMAIL, $MESSAGE, $COMPOSE, $compose_mode, $HTML_MODE;
 
   // use posted message body
   if (!empty($_POST['_message'])) {
@@ -554,11 +592,10 @@ function rcmail_prepare_message_body()
   else if ($compose_mode == RCUBE_COMPOSE_FORWARD && $COMPOSE['as_attachment']) {
     $isHtml = rcmail_compose_editor_mode();
     $body = '';
-    if (empty($COMPOSE['attachments']))
-      rcmail_write_forward_attachments();
+    rcmail_write_forward_attachments();
   }
   // reply/edit/draft/forward
-  else if ($compose_mode && ($compose_mode != RCUBE_COMPOSE_REPLY || $RCMAIL->config->get('reply_mode') != -1)) {
+  else if ($compose_mode && ($compose_mode != RCUBE_COMPOSE_REPLY || intval($RCMAIL->config->get('reply_mode')) != -1)) {
     $isHtml = rcmail_compose_editor_mode();
 
     if (!empty($MESSAGE->parts)) {
@@ -613,7 +650,7 @@ function rcmail_prepare_message_body()
 
 function rcmail_compose_part_body($part, $isHtml = false)
 {
-    global $RCMAIL, $MESSAGE, $compose_mode;
+    global $RCMAIL, $MESSAGE, $LINE_LENGTH, $compose_mode;
 
     // Check if we have enough memory to handle the message in it
     // #1487424: we need up to 10x more memory than the body
@@ -650,6 +687,11 @@ function rcmail_compose_part_body($part, $isHtml = false)
                     $body = rcmail_remove_signature($body);
                 }
             }
+
+            if ($part->ctype_parameters['format'] == 'flowed') {
+                $body = rcube_mime::unfold_flowed($body);
+            }
+
             // add HTML formatting
             $body = rcmail_plain_body($body);
             if ($body) {
@@ -670,9 +712,6 @@ function rcmail_compose_part_body($part, $isHtml = false)
             $txt = new rcube_html2text($body, false, true, $len);
             $body = $txt->get_text();
         }
-        else if ($part->ctype_secondary == 'enriched') {
-            $body = rcube_enriched::to_html($body);
-        }
         else {
             if ($part->ctype_secondary == 'plain' && $part->ctype_parameters['format'] == 'flowed') {
                 $body = rcube_mime::unfold_flowed($body);
@@ -692,7 +731,7 @@ function rcmail_compose_part_body($part, $isHtml = false)
 
 function rcmail_compose_body($attrib)
 {
-  global $RCMAIL, $CONFIG, $OUTPUT, $MESSAGE, $compose_mode, $LINE_LENGTH, $HTML_MODE, $MESSAGE_BODY;
+  global $RCMAIL, $CONFIG, $OUTPUT, $MESSAGE, $compose_mode, $HTML_MODE, $MESSAGE_BODY;
 
   list($form_start, $form_end) = get_form_tags($attrib);
   unset($attrib['form']);
@@ -876,8 +915,7 @@ function rcmail_create_forward_body($body, $bodyIsHtml)
   if (!isset($COMPOSE['forward_attachments']) && is_array($MESSAGE->mime_parts))
     $cid_map = rcmail_write_compose_attachments($MESSAGE, $bodyIsHtml);
 
-  $date    = format_date($MESSAGE->headers->date, $RCMAIL->config->get('date_long'));
-  $charset = $RCMAIL->output->get_charset();
+  $date = format_date($MESSAGE->headers->date, $RCMAIL->config->get('date_long'));
 
   if (!$bodyIsHtml) {
     $prefix = "\n\n\n-------- " . rcube_label('originalmessage') . " --------\n";
@@ -931,7 +969,7 @@ function rcmail_create_forward_body($body, $bodyIsHtml)
 
 function rcmail_create_draft_body($body, $bodyIsHtml)
 {
-  global $MESSAGE, $OUTPUT, $COMPOSE;
+  global $MESSAGE, $COMPOSE;
 
   /**
    * add attachments
@@ -978,18 +1016,25 @@ function rcmail_write_compose_attachments(&$message, $bodyIsHtml)
 {
   global $RCMAIL, $COMPOSE, $compose_mode;
 
+  $loaded_attachments = array();
+  foreach ((array)$COMPOSE['attachments'] as $attachment) {
+      $loaded_attachments[$attachment['name'] . $attachment['mimetype']] = $attachment;
+  }
+
   $cid_map = $messages = array();
   foreach ((array)$message->mime_parts as $pid => $part)
   {
     if ($part->disposition == 'attachment' || ($part->disposition == 'inline' && $bodyIsHtml) || $part->filename) {
-      if ($part->ctype_primary == 'message' || $part->ctype_primary == 'multipart') {
+      // skip parts that aren't valid attachments
+      if ($part->ctype_primary == 'multipart' || $part->mimetype == 'application/ms-tnef') {
         continue;
       }
-      if ($part->mimetype == 'application/ms-tnef') {
+      // skip message attachments in reply mode
+      if ($part->ctype_primary == 'message' && $compose_mode == RCUBE_COMPOSE_REPLY) {
         continue;
       }
-      // skip inline images when forwarding in plain text
-      if ($part->content_id && !$bodyIsHtml && $compose_mode == RCUBE_COMPOSE_FORWARD) {
+      // skip inline images when forwarding
+      if ($part->content_id && $part->disposition == 'inline' && $compose_mode == RCUBE_COMPOSE_FORWARD) {
         continue;
       }
 
@@ -1005,7 +1050,8 @@ function rcmail_write_compose_attachments(&$message, $bodyIsHtml)
           }
       }
 
-      if (!$skip && ($attachment = rcmail_save_attachment($message, $pid))) {
+      if (!$skip && (($attachment = $loaded_attachments[rcmail_attachment_name($part) . $part->mimetype])
+          || ($attachment = rcmail_save_attachment($message, $pid)))) {
         $COMPOSE['attachments'][$attachment['id']] = $attachment;
         if ($bodyIsHtml && ($part->content_id || $part->content_location)) {
           $url = sprintf('%s&_id=%s&_action=display-attachment&_file=rcmfile%s',
@@ -1057,6 +1103,11 @@ function rcmail_write_forward_attachments()
   $curr_mem  = function_exists('memory_get_usage') ? memory_get_usage() : 16*1024*1024; // safe value: 16MB
   $names     = array();
 
+  $loaded_attachments = array();
+  foreach ((array)$COMPOSE['attachments'] as $attachment) {
+      $loaded_attachments[$attachment['name'] . $attachment['mimetype']] = $attachment;
+  }
+
   if ($COMPOSE['forward_uid'] == '*') {
     $index = $storage->index(null, rcmail_sort_column(), rcmail_sort_order());
     $COMPOSE['forward_uid'] = $index->get();
@@ -1091,6 +1142,10 @@ function rcmail_write_forward_attachments()
 
     $data = $path = null;
 
+    if (!empty($loaded_attachments[$name . 'message/rfc822'])) {
+      continue;
+    }
+
     // don't load too big attachments into memory
     if ($mem_limit > 0 && $message->size > $mem_limit - $curr_mem) {
       $temp_dir = unslashify($RCMAIL->config->get('temp_dir'));
@@ -1184,10 +1239,11 @@ function rcmail_save_image($path, $mimetype='')
 
   // handle attachments in memory
   $data = file_get_contents($path);
+  $name = rcmail_basename($path);
 
   $attachment = array(
     'group' => $COMPOSE['id'],
-    'name' => rcmail_basename($path),
+    'name' => $name,
     'mimetype' => $mimetype ? $mimetype : rc_mime_content_type($path, $name),
     'data' => $data,
     'size' => strlen($data),
@@ -1457,7 +1513,7 @@ function rcmail_editor_selector($attrib)
   $select->add(Q(rcube_label('plaintoggle')), 'plain');
 
   return $select->show($useHtml ? 'html' : 'plain');
-
+/*
   foreach ($choices as $value => $text) {
     $attrib['id'] = '_' . $value;
     $attrib['value'] = $value;
@@ -1465,6 +1521,7 @@ function rcmail_editor_selector($attrib)
   }
 
   return $selector;
+*/
 }
 
 
@@ -1558,7 +1615,7 @@ function rcmail_addressbook_list($attrib = array())
             $class_name .= ' ' . $source['class_name'];
 
         $out .= sprintf($line_templ,
-            html_identifier($id),
+            html_identifier($id,true),
             $class_name,
             $source['id'],
             $js_id, (!empty($source['name']) ? $source['name'] : $id));
diff --git a/program/steps/mail/copy.inc b/program/steps/mail/copy.inc
index a72378b0e..876657485 100644
--- a/program/steps/mail/copy.inc
+++ b/program/steps/mail/copy.inc
@@ -24,10 +24,10 @@ if (!$OUTPUT->ajax_call)
   return;
 
 // move messages
-if (!empty($_POST['_uid']) && !empty($_POST['_target_mbox'])) {
-    $uids = get_input_value('_uid', RCUBE_INPUT_POST);
+if (!empty($_POST['_uid']) && strlen($_POST['_target_mbox'])) {
+    $uids   = get_input_value('_uid', RCUBE_INPUT_POST);
     $target = get_input_value('_target_mbox', RCUBE_INPUT_POST, true);
-    $mbox = get_input_value('_mbox', RCUBE_INPUT_POST, true);
+    $mbox   = get_input_value('_mbox', RCUBE_INPUT_POST, true);
 
     $copied = $RCMAIL->storage->copy_message($uids, $target, $mbox);
 
@@ -47,7 +47,7 @@ if (!empty($_POST['_uid']) && !empty($_POST['_target_mbox'])) {
 }
 // unknown action or missing query param
 else {
-    exit;
+    $OUTPUT->show_message('internalerror', 'error');
 }
 
 // send response
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index 6b8879dcf..4483ec160 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -120,7 +120,7 @@ if (empty($RCMAIL->action) || $RCMAIL->action == 'list') {
   if (!$OUTPUT->ajax_call)
     $OUTPUT->add_label('checkingmail', 'deletemessage', 'movemessagetotrash',
       'movingmessage', 'copyingmessage', 'deletingmessage', 'markingmessage',
-      'copy', 'move', 'quota');
+      'copy', 'move', 'quota', 'replyall', 'replylist', 'importwait');
 
   $pagetitle = $RCMAIL->localize_foldername($RCMAIL->storage->mod_folder($mbox_name), true);
   $pagetitle = str_replace($delimiter, " \xC2\xBB ", $pagetitle);
@@ -224,7 +224,7 @@ function rcmail_message_list($attrib)
   if (!in_array('threads', $a_show_cols))
     array_unshift($a_show_cols, 'threads');
 
-  $skin_path = $_SESSION['skin_path'] = $CONFIG['skin_path'];
+  $_SESSION['skin_path'] = $CONFIG['skin_path'];
 
   // set client env
   $OUTPUT->add_gui_object('messagelist', $attrib['id']);
@@ -236,15 +236,13 @@ function rcmail_message_list($attrib)
 
   $OUTPUT->include_script('list.js');
 
-  $thead = '';
-  foreach (rcmail_message_list_head($attrib, $a_show_cols) as $cell)
-    $thead .= html::tag('td', array('class' => $cell['className'], 'id' => $cell['id']), $cell['html']);
+  $table = new html_table($attrib);
+  if (!$attrib['noheader']) {
+    foreach (rcmail_message_list_head($attrib, $a_show_cols) as $cell)
+      $table->add_header(array('class' => $cell['className'], 'id' => $cell['id']), $cell['html']);
+  }
 
-  return html::tag('table',
-    $attrib,
-    html::tag('thead', null, html::tag('tr', null, $thead)) .
-      html::tag('tbody', null, ''),
-        array('style', 'class', 'id', 'cellpadding', 'cellspacing', 'border', 'summary'));
+  return $table->show();
 }
 
 
@@ -291,7 +289,7 @@ function rcmail_js_message_list($a_headers, $insert_top=FALSE, $a_show_cols=null
   $thead = $head_replace ? rcmail_message_list_head($_SESSION['list_attrib'], $a_show_cols) : NULL;
 
   // get name of smart From/To column in folder context
-  if (($f = array_search('fromto', $a_show_cols)) !== false) {
+  if (array_search('fromto', $a_show_cols) !== false) {
     $smart_col = rcmail_message_list_smart_column_name();
   }
 
@@ -307,7 +305,7 @@ function rcmail_js_message_list($a_headers, $insert_top=FALSE, $a_show_cols=null
   }
 
   // loop through message headers
-  foreach ($a_headers as $n => $header) {
+  foreach ($a_headers as $header) {
     if (empty($header))
       continue;
 
@@ -381,7 +379,6 @@ function rcmail_message_list_head($attrib, $a_show_cols)
   global $RCMAIL;
 
   $skin_path = $_SESSION['skin_path'];
-  $image_tag = html::img(array('src' => "%s%s", 'alt' => "%s"));
 
   // check to see if we have some settings for sorting
   $sort_col   = $_SESSION['sort_col'];
@@ -417,7 +414,7 @@ function rcmail_message_list_head($attrib, $a_show_cols)
   $cells = array();
 
   // get name of smart From/To column in folder context
-  if (($f = array_search('fromto', $a_show_cols)) !== false) {
+  if (array_search('fromto', $a_show_cols) !== false) {
     $smart_col = rcmail_message_list_smart_column_name();
   }
 
@@ -707,7 +704,10 @@ function rcmail_print_body($part, $p = array())
         + $p + array('safe' => false, 'plain' => false, 'inline_html' => true));
 
   // convert html to text/plain
-  if ($data['type'] == 'html' && $data['plain']) {
+  if ($data['plain'] && ($data['type'] == 'html' || $data['type'] == 'enriched')) {
+    if ($data['type'] == 'enriched') {
+      $data['body'] = rcube_enriched::to_html($data['body']);
+    }
     $txt = new rcube_html2text($data['body'], false, true);
     $body = $txt->get_text();
     $part->ctype_secondary = 'plain';
@@ -733,8 +733,13 @@ function rcmail_print_body($part, $p = array())
   unset($data['body']);
 
   // plaintext postprocessing
-  if ($part->ctype_secondary == 'plain')
-    $body = rcmail_plain_body($body, $part->ctype_parameters['format'] == 'flowed');
+  if ($part->ctype_secondary == 'plain') {
+    if ($part->ctype_secondary == 'plain' && $part->ctype_parameters['format'] == 'flowed') {
+      $body = rcube_mime::unfold_flowed($body);
+    }
+
+    $body = rcmail_plain_body($body);
+  }
 
   // allow post-processing of the message body
   $data = $RCMAIL->plugins->exec_hook('message_part_after',
@@ -748,16 +753,16 @@ function rcmail_print_body($part, $p = array())
  * Handle links and citation marks in plain text message
  *
  * @param string  Plain text string
- * @param boolean Text uses format=flowed
  *
  * @return string Formatted HTML string
  */
-function rcmail_plain_body($body, $flowed=false)
+function rcmail_plain_body($body)
 {
   global $RCMAIL;
 
   // make links and email-addresses clickable
-  $replacer = new rcmail_string_replacer;
+  $attribs  = array('link_attribs' => array('rel' => 'noreferrer', 'target' => '_blank'));
+  $replacer = new rcmail_string_replacer($attribs);
 
   // search for patterns like links and e-mail addresses and replace with tokens
   $body = $replacer->replace($body);
@@ -776,53 +781,17 @@ function rcmail_plain_body($body, $flowed=false)
       if ($q > $quote_level) {
         $body[$n] = $replacer->get_replacement($replacer->add(
           str_repeat('<blockquote>', $q - $quote_level))) . $body[$n];
+        $last = $n;
       }
       else if ($q < $quote_level) {
         $body[$n] = $replacer->get_replacement($replacer->add(
           str_repeat('</blockquote>', $quote_level - $q))) . $body[$n];
-      }
-      else if ($flowed) {
-        // previous line is flowed
-        if (isset($body[$last]) && $body[$n]
-          && $body[$last][strlen($body[$last])-1] == ' ') {
-          // merge lines
-          $body[$last] .= $body[$n];
-          unset($body[$n]);
-        }
-        else {
-          $last = $n;
-        }
+        $last = $n;
       }
     }
     else {
       $q = 0;
-      if ($flowed) {
-        // sig separator - line is fixed
-        if ($body[$n] == '-- ') {
-          $last = $last_sig = $n;
-        }
-        else {
-          // remove space-stuffing
-          if ($body[$n][0] == ' ')
-            $body[$n] = substr($body[$n], 1);
-
-          // previous line is flowed?
-          if (isset($body[$last]) && $body[$n]
-            && $last !== $last_sig
-            && $body[$last][strlen($body[$last])-1] == ' '
-          ) {
-            $body[$last] .= $body[$n];
-            unset($body[$n]);
-          }
-          else {
-            $last = $n;
-          }
-        }
-        if ($quote_level > 0)
-          $body[$last] = $replacer->get_replacement($replacer->add(
-            str_repeat('</blockquote>', $quote_level))) . $body[$last];
-      }
-      else if ($quote_level > 0)
+      if ($quote_level > 0)
         $body[$n] = $replacer->get_replacement($replacer->add(
           str_repeat('</blockquote>', $quote_level))) . $body[$n];
     }
@@ -892,8 +861,8 @@ function rcmail_washtml_callback($tagname, $attrib, $content, $washtml)
  * return table with message headers
  */
 function rcmail_message_headers($attrib, $headers=null)
-  {
-  global $OUTPUT, $MESSAGE, $PRINT_MODE, $RCMAIL;
+{
+  global $MESSAGE, $PRINT_MODE, $RCMAIL;
   static $sa_attrib;
 
   // keep header table attrib
@@ -931,7 +900,7 @@ function rcmail_message_headers($attrib, $headers=null)
       $value = $headers[$hkey];
     else if ($headers['others'][$hkey])
       $value = $headers['others'][$hkey];
-    else
+    else if (!$attrib['valueof'])
       continue;
 
     if (in_array($hkey, $exclude_headers))
@@ -1078,14 +1047,14 @@ function rcmail_message_body($attrib)
       $header_attrib[$regs[1]] = $value;
 
   if (!empty($MESSAGE->parts)) {
-    foreach ($MESSAGE->parts as $i => $part) {
+    foreach ($MESSAGE->parts as $part) {
       if ($part->type == 'headers') {
         $out .= html::div('message-partheaders', rcmail_message_headers(sizeof($header_attrib) ? $header_attrib : null, $part->headers));
       }
       else if ($part->type == 'content') {
-        // unsapported
+        // unsupported (e.g. encrypted)
         if ($part->realtype) {
-          if ($part->realtype == 'multipart/encrypted') {
+          if ($part->realtype == 'multipart/encrypted' || $part->realtype == 'application/pkcs7-mime') {
             $out .= html::span('part-notice', rcube_label('encryptedmessage'));
           }
           continue;
@@ -1182,16 +1151,15 @@ function rcmail_message_body($attrib)
           $show_link = array(
             'href' => $MESSAGE->get_part_url($attach_prop->mime_id, false),
             'onclick' => sprintf(
-              'return %s.command(\'load-attachment\',{part:\'%s\', mimetype:\'%s\'},this)',
+              'return %s.command(\'load-attachment\',\'%s\',this)',
               JS_OBJECT_NAME,
-              $attach_prop->mime_id,
-              $mimetype)
+              $attach_prop->mime_id)
           );
           $out .= html::p('image-attachment',
              html::a($show_link + array('class' => 'image-link', 'style' => sprintf('width:%dpx', $thumbnail_size)),
                html::img(array(
                 'class' => 'image-thumbnail',
-                'src'   => $MESSAGE->get_part_url($attach_prop->mime_id, true) . '&_thumb=1',
+                'src'   => $MESSAGE->get_part_url($attach_prop->mime_id, 'image') . '&_thumb=1',
                 'title' => $attach_prop->filename,
                 'alt'   => $attach_prop->filename,
                 'style' => sprintf('max-width:%dpx; max-height:%dpx', $thumbnail_size, $thumbnail_size),
@@ -1211,7 +1179,7 @@ function rcmail_message_body($attrib)
             html::tag('legend', 'image-filename', Q($attach_prop->filename)) .
             html::p(array('align' => "center"),
               html::img(array(
-                'src'   => $MESSAGE->get_part_url($attach_prop->mime_id, true),
+                'src'   => $MESSAGE->get_part_url($attach_prop->mime_id, 'image'),
                 'title' => $attach_prop->filename,
                 'alt'   => $attach_prop->filename,
               )))
@@ -1371,7 +1339,7 @@ function rcmail_html4inline($body, $container_id, $body_id='', &$attributes=null
 
 
 /**
- * parse link attributes and set correct target
+ * parse link (a, link, area) attributes and set correct target
  */
 function rcmail_alter_html_link($matches)
 {
@@ -1380,9 +1348,9 @@ function rcmail_alter_html_link($matches)
   // Support unicode/punycode in top-level domain part
   $EMAIL_PATTERN = '([a-z0-9][a-z0-9\-\.\+\_]*@[^&@"\'.][^@&"\']*\\.([^\\x00-\\x40\\x5b-\\x60\\x7b-\\x7f]{2,}|xn--[a-z0-9]{2,}))';
 
-  $tag = $matches[1];
+  $tag    = strtolower($matches[1]);
   $attrib = parse_attrib_string($matches[2]);
-  $end = '>';
+  $end    = '>';
 
   // Remove non-printable characters in URL (#1487805)
   if ($attrib['href'])
@@ -1409,6 +1377,11 @@ function rcmail_alter_html_link($matches)
     $attrib['target'] = '_blank';
   }
 
+  // Better security by adding rel="noreferrer" (#1484686)
+  if (($tag == 'a' || $tag == 'area') && $attrib['href'] && $attrib['href'][0] != '#') {
+    $attrib['rel'] = 'noreferrer';
+  }
+
   // allowed attributes for a|link|area tags
   $allow = array('href','name','target','onclick','id','class','style','title',
     'rel','type','media','alt','coords','nohref','hreflang','shape');
@@ -1432,7 +1405,8 @@ function rcmail_address_string($input, $max=null, $linked=false, $addicon=null,
   $c = count($a_parts);
   $j = 0;
   $out = '';
-  $allvalues = array();
+  $allvalues  = array();
+  $show_email = $RCMAIL->config->get('message_show_email');
 
   if ($addicon && !isset($_SESSION['writeable_abook'])) {
     $_SESSION['writeable_abook'] = $RCMAIL->get_address_sources(true) ? true : false;
@@ -1443,6 +1417,12 @@ function rcmail_address_string($input, $max=null, $linked=false, $addicon=null,
     $name   = $part['name'];
     $mailto = $part['mailto'];
     $string = $part['string'];
+    $valid  = check_email($mailto, false);
+
+    // phishing email prevention (#1488981), e.g. "valid@email.addr <phishing@email.addr>"
+    if (!$show_email && $valid && $name && $name != $mailto && strpos($name, '@')) {
+      $name = '';
+    }
 
     // IDNA ASCII to Unicode
     if ($name == $mailto)
@@ -1456,15 +1436,23 @@ function rcmail_address_string($input, $max=null, $linked=false, $addicon=null,
       // for printing we display all addresses
       continue;
     }
-    else if (check_email($part['mailto'], false)) {
+    else if ($valid) {
       if ($linked) {
-        $address = html::a(array(
-            'href' => 'mailto:'.$mailto,
-            'onclick' => sprintf("return %s.command('compose','%s',this)", JS_OBJECT_NAME, JQ($mailto)),
-            'title' => $mailto,
-            'class' => "rcmContactAddress",
-          ),
-        Q($name ? $name : $mailto));
+        $attrs = array(
+           'href' => 'mailto:' . $mailto,
+           'onclick' => sprintf("return %s.command('compose','%s',this)", JS_OBJECT_NAME, JQ($mailto)),
+           'class' => "rcmContactAddress",
+        );
+
+        if ($show_email && $name && $mailto) {
+          $content = Q($name ? sprintf('%s <%s>', $name, $mailto) : $mailto);
+        }
+        else {
+          $content = Q($name ? $name : $mailto);
+          $attrs['title'] = $mailto;
+        }
+
+        $address = html::a($attrs, $content);
       }
       else {
         $address = html::span(array('title' => $mailto, 'class' => "rcmContactAddress"),
@@ -1489,7 +1477,7 @@ function rcmail_address_string($input, $max=null, $linked=false, $addicon=null,
       if ($name)
         $address .= Q($name);
       if ($mailto)
-        $address .= (strlen($address) ? ' ' : '') . sprintf('&lt;%s&gt;', Q($mailto));
+        $address = trim($address . ' ' . Q($name ? sprintf('<%s>', $mailto) : $mailto));
     }
 
     $address = html::span('adr', $address);
@@ -1528,11 +1516,11 @@ function rcmail_address_string($input, $max=null, $linked=false, $addicon=null,
 /**
  * Wrap text to a given number of characters per line
  * but respect the mail quotation of replies messages (>).
- * Finally add another quotation level by prpending the lines
+ * Finally add another quotation level by prepending the lines
  * with >
  *
  * @param string Text to wrap
- * @param int The line width
+ * @param int    The line width
  * @return string The wrapped text
  */
 function rcmail_wrap_and_quote($text, $length = 72)
@@ -1548,7 +1536,7 @@ function rcmail_wrap_and_quote($text, $length = 72)
       $line = '>' . rtrim($line);
     else if (mb_strlen($line) > $max) {
       $newline = '';
-      foreach(explode("\n", rc_wordwrap($line, $length - 2)) as $l) {
+      foreach (explode("\n", rc_wordwrap($line, $length - 2)) as $l) {
         if (strlen($l))
           $newline .= '> ' . $l . "\n";
         else
@@ -1717,8 +1705,7 @@ function rcmail_send_mdn($message, &$smtp_error)
 
     $sent = rcmail_deliver_message($compose, $identity['email'], $mailto, $smtp_error, $body_file, $options);
 
-    if ($sent)
-    {
+    if ($sent) {
       $RCMAIL->storage->set_flag($message->uid, 'MDNSENT');
       return true;
     }
@@ -1799,9 +1786,12 @@ function rcmail_identity_select($MESSAGE, $identities = null, $compose_mode = 'r
     // Try Return-Path
     if ($from_idx === null && ($return_path = $MESSAGE->headers->others['return-path'])) {
         foreach ($identities as $idx => $ident) {
-            if (strpos($return_path, str_replace('@', '=', $ident['email_ascii']).'@') !== false) {
-                $from_idx = $idx;
-                break;
+            $ident = str_replace('@', '=', $ident['email_ascii']) . '@';
+            foreach ((array)$return_path as $path) {
+                if (strpos($path, $ident) !== false) {
+                    $from_idx = $idx;
+                    break 2;
+                }
             }
         }
     }
@@ -1836,8 +1826,7 @@ function rcmail_fix_mimetype($name)
   // application/pdf.A520491B_3BF7_494D_8855_7FAC2C6C0608
   if (preg_match('/^application\/pdf.+/', $name))
     $name = 'application/pdf';
-
-  // treat image/pjpeg as image/jpeg
+  // treat image/pjpeg (image/pjpg, image/jpg) as image/jpeg (#1489097)
   else if (preg_match('/^image\/p?jpe?g$/', $name))
     $name = 'image/jpeg';
 
@@ -1854,7 +1843,7 @@ function rcmail_attachment_name($attachment, $display = false)
             $filename = rcube_label('htmlmessage');
         }
         else {
-            $ext      = rcube_mime::get_mime_extensions($attachment->mimetype);
+            $ext      = (array) rcube_mime::get_mime_extensions($attachment->mimetype);
             $ext      = array_shift($ext);
             $filename = rcube_label('messagepart') . ' ' . $attachment->mime_id;
             if ($ext) {
@@ -1884,13 +1873,15 @@ function rcmail_search_filter($attrib)
 
   $attrib['onchange'] = JS_OBJECT_NAME.'.filter_mailbox(this.value)';
 
-  /*
-    RFC3501 (6.4.4): 'ALL', 'RECENT', 
-    'ANSWERED', 'DELETED', 'FLAGGED', 'SEEN',
-    'UNANSWERED', 'UNDELETED', 'UNFLAGGED', 'UNSEEN',
-    'NEW', // = (RECENT UNSEEN)
-    'OLD' // = NOT RECENT
-  */
+  // Content-Type values of messages with attachments
+  // the same as in app.js:add_message_row()
+  $ctypes = array('application/', 'multipart/m', 'multipart/signed', 'multipart/report');
+
+  // Build search string of "with attachment" filter
+  $attachment = str_repeat(' OR', count($ctypes)-1);
+  foreach ($ctypes as $type) {
+    $attachment .= ' HEADER Content-Type ' . rcube_imap_generic::escape($type);
+  }
 
   $select_filter = new html_select($attrib);
   $select_filter->add(rcube_label('all'), 'ALL');
@@ -1901,6 +1892,7 @@ function rcmail_search_filter($attrib)
     $select_filter->add(rcube_label('deleted'), 'DELETED');
     $select_filter->add(rcube_label('undeleted'), 'UNDELETED');
   }
+  $select_filter->add(rcube_label('withattachment'), $attachment);
   $select_filter->add(rcube_label('priority').': '.rcube_label('highest'), 'HEADER X-PRIORITY 1');
   $select_filter->add(rcube_label('priority').': '.rcube_label('high'), 'HEADER X-PRIORITY 2');
   $select_filter->add(rcube_label('priority').': '.rcube_label('normal'), 'NOT HEADER X-PRIORITY 1 NOT HEADER X-PRIORITY 2 NOT HEADER X-PRIORITY 4 NOT HEADER X-PRIORITY 5');
@@ -1930,6 +1922,42 @@ function rcmail_message_error($uid=null)
   $RCMAIL->output->send('messageerror');
 }
 
+function rcmail_message_import_form($attrib = array())
+{
+  global $OUTPUT;
+
+  // set defaults
+  $attrib += array('id' => 'rcmImportform', 'buttons' => 'yes');
+
+  // Get filesize, enable upload progress bar
+  $max_filesize = rcube_upload_init();
+
+  $button = new html_inputfield(array('type' => 'button'));
+  $fileinput = new html_inputfield(array(
+      'type' => 'file',
+      'name' => '_file[]',
+      'size' => $attrib['attachmentfieldsize'],
+      'multiple' => 'multiple',
+      'accept' => ".eml, .mbox, message/rfc822, text/*",
+  ));
+
+  $out = html::div($attrib,
+    $OUTPUT->form_tag(array('id' => $attrib['id'].'Frm', 'method' => 'post', 'enctype' => 'multipart/form-data'),
+      html::tag('input', array('type' => 'hidden', 'name' => '_unlock', 'value' => '')) .
+      html::div(null, $fileinput->show()) .
+      html::div('hint', rcube_label(array('name' => 'maxuploadsize', 'vars' => array('size' => $max_filesize)))) .
+      (get_boolean($attrib['buttons']) ? html::div('buttons',
+        $button->show(rcube_label('close'), array('class' => 'button', 'onclick' => "$('#$attrib[id]').hide()")) . ' ' .
+        $button->show(rcube_label('upload'), array('class' => 'button mainaction', 'onclick' => JS_OBJECT_NAME . ".command('import-messages', this.form)"))
+      ) : '')
+    )
+  );
+
+  $OUTPUT->add_gui_object('importform', $attrib['id'].'Frm');
+  return $out;
+}
+
+
 // register UI objects
 $OUTPUT->add_handlers(array(
   'mailboxlist' => 'rcmail_mailbox_list',
@@ -1943,6 +1971,7 @@ $OUTPUT->add_handlers(array(
   'messagecontentframe' => 'rcmail_messagecontent_frame',
   'messagepartframe' => 'rcmail_message_part_frame',
   'messagepartcontrols' => 'rcmail_message_part_controls',
+  'messageimportform' => 'rcmail_message_import_form',
   'searchfilter' => 'rcmail_search_filter',
   'searchform' => array($OUTPUT, 'search_form'),
 ));
diff --git a/program/steps/mail/get.inc b/program/steps/mail/get.inc
index fddb40ae8..372757720 100644
--- a/program/steps/mail/get.inc
+++ b/program/steps/mail/get.inc
@@ -22,7 +22,7 @@
 
 // show loading page
 if (!empty($_GET['_preload'])) {
-  $url = preg_replace('/([&?]+)_preload=/', '\\1_embed=', $_SERVER['REQUEST_URI']);
+  $url = preg_replace('/([&?]+)_preload=/', '\\1_mimewarning=1&_embed=', $_SERVER['REQUEST_URI']);
   $message = rcube_label('loadingdata');
 
   header('Content-Type: text/html; charset=' . RCMAIL_CHARSET);
@@ -60,11 +60,12 @@ else if ($_GET['_thumb']) {
   $pid = get_input_value('_part', RCUBE_INPUT_GET);
   if ($part = $MESSAGE->mime_parts[$pid]) {
     $thumbnail_size = $RCMAIL->config->get('image_thumbnail_size', 240);
-    $temp_dir = $RCMAIL->config->get('temp_dir');
-    list(,$ext) = explode('/', $part->mimetype);
-    $cache_basename = $temp_dir . '/' . md5($MESSAGE->headers->messageID . $part->mime_id . ':' . $RCMAIL->user->ID . ':' . $thumbnail_size);
-    $cache_file = $cache_basename . '.' . $ext;
-    $mimetype = $part->mimetype;
+    $temp_dir       = $RCMAIL->config->get('temp_dir');
+    list(,$ext)     = explode('/', $part->mimetype);
+    $mimetype       = $part->mimetype;
+    $file_ident     = $MESSAGE->headers->messageID . ':' . $part->mime_id . ':' . $part->size . ':' . $part->mimetype;
+    $cache_basename = $temp_dir . '/' . md5($file_ident . ':' . $RCMAIL->user->ID . ':' . $thumbnail_size);
+    $cache_file     = $cache_basename . '.' . $ext;
 
     // render thumbnail image if not done yet
     if (!is_file($cache_file)) {
@@ -73,7 +74,7 @@ else if ($_GET['_thumb']) {
       fclose($fp);
 
       $image = new rcube_image($orig_name);
-      if ($imgtype = $image->resize($RCMAIL->config->get('image_thumbnail_size', 240), $cache_file, true)) {
+      if ($imgtype = $image->resize($thumbnail_size, $cache_file, true)) {
         $mimetype = 'image/' . $imgtype;
         unlink($orig_name);
       }
@@ -94,9 +95,7 @@ else if ($_GET['_thumb']) {
 else if (strlen($pid = get_input_value('_part', RCUBE_INPUT_GET))) {
 
   if ($part = $MESSAGE->mime_parts[$pid]) {
-    $ctype_primary = strtolower($part->ctype_primary);
-    $ctype_secondary = strtolower($part->ctype_secondary);
-    $mimetype = sprintf('%s/%s', $ctype_primary, $ctype_secondary);
+    $mimetype = rcmail_fix_mimetype($part->mimetype);
 
     // allow post-processing of the message body
     $plugin = $RCMAIL->plugins->exec_hook('message_part_get',
@@ -106,7 +105,7 @@ else if (strlen($pid = get_input_value('_part', RCUBE_INPUT_GET))) {
       exit;
 
     // overwrite modified vars from plugin
-    $mimetype = $plugin['mimetype'];
+    $mimetype   = $plugin['mimetype'];
     $extensions = rcube_mime::get_mime_extensions($mimetype);
 
     if ($plugin['body'])
@@ -118,10 +117,10 @@ else if (strlen($pid = get_input_value('_part', RCUBE_INPUT_GET))) {
       $file_extension = strtolower(pathinfo($part->filename, PATHINFO_EXTENSION));
 
       // 1. compare filename suffix with expected suffix derived from mimetype
-      $valid = $file_extension && in_array($file_extension, (array)$extensions);
+      $valid = $file_extension && in_array($file_extension, (array)$extensions) || !empty($_REQUEST['_mimeclass']);
 
       // 2. detect the real mimetype of the attachment part and compare it with the stated mimetype and filename extension
-      if ($valid || !$file_extension || $mimetype == 'application/octet-stream') {
+      if ($valid || !$file_extension || $mimetype == 'application/octet-stream' || $mimetype == 'text/plain') {
         if ($part->body)  // part body is already loaded
           $body = $part->body;
         else if ($part->size && $part->size < 1024*1024)   // load the entire part if it's small enough
@@ -133,6 +132,10 @@ else if (strlen($pid = get_input_value('_part', RCUBE_INPUT_GET))) {
         $real_mimetype = rcube_mime::file_content_type($body, $part->filename, $mimetype, true, true);
         list($real_ctype_primary, $real_ctype_secondary) = explode('/', $real_mimetype);
 
+        // accept text/plain with any extension
+        if ($real_mimetype == 'text/plain' && $real_mimetype == $mimetype)
+          $file_extension = 'txt';
+
         // ignore differences in text/* mimetypes. Filetype detection isn't very reliable here
         if ($real_ctype_primary == 'text' && strpos($mimetype, $real_ctype_primary) === 0)
           $real_mimetype = $mimetype;
@@ -141,6 +144,10 @@ else if (strlen($pid = get_input_value('_part', RCUBE_INPUT_GET))) {
         $extensions = rcube_mime::get_mime_extensions($real_mimetype);
         $valid_extension = (!$file_extension || in_array($file_extension, (array)$extensions));
 
+        // ignore filename extension if mimeclass matches (#1489029)
+        if (!empty($_REQUEST['_mimeclass']) && $real_ctype_primary == $_REQUEST['_mimeclass'])
+          $valid_extension = true;
+
         // fix mimetype for images wrongly declared as octet-stream
         if ($mimetype == 'application/octet-stream' && strpos($real_mimetype, 'image/') === 0 && $valid_extension)
           $mimetype = $real_mimetype;
@@ -153,19 +160,32 @@ else if (strlen($pid = get_input_value('_part', RCUBE_INPUT_GET))) {
 
       // show warning if validity checks failed
       if (!$valid) {
-        $OUTPUT = new rcmail_html_page();
-        $OUTPUT->write(html::tag('html', null, html::tag('body', 'embed',
-          html::div(array('class' => 'rcmail-inline-message rcmail-inline-warning'),
-            rcube_label(array(
-              'name' => 'attachmentvalidationerror',
-              'vars' => array('expected' => "$mimetype (.$file_extension)", 'detected' => "$real_mimetype (.$extensions[0])")
-            )) .
-            html::p(array('class' => 'rcmail-inline-buttons'),
-              html::tag('button',
-                array('onclick' => "location.href='" . $RCMAIL->url(array_merge($_GET, array('_nocheck' => 1))) . "'"),
-                rcube_label('showanyway')))
-            )
-        )));
+        // send blocked.gif for expected images
+        if (empty($_REQUEST['_mimewarning']) && strpos($mimetype, 'image/') === 0) {
+          // Do not cache. Failure might be the result of a misconfiguration, thus real content should be returned once fixed. 
+          $OUTPUT->nocacheing_headers();
+          header("Content-Type: image/gif");
+          header("Content-Transfer-Encoding: binary");
+          readfile(INSTALL_PATH . 'program/resources/blocked.gif');
+        }
+        else {  // html warning with a button to load the file anyway
+          $OUTPUT = new rcmail_html_page();
+          $OUTPUT->write(html::tag('html', null, html::tag('body', 'embed',
+            html::div(array('class' => 'rcmail-inline-message rcmail-inline-warning'),
+              rcube_label(array(
+                'name' => 'attachmentvalidationerror',
+                'vars' => array(
+                  'expected' => $mimetype . ($file_extension ? "(.$file_extension)" : ''),
+                  'detected' => $real_mimetype . ($extensions[0] ? "(.$extensions[0])" : ''),
+                )
+              )) .
+              html::p(array('class' => 'rcmail-inline-buttons'),
+                html::tag('button',
+                  array('onclick' => "location.href='" . $RCMAIL->url(array_merge($_GET, array('_nocheck' => 1))) . "'"),
+                  rcube_label('showanyway')))
+              )
+          )));
+        }
         exit;
       }
     }
@@ -195,7 +215,6 @@ else if (strlen($pid = get_input_value('_part', RCUBE_INPUT_GET))) {
       header("Content-Type: text/$ctype_secondary; charset=" . ($part->charset ? $part->charset : RCMAIL_CHARSET));
     }
     else {
-      $mimetype = rcmail_fix_mimetype($mimetype);
       header("Content-Type: $mimetype");
       header("Content-Transfer-Encoding: binary");
     }
diff --git a/program/steps/mail/import.inc b/program/steps/mail/import.inc
new file mode 100644
index 000000000..f7e7a3eb8
--- /dev/null
+++ b/program/steps/mail/import.inc
@@ -0,0 +1,105 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | program/steps/mail/import.inc                                         |
+ |                                                                       |
+ | This file is part of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ | PURPOSE:                                                              |
+ |   Save the uploaded file(s) as messages to the current IMAP folder    |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas Bruederli <roundcube@gmail.com>                        |
+ +-----------------------------------------------------------------------+
+*/
+
+// clear all stored output properties (like scripts and env vars)
+$OUTPUT->reset();
+
+if (is_array($_FILES['_file'])) {
+    $imported = 0;
+
+    foreach ((array)$_FILES['_file']['tmp_name'] as $i => $filepath) {
+        // Process uploaded file if there is no error
+        $err = $_FILES['_file']['error'][$i];
+
+        if (!$err) {
+            // check file content type first
+            list($mtype_primary,) = explode('/', rc_mime_content_type($filepath, $_FILES['_file']['name'][$i], $_FILES['_file']['type'][$i]));
+            if (!in_array($mtype_primary, array('text','message'))) {
+                $OUTPUT->show_message('importmessageerror', 'error');
+                continue;
+            }
+
+            // read the first few lines to detect header-like structure
+            $fp = fopen($filepath, 'r');
+            do { $line = fgets($fp); }
+            while ($line !== false && trim($line) == '');
+
+            if (!preg_match('/^From\s+-/', $line) && !preg_match('/^[a-z-_]+:\s+.+/i', $line)) {
+                $OUTPUT->show_message('importmessageerror', 'error');
+                continue;
+            }
+
+            $message = $lastline = '';
+            fseek($fp, 0);
+            while (($line = fgets($fp)) !== false) {
+                // importing mbox file, split by From - lines
+                if (preg_match('/^From\s+-/', $line) && $lastline == '') {
+                    if (!empty($message)) {
+                        if ($RCMAIL->storage->save_message(null, rtrim($message))) {
+                            $imported++;
+                        }
+                        else {
+                            rcube::raise_error("Failed to import message to " . $RCMAIL->storage->get_folder(), false, true);
+                        }
+                        $message = '';
+                    }
+                    continue;
+                }
+
+                $message .= $line;
+                $lastline = rtrim($line);
+            }
+
+            if (!empty($message) && $RCMAIL->storage->save_message(null, rtrim($message))) {
+                $imported++;
+            }
+        }
+
+        if ($err == UPLOAD_ERR_INI_SIZE || $err == UPLOAD_ERR_FORM_SIZE) {
+            $msg = rcube_label(array('name' => 'filesizeerror', 'vars' => array('size' => show_bytes(parse_bytes(ini_get('upload_max_filesize'))))));
+        }
+        else if ($err) {
+            $OUTPUT->show_message('fileuploaderror', 'error');
+        }
+    }  // end foreach
+
+    if ($imported) {
+        $OUTPUT->show_message(rcube_label(array('name' => 'importmessagesuccess', 'nr' => $imported, 'vars' => array('nr' => $imported))), 'confirmation');
+        $OUTPUT->command('command', 'list');
+    }
+    else {
+        $OUTPUT->show_message('importmessageerror', 'error');
+    }
+}
+else if ($_SERVER['REQUEST_METHOD'] == 'POST') {
+    // if filesize exceeds post_max_size then $_FILES array is empty,
+    // show filesizeerror instead of fileuploaderror
+    if ($maxsize = ini_get('post_max_size'))
+        $msg = rcube_label(array('name' => 'filesizeerror', 'vars' => array('size' => show_bytes(parse_bytes($maxsize)))));
+    else
+        $msg = rcube_label('fileuploaderror');
+
+    $OUTPUT->command('display_message', $msg, 'error');
+}
+
+// send html page with JS calls as response
+$OUTPUT->send('iframe');
+
diff --git a/program/steps/mail/mark.inc b/program/steps/mail/mark.inc
index c220fc5c4..dfc892ea1 100644
--- a/program/steps/mail/mark.inc
+++ b/program/steps/mail/mark.inc
@@ -113,7 +113,7 @@ if (($uids = get_input_value('_uid', RCUBE_INPUT_POST)) && ($flag = get_input_va
       $OUTPUT->command('set_rowcount', rcmail_get_messagecount_text($msg_count), $mbox);
 
       if ($threading) {
-	    $count = get_input_value('_count', RCUBE_INPUT_POST);
+        $count = get_input_value('_count', RCUBE_INPUT_POST);
       }
 
       // add new rows from next page (if any)
@@ -125,9 +125,9 @@ if (($uids = get_input_value('_uid', RCUBE_INPUT_POST)) && ($flag = get_input_va
       }
     }
   }
-
-  $OUTPUT->send();
+}
+else {
+    $OUTPUT->show_message('internalerror', 'error');
 }
 
-exit;
-
+$OUTPUT->send();
diff --git a/program/steps/mail/move_del.inc b/program/steps/mail/move_del.inc
index 3e2252683..e21ba2c6b 100644
--- a/program/steps/mail/move_del.inc
+++ b/program/steps/mail/move_del.inc
@@ -29,10 +29,11 @@ $old_count = $RCMAIL->storage->count(NULL, $threading ? 'THREADS' : 'ALL');
 $old_pages = ceil($old_count / $RCMAIL->storage->get_pagesize());
 
 // move messages
-if ($RCMAIL->action=='moveto' && !empty($_POST['_uid']) && strlen($_POST['_target_mbox'])) {
-    $count = sizeof(explode(',', ($uids = get_input_value('_uid', RCUBE_INPUT_POST))));
+if ($RCMAIL->action == 'moveto' && !empty($_POST['_uid']) && strlen($_POST['_target_mbox'])) {
+    $count  = sizeof(explode(',', ($uids = get_input_value('_uid', RCUBE_INPUT_POST))));
     $target = get_input_value('_target_mbox', RCUBE_INPUT_POST, true);
-    $mbox = get_input_value('_mbox', RCUBE_INPUT_POST, true);
+    $mbox   = get_input_value('_mbox', RCUBE_INPUT_POST, true);
+    $trash  = $RCMAIL->config->get('trash_mbox');
 
     $moved = $RCMAIL->storage->move_message($uids, $target, $mbox);
 
@@ -40,7 +41,7 @@ if ($RCMAIL->action=='moveto' && !empty($_POST['_uid']) && strlen($_POST['_targe
         // send error message
         if ($_POST['_from'] != 'show')
             $OUTPUT->command('list_mailbox');
-        rcmail_display_server_error('errormoving');
+        rcmail_display_server_error('errormoving', null, $target == $trash ? 'delete' : '');
         $OUTPUT->send();
         exit;
     }
@@ -73,6 +74,8 @@ else if ($RCMAIL->action=='delete' && !empty($_POST['_uid'])) {
 }
 // unknown action or missing query param
 else {
+    $OUTPUT->show_message('internalerror', 'error');
+    $OUTPUT->send();
     exit;
 }
 
diff --git a/program/steps/mail/sendmail.inc b/program/steps/mail/sendmail.inc
index eb0ba89c6..cf22a2af9 100644
--- a/program/steps/mail/sendmail.inc
+++ b/program/steps/mail/sendmail.inc
@@ -255,6 +255,33 @@ function rcmail_email_input_format($mailto, $count=false, $check=true)
 }
 
 
+function rcmail_generic_message_footer($isHtml)
+{
+  global $CONFIG;
+
+  if ($isHtml && !empty($CONFIG['generic_message_footer_html'])) {
+    $file = $CONFIG['generic_message_footer_html'];
+    $html_footer = true;
+  }
+  else {
+    $file = $CONFIG['generic_message_footer'];
+    $html_footer = false;
+  }
+
+  if ($file && realpath($file)) {
+    // sanity check
+    if (!preg_match('/\.(php|ini|conf)$/', $file) && strpos($file, '/etc/') === false) {
+      $footer = file_get_contents($file);
+      if ($isHtml && !$html_footer)
+        $footer = '<pre>' . $footer . '</pre>';
+      return $footer;
+    }
+  }
+
+  return false;
+}
+
+
 /****** compose message ********/
 
 if (strlen($_POST['_draft_saveid']) > 3)
@@ -364,10 +391,6 @@ if (!empty($mailcc)) {
 if (!empty($mailbcc)) {
   $headers['Bcc'] = $mailbcc;
 }
-if (!empty($identity_arr['bcc']) && stripos($headers['Bcc'], $identity_arr['bcc']) === false) {
-  $headers['Bcc'] = ($headers['Bcc'] ? $headers['Bcc'].', ' : '') . $identity_arr['bcc'];
-  $RECIPIENT_COUNT ++;
-}
 
 if (($max_recipients = (int) $RCMAIL->config->get('max_recipients')) > 0) {
   if ($RECIPIENT_COUNT > $max_recipients) {
@@ -385,9 +408,6 @@ if (!empty($identity_arr['organization'])) {
 if (!empty($_POST['_replyto'])) {
   $headers['Reply-To'] = rcmail_email_input_format(get_input_value('_replyto', RCUBE_INPUT_POST, TRUE, $message_charset));
 }
-else if (!empty($identity_arr['reply-to'])) {
-  $headers['Reply-To'] = rcmail_email_input_format($identity_arr['reply-to'], false, true);
-}
 if (!empty($headers['Reply-To'])) {
   $headers['Mail-Reply-To'] = $headers['Reply-To'];
 }
@@ -452,7 +472,7 @@ $isHtml = (bool) get_input_value('_is_html', RCUBE_INPUT_POST);
 $message_body = get_input_value('_message', RCUBE_INPUT_POST, TRUE, $message_charset);
 
 if ($isHtml) {
-  $font   = rcube_fontdefs($RCMAIL->config->get('default_font', 'Verdana'));
+  $font   = rcube_fontdefs($RCMAIL->config->get('default_font'));
   $bstyle = $font && is_string($font) ? " style='font-family: $font'" : '';
 
   // append doctype and html/body wrappers
@@ -466,7 +486,7 @@ if (!$savedraft) {
     $message_body = preg_replace('/\s*id="_rc_sig"/', '', $message_body);
 
     // add inline css for blockquotes
-    $bstyle = 'padding-left:5px; border-left:#1010ff 2px solid; margin-left:5px; width:100%';
+    $bstyle = 'padding-left:5px; border-left:#1010ff 2px solid; margin-left:5px';
     $message_body = preg_replace('/<blockquote>/',
       '<blockquote type="cite" style="'.$bstyle.'">', $message_body);
   }
@@ -490,19 +510,10 @@ if (!$savedraft) {
   }
 
   // generic footer for all messages
-  if ($isHtml && !empty($CONFIG['generic_message_footer_html'])) {
-      $footer = file_get_contents(realpath($CONFIG['generic_message_footer_html']));
-      $footer = rcube_charset_convert($footer, RCMAIL_CHARSET, $message_charset);
-  }
-  else if (!empty($CONFIG['generic_message_footer'])) {
-    $footer = file_get_contents(realpath($CONFIG['generic_message_footer']));
+  if ($footer = rcmail_generic_message_footer($isHtml)) {
     $footer = rcube_charset_convert($footer, RCMAIL_CHARSET, $message_charset);
-    if ($isHtml)
-      $footer = '<pre>'.$footer.'</pre>';
-  }
-
-  if ($footer)
     $message_body .= "\r\n" . $footer;
+  }
 }
 
 if ($isHtml) {
@@ -820,6 +831,6 @@ else {
   if ($store_folder && !$saved)
     $OUTPUT->command('sent_successfully', 'error', rcube_label('errorsavingsent'));
   else
-    $OUTPUT->command('sent_successfully', 'confirmation', rcube_label('messagesent'));
+    $OUTPUT->command('sent_successfully', 'confirmation', rcube_label('messagesent'), $store_target);
   $OUTPUT->send('iframe');
 }
diff --git a/program/steps/mail/show.inc b/program/steps/mail/show.inc
index 3495df9c0..59f4d55e1 100644
--- a/program/steps/mail/show.inc
+++ b/program/steps/mail/show.inc
@@ -19,7 +19,7 @@
  +-----------------------------------------------------------------------+
 */
 
-$PRINT_MODE = $RCMAIL->action=='print' ? TRUE : FALSE;
+$PRINT_MODE = $RCMAIL->action == 'print' ? TRUE : FALSE;
 
 // Read browser capabilities and store them in session
 if ($caps = get_input_value('_caps', RCUBE_INPUT_GET)) {
@@ -31,8 +31,21 @@ if ($caps = get_input_value('_caps', RCUBE_INPUT_GET)) {
   $_SESSION['browser_caps'] = $browser_caps;
 }
 
+$uid       = get_input_value('_uid', RCUBE_INPUT_GET);
+$mbox_name = $RCMAIL->storage->get_folder();
+
 // similar code as in program/steps/mail/get.inc
-if ($uid = get_input_value('_uid', RCUBE_INPUT_GET)) {
+if ($uid) {
+  // set message format (need to be done before rcube_message construction)
+  if (!empty($_GET['_format'])) {
+    $prefer_html = $_GET['_format'] == 'html';
+    $RCMAIL->config->set('prefer_html', $prefer_html);
+    $_SESSION['msg_formats'][$mbox_name.':'.$uid] = $prefer_html;
+  }
+  else if (isset($_SESSION['msg_formats'][$mbox_name.':'.$uid])) {
+    $RCMAIL->config->set('prefer_html', $_SESSION['msg_formats'][$mbox_name.':'.$uid]);
+  }
+
   $MESSAGE = new rcube_message($uid);
 
   // if message not found (wrong UID)...
@@ -40,7 +53,6 @@ if ($uid = get_input_value('_uid', RCUBE_INPUT_GET)) {
     rcmail_message_error($uid);
   }
 
-  $mbox_name = $RCMAIL->storage->get_folder();
 
   // show images?
   rcmail_check_safe($MESSAGE);
@@ -97,14 +109,19 @@ if ($uid = get_input_value('_uid', RCUBE_INPUT_GET)) {
     $OUTPUT->set_env('skip_deleted', true);
   if ($CONFIG['display_next'])
     $OUTPUT->set_env('display_next', true);
-  if ($MESSAGE->headers->others['list-post'])
+  if ($MESSAGE->headers->get('list-post', false))
     $OUTPUT->set_env('list_post', true);
   if ($CONFIG['forward_attachment'])
     $OUTPUT->set_env('forward_attachment', true);
 
   if (!$OUTPUT->ajax_call)
     $OUTPUT->add_label('checkingmail', 'deletemessage', 'movemessagetotrash',
-      'movingmessage', 'deletingmessage', 'markingmessage');
+      'movingmessage', 'deletingmessage', 'markingmessage', 'replyall', 'replylist');
+
+  $prefer_html = $RCMAIL->config->get('prefer_html');
+  if ($MESSAGE->has_html_part()) {
+    $OUTPUT->set_env('optional_format', $prefer_html ? 'text' : 'html');
+  }
 
   // check for unset disposition notification
   if ($MESSAGE->headers->mdn_to
@@ -147,6 +164,7 @@ function rcmail_message_attachments($attrib)
   global $PRINT_MODE, $MESSAGE, $RCMAIL;
 
   $out = $ol = '';
+  $attachments = array();
 
   if (sizeof($MESSAGE->attachments)) {
     foreach ($MESSAGE->attachments as $attach_prop) {
@@ -158,28 +176,30 @@ function rcmail_message_attachments($attrib)
       }
       else {
         if (mb_strlen($filename) > 50) {
+          $title    = $filename;
           $filename = abbreviate_string($filename, 50);
-          $title = $filename;
         }
         else {
           $title = '';
         }
 
-        $ol .= html::tag('li', rcmail_filetype2classname($attach_prop->mimetype, $filename),
-          html::a(array(
+        $mimetype = rcmail_fix_mimetype($attach_prop->mimetype);
+        $class    = rcmail_filetype2classname($mimetype, $filename);
+        $id       = 'attach' . $attach_prop->mime_id;
+        $link     = html::a(array(
             'href' => $MESSAGE->get_part_url($attach_prop->mime_id, false),
-            'onclick' => sprintf(
-              'return %s.command(\'load-attachment\',{part:\'%s\', mimetype:\'%s\'},this)',
-              JS_OBJECT_NAME,
-              $attach_prop->mime_id,
-              rcmail_fix_mimetype($attach_prop->mimetype)),
-              'title' => Q($title),
-            ),
-            Q($filename)));
+            'onclick' => sprintf('return %s.command(\'load-attachment\',\'%s\',this)',
+              JS_OBJECT_NAME, $attach_prop->mime_id),
+            'title' => Q($title),
+            ), Q($filename));
+        $ol .= html::tag('li', array('class' => $class, 'id' => $id), $link);
+
+        $attachments[$attach_prop->mime_id] = $mimetype;
       }
     }
 
     $out = html::tag('ul', $attrib, $ol, html::$common_attrib);
+    $RCMAIL->output->set_env('attachments', $attachments);
   }
 
   return $out;
@@ -208,11 +228,11 @@ function rcmail_remote_objects_msg()
 
 function rcmail_message_buttons()
 {
-  global $MESSAGE, $RCMAIL, $CONFIG;
+  global $RCMAIL;
 
   $mbox  = $RCMAIL->storage->get_folder();
   $delim = $RCMAIL->storage->get_hierarchy_delimiter();
-  $dbox  = $CONFIG['drafts_mbox'];
+  $dbox  = $RCMAIL->config->get('drafts_mbox');
 
   // the message is not a draft
   if ($mbox != $dbox && strpos($mbox, $dbox.$delim) !== 0) {
@@ -255,9 +275,13 @@ function rcmail_contact_exists($email)
   if ($email) {
     // @TODO: search in all address books?
     $CONTACTS = $RCMAIL->get_address_book(-1, true);
-    $existing = $CONTACTS->search('email', $email, true, false);
-    if ($existing->count)
-      return true;
+
+    if (is_object($CONTACTS)) {
+      $existing = $CONTACTS->search('email', $email, true, false);
+      if ($existing->count) {
+        return true;
+      }
+    }
   }
 
   return false;
@@ -285,9 +309,9 @@ $OUTPUT->add_handlers(array(
 ));
 
 
-if ($RCMAIL->action=='print' && $OUTPUT->template_exists('messageprint'))
+if ($RCMAIL->action == 'print' && $OUTPUT->template_exists('messageprint'))
   $OUTPUT->send('messageprint', false);
-else if ($RCMAIL->action=='preview' && $OUTPUT->template_exists('messagepreview'))
+else if ($RCMAIL->action == 'preview' && $OUTPUT->template_exists('messagepreview'))
   $OUTPUT->send('messagepreview', false);
 else
   $OUTPUT->send('message', false);
diff --git a/program/steps/settings/about.inc b/program/steps/settings/about.inc
index 9b13402f1..0fdefddda 100644
--- a/program/steps/settings/about.inc
+++ b/program/steps/settings/about.inc
@@ -40,17 +40,28 @@ function rcmail_plugins_list($attrib)
     $attrib['id'] = 'rcmpluginlist';
 
   $plugins = array_filter((array) $RCMAIL->config->get('plugins'));
-  $plugins = array_flip($plugins);
+  $plugin_info = array();
 
-  foreach ($plugins as $name => $plugin) {
-    rcube_plugin_data($name, $plugins);
+  foreach ($plugins as $name) {
+    if ($info = $RCMAIL->plugins->get_info($name))
+      $plugin_info[$name] = $info;
   }
 
-  if (empty($plugins)) {
+  // load info from required plugins, too
+  foreach ($plugin_info as $name => $info) {
+    if (is_array($info['required']) && !empty($info['required'])) {
+      foreach ($info['required'] as $req_name) {
+        if (!isset($plugin_info[$req_name]) && ($req_info = $RCMAIL->plugins->get_info($req_name)))
+          $plugin_info[$req_name] = $req_info;
+      }
+    }
+  }
+
+  if (empty($plugin_info)) {
     return '';
   }
 
-  ksort($plugins, SORT_LOCALE_STRING);
+  ksort($plugin_info, SORT_LOCALE_STRING);
 
   $table = new html_table($attrib);
 
@@ -60,8 +71,8 @@ function rcmail_plugins_list($attrib)
   $table->add_header('license', rcube_label('license'));
   $table->add_header('source', rcube_label('source'));
 
-  foreach ($plugins as $name => $data) {
-    $uri = $data['srcuri'] ? $data['srcuri'] : $data['uri'];
+  foreach ($plugin_info as $name => $data) {
+    $uri = $data['src_uri'] ? $data['src_uri'] : $data['uri'];
     if ($uri && stripos($uri, 'http') !== 0) {
       $uri = 'http://' . $uri;
     }
@@ -78,48 +89,6 @@ function rcmail_plugins_list($attrib)
   return $table->show();
 }
 
-function rcube_plugin_data($name, &$plugins = array())
-{
-  // XPaths of plugin metadata elements
-  $metadata = array(
-    'name'    => 'string(//rc:package/rc:name)',
-    'version' => 'string(//rc:package/rc:version/rc:release)',
-    'license' => 'string(//rc:package/rc:license)',
-    'license_uri' => 'string(//rc:package/rc:license/@uri)',
-    'srcuri' => 'string(//rc:package/rc:srcuri)',
-    'uri' => 'string(//rc:package/rc:uri)',
-  );
-
-  $package = INSTALL_PATH . "/plugins/$name/package.xml";
-  if (file_exists($package) && ($file = file_get_contents($package))) {
-    $doc = new DOMDocument();
-    $doc->loadXML($file);
-    $xpath = new DOMXPath($doc);
-    $xpath->registerNamespace('rc', "http://pear.php.net/dtd/package-2.0");
-    $data = array();
-
-    foreach ($metadata as $key => $path) {
-      $data[$key] = $xpath->evaluate($path);
-    }
-
-    $plugins[$name] = $data;
-
-    // dependent required plugins (can be used, but not included in config)
-    $deps = $xpath->evaluate('//rc:package/rc:dependencies/rc:required/rc:package/rc:name');
-    $cnt  = $deps->length;
-
-    for ($i=0; $i<$cnt; $i++) {
-      $dn = $deps->item($i)->nodeValue;
-      if (!array_key_exists($dn, $plugins)) {
-        rcube_plugin_data($dn, $plugins);
-      }
-    }
-  }
-  else {
-    unset($plugins[$name]);
-  }
-}
-
 
 $OUTPUT->set_pagetitle(rcube_label('about'));
 
diff --git a/program/steps/settings/edit_folder.inc b/program/steps/settings/edit_folder.inc
index cd2372790..fdb38e602 100644
--- a/program/steps/settings/edit_folder.inc
+++ b/program/steps/settings/edit_folder.inc
@@ -78,7 +78,7 @@ function rcmail_folder_form($attrib)
 
     // Location (name)
     if ($options['protected']) {
-        $foldername = Q(str_replace($delimiter, ' &raquo; ', rcmail_localize_folderpath($mbox_imap)));
+        $foldername = str_replace($delimiter, ' &raquo; ', Q(rcmail_localize_folderpath($mbox_imap)));
     }
     else if ($options['norename']) {
         $foldername = Q($folder);
diff --git a/program/steps/settings/edit_prefs.inc b/program/steps/settings/edit_prefs.inc
index 971ed60b6..468e4994d 100644
--- a/program/steps/settings/edit_prefs.inc
+++ b/program/steps/settings/edit_prefs.inc
@@ -40,7 +40,7 @@ function rcmail_user_prefs_form($attrib)
 
   $out = $form_start;
 
-  foreach ($SECTIONS[$CURR_SECTION]['blocks'] as $idx => $block) {
+  foreach ($SECTIONS[$CURR_SECTION]['blocks'] as $block) {
     if (!empty($block['options'])) {
       $table = new html_table(array('cols' => 2));
 
diff --git a/program/steps/settings/folders.inc b/program/steps/settings/folders.inc
index 0c7d9063f..34a72dd95 100644
--- a/program/steps/settings/folders.inc
+++ b/program/steps/settings/folders.inc
@@ -283,7 +283,6 @@ function rcube_subscription_form($attrib)
         $noselect   = false;
         $classes    = array($i%2 ? 'even' : 'odd');
 
-        $folder_js      = Q($folder['id']);
         $folder_utf8    = rcube_charset_convert($folder['id'], 'UTF7-IMAP');
         $display_folder = str_repeat('&nbsp;&nbsp;&nbsp;&nbsp;', $folder['level'])
             . Q($protected ? rcmail_localize_foldername($folder['id']) : $folder['name']);
@@ -394,7 +393,7 @@ function rcmail_rename_folder($oldname, $newname)
         $a_threaded = (array) $RCMAIL->config->get('message_threading', array());
         $oldprefix  = '/^' . preg_quote($oldname . $delimiter, '/') . '/';
 
-        foreach ($a_threaded as $key => $val) {
+        foreach (array_keys($a_threaded) as $key) {
             if ($key == $oldname) {
                 unset($a_threaded[$key]);
                 $a_threaded[$newname] = true;
diff --git a/program/steps/settings/func.inc b/program/steps/settings/func.inc
index 3bcca21bf..3ee098ca8 100644
--- a/program/steps/settings/func.inc
+++ b/program/steps/settings/func.inc
@@ -19,927 +19,1175 @@
  +-----------------------------------------------------------------------+
 */
 
-if (!$OUTPUT->ajax_call)
-  $OUTPUT->set_pagetitle(rcube_label('preferences'));
-
+if (!$OUTPUT->ajax_call) {
+    $OUTPUT->set_pagetitle(rcube_label('preferences'));
+}
 
 // similar function as /steps/settings/identities.inc::rcmail_identity_frame()
 function rcmail_preferences_frame($attrib)
 {
-  global $OUTPUT;
+    global $OUTPUT;
 
-  if (!$attrib['id'])
-    $attrib['id'] = 'rcmprefsframe';
+    if (!$attrib['id']) {
+        $attrib['id'] = 'rcmprefsframe';
+    }
 
-  return $OUTPUT->frame($attrib, true);
+    return $OUTPUT->frame($attrib, true);
 }
 
 
 function rcmail_sections_list($attrib)
 {
-  global $RCMAIL;
+    global $RCMAIL;
 
-  // add id to message list table if not specified
-  if (!strlen($attrib['id']))
-    $attrib['id'] = 'rcmsectionslist';
+    // add id to message list table if not specified
+    if (!strlen($attrib['id'])) {
+        $attrib['id'] = 'rcmsectionslist';
+    }
 
-  list($list, $cols) = rcmail_user_prefs();
+    list($list, $cols) = rcmail_user_prefs();
 
-  // create XHTML table
-  $out = rcube_table_output($attrib, $list, $cols, 'id');
+    // create XHTML table
+    $out = rcube_table_output($attrib, $list, $cols, 'id');
 
-  // set client env
-  $RCMAIL->output->add_gui_object('sectionslist', $attrib['id']);
-  $RCMAIL->output->include_script('list.js');
+    // set client env
+    $RCMAIL->output->add_gui_object('sectionslist', $attrib['id']);
+    $RCMAIL->output->include_script('list.js');
 
-  return $out;
+    return $out;
 }
 
 
 function rcmail_identities_list($attrib)
 {
-  global $OUTPUT, $RCMAIL;
+    global $OUTPUT, $RCMAIL;
 
-  // add id to message list table if not specified
-  if (!strlen($attrib['id']))
-    $attrib['id'] = 'rcmIdentitiesList';
+    // add id to message list table if not specified
+    if (!strlen($attrib['id'])) {
+        $attrib['id'] = 'rcmIdentitiesList';
+    }
 
-  // get identities list and define 'mail' column
-  $list = $RCMAIL->user->list_identities();
-  foreach ($list as $idx => $row)
-    $list[$idx]['mail'] = trim($row['name'] . ' <' . rcube_idn_to_utf8($row['email']) .'>');
+    // get identities list and define 'mail' column
+    $list = $RCMAIL->user->list_identities();
+    foreach ($list as $idx => $row) {
+        $list[$idx]['mail'] = trim($row['name'] . ' <' . rcube_idn_to_utf8($row['email']) .'>');
+    }
 
-  // get all identites from DB and define list of cols to be displayed
-  $plugin = $RCMAIL->plugins->exec_hook('identities_list', array(
-    'list' => $list,
-    'cols' => array('mail')));
+    // get all identites from DB and define list of cols to be displayed
+    $plugin = $RCMAIL->plugins->exec_hook('identities_list', array(
+        'list' => $list,
+        'cols' => array('mail')
+    ));
 
-  // @TODO: use <UL> instead of <TABLE> for identities list
-  // create XHTML table
-  $out = rcube_table_output($attrib, $plugin['list'], $plugin['cols'], 'identity_id');
+    // @TODO: use <UL> instead of <TABLE> for identities list
+    // create XHTML table
+    $out = rcube_table_output($attrib, $plugin['list'], $plugin['cols'], 'identity_id');
 
-  // set client env
-  $OUTPUT->add_gui_object('identitieslist', $attrib['id']);
+    // set client env
+    $OUTPUT->add_gui_object('identitieslist', $attrib['id']);
 
-  return $out;
+    return $out;
 }
 
 
 // similar function as in /steps/addressbook/edit.inc
 function get_form_tags($attrib, $action, $id = null, $hidden = null)
 {
-  global $EDIT_FORM, $RCMAIL;
-
-  $form_start = $form_end = '';
-
-  if (empty($EDIT_FORM)) {
-    $request_key = $action . (isset($id) ? '.'.$id : '');
-    $form_start = $RCMAIL->output->request_form(array(
-	  'name'    => 'form',
-	  'method'  => 'post',
-	  'task'    => $RCMAIL->task,
-	  'action'  => $action,
-	  'request' => $request_key,
-	  'noclose' => true
-	) + $attrib);
-
-    if (is_array($hidden)) {
-      $hiddenfields = new html_hiddenfield($hidden);
-      $form_start .= $hiddenfields->show();
-    }
+    global $EDIT_FORM, $RCMAIL;
+
+    $form_start = $form_end = '';
+
+    if (empty($EDIT_FORM)) {
+        $request_key = $action . (isset($id) ? '.'.$id : '');
+        $form_start = $RCMAIL->output->request_form(array(
+            'name'    => 'form',
+            'method'  => 'post',
+            'task'    => $RCMAIL->task,
+            'action'  => $action,
+            'request' => $request_key,
+            'noclose' => true
+        ) + $attrib);
+
+        if (is_array($hidden)) {
+            $hiddenfields = new html_hiddenfield($hidden);
+            $form_start .= $hiddenfields->show();
+        }
 
-    $form_end = !strlen($attrib['form']) ? '</form>' : '';
+        $form_end = !strlen($attrib['form']) ? '</form>' : '';
 
-    $EDIT_FORM = !empty($attrib['form']) ? $attrib['form'] : 'form';
-    $RCMAIL->output->add_gui_object('editform', $EDIT_FORM);
-  }
+        $EDIT_FORM = !empty($attrib['form']) ? $attrib['form'] : 'form';
+        $RCMAIL->output->add_gui_object('editform', $EDIT_FORM);
+    }
 
-  return array($form_start, $form_end);
+    return array($form_start, $form_end);
 }
 
 
-function rcmail_user_prefs($current=null)
+function rcmail_user_prefs($current = null)
 {
-  global $RCMAIL;
-
-  $sections['general'] = array('id' => 'general', 'section' => rcube_label('uisettings'));
-  $sections['mailbox'] = array('id' => 'mailbox', 'section' => rcube_label('mailboxview'));
-  $sections['mailview'] = array('id' => 'mailview','section' => rcube_label('messagesdisplaying'));
-  $sections['compose'] = array('id' => 'compose', 'section' => rcube_label('messagescomposition'));
-  $sections['addressbook'] = array('id' => 'addressbook','section' => rcube_label('addressbook'));
-  $sections['folders'] = array('id' => 'folders', 'section' => rcube_label('specialfolders'));
-  $sections['server'] = array('id' => 'server',  'section' => rcube_label('serversettings'));
-
-  // hook + define list cols
-  $plugin = $RCMAIL->plugins->exec_hook('preferences_sections_list',
-        array('list' => $sections, 'cols' => array('section')));
-
-  $sections = $plugin['list'];
-
-  $config = $RCMAIL->config->all();
-  $no_override = array_flip($RCMAIL->config->get('dont_override', array()));
-
-  foreach ($sections as $idx => $sect) {
-
-    if ($current && $sect['id'] != $current)
-      continue;
-
-    $blocks = array();
-
-    switch ($sect['id']) {
-    // general
-    case 'general':
-
-    $blocks = array(
-      'main'    => array('name' => Q(rcube_label('mainoptions'))),
-    );
-
-    // language selection
-    if (!isset($no_override['language'])) {
-      $a_lang = $RCMAIL->list_languages();
-      asort($a_lang);
-
-      $field_id = 'rcmfd_lang';
-      $select_lang = new html_select(array('name' => '_language', 'id' => $field_id));
-      $select_lang->add(array_values($a_lang), array_keys($a_lang));
-
-      $blocks['main']['options']['language'] = array(
-        'title' => html::label($field_id, Q(rcube_label('language'))),
-        'content' => $select_lang->show($RCMAIL->user->language),
-      );
-    }
-
-    // timezone selection
-    if (!isset($no_override['timezone'])) {
-      $field_id = 'rcmfd_timezone';
-      $select_timezone = new html_select(array('name' => '_timezone', 'id' => $field_id));
-      $select_timezone->add(rcube_label('autodetect'), 'auto');
-
-      $zones = array();
-      foreach (DateTimeZone::listIdentifiers() as $i => $tzs) {
-        try {
-          $tz = new DateTimeZone($tzs);
-          $date = new DateTime('2012-12-21', $tz);
-          $offset = $date->format('Z') + 45000;
-          $sortkey = sprintf('%06d.%s', $offset, $tzs);
-          $zones[$sortkey] = array($tzs, $date->format('P'));
-        }
-        catch (Exception $e) {}
-      }
-
-      ksort($zones);
-      foreach ($zones as $zone) {
-        list($tzs, $offset) = $zone;
-        $select_timezone->add('(GMT ' . $offset . ') ' . strtr($tzs, '_', ' '), $tzs);
-      }
-
-      $blocks['main']['options']['timezone'] = array(
-        'title' => html::label($field_id, Q(rcube_label('timezone'))),
-        'content' => $select_timezone->show((string)$config['timezone']),
-      );
-    }
-
-    // date/time formatting
-    if (!isset($no_override['time_format'])) {
-      $reftime = mktime(7,30,0);
-      $field_id = 'rcmfd_time_format';
-      $select_time = new html_select(array('name' => '_time_format', 'id' => $field_id));
-      foreach ((array)$RCMAIL->config->get('time_formats', array('G:i', 'H:i', 'g:i a', 'h:i A')) as $choice)
-        $select_time->add(date($choice, $reftime), $choice);
-
-      $blocks['main']['options']['time_format'] = array(
-        'title' => html::label($field_id, Q(rcube_label('timeformat'))),
-        'content' => $select_time->show($RCMAIL->config->get('time_format')),
-      );
-    }
-
-    if (!isset($no_override['date_format'])) {
-      $refdate = mktime(12,30,0,7,24);
-      $field_id = 'rcmfd_date_format';
-      $select_date = new html_select(array('name' => '_date_format', 'id' => $field_id));
-      foreach ((array)$RCMAIL->config->get('date_formats', array('Y-m-d','d-m-Y','Y/m/d','m/d/Y','d/m/Y','d.m.Y','j.n.Y')) as $choice)
-        $select_date->add(date($choice, $refdate), $choice);
-
-      $blocks['main']['options']['date_format'] = array(
-        'title' => html::label($field_id, Q(rcube_label('dateformat'))),
-        'content' => $select_date->show($config['date_format']),
-      );
-    }
+    global $RCMAIL;
 
-    // MM: Show checkbox for toggling 'pretty dates' 
-    if (!isset($no_override['prettydate'])) {
-      $field_id = 'rcmfd_prettydate';
-      $input_prettydate = new html_checkbox(array('name' => '_pretty_date', 'id' => $field_id, 'value' => 1));
+    $sections['general'] = array('id' => 'general', 'section' => rcube_label('uisettings'));
+    $sections['mailbox'] = array('id' => 'mailbox', 'section' => rcube_label('mailboxview'));
+    $sections['mailview'] = array('id' => 'mailview','section' => rcube_label('messagesdisplaying'));
+    $sections['compose'] = array('id' => 'compose', 'section' => rcube_label('messagescomposition'));
+    $sections['addressbook'] = array('id' => 'addressbook','section' => rcube_label('addressbook'));
+    $sections['folders'] = array('id' => 'folders', 'section' => rcube_label('specialfolders'));
+    $sections['server'] = array('id' => 'server',  'section' => rcube_label('serversettings'));
 
-      $blocks['main']['options']['prettydate'] = array(
-        'title' => html::label($field_id, Q(rcube_label('prettydate'))),
-        'content' => $input_prettydate->show($config['prettydate']?1:0),
-      );
-    }
+    // hook + define list cols
+    $plugin = $RCMAIL->plugins->exec_hook('preferences_sections_list',
+        array('list' => $sections, 'cols' => array('section')));
 
-    if (!isset($no_override['refresh_interval'])) {
-      $field_id = 'rcmfd_refresh_interval';
-      $select_refresh_interval = new html_select(array('name' => '_refresh_interval', 'id' => $field_id));
+    $sections    = $plugin['list'];
+    $config      = $RCMAIL->config->all();
+    $no_override = array_flip((array)$RCMAIL->config->get('dont_override'));
 
-      $select_refresh_interval->add(rcube_label('never'), 0);
-      foreach (array(1, 3, 5, 10, 15, 30, 60) as $min) {
-        if (!$config['min_refresh_interval'] || $config['min_refresh_interval'] <= $min * 60) {
-          $label = rcube_label(array('name' => 'everynminutes', 'vars' => array('n' => $min)));
-          $select_refresh_interval->add($label, $min);
+    foreach ($sections as $idx => $sect) {
+        if ($current && $sect['id'] != $current) {
+            continue;
         }
-      }
 
-      $blocks['main']['options']['refresh_interval'] = array(
-        'title' => html::label($field_id, Q(rcube_label('refreshinterval'))),
-        'content' => $select_refresh_interval->show($config['refresh_interval']/60),
-      );
-    }
-
-    // show drop-down for available skins
-    if (!isset($no_override['skin'])) {
-      $skins = rcmail_get_skins();
-
-      if (count($skins) > 1) {
-        $field_id = 'rcmfd_skin';
-        $input_skin = new html_radiobutton(array('name'=>'_skin'));
-
-        $blocks['skin'] = array('name' => Q(rcube_label('skin')),);
-
-        foreach($skins as $skin) {
-          $thumbnail = "./skins/$skin/thumbnail.png";
-          if (!is_file($thumbnail))
-            $thumbnail = './program/resources/blank.gif';
-
-          $skinname = ucfirst($skin);
-          $author_link = $license_link = '';
-          $meta = @json_decode(@file_get_contents("./skins/$skin/meta.json"), true);
-          if (is_array($meta) && $meta['name']) {
-            $skinname = $meta['name'];
-            $author_link  = $meta['url'] ? html::a(array('href' => $meta['url'], 'target' => '_blank'), Q($meta['author'])) : Q($meta['author']);
-            $license_link = $meta['license-url'] ? html::a(array('href' => $meta['license-url'], 'target' => '_blank'), Q($meta['license'])) : Q($meta['license']);
-          }
-
-          $blocks['skin']['options'][$skin]['content'] = html::label(array('class' => 'skinselection'),
-            html::span('skinitem', $input_skin->show($config['skin'], array('value' => $skin, 'id' => $field_id.$skin))) .
-            html::span('skinitem', html::img(array('src' => $thumbnail, 'class' => 'skinthumbnail', 'alt' => $skin, 'width' => 64, 'height' => 64))) .
-            html::span('skinitem', html::span('skinname', Q($skinname)) . html::br() .
-              html::span('skinauthor', $author_link ? 'by ' . $author_link : '') . html::br() .
-              html::span('skinlicense', $license_link ? rcube_label('license').':&nbsp;' . $license_link : ''))
-          );
+        $blocks = array();
+
+        switch ($sect['id']) {
+
+        // general
+        case 'general':
+            $blocks = array(
+                'main'    => array('name' => Q(rcube_label('mainoptions'))),
+                'skin'    => array('name' => Q(rcube_label('skin'))),
+                'browser' => array('name' => Q(rcube_label('browseroptions'))),
+            );
+
+            // language selection
+            if (!isset($no_override['language'])) {
+                if (!$current) {
+                    continue 2;
+                }
+
+                $a_lang = $RCMAIL->list_languages();
+                asort($a_lang);
+
+                $field_id = 'rcmfd_lang';
+                $select   = new html_select(array('name' => '_language', 'id' => $field_id));
+                $select->add(array_values($a_lang), array_keys($a_lang));
+
+                $blocks['main']['options']['language'] = array(
+                    'title'   => html::label($field_id, Q(rcube_label('language'))),
+                    'content' => $select->show($RCMAIL->user->language),
+                );
+            }
+
+            // timezone selection
+            if (!isset($no_override['timezone'])) {
+                if (!$current) {
+                    continue 2;
+                }
+
+                $field_id = 'rcmfd_timezone';
+                $select   = new html_select(array('name' => '_timezone', 'id' => $field_id));
+                $select->add(rcube_label('autodetect'), 'auto');
+
+                $zones = array();
+                foreach (DateTimeZone::listIdentifiers() as $i => $tzs) {
+                    try {
+                        $tz      = new DateTimeZone($tzs);
+                        $date    = new DateTime('2012-12-21', $tz);
+                        $offset  = $date->format('Z') + 45000;
+                        $sortkey = sprintf('%06d.%s', $offset, $tzs);
+                        $zones[$sortkey] = array($tzs, $date->format('P'));
+                    }
+                    catch (Exception $e) {}
+                }
+
+                ksort($zones);
+
+                foreach ($zones as $zone) {
+                    list($tzs, $offset) = $zone;
+                    $select->add('(GMT ' . $offset . ') ' . strtr($tzs, '_', ' '), $tzs);
+                }
+
+                $blocks['main']['options']['timezone'] = array(
+                    'title'   => html::label($field_id, Q(rcube_label('timezone'))),
+                    'content' => $select->show((string)$config['timezone']),
+                );
+            }
+
+            // date/time formatting
+            if (!isset($no_override['time_format'])) {
+                if (!$current) {
+                    continue 2;
+                }
+
+                $reftime  = mktime(7,30,0);
+                $defaults = array('G:i', 'H:i', 'g:i a', 'h:i A');
+                $formats  = (array)$RCMAIL->config->get('time_formats', $defaults);
+                $field_id = 'rcmfd_time_format';
+                $select   = new html_select(array('name' => '_time_format', 'id' => $field_id));
+
+                foreach ($formats as $choice) {
+                    $select->add(date($choice, $reftime), $choice);
+                }
+
+                $blocks['main']['options']['time_format'] = array(
+                    'title'   => html::label($field_id, Q(rcube_label('timeformat'))),
+                    'content' => $select->show($RCMAIL->config->get('time_format')),
+                );
+            }
+
+            if (!isset($no_override['date_format'])) {
+                if (!$current) {
+                    continue 2;
+                }
+
+                $refdate  = mktime(12,30,0,7,24);
+                $defaults = array('Y-m-d','d-m-Y','Y/m/d','m/d/Y','d/m/Y','d.m.Y','j.n.Y');
+                $formats  = (array)$RCMAIL->config->get('date_formats', $defaults);
+                $field_id = 'rcmfd_date_format';
+                $select   = new html_select(array('name' => '_date_format', 'id' => $field_id));
+
+                foreach ($formats as $choice) {
+                    $select->add(date($choice, $refdate), $choice);
+                }
+
+                $blocks['main']['options']['date_format'] = array(
+                    'title'   => html::label($field_id, Q(rcube_label('dateformat'))),
+                    'content' => $select->show($config['date_format']),
+                );
+            }
+
+            // Show checkbox for toggling 'pretty dates'
+            if (!isset($no_override['prettydate'])) {
+                if (!$current) {
+                    continue 2;
+                }
+
+                $field_id = 'rcmfd_prettydate';
+                $input    = new html_checkbox(array('name' => '_pretty_date', 'id' => $field_id, 'value' => 1));
+
+                $blocks['main']['options']['prettydate'] = array(
+                    'title'   => html::label($field_id, Q(rcube_label('prettydate'))),
+                    'content' => $input->show($config['prettydate']?1:0),
+                );
+            }
+
+            if (!isset($no_override['refresh_interval'])) {
+                if (!$current) {
+                    continue 2;
+                }
+
+                $field_id = 'rcmfd_refresh_interval';
+                $select   = new html_select(array('name' => '_refresh_interval', 'id' => $field_id));
+
+                $select->add(rcube_label('never'), 0);
+                foreach (array(1, 3, 5, 10, 15, 30, 60) as $min) {
+                    if (!$config['min_refresh_interval'] || $config['min_refresh_interval'] <= $min * 60) {
+                        $label = rcube_label(array('name' => 'everynminutes', 'vars' => array('n' => $min)));
+                        $select->add($label, $min);
+                    }
+                }
+
+                $blocks['main']['options']['refresh_interval'] = array(
+                    'title'   => html::label($field_id, Q(rcube_label('refreshinterval'))),
+                    'content' => $select->show($config['refresh_interval']/60),
+                );
+            }
+
+            // show drop-down for available skins
+            if (!isset($no_override['skin'])) {
+                if (!$current) {
+                    continue 2;
+                }
+
+                $skins = rcmail_get_skins();
+
+                if (count($skins) > 1) {
+                    $field_id = 'rcmfd_skin';
+                    $input    = new html_radiobutton(array('name'=>'_skin'));
+
+                    foreach ($skins as $skin) {
+                        $thumbnail = "./skins/$skin/thumbnail.png";
+                        if (!is_file($thumbnail))
+                            $thumbnail = './program/resources/blank.gif';
+
+                        $skinname    = ucfirst($skin);
+                        $author_link = $license_link = '';
+                        $meta        = @json_decode(@file_get_contents("./skins/$skin/meta.json"), true);
+
+                        if (is_array($meta) && $meta['name']) {
+                            $skinname     = $meta['name'];
+                            $author_link  = $meta['url'] ? html::a(array('href' => $meta['url'], 'target' => '_blank'), Q($meta['author'])) : Q($meta['author']);
+                            $license_link = $meta['license-url'] ? html::a(array('href' => $meta['license-url'], 'target' => '_blank'), Q($meta['license'])) : Q($meta['license']);
+                        }
+
+                        $blocks['skin']['options'][$skin]['content'] = html::label(array('class' => 'skinselection'),
+                            html::span('skinitem', $input->show($config['skin'], array('value' => $skin, 'id' => $field_id.$skin))) .
+                            html::span('skinitem', html::img(array('src' => $thumbnail, 'class' => 'skinthumbnail', 'alt' => $skin, 'width' => 64, 'height' => 64))) .
+                            html::span('skinitem', html::span('skinname', Q($skinname)) . html::br() .
+                                html::span('skinauthor', $author_link ? 'by ' . $author_link : '') . html::br() .
+                                html::span('skinlicense', $license_link ? rcube_label('license').':&nbsp;' . $license_link : ''))
+                        );
+                    }
+                }
+            }
+
+            // standard_windows option decides if new windows should be
+            // opened as popups or standard windows (which can be handled by browsers as tabs)
+            if (!isset($no_override['standard_windows'])) {
+                if (!$current) {
+                    continue 2;
+                }
+
+                $field_id = 'rcmfd_standard_windows';
+                $checkbox = new html_checkbox(array('name' => '_standard_windows', 'id' => $field_id, 'value' => 1));
+
+                $blocks['browser']['options']['standard_windows'] = array(
+                    'title'   => html::label($field_id, Q(rcube_label('standardwindows'))),
+                    'content' => $checkbox->show($config['standard_windows']?1:0),
+                );
+            }
+
+            if ($current) {
+                $product_name = $RCMAIL->config->get('product_name', 'Roundcube Webmail');
+                $RCMAIL->output->add_script(sprintf("%s.check_protocol_handler('%s', '#mailtoprotohandler');",
+                    JS_OBJECT_NAME, JQ($product_name)), 'foot');
+            }
+
+            $blocks['browser']['options']['mailtoprotohandler'] = array(
+                'content' => html::a(array(
+                'href'    => '#',
+                'id'      => 'mailtoprotohandler'), Q(rcube_label('mailtoprotohandler'))),
+            );
+
+        break;
+
+        // Mailbox view (mail screen)
+        case 'mailbox':
+            $blocks = array(
+                'main'        => array('name' => Q(rcube_label('mainoptions'))),
+                'new_message' => array('name' => Q(rcube_label('newmessage'))),
+            );
+
+            // show config parameter for preview pane
+            if (!isset($no_override['preview_pane'])) {
+                if (!$current) {
+                    continue 2;
+                }
+
+                $field_id = 'rcmfd_preview';
+                $input    = new html_checkbox(array('name' => '_preview_pane', 'id' => $field_id, 'value' => 1,
+                    'onchange' => "$('#rcmfd_preview_pane_mark_read').prop('disabled', !this.checked)"));
+
+                $blocks['main']['options']['preview_pane'] = array(
+                    'title'   => html::label($field_id, Q(rcube_label('previewpane'))),
+                    'content' => $input->show($config['preview_pane']?1:0),
+                );
+            }
+
+            // show config parameter for preview pane auto mark as read delay
+            if (!isset($no_override['preview_pane_mark_read'])) {
+                if (!$current) {
+                    continue 2;
+                }
+
+                // apply default if config option is not set at all
+                $config['preview_pane_mark_read'] = $RCMAIL->config->get('preview_pane_mark_read', 0);
+
+                $field_id = 'rcmfd_preview_pane_mark_read';
+                $select   = new html_select(array('name' => '_preview_pane_mark_read', 'id' => $field_id,
+                    'disabled' => $config['preview_pane']?0:1));
+
+                $select->add(rcube_label('never'), '-1');
+                $select->add(rcube_label('immediately'), 0);
+
+                foreach (array(5, 10, 20, 30) as $sec) {
+                    $label = rcube_label(array('name' => 'afternseconds', 'vars' => array('n' => $sec)));
+                    $select->add($label, $sec);
+                }
+
+                $blocks['main']['options']['preview_pane_mark_read'] = array(
+                    'title'   => html::label($field_id, Q(rcube_label('previewpanemarkread'))),
+                    'content' => $select->show(intval($config['preview_pane_mark_read'])),
+                );
+            }
+
+            if (!isset($no_override['mdn_requests'])) {
+                if (!$current) {
+                    continue 2;
+                }
+
+                $field_id = 'rcmfd_mdn_requests';
+                $select   = new html_select(array('name' => '_mdn_requests', 'id' => $field_id));
+                $select->add(rcube_label('askuser'), 0);
+                $select->add(rcube_label('autosend'), 1);
+                $select->add(rcube_label('autosendknown'), 3);
+                $select->add(rcube_label('autosendknownignore'), 4);
+                $select->add(rcube_label('ignore'), 2);
+
+                $blocks['main']['options']['mdn_requests'] = array(
+                    'title'   => html::label($field_id, Q(rcube_label('mdnrequests'))),
+                    'content' => $select->show($config['mdn_requests']),
+                );
+            }
+
+            if (!isset($no_override['autoexpand_threads'])) {
+                if (!$current) {
+                    continue 2;
+                }
+
+                $storage   = $RCMAIL->get_storage();
+                $supported = $storage->get_capability('THREAD');
+
+                if ($supported) {
+                    $field_id = 'rcmfd_autoexpand_threads';
+                    $select   = new html_select(array('name' => '_autoexpand_threads', 'id' => $field_id));
+                    $select->add(rcube_label('never'), 0);
+                    $select->add(rcube_label('do_expand'), 1);
+                    $select->add(rcube_label('expand_only_unread'), 2);
+
+                    $blocks['main']['options']['autoexpand_threads'] = array(
+                        'title'   => html::label($field_id, Q(rcube_label('autoexpand_threads'))),
+                        'content' => $select->show($config['autoexpand_threads']),
+                    );
+                }
+            }
+
+            // show page size selection
+            if (!isset($no_override['mail_pagesize'])) {
+                if (!$current) {
+                    continue 2;
+                }
+
+                $field_id = 'rcmfd_mail_pagesize';
+                $input    = new html_inputfield(array('name' => '_mail_pagesize', 'id' => $field_id, 'size' => 5));
+                $size     = intval($config['mail_pagesize'] ? $config['mail_pagesize'] : $config['pagesize']);
+
+                $blocks['main']['options']['pagesize'] = array(
+                    'title'   => html::label($field_id, Q(rcube_label('pagesize'))),
+                    'content' => $input->show($size ? $size : 50),
+                );
+            }
+
+            if (!isset($no_override['check_all_folders'])) {
+                if (!$current) {
+                    continue 2;
+                }
+
+                $field_id = 'rcmfd_check_all_folders';
+                $input    = new html_checkbox(array('name' => '_check_all_folders', 'id' => $field_id, 'value' => 1));
+
+                $blocks['new_message']['options']['check_all_folders'] = array(
+                    'title'   => html::label($field_id, Q(rcube_label('checkallfolders'))),
+                    'content' => $input->show($config['check_all_folders']?1:0),
+                );
+            }
+        break;
+
+        // Message viewing
+        case 'mailview':
+            $blocks = array(
+                'main' => array('name' => Q(rcube_label('mainoptions'))),
+            );
+
+            // show checkbox to open message view in new window
+            if (!isset($no_override['message_extwin'])) {
+                if (!$current) {
+                    continue 2;
+                }
+
+                $field_id = 'rcmfd_message_extwin';
+                $input    = new html_checkbox(array('name' => '_message_extwin', 'id' => $field_id, 'value' => 1));
+
+                $blocks['main']['options']['message_extwin'] = array(
+                    'title'   => html::label($field_id, Q(rcube_label('showinextwin'))),
+                    'content' => $input->show($config['message_extwin']?1:0),
+                );
+            }
+
+            // show checkbox to show email instead of name
+            if (!isset($no_override['message_show_email'])) {
+                if (!$current) {
+                    continue 2;
+                }
+
+                $field_id = 'rcmfd_message_show_email';
+                $input    = new html_checkbox(array('name' => '_message_show_email', 'id' => $field_id, 'value' => 1));
+
+                $blocks['main']['options']['message_show_email'] = array(
+                    'title'   => html::label($field_id, Q(rcube_label('showemail'))),
+                    'content' => $input->show($config['message_show_email']?1:0),
+                );
+            }
+
+            // show checkbox for HTML/plaintext messages
+            if (!isset($no_override['prefer_html'])) {
+                if (!$current) {
+                    continue 2;
+                }
+
+                $field_id = 'rcmfd_htmlmsg';
+                $input    = new html_checkbox(array('name' => '_prefer_html', 'id' => $field_id, 'value' => 1,
+                    'onchange' => "$('#rcmfd_show_images').prop('disabled', !this.checked).val(0)"));
+
+                $blocks['main']['options']['prefer_html'] = array(
+                    'title'   => html::label($field_id, Q(rcube_label('preferhtml'))),
+                    'content' => $input->show($config['prefer_html']?1:0),
+                );
+            }
+
+            if (!isset($no_override['default_charset'])) {
+                if (!$current) {
+                    continue 2;
+                }
+
+                $field_id = 'rcmfd_default_charset';
+
+                $blocks['main']['options']['default_charset'] = array(
+                    'title' => html::label($field_id, Q(rcube_label('defaultcharset'))),
+                    'content' => $RCMAIL->output->charset_selector(array(
+                        'name' => '_default_charset', 'selected' => $config['default_charset']
+                )));
+            }
+
+            if (!isset($no_override['show_images'])) {
+                if (!$current) {
+                    continue 2;
+                }
+
+                $field_id = 'rcmfd_show_images';
+                $input    = new html_select(array('name' => '_show_images', 'id' => $field_id,
+                    'disabled' => !$config['prefer_html']));
+
+                $input->add(rcube_label('never'), 0);
+                $input->add(rcube_label('fromknownsenders'), 1);
+                $input->add(rcube_label('always'), 2);
+
+                $blocks['main']['options']['show_images'] = array(
+                    'title'   => html::label($field_id, Q(rcube_label('showremoteimages'))),
+                    'content' => $input->show($config['prefer_html'] ? $config['show_images'] : 0),
+                );
+            }
+
+            if (!isset($no_override['inline_images'])) {
+                if (!$current) {
+                    continue 2;
+                }
+
+                $field_id = 'rcmfd_inline_images';
+                $input    = new html_checkbox(array('name' => '_inline_images', 'id' => $field_id, 'value' => 1));
+
+                $blocks['main']['options']['inline_images'] = array(
+                    'title'   => html::label($field_id, Q(rcube_label('showinlineimages'))),
+                    'content' => $input->show($config['inline_images']?1:0),
+                );
+            }
+
+            // "display after delete" checkbox
+            if (!isset($no_override['display_next'])) {
+                if (!$current) {
+                    continue 2;
+                }
+
+                $field_id = 'rcmfd_displaynext';
+                $input    = new html_checkbox(array('name' => '_display_next', 'id' => $field_id, 'value' => 1));
+
+                $blocks['main']['options']['display_next'] = array(
+                    'title'   => html::label($field_id, Q(rcube_label('displaynext'))),
+                    'content' => $input->show($config['display_next']?1:0),
+                );
+            }
+        break;
+
+        // Mail composition
+        case 'compose':
+            $blocks = array(
+                'main'       => array('name' => Q(rcube_label('mainoptions'))),
+                'sig'        => array('name' => Q(rcube_label('signatureoptions'))),
+                'spellcheck' => array('name' => Q(rcube_label('spellcheckoptions'))),
+            );
+
+            // show checkbox to compose messages in a new window
+            if (!isset($no_override['compose_extwin'])) {
+                if (!$current) {
+                    continue 2;
+                }
+
+                $field_id = 'rcmfdcompose_extwin';
+                $input    = new html_checkbox(array('name' => '_compose_extwin', 'id' => $field_id, 'value' => 1));
+
+                $blocks['main']['options']['compose_extwin'] = array(
+                    'title'   => html::label($field_id, Q(rcube_label('composeextwin'))),
+                    'content' => $input->show($config['compose_extwin']?1:0),
+                );
+            }
+
+            if (!isset($no_override['htmleditor'])) {
+                if (!$current) {
+                    continue 2;
+                }
+
+                $field_id = 'rcmfd_htmleditor';
+                $select   = new html_select(array('name' => '_htmleditor', 'id' => $field_id));
+
+                $select->add(rcube_label('never'), 0);
+                $select->add(rcube_label('always'), 1);
+                $select->add(rcube_label('htmlonreply'), 2);
+                $select->add(rcube_label('htmlonreplyandforward'), 3);
+
+                $blocks['main']['options']['htmleditor'] = array(
+                    'title'   => html::label($field_id, Q(rcube_label('htmleditor'))),
+                    'content' => $select->show(intval($config['htmleditor'])),
+                );
+            }
+
+            if (!isset($no_override['draft_autosave'])) {
+                if (!$current) {
+                    continue 2;
+                }
+
+                $field_id = 'rcmfd_autosave';
+                $select   = new html_select(array('name' => '_draft_autosave', 'id' => $field_id, 'disabled' => empty($config['drafts_mbox'])));
+
+                $select->add(rcube_label('never'), 0);
+                foreach (array(1, 3, 5, 10) as $i => $min) {
+                    $label = rcube_label(array('name' => 'everynminutes', 'vars' => array('n' => $min)));
+                    $select->add($label, $min*60);
+                }
+
+                $blocks['main']['options']['draft_autosave'] = array(
+                    'title'   => html::label($field_id, Q(rcube_label('autosavedraft'))),
+                    'content' => $select->show($config['draft_autosave']),
+                );
+            }
+
+            if (!isset($no_override['mime_param_folding'])) {
+                if (!$current) {
+                    continue 2;
+                }
+
+                $field_id = 'rcmfd_param_folding';
+                $select   = new html_select(array('name' => '_mime_param_folding', 'id' => $field_id));
+
+                $select->add(rcube_label('2231folding'), 0);
+                $select->add(rcube_label('miscfolding'), 1);
+                $select->add(rcube_label('2047folding'), 2);
+
+                $blocks['main']['options']['mime_param_folding'] = array(
+                    'advanced' => true,
+                    'title'    => html::label($field_id, Q(rcube_label('mimeparamfolding'))),
+                    'content'  => $select->show($config['mime_param_folding']),
+                );
+            }
+
+            if (!isset($no_override['force_7bit'])) {
+                if (!$current) {
+                    continue 2;
+                }
+
+                $field_id = 'rcmfd_force_7bit';
+                $input    = new html_checkbox(array('name' => '_force_7bit', 'id' => $field_id, 'value' => 1));
+
+                $blocks['main']['options']['force_7bit'] = array(
+                    'advanced' => true,
+                    'title'    => html::label($field_id, Q(rcube_label('force7bit'))),
+                    'content'  => $input->show($config['force_7bit']?1:0),
+                );
+            }
+
+            if (!isset($no_override['mdn_default'])) {
+                if (!$current) {
+                    continue 2;
+                }
+
+                $field_id = 'rcmfd_mdn_default';
+                $input    = new html_checkbox(array('name' => '_mdn_default', 'id' => $field_id, 'value' => 1));
+
+                $blocks['main']['options']['mdn_default'] = array(
+                    'title'   => html::label($field_id, Q(rcube_label('reqmdn'))),
+                    'content' => $input->show($config['mdn_default']?1:0),
+                );
+            }
+
+            if (!isset($no_override['dsn_default'])) {
+                if (!$current) {
+                    continue 2;
+                }
+
+                $field_id = 'rcmfd_dsn_default';
+                $input    = new html_checkbox(array('name' => '_dsn_default', 'id' => $field_id, 'value' => 1));
+
+                $blocks['main']['options']['dsn_default'] = array(
+                    'title'   => html::label($field_id, Q(rcube_label('reqdsn'))),
+                    'content' => $input->show($config['dsn_default']?1:0),
+                );
+            }
+
+            if (!isset($no_override['reply_same_folder'])) {
+                if (!$current) {
+                    continue 2;
+                }
+
+                $field_id = 'rcmfd_reply_same_folder';
+                $input    = new html_checkbox(array('name' => '_reply_same_folder', 'id' => $field_id, 'value' => 1));
+
+                $blocks['main']['options']['reply_same_folder'] = array(
+                    'title'   => html::label($field_id, Q(rcube_label('replysamefolder'))),
+                    'content' => $input->show($config['reply_same_folder']?1:0),
+                );
+            }
+
+            if (!isset($no_override['reply_mode'])) {
+                if (!$current) {
+                    continue 2;
+                }
+
+                $field_id = 'rcmfd_reply_mode';
+                $select   = new html_select(array('name' => '_reply_mode', 'id' => $field_id));
+
+                $select->add(rcube_label('replyempty'), -1);
+                $select->add(rcube_label('replybottomposting'), 0);
+                $select->add(rcube_label('replytopposting'), 1);
+
+                $blocks['main']['options']['reply_mode'] = array(
+                    'title'   => html::label($field_id, Q(rcube_label('whenreplying'))),
+                    'content' => $select->show(intval($config['reply_mode'])),
+                );
+            }
+
+            if (!isset($no_override['spellcheck_before_send']) && $config['enable_spellcheck']) {
+                if (!$current) {
+                    continue 2;
+                }
+
+                $field_id = 'rcmfd_spellcheck_before_send';
+                $input    = new html_checkbox(array('name' => '_spellcheck_before_send', 'id' => $field_id, 'value' => 1));
+
+                $blocks['spellcheck']['options']['spellcheck_before_send'] = array(
+                    'title'   => html::label($field_id, Q(rcube_label('spellcheckbeforesend'))),
+                    'content' => $input->show($config['spellcheck_before_send']?1:0),
+                );
+            }
+
+            if ($config['enable_spellcheck']) {
+                if (!$current) {
+                    continue 2;
+                }
+
+                foreach (array('syms', 'nums', 'caps') as $key) {
+                    $key = 'spellcheck_ignore_'.$key;
+                    if (!isset($no_override[$key])) {
+                        $input = new html_checkbox(array('name' => '_'.$key, 'id' => 'rcmfd_'.$key, 'value' => 1));
+
+                        $blocks['spellcheck']['options'][$key] = array(
+                            'title'   => html::label($field_id, Q(rcube_label(str_replace('_', '', $key)))),
+                            'content' => $input->show($config[$key]?1:0),
+                        );
+                    }
+                }
+            }
+
+            if (!isset($no_override['show_sig'])) {
+                if (!$current) {
+                    continue 2;
+                }
+
+                $field_id = 'rcmfd_show_sig';
+                $select   = new html_select(array('name' => '_show_sig', 'id' => $field_id));
+
+                $select->add(rcube_label('never'), 0);
+                $select->add(rcube_label('always'), 1);
+                $select->add(rcube_label('newmessageonly'), 2);
+                $select->add(rcube_label('replyandforwardonly'), 3);
+
+                $blocks['sig']['options']['show_sig'] = array(
+                    'title'   => html::label($field_id, Q(rcube_label('autoaddsignature'))),
+                    'content' => $select->show($RCMAIL->config->get('show_sig', 1)),
+                );
+            }
+
+            if (!isset($no_override['strip_existing_sig'])) {
+                if (!$current) {
+                    continue 2;
+                }
+
+                $field_id = 'rcmfd_strip_existing_sig';
+                $input    = new html_checkbox(array('name' => '_strip_existing_sig', 'id' => $field_id, 'value' => 1));
+
+                $blocks['sig']['options']['strip_existing_sig'] = array(
+                    'title'   => html::label($field_id, Q(rcube_label('replyremovesignature'))),
+                    'content' => $input->show($config['strip_existing_sig']?1:0),
+                );
+            }
+
+            if (!isset($no_override['forward_attachment'])) {
+                if (!$current) {
+                    continue 2;
+                }
+
+                $field_id = 'rcmfd_forward_attachment';
+                $select = new html_select(array('name' => '_forward_attachment', 'id' => $field_id));
+
+                $select->add(rcube_label('inline'), 0);
+                $select->add(rcube_label('asattachment'), 1);
+
+                $blocks['main']['options']['forward_attachment'] = array(
+                    'title'   => html::label($field_id, Q(rcube_label('forwardmode'))),
+                    'content' => $select->show(intval($config['forward_attachment'])),
+                );
+            }
+
+            if (!isset($no_override['default_font'])) {
+                if (!$current) {
+                    continue 2;
+                }
+
+                $field_id = 'rcmfd_default_font';
+                $fonts    = rcube_fontdefs();
+                $selected = $config['default_font'];
+
+                $select = '<select name="_default_font" id="'.$field_id.'">';
+                $select .= '<option value=""' . (!$selected ? ' selected="selected"' : '') . '>---</option>';
+                foreach ($fonts as $fname => $font) {
+                    $select .= '<option value="'.$fname.'"'
+                        . ($fname == $selected ? ' selected="selected"' : '')
+                        . ' style=\'font-family: ' . $font . '\'>'
+                        . Q($fname) . '</option>';
+                }
+                $select .= '</select>';
+
+                $blocks['main']['options']['default_font'] = array(
+                    'title' => html::label($field_id, Q(rcube_label('defaultfont'))),
+                    'content' => $select
+                );
+            }
+        break;
+
+        // Addressbook config
+        case 'addressbook':
+            $blocks = array(
+                'main' => array('name' => Q(rcube_label('mainoptions'))),
+            );
+
+            if (!isset($no_override['default_addressbook'])
+                && (!$current || ($books = $RCMAIL->get_address_sources(true, true)))
+            ) {
+                if (!$current) {
+                    continue 2;
+                }
+
+                $field_id = 'rcmfd_default_addressbook';
+                $select   = new html_select(array('name' => '_default_addressbook', 'id' => $field_id));
+
+                foreach ($books as $book) {
+                    $select->add(html_entity_decode($book['name'], ENT_COMPAT, 'UTF-8'), $book['id']);
+                }
+
+                $blocks['main']['options']['default_addressbook'] = array(
+                    'title'   => html::label($field_id, Q(rcube_label('defaultabook'))),
+                    'content' => $select->show($config['default_addressbook']),
+                );
+            }
+
+            // show addressbook listing mode selection
+            if (!isset($no_override['addressbook_name_listing'])) {
+                if (!$current) {
+                    continue 2;
+                }
+
+                $field_id = 'rcmfd_addressbook_name_listing';
+                $select   = new html_select(array('name' => '_addressbook_name_listing', 'id' => $field_id));
+
+                $select->add(rcube_label('name'), 0);
+                $select->add(rcube_label('firstname') . ' '  . rcube_label('surname'), 1);
+                $select->add(rcube_label('surname')   . ' '  . rcube_label('firstname'), 2);
+                $select->add(rcube_label('surname')   . ', ' . rcube_label('firstname'), 3);
+
+                $blocks['main']['options']['list_name_listing'] = array(
+                    'title'   => html::label($field_id, Q(rcube_label('listnamedisplay'))),
+                    'content' => $select->show($config['addressbook_name_listing']),
+                );
+            }
+
+            // show addressbook sort column
+            if (!isset($no_override['addressbook_sort_col'])) {
+                if (!$current) {
+                    continue 2;
+                }
+
+                $field_id = 'rcmfd_addressbook_sort_col';
+                $select   = new html_select(array('name' => '_addressbook_sort_col', 'id' => $field_id));
+
+                $select->add(rcube_label('name'), 'name');
+                $select->add(rcube_label('firstname'), 'firstname');
+                $select->add(rcube_label('surname'), 'surname');
+
+                $blocks['main']['options']['sort_col'] = array(
+                    'title'   => html::label($field_id, Q(rcube_label('listsorting'))),
+                    'content' => $select->show($config['addressbook_sort_col']),
+                );
+            }
+
+            // show addressbook page size selection
+            if (!isset($no_override['addressbook_pagesize'])) {
+                if (!$current) {
+                    continue 2;
+                }
+
+                $field_id = 'rcmfd_addressbook_pagesize';
+                $input    = new html_inputfield(array('name' => '_addressbook_pagesize', 'id' => $field_id, 'size' => 5));
+                $size     = intval($config['addressbook_pagesize'] ? $config['addressbook_pagesize'] : $config['pagesize']);
+
+                $blocks['main']['options']['pagesize'] = array(
+                    'title'   => html::label($field_id, Q(rcube_label('pagesize'))),
+                    'content' => $input->show($size ? $size : 50),
+                );
+            }
+
+            if (!isset($no_override['autocomplete_single'])) {
+                if (!$current) {
+                    continue 2;
+                }
+
+                $field_id = 'rcmfd_autocomplete_single';
+                $checkbox = new html_checkbox(array('name' => '_autocomplete_single', 'id' => $field_id, 'value' => 1));
+
+                $blocks['main']['options']['autocomplete_single'] = array(
+                    'title'   => html::label($field_id, Q(rcube_label('autocompletesingle'))),
+                    'content' => $checkbox->show($config['autocomplete_single']?1:0),
+                );
+            }
+        break;
+
+        // Special IMAP folders
+        case 'folders':
+            $blocks = array(
+                'main' => array('name' => Q(rcube_label('mainoptions'))),
+            );
+
+            if (!isset($no_override['show_real_foldernames'])) {
+                if (!$current) {
+                    continue 2;
+                }
+
+                $field_id = 'show_real_foldernames';
+                $input    = new html_checkbox(array('name' => '_show_real_foldernames', 'id' => $field_id, 'value' => 1));
+
+                $blocks['main']['options']['show_real_foldernames'] = array(
+                    'title'   => html::label($field_id, Q(rcube_label('show_real_foldernames'))),
+                    'content' => $input->show($config['show_real_foldernames']?1:0),
+                );
+            }
+
+            // Configure special folders
+            if (!isset($no_override['default_folders']) && $current) {
+                $select = rcmail_mailbox_select(array(
+                    'noselection'   => '---',
+                    'realnames'     => true,
+                    'maxlength'     => 30,
+                    'folder_filter' => 'mail',
+                    'folder_rights' => 'w',
+                    // #1486114, #1488279
+                    'onchange'      => "if ($(this).val() == 'INBOX') $(this).val('')",
+                ));
+            }
+
+            if (!isset($no_override['drafts_mbox'])) {
+                if (!$current) {
+                    continue 2;
+                }
+
+                $blocks['main']['options']['drafts_mbox'] = array(
+                    'title'   => Q(rcube_label('drafts')),
+                    'content' => $select->show($config['drafts_mbox'], array('name' => "_drafts_mbox")),
+                );
+            }
+
+            if (!isset($no_override['sent_mbox'])) {
+                if (!$current) {
+                    continue 2;
+                }
+
+                $blocks['main']['options']['sent_mbox'] = array(
+                    'title'   => Q(rcube_label('sent')),
+                    'content' => $select->show($config['sent_mbox'], array('name' => "_sent_mbox")),
+                );
+            }
+
+            if (!isset($no_override['junk_mbox'])) {
+                if (!$current) {
+                    continue 2;
+                }
+
+                $blocks['main']['options']['junk_mbox'] = array(
+                    'title'   => Q(rcube_label('junk')),
+                    'content' => $select->show($config['junk_mbox'], array('name' => "_junk_mbox")),
+                );
+            }
+
+            if (!isset($no_override['trash_mbox'])) {
+                if (!$current) {
+                    continue 2;
+                }
+
+                $blocks['main']['options']['trash_mbox'] = array(
+                    'title'   => Q(rcube_label('trash')),
+                    'content' => $select->show($config['trash_mbox'], array('name' => "_trash_mbox")),
+                );
+            }
+        break;
+
+        // Server settings
+        case 'server':
+            $blocks = array(
+                'main'        => array('name' => Q(rcube_label('mainoptions'))),
+                'maintenance' => array('name' => Q(rcube_label('maintenance'))),
+            );
+
+            if (!isset($no_override['read_when_deleted'])) {
+                if (!$current) {
+                    continue 2;
+                }
+
+                $field_id = 'rcmfd_read_deleted';
+                $input    = new html_checkbox(array('name' => '_read_when_deleted', 'id' => $field_id, 'value' => 1));
+
+                $blocks['main']['options']['read_when_deleted'] = array(
+                    'title'   => html::label($field_id, Q(rcube_label('readwhendeleted'))),
+                    'content' => $input->show($config['read_when_deleted']?1:0),
+                );
+            }
+
+            if (!isset($no_override['flag_for_deletion'])) {
+                if (!$current) {
+                    continue 2;
+                }
+
+                $field_id = 'rcmfd_flag_for_deletion';
+                $input    = new html_checkbox(array('name' => '_flag_for_deletion', 'id' => $field_id, 'value' => 1));
+
+                $blocks['main']['options']['flag_for_deletion'] = array(
+                    'title'   => html::label($field_id, Q(rcube_label('flagfordeletion'))),
+                    'content' => $input->show($config['flag_for_deletion']?1:0),
+                );
+            }
+
+            // don't show deleted messages
+            if (!isset($no_override['skip_deleted'])) {
+                if (!$current) {
+                    continue 2;
+                }
+
+                $field_id = 'rcmfd_skip_deleted';
+                $input    = new html_checkbox(array('name' => '_skip_deleted', 'id' => $field_id, 'value' => 1));
+
+                $blocks['main']['options']['skip_deleted'] = array(
+                    'title'   => html::label($field_id, Q(rcube_label('skipdeleted'))),
+                    'content' => $input->show($config['skip_deleted']?1:0),
+                );
+            }
+
+            if (!isset($no_override['delete_always'])) {
+                if (!$current) {
+                    continue 2;
+                }
+
+                $field_id = 'rcmfd_delete_always';
+                $input    = new html_checkbox(array('name' => '_delete_always', 'id' => $field_id, 'value' => 1));
+
+                $blocks['main']['options']['delete_always'] = array(
+                    'title'   => html::label($field_id, Q(rcube_label('deletealways'))),
+                    'content' => $input->show($config['delete_always']?1:0),
+                );
+            }
+
+            if (!isset($no_override['delete_junk'])) {
+                if (!$current) {
+                    continue 2;
+                }
+
+                $field_id = 'rcmfd_delete_junk';
+                $input    = new html_checkbox(array('name' => '_delete_junk', 'id' => $field_id, 'value' => 1));
+
+                $blocks['main']['options']['delete_junk'] = array(
+                    'title'   => html::label($field_id, Q(rcube_label('deletejunk'))),
+                    'content' => $input->show($config['delete_junk']?1:0),
+                );
+            }
+
+            // Trash purging on logout
+            if (!isset($no_override['logout_purge'])) {
+                if (!$current) {
+                    continue 2;
+                }
+
+                $field_id = 'rcmfd_logout_purge';
+                $input    = new html_checkbox(array('name' => '_logout_purge', 'id' => $field_id, 'value' => 1));
+
+                $blocks['maintenance']['options']['logout_purge'] = array(
+                    'title'   => html::label($field_id, Q(rcube_label('logoutclear'))),
+                    'content' => $input->show($config['logout_purge']?1:0),
+                );
+            }
+
+            // INBOX compacting on logout
+            if (!isset($no_override['logout_expunge'])) {
+                if (!$current) {
+                    continue 2;
+                }
+
+                $field_id = 'rcmfd_logout_expunge';
+                $input    = new html_checkbox(array('name' => '_logout_expunge', 'id' => $field_id, 'value' => 1));
+
+                $blocks['maintenance']['options']['logout_expunge'] = array(
+                    'title'   => html::label($field_id, Q(rcube_label('logoutcompact'))),
+                    'content' => $input->show($config['logout_expunge']?1:0),
+                );
+            }
         }
-      }
-    }
-
-    $product_name = $RCMAIL->config->get('product_name', 'Roundcube Webmail');
-    $RCMAIL->output->add_script(sprintf("%s.check_protocol_handler('%s', '#mailtoprotohandler');",
-      JS_OBJECT_NAME, JQ($product_name)), 'foot');
-
-    $blocks['browser'] = array(
-      'name' => Q(rcube_label('browseroptions')),
-      'options' => array('mailtoprotohandler' => array(
-        'content' => html::a(array(
-          'href' => '#',
-          'id' => 'mailtoprotohandler'), Q(rcube_label('mailtoprotohandler'))),
-        )),
-    );
-
-    break;
-
-    // Mailbox view (mail screen)
-    case 'mailbox':
-
-    $blocks = array(
-      'main' => array('name' => Q(rcube_label('mainoptions'))),
-      'new_message' => array('name' => Q(rcube_label('newmessage'))),
-    );
-
-    // show config parameter for preview pane
-    if (!isset($no_override['preview_pane'])) {
-      $field_id = 'rcmfd_preview';
-      $input_preview = new html_checkbox(array('name' => '_preview_pane', 'id' => $field_id, 'value' => 1,
-        'onchange' => "$('#rcmfd_preview_pane_mark_read').prop('disabled', !this.checked)"));
-
-      $blocks['main']['options']['preview_pane'] = array(
-        'title' => html::label($field_id, Q(rcube_label('previewpane'))),
-        'content' => $input_preview->show($config['preview_pane']?1:0),
-      );
-    }
-
-    // show config parameter for preview pane auto mark as read delay
-    if (!isset($no_override['preview_pane_mark_read'])) {
-      // apply default if config option is not set at all
-      $config['preview_pane_mark_read'] = $RCMAIL->config->get('preview_pane_mark_read', 0);
-
-      $field_id = 'rcmfd_preview_pane_mark_read';
-      $select_delay = new html_select(array('name' => '_preview_pane_mark_read', 'id' => $field_id,
-        'disabled' => $config['preview_pane']?0:1));
-
-      $select_delay->add(rcube_label('never'), '-1');
-      $select_delay->add(rcube_label('immediately'), 0);
-      foreach(array(5, 10, 20, 30) as $sec)
-        $select_delay->add(rcube_label(array('name' => 'afternseconds', 'vars' => array('n' => $sec))), $sec);
-
-      $blocks['main']['options']['preview_pane_mark_read'] = array(
-        'title' => html::label($field_id, Q(rcube_label('previewpanemarkread'))),
-        'content' => $select_delay->show(intval($config['preview_pane_mark_read'])),
-      );
-    }
-
-    if (!isset($no_override['mdn_requests'])) {
-      $field_id = 'rcmfd_mdn_requests';
-      $select_mdn_requests = new html_select(array('name' => '_mdn_requests', 'id' => $field_id));
-      $select_mdn_requests->add(rcube_label('askuser'), 0);
-      $select_mdn_requests->add(rcube_label('autosend'), 1);
-      $select_mdn_requests->add(rcube_label('autosendknown'), 3);
-      $select_mdn_requests->add(rcube_label('autosendknownignore'), 4);
-      $select_mdn_requests->add(rcube_label('ignore'), 2);
-
-      $blocks['main']['options']['mdn_requests'] = array(
-        'title' => html::label($field_id, Q(rcube_label('mdnrequests'))),
-        'content' => $select_mdn_requests->show($config['mdn_requests']),
-      );
-    }
-
-    $storage             = $RCMAIL->get_storage();
-    $threading_supported = $storage->get_capability('THREAD');
-
-    if (!isset($no_override['autoexpand_threads']) && $threading_supported) {
-      $field_id = 'rcmfd_autoexpand_threads';
-      $select_autoexpand_threads = new html_select(array('name' => '_autoexpand_threads', 'id' => $field_id));
-      $select_autoexpand_threads->add(rcube_label('never'), 0);
-      $select_autoexpand_threads->add(rcube_label('do_expand'), 1);
-      $select_autoexpand_threads->add(rcube_label('expand_only_unread'), 2);
-
-      $blocks['main']['options']['autoexpand_threads'] = array(
-        'title' => html::label($field_id, Q(rcube_label('autoexpand_threads'))),
-        'content' => $select_autoexpand_threads->show($config['autoexpand_threads']),
-      );
-    }
-
-    // show page size selection
-    if (!isset($no_override['mail_pagesize'])) {
-      $field_id = 'rcmfd_mail_pagesize';
-      $input_pagesize = new html_inputfield(array('name' => '_mail_pagesize', 'id' => $field_id, 'size' => 5));
-
-      $size = intval($config['mail_pagesize'] ? $config['mail_pagesize'] : $config['pagesize']);
-
-      $blocks['main']['options']['pagesize'] = array(
-        'title' => html::label($field_id, Q(rcube_label('pagesize'))),
-        'content' => $input_pagesize->show($size ? $size : 50),
-      );
-    }
-    if (!isset($no_override['check_all_folders'])) {
-      $field_id = 'rcmfd_check_all_folders';
-      $input_check_all = new html_checkbox(array('name' => '_check_all_folders', 'id' => $field_id, 'value' => 1));
-
-      $blocks['new_message']['options']['check_all_folders'] = array(
-        'title' => html::label($field_id, Q(rcube_label('checkallfolders'))),
-        'content' => $input_check_all->show($config['check_all_folders']?1:0),
-      );
-    }
-
-    break;
-
-    // Message viewing
-    case 'mailview':
-
-    $blocks = array(
-      'main' => array('name' => Q(rcube_label('mainoptions'))),
-    );
-
-    // show checkbox to open message view in new window
-    if (!isset($no_override['message_extwin'])) {
-      $field_id = 'rcmfd_message_extwin';
-      $input_msgextwin = new html_checkbox(array('name' => '_message_extwin', 'id' => $field_id, 'value' => 1));
-
-      $blocks['main']['options']['message_extwin'] = array(
-        'title' => html::label($field_id, Q(rcube_label('showinextwin'))),
-        'content' => $input_msgextwin->show($config['message_extwin']?1:0),
-      );
-    }
-
-    // show checkbox for HTML/plaintext messages
-    if (!isset($no_override['prefer_html'])) {
-      $field_id = 'rcmfd_htmlmsg';
-      $input_preferhtml = new html_checkbox(array('name' => '_prefer_html', 'id' => $field_id, 'value' => 1,
-        'onchange' => "$('#rcmfd_show_images').prop('disabled', !this.checked).val(0)"));
-
-      $blocks['main']['options']['prefer_html'] = array(
-        'title' => html::label($field_id, Q(rcube_label('preferhtml'))),
-        'content' => $input_preferhtml->show($config['prefer_html']?1:0),
-      );
-    }
-
-    if (!isset($no_override['default_charset'])) {
-      $field_id = 'rcmfd_default_charset';
-
-      $blocks['main']['options']['default_charset'] = array(
-        'title' => html::label($field_id, Q(rcube_label('defaultcharset'))),
-        'content' => $RCMAIL->output->charset_selector(array(
-          'name' => '_default_charset', 'selected' => $config['default_charset']
-        ))
-      );
-    }
-
-    if (!isset($no_override['show_images'])) {
-      $field_id = 'rcmfd_show_images';
-      $input_show_images = new html_select(array('name' => '_show_images', 'id' => $field_id,
-        'disabled' => !$config['prefer_html']));
-      $input_show_images->add(rcube_label('never'), 0);
-      $input_show_images->add(rcube_label('fromknownsenders'), 1);
-      $input_show_images->add(rcube_label('always'), 2);
-
-      $blocks['main']['options']['show_images'] = array(
-        'title' => html::label($field_id, Q(rcube_label('showremoteimages'))),
-        'content' => $input_show_images->show($config['prefer_html'] ? $config['show_images'] : 0),
-      );
-    }
-
-    if (!isset($no_override['inline_images'])) {
-      $field_id = 'rcmfd_inline_images';
-      $input_inline_images = new html_checkbox(array('name' => '_inline_images', 'id' => $field_id, 'value' => 1));
-
-      $blocks['main']['options']['inline_images'] = array(
-        'title' => html::label($field_id, Q(rcube_label('showinlineimages'))),
-        'content' => $input_inline_images->show($config['inline_images']?1:0),
-      );
-    }
-
-    // "display after delete" checkbox
-    if (!isset($no_override['display_next'])) {
-      $field_id = 'rcmfd_displaynext';
-      $input_displaynext = new html_checkbox(array('name' => '_display_next', 'id' => $field_id, 'value' => 1));
-
-      $blocks['main']['options']['display_next'] = array(
-        'title' => html::label($field_id, Q(rcube_label('displaynext'))),
-        'content' => $input_displaynext->show($config['display_next']?1:0),
-      );
-    }
-
-    break;
-
-    // Mail composition
-    case 'compose':
-
-    $blocks = array(
-      'main'       => array('name' => Q(rcube_label('mainoptions'))),
-      'spellcheck' => array('name' => Q(rcube_label('spellcheckoptions'))),
-      'sig'        => array('name' => Q(rcube_label('signatureoptions'))),
-    );
-
-    // show checkbox to compose messages in a new window
-    if (!isset($no_override['compose_extwin'])) {
-      $field_id = 'rcmfdcompose_extwin';
-      $input_compextwin = new html_checkbox(array('name' => '_compose_extwin', 'id' => $field_id, 'value' => 1));
-
-      $blocks['main']['options']['compose_extwin'] = array(
-        'title' => html::label($field_id, Q(rcube_label('composeextwin'))),
-        'content' => $input_compextwin->show($config['compose_extwin']?1:0),
-      );
-    }
-
-    if (!isset($no_override['htmleditor'])) {
-      $field_id = 'rcmfd_htmleditor';
-      $select_htmleditor = new html_select(array('name' => '_htmleditor', 'id' => $field_id));
-      $select_htmleditor->add(rcube_label('never'), 0);
-      $select_htmleditor->add(rcube_label('always'), 1);
-      $select_htmleditor->add(rcube_label('htmlonreply'), 2);
-      $select_htmleditor->add(rcube_label('htmlonreplyandforward'), 3);
-
-      $blocks['main']['options']['htmleditor'] = array(
-        'title' => html::label($field_id, Q(rcube_label('htmleditor'))),
-        'content' => $select_htmleditor->show(intval($config['htmleditor'])),
-      );
-    }
-
-    if (!isset($no_override['draft_autosave'])) {
-      $field_id = 'rcmfd_autosave';
-      $select_autosave = new html_select(array('name' => '_draft_autosave', 'id' => $field_id, 'disabled' => empty($config['drafts_mbox'])));
-      $select_autosave->add(rcube_label('never'), 0);
-      foreach (array(1, 3, 5, 10) as $i => $min)
-        $select_autosave->add(rcube_label(array('name' => 'everynminutes', 'vars' => array('n' => $min))), $min*60);
-
-      $blocks['main']['options']['draft_autosave'] = array(
-        'title' => html::label($field_id, Q(rcube_label('autosavedraft'))),
-        'content' => $select_autosave->show($config['draft_autosave']),
-      );
-    }
-
-    if (!isset($no_override['mime_param_folding'])) {
-      $field_id = 'rcmfd_param_folding';
-      $select_param_folding = new html_select(array('name' => '_mime_param_folding', 'id' => $field_id));
-      $select_param_folding->add(rcube_label('2231folding'), 0);
-      $select_param_folding->add(rcube_label('miscfolding'), 1);
-      $select_param_folding->add(rcube_label('2047folding'), 2);
-
-      $blocks['main']['options']['mime_param_folding'] = array(
-        'advanced' => true,
-        'title' => html::label($field_id, Q(rcube_label('mimeparamfolding'))),
-        'content' => $select_param_folding->show($config['mime_param_folding']),
-      );
-    }
 
-    if (!isset($no_override['force_7bit'])) {
-      $field_id = 'rcmfd_force_7bit';
-      $input_7bit = new html_checkbox(array('name' => '_force_7bit', 'id' => $field_id, 'value' => 1));
+        $found = false;
+        $data  = $RCMAIL->plugins->exec_hook('preferences_list',
+            array('section' => $sect['id'], 'blocks' => $blocks, 'current' => $current));
 
-      $blocks['main']['options']['force_7bit'] = array(
-        'title' => html::label($field_id, Q(rcube_label('force7bit'))),
-        'content' => $input_7bit->show($config['force_7bit']?1:0),
-      );
-    }
-
-    if (!isset($no_override['mdn_default'])) {
-      $field_id = 'rcmfd_mdn_default';
-      $input_mdn = new html_checkbox(array('name' => '_mdn_default', 'id' => $field_id, 'value' => 1));
-
-      $blocks['main']['options']['mdn_default'] = array(
-        'title' => html::label($field_id, Q(rcube_label('reqmdn'))),
-        'content' => $input_mdn->show($config['mdn_default']?1:0),
-      );
-    }
-
-    if (!isset($no_override['dsn_default'])) {
-      $field_id = 'rcmfd_dsn_default';
-      $input_dsn = new html_checkbox(array('name' => '_dsn_default', 'id' => $field_id, 'value' => 1));
-
-      $blocks['main']['options']['dsn_default'] = array(
-        'title' => html::label($field_id, Q(rcube_label('reqdsn'))),
-        'content' => $input_dsn->show($config['dsn_default']?1:0),
-      );
-    }
-
-    if (!isset($no_override['reply_same_folder'])) {
-      $field_id = 'rcmfd_reply_same_folder';
-      $input_reply_same_folder = new html_checkbox(array('name' => '_reply_same_folder', 'id' => $field_id, 'value' => 1));
-
-      $blocks['main']['options']['reply_same_folder'] = array(
-        'title' => html::label($field_id, Q(rcube_label('replysamefolder'))),
-        'content' => $input_reply_same_folder->show($config['reply_same_folder']?1:0),
-      );
-    }
-
-    if (!isset($no_override['reply_mode'])) {
-      $field_id = 'rcmfd_reply_mode';
-      $select_replymode = new html_select(array('name' => '_reply_mode', 'id' => $field_id,
-        'onchange' => "\$('#rcmfd_sig_above').attr('disabled',this.selectedIndex<2)"));
-      $select_replymode->add(rcube_label('replyempty'), -1);
-      $select_replymode->add(rcube_label('replybottomposting'), 0);
-      $select_replymode->add(rcube_label('replytopposting'), 1);
-
-      $blocks['main']['options']['reply_mode'] = array(
-        'title' => html::label($field_id, Q(rcube_label('whenreplying'))),
-        'content' => $select_replymode->show(intval($config['reply_mode'])),
-      );
-    }
-
-    if (!isset($no_override['spellcheck_before_send']) && $config['enable_spellcheck']) {
-      $field_id = 'rcmfd_spellcheck_before_send';
-      $input_spellcheck = new html_checkbox(array('name' => '_spellcheck_before_send', 'id' => $field_id, 'value' => 1));
-
-      $blocks['spellcheck']['options']['spellcheck_before_send'] = array(
-        'title' => html::label($field_id, Q(rcube_label('spellcheckbeforesend'))),
-        'content' => $input_spellcheck->show($config['spellcheck_before_send']?1:0),
-      );
-    }
-
-    if ($config['enable_spellcheck']) {
-      foreach (array('syms', 'nums', 'caps') as $key) {
-        $key = 'spellcheck_ignore_'.$key;
-        if (!isset($no_override[$key])) {
-          $input_spellcheck = new html_checkbox(array('name' => '_'.$key, 'id' => 'rcmfd_'.$key, 'value' => 1));
-
-          $blocks['spellcheck']['options'][$key] = array(
-            'title' => html::label($field_id, Q(rcube_label(str_replace('_', '', $key)))),
-            'content' => $input_spellcheck->show($config[$key]?1:0),
-          );
+        // create output
+        foreach ($data['blocks'] as $block) {
+            if (!empty($block['content']) || !empty($block['options'])) {
+                $found = true;
+                break;
+            }
         }
-      }
-    }
 
-    if (!isset($no_override['show_sig'])) {
-      $field_id = 'rcmfd_show_sig';
-      $select_show_sig = new html_select(array('name' => '_show_sig', 'id' => $field_id));
-      $select_show_sig->add(rcube_label('never'), 0);
-      $select_show_sig->add(rcube_label('always'), 1);
-      $select_show_sig->add(rcube_label('newmessageonly'), 2);
-      $select_show_sig->add(rcube_label('replyandforwardonly'), 3);
-
-      $blocks['sig']['options']['show_sig'] = array(
-        'title' => html::label($field_id, Q(rcube_label('autoaddsignature'))),
-        'content' => $select_show_sig->show($RCMAIL->config->get('show_sig', 1)),
-      );
+        if (!$found)
+            unset($sections[$idx]);
+        else
+            $sections[$idx]['blocks'] = $data['blocks'];
     }
 
-    if (!isset($no_override['sig_above'])) {
-      $field_id = 'rcmfd_sig_above';
-      $select_sigabove = new html_select(array('name' => '_sig_above', 'id' => $field_id, 'disabled' => $config['reply_mode'] < 1));
-      $select_sigabove->add(rcube_label('belowquote'), 0);
-      $select_sigabove->add(rcube_label('abovequote'), 1);
-
-      $blocks['sig']['options']['sig_above'] = array(
-        'title' => html::label($field_id, Q(rcube_label('replysignaturepos'))),
-        'content' => $select_sigabove->show($config['sig_above']?1:0),
-      );
-    }
-
-    if (!isset($no_override['strip_existing_sig'])) {
-      $field_id = 'rcmfd_strip_existing_sig';
-      $input_stripexistingsig = new html_checkbox(array('name' => '_strip_existing_sig', 'id' => $field_id, 'value' => 1));
-
-      $blocks['sig']['options']['strip_existing_sig'] = array(
-        'title' => html::label($field_id, Q(rcube_label('replyremovesignature'))),
-        'content' => $input_stripexistingsig->show($config['strip_existing_sig']?1:0),
-      );
-    }
-
-    if (!isset($no_override['forward_attachment'])) {
-      $field_id = 'rcmfd_forward_attachment';
-      $select = new html_select(array('name' => '_forward_attachment', 'id' => $field_id));
-      $select->add(rcube_label('inline'), 0);
-      $select->add(rcube_label('asattachment'), 1);
-
-      $blocks['main']['options']['forward_attachment'] = array(
-        'title' => html::label($field_id, Q(rcube_label('forwardmode'))),
-        'content' => $select->show(intval($config['forward_attachment'])),
-      );
-    }
-
-    if (!isset($no_override['default_font'])) {
-      $field_id     = 'rcmfd_default_font';
-      $fonts        = rcube_fontdefs();
-      $default_font = $config['default_font'] ? $config['default_font'] : 'Verdana';
-
-      $select = '<select name="_default_font" id="'.$field_id.'">';
-      foreach ($fonts as $fname => $font)
-        $select .= '<option value="'.$fname.'"'
-          . ($fname == $default_font ? ' selected="selected"' : '')
-          . ' style=\'font-family: ' . $font . '\'>'
-          . Q($fname) . '</option>';
-      $select .= '</select>';
-
-      $blocks['main']['options']['default_font'] = array(
-        'title' => html::label($field_id, Q(rcube_label('defaultfont'))),
-        'content' => $select
-      );
-    }
-
-    break;
-
-
-    // Addressbook config
-    case 'addressbook':
-
-    $blocks = array(
-      'main' => array('name' => Q(rcube_label('mainoptions'))),
-    );
-
-    if (!isset($no_override['default_addressbook'])
-      && ($books = $RCMAIL->get_address_sources(true, true))
-    ) {
-      $field_id = 'rcmfd_default_addressbook';
-      $select_abook = new html_select(array('name' => '_default_addressbook', 'id' => $field_id));
-
-      foreach ($books as $book) {
-        $select_abook->add(html_entity_decode($book['name'], ENT_COMPAT, 'UTF-8'), $book['id']);
-      }
-
-      $blocks['main']['options']['default_addressbook'] = array(
-        'title' => html::label($field_id, Q(rcube_label('defaultabook'))),
-        'content' => $select_abook->show($config['default_addressbook']),
-      );
-    }
-
-    // show addressbook listing mode selection
-    if (!isset($no_override['addressbook_name_listing'])) {
-      $field_id = 'rcmfd_addressbook_name_listing';
-      $select_listing = new html_select(array('name' => '_addressbook_name_listing', 'id' => $field_id));
-      $select_listing->add(rcube_label('name'), 0);
-      $select_listing->add(rcube_label('firstname') . ' '  . rcube_label('surname'), 1);
-      $select_listing->add(rcube_label('surname')   . ' '  . rcube_label('firstname'), 2);
-      $select_listing->add(rcube_label('surname')   . ', ' . rcube_label('firstname'), 3);
-
-      $blocks['main']['options']['list_name_listing'] = array(
-        'title' => html::label($field_id, Q(rcube_label('listnamedisplay'))),
-        'content' => $select_listing->show($config['addressbook_name_listing']),
-      );
-    }
-
-    // show addressbook sort column
-    if (!isset($no_override['addressbook_sort_col'])) {
-      $field_id = 'rcmfd_addressbook_sort_col';
-      $select_sort = new html_select(array('name' => '_addressbook_sort_col', 'id' => $field_id));
-      $select_sort->add(rcube_label('name'), 'name');
-      $select_sort->add(rcube_label('firstname'), 'firstname');
-      $select_sort->add(rcube_label('surname'), 'surname');
-
-      $blocks['main']['options']['sort_col'] = array(
-        'title' => html::label($field_id, Q(rcube_label('listsorting'))),
-        'content' => $select_sort->show($config['addressbook_sort_col']),
-      );
-    }
-
-    // show addressbook page size selection
-    if (!isset($no_override['addressbook_pagesize'])) {
-      $field_id = 'rcmfd_addressbook_pagesize';
-      $input_pagesize = new html_inputfield(array('name' => '_addressbook_pagesize', 'id' => $field_id, 'size' => 5));
-
-      $size = intval($config['addressbook_pagesize'] ? $config['addressbook_pagesize'] : $config['pagesize']);
-
-      $blocks['main']['options']['pagesize'] = array(
-        'title' => html::label($field_id, Q(rcube_label('pagesize'))),
-        'content' => $input_pagesize->show($size ? $size : 50),
-      );
-    }
-
-    if (!isset($no_override['autocomplete_single'])) {
-      $field_id = 'rcmfd_autocomplete_single';
-      $checkbox = new html_checkbox(array('name' => '_autocomplete_single', 'id' => $field_id, 'value' => 1));
-
-      $blocks['main']['options']['autocomplete_single'] = array(
-        'title' => html::label($field_id, Q(rcube_label('autocompletesingle'))),
-        'content' => $checkbox->show($config['autocomplete_single']?1:0),
-      );
-    }
-
-    break;
-
-    // Special IMAP folders
-    case 'folders':
-
-    $blocks = array(
-      'main' => array('name' => Q(rcube_label('mainoptions'))),
-    );
-
-    // Configure special folders
-    if (!isset($no_override['default_folders'])) {
-      // load folders list only when needed
-      if ($current) {
-        $select = rcmail_mailbox_select(array(
-          'noselection'   => '---',
-          'realnames'     => true,
-          'maxlength'     => 30,
-          'folder_filter' => 'mail',
-          'folder_rights' => 'w',
-          // #1486114, #1488279
-          'onchange'      => "if ($(this).val() == 'INBOX') $(this).val('')",
-        ));
-      }
-      else // dummy select
-        $select = new html_select();
-
-      if (!isset($no_override['drafts_mbox']))
-        $blocks['main']['options']['drafts_mbox'] = array(
-          'title' => Q(rcube_label('drafts')),
-          'content' => $select->show($config['drafts_mbox'], array('name' => "_drafts_mbox")),
-        );
-
-      if (!isset($no_override['sent_mbox']))
-        $blocks['main']['options']['sent_mbox'] = array(
-          'title' => Q(rcube_label('sent')),
-          'content' => $select->show($config['sent_mbox'], array('name' => "_sent_mbox")),
-	);
-
-      if (!isset($no_override['junk_mbox']))
-        $blocks['main']['options']['junk_mbox'] = array(
-          'title' => Q(rcube_label('junk')),
-          'content' => $select->show($config['junk_mbox'], array('name' => "_junk_mbox")),
-	);
-
-      if (!isset($no_override['trash_mbox']))
-        $blocks['main']['options']['trash_mbox'] = array(
-          'title' => Q(rcube_label('trash')),
-          'content' => $select->show($config['trash_mbox'], array('name' => "_trash_mbox")),
-        );
-    }
-
-    break;
-
-    // Server settings
-    case 'server':
-
-    $blocks = array(
-      'main' => array('name' => Q(rcube_label('mainoptions'))),
-      'maintenance' => array('name' => Q(rcube_label('maintenance'))),
-    );
-
-    if (!isset($no_override['read_when_deleted'])) {
-      $field_id = 'rcmfd_read_deleted';
-      $input_readdeleted = new html_checkbox(array('name' => '_read_when_deleted', 'id' => $field_id, 'value' => 1));
-
-      $blocks['main']['options']['read_when_deleted'] = array(
-        'title' => html::label($field_id, Q(rcube_label('readwhendeleted'))),
-        'content' => $input_readdeleted->show($config['read_when_deleted']?1:0),
-      );
-    }
-
-    if (!isset($no_override['flag_for_deletion'])) {
-      $field_id = 'rcmfd_flag_for_deletion';
-      $input_flagfordeletion = new html_checkbox(array('name' => '_flag_for_deletion', 'id' => $field_id, 'value' => 1));
-
-      $blocks['main']['options']['flag_for_deletion'] = array(
-        'title' => html::label($field_id, Q(rcube_label('flagfordeletion'))),
-        'content' => $input_flagfordeletion->show($config['flag_for_deletion']?1:0),
-      );
-    }
-
-    // don't show deleted messages
-    if (!isset($no_override['skip_deleted'])) {
-      $field_id = 'rcmfd_skip_deleted';
-      $input_purge = new html_checkbox(array('name' => '_skip_deleted', 'id' => $field_id, 'value' => 1));
-
-      $blocks['main']['options']['skip_deleted'] = array(
-        'title' => html::label($field_id, Q(rcube_label('skipdeleted'))),
-        'content' => $input_purge->show($config['skip_deleted']?1:0),
-      );
-    }
-
-    if (!isset($no_override['delete_always'])) {
-      $field_id = 'rcmfd_delete_always';
-      $input_delete_always = new html_checkbox(array('name' => '_delete_always', 'id' => $field_id, 'value' => 1));
-
-      $blocks['main']['options']['delete_always'] = array(
-        'title' => html::label($field_id, Q(rcube_label('deletealways'))),
-        'content' => $input_delete_always->show($config['delete_always']?1:0),
-      );
-    }
-
-    if (!isset($no_override['delete_junk'])) {
-      $field_id = 'rcmfd_delete_junk';
-      $input_delete_junk = new html_checkbox(array('name' => '_delete_junk', 'id' => $field_id, 'value' => 1));
-
-      $blocks['main']['options']['delete_junk'] = array(
-        'title' => html::label($field_id, Q(rcube_label('deletejunk'))),
-        'content' => $input_delete_junk->show($config['delete_junk']?1:0),
-      );
-    }
-
-    // Trash purging on logout
-    if (!isset($no_override['logout_purge'])) {
-      $field_id = 'rcmfd_logout_purge';
-      $input_purge = new html_checkbox(array('name' => '_logout_purge', 'id' => $field_id, 'value' => 1));
-
-      $blocks['maintenance']['options']['logout_purge'] = array(
-        'title' => html::label($field_id, Q(rcube_label('logoutclear'))),
-        'content' => $input_purge->show($config['logout_purge']?1:0),
-      );
-    }
-
-    // INBOX compacting on logout
-    if (!isset($no_override['logout_expunge'])) {
-      $field_id = 'rcmfd_logout_expunge';
-      $input_expunge = new html_checkbox(array('name' => '_logout_expunge', 'id' => $field_id, 'value' => 1));
-
-      $blocks['maintenance']['options']['logout_expunge'] = array(
-        'title' => html::label($field_id, Q(rcube_label('logoutcompact'))),
-        'content' => $input_expunge->show($config['logout_expunge']?1:0),
-      );
-    }
-
-    break;
-    }
-
-    $data = $RCMAIL->plugins->exec_hook('preferences_list', array('section' => $sect['id'], 'blocks' => $blocks));
-    $found = false;
-
-    // create output
-    foreach ($data['blocks'] as $block) {
-      if (!empty($block['content']) || !empty($block['options'])) {
-        $found = true;
-	    break;
-      }
-    }
-
-    if (!$found)
-      unset($sections[$idx]);
-    else
-      $sections[$idx]['blocks'] = $data['blocks'];
-  }
-
-  return array($sections, $plugin['cols']);
+    return array($sections, $plugin['cols']);
 }
 
 
 function rcmail_get_skins()
 {
-  $path = 'skins';
-  $skins = array();
-
-  $dir = opendir($path);
+    $path  = 'skins';
+    $skins = array();
+    $dir   = opendir($path);
 
-  if (!$dir)
-	return false;
+    if (!$dir) {
+        return false;
+    }
 
-  while (($file = readdir($dir)) !== false)
-  {
-    $filename = $path.'/'.$file;
-    if (!preg_match('/^\./', $file) && is_dir($filename) && is_readable($filename))
-      $skins[] = $file;
-  }
+    while (($file = readdir($dir)) !== false) {
+        $filename = $path.'/'.$file;
+        if (!preg_match('/^\./', $file) && is_dir($filename) && is_readable($filename)) {
+            $skins[] = $file;
+        }
+    }
 
-  closedir($dir);
+    closedir($dir);
 
-  return $skins;
+    return $skins;
 }
 
 
@@ -989,9 +1237,9 @@ function rcmail_update_folder_row($name, $oldname=null, $subscribe=false, $class
 
 // register UI objects
 $OUTPUT->add_handlers(array(
-  'prefsframe' => 'rcmail_preferences_frame',
-  'sectionslist' => 'rcmail_sections_list',
-  'identitieslist' => 'rcmail_identities_list',
+    'prefsframe' => 'rcmail_preferences_frame',
+    'sectionslist' => 'rcmail_sections_list',
+    'identitieslist' => 'rcmail_identities_list',
 ));
 
 // register action aliases
diff --git a/program/steps/settings/save_prefs.inc b/program/steps/settings/save_prefs.inc
index 5daab0d24..19edb41d4 100644
--- a/program/steps/settings/save_prefs.inc
+++ b/program/steps/settings/save_prefs.inc
@@ -34,6 +34,7 @@ switch ($CURR_SECTION)
       'time_format'  => isset($_POST['_time_format']) ? get_input_value('_time_format', RCUBE_INPUT_POST) : ($CONFIG['time_format'] ? $CONFIG['time_format'] : 'H:i'),
       'prettydate'   => isset($_POST['_pretty_date']) ? TRUE : FALSE,
       'refresh_interval' => isset($_POST['_refresh_interval']) ? intval($_POST['_refresh_interval'])*60 : $CONFIG['refresh_interval'],
+      'standard_windows' => isset($_POST['_standard_windows']) ? TRUE : FALSE,
       'skin'         => isset($_POST['_skin']) ? get_input_value('_skin', RCUBE_INPUT_POST) : $CONFIG['skin'],
     );
 
@@ -60,6 +61,7 @@ switch ($CURR_SECTION)
   case 'mailview':
     $a_user_prefs = array(
       'message_extwin'  => intval($_POST['_message_extwin']),
+      'message_show_email' => isset($_POST['_message_show_email']) ? TRUE : FALSE,
       'prefer_html'     => isset($_POST['_prefer_html']) ? TRUE : FALSE,
       'inline_images'   => isset($_POST['_inline_images']) ? TRUE : FALSE,
       'show_images'     => isset($_POST['_show_images']) ? intval($_POST['_show_images']) : 0,
@@ -86,7 +88,6 @@ switch ($CURR_SECTION)
       'show_sig'           => isset($_POST['_show_sig']) ? intval($_POST['_show_sig']) : 1,
       'reply_mode'         => isset($_POST['_reply_mode']) ? intval($_POST['_reply_mode']) : 0,
       'strip_existing_sig' => isset($_POST['_strip_existing_sig']),
-      'sig_above'          => !empty($_POST['_sig_above']) && $_POST['_reply_mode'] > 0,
       'default_font'       => get_input_value('_default_font', RCUBE_INPUT_POST),
       'forward_attachment' => !empty($_POST['_forward_attachment']),
     );
@@ -119,6 +120,8 @@ switch ($CURR_SECTION)
 
   case 'folders':
     $a_user_prefs = array(
+      'show_real_foldernames'  =>
+      isset($_POST['_show_real_foldernames']) ? TRUE : FALSE,
       'drafts_mbox' => get_input_value('_drafts_mbox', RCUBE_INPUT_POST, true),
       'sent_mbox'   => get_input_value('_sent_mbox', RCUBE_INPUT_POST, true),
       'junk_mbox'   => get_input_value('_junk_mbox', RCUBE_INPUT_POST, true),
@@ -158,7 +161,7 @@ switch ($CURR_SECTION)
     $a_user_prefs['timezone'] = (string) $a_user_prefs['timezone'];
 
     if (isset($a_user_prefs['refresh_interval']) && !empty($CONFIG['min_refresh_interval'])) {
-      if ($a_user_prefs['refresh_interval'] > $CONFIG['min_refresh_interval']) {
+      if ($a_user_prefs['refresh_interval'] < $CONFIG['min_refresh_interval']) {
         $a_user_prefs['refresh_interval'] = $CONFIG['min_refresh_interval'];
       }
     }
diff --git a/program/steps/utils/save_pref.inc b/program/steps/utils/save_pref.inc
index b550ad7ef..7def8733d 100644
--- a/program/steps/utils/save_pref.inc
+++ b/program/steps/utils/save_pref.inc
@@ -21,6 +21,22 @@
 
 $name = get_input_value('_name', RCUBE_INPUT_POST);
 $value = get_input_value('_value', RCUBE_INPUT_POST);
+$whitelist = array(
+    'preview_pane',
+    'list_cols',
+    'collapsed_folders',
+    'collapsed_abooks',
+);
+
+if (!in_array($name, array_merge($whitelist, $RCMAIL->plugins->allowed_prefs))) {
+    raise_error(array('code' => 500, 'type' => 'php',
+        'file' => __FILE__, 'line' => __LINE__,
+        'message' => sprintf("Hack attempt detected (user: %s)", $RCMAIL->get_user_name())),
+        true, false);
+
+    $OUTPUT->reset();
+    $OUTPUT->send();
+}
 
 // save preference value
 $RCMAIL->user->save_prefs(array($name => $value));
diff --git a/program/steps/utils/spell.inc b/program/steps/utils/spell.inc
index a0dd35d27..38e4ca285 100644
--- a/program/steps/utils/spell.inc
+++ b/program/steps/utils/spell.inc
@@ -42,6 +42,13 @@ else {
     $result = $spellchecker->get_xml();
 }
 
+if ($err = $spellchecker->error()) {
+    rcube::raise_error(array('code' => 500, 'type' => 'php',
+        'file' => __FILE__, 'line' => __LINE__,
+        'message' => sprintf("Spell check engine error: " . $err)),
+        true, false);
+}
+
 // set response length
 header("Content-Length: " . strlen($result));
 
diff --git a/program/steps/utils/spell_html.inc b/program/steps/utils/spell_html.inc
index 861e4ba48..96b41e230 100644
--- a/program/steps/utils/spell_html.inc
+++ b/program/steps/utils/spell_html.inc
@@ -46,6 +46,11 @@ else if ($request['method'] == 'learnWord') {
 }
 
 if ($error = $spellchecker->error()) {
+    rcube::raise_error(array('code' => 500, 'type' => 'php',
+        'file' => __FILE__, 'line' => __LINE__,
+        'message' => sprintf("Spell check engine error: " . $error)),
+        true, false);
+
     echo '{"error":{"errstr":"' . addslashes($error) . '","errfile":"","errline":null,"errcontext":"","level":"FATAL"}}';
     exit;
 }
diff --git a/skins/classic/addressbook.css b/skins/classic/addressbook.css
index 78314538a..5afa4592f 100644
--- a/skins/classic/addressbook.css
+++ b/skins/classic/addressbook.css
@@ -118,7 +118,7 @@
 
 #directorylistbox input
 {
-  margin: 0px;
+  margin: 0 0 0 20px;
   font-size: 11px;
   width: 90%;
 }
@@ -144,7 +144,8 @@
   width: 280px;
 }
 
-#directorylist
+#directorylist,
+#directorylist li ul
 {
   list-style: none;
   margin: 0;
@@ -152,11 +153,15 @@
   background-color: #FFFFFF;
 }
 
+#directorylist li ul
+{
+  border-top: 1px solid #EBEBEB;
+}
+
 #directorylist li
 {
   display: block;
   font-size: 11px;
-  background: url(images/icons/folders.png) 5px -108px no-repeat;
   border-bottom: 1px solid #EBEBEB;
   white-space: nowrap;
 }
@@ -168,31 +173,37 @@
   padding-left: 25px;
   padding-top: 2px;
   padding-bottom: 2px;
+  height: 16px;
   text-decoration: none;
   white-space: nowrap;
+  background: url(images/icons/folders.png) 5px -108px no-repeat;
 }
 
-#directorylist li.contactgroup
+#directorylist li ul li a
 {
-  padding-left: 15px;
-  background-position: 20px -143px;
+  padding-left: 45px;
 }
 
-#directorylist li.contactsearch
+#directorylist li ul li:last-child
 {
-  background-position: 6px -162px;
+  border-bottom: 0;
 }
 
-#directorylist li.selected
+#directorylist li.contactgroup a
 {
-  background-color: #929292;
-  border-bottom: 1px solid #898989;
+  background-position: 22px -143px;
+}
+
+#directorylist li.contactsearch a
+{
+  background-position: 6px -162px;
 }
 
-#directorylist li.selected a
+#directorylist li.selected > a
 {
   color: #FFF;
   font-weight: bold;
+  background-color: #929292;
 }
 
 #directorylist li.droptarget
diff --git a/skins/classic/common.css b/skins/classic/common.css
index b4adc58a7..1f62fbe07 100644
--- a/skins/classic/common.css
+++ b/skins/classic/common.css
@@ -20,7 +20,7 @@ body.extwin
   margin: 10px;
 }
 
-td, th, div, p, select, input, textarea
+select, input, textarea
 {
   font-size: 12px;
   font-family: inherit;
@@ -622,6 +622,32 @@ table.records-table tr.unfocused td
   background-color: #929292;
 }
 
+ul.treelist li
+{
+  position: relative;
+}
+
+ul.treelist li div.treetoggle
+{
+  position: absolute;
+  left: 8px !important;
+  left: -16px;
+  top: 1px;
+  width: 14px;
+  height: 16px;
+  cursor: pointer;
+}
+
+ul.treelist li div.collapsed
+{
+  background: url(images/icons/collapsed.png) bottom right no-repeat;
+}
+
+ul.treelist li div.expanded
+{
+  background: url(images/icons/expanded.png) bottom right no-repeat;
+}
+
 
 /***** mac-style quicksearch field *****/
 
@@ -666,6 +692,7 @@ table.records-table tr.unfocused td
   font-size: 11px;
   padding: 0px;
   border: none;
+  outline: none;
 }
 
 /***** roundcube webmail pre-defined classes *****/
diff --git a/skins/classic/embed.css b/skins/classic/embed.css
index b9715c77c..6d2c63c6a 100644
--- a/skins/classic/embed.css
+++ b/skins/classic/embed.css
@@ -14,12 +14,16 @@
   font-size: 14px;
   color: #000;
   margin-bottom: .8em;
-  min-height: 20px;
+  min-height: 30px;
   padding: 10px 10px 6px 46px;
   background: url(images/display/icons.png) 6px 3px no-repeat #F7FDCB;
   border: 1px solid #C2D071;
 }
 
+.rcmail-inline-warning {
+  background-position: 6px -92px;
+}
+
 .rcmail-inline-message > button {
   margin-left: 1em;
   vertical-align: baseline;
diff --git a/skins/classic/functions.js b/skins/classic/functions.js
index ee68ee729..d10812c57 100644
--- a/skins/classic/functions.js
+++ b/skins/classic/functions.js
@@ -92,6 +92,7 @@ function rcube_mail_ui()
     forwardmenu:    {id:'forwardmenu', editable:1},
     searchmenu:     {id:'searchmenu', editable:1},
     messagemenu:    {id:'messagemenu'},
+    attachmentmenu: {id:'attachmentmenu'},
     listmenu:       {id:'listmenu', editable:1},
     dragmessagemenu:{id:'dragmessagemenu', sticky:1},
     groupmenu:      {id:'groupoptionsmenu', above:1},
@@ -133,24 +134,24 @@ show_popupmenu: function(popup, show)
 {
   var obj = this.popups[popup].obj,
     above = this.popups[popup].above,
-    ref = rcube_find_object(popup+'link');
+    ref = $(this.popups[popup].link ? this.popups[popup].link : rcube_find_object(popup+'link'));
 
   if (typeof show == 'undefined')
     show = obj.is(':visible') ? false : true;
   else if (this.popups[popup].toggle && show && this.popups[popup].obj.is(':visible') )
     show = false;
 
-  if (show && ref) {
-    var parent = $(ref).parent(),
+  if (show && ref.length) {
+    var parent = ref.parent(),
       win = $(window),
-      pos = parent.hasClass('dropbutton') ? parent.offset() : $(ref).offset();
+      pos = parent.hasClass('dropbutton') ? parent.offset() : ref.offset();
 
-    if (!above && pos.top + ref.offsetHeight + obj.height() > win.height())
+    if (!above && pos.top + ref.height() + obj.height() > win.height())
       above = true;
     if (pos.left + obj.width() > win.width())
       pos.left = win.width() - obj.width() - 30;
 
-    obj.css({ left:pos.left, top:(pos.top + (above ? -obj.height() : ref.offsetHeight)) });
+    obj.css({ left:pos.left, top:(pos.top + (above ? -obj.height() : ref.height())) });
   }
 
   obj[show?'show':'hide']();
@@ -325,7 +326,7 @@ listmenu: function(show)
   };
 },
 
-open_listmenu: function(e)
+open_listmenu: function()
 {
   this.listmenu();
 },
@@ -380,6 +381,35 @@ spellmenu: function(show)
   this.show_popupmenu('spellmenu', show);
 },
 
+show_attachmentmenu: function(elem)
+{
+  var id = elem.parentNode.id.replace(/^attach/, '');
+
+  $('#attachmenuopen').unbind('click').attr('onclick', '').click(function(e) {
+    return rcmail.command('open-attachment', id, this);
+  });
+
+  $('#attachmenudownload').unbind('click').attr('onclick', '').click(function() {
+    rcmail.command('download-attachment', id, this);
+  });
+
+  this.popups.attachmentmenu.link = elem;
+  rcmail.command('menu-open', {menu: 'attachmentmenu', id: id});
+},
+
+menu_open: function(p)
+{
+  if (p && p.props && p.props.menu == 'attachmentmenu')
+    this.show_popup('attachmentmenu');
+  else
+    this.open_listmenu();
+},
+
+menu_save: function(prop)
+{
+  this.save_listmenu();
+},
+
 body_mouseup: function(evt, p)
 {
   var i, target = rcube_event.get_target(evt);
@@ -462,14 +492,18 @@ switch_preview_pane: function(elem)
 /* Message composing */
 init_compose_form: function()
 {
-  var f, field, fields = ['cc', 'bcc', 'replyto', 'followupto'],
+  var f, v, field, fields = ['cc', 'bcc', 'replyto', 'followupto'],
     div = document.getElementById('compose-div'),
     headers_div = document.getElementById('compose-headers-div');
 
   // Show input elements with non-empty value
   for (f=0; f<fields.length; f++) {
-    if ((field = $('#_'+fields[f])) && field.length && field.val() != '')
-      rcmail_ui.show_header_form(fields[f]);
+    v = fields[f]; field = $('#_'+v);
+    if (field.length) {
+      field.on('change', {v:v}, function(e) { if (this.value) rcmail_ui.show_header_form(e.data.v); });
+      if (field.val() != '')
+        rcmail_ui.show_header_form(v);
+    }
   }
 
   // prevent from form data loss when pressing ESC key in IE
@@ -492,6 +526,9 @@ init_compose_form: function()
   div.style.top = (parseInt(headers_div.offsetHeight, 10) + 3) + 'px';
   $(window).resize();
 
+  // fixes contacts-table position when there's more than one addressbook
+  $('#contacts-table').css('top', $('#directorylist').height() + 24 + 'px');
+
   // contacts search submit
   $('#quicksearchbox').keydown(function(e) {
     if (rcube_event.get_keycode(e) == 13)
@@ -584,14 +621,130 @@ prev_sibling: function(elm)
   while (ps && ps.nodeType == 3)
     ps = ps.previousSibling;
   return ps;
+},
+
+enable_command: function(p)
+{
+  if (p.command == 'reply-list') {
+    var label = rcmail.gettext(p.status ? 'replylist' : 'replyall');
+    $('a.button.replyAll').attr('title', label);
+  }
 }
 
 };
 
 /**
- * Scroller
+ * Roundcube generic layer (floating box) class
+ *
+ * @constructor
  */
+function rcube_layer(id, attributes)
+{
+  this.name = id;
+
+  // create a new layer in the current document
+  this.create = function(arg)
+  {
+    var l = (arg.x) ? arg.x : 0,
+      t = (arg.y) ? arg.y : 0,
+      w = arg.width,
+      h = arg.height,
+      z = arg.zindex,
+      vis = arg.vis,
+      parent = arg.parent,
+      obj = document.createElement('DIV');
+
+    obj.id = this.name;
+    obj.style.position = 'absolute';
+    obj.style.visibility = (vis) ? (vis==2) ? 'inherit' : 'visible' : 'hidden';
+    obj.style.left = l+'px';
+    obj.style.top = t+'px';
+    if (w)
+      obj.style.width = w.toString().match(/\%$/) ? w : w+'px';
+    if (h)
+      obj.style.height = h.toString().match(/\%$/) ? h : h+'px';
+    if (z)
+      obj.style.zIndex = z;
+
+    if (parent)
+      parent.appendChild(obj);
+    else
+      document.body.appendChild(obj);
+
+    this.elm = obj;
+  };
+
+  // create new layer
+  if (attributes != null) {
+    this.create(attributes);
+    this.name = this.elm.id;
+  }
+  else  // just refer to the object
+    this.elm = document.getElementById(id);
 
+  if (!this.elm)
+    return false;
+
+
+  // ********* layer object properties *********
+
+  this.css = this.elm.style;
+  this.event = this.elm;
+  this.width = this.elm.offsetWidth;
+  this.height = this.elm.offsetHeight;
+  this.x = parseInt(this.elm.offsetLeft);
+  this.y = parseInt(this.elm.offsetTop);
+  this.visible = (this.css.visibility=='visible' || this.css.visibility=='show' || this.css.visibility=='inherit') ? true : false;
+
+
+  // ********* layer object methods *********
+
+  // move the layer to a specific position
+  this.move = function(x, y)
+  {
+    this.x = x;
+    this.y = y;
+    this.css.left = Math.round(this.x)+'px';
+    this.css.top = Math.round(this.y)+'px';
+  };
+
+  // change the layers width and height
+  this.resize = function(w,h)
+  {
+    this.css.width  = w+'px';
+    this.css.height = h+'px';
+    this.width = w;
+    this.height = h;
+  };
+
+  // show or hide the layer
+  this.show = function(a)
+  {
+    if(a == 1) {
+      this.css.visibility = 'visible';
+      this.visible = true;
+    }
+    else if(a == 2) {
+      this.css.visibility = 'inherit';
+      this.visible = true;
+    }
+    else {
+      this.css.visibility = 'hidden';
+      this.visible = false;
+    }
+  };
+
+  // write new content into a Layer
+  this.write = function(cont)
+  {
+    this.elm.innerHTML = cont;
+  };
+
+};
+
+/**
+ * Scroller
+ */
 function rcmail_scroller(list, top, bottom)
 {
   var ref = this;
@@ -631,8 +784,13 @@ function rcmail_scroller(list, top, bottom)
 function iframe_events()
 {
   // this==iframe
-  var doc = this.contentDocument ? this.contentDocument : this.contentWindow ? this.contentWindow.document : null;
-  rcube_event.add_listener({ element: doc, object:rcmail_ui, method:'body_mouseup', event:'mouseup' });
+  try {
+    var doc = this.contentDocument ? this.contentDocument : this.contentWindow ? this.contentWindow.document : null;
+    rcube_event.add_listener({ element: doc, object:rcmail_ui, method:'body_mouseup', event:'mouseup' });
+  }
+  catch (e) {
+    // catch possible "Permission denied" error in IE
+  };
 };
 
 // Abbreviate mailbox names to fit width of the container
@@ -754,7 +912,7 @@ function percent_indicator(obj, data)
   var bar2 = $('<div>');
   bar2.css({position: 'absolute', top: pos.top + 1, left: pos.left + 1,
       width: width + 'px', height: height + 'px', zIndex: 98})
-	.addClass('quota_bg');
+    .addClass('quota_bg');
 
   if (quota >= limit_high) {
     main.addClass(' quota_text_high');
@@ -797,8 +955,9 @@ function rcube_init_mail_ui()
     .contents().mouseup(function(e){rcmail_ui.body_mouseup(e)});
 
   if (rcmail.env.task == 'mail') {
-    rcmail.addEventListener('menu-open', 'open_listmenu', rcmail_ui);
-    rcmail.addEventListener('menu-save', 'save_listmenu', rcmail_ui);
+    rcmail.addEventListener('enable-command', 'enable_command', rcmail_ui);
+    rcmail.addEventListener('menu-open', 'menu_open', rcmail_ui);
+    rcmail.addEventListener('menu-save', 'menu_save', rcmail_ui);
     rcmail.addEventListener('aftersend-attachment', 'uploadmenu', rcmail_ui);
     rcmail.addEventListener('aftertoggle-editor', 'resize_compose_body_ev', rcmail_ui);
     rcmail.gui_object('message_dragmenu', 'dragmessagemenu');
@@ -808,12 +967,18 @@ function rcube_init_mail_ui()
       rcmail.addEventListener('responseaftergetunread', rcube_render_mailboxlist);
       rcmail.addEventListener('responseaftercheck-recent', rcube_render_mailboxlist);
       rcmail.addEventListener('aftercollapse-folder', rcube_render_mailboxlist);
+      rcmail.addEventListener('afterimport-messages', function(){ rcmail_ui.show_popup('uploadform', false); });
 
       new rcmail_scroller('#mailboxlist-content', '#mailboxlist-title', '#mailboxlist-footer');
     }
 
     if (rcmail.env.action == 'compose')
       rcmail_ui.init_compose_form();
+    else if (rcmail.env.action == 'show' || rcmail.env.action == 'preview')
+      // add menu link for each attachment
+      $('#attachment-list > li[id^="attach"]').each(function() {
+        $(this).append($('<a class="drop">').click(function() { rcmail_ui.show_attachmentmenu(this); }));
+      });
   }
   else if (rcmail.env.task == 'addressbook') {
     rcmail.addEventListener('afterupload-photo', function(){ rcmail_ui.show_popup('uploadform', false); });
diff --git a/skins/classic/iehacks.css b/skins/classic/iehacks.css
index 18555809d..fabf73db6 100644
--- a/skins/classic/iehacks.css
+++ b/skins/classic/iehacks.css
@@ -106,7 +106,7 @@ body.iframe div.messageheaderbox
 
 #quicksearchbar
 {
-  z-index: 250;
+  z-index: 240;
 }
 
 #addresslist,
diff --git a/skins/classic/images/icons/html.png b/skins/classic/images/icons/html.png
new file mode 100644
index 000000000..3f022f678
--- /dev/null
+++ b/skins/classic/images/icons/html.png
diff --git a/skins/classic/images/icons/text.png b/skins/classic/images/icons/text.png
new file mode 100644
index 000000000..94891be80
--- /dev/null
+++ b/skins/classic/images/icons/text.png
diff --git a/skins/classic/mail.css b/skins/classic/mail.css
index 54673fe64..b99c599b4 100644
--- a/skins/classic/mail.css
+++ b/skins/classic/mail.css
@@ -173,13 +173,15 @@
 }
 
 #messagemenu li a.active:hover,
+#attachmentmenu li a.active:hover,
 #markmessagemenu li a.active:hover
 {
   color: #fff;
   background-color: #c00;
 }
 
-#messagemenu li a
+#messagemenu li a,
+#attachmentmenu li a
 {
   background: url(images/messageactions.png) no-repeat 7px 0;
   background-position: 7px 20px;
@@ -190,7 +192,8 @@
   background-position: 7px 1px;
 }
 
-#messagemenu li a.downloadlink
+#messagemenu li a.downloadlink,
+#attachmentmenu li a.downloadlink
 {
   background-position: 7px -17px;
 }
@@ -200,7 +203,8 @@
   background-position: 7px -35px;
 }
 
-#messagemenu li a.openlink
+#messagemenu li a.openlink,
+#attachmentmenu li a.openlink
 {
   background-position: 7px -53px;
 }
@@ -393,32 +397,6 @@
   border-bottom: none;
 }
 
-#mailboxlist li div
-{
-  position: absolute;
-  left: 8px !important;
-  left: -16px;
-  top: 1px;
-  width: 14px;
-  height: 16px;
-}
-
-#mailboxlist li div.collapsed,
-#mailboxlist li div.expanded
-{
-  cursor: pointer;
-}
-
-#mailboxlist li div.collapsed
-{
-  background: url(images/icons/collapsed.png) bottom right no-repeat;
-}
-
-#mailboxlist li div.expanded
-{
-  background: url(images/icons/expanded.png) bottom right no-repeat;
-}
-
 #mailboxlist li.inbox
 {
   background-position: 5px -18px;
@@ -1161,6 +1139,16 @@ table.headers-table tr td.header span
   text-decoration: underline;
 }
 
+#attachment-list li a.drop {
+  background: url(images/icons/down_small.gif) no-repeat center 6px;
+  width: 12px;
+  height: 7px;
+  cursor: pointer;
+  padding: 5px 0 0;
+  margin-left: 3px;
+  display: inline-block;
+}
+
 #messagebody
 {
   position:relative;
@@ -1324,20 +1312,27 @@ div.message-htmlpart div.rcmBody
   text-decoration: underline;
 }
 
-#openextwinlink
+#messagelinks
 {
   position: absolute;
   top: 8px;
   right: 10px;
-  width: 15px;
-  height: 15px;
-  border: 0;
+  height: 16px;
+  text-align: right;
+}
+
+#messageframe #messagelinks
+{
+  top: 2px;
+  right: 2px;
 }
 
 #compose-headers #openextwinlink
 {
-	top: 4px;
-	right: 2px;
+  position: absolute;
+  height: 15px;
+  top: 4px;
+  right: 2px;
 }
 
 #full-headers
@@ -1605,16 +1600,19 @@ input.from_address
   vertical-align: middle;
 }
 
+#upload-form,
 #attachment-form
 {
   padding: 6px;
 }
 
+#upload-form div,
 #attachment-form div
 {
   padding: 2px;
 }
 
+#upload-form div.buttons,
 #attachment-form div.buttons
 {
   margin-top: 4px;
diff --git a/skins/classic/print.css b/skins/classic/print.css
index 34125b0d3..d7e332dba 100644
--- a/skins/classic/print.css
+++ b/skins/classic/print.css
@@ -136,3 +136,32 @@ div.message-part blockquote blockquote blockquote
   border-left: 2px solid #bb0000;
   border-right: 2px solid #bb0000;
 }
+
+p.image-attachment
+{
+  position: relative;
+  padding: 1em;
+  border-top: 1px solid #ccc;
+}
+
+p.image-attachment a.image-link
+{
+  float: left;
+  display: block;
+  margin-right: 2em;
+  min-width: 160px;
+  min-height: 60px;
+  text-align: center;
+}
+
+p.image-attachment .image-filename
+{
+  display: block;
+  line-height: 1.6em;
+}
+
+p.image-attachment .attachment-links
+{
+  display: none;
+}
+
diff --git a/skins/classic/templates/about.html b/skins/classic/templates/about.html
index d84ccbd3c..519acf773 100644
--- a/skins/classic/templates/about.html
+++ b/skins/classic/templates/about.html
@@ -16,7 +16,7 @@
 <div id="license">
 <roundcube:object name="aboutcontent" />
 <h2 class="sysname">Roundcube Webmail <roundcube:object name="version" /></h2>
-<p class="copyright">Copyright &copy; 2005-2012, The Roundcube Dev Team</p>
+<p class="copyright">Copyright &copy; 2005-2013, The Roundcube Dev Team</p>
 <p class="license">This program is free software; you can redistribute it and/or modify
 it under the terms of the <a href="http://www.gnu.org/licenses/gpl.html" target="_blank">GNU General Public License</a>
 as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.<br/>
diff --git a/skins/classic/templates/addressbook.html b/skins/classic/templates/addressbook.html
index 404fb2c11..ba119891c 100644
--- a/skins/classic/templates/addressbook.html
+++ b/skins/classic/templates/addressbook.html
@@ -9,6 +9,7 @@
 #addresslist { width: <roundcube:exp expression="!empty(cookie:addressviewsplitter) ? cookie:addressviewsplitter-5 : 245" />px; }
 #contacts-box { left: <roundcube:exp expression="!empty(cookie:addressviewsplitter) ? cookie:addressviewsplitter+5 : 255" />px;
 	<roundcube:exp expression="browser:ie ? ('width:expression((parseInt(this.parentNode.offsetWidth)-'.(!empty(cookie:addressviewsplitter) ? cookie:addressviewsplitter+5 : 255).')+\\'px\\');') : ''" />
+}
 #directorylistbox { width: <roundcube:exp expression="!empty(cookie:addressviewsplitterd) ? cookie:addressviewsplitterd-5 : 195" />px; }
 #addressscreen { left: <roundcube:exp expression="!empty(cookie:addressviewsplitterd) ? cookie:addressviewsplitterd+5 : 205" />px;
 	<roundcube:exp expression="browser:ie ? ('width:expression((parseInt(this.parentNode.offsetWidth)-'.(!empty(cookie:addressviewsplitterd) ? cookie:addressviewsplitterd+5 : 205).')+\\'px\\');') : ''" />
@@ -63,8 +64,7 @@
 <div id="directorylistbox">
 <div id="directorylist-title" class="boxtitle"><roundcube:label name="groups" /></div>
 <div id="directorylist-content" class="boxlistcontent">
-  <roundcube:object name="directorylist" id="directorylist" />
-  <roundcube:object name="groupslist" id="contactgroupslist" />
+  <roundcube:object name="directorylist" id="directorylist" class="treelist" />
 </div>
 <div id="directorylist-footer" class="boxfooter">
   <roundcube:button command="group-create" type="link" title="newcontactgroup" class="buttonPas addgroup" classAct="button addgroup" content=" " />
diff --git a/skins/classic/templates/compose.html b/skins/classic/templates/compose.html
index 6ca5e2cb5..5b0b47924 100644
--- a/skins/classic/templates/compose.html
+++ b/skins/classic/templates/compose.html
@@ -31,15 +31,15 @@
     <roundcube:button command="list" type="link" class="button back" classAct="button back" classSel="button backSel" title="backtolist" content=" " />
 <roundcube:endif />
     <roundcube:button command="send" type="link" class="buttonPas send" classAct="button send" classSel="button sendSel" title="sendmessage" content=" " />
+    <roundcube:button name="addattachment" type="link" class="button attach" classAct="button attach" classSel="button attachSel" title="addattachment" onclick="rcmail_ui.show_popup('uploadmenu', true);return false" content=" " />
+    <roundcube:button command="insert-sig" type="link" class="buttonPas insertsig" classAct="button insertsig" classSel="button insertsigSel" title="insertsignature" content=" " />
+    <roundcube:button command="savedraft" type="link" class="buttonPas savedraft" classAct="button savedraft" classSel="button savedraftSel" title="savemessage" content=" " />
 <roundcube:if condition="config:enable_spellcheck" />
     <span class="dropbutton">
         <roundcube:button command="spellcheck" type="link" class="buttonPas spellcheck" classAct="button spellcheck" classSel="button spellcheckSel" title="checkspelling" content=" " />
         <span id="spellmenulink" onclick="rcmail_ui.show_popup('spellmenu');return false"></span>
     </span>
 <roundcube:endif />
-    <roundcube:button name="addattachment" type="link" class="button attach" classAct="button attach" classSel="button attachSel" title="addattachment" onclick="rcmail_ui.show_popup('uploadmenu', true);return false" content=" " />
-    <roundcube:button command="insert-sig" type="link" class="buttonPas insertsig" classAct="button insertsig" classSel="button insertsigSel" title="insertsignature" content=" " />
-    <roundcube:button command="savedraft" type="link" class="buttonPas savedraft" classAct="button savedraft" classSel="button savedraftSel" title="savemessage" content=" " />
     <roundcube:container name="toolbar" id="compose-toolbar" />
     <roundcube:button name="messageoptions" id="composemenulink" type="link" class="button messagemenu" title="messageoptions" onclick="rcmail_ui.show_popup('composemenu', true);return false" content=" " />
 </div>
diff --git a/skins/classic/templates/mail.html b/skins/classic/templates/mail.html
index 75a112ff5..c3b4004cc 100644
--- a/skins/classic/templates/mail.html
+++ b/skins/classic/templates/mail.html
@@ -28,7 +28,7 @@
 <div id="mailboxlist-container">
 <div id="mailboxlist-title" class="boxtitle"><roundcube:label name="mailboxlist" /></div>
 <div id="mailboxlist-content"  class="boxlistcontent">
-<roundcube:object name="mailboxlist" id="mailboxlist" folder_filter="mail" />
+<roundcube:object name="mailboxlist" id="mailboxlist" class="treelist" folder_filter="mail" />
 </div>
 <div id="mailboxlist-footer" class="boxfooter">
   <roundcube:button name="mailboxmenulink" id="mailboxmenulink" type="link" title="folderactions" class="button groupactions" onclick="rcmail_ui.show_popup('mailboxmenu');return false" content=" " />
@@ -140,7 +140,8 @@
 <div id="mailboxoptionsmenu" class="popupmenu">
   <ul>
     <li><roundcube:button command="expunge" type="link" label="compact" classAct="active" /></li>
-    <li class="separator_below"><roundcube:button command="purge" type="link" label="empty" classAct="active" /></li>
+    <li><roundcube:button command="purge" type="link" label="empty" classAct="active" /></li>
+    <li class="separator_below"><roundcube:button name="messageimport" type="link" class="active" label="importmessages" id="uploadformlink" onclick="rcmail_ui.show_popup('uploadform', true); return false" /></li>
     <li><roundcube:button command="folders" task="settings" type="link" label="managefolders" classAct="active" /></li>
     <roundcube:container name="mailboxoptions" id="mailboxoptionsmenu" />
   </ul>
@@ -204,5 +205,7 @@
 </div>
 </div>
 
+<roundcube:object name="messageimportform" id="upload-form" attachmentFieldSize="40" class="popupmenu" />
+
 </body>
 </html>
diff --git a/skins/classic/templates/message.html b/skins/classic/templates/message.html
index b9c928f8f..11e58c711 100644
--- a/skins/classic/templates/message.html
+++ b/skins/classic/templates/message.html
@@ -30,7 +30,7 @@
 <div id="mailboxlist-container">
 <div id="mailboxlist-title" class="boxtitle"><roundcube:label name="mailboxlist" /></div>
 <div class="boxlistcontent">
-    <roundcube:object name="mailboxlist" id="mailboxlist" maxlength="25" />
+    <roundcube:object name="mailboxlist" id="mailboxlist" class="treelist" maxlength="25" />
 </div>
 <div class="boxfooter"></div>
 </div>
@@ -39,6 +39,14 @@
 
 <div id="messageframe">
 <div class="boxlistcontent" style="top:0; overflow-x:auto">
+  <div id="messagelinks">
+    <roundcube:if condition="env:optional_format=='text'" />
+      <roundcube:button command="change-format" prop="text" image="/images/icons/text.png" width="15" height="15" title="changeformattext" id="changeformattext" />
+    <roundcube:endif />
+    <roundcube:if condition="env:optional_format=='html'" />
+      <roundcube:button command="change-format" prop="html" image="/images/icons/html.png" width="15" height="15" title="changeformathtml" id="changeformathtml" />
+    <roundcube:endif />
+  </div>
 <roundcube:object name="messageHeaders" class="headers-table" cellspacing="0" cellpadding="2" addicon="/images/icons/silhouette.png" summary="Message headers" />
 <roundcube:object name="messageFullHeaders" id="full-headers" />
 <roundcube:object name="messageAttachments" id="attachment-list" />
@@ -65,5 +73,13 @@
 </script>
 <roundcube:endif />
 
+<div id="attachmentmenu" class="popupmenu">
+  <ul class="toolbarmenu">
+    <li><roundcube:button command="open-attachment" id="attachmenuopen" type="link" label="open" class="openlink" classAct="openlink active" innerclass="openlink" /></li>
+    <li><roundcube:button command="download-attachment" id="attachmenudownload" type="link" label="download" class="downloadlink" classAct="downloadlink active" innerclass="downloadlink" /></li>
+    <roundcube:container name="attachmentmenu" id="attachmentmenu" />
+  </ul>
+</div>
+
 </body>
 </html>
diff --git a/skins/classic/templates/messageerror.html b/skins/classic/templates/messageerror.html
index 918e3092a..d02508942 100644
--- a/skins/classic/templates/messageerror.html
+++ b/skins/classic/templates/messageerror.html
@@ -42,7 +42,7 @@
 <div id="mailboxlist-container">
 <div class="boxtitle"><roundcube:label name="mailboxlist" /></div>
 <div class="boxlistcontent">
-    <roundcube:object name="mailboxlist" id="mailboxlist" folder_filter="mail" />
+    <roundcube:object name="mailboxlist" id="mailboxlist" class="treelist" folder_filter="mail" />
 </div>
 <div class="boxfooter"></div>
 </div>
diff --git a/skins/classic/templates/messagepreview.html b/skins/classic/templates/messagepreview.html
index 78b2306f6..80dbe381a 100644
--- a/skins/classic/templates/messagepreview.html
+++ b/skins/classic/templates/messagepreview.html
@@ -3,11 +3,21 @@
 <head>
 <title><roundcube:object name="pagetitle" /></title>
 <roundcube:include file="/includes/links.html" />
+<script type="text/javascript" src="/splitter.js"></script>
+<script type="text/javascript" src="/functions.js"></script>
 </head>
-<body class="iframe">
+<body class="iframe" onload="rcube_init_mail_ui()">
 
 <div class="messageheaderbox">
-<roundcube:button command="extwin" image="/images/icons/extwin.png" width="15" height="15" title="openinextwin" id="openextwinlink" />
+  <div id="messagelinks">
+    <roundcube:if condition="env:optional_format=='text'" />
+      <roundcube:button command="change-format" prop="text" image="/images/icons/text.png" width="15" height="15" title="changeformattext" id="changeformattext" />
+    <roundcube:endif />
+    <roundcube:if condition="env:optional_format=='html'" />
+      <roundcube:button command="change-format" prop="html" image="/images/icons/html.png" width="15" height="15" title="changeformathtml" id="changeformathtml" />
+    <roundcube:endif />
+    <roundcube:button command="extwin" image="/images/icons/extwin.png" width="15" height="15" title="openinextwin" id="openextwinlink" />
+  </div>
 <roundcube:object name="messageHeaders" class="headers-table" cellspacing="0" cellpadding="2" addicon="/images/icons/silhouette.png" summary="Message headers" />
 <roundcube:object name="messageFullHeaders" id="full-headers" />
 <roundcube:object name="messageAttachments" id="attachment-list" />
@@ -16,5 +26,13 @@
 <roundcube:object name="messageObjects" id="message-objects" />
 <roundcube:object name="messageBody" id="messagebody" />
 
+<div id="attachmentmenu" class="popupmenu">
+  <ul class="toolbarmenu">
+    <li><roundcube:button command="open-attachment" id="attachmenuopen" type="link" label="open" class="openlink" classAct="openlink active" innerclass="openlink" /></li>
+    <li><roundcube:button command="download-attachment" id="attachmenudownload" type="link" label="download" class="downloadlink" classAct="downloadlink active" innerclass="downloadlink" /></li>
+    <roundcube:container name="attachmentmenu" id="attachmentmenu" />
+  </ul>
+</div>
+
 </body>
 </html>
diff --git a/skins/larry/addressbook.css b/skins/larry/addressbook.css
index 54fabfa8b..ff3951497 100644
--- a/skins/larry/addressbook.css
+++ b/skins/larry/addressbook.css
@@ -83,10 +83,23 @@
 	background-position: 6px -766px;
 }
 
-#directorylist li.addressbook.selected a {
+#directorylist li.addressbook.selected > a {
 	background-position: 6px -791px;
 }
 
+#directorylist li.addressbook ul li:last-child {
+	border-bottom: 0;
+}
+
+#directorylist li.addressbook ul.groups {
+	margin: 0;
+	padding: 0;
+}
+
+#directorylist li.addressbook ul.groups li {
+	width: 100%;
+}
+
 #directorylist li.contactgroup a {
 	padding-left: 62px;
 	background-position: 32px -1555px;
@@ -112,6 +125,12 @@
 	margin-left: 8px;
 }
 
+#directorylist li.addressbook div.collapsed,
+#directorylist li.addressbook div.expanded {
+	top: 15px;
+	left: 20px;
+}
+
 #contacts-table .contact td.name {
 	background-position: 6px -1603px;
 }
@@ -317,3 +336,13 @@ a.deletebutton {
 	text-indent: -5000px;
 	background: url(images/buttons.png) -7px -377px no-repeat;
 }
+
+#import-box {
+	position: absolute;
+	bottom: 28px;
+	top: 34px;
+	left: 0;
+	right: 0;
+	overflow: auto;
+	padding: 10px;
+}
diff --git a/skins/larry/iehacks.css b/skins/larry/iehacks.css
index 871cce4fd..960ce7648 100644
--- a/skins/larry/iehacks.css
+++ b/skins/larry/iehacks.css
@@ -29,7 +29,8 @@ input.button.mainaction:active {
 	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#2a2e31', endColorstr='#505050', GradientType=0);
 }
 
-a.button {
+a.button,
+.buttongroup {
 	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f9f9f9', endColorstr='#e6e6e6', GradientType=0);
 }
 
@@ -47,6 +48,10 @@ input.button:active {
 	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#bababa', endColorstr='#d8d8d8', GradientType=0);
 }
 
+.buttongroup a.button.selected {
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#909090', endColorstr='#858585', GradientType=0);
+}
+
 #message.statusbar {
 	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#eaeaea', endColorstr='#c8c8c8', GradientType=0);
 }
diff --git a/skins/larry/images/buttons.gif b/skins/larry/images/buttons.gif
index d8a33d6b2..8a4a78ee4 100644
--- a/skins/larry/images/buttons.gif
+++ b/skins/larry/images/buttons.gif
diff --git a/skins/larry/images/buttons.png b/skins/larry/images/buttons.png
index 4438d9cbc..54bee0156 100644
--- a/skins/larry/images/buttons.png
+++ b/skins/larry/images/buttons.png
diff --git a/skins/larry/includes/footer.html b/skins/larry/includes/footer.html
index ee93fcf57..a4fa69296 100644
--- a/skins/larry/includes/footer.html
+++ b/skins/larry/includes/footer.html
@@ -8,4 +8,16 @@ $(document).ready(function(){
 });
 
 </script>
+<!--[if lte IE 8]>
+<script type="text/javascript">
+
+// fix missing :last-child selectors
+$(document).ready(function(){
+	$('ul.treelist ul').each(function(i,ul){
+		$('li:last-child', ul).css('border-bottom', 0);
+	});
+});
+
+</script>
+<![endif]-->
 
diff --git a/skins/larry/includes/header.html b/skins/larry/includes/header.html
index 5a30020f3..f2efb8e06 100644
--- a/skins/larry/includes/header.html
+++ b/skins/larry/includes/header.html
@@ -10,16 +10,16 @@
 	<roundcube:container name="topline-center" id="topline-center" />
 	<div class="topright">
 	<roundcube:container name="topline-right" id="topline-right" />
-	<roundcube:if condition="!env:extwin" />
+	<roundcube:if condition="!env:extwin &amp;&amp; !env:framed" />
 		<span class="username"><roundcube:object name="username" /></span>
 		<roundcube:button command="logout" label="logout" class="button-logout" />
-	<roundcube:else />
+	<roundcube:elseif condition="env:extwin" />
 		<roundcube:button command="close" label="close" class="closelink" />
 	<roundcube:endif />
 	</div>
 </div>
 
-<roundcube:if condition="!env:extwin" />
+<roundcube:if condition="!env:extwin &amp;&amp; !env:framed" />
 <div id="topnav">
 	<div id="taskbar" class="topright">
 	<roundcube:button command="mail" label="mail" class="button-mail" classSel="button-mail button-selected" innerClass="button-inner" />
diff --git a/skins/larry/mail.css b/skins/larry/mail.css
index b98a89c8b..fe9e56ea3 100644
--- a/skins/larry/mail.css
+++ b/skins/larry/mail.css
@@ -2,7 +2,7 @@
  * Roundcube webmail styles for the Email section
  *
  * Copyright (c) 2012, The Roundcube Dev Team
- * Screendesign by FLINT / B�ro f�r Gestaltung, bueroflint.com
+ * Screendesign by FLINT / Büro für Gestaltung, bueroflint.com
  *
  * The contents are subject to the Creative Commons Attribution-ShareAlike
  * License. It is allowed to copy, distribute, transmit and to adapt the work
@@ -54,6 +54,10 @@
 	border-top: none;
 }
 
+#composeview-right #mailview-bottom {
+	border-radius: 0 0 4px 4px;
+}
+
 #folderlist-header {
 	width: 100%;
 	height: 12px;
@@ -141,7 +145,7 @@ a.iconbutton.threadmode.selected {
 	background-position: 6px 2px;
 }
 
-#mailboxlist li:first-child {
+#mailboxlist > li:first-child {
 	border-radius: 4px 4px 0 0;
 	border-top: 0;
 }
@@ -156,7 +160,7 @@ a.iconbutton.threadmode.selected {
 	background-position: 6px 3px;
 }
 
-#mailboxlist li.mailbox.unread a {
+#mailboxlist li.mailbox.unread > a {
 	padding-right: 36px;
 }
 
@@ -224,6 +228,17 @@ a.iconbutton.threadmode.selected {
 	color: #017cb4;
 }
 
+#mailboxlist li.mailbox div.treetoggle {
+	top: 13px;
+	left: 19px;
+}
+
+#mailboxlist li.mailbox ul li:last-child {
+	border-bottom: 0;
+}
+
+/* nested mailboxes */
+
 #mailboxlist li.mailbox ul {
 	list-style: none;
 	margin: 0;
@@ -231,50 +246,57 @@ a.iconbutton.threadmode.selected {
 	border-top: 1px solid #bbd3da;
 }
 
-#mailboxlist li.mailbox ul li {
-	padding-left: 26px;
-}
-
 #mailboxlist li.mailbox ul li a {
-	background-position: 6px -93px;
+	padding-left: 52px;  /* 36 + 1 x 16 */
+	background-position: 22px -93px;  /* 6 + 1 x 16 */
 }
-
 #mailboxlist li.mailbox ul li.selected > a {
-	background-position: 6px -117px;
+	background-position: 22px -117px;
 }
-
-#mailboxlist li.mailbox ul li:last-child {
-	border-bottom: 0;
+#mailboxlist li.mailbox ul li div.treetoggle {
+	left: 33px;
+	top: 14px;
 }
 
-#mailboxlist li.mailbox div.collapsed,
-#mailboxlist li.mailbox div.expanded {
-	position: absolute;
-	top: 13px;
-	left: 19px;
-	width: 13px;
-	height: 13px;
-	background: url(images/listicons.png) -3px -144px no-repeat;
-	cursor: pointer;
+#mailboxlist li.mailbox ul ul li.mailbox a {
+	padding-left: 68px;  /* 2x */
+	background-position: 38px -93px;
 }
-
-#mailboxlist li.mailbox div.expanded {
-	background-position: -3px -168px;
+#mailboxlist li.mailbox ul ul li.selected > a {
+	background-position: 38px -117px;
 }
-
-#mailboxlist li.mailbox.selected > div.collapsed {
-	background-position: -23px -144px;
+#mailboxlist li.mailbox ul ul li div.treetoggle {
+	left: 48px;
 }
 
-#mailboxlist li.mailbox.selected > div.expanded {
-	background-position: -23px -168px;
+#mailboxlist li.mailbox ul ul ul li.mailbox a {
+	padding-left: 84px;  /* 3x */
+	background-position: 54px -93px;
+}
+#mailboxlist li.mailbox ul ul ul li.selected > a {
+	background-position: 54px -117px;
+}
+#mailboxlist li.mailbox ul ul ul li div.treetoggle {
+	left: 64px;
 }
 
+#mailboxlist li.mailbox ul ul ul ul li.mailbox a {
+	padding-left: 100px;  /* 4x */
+	background-position: 70px -93px;
+}
+#mailboxlist li.mailbox ul ul ul ul li.selected > a {
+	background-position: 70px -117px;
+}
+#mailboxlist li.mailbox ul ul ul ul li div.treetoggle {
+	left: 80px;
+}
 
-#mailboxlist li.mailbox ul li div.collapsed,
-#mailboxlist li.mailbox ul li div.expanded {
-	left: 43px;
-	top: 14px;
+/* indent folders on levels > 4 */
+#mailboxlist li.mailbox ul ul ul ul ul li {
+	padding-left: 16px;
+}
+#mailboxlist li.mailbox ul ul ul ul ul li div.treetoggle {
+	left: 96px;
 }
 
 #mailboxlist li.mailbox .unreadcount {
@@ -438,7 +460,7 @@ a.iconbutton.threadmode.selected {
 }
 
 #messagelist tr td.date {
-	width: 125px;
+	width: 135px;
 }
 
 #messagelist tr.message {
@@ -850,7 +872,7 @@ div.more-headers {
 }
 
 div.hide-headers {
-	background-position: center -1589px;
+	background-position: center -1590px;
 }
 
 #all-headers {
@@ -913,6 +935,10 @@ div.hide-headers {
 	border-radius: 3px;
 }
 
+#messageheader .message-headers {
+	min-height: 60px;
+}
+
 #messageheader #contactphoto {
 	display: block;
 	position: absolute;
@@ -932,7 +958,8 @@ div.hide-headers {
 	border-radius: 4px;
 }
 
-#messageheader #countcontrols {
+#messageheader #countcontrols,
+#messageheader #formatcontrols {
 	position: absolute;
 	top: 8px;
 	right: 8px;
@@ -940,6 +967,11 @@ div.hide-headers {
 	white-space: nowrap;
 }
 
+#messageheader #formatcontrols {
+	top: 38px;
+	right: 8px;
+}
+
 #messageheader .pagenav .countdisplay {
 	min-width: 0;
 	padding-right: 0.5em;
@@ -1010,8 +1042,8 @@ div.message-partheaders {
 div.message-part pre,
 div.message-htmlpart pre,
 div.message-part div.pre {
-	margin: 0px;
-	padding: 0px;
+	margin: 0;
+	padding: 0;
 	font-family: monospace;
 	font-size: 12px;
 	white-space: -moz-pre-wrap !important;
@@ -1020,7 +1052,7 @@ div.message-part div.pre {
 }
 
 div.message-part span.sig {
-	color: #666666;
+	color: #666;
 }
 
 div.message-part blockquote {
@@ -1028,7 +1060,7 @@ div.message-part blockquote {
 	border-left: 2px solid blue;
 	border-right: 2px solid blue;
 	background-color: #F6F6F6;
-	margin: 2px 0px 2px 0px;
+	margin: 2px 0 2px 0;
 	padding: 1px 8px 1px 10px;
 }
 
@@ -1039,9 +1071,9 @@ div.message-part blockquote blockquote {
 }
 
 div.message-part blockquote blockquote blockquote {
-	color: #990000;
-	border-left: 2px solid #bb0000;
-	border-right: 2px solid #bb0000;
+	color: #900;
+	border-left: 2px solid #b00;
+	border-right: 2px solid #b00;
 }
 
 div.message-partheaders {
@@ -1117,9 +1149,9 @@ div.message-partheaders .headers-table td.header {
 #messagepartcontainer {
 	position: absolute;
 	top: 60px;
-	left: 0px;
-	right: 0px;
-	bottom: 0px;
+	left: 0;
+	right: 0;
+	bottom: 0;
 }
 
 #messagepartframe {
diff --git a/skins/larry/print.css b/skins/larry/print.css
index 6481ea9e6..a56c9b938 100644
--- a/skins/larry/print.css
+++ b/skins/larry/print.css
@@ -123,3 +123,28 @@ div.message-part blockquote blockquote blockquote {
 	border-left: 2px solid #b00;
 	border-right: 2px solid #b00;
 }
+
+p.image-attachment {
+	position: relative;
+	padding: 1em;
+	border-top: 1px solid #ccc;
+}
+
+p.image-attachment a.image-link {
+	float: left;
+	display: block;
+	margin-right: 2em;
+	min-width: 160px;
+	min-height: 60px;
+	text-align: center;
+}
+
+p.image-attachment .image-filename {
+	display: block;
+	line-height: 1.6em;
+}
+
+p.image-attachment .attachment-links {
+	display: none;
+}
+
diff --git a/skins/larry/styles.css b/skins/larry/styles.css
index f7adeba38..cfbf9ac5f 100644
--- a/skins/larry/styles.css
+++ b/skins/larry/styles.css
@@ -177,7 +177,8 @@ input.mainaction {
 
 /** link buttons **/
 
-a.button {
+a.button,
+.buttongroup {
 	display: inline-block;
 	margin: 0 2px;
 	padding: 2px 5px;
@@ -198,6 +199,11 @@ a.button {
 	text-decoration: none;
 }
 
+.buttongroup {
+	padding: 0;
+	white-space: nowrap;
+}
+
 a.button:focus,
 input.button:focus {
 	border-color: #4fadd5;
@@ -231,6 +237,29 @@ a.button.disabled span.inner {
 	filter: alpha(opacity=40);
 }
 
+.buttongroup a.button {
+	margin: 0;
+	border-width: 0 1px 0 0;
+	border-radius: 0;
+	background: none;
+	box-shadow: none;
+	-o-box-shadow: none;
+	-webkit-box-shadow: none;
+	-moz-box-shadow: none;
+}
+
+.buttongroup a.button.first,
+.buttongroup a.button:first-child {
+	border-radius: 4px 0 0 4px;
+	border-left: 0;
+}
+
+.buttongroup a.button.last,
+.buttongroup a.button:last-child {
+	border-radius: 0 4px 4px 0;
+	border-right: 0;
+}
+
 a.button.pressed,
 a.button:active,
 input.button:active {
@@ -266,6 +295,21 @@ input.button:active {
 	background: linear-gradient(top, #bababa 0%, #d8d8d8 100%);
 }
 
+.buttongroup a.button.selected,
+.buttongroup a.button.selected:hover {
+	background: #8a8a8a;
+	background: -moz-linear-gradient(top, #909090 0%, #858585 100%);
+	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#909090), color-stop(100%,#858585));
+	background: -o-linear-gradient(top, #909090 0%, #858585 100%);
+	background: -ms-linear-gradient(top, #909090 0%, #858585 100%);
+	background: linear-gradient(top, #909090 0%, #858585 100%);
+	-webkit-box-shadow: inset 0 1px 2px 0 #555;
+	-moz-box-shadow: inset 0 1px 2px 0 #555;
+	box-shadow: inset 0 1px 2px 0 #555;
+	border-right-color: #555;
+	border-left-color: #555;
+}
+
 .pagenav a.button {
 	padding: 1px 3px;
 	height: 16px;
@@ -273,6 +317,12 @@ input.button:active {
 	margin-bottom: 1px;
 }
 
+.pagenav .buttongroup a.button,
+.pagenav .buttongroup a.button:hover {
+	padding: 1px 5px;
+	margin-bottom: 0;
+}
+
 .pagenav a.button span.inner {
 	display: inline-block;
 	width: 16px;
@@ -318,6 +368,20 @@ input.button:active {
 	background-position: -29px -271px;
 }
 
+.pagenav a.changeformat.html span.inner {
+	background-position: -7px -1859px;
+}
+.pagenav a.changeformat.html.selected span.inner {
+	background-position: -29px -1859px;
+}
+
+.pagenav a.changeformat.text span.inner {
+	background-position: -7px -1874px;
+}
+.pagenav a.changeformat.text.selected span.inner {
+	background-position: -29px -1874px;
+}
+
 .pagenav .countdisplay {
 	display: inline-block;
 	padding: 3px 1em 0 1em;
@@ -986,6 +1050,10 @@ ul.listing li {
 	background-color: #d9ecf4;
 }
 
+ul.listing li ul {
+	border-top: 1px solid #bbd3da;
+}
+
 ul.listing li.droptarget,
 table.listing tr.droptarget td {
 	background-color: #e8e798;
@@ -1002,6 +1070,32 @@ table.layout td {
 	vertical-align: top;
 }
 
+ul.treelist li {
+	position: relative;
+}
+
+ul.treelist li div.treetoggle {
+	position: absolute;
+	top: 13px;
+	left: 19px;
+	width: 13px;
+	height: 13px;
+	background: url(images/listicons.png) -3px -144px no-repeat;
+	cursor: pointer;
+}
+
+ul.treelist li div.treetoggle.expanded {
+	background-position: -3px -168px;
+}
+
+ul.treelist li.selected > div.collapsed {
+	background-position: -23px -144px;
+}
+
+ul.treelist li.selected > div.expanded {
+	background-position: -23px -168px;
+}
+
 .listbox .boxfooter {
 	position: absolute;
 	bottom: 0;
@@ -1246,6 +1340,10 @@ body.iframe {
 	margin: 38px 0 10px 0;
 }
 
+body.iframe.error {
+	background: #ededed;
+}
+
 body.iframe.floatingbuttons {
 	margin-bottom: 40px;
 }
@@ -2185,7 +2283,7 @@ ul.toolbarmenu li span.conversation {
 	display: block;
 	color: #333;
 	font-weight: bold;
-	padding: 8px 4px 3px 30px;
+	padding: 8px 15px 3px 30px;
 	text-shadow: 0px 1px 1px #fff;
 	text-decoration: none;
 	white-space: nowrap;
@@ -2193,6 +2291,17 @@ ul.toolbarmenu li span.conversation {
 	text-overflow: ellipsis;
 }
 
+.attachmentslist li a.drop {
+	background: url(images/buttons.png) no-repeat scroll center -1570px;
+	width: 14px;
+	height: 20px;
+	cursor: pointer;
+	position: absolute;
+	right: 0;
+	top: 0;
+	padding: 0;
+}
+
 #compose-attachments ul li {
 	padding-right: 28px;
 }
diff --git a/skins/larry/svggradients.css b/skins/larry/svggradients.css
index 2172ac31a..c40d44f4b 100644
--- a/skins/larry/svggradients.css
+++ b/skins/larry/svggradients.css
@@ -29,7 +29,8 @@ input.button.mainaction:active {
 	background-image: url(svggradient.php?c=2a2e31;505050);
 }
 
-a.button {
+a.button,
+.buttongroup {
 	background-image: url(svggradient.php?c=f9f9f9;e6e6e6);
 }
 
@@ -47,6 +48,10 @@ input.button:active {
 	background-image: url(svggradient.php?c=bababa;d8d8d8);
 }
 
+.buttongroup a.button.selected {
+	background-image: url(svggradient.php?c=909090;858585);
+}
+
 #message.statusbar {
 	background-image: url(svggradient.php?c=eaeaea;c8c8c8);
 }
diff --git a/skins/larry/templates/addressbook.html b/skins/larry/templates/addressbook.html
index 390f8d83b..401640f1f 100644
--- a/skins/larry/templates/addressbook.html
+++ b/skins/larry/templates/addressbook.html
@@ -30,7 +30,7 @@
 <div id="directorylistbox" class="uibox listbox">
 <h2 id="directorylist-header" class="boxtitle"><roundcube:label name="groups" /></h2>
 <div id="directorylist-content" class="scroller withfooter">
-	<roundcube:object name="directorylist" id="directorylist" class="listing" />
+	<roundcube:object name="directorylist" id="directorylist" class="treelist listing" />
 </div>
 <div id="directorylist-footer" class="boxfooter">
 	<roundcube:button command="group-create" type="link" title="newcontactgroup" class="listbutton add disabled" classAct="listbutton add" innerClass="inner" content="+" /><roundcube:button name="groupoptions" id="groupoptionslink" type="link" title="moreactions" class="listbutton groupactions" onclick="UI.show_popup('groupoptions');return false" innerClass="inner" content="&#9881;" />
diff --git a/skins/larry/templates/error.html b/skins/larry/templates/error.html
index cd0fc9656..a65733eb0 100644
--- a/skins/larry/templates/error.html
+++ b/skins/larry/templates/error.html
@@ -4,9 +4,12 @@
 <title><roundcube:object name="pagetitle" /></title>
 <roundcube:include file="/includes/links.html" />
 </head>
-<body>
-
+<roundcube:if condition="!env:framed" />
+<body class="error">
 <roundcube:include file="/includes/header.html" />
+<roundcube:else />
+<body class="error iframe">
+<roundcube:endif />
 
 <div class="uibox centerbox errorbox">
 $__page_content
diff --git a/skins/larry/templates/importcontacts.html b/skins/larry/templates/importcontacts.html
index 89aea0a2e..d3d0f2b93 100644
--- a/skins/larry/templates/importcontacts.html
+++ b/skins/larry/templates/importcontacts.html
@@ -14,20 +14,19 @@
 	<roundcube:button command="list" type="link" class="button back disabled" classAct="button back" classSel="button back pressed" label="back" />
 </div>
 
-<div class="offset uibox contentbox">
+<div id="pluginbody" class="offset uibox contentbox">
 <h2 class="boxtitle"><roundcube:label name="importcontacts" /></h2>
 
-<div class="boxcontent readtext">
+<div id="import-box" class="boxcontent">
 <roundcube:object name="importstep" />
-
 <br/>
-
 <p class="formbuttons">
 	<roundcube:object name="importnav" class="button" />
 </p>
-
 </div>
 
+<roundcube:object name="message" id="message" class="statusbar" />
+
 </div>
 
 <roundcube:include file="/includes/footer.html" />
diff --git a/skins/larry/templates/mail.html b/skins/larry/templates/mail.html
index e145ddff8..575cb792a 100644
--- a/skins/larry/templates/mail.html
+++ b/skins/larry/templates/mail.html
@@ -30,7 +30,7 @@
 <div id="folderlist-header"></div>
 <div id="mailboxcontainer" class="uibox listbox">
 <div id="folderlist-content" class="scroller withfooter">
-<roundcube:object name="mailboxlist" id="mailboxlist" class="listing" folder_filter="mail" unreadwrap="%s" />
+<roundcube:object name="mailboxlist" id="mailboxlist" class="treelist listing" folder_filter="mail" unreadwrap="%s" />
 </div>
 <div id="folderlist-footer" class="boxfooter">
 	<roundcube:button name="mailboxmenulink" id="mailboxmenulink" type="link" title="folderactions" class="listbutton groupactions" onclick="UI.show_popup('mailboxmenu');return false" innerClass="inner" content="&#9881;" />
@@ -148,7 +148,8 @@
 <div id="mailboxmenu" class="popupmenu">
 	<ul class="toolbarmenu" id="mailboxoptionsmenu">
 		<li><roundcube:button command="expunge" type="link" label="compact" classAct="active" /></li>
-		<li class="separator_below"><roundcube:button command="purge" type="link" label="empty" classAct="active" /></li>
+		<li><roundcube:button command="purge" type="link" label="empty" classAct="active" /></li>
+		<li><roundcube:button name="messageimport" type="link" class="active" label="importmessages" onclick="UI.show_uploadform()" /></li>
 		<li><roundcube:button command="folders" task="settings" type="link" label="managefolders" classAct="active" /></li>
 		<roundcube:container name="mailboxoptions" id="mailboxoptionsmenu" />
 	</ul>
@@ -226,6 +227,14 @@
 	</div>
 </div>
 
+<div id="upload-dialog" class="propform popupdialog" title="<roundcube:label name='importmessages' />">
+	<roundcube:object name="messageimportform" id="uploadform" attachmentFieldSize="40" buttons="no" />
+	<div class="formbuttons">
+		<roundcube:button command="import-messages" type="input" class="button mainaction" label="upload" />
+		<roundcube:button name="close" type="input" class="button" label="cancel" onclick="UI.show_uploadform()" />
+	</div>
+</div>
+
 <roundcube:include file="/includes/footer.html" />
 
 </body>
diff --git a/skins/larry/templates/message.html b/skins/larry/templates/message.html
index ae77c0dc0..7ac7e5b55 100644
--- a/skins/larry/templates/message.html
+++ b/skins/larry/templates/message.html
@@ -28,7 +28,7 @@
 <!-- folders list -->
 <div id="mailboxcontainer" class="uibox listbox">
 <div class="scroller">
-<roundcube:object name="mailboxlist" id="mailboxlist" class="listing" folder_filter="mail" unreadwrap="%s" />
+<roundcube:object name="mailboxlist" id="mailboxlist" class="treelist listing" folder_filter="mail" unreadwrap="%s" />
 </div>
 </div>
 
@@ -44,7 +44,9 @@
 <span class="moreheaderstoggle"></span>
 
 <h2 class="subject"><roundcube:object name="messageHeaders" valueOf="subject" /></h2>
+<div class="message-headers">
 <roundcube:object name="messageHeaders" class="headers-table" addicon="/images/addcontact.png" exclude="subject" max="20" />
+</div>
 <roundcube:object name="messageFullHeaders" id="full-headers" />
 
 <!-- record navigation -->
@@ -54,6 +56,21 @@
 	<roundcube:button command="nextmessage" type="link" class="button nextpage disabled" classAct="button nextpage" classSel="button nextpage pressed" innerClass="inner" title="nextmessage" content="&amp;gt;" />
 </div>
 
+<roundcube:if condition="env:optional_format=='text'" />
+<div class="pagenav" id="formatcontrols">
+	<span class="buttongroup">
+		<roundcube:button command="change-format" prop="html" type="link" class="button first changeformat html selected" innerClass="inner" title="changeformathtml" /><roundcube:button command="change-format" prop="text" type="link" class="button last changeformat text" classSel="button last changeformat text pressed" innerClass="inner" title="changeformattext" />
+	</span>
+</div>
+<roundcube:elseif condition="env:optional_format=='html'" />
+<div class="pagenav" id="formatcontrols">
+	<span class="buttongroup">
+		<roundcube:button command="change-format" prop="html" type="link" class="button first changeformat html" classSel="button first changeformat html pressed" innerClass="inner" title="changeformathtml" /><roundcube:button command="change-format" prop="text" type="link" class="button last changeformat text selected" innerClass="inner" title="changeformattext" />
+	</span>
+</div>
+<roundcube:endif />
+
+
 <div id="contactphoto"><roundcube:object name="contactphoto" /></div>
 </div>
 
@@ -73,6 +90,14 @@
 
 </div><!-- end mainscreen -->
 
+<div id="attachmentmenu" class="popupmenu">
+	<ul class="toolbarmenu">
+		<li><roundcube:button command="open-attachment" id="attachmenuopen" type="link" label="open" class="icon" classAct="icon active" innerclass="icon extwin" /></li>
+		<li><roundcube:button command="download-attachment" id="attachmenudownload" type="link" label="download" class="icon" classAct="icon active" innerclass="icon download" /></li>
+		<roundcube:container name="attachmentmenu" id="attachmentmenu" />
+	</ul>
+</div>
+
 <roundcube:include file="/includes/footer.html" />
 
 </body>
diff --git a/skins/larry/templates/messageerror.html b/skins/larry/templates/messageerror.html
index 3c3c9acdb..a735d47f2 100644
--- a/skins/larry/templates/messageerror.html
+++ b/skins/larry/templates/messageerror.html
@@ -28,7 +28,7 @@
 <!-- folders list -->
 <div id="mailboxcontainer" class="uibox listbox">
 <div class="scroller">
-	<roundcube:object name="mailboxlist" id="mailboxlist" class="listing" folder_filter="mail" unreadwrap="%s" />
+	<roundcube:object name="mailboxlist" id="mailboxlist" class="treelist listing" folder_filter="mail" unreadwrap="%s" />
 </div>
 </div>
 
diff --git a/skins/larry/templates/messagepreview.html b/skins/larry/templates/messagepreview.html
index aef282ac9..f69f65125 100644
--- a/skins/larry/templates/messagepreview.html
+++ b/skins/larry/templates/messagepreview.html
@@ -30,6 +30,17 @@
 
 <!-- record navigation -->
 <div id="countcontrols" class="pagenav">
+<roundcube:if condition="env:optional_format=='text'" />
+	<span class="buttongroup">
+		<roundcube:button command="change-format" prop="html" type="link" class="button first changeformat html selected" innerClass="inner" title="changeformathtml" content="HTML" /><roundcube:button command="change-format" prop="text" type="link" class="button last changeformat text" classSel="button changeformat text pressed" innerClass="inner" title="changeformattext" content="Text" />
+	</span>
+	&nbsp;
+<roundcube:elseif condition="env:optional_format=='html'" />
+	<span class="buttongroup">
+		<roundcube:button command="change-format" prop="html" type="link" class="button first changeformat html" classSel="button changeformat html pressed" innerClass="inner" title="changeformathtml" content="HTML" /><roundcube:button command="change-format" prop="text" type="link" class="button last changeformat text selected" innerClass="inner" title="changeformattext" content="Text" />
+	</span>
+	&nbsp;
+<roundcube:endif />
 <roundcube:if condition="env:mailbox != config:drafts_mbox">
 	<roundcube:button command="reply" type="link" class="button reply" classSel="button reply pressed" innerClass="inner" title="replytomessage" content="&lt;-" />
 	<roundcube:button command="reply-all" type="link" class="button replyall" classSel="button replyall pressed" innerClass="inner" title="replytoallmessage" content="&lt;&lt;-" />
@@ -51,6 +62,14 @@
 </div>
 </div>
 
+<div id="attachmentmenu" class="popupmenu">
+	<ul class="toolbarmenu">
+		<li><roundcube:button command="open-attachment" id="attachmenuopen" type="link" label="open" class="icon" classAct="icon active" innerclass="icon extwin" /></li>
+		<li><roundcube:button command="download-attachment" id="attachmenudownload" type="link" label="download" class="icon" classAct="icon active" innerclass="icon download" /></li>
+		<roundcube:container name="attachmentmenu" id="attachmentmenu" />
+	</ul>
+</div>
+
 <roundcube:include file="/includes/footer.html" />
 
 </body>
diff --git a/skins/larry/ui.js b/skins/larry/ui.js
index d2faa3611..ec4d03d00 100644
--- a/skins/larry/ui.js
+++ b/skins/larry/ui.js
@@ -1,7 +1,7 @@
 /**
  * Roundcube functions for default skin interface
  *
- * Copyright (c) 2011, The Roundcube Dev Team
+ * Copyright (c) 2013, The Roundcube Dev Team
  *
  * The contents are subject to the Creative Commons Attribution-ShareAlike
  * License. It is allowed to copy, distribute, transmit and to adapt the work
@@ -17,6 +17,7 @@ function rcube_mail_ui()
   var popupconfig = {
     forwardmenu:        { editable:1 },
     searchmenu:         { editable:1, callback:searchmenu },
+    attachmentmenu:     { },
     listoptions:        { editable:1 },
     dragmessagemenu:    { sticky:1 },
     groupmenu:          { above:1 },
@@ -37,10 +38,12 @@ function rcube_mail_ui()
   this.init_tabs = init_tabs;
   this.show_about = show_about;
   this.show_popup = show_popup;
+  this.add_popup = add_popup;
   this.set_searchmod = set_searchmod;
   this.show_uploadform = show_uploadform;
   this.show_header_row = show_header_row;
   this.hide_header_row = hide_header_row;
+  this.update_quota = update_quota;
 
 
   // set minimal mode on small screens (don't wait for document.ready)
@@ -81,8 +84,8 @@ function rcube_mail_ui()
 
     /***  mail task  ***/
     if (rcmail.env.task == 'mail') {
-      rcmail.addEventListener('menu-open', show_listoptions);
-      rcmail.addEventListener('menu-save', save_listoptions);
+      rcmail.addEventListener('menu-open', menu_open);
+      rcmail.addEventListener('menu-save', menu_save);
       rcmail.addEventListener('responseafterlist', function(e){ switch_view_mode(rcmail.env.threading ? 'thread' : 'list') });
 
       var dragmenu = $('#dragmessagemenu');
@@ -92,9 +95,15 @@ function rcube_mail_ui()
       }
 
       if (rcmail.env.action == 'show' || rcmail.env.action == 'preview') {
+        rcmail.addEventListener('enable-command', enable_command);
         rcmail.addEventListener('aftershow-headers', function() { layout_messageview(); });
         rcmail.addEventListener('afterhide-headers', function() { layout_messageview(); });
-        $('#previewheaderstoggle').click(function(e){ toggle_preview_headers(this); return false });
+        $('#previewheaderstoggle').click(function(e){ toggle_preview_headers(); return false });
+
+        // add menu link for each attachment
+        $('#attachment-list > li').each(function() {
+          $(this).append($('<a class="drop">').click(function() { attachmentmenu(this); }));
+        });
       }
       else if (rcmail.env.action == 'compose') {
         rcmail.addEventListener('aftertoggle-editor', function(){ window.setTimeout(function(){ layout_composeview() }, 200); });
@@ -103,10 +112,14 @@ function rcube_mail_ui()
         layout_composeview();
 
         // Show input elements with non-empty value
-        var field, fields = ['cc', 'bcc', 'replyto', 'followupto'];
-        for (var f=0; f < fields.length; f++) {
-          if ((field = $('#_'+fields[f])) && field.length && field.val() != '')
-            show_header_row(fields[f], true);
+        var f, v, field, fields = ['cc', 'bcc', 'replyto', 'followupto'];
+        for (f=0; f < fields.length; f++) {
+          v = fields[f]; field = $('#_'+v);
+          if (field.length) {
+            field.on('change', {v: v}, function(e) { if (this.value) show_header_row(e.data.v, true); });
+            if (field.val() != '')
+              show_header_row(v, true);
+          }
         }
 
         $('#composeoptionstoggle').click(function(){
@@ -117,7 +130,8 @@ function rcube_mail_ui()
         }).css('cursor', 'pointer');
 
         // toggle compose options if opened in new window and they were visible before
-        if (window.opener && opener.rcmail && opener.rcmail.env.action == 'compose' && $('#composeoptionstoggle', opener.document).hasClass('remove'))
+        var opener_rc = rcmail.opener();
+        if (opener_rc && opener_rc.env.action == 'compose' && $('#composeoptionstoggle', opener.document).hasClass('remove'))
           $('#composeoptionstoggle').click();
 
         new rcube_splitter({ id:'composesplitterv', p1:'#composeview-left', p2:'#composeview-right',
@@ -137,6 +151,8 @@ function rcube_mail_ui()
         new rcube_scroller('#folderlist-content', '#folderlist-header', '#folderlist-footer');
 
         rcmail.addEventListener('setquota', update_quota);
+        rcmail.addEventListener('enable-command', enable_command);
+        rcmail.addEventListener('afterimport-messages', show_uploadform);
       }
 
       if ($('#mailview-left').length) {
@@ -227,7 +243,8 @@ function rcube_mail_ui()
         parent.css('position', 'relative');
 
       // re-set original select width to fix click action and options width in some browsers
-      select.width(overlay.width());
+      if (!bw.mz)
+        select.width(overlay.width());
     });
 
     $(document.body)
@@ -243,8 +260,13 @@ function rcube_mail_ui()
 
     $('iframe').load(function(e){
       // this = iframe
-      var doc = this.contentDocument ? this.contentDocument : this.contentWindow ? this.contentWindow.document : null;
-      $(doc).mouseup(body_mouseup);
+      try {
+        var doc = this.contentDocument ? this.contentDocument : this.contentWindow ? this.contentWindow.document : null;
+        $(doc).mouseup(body_mouseup);
+      }
+      catch (e) {
+        // catch possible "Permission denied" error in IE
+      };
     })
     .contents().mouseup(body_mouseup);
 
@@ -280,28 +302,36 @@ function rcube_mail_ui()
   /**
    * Update UI on window resize
    */
-  function resize()
+  function resize(e)
   {
-    if (rcmail.env.task == 'mail') {
-      if (rcmail.env.action == 'show' || rcmail.env.action == 'preview')
-        layout_messageview();
-      else if (rcmail.env.action == 'compose')
-        layout_composeview();
-    }
+    // resize in intervals to prevent lags and double onresize calls in Chrome (#1489005)
+    var interval = e ? 10 : 0;
+
+    if (rcmail.resize_timeout)
+      window.clearTimeout(rcmail.resize_timeout);
 
-    // make iframe footer buttons float if scrolling is active
-    $('body.iframe .footerleft').each(function(){
-      var footer = $(this),
-        body = $(document.body),
-        floating = footer.hasClass('floating'),
-        overflow = body.outerHeight(true) > $(window).height();
-
-      if (overflow != floating) {
-        var action = overflow ? 'addClass' : 'removeClass';
-        footer[action]('floating');
-        body[action]('floatingbuttons');
+    rcmail.resize_timeout = window.setTimeout(function() {
+      if (rcmail.env.task == 'mail') {
+        if (rcmail.env.action == 'show' || rcmail.env.action == 'preview')
+          layout_messageview();
+        else if (rcmail.env.action == 'compose')
+          layout_composeview();
       }
-    });
+
+      // make iframe footer buttons float if scrolling is active
+      $('body.iframe .footerleft').each(function(){
+        var footer = $(this),
+          body = $(document.body),
+          floating = footer.hasClass('floating'),
+          overflow = body.outerHeight(true) > $(window).height();
+
+        if (overflow != floating) {
+          var action = overflow ? 'addClass' : 'removeClass';
+          footer[action]('floating');
+          body[action]('floatingbuttons');
+        }
+      });
+    }, interval);
   }
 
   /**
@@ -414,6 +444,30 @@ function rcube_mail_ui()
   }
 
 
+  function enable_command(p)
+  {
+    if (p.command == 'reply-list') {
+      var label = rcmail.gettext(p.status ? 'replylist' : 'replyall');
+      if (rcmail.env.action == 'preview')
+        $('a.button.replyall').attr('title', label);
+      else
+        $('a.button.reply-all').text(label).attr('title', label);
+    }
+  }
+
+
+  /**
+   * Register a popup menu
+   */
+  function add_popup(popup, config)
+  {
+    var obj = popups[popup] = $('#'+popup);
+    obj.appendTo(document.body);  // move it to top for proper absolute positioning
+
+    if (obj.length)
+      popupconfig[popup] = $.extend(popupconfig[popup] || {}, config || {});
+  }
+
   /**
    * Trigger for popup menus
    */
@@ -421,7 +475,7 @@ function rcube_mail_ui()
   {
     // auto-register menu object
     if (config || !popupconfig[popup])
-      popupconfig[popup] = $.extend(popupconfig[popup] || {}, config);
+      add_popup(popup, config);
 
     var visible = show_popupmenu(popup, show),
       config = popupconfig[popup];
@@ -436,7 +490,7 @@ function rcube_mail_ui()
   {
     var obj = popups[popup],
       config = popupconfig[popup],
-      ref = $('#'+popup+'link'),
+      ref = $(config.link ? config.link : '#'+popup+'link'),
       above = config.above;
 
     if (!obj) {
@@ -452,7 +506,7 @@ function rcube_mail_ui()
     else if (config.toggle && show && obj.is(':visible'))
       show = false;
 
-    if (show && ref) {
+    if (show && ref.length) {
       var parent = ref.parent(),
         win = $(window),
         pos;
@@ -546,7 +600,7 @@ function rcube_mail_ui()
   /**
    * Switch between short and full headers display in message preview
    */
-  function toggle_preview_headers(button)
+  function toggle_preview_headers()
   {
     $('#preview-shortheaders').toggle();
     var full = $('#preview-allheaders').toggle(),
@@ -575,6 +629,19 @@ function rcube_mail_ui()
 
   /**** popup callbacks ****/
 
+  function menu_open(p)
+  {
+    if (p && p.props && p.props.menu == 'attachmentmenu')
+      show_popupmenu('attachmentmenu');
+    else
+      show_listoptions();
+  }
+
+  function menu_save(prop)
+  {
+    save_listoptions();
+  }
+
   function searchmenu(show)
   {
     if (show && rcmail.env.search_mods) {
@@ -605,6 +672,21 @@ function rcube_mail_ui()
     }
   }
 
+  function attachmentmenu(elem)
+  {
+    var id = elem.parentNode.id.replace(/^attach/, '');
+
+    $('#attachmenuopen').unbind('click').attr('onclick', '').click(function(e) {
+      return rcmail.command('open-attachment', id, this);
+    });
+
+    $('#attachmenudownload').unbind('click').attr('onclick', '').click(function() {
+      rcmail.command('download-attachment', id, this);
+    });
+
+    popupconfig.attachmentmenu.link = elem;
+    rcmail.command('menu-open', {menu: 'attachmentmenu', id: id});
+  }
 
   function spellmenu(show)
   {
@@ -659,8 +741,6 @@ function rcube_mail_ui()
     $('input[name="sort_col"][value="'+rcmail.env.sort_col+'"]').prop('checked', true);
     $('input[name="sort_ord"][value="DESC"]').prop('checked', rcmail.env.sort_order == 'DESC');
     $('input[name="sort_ord"][value="ASC"]').prop('checked', rcmail.env.sort_order != 'DESC');
-    $('input[name="view"][value="thread"]').prop('checked', rcmail.env.threading ? true : false);
-    $('input[name="view"][value="list"]').prop('checked', rcmail.env.threading ? false : true);
 
     // set checkboxes
     $('input[name="list_col[]"]').each(function() {
@@ -675,7 +755,8 @@ function rcube_mail_ui()
       close: function() {
         $dialog.dialog('destroy').hide();
       },
-      width: 650
+      minWidth: 500,
+      width: $dialog.width()+25
     }).show();
   }
 
@@ -689,11 +770,10 @@ function rcube_mail_ui()
 
     var sort = $('input[name="sort_col"]:checked').val(),
       ord = $('input[name="sort_ord"]:checked').val(),
-      thread = $('input[name="view"]:checked').val(),
       cols = $('input[name="list_col[]"]:checked')
         .map(function(){ return this.value; }).get();
 
-    rcmail.set_list_options(cols, sort, ord, thread == 'thread' ? 1 : 0);
+    rcmail.set_list_options(cols, sort, ord, rcmail.env.threading);
   }
 
 
@@ -940,11 +1020,11 @@ function rcube_scroller(list, top, bottom)
   this.delay = 500;
 
   this.top
-    .mouseenter(function() { ref.ts = window.setTimeout(function() { ref.scroll('down'); }, ref.delay); })
+    .mouseenter(function() { if (rcmail.drag_active) ref.ts = window.setTimeout(function() { ref.scroll('down'); }, ref.delay); })
     .mouseout(function() { if (ref.ts) window.clearTimeout(ref.ts); });
 
   this.bottom
-    .mouseenter(function() { ref.ts = window.setTimeout(function() { ref.scroll('up'); }, ref.delay); })
+    .mouseenter(function() { if (rcmail.drag_active) ref.ts = window.setTimeout(function() { ref.scroll('up'); }, ref.delay); })
     .mouseout(function() { if (ref.ts) window.clearTimeout(ref.ts); });
 
   this.scroll = function(dir)
diff --git a/tests/Framework/Mime.php b/tests/Framework/Mime.php
index 1f9a8c58f..4db1856be 100644
--- a/tests/Framework/Mime.php
+++ b/tests/Framework/Mime.php
@@ -39,6 +39,8 @@ class Framework_Mime extends PHPUnit_Framework_TestCase
             19 => 'Test <"test test"@domain.tld>',
             20 => '<"test test"@domain.tld>',
             21 => '"test test"@domain.tld',
+            // invalid (#1489092)
+            22 => '"John Doe @ SomeBusinessName" <MAILER-DAEMON>',
         );
 
         $results = array(
@@ -64,6 +66,8 @@ class Framework_Mime extends PHPUnit_Framework_TestCase
             19 => array(1, 'Test', '"test test"@domain.tld'),
             20 => array(1, '', '"test test"@domain.tld'),
             21 => array(1, '', '"test test"@domain.tld'),
+            // invalid (#1489092)
+            22 => array(1, 'John Doe @ SomeBusinessName', 'MAILER-DAEMON'),
         );
 
         foreach ($headers as $idx => $header) {
@@ -142,4 +146,62 @@ class Framework_Mime extends PHPUnit_Framework_TestCase
 
         $this->assertEquals($unfolded, rcube_mime::unfold_flowed($flowed), "Test correct unfolding of quoted lines");
     }
+
+    /**
+     * Test wordwrap()
+     */
+    function test_wordwrap()
+    {
+        $samples = array(
+            array(
+                array("aaaa aaaa\n           aaaa"),
+                "aaaa aaaa\n           aaaa",
+            ),
+            array(
+                array("123456789 123456789 123456789 123", 29),
+                "123456789 123456789 123456789\n123",
+            ),
+            array(
+                array("123456789   3456789 123456789", 29),
+                "123456789   3456789 123456789",
+            ),
+            array(
+                array("123456789 123456789 123456789   123", 29),
+                "123456789 123456789 123456789\n  123",
+            ),
+            array(
+                array("abc", 1, "\n", true),
+                "a\nb\nc",
+            ),
+            array(
+                array("ąść", 1, "\n", true, 'UTF-8'),
+                "ą\nś\nć",
+            ),
+            array(
+                array(">abc\n>def", 2, "\n", true),
+                ">abc\n>def",
+            ),
+            array(
+                array("abc def", 3, "-"),
+                "abc-def",
+            ),
+            array(
+                array("----------------------------------------------------------------------------------------\nabc                        def123456789012345", 76),
+                "----------------------------------------------------------------------------------------\nabc                        def123456789012345",
+            ),
+            array(
+                array("-------\nabc def", 5),
+                "-------\nabc\ndef",
+            ),
+            array(
+                array("http://xx.xxx.xx.xxx:8080/addressbooks/roundcubexxxxx%40xxxxxxxxxxxxxxxxxxxxxxx.xx.xx/testing/", 70),
+                "http://xx.xxx.xx.xxx:8080/addressbooks/roundcubexxxxx%40xxxxxxxxxxxxxxxxxxxxxxx.xx.xx/testing/",
+            ),
+        );
+
+        foreach ($samples as $sample) {
+            $this->assertEquals($sample[1], call_user_func_array(array('rcube_mime', 'wordwrap'), $sample[0]), "Test text wrapping");
+        }
+    }
+
 }
diff --git a/tests/Framework/StringReplacer.php b/tests/Framework/StringReplacer.php
index e630ebac0..dc7638734 100644
--- a/tests/Framework/StringReplacer.php
+++ b/tests/Framework/StringReplacer.php
@@ -24,19 +24,21 @@ class Framework_StringReplacer extends PHPUnit_Framework_TestCase
     function data_replace()
     {
         return array(
-            array('http://domain.tld/path*path2', '<a href="http://domain.tld/path*path2" target="_blank">http://domain.tld/path*path2</a>'),
-            array("Click this link:\nhttps://mail.xn--brderli-o2a.ch/rc/ EOF", "Click this link:\n<a href=\"https://mail.xn--brderli-o2a.ch/rc/\" target=\"_blank\">https://mail.xn--brderli-o2a.ch/rc/</a> EOF"),
-            array('Start http://localhost/?foo End', 'Start <a href="http://localhost/?foo" target="_blank">http://localhost/?foo</a> End'),
-            array('www.domain.tld', '<a href="http://www.domain.tld" target="_blank">www.domain.tld</a>'),
-            array('WWW.DOMAIN.TLD', '<a href="http://WWW.DOMAIN.TLD" target="_blank">WWW.DOMAIN.TLD</a>'),
-            array('[http://link.com]', '[<a href="http://link.com" target="_blank">http://link.com</a>]'),
-            array('http://link.com?a[]=1', '<a href="http://link.com?a[]=1" target="_blank">http://link.com?a[]=1</a>'),
-            array('http://link.com?a[]', '<a href="http://link.com?a[]" target="_blank">http://link.com?a[]</a>'),
-            array('(http://link.com)', '(<a href="http://link.com" target="_blank">http://link.com</a>)'),
-            array('http://link.com?a(b)c', '<a href="http://link.com?a(b)c" target="_blank">http://link.com?a(b)c</a>'),
-            array('http://link.com?(link)', '<a href="http://link.com?(link)" target="_blank">http://link.com?(link)</a>'),
+            array('http://domain.tld/path*path2', '<a href="http://domain.tld/path*path2">http://domain.tld/path*path2</a>'),
+            array("Click this link:\nhttps://mail.xn--brderli-o2a.ch/rc/ EOF", "Click this link:\n<a href=\"https://mail.xn--brderli-o2a.ch/rc/\">https://mail.xn--brderli-o2a.ch/rc/</a> EOF"),
+            array('Start http://localhost/?foo End', 'Start <a href="http://localhost/?foo">http://localhost/?foo</a> End'),
+            array('www.domain.tld', '<a href="http://www.domain.tld">www.domain.tld</a>'),
+            array('WWW.DOMAIN.TLD', '<a href="http://WWW.DOMAIN.TLD">WWW.DOMAIN.TLD</a>'),
+            array('[http://link.com]', '[<a href="http://link.com">http://link.com</a>]'),
+            array('http://link.com?a[]=1', '<a href="http://link.com?a[]=1">http://link.com?a[]=1</a>'),
+            array('http://link.com?a[]', '<a href="http://link.com?a[]">http://link.com?a[]</a>'),
+            array('(http://link.com)', '(<a href="http://link.com">http://link.com</a>)'),
+            array('http://link.com?a(b)c', '<a href="http://link.com?a(b)c">http://link.com?a(b)c</a>'),
+            array('http://link.com?(link)', '<a href="http://link.com?(link)">http://link.com?(link)</a>'),
             array('http://<test>', 'http://<test>'),
             array('http://', 'http://'),
+            array('1@1.com www.domain.tld', '<a href="mailto:1@1.com">1@1.com</a> <a href="http://www.domain.tld">www.domain.tld</a>'),
+            array(' www.domain.tld ', ' <a href="http://www.domain.tld">www.domain.tld</a> '),
         );
     }
 
diff --git a/tests/Framework/Utils.php b/tests/Framework/Utils.php
index 7c1e92ac8..abfb7cb65 100644
--- a/tests/Framework/Utils.php
+++ b/tests/Framework/Utils.php
@@ -195,6 +195,23 @@ class Framework_Utils extends PHPUnit_Framework_TestCase
     }
 
     /**
+     * Check rcube_utils::explode_quoted_string()
+     */
+    function test_explode_quoted_string()
+    {
+        $data = array(
+            '"a,b"' => array('"a,b"'),
+            '"a,b","c,d"' => array('"a,b"','"c,d"'),
+            '"a,\\"b",d' => array('"a,\\"b"', 'd'),
+        );
+
+        foreach ($data as $text => $res) {
+            $result = rcube_utils::explode_quoted_string(',', $text);
+            $this->assertSame($res, $result);
+        }
+    }
+
+    /**
      * Check rcube_utils::explode_quoted_string() compat. with explode()
      */
     function test_explode_quoted_string_compat()
@@ -229,4 +246,52 @@ class Framework_Utils extends PHPUnit_Framework_TestCase
         }
     }
 
+    /**
+     * rcube:utils::file2class()
+     */
+    function test_file2class()
+    {
+        $test = array(
+            array('', '', 'unknown'),
+            array('text', 'text', 'text'),
+            array('image/png', 'image.png', 'image png'),
+        );
+
+        foreach ($test as $v) {
+            $result = rcube_utils::file2class($v[0], $v[1]);
+            $this->assertSame($v[2], $result);
+        }
+    }
+
+    /**
+     * rcube:utils::strtotime()
+     */
+    function test_strtotime()
+    {
+        $test = array(
+            '1' => 1,
+            '' => 0,
+        );
+
+        foreach ($test as $datetime => $ts) {
+            $result = rcube_utils::strtotime($datetime);
+            $this->assertSame($ts, $result);
+        }
+    }
+
+    /**
+     * rcube:utils::normalize _string()
+     */
+    function test_normalize_string()
+    {
+        $test = array(
+            '' => '',
+            'abc def' => 'abc def',
+        );
+
+        foreach ($test as $input => $output) {
+            $result = rcube_utils::normalize_string($input);
+            $this->assertSame($output, $result);
+        }
+    }
 }
diff --git a/tests/Framework/VCard.php b/tests/Framework/VCard.php
index 15aa5d816..3353b5b13 100644
--- a/tests/Framework/VCard.php
+++ b/tests/Framework/VCard.php
@@ -65,6 +65,20 @@ class Framework_VCard extends PHPUnit_Framework_TestCase
         $this->assertEquals("prefix", $vcard['prefix'], "Decode backslash character");
     }
 
+    /**
+     * Backslash parsing test (#1489085)
+     */
+    function test_parse_five()
+    {
+        $vcard = "BEGIN:VCARD\nVERSION:3.0\nN:last\\\\\\a;fir\\nst\nURL:http\\://domain.tld\nEND:VCARD";
+        $vcard = new rcube_vcard($vcard, null);
+        $vcard = $vcard->get_assoc();
+
+        $this->assertEquals("last\\a", $vcard['surname'], "Decode dummy backslash character");
+        $this->assertEquals("fir\nst", $vcard['firstname'], "Decode backslash character");
+        $this->assertEquals("http://domain.tld", $vcard['website:other'][0], "Decode dummy backslash character");
+    }
+
     function test_import()
     {
         $input = file_get_contents($this->_srcpath('apple.vcf'));
diff --git a/tests/Framework/Washtml.php b/tests/Framework/Washtml.php
index 088ac4a8c..cb7234314 100644
--- a/tests/Framework/Washtml.php
+++ b/tests/Framework/Washtml.php
@@ -18,11 +18,54 @@ class Framework_Washtml extends PHPUnit_Framework_TestCase
             .'<a href="vbscript:alert(document.cookie)">Internet Explorer</a></p>';
 
         $washer = new rcube_washtml;
-
         $washed = $washer->wash($html);
 
         $this->assertNotRegExp('/data:text/', $washed, "Remove data:text/html links");
         $this->assertNotRegExp('/vbscript:/', $washed, "Remove vbscript: links");
     }
 
+    /**
+     * Test fixing of invalid href (#1488940)
+     */
+    function test_href()
+    {
+        $html = "<p><a href=\"\nhttp://test.com\n\">Firefox</a>";
+
+        $washer = new rcube_washtml;
+        $washed = $washer->wash($html);
+
+        $this->assertRegExp('|href="http://test.com">|', $washed, "Link href with newlines (#1488940)");
+    }
+
+    /**
+     * Test handling HTML comments
+     */
+    function test_comments()
+    {
+        $washer = new rcube_washtml;
+
+        $html   = "<!--[if gte mso 10]><p>p1</p><!--><p>p2</p>";
+        $washed = $washer->wash($html);
+
+        $this->assertEquals('<!-- node type 8 --><!-- html ignored --><!-- body ignored --><p>p2</p>', $washed, "HTML conditional comments (#1489004)");
+
+        $html   = "<!--TestCommentInvalid><p>test</p>";
+        $washed = $washer->wash($html);
+
+        $this->assertEquals('<!-- html ignored --><!-- body ignored --><p>test</p>', $washed, "HTML invalid comments (#1487759)");
+    }
+
+    /**
+     * Test fixing of invalid self-closing elements (#1489137)
+     */
+    function test_self_closing()
+    {
+        $html = "<textarea>test";
+
+        $washer = new rcube_washtml;
+        $washed = $washer->wash($html);
+
+        $this->assertRegExp('|<textarea>test</textarea>|', $washed, "Self-closing textarea (#1489137)");
+    }
+
 }
diff --git a/tests/MailFunc.php b/tests/MailFunc.php
index 38c0bac30..319075abd 100644
--- a/tests/MailFunc.php
+++ b/tests/MailFunc.php
@@ -54,7 +54,7 @@ class MailFunc extends PHPUnit_Framework_TestCase
         $this->assertNotRegExp('/<form [^>]+>/', $html, "No form tags allowed");
         $this->assertRegExp('/Subscription form/', $html, "Include <form> contents");
         $this->assertRegExp('/<!-- link ignored -->/', $html, "No external links allowed");
-        $this->assertRegExp('/<a[^>]+ target="_blank">/', $html, "Set target to _blank");
+        $this->assertRegExp('/<a[^>]+ target="_blank"/', $html, "Set target to _blank");
         $this->assertTrue($GLOBALS['REMOTE_OBJECTS'], "Remote object detected");
 
         // render HTML in safe mode
@@ -133,8 +133,8 @@ class MailFunc extends PHPUnit_Framework_TestCase
         $html = rcmail_print_body($part, array('safe' => true));
 
         $this->assertRegExp('/<a href="mailto:nobody@roundcube.net" onclick="return rcmail.command\(\'compose\',\'nobody@roundcube.net\',this\)">nobody@roundcube.net<\/a>/', $html, "Mailto links with onclick");
-        $this->assertRegExp('#<a href="http://www.apple.com/legal/privacy" target="_blank">http://www.apple.com/legal/privacy</a>#', $html, "Links with target=_blank");
-        $this->assertRegExp('#\\[<a href="http://example.com/\\?tx\\[a\\]=5" target="_blank">http://example.com/\\?tx\\[a\\]=5</a>\\]#', $html, "Links with square brackets");
+        $this->assertRegExp('#<a rel="noreferrer" target="_blank" href="http://www.apple.com/legal/privacy">http://www.apple.com/legal/privacy</a>#', $html, "Links with target=_blank");
+        $this->assertRegExp('#\\[<a rel="noreferrer" target="_blank" href="http://example.com/\\?tx\\[a\\]=5">http://example.com/\\?tx\\[a\\]=5</a>\\]#', $html, "Links with square brackets");
     }
 
     /**
@@ -148,7 +148,7 @@ class MailFunc extends PHPUnit_Framework_TestCase
         $html = rcmail_html4inline(rcmail_print_body($part, array('safe' => false)), 'foo');
 
         $mailto = '<a href="mailto:me@me.com?subject=this is the subject&amp;body=this is the body"'
-            .' onclick="return rcmail.command(\'compose\',\'me@me.com?subject=this is the subject&amp;body=this is the body\',this)">e-mail</a>';
+            .' onclick="return rcmail.command(\'compose\',\'me@me.com?subject=this is the subject&amp;body=this is the body\',this)" rel="noreferrer">e-mail</a>';
 
         $this->assertRegExp('|'.preg_quote($mailto, '|').'|', $html, "Extended mailto links");
     }
diff --git a/tests/Selenium/Addressbook/Addressbook.php b/tests/Selenium/Addressbook/Addressbook.php
new file mode 100644
index 000000000..9a22b6e13
--- /dev/null
+++ b/tests/Selenium/Addressbook/Addressbook.php
@@ -0,0 +1,21 @@
+<?php
+
+class Selenium_Addressbook_Addressbook extends Selenium_Test
+{
+    public function testAddressbook()
+    {
+        $this->go('addressbook');
+
+        // check task
+        $env = $this->get_env();
+        $this->assertEquals('addressbook', $env['task']);
+
+        $objects = $this->get_objects();
+
+        // these objects should be there always
+        $this->assertContains('qsearchbox', $objects);
+        $this->assertContains('folderlist', $objects);
+        $this->assertContains('contactslist', $objects);
+        $this->assertContains('countdisplay', $objects);
+    }
+}
diff --git a/tests/Selenium/Addressbook/Import.php b/tests/Selenium/Addressbook/Import.php
new file mode 100644
index 000000000..13d81740f
--- /dev/null
+++ b/tests/Selenium/Addressbook/Import.php
@@ -0,0 +1,29 @@
+<?php
+
+class Selenium_Addressbook_Import extends Selenium_Test
+{
+    public function testImport()
+    {
+        $this->go('addressbook', 'import');
+
+        // check task and action
+        $env = $this->get_env();
+        $this->assertEquals('addressbook', $env['task']);
+        $this->assertEquals('import', $env['action']);
+
+        $objects = $this->get_objects();
+
+        // these objects should be there always
+        $this->assertContains('importform', $objects);
+    }
+
+    public function testImport2()
+    {
+        $this->go('addressbook', 'import');
+
+        $objects = $this->get_objects();
+
+        // these objects should be there always
+        $this->assertContains('importform', $objects);
+    }
+}
diff --git a/tests/Selenium/Login.php b/tests/Selenium/Login.php
new file mode 100644
index 000000000..a3f0ab6b4
--- /dev/null
+++ b/tests/Selenium/Login.php
@@ -0,0 +1,21 @@
+<?php
+
+class Selenium_Login extends Selenium_Test
+{
+    public function testLogin()
+    {
+        // first test, we're already on the login page
+        $this->url(TESTS_URL);
+
+        // task should be set to 'login'
+        $env = $this->get_env();
+        $this->assertEquals('login', $env['task']);
+
+        // test valid login
+        $this->login();
+
+        // task should be set to 'mail' now
+        $env = $this->get_env();
+        $this->assertEquals('mail', $env['task']);
+    }
+}
diff --git a/tests/Selenium/Logout.php b/tests/Selenium/Logout.php
new file mode 100644
index 000000000..95eeda57c
--- /dev/null
+++ b/tests/Selenium/Logout.php
@@ -0,0 +1,20 @@
+<?php
+
+class Selenium_Logout extends Selenium_Test
+{
+    public function testLogout()
+    {
+        $this->go('mail');
+
+        $this->click_button('logout');
+
+        sleep(TESTS_SLEEP);
+
+        // task should be set to 'login'
+        $env = $this->get_env();
+        $this->assertEquals('login', $env['task']);
+
+        // form should exist
+        $user_input = $this->byCssSelector('form input[name="_user"]');
+    }
+}
diff --git a/tests/Selenium/Mail/CheckRecent.php b/tests/Selenium/Mail/CheckRecent.php
new file mode 100644
index 000000000..865421c2d
--- /dev/null
+++ b/tests/Selenium/Mail/CheckRecent.php
@@ -0,0 +1,14 @@
+<?php
+
+class Selenium_Mail_CheckRecent extends Selenium_Test
+{
+    public function testCheckRecent()
+    {
+        $this->go('mail');
+
+        $res = $this->ajaxResponse('check-recent', "rcmail.command('checkmail')");
+
+        $this->assertEquals('check-recent', $res['action']);
+        $this->assertRegExp('/this\.set_unread_count/', $res['exec']);
+    }
+}
diff --git a/tests/Selenium/Mail/Compose.php b/tests/Selenium/Mail/Compose.php
new file mode 100644
index 000000000..e707ef17d
--- /dev/null
+++ b/tests/Selenium/Mail/Compose.php
@@ -0,0 +1,25 @@
+<?php
+
+class Selenium_Mail_Compose extends Selenium_Test
+{
+    public function testCompose()
+    {
+        $this->go('mail', 'compose');
+
+        // check task and action
+        $env = $this->get_env();
+        $this->assertEquals('mail', $env['task']);
+        $this->assertEquals('compose', $env['action']);
+
+        $objects = $this->get_objects();
+
+        // these objects should be there always
+        $this->assertContains('qsearchbox', $objects);
+        $this->assertContains('addressbookslist', $objects);
+        $this->assertContains('contactslist', $objects);
+        $this->assertContains('messageform', $objects);
+        $this->assertContains('attachmentlist', $objects);
+        $this->assertContains('filedrop', $objects);
+        $this->assertContains('uploadform', $objects);
+    }
+}
diff --git a/tests/Selenium/Mail/Getunread.php b/tests/Selenium/Mail/Getunread.php
new file mode 100644
index 000000000..d6362f2f4
--- /dev/null
+++ b/tests/Selenium/Mail/Getunread.php
@@ -0,0 +1,13 @@
+<?php
+
+class Selenium_Mail_Getunread extends Selenium_Test
+{
+    public function testGetunread()
+    {
+        $this->go('mail');
+
+        $res = $this->ajaxResponse('getunread', "rcmail.http_request('getunread')");
+
+        $this->assertEquals('getunread', $res['action']);
+    }
+}
diff --git a/tests/Selenium/Mail/List.php b/tests/Selenium/Mail/List.php
new file mode 100644
index 000000000..7574c1801
--- /dev/null
+++ b/tests/Selenium/Mail/List.php
@@ -0,0 +1,25 @@
+<?php
+
+class Selenium_Mail_List extends Selenium_Test
+{
+    public function testCheckRecent()
+    {
+        $this->go('mail');
+
+        $res = $this->ajaxResponse('list', "rcmail.command('list')");
+
+        $this->assertEquals('list', $res['action']);
+        $this->assertRegExp('/this\.set_pagetitle/', $res['exec']);
+        $this->assertRegExp('/this\.set_unread_count/', $res['exec']);
+        $this->assertRegExp('/this\.set_rowcount/', $res['exec']);
+        $this->assertRegExp('/this\.set_message_coltypes/', $res['exec']);
+//        $this->assertRegExp('/this\.add_message_row/', $res['exec']);
+
+        $this->assertContains('current_page', $res['env']);
+        $this->assertContains('exists', $res['env']);
+        $this->assertContains('pagecount', $res['env']);
+        $this->assertContains('pagesize', $res['env']);
+        $this->assertContains('messagecount', $res['env']);
+        $this->assertContains('mailbox', $res['env']);
+    }
+}
diff --git a/tests/Selenium/Mail/Mail.php b/tests/Selenium/Mail/Mail.php
new file mode 100644
index 000000000..98413787b
--- /dev/null
+++ b/tests/Selenium/Mail/Mail.php
@@ -0,0 +1,23 @@
+<?php
+
+class Selenium_Mail_Mail extends Selenium_Test
+{
+    public function testMail()
+    {
+        $this->go('mail');
+
+        // check task
+        $env = $this->get_env();
+        $this->assertEquals('mail', $env['task']);
+
+        $objects = $this->get_objects();
+
+        // these objects should be there always
+        $this->assertContains('qsearchbox', $objects);
+        $this->assertContains('mailboxlist', $objects);
+        $this->assertContains('messagelist', $objects);
+        $this->assertContains('quotadisplay', $objects);
+        $this->assertContains('search_filter', $objects);
+        $this->assertContains('countdisplay', $objects);
+    }
+}
diff --git a/tests/Selenium/Settings/About.php b/tests/Selenium/Settings/About.php
new file mode 100644
index 000000000..9a6c31d4b
--- /dev/null
+++ b/tests/Selenium/Settings/About.php
@@ -0,0 +1,14 @@
+<?php
+
+class Selenium_Settings_About extends Selenium_Test
+{
+    public function testAbout()
+    {
+        $this->url(TESTS_URL . '/?_task=settings&_action=about');
+
+        // check task and action
+        $env = $this->get_env();
+        $this->assertEquals('settings', $env['task']);
+        $this->assertEquals('about', $env['action']);
+    }
+}
diff --git a/tests/Selenium/Settings/Folders.php b/tests/Selenium/Settings/Folders.php
new file mode 100644
index 000000000..fa64e45d6
--- /dev/null
+++ b/tests/Selenium/Settings/Folders.php
@@ -0,0 +1,20 @@
+<?php
+
+class Selenium_Settings_Folders extends Selenium_Test
+{
+    public function testFolders()
+    {
+        $this->go('settings', 'folders');
+
+        // task should be set to 'settings' and action to 'folders'
+        $env = $this->get_env();
+        $this->assertEquals('settings', $env['task']);
+        $this->assertEquals('folders', $env['action']);
+
+        $objects = $this->get_objects();
+
+        // these objects should be there always
+        $this->assertContains('quotadisplay', $objects);
+        $this->assertContains('subscriptionlist', $objects);
+    }
+}
diff --git a/tests/Selenium/Settings/Identities.php b/tests/Selenium/Settings/Identities.php
new file mode 100644
index 000000000..869018b09
--- /dev/null
+++ b/tests/Selenium/Settings/Identities.php
@@ -0,0 +1,19 @@
+<?php
+
+class Selenium_Settings_Identities extends Selenium_Test
+{
+    public function testIdentities()
+    {
+        $this->go('settings', 'identities');
+
+        // check task and action
+        $env = $this->get_env();
+        $this->assertEquals('settings', $env['task']);
+        $this->assertEquals('identities', $env['action']);
+
+        $objects = $this->get_objects();
+
+        // these objects should be there always
+        $this->assertContains('identitieslist', $objects);
+    }
+}
diff --git a/tests/Selenium/Settings/Settings.php b/tests/Selenium/Settings/Settings.php
new file mode 100644
index 000000000..08d8339f1
--- /dev/null
+++ b/tests/Selenium/Settings/Settings.php
@@ -0,0 +1,17 @@
+<?php
+
+class Selenium_Settings_Settings extends Selenium_Test
+{
+    public function testSettings()
+    {
+        $this->go('settings');
+
+        // task should be set to 'settings'
+        $env = $this->get_env();
+        $this->assertEquals('settings', $env['task']);
+
+        $objects = $this->get_objects();
+
+        $this->assertContains('sectionslist', $objects);
+    }
+}
diff --git a/tests/Selenium/bootstrap.php b/tests/Selenium/bootstrap.php
new file mode 100644
index 000000000..6611e8feb
--- /dev/null
+++ b/tests/Selenium/bootstrap.php
@@ -0,0 +1,185 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | tests/Selenium/bootstrap.php                                          |
+ |                                                                       |
+ | This file is part of the Roundcube Webmail client                     |
+ | Copyright (C) 2009-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ | PURPOSE:                                                              |
+ |   Environment initialization script for unit tests                    |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas Bruederli <roundcube@gmail.com>                        |
+ | Author: Aleksander Machniak <alec@alec.pl>                            |
+ +-----------------------------------------------------------------------+
+*/
+
+if (php_sapi_name() != 'cli')
+  die("Not in shell mode (php-cli)");
+
+if (!defined('INSTALL_PATH')) define('INSTALL_PATH', realpath(dirname(__FILE__) . '/../../') . '/' );
+
+define('TESTS_DIR', dirname(__FILE__) . '/');
+
+if (@is_dir(TESTS_DIR . 'config')) {
+    define('RCMAIL_CONFIG_DIR', TESTS_DIR . 'config');
+}
+
+require_once(INSTALL_PATH . 'program/include/iniset.php');
+
+// Extend include path so some plugin test won't fail
+$include_path = ini_get('include_path') . PATH_SEPARATOR . TESTS_DIR . '..';
+if (set_include_path($include_path) === false) {
+    die("Fatal error: ini_set/set_include_path does not work.");
+}
+
+$rcmail = rcube::get_instance();
+
+define('TESTS_URL',     $rcmail->config->get('tests_url'));
+define('TESTS_BROWSER', $rcmail->config->get('tests_browser', 'firefox'));
+define('TESTS_USER',    $rcmail->config->get('tests_username'));
+define('TESTS_PASS',    $rcmail->config->get('tests_password'));
+define('TESTS_SLEEP',   $rcmail->config->get('tests_sleep', 5));
+
+PHPUnit_Extensions_Selenium2TestCase::shareSession(true);
+
+// @TODO: remove user record from DB before running tests
+// @TODO: make sure mailbox has some content (always the same) or is empty
+// @TODO: plugins: enable all?
+
+/**
+ * Base class for all tests in this directory
+ */
+class Selenium_Test extends PHPUnit_Extensions_Selenium2TestCase
+{
+    protected function setUp()
+    {
+//        $this->rc = rcube::get_instance();
+        $this->setBrowser(TESTS_BROWSER);
+
+        // Set root to our index.html, for better performance
+        // See https://github.com/sebastianbergmann/phpunit-selenium/issues/217
+        $this->setBrowserUrl(TESTS_URL . '/tests/Selenium');
+    }
+
+    protected function login()
+    {
+        $this->go('mail');
+
+        $user_input = $this->byCssSelector('form input[name="_user"]');
+        $pass_input = $this->byCssSelector('form input[name="_pass"]');
+        $submit     = $this->byCssSelector('form input[type="submit"]');
+
+        $user_input->value(TESTS_USER);
+        $pass_input->value(TESTS_PASS);
+
+        // submit login form
+        $submit->click();
+
+        // wait after successful login
+        sleep(TESTS_SLEEP);
+    }
+
+    protected function go($task = 'mail', $action = null)
+    {
+        $this->url(TESTS_URL . '/?_task=' . $task);
+
+        // wait for interface load (initial ajax requests, etc.)
+        sleep(TESTS_SLEEP);
+
+        if ($action) {
+            $this->click_button($action);
+
+            sleep(TESTS_SLEEP);
+        }
+    }
+
+    protected function get_env()
+    {
+        return $this->execute(array(
+            'script' => 'return rcmail.env;',
+            'args' => array(),
+        ));
+    }
+
+    protected function get_buttons($action)
+    {
+        $buttons = $this->execute(array(
+            'script' => "return rcmail.buttons['$action'];",
+            'args' => array(),
+        ));
+
+        if (is_array($buttons)) {
+            foreach ($buttons as $idx => $button) {
+                $buttons[$idx] = $button['id'];
+            }
+        }
+
+        return (array) $buttons;
+    }
+
+    protected function get_objects()
+    {
+        return $this->execute(array(
+            'script' => "var i,r = []; for (i in rcmail.gui_objects) r.push(i); return r;",
+            'args' => array(),
+        ));
+    }
+
+    protected function click_button($action)
+    {
+        $buttons = $this->get_buttons($action);
+        $id      = array_shift($buttons);
+
+        // this doesn't work for me
+        $this->byId($id)->click();
+    }
+
+    protected function ajaxResponse($action, $script = '', $button = false)
+    {
+        if (!$script && !$button) {
+            $script = "rcmail.command('$action')";
+        }
+
+        $script = 
+        "if (!window.test_ajax_response) {
+            window.test_ajax_response_object = {};
+            function test_ajax_response(response)
+            {
+                if (response.response && response.response.action) {
+                    window.test_ajax_response_object[response.response.action] = response.response;
+                }
+            }
+            rcmail.addEventListener('responsebefore', test_ajax_response);
+        }
+        window.test_ajax_response_object['$action'] = null;
+        $script;
+        ";
+
+        // run request
+        $this->execute(array(
+            'script' => $script,
+            'args' => array(),
+        ));
+
+        if ($button) {
+            $this->click_button($action);
+        }
+
+        // wait
+        sleep(TESTS_SLEEP);
+
+        // get response
+        $response = $this->execute(array(
+            'script' => "return window.test_ajax_response_object['$action'];",
+            'args' => array(),
+        ));
+
+        return $response;
+    }
+}
diff --git a/tests/Selenium/index.html b/tests/Selenium/index.html
new file mode 100644
index 000000000..7aa65f829
--- /dev/null
+++ b/tests/Selenium/index.html
@@ -0,0 +1,8 @@
+<html>
+<head>
+    <title>Roundcube Webmail Tests</title>
+</head>
+<body>
+Testing...
+</body>
+</html>
diff --git a/tests/Selenium/phpunit.xml b/tests/Selenium/phpunit.xml
new file mode 100644
index 000000000..b5835cf74
--- /dev/null
+++ b/tests/Selenium/phpunit.xml
@@ -0,0 +1,21 @@
+<phpunit backupGlobals="false"
+    bootstrap="bootstrap.php"
+    colors="true">
+    <testsuites>
+        <testsuite name="All Tests">
+            <file>Login.php</file><!-- Login.php test must be first -->
+            <file>Addressbook/Addressbook.php</file>
+            <file>Addressbook/Import.php</file>
+            <file>Mail/Mail.php</file>
+            <file>Mail/CheckRecent.php</file>
+            <file>Mail/Compose.php</file>
+            <file>Mail/Getunread.php</file>
+            <file>Mail/List.php</file>
+            <file>Settings/About.php</file>
+            <file>Settings/Folders.php</file>
+            <file>Settings/Identities.php</file>
+            <file>Settings/Settings.php</file>
+            <file>Logout.php</file><!-- Logout.php test must be last -->
+        </testsuite>
+    </testsuites>
+</phpunit>
diff --git a/tests/src/Csv2vcard/tb_plain.csv b/tests/src/Csv2vcard/tb_plain.csv
index 94ea766c0..4c4af14ca 100644
--- a/tests/src/Csv2vcard/tb_plain.csv
+++ b/tests/src/Csv2vcard/tb_plain.csv
@@ -1,2 +1,2 @@
 First Name,Last Name,Display Name,Nickname,Primary Email,Secondary Email,Screen Name,Work Phone,Home Phone,Fax Number,Pager Number,Mobile Number,Home Address,Home Address 2,Home City,Home State,Home ZipCode,Home Country,Work Address,Work Address 2,Work City,Work State,Work ZipCode,Work Country,Job Title,Department,Organization,Web Page 1,Web Page 2,Birth Year,Birth Month,Birth Day,Custom 1,Custom 2,Custom 3,Custom 4,Notes,
-Firstname,Lastname,Displayname,Nick,test@domain.tld,next@domain.tld,,phone work,phone home,fax,pager,mobile,Priv address,,City,region,xx-xxx,USA,Addr work,,city,region,33-333,Poland,title,department,Organization,http://page.com,http://webpage.tld,1970,11,15,,,,,,
+Firstname,Lastname,Displayname,Nick,test@domain.tld,next@domain.tld,,phone work,phone home,fax,pager,mobile,Priv address,,City,region,xx-xxx,USA,Addr work,,Wcity,Wstate,33-333,Poland,title,department,Organization,http://page.com,http://webpage.tld,1970,11,15,,,,,,
diff --git a/tests/src/Csv2vcard/tb_plain.vcf b/tests/src/Csv2vcard/tb_plain.vcf
index b001c3924..2aa91adf8 100644
--- a/tests/src/Csv2vcard/tb_plain.vcf
+++ b/tests/src/Csv2vcard/tb_plain.vcf
@@ -16,5 +16,5 @@ URL;TYPE=homepage:http://page.com
 URL;TYPE=other:http://webpage.tld
 BDAY;VALUE=date:1970-11-15
 ADR;TYPE=home:;;Priv address;City;region;xx-xxx;USA
-ADR;TYPE=work:;;Addr work;;;33-333;Poland
+ADR;TYPE=work:;;Addr work;Wcity;Wstate;33-333;Poland
 END:VCARD
diff --git a/tests/src/format-flowed-unfolded.txt b/tests/src/format-flowed-unfolded.txt
index 14e526be4..0af9b7130 100644
--- a/tests/src/format-flowed-unfolded.txt
+++ b/tests/src/format-flowed-unfolded.txt
@@ -5,7 +5,7 @@ X
 

 On XX.YY.YYYY Y:YY, Somebody wrote:

 > This part is a reply wihtout any flowing lines. rcube_mime::unfold_flowed()

-> has to be careful with empty quoted lines because they might end with a

+>> has to be careful with empty quoted lines because they might end with a

 > space but still shouldn't be considered as flowed!

 > 

 > The above empty line should persist after unfolding.

diff --git a/tests/src/format-flowed.txt b/tests/src/format-flowed.txt
index a390ffd11..da36064e0 100644
--- a/tests/src/format-flowed.txt
+++ b/tests/src/format-flowed.txt
@@ -1,13 +1,13 @@
 I'm replying on this with a very long line which is then wrapped and 

 space-stuffed because the draft is saved as format=flowed.

- From what's specified in RFC 2646 some lines need to be space-stuffed to 

-avoid muning during transport.

+ From what's specified in RFC 2646 some lines need to be space-stuffed to avoid 

+muning during transport.

 

 X

 

 On XX.YY.YYYY Y:YY, Somebody wrote:

 > This part is a reply wihtout any flowing lines. rcube_mime::unfold_flowed()

-> has to be careful with empty quoted lines because they might end with a

+>> has to be careful with empty quoted lines because they might end with a

 > space but still shouldn't be considered as flowed!

 > 

 > The above empty line should persist after unfolding.