1107 files changed, 54020 insertions, 27499 deletions

diff --git a/.htaccess b/.htaccess
index 25e153f8c..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)$ - [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..6da7dd998
--- /dev/null
+++ b/.tx/config
@@ -0,0 +1,80 @@
+[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-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 4f6dc1778..c21743dfc 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,13 +1,87 @@
 CHANGELOG Roundcube Webmail
 ===========================
 
+- 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)
+- 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-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)
+- Also block remote images in HTML part view (#1488827)
+- Improved database schema upgrade procedure, added updatedb.sh script
+- Force autocommit mode in mysql database driver (#1488902)
+
+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)
+- 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)
+- Display PGP/MIME signature attachments as "Digital Signature" (#1488570)
+- Workaround UW-IMAP bug where hierarchy separator is added to the shared folder name (#1488879)
+- Fix version comparisons with -stable suffix (#1488876)
+- Add unsupported alternative parts to attachments list (#1488870)
+- Add Compose button on message view page (#1488747)
+- Display 'Sender' header in message preview
+- 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 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)
+- 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)
@@ -65,6 +139,18 @@ CHANGELOG Roundcube Webmail
     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 30217686b..de2944107 100644
--- a/INSTALL
+++ b/INSTALL
@@ -12,9 +12,11 @@ REQUIREMENTS
 * The Apache, Lighttpd, Cherokee or Hiawatha web server
 * .htaccess support allowing overrides for DirectoryIndex
 * PHP Version 5.2.1 or greater including
-   - PDO, PCRE, DOM, JSON, XML, Session, Sockets (required)
-   - libiconv, zip (recommended)
-   - mbstring, fileinfo, mcrypt (optional)
+   - PCRE, DOM, JSON, XML, Session, Sockets (required)
+   - PHP Data Objects (PDO) with driver for either MySQL, PostgreSQL or SQLite (required)
+     Note: MySQL database driver requires PHP 5.3 or newer.
+   - Libiconv, Zip (recommended)
+   - Fileinfo, Mcrypt, mbstring (optional)
 * PEAR packages distributed with Roundcube or external:
    - Mail_Mime 1.8.1 or newer
    - Mail_mimeDecode 1.5.5 or newer
@@ -32,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
@@ -230,5 +232,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 85b8e4ef6..9139509a5 100644
--- a/SQL/mssql.initial.sql
+++ b/SQL/mssql.initial.sql
@@ -115,6 +115,12 @@ CREATE TABLE [dbo].[searches] (
 ) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]

 GO

 

+CREATE TABLE [dbo].[system] (

+	[name] [varchar] (64) COLLATE Latin1_General_CI_AI NOT NULL ,

+	[value] [text] COLLATE Latin1_General_CI_AI NOT NULL 

+) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]

+GO

+

 ALTER TABLE [dbo].[cache_index] WITH NOCHECK ADD 

 	 PRIMARY KEY CLUSTERED 

 	(

@@ -185,6 +191,13 @@ ALTER TABLE [dbo].[searches] WITH NOCHECK ADD
 	) ON [PRIMARY] 

 GO

 

+ALTER TABLE [dbo].[system] WITH NOCHECK ADD 

+	CONSTRAINT [PK_system_name] PRIMARY KEY CLUSTERED 

+	(

+		[name]

+	) ON [PRIMARY] 

+GO

+

 ALTER TABLE [dbo].[cache] ADD 

 	CONSTRAINT [DF_cache_user_id] DEFAULT ('0') FOR [user_id],

 	CONSTRAINT [DF_cache_cache_key] DEFAULT ('') FOR [cache_key],

@@ -358,3 +371,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')

+GO

+
\ No newline at end of file
diff --git a/SQL/mssql.upgrade.sql b/SQL/mssql.upgrade.sql
deleted file mode 100644
index 26001e713..000000000
--- a/SQL/mssql.upgrade.sql
+++ /dev/null
@@ -1,273 +0,0 @@
--- Roundcube Webmail update script for MSSQL databases

-

--- Updates from version 0.3.1

-

-ALTER TABLE [dbo].[messages] ADD CONSTRAINT [FK_messages_user_id]

-    FOREIGN KEY ([user_id]) REFERENCES [dbo].[users] ([user_id])

-    ON DELETE CASCADE ON UPDATE CASCADE

-GO

-

-ALTER TABLE [dbo].[cache] ADD CONSTRAINT [FK_cache_user_id]

-    FOREIGN KEY ([user_id]) REFERENCES [dbo].[users] ([user_id])

-    ON DELETE CASCADE ON UPDATE CASCADE

-GO

-

-ALTER TABLE [dbo].[contacts] ADD CONSTRAINT [FK_contacts_user_id]

-    FOREIGN KEY ([user_id]) REFERENCES [dbo].[users] ([user_id])

-    ON DELETE CASCADE ON UPDATE CASCADE

-GO

-

-ALTER TABLE [dbo].[identities] ADD CONSTRAINT [FK_identities_user_id] 

-    FOREIGN KEY ([user_id]) REFERENCES [dbo].[users] ([user_id])

-    ON DELETE CASCADE ON UPDATE CASCADE

-GO

-

-ALTER TABLE [dbo].[identities] ADD [changed] [datetime] NULL 

-GO

-

-CREATE TABLE [dbo].[contactgroups] (

-	[contactgroup_id] [int] IDENTITY (1, 1) NOT NULL ,

-	[user_id] [int] NOT NULL ,

-	[changed] [datetime] NOT NULL ,

-	[del] [char] (1) COLLATE Latin1_General_CI_AI NOT NULL ,

-	[name] [varchar] (128) COLLATE Latin1_General_CI_AI NOT NULL

-) ON [PRIMARY] 

-GO

-

-CREATE TABLE [dbo].[contactgroupmembers] (

-	[contactgroup_id] [int] NOT NULL ,

-	[contact_id] [int] NOT NULL ,

-	[created] [datetime] NOT NULL

-) ON [PRIMARY] 

-GO

-

-ALTER TABLE [dbo].[contactgroups] WITH NOCHECK ADD 

-	CONSTRAINT [PK_contactgroups_contactgroup_id] PRIMARY KEY CLUSTERED 

-	(

-		[contactgroup_id]

-	)  ON [PRIMARY] 

-GO

-

-ALTER TABLE [dbo].[contactgroupmembers] WITH NOCHECK ADD 

-	CONSTRAINT [PK_contactgroupmembers_id] PRIMARY KEY CLUSTERED 

-	(

-		[contactgroup_id], [contact_id]

-	)  ON [PRIMARY] 

-GO

-

-ALTER TABLE [dbo].[contactgroups] ADD 

-	CONSTRAINT [DF_contactgroups_user_id] DEFAULT (0) FOR [user_id],

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

-	CONSTRAINT [DF_contactgroups_del] DEFAULT ('0') FOR [del],

-	CONSTRAINT [DF_contactgroups_name] DEFAULT ('') FOR [name],

-	CONSTRAINT [CK_contactgroups_del] CHECK ([del] = '1' or [del] = '0')

-GO

-

-CREATE  INDEX [IX_contactgroups_user_id] ON [dbo].[contacts]([user_id]) ON [PRIMARY]

-GO

-

-ALTER TABLE [dbo].[contactgroupmembers] ADD 

-	CONSTRAINT [DF_contactgroupmembers_contactgroup_id] DEFAULT (0) FOR [contactgroup_id],

-	CONSTRAINT [DF_contactgroupmembers_contact_id] DEFAULT (0) FOR [contact_id],

-	CONSTRAINT [DF_contactgroupmembers_created] DEFAULT (getdate()) FOR [created]

-GO

-

-ALTER TABLE [dbo].[contactgroupmembers] ADD CONSTRAINT [FK_contactgroupmembers_contactgroup_id]

-    FOREIGN KEY ([contactgroup_id]) REFERENCES [dbo].[contactgroups] ([contactgroup_id])

-    ON DELETE CASCADE ON UPDATE CASCADE

-GO

-

-CREATE TRIGGER [contact_delete_member] ON [dbo].[contacts]

-    AFTER DELETE AS

-    DELETE FROM [dbo].[contactgroupmembers]

-    WHERE [contact_id] IN (SELECT [contact_id] FROM deleted)

-GO

-

-ALTER TABLE [dbo].[contactgroups] ADD CONSTRAINT [FK_contactgroups_user_id]

-    FOREIGN KEY ([user_id]) REFERENCES [dbo].[users] ([user_id])

-    ON DELETE CASCADE ON UPDATE CASCADE

-GO

-

--- Updates from version 0.4.2

-

-DROP INDEX [IX_users_username]

-GO

-CREATE UNIQUE INDEX [IX_users_username] ON [dbo].[users]([username],[mail_host]) ON [PRIMARY]

-GO

-ALTER TABLE [dbo].[contacts] ALTER COLUMN [email] [varchar] (255) COLLATE Latin1_General_CI_AI NOT NULL

-GO

-

--- Updates from version 0.5.1

--- Updates from version 0.5.2

--- Updates from version 0.5.3

--- Updates from version 0.5.4

-

-ALTER TABLE [dbo].[contacts] ADD [words] [text] COLLATE Latin1_General_CI_AI NULL 

-GO

-CREATE INDEX [IX_contactgroupmembers_contact_id] ON [dbo].[contactgroupmembers]([contact_id]) ON [PRIMARY]

-GO

-DELETE FROM [dbo].[messages]

-GO

-DELETE FROM [dbo].[cache]

-GO

-

--- Updates from version 0.6

-

-CREATE TABLE [dbo].[dictionary] (

-    [user_id] [int] ,

-    [language] [varchar] (5) COLLATE Latin1_General_CI_AI NOT NULL ,

-    [data] [text] COLLATE Latin1_General_CI_AI NOT NULL 

-) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]

-GO

-CREATE  UNIQUE INDEX [IX_dictionary_user_language] ON [dbo].[dictionary]([user_id],[language]) ON [PRIMARY]

-GO

-

-CREATE TABLE [dbo].[searches] (

-	[search_id] [int] IDENTITY (1, 1) NOT NULL ,

-	[user_id] [int] NOT NULL ,

-	[type] [tinyint] NOT NULL ,

-	[name] [varchar] (128) COLLATE Latin1_General_CI_AI NOT NULL ,

-	[data] [text] COLLATE Latin1_General_CI_AI NOT NULL 

-) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]

-GO

-

-ALTER TABLE [dbo].[searches] WITH NOCHECK ADD 

-	CONSTRAINT [PK_searches_search_id] PRIMARY KEY CLUSTERED 

-	(

-		[search_id]

-	) ON [PRIMARY] 

-GO

-

-ALTER TABLE [dbo].[searches] ADD 

-	CONSTRAINT [DF_searches_user] DEFAULT (0) FOR [user_id],

-	CONSTRAINT [DF_searches_type] DEFAULT (0) FOR [type],

-GO

-

-CREATE UNIQUE INDEX [IX_searches_user_type_name] ON [dbo].[searches]([user_id],[type],[name]) ON [PRIMARY]

-GO

-

-ALTER TABLE [dbo].[searches] ADD CONSTRAINT [FK_searches_user_id]

-    FOREIGN KEY ([user_id]) REFERENCES [dbo].[users] ([user_id])

-    ON DELETE CASCADE ON UPDATE CASCADE

-GO

-

-DROP TABLE [dbo].[messages]

-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 ,

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

-	[data] [text] COLLATE Latin1_General_CI_AI NOT NULL 

-) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]

-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 ,

-	[data] [text] COLLATE Latin1_General_CI_AI NOT NULL 

-) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]

-GO

-

-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 ,

-	[data] [text] COLLATE Latin1_General_CI_AI NOT NULL ,

-	[flags] [int] NOT NULL

-) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]

-GO

-

-ALTER TABLE [dbo].[cache_index] WITH NOCHECK ADD 

-	 PRIMARY KEY CLUSTERED 

-	(

-		[user_id],[mailbox]

-	) ON [PRIMARY] 

-GO

-

-ALTER TABLE [dbo].[cache_thread] WITH NOCHECK ADD 

-	 PRIMARY KEY CLUSTERED 

-	(

-		[user_id],[mailbox]

-	) ON [PRIMARY] 

-GO

-

-ALTER TABLE [dbo].[cache_messages] WITH NOCHECK ADD 

-	 PRIMARY KEY CLUSTERED 

-	(

-		[user_id],[mailbox],[uid]

-	) 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]

-GO

-

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

-GO

-

-ALTER TABLE [dbo].[cache_thread] ADD 

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

-GO

-

-CREATE  INDEX [IX_cache_thread_user_id] ON [dbo].[cache_thread]([user_id]) 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]

-GO

-

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

-GO

-

-ALTER TABLE [dbo].[cache_index] ADD CONSTRAINT [FK_cache_index_user_id]

-    FOREIGN KEY ([user_id]) REFERENCES [dbo].[users] ([user_id])

-    ON DELETE CASCADE ON UPDATE CASCADE

-GO

-

-ALTER TABLE [dbo].[cache_thread] ADD CONSTRAINT [FK_cache_thread_user_id]

-    FOREIGN KEY ([user_id]) REFERENCES [dbo].[users] ([user_id])

-    ON DELETE CASCADE ON UPDATE CASCADE

-GO

-

-ALTER TABLE [dbo].[cache_messages] ADD CONSTRAINT [FK_cache_messages_user_id]

-    FOREIGN KEY ([user_id]) REFERENCES [dbo].[users] ([user_id])

-    ON DELETE CASCADE ON UPDATE CASCADE

-GO

-

--- Updates from version 0.7-beta

-

-ALTER TABLE [dbo].[session] ALTER COLUMN [sess_id] [varchar] (128) COLLATE Latin1_General_CI_AI NOT NULL

-GO

-

--- Updates from version 0.7

-

-ALTER TABLE [dbo].[contacts] DROP CONSTRAINT [DF_contacts_email]

-GO

-ALTER TABLE [dbo].[contacts] ALTER COLUMN [email] [text] COLLATE Latin1_General_CI_AI NOT NULL

-GO

-ALTER TABLE [dbo].[contacts] ADD CONSTRAINT [DF_contacts_email] DEFAULT ('') FOR [email]

-GO

-

--- Updates from version 0.8-rc

-

-ALTER TABLE [dbo].[contacts] DROP CONSTRAINT [DF_contacts_email]

-GO

-ALTER TABLE [dbo].[contacts] ALTER COLUMN [email] [varchar] (8000) COLLATE Latin1_General_CI_AI NOT NULL

-GO

-ALTER TABLE [dbo].[contacts] ADD CONSTRAINT [DF_contacts_email] DEFAULT ('') FOR [email]

-GO

-

--- Updates from version 0.8

-

-ALTER TABLE [dbo].[cache] DROP COLUMN [cache_id]

-GO

-ALTER TABLE [dbo].[users] DROP COLUMN [alias]

-GO

-CREATE INDEX [IX_identities_email] ON [dbo].[identities]([email],[del]) ON [PRIMARY]

-GO

-
\ No newline at end of file
diff --git a/SQL/mssql/2009103100.sql b/SQL/mssql/2009103100.sql
new file mode 100644
index 000000000..646fe38af
--- /dev/null
+++ b/SQL/mssql/2009103100.sql
@@ -0,0 +1,87 @@
+-- Updates from version 0.3.1

+

+ALTER TABLE [dbo].[messages] ADD CONSTRAINT [FK_messages_user_id]

+    FOREIGN KEY ([user_id]) REFERENCES [dbo].[users] ([user_id])

+    ON DELETE CASCADE ON UPDATE CASCADE

+GO

+

+ALTER TABLE [dbo].[cache] ADD CONSTRAINT [FK_cache_user_id]

+    FOREIGN KEY ([user_id]) REFERENCES [dbo].[users] ([user_id])

+    ON DELETE CASCADE ON UPDATE CASCADE

+GO

+

+ALTER TABLE [dbo].[contacts] ADD CONSTRAINT [FK_contacts_user_id]

+    FOREIGN KEY ([user_id]) REFERENCES [dbo].[users] ([user_id])

+    ON DELETE CASCADE ON UPDATE CASCADE

+GO

+

+ALTER TABLE [dbo].[identities] ADD CONSTRAINT [FK_identities_user_id] 

+    FOREIGN KEY ([user_id]) REFERENCES [dbo].[users] ([user_id])

+    ON DELETE CASCADE ON UPDATE CASCADE

+GO

+

+ALTER TABLE [dbo].[identities] ADD [changed] [datetime] NULL 

+GO

+

+CREATE TABLE [dbo].[contactgroups] (

+	[contactgroup_id] [int] IDENTITY (1, 1) NOT NULL ,

+	[user_id] [int] NOT NULL ,

+	[changed] [datetime] NOT NULL ,

+	[del] [char] (1) COLLATE Latin1_General_CI_AI NOT NULL ,

+	[name] [varchar] (128) COLLATE Latin1_General_CI_AI NOT NULL

+) ON [PRIMARY] 

+GO

+

+CREATE TABLE [dbo].[contactgroupmembers] (

+	[contactgroup_id] [int] NOT NULL ,

+	[contact_id] [int] NOT NULL ,

+	[created] [datetime] NOT NULL

+) ON [PRIMARY] 

+GO

+

+ALTER TABLE [dbo].[contactgroups] WITH NOCHECK ADD 

+	CONSTRAINT [PK_contactgroups_contactgroup_id] PRIMARY KEY CLUSTERED 

+	(

+		[contactgroup_id]

+	)  ON [PRIMARY] 

+GO

+

+ALTER TABLE [dbo].[contactgroupmembers] WITH NOCHECK ADD 

+	CONSTRAINT [PK_contactgroupmembers_id] PRIMARY KEY CLUSTERED 

+	(

+		[contactgroup_id], [contact_id]

+	)  ON [PRIMARY] 

+GO

+

+ALTER TABLE [dbo].[contactgroups] ADD 

+	CONSTRAINT [DF_contactgroups_user_id] DEFAULT (0) FOR [user_id],

+	CONSTRAINT [DF_contactgroups_changed] DEFAULT (getdate()) FOR [changed],

+	CONSTRAINT [DF_contactgroups_del] DEFAULT ('0') FOR [del],

+	CONSTRAINT [DF_contactgroups_name] DEFAULT ('') FOR [name],

+	CONSTRAINT [CK_contactgroups_del] CHECK ([del] = '1' or [del] = '0')

+GO

+

+CREATE  INDEX [IX_contactgroups_user_id] ON [dbo].[contacts]([user_id]) ON [PRIMARY]

+GO

+

+ALTER TABLE [dbo].[contactgroupmembers] ADD 

+	CONSTRAINT [DF_contactgroupmembers_contactgroup_id] DEFAULT (0) FOR [contactgroup_id],

+	CONSTRAINT [DF_contactgroupmembers_contact_id] DEFAULT (0) FOR [contact_id],

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

+GO

+

+ALTER TABLE [dbo].[contactgroupmembers] ADD CONSTRAINT [FK_contactgroupmembers_contactgroup_id]

+    FOREIGN KEY ([contactgroup_id]) REFERENCES [dbo].[contactgroups] ([contactgroup_id])

+    ON DELETE CASCADE ON UPDATE CASCADE

+GO

+

+CREATE TRIGGER [contact_delete_member] ON [dbo].[contacts]

+    AFTER DELETE AS

+    DELETE FROM [dbo].[contactgroupmembers]

+    WHERE [contact_id] IN (SELECT [contact_id] FROM deleted)

+GO

+

+ALTER TABLE [dbo].[contactgroups] ADD CONSTRAINT [FK_contactgroups_user_id]

+    FOREIGN KEY ([user_id]) REFERENCES [dbo].[users] ([user_id])

+    ON DELETE CASCADE ON UPDATE CASCADE

+GO

diff --git a/SQL/mssql/2010100600.sql b/SQL/mssql/2010100600.sql
new file mode 100644
index 000000000..fb045e303
--- /dev/null
+++ b/SQL/mssql/2010100600.sql
@@ -0,0 +1,9 @@
+-- Updates from version 0.4.2

+

+DROP INDEX [IX_users_username]

+GO

+CREATE UNIQUE INDEX [IX_users_username] ON [dbo].[users]([username],[mail_host]) ON [PRIMARY]

+GO

+ALTER TABLE [dbo].[contacts] ALTER COLUMN [email] [varchar] (255) COLLATE Latin1_General_CI_AI NOT NULL

+GO

+
\ No newline at end of file
diff --git a/SQL/mssql/2011011200.sql b/SQL/mssql/2011011200.sql
new file mode 100644
index 000000000..8715455df
--- /dev/null
+++ b/SQL/mssql/2011011200.sql
@@ -0,0 +1,10 @@
+-- Updates from version 0.5.x

+

+ALTER TABLE [dbo].[contacts] ADD [words] [text] COLLATE Latin1_General_CI_AI NULL 

+GO

+CREATE INDEX [IX_contactgroupmembers_contact_id] ON [dbo].[contactgroupmembers]([contact_id]) ON [PRIMARY]

+GO

+DELETE FROM [dbo].[messages]

+GO

+DELETE FROM [dbo].[cache]

+GO

diff --git a/SQL/mssql/2011092800.sql b/SQL/mssql/2011092800.sql
new file mode 100644
index 000000000..00f79bbc0
--- /dev/null
+++ b/SQL/mssql/2011092800.sql
@@ -0,0 +1,127 @@
+-- Updates from version 0.6

+

+CREATE TABLE [dbo].[dictionary] (

+    [user_id] [int] ,

+    [language] [varchar] (5) COLLATE Latin1_General_CI_AI NOT NULL ,

+    [data] [text] COLLATE Latin1_General_CI_AI NOT NULL 

+) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]

+GO

+CREATE  UNIQUE INDEX [IX_dictionary_user_language] ON [dbo].[dictionary]([user_id],[language]) ON [PRIMARY]

+GO

+

+CREATE TABLE [dbo].[searches] (

+	[search_id] [int] IDENTITY (1, 1) NOT NULL ,

+	[user_id] [int] NOT NULL ,

+	[type] [tinyint] NOT NULL ,

+	[name] [varchar] (128) COLLATE Latin1_General_CI_AI NOT NULL ,

+	[data] [text] COLLATE Latin1_General_CI_AI NOT NULL 

+) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]

+GO

+

+ALTER TABLE [dbo].[searches] WITH NOCHECK ADD 

+	CONSTRAINT [PK_searches_search_id] PRIMARY KEY CLUSTERED 

+	(

+		[search_id]

+	) ON [PRIMARY] 

+GO

+

+ALTER TABLE [dbo].[searches] ADD 

+	CONSTRAINT [DF_searches_user] DEFAULT (0) FOR [user_id],

+	CONSTRAINT [DF_searches_type] DEFAULT (0) FOR [type],

+GO

+

+CREATE UNIQUE INDEX [IX_searches_user_type_name] ON [dbo].[searches]([user_id],[type],[name]) ON [PRIMARY]

+GO

+

+ALTER TABLE [dbo].[searches] ADD CONSTRAINT [FK_searches_user_id]

+    FOREIGN KEY ([user_id]) REFERENCES [dbo].[users] ([user_id])

+    ON DELETE CASCADE ON UPDATE CASCADE

+GO

+

+DROP TABLE [dbo].[messages]

+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 ,

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

+	[data] [text] COLLATE Latin1_General_CI_AI NOT NULL 

+) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]

+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 ,

+	[data] [text] COLLATE Latin1_General_CI_AI NOT NULL 

+) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]

+GO

+

+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 ,

+	[data] [text] COLLATE Latin1_General_CI_AI NOT NULL ,

+	[flags] [int] NOT NULL

+) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]

+GO

+

+ALTER TABLE [dbo].[cache_index] WITH NOCHECK ADD 

+	 PRIMARY KEY CLUSTERED 

+	(

+		[user_id],[mailbox]

+	) ON [PRIMARY] 

+GO

+

+ALTER TABLE [dbo].[cache_thread] WITH NOCHECK ADD 

+	 PRIMARY KEY CLUSTERED 

+	(

+		[user_id],[mailbox]

+	) ON [PRIMARY] 

+GO

+

+ALTER TABLE [dbo].[cache_messages] WITH NOCHECK ADD 

+	 PRIMARY KEY CLUSTERED 

+	(

+		[user_id],[mailbox],[uid]

+	) 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]

+GO

+

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

+GO

+

+ALTER TABLE [dbo].[cache_thread] ADD 

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

+GO

+

+CREATE  INDEX [IX_cache_thread_user_id] ON [dbo].[cache_thread]([user_id]) 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]

+GO

+

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

+GO

+

+ALTER TABLE [dbo].[cache_index] ADD CONSTRAINT [FK_cache_index_user_id]

+    FOREIGN KEY ([user_id]) REFERENCES [dbo].[users] ([user_id])

+    ON DELETE CASCADE ON UPDATE CASCADE

+GO

+

+ALTER TABLE [dbo].[cache_thread] ADD CONSTRAINT [FK_cache_thread_user_id]

+    FOREIGN KEY ([user_id]) REFERENCES [dbo].[users] ([user_id])

+    ON DELETE CASCADE ON UPDATE CASCADE

+GO

+

+ALTER TABLE [dbo].[cache_messages] ADD CONSTRAINT [FK_cache_messages_user_id]

+    FOREIGN KEY ([user_id]) REFERENCES [dbo].[users] ([user_id])

+    ON DELETE CASCADE ON UPDATE CASCADE

+GO

diff --git a/SQL/mssql/2011111600.sql b/SQL/mssql/2011111600.sql
new file mode 100644
index 000000000..387877604
--- /dev/null
+++ b/SQL/mssql/2011111600.sql
@@ -0,0 +1,4 @@
+-- Updates from version 0.7-beta

+

+ALTER TABLE [dbo].[session] ALTER COLUMN [sess_id] [varchar] (128) COLLATE Latin1_General_CI_AI NOT NULL

+GO

diff --git a/SQL/mssql/2011121400.sql b/SQL/mssql/2011121400.sql
new file mode 100644
index 000000000..fde63ea79
--- /dev/null
+++ b/SQL/mssql/2011121400.sql
@@ -0,0 +1,9 @@
+-- Updates from version 0.7

+

+ALTER TABLE [dbo].[contacts] DROP CONSTRAINT [DF_contacts_email]

+GO

+ALTER TABLE [dbo].[contacts] ALTER COLUMN [email] [text] COLLATE Latin1_General_CI_AI NOT NULL

+GO

+ALTER TABLE [dbo].[contacts] ADD CONSTRAINT [DF_contacts_email] DEFAULT ('') FOR [email]

+GO

+
\ No newline at end of file
diff --git a/SQL/mssql/2012051800.sql b/SQL/mssql/2012051800.sql
new file mode 100644
index 000000000..8dcf7bfc0
--- /dev/null
+++ b/SQL/mssql/2012051800.sql
@@ -0,0 +1,18 @@
+-- Updates from version 0.8-rc

+

+ALTER TABLE [dbo].[contacts] DROP CONSTRAINT [DF_contacts_email]

+GO

+ALTER TABLE [dbo].[contacts] ALTER COLUMN [email] [varchar] (8000) COLLATE Latin1_General_CI_AI NOT NULL

+GO

+ALTER TABLE [dbo].[contacts] ADD CONSTRAINT [DF_contacts_email] DEFAULT ('') FOR [email]

+GO

+

+-- Updates from version 0.8

+

+ALTER TABLE [dbo].[cache] DROP COLUMN [cache_id]

+GO

+ALTER TABLE [dbo].[users] DROP COLUMN [alias]

+GO

+CREATE INDEX [IX_identities_email] ON [dbo].[identities]([email],[del]) ON [PRIMARY]

+GO

+
\ No newline at end of file
diff --git a/SQL/mssql/2012080700.sql b/SQL/mssql/2012080700.sql
new file mode 100644
index 000000000..33e6133b3
--- /dev/null
+++ b/SQL/mssql/2012080700.sql
@@ -0,0 +1,8 @@
+-- Updates from version 0.8

+

+ALTER TABLE [dbo].[cache] DROP COLUMN [cache_id]

+GO

+ALTER TABLE [dbo].[users] DROP COLUMN [alias]

+GO

+CREATE INDEX [IX_identities_email] ON [dbo].[identities]([email],[del]) ON [PRIMARY]

+GO

diff --git a/SQL/mssql/2013011000.sql b/SQL/mssql/2013011000.sql
new file mode 100644
index 000000000..2eb51e6b5
--- /dev/null
+++ b/SQL/mssql/2013011000.sql
@@ -0,0 +1,14 @@
+-- Upgrades from 0.9-beta
+
+CREATE TABLE [dbo].[system] (

+    [name] [varchar] (64) COLLATE Latin1_General_CI_AI NOT NULL ,

+    [value] [text] COLLATE Latin1_General_CI_AI 

+) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY]

+GO

+

+ALTER TABLE [dbo].[system] WITH NOCHECK ADD

+    CONSTRAINT [PK_system_name] PRIMARY KEY CLUSTERED

+    (

+        [name]

+    ) ON [PRIMARY]

+GO

diff --git a/SQL/mysql.initial.sql b/SQL/mysql.initial.sql
index 47d9db4a2..cb750c5ea 100644
--- a/SQL/mysql.initial.sql
+++ b/SQL/mysql.initial.sql
@@ -186,4 +186,14 @@ CREATE TABLE `searches` (
 ) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
 
 
+-- Table structure for table `system`
+
+CREATE TABLE `system` (
+ `name` varchar(64) NOT NULL,
+ `value` mediumtext,
+ PRIMARY KEY(`name`)
+) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
+
 /*!40014 SET FOREIGN_KEY_CHECKS=1 */;
+
+INSERT INTO system (name, value) VALUES ('roundcube-version', '2013011700');
diff --git a/SQL/mysql.update.sql b/SQL/mysql.update.sql
deleted file mode 100644
index 237aa3e38..000000000
--- a/SQL/mysql.update.sql
+++ /dev/null
@@ -1,247 +0,0 @@
--- Roundcube Webmail update script for MySQL databases
-
--- Updates from version 0.1-stable
-
-TRUNCATE TABLE `messages`;
-
-ALTER TABLE `messages`
-  DROP INDEX `idx`,
-  DROP INDEX `uid`;
-
-ALTER TABLE `cache`
-  DROP INDEX `cache_key`,
-  DROP INDEX `session_id`,
-  ADD INDEX `user_cache_index` (`user_id`,`cache_key`);
-
-ALTER TABLE `users`
-    ADD INDEX `username_index` (`username`),
-    ADD INDEX `alias_index` (`alias`);
-
--- Updates from version 0.1.1
-
-ALTER TABLE `identities`
-    MODIFY `signature` text, 
-    MODIFY `bcc` varchar(128) NOT NULL DEFAULT '', 
-    MODIFY `reply-to` varchar(128) NOT NULL DEFAULT '', 
-    MODIFY `organization` varchar(128) NOT NULL DEFAULT '',
-    MODIFY `name` varchar(128) NOT NULL, 
-    MODIFY `email` varchar(128) NOT NULL; 
-
--- Updates from version 0.2-alpha
-
-ALTER TABLE `messages`
-    ADD INDEX `created_index` (`created`);
-
--- Updates from version 0.2-beta (InnoDB required)
-
-ALTER TABLE `cache`
-    DROP `session_id`;
-
-ALTER TABLE `session`
-    ADD INDEX `changed_index` (`changed`);
-
-ALTER TABLE `cache`
-    ADD INDEX `created_index` (`created`);
-
-ALTER TABLE `users`
-    CHANGE `language` `language` varchar(5);
-
-ALTER TABLE `cache` ENGINE=InnoDB;
-ALTER TABLE `session` ENGINE=InnoDB;
-ALTER TABLE `messages` ENGINE=InnoDB;
-ALTER TABLE `users` ENGINE=InnoDB;
-ALTER TABLE `contacts` ENGINE=InnoDB;
-ALTER TABLE `identities` ENGINE=InnoDB;
-
--- Updates from version 0.3-stable
-
-TRUNCATE `messages`;
-
-ALTER TABLE `messages`
-    ADD INDEX `index_index` (`user_id`, `cache_key`, `idx`);
-
-ALTER TABLE `session` 
-    CHANGE `vars` `vars` MEDIUMTEXT NOT NULL;
-
-ALTER TABLE `contacts`
-    ADD INDEX `user_contacts_index` (`user_id`,`email`);
-
--- Updates from version 0.3.1
--- WARNING: Make sure that all tables are using InnoDB engine!!!
---          If not, use: ALTER TABLE xxx ENGINE=InnoDB;
-
-/* MySQL bug workaround: http://bugs.mysql.com/bug.php?id=46293 */
-/*!40014 SET FOREIGN_KEY_CHECKS=0 */;
-
-ALTER TABLE `messages` DROP FOREIGN KEY `user_id_fk_messages`;
-ALTER TABLE `cache` DROP FOREIGN KEY `user_id_fk_cache`;
-ALTER TABLE `contacts` DROP FOREIGN KEY `user_id_fk_contacts`;
-ALTER TABLE `identities` DROP FOREIGN KEY `user_id_fk_identities`;
-
-ALTER TABLE `messages` ADD CONSTRAINT `user_id_fk_messages` FOREIGN KEY (`user_id`)
- REFERENCES `users`(`user_id`) ON DELETE CASCADE ON UPDATE CASCADE;
-ALTER TABLE `cache` ADD CONSTRAINT `user_id_fk_cache` FOREIGN KEY (`user_id`)
- REFERENCES `users`(`user_id`) ON DELETE CASCADE ON UPDATE CASCADE;
-ALTER TABLE `contacts` ADD CONSTRAINT `user_id_fk_contacts` FOREIGN KEY (`user_id`)
- REFERENCES `users`(`user_id`) ON DELETE CASCADE ON UPDATE CASCADE;
-ALTER TABLE `identities` ADD CONSTRAINT `user_id_fk_identities` FOREIGN KEY (`user_id`)
- REFERENCES `users`(`user_id`) ON DELETE CASCADE ON UPDATE CASCADE;
-
-ALTER TABLE `contacts` ALTER `name` SET DEFAULT '';
-ALTER TABLE `contacts` ALTER `firstname` SET DEFAULT '';
-ALTER TABLE `contacts` ALTER `surname` SET DEFAULT '';
-
-ALTER TABLE `identities` ADD INDEX `user_identities_index` (`user_id`, `del`);
-ALTER TABLE `identities` ADD `changed` datetime NOT NULL DEFAULT '1000-01-01 00:00:00' AFTER `user_id`;
-
-CREATE TABLE `contactgroups` (
-  `contactgroup_id` int(10) UNSIGNED NOT NULL AUTO_INCREMENT,
-  `user_id` int(10) UNSIGNED NOT NULL DEFAULT '0',
-  `changed` datetime NOT NULL DEFAULT '1000-01-01 00:00:00',
-  `del` tinyint(1) NOT NULL DEFAULT '0',
-  `name` varchar(128) NOT NULL DEFAULT '',
-  PRIMARY KEY(`contactgroup_id`),
-  CONSTRAINT `user_id_fk_contactgroups` FOREIGN KEY (`user_id`)
-    REFERENCES `users`(`user_id`) ON DELETE CASCADE ON UPDATE CASCADE,
-  INDEX `contactgroups_user_index` (`user_id`,`del`)
-) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
-
-CREATE TABLE `contactgroupmembers` (
-  `contactgroup_id` int(10) UNSIGNED NOT NULL,
-  `contact_id` int(10) UNSIGNED NOT NULL DEFAULT '0',
-  `created` datetime NOT NULL DEFAULT '1000-01-01 00:00:00',
-  PRIMARY KEY (`contactgroup_id`, `contact_id`),
-  CONSTRAINT `contactgroup_id_fk_contactgroups` FOREIGN KEY (`contactgroup_id`)
-    REFERENCES `contactgroups`(`contactgroup_id`) ON DELETE CASCADE ON UPDATE CASCADE,
-  CONSTRAINT `contact_id_fk_contacts` FOREIGN KEY (`contact_id`)
-    REFERENCES `contacts`(`contact_id`) ON DELETE CASCADE ON UPDATE CASCADE
-) /*!40000 ENGINE=INNODB */;
-
-/*!40014 SET FOREIGN_KEY_CHECKS=1 */;
-
--- Updates from version 0.4-beta
-
-ALTER TABLE `users` CHANGE `last_login` `last_login` datetime DEFAULT NULL;
-UPDATE `users` SET `last_login` = NULL WHERE `last_login` = '1000-01-01 00:00:00';
-
--- Updates from version 0.4.2
-
-ALTER TABLE `users` DROP INDEX `username_index`;
-ALTER TABLE `users` ADD UNIQUE `username` (`username`, `mail_host`);
-
-ALTER TABLE `contacts` MODIFY `email` varchar(255) NOT NULL;
-
-TRUNCATE TABLE `messages`;
-
--- Updates from version 0.5.1
--- Updates from version 0.5.2
--- Updates from version 0.5.3
--- Updates from version 0.5.4
-
-ALTER TABLE `contacts` ADD `words` TEXT NULL AFTER `vcard`;
-ALTER TABLE `contacts` CHANGE `vcard` `vcard` LONGTEXT /*!40101 CHARACTER SET utf8 */ NULL DEFAULT NULL;
-ALTER TABLE `contactgroupmembers` ADD INDEX `contactgroupmembers_contact_index` (`contact_id`);
-
-TRUNCATE TABLE `messages`;
-TRUNCATE TABLE `cache`;
-
--- Updates from version 0.6
-
-/*!40014 SET FOREIGN_KEY_CHECKS=0 */;
-
-ALTER TABLE `users` CHANGE `alias` `alias` varchar(128) BINARY NOT NULL;
-ALTER TABLE `users` CHANGE `username` `username` varchar(128) BINARY NOT NULL;
-
-CREATE TABLE `dictionary` (
-  `user_id` int(10) UNSIGNED DEFAULT NULL,
-  `language` varchar(5) NOT NULL,
-  `data` longtext NOT NULL,
-  CONSTRAINT `user_id_fk_dictionary` FOREIGN KEY (`user_id`)
-    REFERENCES `users`(`user_id`) ON DELETE CASCADE ON UPDATE CASCADE,
-  UNIQUE `uniqueness` (`user_id`, `language`)
-) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
-
-CREATE TABLE `searches` (
-  `search_id` int(10) UNSIGNED NOT NULL AUTO_INCREMENT,
-  `user_id` int(10) UNSIGNED NOT NULL DEFAULT '0',
-  `type` int(3) NOT NULL DEFAULT '0',
-  `name` varchar(128) NOT NULL,
-  `data` text,
-  PRIMARY KEY(`search_id`),
-  CONSTRAINT `user_id_fk_searches` FOREIGN KEY (`user_id`)
-    REFERENCES `users`(`user_id`) ON DELETE CASCADE ON UPDATE CASCADE,
-  UNIQUE `uniqueness` (`user_id`, `type`, `name`)
-) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
-
-DROP TABLE `messages`;
-
-CREATE TABLE `cache_index` (
- `user_id` int(10) UNSIGNED NOT NULL DEFAULT '0',
- `mailbox` varchar(255) BINARY NOT NULL,
- `changed` datetime NOT NULL DEFAULT '1000-01-01 00:00:00',
- `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`),
- PRIMARY KEY (`user_id`, `mailbox`)
-) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
-
-CREATE TABLE `cache_thread` (
- `user_id` int(10) UNSIGNED NOT NULL DEFAULT '0',
- `mailbox` varchar(255) BINARY NOT NULL,
- `changed` datetime NOT NULL DEFAULT '1000-01-01 00:00:00',
- `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`),
- PRIMARY KEY (`user_id`, `mailbox`)
-) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
-
-CREATE TABLE `cache_messages` (
- `user_id` int(10) UNSIGNED NOT NULL DEFAULT '0',
- `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',
- `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`),
- PRIMARY KEY (`user_id`, `mailbox`, `uid`)
-) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
-
-/*!40014 SET FOREIGN_KEY_CHECKS=1 */;
-
--- Updates from version 0.7-beta
-
-ALTER TABLE `session` CHANGE `sess_id` `sess_id` varchar(128) NOT NULL;
-
--- Updates from version 0.7
-
-/*!40014 SET FOREIGN_KEY_CHECKS=0 */;
-
-ALTER TABLE `contacts` DROP FOREIGN KEY `user_id_fk_contacts`;
-ALTER TABLE `contacts` DROP INDEX `user_contacts_index`;
-ALTER TABLE `contacts` MODIFY `email` text NOT NULL;
-ALTER TABLE `contacts` ADD INDEX `user_contacts_index` (`user_id`,`del`);
-ALTER TABLE `contacts` ADD CONSTRAINT `user_id_fk_contacts` FOREIGN KEY (`user_id`)
-   REFERENCES `users`(`user_id`) ON DELETE CASCADE ON UPDATE CASCADE;
-
-ALTER TABLE `cache` ALTER `user_id` DROP DEFAULT;
-ALTER TABLE `cache_index` ALTER `user_id` DROP DEFAULT;
-ALTER TABLE `cache_thread` ALTER `user_id` DROP DEFAULT;
-ALTER TABLE `cache_messages` ALTER `user_id` DROP DEFAULT;
-ALTER TABLE `contacts` ALTER `user_id` DROP DEFAULT;
-ALTER TABLE `contactgroups` ALTER `user_id` DROP DEFAULT;
-ALTER TABLE `contactgroupmembers` ALTER `contact_id` DROP DEFAULT;
-ALTER TABLE `identities` ALTER `user_id` DROP DEFAULT;
-ALTER TABLE `searches` ALTER `user_id` DROP DEFAULT;
-
-/*!40014 SET FOREIGN_KEY_CHECKS=1 */;
-
--- Updates from version 0.8
-
-ALTER TABLE `cache` DROP COLUMN `cache_id`;
-ALTER TABLE `users` DROP COLUMN `alias`;
-ALTER TABLE `identities` ADD INDEX `email_identities_index` (`email`, `del`);
diff --git a/SQL/mysql/2008030300.sql b/SQL/mysql/2008030300.sql
new file mode 100644
index 000000000..9a3d04847
--- /dev/null
+++ b/SQL/mysql/2008030300.sql
@@ -0,0 +1,16 @@
+-- Updates from version 0.1-stable
+
+TRUNCATE TABLE `messages`;
+
+ALTER TABLE `messages`
+  DROP INDEX `idx`,
+  DROP INDEX `uid`;
+
+ALTER TABLE `cache`
+  DROP INDEX `cache_key`,
+  DROP INDEX `session_id`,
+  ADD INDEX `user_cache_index` (`user_id`,`cache_key`);
+
+ALTER TABLE `users`
+    ADD INDEX `username_index` (`username`),
+    ADD INDEX `alias_index` (`alias`);
diff --git a/SQL/mysql/2008040500.sql b/SQL/mysql/2008040500.sql
new file mode 100644
index 000000000..f538f6378
--- /dev/null
+++ b/SQL/mysql/2008040500.sql
@@ -0,0 +1,9 @@
+-- Updates from version 0.1.1
+
+ALTER TABLE `identities`
+    MODIFY `signature` text, 
+    MODIFY `bcc` varchar(128) NOT NULL DEFAULT '', 
+    MODIFY `reply-to` varchar(128) NOT NULL DEFAULT '', 
+    MODIFY `organization` varchar(128) NOT NULL DEFAULT '',
+    MODIFY `name` varchar(128) NOT NULL, 
+    MODIFY `email` varchar(128) NOT NULL; 
diff --git a/SQL/mysql/2008060900.sql b/SQL/mysql/2008060900.sql
new file mode 100644
index 000000000..9f8de0a54
--- /dev/null
+++ b/SQL/mysql/2008060900.sql
@@ -0,0 +1,4 @@
+-- Updates from version 0.2-alpha
+
+ALTER TABLE `messages`
+    ADD INDEX `created_index` (`created`);
diff --git a/SQL/mysql/2008092100.sql b/SQL/mysql/2008092100.sql
new file mode 100644
index 000000000..3989c75f2
--- /dev/null
+++ b/SQL/mysql/2008092100.sql
@@ -0,0 +1,20 @@
+-- Updates from version 0.2-beta (InnoDB required)
+
+ALTER TABLE `cache`
+    DROP `session_id`;
+
+ALTER TABLE `session`
+    ADD INDEX `changed_index` (`changed`);
+
+ALTER TABLE `cache`
+    ADD INDEX `created_index` (`created`);
+
+ALTER TABLE `users`
+    CHANGE `language` `language` varchar(5);
+
+ALTER TABLE `cache` ENGINE=InnoDB;
+ALTER TABLE `session` ENGINE=InnoDB;
+ALTER TABLE `messages` ENGINE=InnoDB;
+ALTER TABLE `users` ENGINE=InnoDB;
+ALTER TABLE `contacts` ENGINE=InnoDB;
+ALTER TABLE `identities` ENGINE=InnoDB;
diff --git a/SQL/mysql/2009090400.sql b/SQL/mysql/2009090400.sql
new file mode 100644
index 000000000..fd31bed5b
--- /dev/null
+++ b/SQL/mysql/2009090400.sql
@@ -0,0 +1,12 @@
+-- Updates from version 0.3-stable
+
+TRUNCATE `messages`;
+
+ALTER TABLE `messages`
+    ADD INDEX `index_index` (`user_id`, `cache_key`, `idx`);
+
+ALTER TABLE `session` 
+    CHANGE `vars` `vars` MEDIUMTEXT NOT NULL;
+
+ALTER TABLE `contacts`
+    ADD INDEX `user_contacts_index` (`user_id`,`email`);
diff --git a/SQL/mysql/2009103100.sql b/SQL/mysql/2009103100.sql
new file mode 100644
index 000000000..aafbe238f
--- /dev/null
+++ b/SQL/mysql/2009103100.sql
@@ -0,0 +1,52 @@
+-- Updates from version 0.3.1
+-- WARNING: Make sure that all tables are using InnoDB engine!!!
+--          If not, use: ALTER TABLE xxx ENGINE=InnoDB;
+
+/* MySQL bug workaround: http://bugs.mysql.com/bug.php?id=46293 */
+/*!40014 SET FOREIGN_KEY_CHECKS=0 */;
+
+ALTER TABLE `messages` DROP FOREIGN KEY `user_id_fk_messages`;
+ALTER TABLE `cache` DROP FOREIGN KEY `user_id_fk_cache`;
+ALTER TABLE `contacts` DROP FOREIGN KEY `user_id_fk_contacts`;
+ALTER TABLE `identities` DROP FOREIGN KEY `user_id_fk_identities`;
+
+ALTER TABLE `messages` ADD CONSTRAINT `user_id_fk_messages` FOREIGN KEY (`user_id`)
+ REFERENCES `users`(`user_id`) ON DELETE CASCADE ON UPDATE CASCADE;
+ALTER TABLE `cache` ADD CONSTRAINT `user_id_fk_cache` FOREIGN KEY (`user_id`)
+ REFERENCES `users`(`user_id`) ON DELETE CASCADE ON UPDATE CASCADE;
+ALTER TABLE `contacts` ADD CONSTRAINT `user_id_fk_contacts` FOREIGN KEY (`user_id`)
+ REFERENCES `users`(`user_id`) ON DELETE CASCADE ON UPDATE CASCADE;
+ALTER TABLE `identities` ADD CONSTRAINT `user_id_fk_identities` FOREIGN KEY (`user_id`)
+ REFERENCES `users`(`user_id`) ON DELETE CASCADE ON UPDATE CASCADE;
+
+ALTER TABLE `contacts` ALTER `name` SET DEFAULT '';
+ALTER TABLE `contacts` ALTER `firstname` SET DEFAULT '';
+ALTER TABLE `contacts` ALTER `surname` SET DEFAULT '';
+
+ALTER TABLE `identities` ADD INDEX `user_identities_index` (`user_id`, `del`);
+ALTER TABLE `identities` ADD `changed` datetime NOT NULL DEFAULT '1000-01-01 00:00:00' AFTER `user_id`;
+
+CREATE TABLE `contactgroups` (
+  `contactgroup_id` int(10) UNSIGNED NOT NULL AUTO_INCREMENT,
+  `user_id` int(10) UNSIGNED NOT NULL DEFAULT '0',
+  `changed` datetime NOT NULL DEFAULT '1000-01-01 00:00:00',
+  `del` tinyint(1) NOT NULL DEFAULT '0',
+  `name` varchar(128) NOT NULL DEFAULT '',
+  PRIMARY KEY(`contactgroup_id`),
+  CONSTRAINT `user_id_fk_contactgroups` FOREIGN KEY (`user_id`)
+    REFERENCES `users`(`user_id`) ON DELETE CASCADE ON UPDATE CASCADE,
+  INDEX `contactgroups_user_index` (`user_id`,`del`)
+) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
+
+CREATE TABLE `contactgroupmembers` (
+  `contactgroup_id` int(10) UNSIGNED NOT NULL,
+  `contact_id` int(10) UNSIGNED NOT NULL DEFAULT '0',
+  `created` datetime NOT NULL DEFAULT '1000-01-01 00:00:00',
+  PRIMARY KEY (`contactgroup_id`, `contact_id`),
+  CONSTRAINT `contactgroup_id_fk_contactgroups` FOREIGN KEY (`contactgroup_id`)
+    REFERENCES `contactgroups`(`contactgroup_id`) ON DELETE CASCADE ON UPDATE CASCADE,
+  CONSTRAINT `contact_id_fk_contacts` FOREIGN KEY (`contact_id`)
+    REFERENCES `contacts`(`contact_id`) ON DELETE CASCADE ON UPDATE CASCADE
+) /*!40000 ENGINE=INNODB */;
+
+/*!40014 SET FOREIGN_KEY_CHECKS=1 */;
diff --git a/SQL/mysql/2010042300.sql b/SQL/mysql/2010042300.sql
new file mode 100644
index 000000000..8b90af45e
--- /dev/null
+++ b/SQL/mysql/2010042300.sql
@@ -0,0 +1,4 @@
+-- Updates from version 0.4-beta
+
+ALTER TABLE `users` CHANGE `last_login` `last_login` datetime DEFAULT NULL;
+UPDATE `users` SET `last_login` = NULL WHERE `last_login` = '1000-01-01 00:00:00';
diff --git a/SQL/mysql/2010100600.sql b/SQL/mysql/2010100600.sql
new file mode 100644
index 000000000..ca0fec858
--- /dev/null
+++ b/SQL/mysql/2010100600.sql
@@ -0,0 +1,8 @@
+-- Updates from version 0.4.2
+
+ALTER TABLE `users` DROP INDEX `username_index`;
+ALTER TABLE `users` ADD UNIQUE `username` (`username`, `mail_host`);
+
+ALTER TABLE `contacts` MODIFY `email` varchar(255) NOT NULL;
+
+TRUNCATE TABLE `messages`;
diff --git a/SQL/mysql/2011011200.sql b/SQL/mysql/2011011200.sql
new file mode 100644
index 000000000..6597034c2
--- /dev/null
+++ b/SQL/mysql/2011011200.sql
@@ -0,0 +1,8 @@
+-- Updates from version 0.5.x
+
+ALTER TABLE `contacts` ADD `words` TEXT NULL AFTER `vcard`;
+ALTER TABLE `contacts` CHANGE `vcard` `vcard` LONGTEXT /*!40101 CHARACTER SET utf8 */ NULL DEFAULT NULL;
+ALTER TABLE `contactgroupmembers` ADD INDEX `contactgroupmembers_contact_index` (`contact_id`);
+
+TRUNCATE TABLE `messages`;
+TRUNCATE TABLE `cache`;
diff --git a/SQL/mysql/2011092800.sql b/SQL/mysql/2011092800.sql
new file mode 100644
index 000000000..6b7cbe1f3
--- /dev/null
+++ b/SQL/mysql/2011092800.sql
@@ -0,0 +1,67 @@
+-- Updates from version 0.6
+
+/*!40014 SET FOREIGN_KEY_CHECKS=0 */;
+
+ALTER TABLE `users` CHANGE `alias` `alias` varchar(128) BINARY NOT NULL;
+ALTER TABLE `users` CHANGE `username` `username` varchar(128) BINARY NOT NULL;
+
+CREATE TABLE `dictionary` (
+  `user_id` int(10) UNSIGNED DEFAULT NULL,
+  `language` varchar(5) NOT NULL,
+  `data` longtext NOT NULL,
+  CONSTRAINT `user_id_fk_dictionary` FOREIGN KEY (`user_id`)
+    REFERENCES `users`(`user_id`) ON DELETE CASCADE ON UPDATE CASCADE,
+  UNIQUE `uniqueness` (`user_id`, `language`)
+) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
+
+CREATE TABLE `searches` (
+  `search_id` int(10) UNSIGNED NOT NULL AUTO_INCREMENT,
+  `user_id` int(10) UNSIGNED NOT NULL DEFAULT '0',
+  `type` int(3) NOT NULL DEFAULT '0',
+  `name` varchar(128) NOT NULL,
+  `data` text,
+  PRIMARY KEY(`search_id`),
+  CONSTRAINT `user_id_fk_searches` FOREIGN KEY (`user_id`)
+    REFERENCES `users`(`user_id`) ON DELETE CASCADE ON UPDATE CASCADE,
+  UNIQUE `uniqueness` (`user_id`, `type`, `name`)
+) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
+
+DROP TABLE `messages`;
+
+CREATE TABLE `cache_index` (
+ `user_id` int(10) UNSIGNED NOT NULL DEFAULT '0',
+ `mailbox` varchar(255) BINARY NOT NULL,
+ `changed` datetime NOT NULL DEFAULT '1000-01-01 00:00:00',
+ `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`),
+ PRIMARY KEY (`user_id`, `mailbox`)
+) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
+
+CREATE TABLE `cache_thread` (
+ `user_id` int(10) UNSIGNED NOT NULL DEFAULT '0',
+ `mailbox` varchar(255) BINARY NOT NULL,
+ `changed` datetime NOT NULL DEFAULT '1000-01-01 00:00:00',
+ `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`),
+ PRIMARY KEY (`user_id`, `mailbox`)
+) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
+
+CREATE TABLE `cache_messages` (
+ `user_id` int(10) UNSIGNED NOT NULL DEFAULT '0',
+ `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',
+ `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`),
+ PRIMARY KEY (`user_id`, `mailbox`, `uid`)
+) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
+
+/*!40014 SET FOREIGN_KEY_CHECKS=1 */;
diff --git a/SQL/mysql/2011111600.sql b/SQL/mysql/2011111600.sql
new file mode 100644
index 000000000..6f53daa9c
--- /dev/null
+++ b/SQL/mysql/2011111600.sql
@@ -0,0 +1,3 @@
+-- Updates from version 0.7-beta
+
+ALTER TABLE `session` CHANGE `sess_id` `sess_id` varchar(128) NOT NULL;
diff --git a/SQL/mysql/2011121400.sql b/SQL/mysql/2011121400.sql
new file mode 100644
index 000000000..5aee80601
--- /dev/null
+++ b/SQL/mysql/2011121400.sql
@@ -0,0 +1,22 @@
+-- Updates from version 0.7
+
+/*!40014 SET FOREIGN_KEY_CHECKS=0 */;
+
+ALTER TABLE `contacts` DROP FOREIGN KEY `user_id_fk_contacts`;
+ALTER TABLE `contacts` DROP INDEX `user_contacts_index`;
+ALTER TABLE `contacts` MODIFY `email` text NOT NULL;
+ALTER TABLE `contacts` ADD INDEX `user_contacts_index` (`user_id`,`del`);
+ALTER TABLE `contacts` ADD CONSTRAINT `user_id_fk_contacts` FOREIGN KEY (`user_id`)
+   REFERENCES `users`(`user_id`) ON DELETE CASCADE ON UPDATE CASCADE;
+
+ALTER TABLE `cache` ALTER `user_id` DROP DEFAULT;
+ALTER TABLE `cache_index` ALTER `user_id` DROP DEFAULT;
+ALTER TABLE `cache_thread` ALTER `user_id` DROP DEFAULT;
+ALTER TABLE `cache_messages` ALTER `user_id` DROP DEFAULT;
+ALTER TABLE `contacts` ALTER `user_id` DROP DEFAULT;
+ALTER TABLE `contactgroups` ALTER `user_id` DROP DEFAULT;
+ALTER TABLE `contactgroupmembers` ALTER `contact_id` DROP DEFAULT;
+ALTER TABLE `identities` ALTER `user_id` DROP DEFAULT;
+ALTER TABLE `searches` ALTER `user_id` DROP DEFAULT;
+
+/*!40014 SET FOREIGN_KEY_CHECKS=1 */;
diff --git a/SQL/mysql/2012080700.sql b/SQL/mysql/2012080700.sql
new file mode 100644
index 000000000..789b7122c
--- /dev/null
+++ b/SQL/mysql/2012080700.sql
@@ -0,0 +1,5 @@
+-- Updates from version 0.8
+
+ALTER TABLE `cache` DROP COLUMN `cache_id`;
+ALTER TABLE `users` DROP COLUMN `alias`;
+ALTER TABLE `identities` ADD INDEX `email_identities_index` (`email`, `del`);
diff --git a/SQL/mysql/2013011000.sql b/SQL/mysql/2013011000.sql
new file mode 100644
index 000000000..d1ea001db
--- /dev/null
+++ b/SQL/mysql/2013011000.sql
@@ -0,0 +1,7 @@
+-- Upgrade from 0.9-beta
+
+CREATE TABLE IF NOT EXISTS `system` (
+ `name` varchar(64) NOT NULL,
+ `value` mediumtext,
+ PRIMARY KEY(`name`)
+) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
diff --git a/SQL/postgres.initial.sql b/SQL/postgres.initial.sql
index f7b2d96d9..32d8edee8 100644
--- a/SQL/postgres.initial.sql
+++ b/SQL/postgres.initial.sql
@@ -262,3 +262,16 @@ CREATE TABLE searches (
     data text NOT NULL,
     CONSTRAINT searches_user_id_key UNIQUE (user_id, "type", name)
 );
+
+
+--
+-- Table "system"
+-- Name: system; Type: TABLE; Schema: public; Owner: postgres
+--
+
+CREATE TABLE "system" (
+    name varchar(64) NOT NULL PRIMARY KEY,
+    value text
+);
+
+INSERT INTO system (name, value) VALUES ('roundcube-version', '2013011700');
diff --git a/SQL/postgres.update.sql b/SQL/postgres.update.sql
deleted file mode 100644
index 11ab93bfc..000000000
--- a/SQL/postgres.update.sql
+++ /dev/null
@@ -1,185 +0,0 @@
--- Roundcube Webmail update script for Postgres databases
--- Updates from version 0.1-stable to 0.1.1
-
-CREATE INDEX cache_user_id_idx ON cache (user_id, cache_key);
-CREATE INDEX contacts_user_id_idx ON contacts (user_id);
-CREATE INDEX identities_user_id_idx ON identities (user_id);
-
-CREATE INDEX users_username_id_idx ON users (username);
-CREATE INDEX users_alias_id_idx ON users (alias);
-
--- added ON DELETE/UPDATE actions
-ALTER TABLE messages DROP CONSTRAINT messages_user_id_fkey;
-ALTER TABLE messages ADD FOREIGN KEY (user_id) REFERENCES users(user_id) ON DELETE CASCADE ON UPDATE CASCADE;
-ALTER TABLE identities DROP CONSTRAINT identities_user_id_fkey;
-ALTER TABLE identities ADD FOREIGN KEY (user_id) REFERENCES users(user_id) ON DELETE CASCADE ON UPDATE CASCADE;
-ALTER TABLE contacts DROP CONSTRAINT contacts_user_id_fkey;
-ALTER TABLE contacts ADD FOREIGN KEY (user_id) REFERENCES users(user_id) ON DELETE CASCADE ON UPDATE CASCADE;
-ALTER TABLE cache DROP CONSTRAINT cache_user_id_fkey;
-ALTER TABLE cache ADD FOREIGN KEY (user_id) REFERENCES users(user_id) ON DELETE CASCADE ON UPDATE CASCADE;
-
--- Updates from version 0.2-alpha
-
-CREATE INDEX messages_created_idx ON messages (created);
-
--- Updates from version 0.2-beta
-
-ALTER TABLE cache DROP session_id;
-
-CREATE INDEX session_changed_idx ON session (changed);
-CREATE INDEX cache_created_idx ON "cache" (created);
-
-ALTER TABLE users ALTER "language" DROP NOT NULL;
-ALTER TABLE users ALTER "language" DROP DEFAULT;
-
-ALTER TABLE identities ALTER del TYPE smallint;
-ALTER TABLE identities ALTER standard TYPE smallint;
-ALTER TABLE contacts ALTER del TYPE smallint;
-ALTER TABLE messages ALTER del TYPE smallint;
-
--- Updates from version 0.3-stable
-
-TRUNCATE messages;
-CREATE INDEX messages_index_idx ON messages (user_id, cache_key, idx);
-DROP INDEX contacts_user_id_idx;
-CREATE INDEX contacts_user_id_idx ON contacts (user_id, email);
-
--- Updates from version 0.3.1
-
-DROP INDEX identities_user_id_idx;
-CREATE INDEX identities_user_id_idx ON identities (user_id, del);
-
-ALTER TABLE identities ADD changed timestamp with time zone DEFAULT now() NOT NULL;
-
-CREATE SEQUENCE contactgroups_ids
-    INCREMENT BY 1
-    NO MAXVALUE
-    NO MINVALUE
-    CACHE 1;
-
-CREATE TABLE contactgroups (
-    contactgroup_id integer DEFAULT nextval('contactgroups_ids'::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,
-    del 	smallint 	NOT NULL DEFAULT 0,
-    name 	varchar(128) 	NOT NULL DEFAULT ''
-);
-
-CREATE INDEX contactgroups_user_id_idx ON contactgroups (user_id, del);
-
-CREATE TABLE contactgroupmembers (
-    contactgroup_id 	integer NOT NULL
-	REFERENCES contactgroups(contactgroup_id) ON DELETE CASCADE ON UPDATE CASCADE,
-    contact_id 		integer NOT NULL
-	REFERENCES contacts(contact_id) ON DELETE CASCADE ON UPDATE CASCADE,
-    created timestamp with time zone DEFAULT now() NOT NULL,
-    PRIMARY KEY (contactgroup_id, contact_id)
-);
-
--- Updates from version 0.4-beta
-
-ALTER TABLE users ALTER last_login DROP NOT NULL;
-ALTER TABLE users ALTER last_login SET DEFAULT NULL;
-
--- Updates from version 0.4.2
-
-DROP INDEX users_username_id_idx;
-ALTER TABLE users ADD CONSTRAINT users_username_key UNIQUE (username, mail_host);
-ALTER TABLE contacts ALTER email TYPE varchar(255);
-
-TRUNCATE messages;
-
--- Updates from version 0.5.1
--- Updates from version 0.5.2
--- Updates from version 0.5.3
--- Updates from version 0.5.4
-
-ALTER TABLE contacts ADD words TEXT NULL;
-CREATE INDEX contactgroupmembers_contact_id_idx ON contactgroupmembers (contact_id);
-
-TRUNCATE messages;
-TRUNCATE cache;
-
--- Updates from version 0.6
-
-CREATE TABLE dictionary (
-    user_id integer DEFAULT NULL
-        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")
-);
-
-CREATE SEQUENCE search_ids
-    INCREMENT BY 1
-    NO MAXVALUE
-    NO MINVALUE
-    CACHE 1;
-
-CREATE TABLE searches (
-    search_id integer DEFAULT nextval('search_ids'::text) PRIMARY KEY,
-    user_id integer NOT NULL
-        REFERENCES users (user_id) ON DELETE CASCADE ON UPDATE CASCADE,
-    "type" smallint DEFAULT 0 NOT NULL,
-    name varchar(128) NOT NULL,
-    data text NOT NULL,
-    CONSTRAINT searches_user_id_key UNIQUE (user_id, "type", name)
-);
-
-DROP SEQUENCE message_ids;
-DROP TABLE messages;
-
-CREATE TABLE cache_index (
-    user_id integer NOT NULL
-    	REFERENCES users (user_id) ON DELETE CASCADE ON UPDATE CASCADE,
-    mailbox varchar(255) NOT NULL,
-    changed timestamp with time zone DEFAULT now() NOT 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 TABLE cache_thread (
-    user_id integer NOT NULL
-    	REFERENCES users (user_id) ON DELETE CASCADE ON UPDATE CASCADE,
-    mailbox varchar(255) NOT NULL,
-    changed timestamp with time zone DEFAULT now() NOT NULL,
-    data text NOT NULL,
-    PRIMARY KEY (user_id, mailbox)
-);
-
-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,
-    mailbox varchar(255) NOT NULL,
-    uid integer NOT NULL,
-    changed timestamp with time zone DEFAULT now() NOT 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);
-
--- Updates from version 0.7-beta
-
-ALTER TABLE "session" ALTER sess_id TYPE varchar(128);
-
--- Updates from version 0.7
-
-DROP INDEX contacts_user_id_idx;
-CREATE INDEX contacts_user_id_idx ON contacts USING btree (user_id, del);
-ALTER TABLE contacts ALTER email TYPE text;
-
--- Updates from version 0.8
-
-ALTER TABLE cache DROP COLUMN cache_id;
-DROP SEQUENCE cache_ids;
-
-ALTER TABLE users DROP COLUMN alias;
-CREATE INDEX identities_email_idx ON identities (email, del);
diff --git a/SQL/postgres/2008030300.sql b/SQL/postgres/2008030300.sql
new file mode 100644
index 000000000..67a8f158f
--- /dev/null
+++ b/SQL/postgres/2008030300.sql
@@ -0,0 +1,18 @@
+-- Updates from version 0.1-stable to 0.1.1
+
+CREATE INDEX cache_user_id_idx ON cache (user_id, cache_key);
+CREATE INDEX contacts_user_id_idx ON contacts (user_id);
+CREATE INDEX identities_user_id_idx ON identities (user_id);
+
+CREATE INDEX users_username_id_idx ON users (username);
+CREATE INDEX users_alias_id_idx ON users (alias);
+
+-- added ON DELETE/UPDATE actions
+ALTER TABLE messages DROP CONSTRAINT messages_user_id_fkey;
+ALTER TABLE messages ADD FOREIGN KEY (user_id) REFERENCES users(user_id) ON DELETE CASCADE ON UPDATE CASCADE;
+ALTER TABLE identities DROP CONSTRAINT identities_user_id_fkey;
+ALTER TABLE identities ADD FOREIGN KEY (user_id) REFERENCES users(user_id) ON DELETE CASCADE ON UPDATE CASCADE;
+ALTER TABLE contacts DROP CONSTRAINT contacts_user_id_fkey;
+ALTER TABLE contacts ADD FOREIGN KEY (user_id) REFERENCES users(user_id) ON DELETE CASCADE ON UPDATE CASCADE;
+ALTER TABLE cache DROP CONSTRAINT cache_user_id_fkey;
+ALTER TABLE cache ADD FOREIGN KEY (user_id) REFERENCES users(user_id) ON DELETE CASCADE ON UPDATE CASCADE;
diff --git a/SQL/postgres/2008060900.sql b/SQL/postgres/2008060900.sql
new file mode 100644
index 000000000..7c60a4422
--- /dev/null
+++ b/SQL/postgres/2008060900.sql
@@ -0,0 +1,3 @@
+-- Updates from version 0.2-alpha
+
+CREATE INDEX messages_created_idx ON messages (created);
diff --git a/SQL/postgres/2008092100.sql b/SQL/postgres/2008092100.sql
new file mode 100644
index 000000000..6cd19290c
--- /dev/null
+++ b/SQL/postgres/2008092100.sql
@@ -0,0 +1,14 @@
+-- Updates from version 0.2-beta
+
+ALTER TABLE cache DROP session_id;
+
+CREATE INDEX session_changed_idx ON session (changed);
+CREATE INDEX cache_created_idx ON "cache" (created);
+
+ALTER TABLE users ALTER "language" DROP NOT NULL;
+ALTER TABLE users ALTER "language" DROP DEFAULT;
+
+ALTER TABLE identities ALTER del TYPE smallint;
+ALTER TABLE identities ALTER standard TYPE smallint;
+ALTER TABLE contacts ALTER del TYPE smallint;
+ALTER TABLE messages ALTER del TYPE smallint;
diff --git a/SQL/postgres/2009090400.sql b/SQL/postgres/2009090400.sql
new file mode 100644
index 000000000..8eb4949e8
--- /dev/null
+++ b/SQL/postgres/2009090400.sql
@@ -0,0 +1,6 @@
+-- Updates from version 0.3-stable
+
+TRUNCATE messages;
+CREATE INDEX messages_index_idx ON messages (user_id, cache_key, idx);
+DROP INDEX contacts_user_id_idx;
+CREATE INDEX contacts_user_id_idx ON contacts (user_id, email);
diff --git a/SQL/postgres/2009103100.sql b/SQL/postgres/2009103100.sql
new file mode 100644
index 000000000..2350f79f7
--- /dev/null
+++ b/SQL/postgres/2009103100.sql
@@ -0,0 +1,32 @@
+-- Updates from version 0.3.1
+
+DROP INDEX identities_user_id_idx;
+CREATE INDEX identities_user_id_idx ON identities (user_id, del);
+
+ALTER TABLE identities ADD changed timestamp with time zone DEFAULT now() NOT NULL;
+
+CREATE SEQUENCE contactgroups_ids
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+CREATE TABLE contactgroups (
+    contactgroup_id integer DEFAULT nextval('contactgroups_ids'::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,
+    del smallint NOT NULL DEFAULT 0,
+    name varchar(128) NOT NULL DEFAULT ''
+);
+
+CREATE INDEX contactgroups_user_id_idx ON contactgroups (user_id, del);
+
+CREATE TABLE contactgroupmembers (
+    contactgroup_id integer NOT NULL
+        REFERENCES contactgroups(contactgroup_id) ON DELETE CASCADE ON UPDATE CASCADE,
+    contact_id integer NOT NULL
+        REFERENCES contacts(contact_id) ON DELETE CASCADE ON UPDATE CASCADE,
+    created timestamp with time zone DEFAULT now() NOT NULL,
+    PRIMARY KEY (contactgroup_id, contact_id)
+);
diff --git a/SQL/postgres/2010042300.sql b/SQL/postgres/2010042300.sql
new file mode 100644
index 000000000..bc9bd826a
--- /dev/null
+++ b/SQL/postgres/2010042300.sql
@@ -0,0 +1,4 @@
+-- Updates from version 0.4-beta
+
+ALTER TABLE users ALTER last_login DROP NOT NULL;
+ALTER TABLE users ALTER last_login SET DEFAULT NULL;
diff --git a/SQL/postgres/2010100600.sql b/SQL/postgres/2010100600.sql
new file mode 100644
index 000000000..8dfcc12df
--- /dev/null
+++ b/SQL/postgres/2010100600.sql
@@ -0,0 +1,7 @@
+-- Updates from version 0.4.2
+
+DROP INDEX users_username_id_idx;
+ALTER TABLE users ADD CONSTRAINT users_username_key UNIQUE (username, mail_host);
+ALTER TABLE contacts ALTER email TYPE varchar(255);
+
+TRUNCATE messages;
diff --git a/SQL/postgres/2011011200.sql b/SQL/postgres/2011011200.sql
new file mode 100644
index 000000000..db468d8e8
--- /dev/null
+++ b/SQL/postgres/2011011200.sql
@@ -0,0 +1,7 @@
+-- Updates from version 0.5.x
+
+ALTER TABLE contacts ADD words TEXT NULL;
+CREATE INDEX contactgroupmembers_contact_id_idx ON contactgroupmembers (contact_id);
+
+TRUNCATE messages;
+TRUNCATE cache;
diff --git a/SQL/postgres/2011092800.sql b/SQL/postgres/2011092800.sql
new file mode 100644
index 000000000..fac3cd371
--- /dev/null
+++ b/SQL/postgres/2011092800.sql
@@ -0,0 +1,64 @@
+-- Updates from version 0.6
+
+CREATE TABLE dictionary (
+    user_id integer DEFAULT NULL
+        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")
+);
+
+CREATE SEQUENCE search_ids
+    INCREMENT BY 1
+    NO MAXVALUE
+    NO MINVALUE
+    CACHE 1;
+
+CREATE TABLE searches (
+    search_id integer DEFAULT nextval('search_ids'::text) PRIMARY KEY,
+    user_id integer NOT NULL
+        REFERENCES users (user_id) ON DELETE CASCADE ON UPDATE CASCADE,
+    "type" smallint DEFAULT 0 NOT NULL,
+    name varchar(128) NOT NULL,
+    data text NOT NULL,
+    CONSTRAINT searches_user_id_key UNIQUE (user_id, "type", name)
+);
+
+DROP SEQUENCE message_ids;
+DROP TABLE messages;
+
+CREATE TABLE cache_index (
+    user_id integer NOT NULL
+        REFERENCES users (user_id) ON DELETE CASCADE ON UPDATE CASCADE,
+    mailbox varchar(255) NOT NULL,
+    changed timestamp with time zone DEFAULT now() NOT 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 TABLE cache_thread (
+    user_id integer NOT NULL
+        REFERENCES users (user_id) ON DELETE CASCADE ON UPDATE CASCADE,
+    mailbox varchar(255) NOT NULL,
+    changed timestamp with time zone DEFAULT now() NOT NULL,
+    data text NOT NULL,
+    PRIMARY KEY (user_id, mailbox)
+);
+
+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,
+    mailbox varchar(255) NOT NULL,
+    uid integer NOT NULL,
+    changed timestamp with time zone DEFAULT now() NOT 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);
diff --git a/SQL/postgres/2011111600.sql b/SQL/postgres/2011111600.sql
new file mode 100644
index 000000000..a382ba0ba
--- /dev/null
+++ b/SQL/postgres/2011111600.sql
@@ -0,0 +1,3 @@
+-- Updates from version 0.7-beta
+
+ALTER TABLE "session" ALTER sess_id TYPE varchar(128);
diff --git a/SQL/postgres/2011121400.sql b/SQL/postgres/2011121400.sql
new file mode 100644
index 000000000..81a0cb880
--- /dev/null
+++ b/SQL/postgres/2011121400.sql
@@ -0,0 +1,5 @@
+-- Updates from version 0.7
+
+DROP INDEX contacts_user_id_idx;
+CREATE INDEX contacts_user_id_idx ON contacts USING btree (user_id, del);
+ALTER TABLE contacts ALTER email TYPE text;
diff --git a/SQL/postgres/2012080700.sql b/SQL/postgres/2012080700.sql
new file mode 100644
index 000000000..41f60168e
--- /dev/null
+++ b/SQL/postgres/2012080700.sql
@@ -0,0 +1,7 @@
+-- Updates from version 0.8
+
+ALTER TABLE cache DROP COLUMN cache_id;
+DROP SEQUENCE cache_ids;
+
+ALTER TABLE users DROP COLUMN alias;
+CREATE INDEX identities_email_idx ON identities (email, del);
diff --git a/SQL/postgres/2013011000.sql b/SQL/postgres/2013011000.sql
new file mode 100644
index 000000000..a8cf917d0
--- /dev/null
+++ b/SQL/postgres/2013011000.sql
@@ -0,0 +1,4 @@
+CREATE TABLE "system" (
+    name varchar(64) NOT NULL PRIMARY KEY,
+    value text
+);
diff --git a/SQL/sqlite.initial.sql b/SQL/sqlite.initial.sql
index f5b5615d8..83874ce7c 100644
--- a/SQL/sqlite.initial.sql
+++ b/SQL/sqlite.initial.sql
@@ -197,3 +197,16 @@ CREATE TABLE cache_messages (
 );
 
 CREATE INDEX ix_cache_messages_changed ON cache_messages (changed);
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table system
+--
+
+CREATE TABLE system (
+  name varchar(64) NOT NULL PRIMARY KEY,
+  value text NOT NULL
+);
+
+INSERT INTO system (name, value) VALUES ('roundcube-version', '2013011700');
diff --git a/SQL/sqlite.update.sql b/SQL/sqlite.update.sql
deleted file mode 100644
index 72a29e9ae..000000000
--- a/SQL/sqlite.update.sql
+++ /dev/null
@@ -1,380 +0,0 @@
--- Roundcube Webmail update script for SQLite databases
--- Updates from version 0.1-stable to 0.1.1
-
-DROP TABLE messages;
-
-CREATE TABLE messages (
-  message_id integer NOT NULL PRIMARY KEY,
-  user_id integer NOT NULL default '0',
-  del tinyint NOT NULL default '0',
-  cache_key varchar(128) NOT NULL default '',
-  created datetime NOT NULL default '0000-00-00 00:00:00',
-  idx integer NOT NULL default '0',
-  uid integer NOT NULL default '0',
-  subject varchar(255) NOT NULL default '',
-  "from" varchar(255) NOT NULL default '',
-  "to" varchar(255) NOT NULL default '',
-  "cc" varchar(255) NOT NULL default '',
-  "date" datetime NOT NULL default '0000-00-00 00:00:00',
-  size integer NOT NULL default '0',
-  headers text NOT NULL,
-  structure text
-);
-
-CREATE INDEX ix_messages_user_cache_uid ON messages(user_id,cache_key,uid);
-CREATE INDEX ix_users_username ON users(username);
-CREATE INDEX ix_users_alias ON users(alias);
-
--- Updates from version 0.2-alpha
-
-CREATE INDEX ix_messages_created ON messages (created);
-
--- Updates from version 0.2-beta
-
-CREATE INDEX ix_session_changed ON session (changed);
-CREATE INDEX ix_cache_created ON cache (created);
-
--- Updates from version 0.3-stable
-
-DELETE FROM messages;
-DROP INDEX ix_messages_user_cache_uid;
-CREATE UNIQUE INDEX ix_messages_user_cache_uid ON messages (user_id,cache_key,uid);
-CREATE INDEX ix_messages_index ON messages (user_id,cache_key,idx);
-DROP INDEX ix_contacts_user_id;
-CREATE INDEX ix_contacts_user_id ON contacts(user_id, email);
-
--- Updates from version 0.3.1
-
--- ALTER TABLE identities ADD COLUMN changed datetime NOT NULL default '0000-00-00 00:00:00'; --
-
-CREATE TABLE temp_identities (
-  identity_id integer NOT NULL PRIMARY KEY,
-  user_id integer NOT NULL default '0',
-  standard tinyint NOT NULL default '0',
-  name varchar(128) NOT NULL default '',
-  organization varchar(128) default '',
-  email varchar(128) NOT NULL default '',
-  "reply-to" varchar(128) NOT NULL default '',
-  bcc varchar(128) NOT NULL default '',
-  signature text NOT NULL default '',
-  html_signature tinyint NOT NULL default '0'
-);
-INSERT INTO temp_identities (identity_id, user_id, standard, name, organization, email, "reply-to", bcc, signature, html_signature)
-  SELECT identity_id, user_id, standard, name, organization, email, "reply-to", bcc, signature, html_signature
-  FROM identities WHERE del=0;
-
-DROP INDEX ix_identities_user_id;
-DROP TABLE identities;
-
-CREATE TABLE identities (
-  identity_id integer NOT NULL PRIMARY KEY,
-  user_id integer NOT NULL default '0',
-  changed datetime NOT NULL default '0000-00-00 00:00:00',
-  del tinyint NOT NULL default '0',
-  standard tinyint NOT NULL default '0',
-  name varchar(128) NOT NULL default '',
-  organization varchar(128) default '',
-  email varchar(128) NOT NULL default '',
-  "reply-to" varchar(128) NOT NULL default '',
-  bcc varchar(128) NOT NULL default '',
-  signature text NOT NULL default '',
-  html_signature tinyint NOT NULL default '0'
-);
-CREATE INDEX ix_identities_user_id ON identities(user_id, del);
-
-INSERT INTO identities (identity_id, user_id, standard, name, organization, email, "reply-to", bcc, signature, html_signature)
-  SELECT identity_id, user_id, standard, name, organization, email, "reply-to", bcc, signature, html_signature
-  FROM temp_identities;
-
-DROP TABLE temp_identities;
-
-CREATE TABLE contactgroups (
-  contactgroup_id integer NOT NULL PRIMARY KEY,
-  user_id integer NOT NULL default '0',
-  changed datetime NOT NULL default '0000-00-00 00:00:00',
-  del tinyint NOT NULL default '0',
-  name varchar(128) NOT NULL default ''
-);
-
-CREATE INDEX ix_contactgroups_user_id ON contactgroups(user_id, del);
-
-CREATE TABLE contactgroupmembers (
-  contactgroup_id integer NOT NULL,
-  contact_id integer NOT NULL default '0',
-  created datetime NOT NULL default '0000-00-00 00:00:00',
-  PRIMARY KEY (contactgroup_id, contact_id)
-);
-
--- Updates from version 0.3.1
-
-CREATE TABLE tmp_users (
-  user_id integer NOT NULL PRIMARY KEY,
-  username varchar(128) NOT NULL default '',
-  mail_host varchar(128) NOT NULL default '',
-  alias varchar(128) NOT NULL default '',
-  created datetime NOT NULL default '0000-00-00 00:00:00',
-  last_login datetime NOT NULL default '0000-00-00 00:00:00',
-  language varchar(5),
-  preferences text NOT NULL default ''
-);
-
-INSERT INTO tmp_users (user_id, username, mail_host, alias, created, last_login, language, preferences)
-    SELECT user_id, username, mail_host, alias, created, last_login, language, preferences FROM users;
-
-DROP TABLE users;
-
-CREATE TABLE users (
-  user_id integer NOT NULL PRIMARY KEY,
-  username varchar(128) NOT NULL default '',
-  mail_host varchar(128) NOT NULL default '',
-  alias varchar(128) NOT NULL default '',
-  created datetime NOT NULL default '0000-00-00 00:00:00',
-  last_login datetime DEFAULT NULL,
-  language varchar(5),
-  preferences text NOT NULL default ''
-);
-
-INSERT INTO users (user_id, username, mail_host, alias, created, last_login, language, preferences)
-    SELECT user_id, username, mail_host, alias, created, last_login, language, preferences FROM tmp_users;
-
-CREATE INDEX ix_users_username ON users(username);
-CREATE INDEX ix_users_alias ON users(alias);
-DROP TABLE tmp_users;
-
--- Updates from version 0.4.2
-
-DROP INDEX ix_users_username;
-CREATE UNIQUE INDEX ix_users_username ON users(username, mail_host);
-
-CREATE TABLE contacts_tmp (
-    contact_id integer NOT NULL PRIMARY KEY,
-    user_id integer NOT NULL default '0',
-    changed datetime NOT NULL default '0000-00-00 00:00:00',
-    del tinyint NOT NULL default '0',
-    name varchar(128) NOT NULL default '',
-    email varchar(255) NOT NULL default '',
-    firstname varchar(128) NOT NULL default '',
-    surname varchar(128) NOT NULL default '',
-    vcard text NOT NULL default ''
-);
-
-INSERT INTO contacts_tmp (contact_id, user_id, changed, del, name, email, firstname, surname, vcard)
-    SELECT contact_id, user_id, changed, del, name, email, firstname, surname, vcard FROM contacts;
-
-DROP TABLE contacts;
-CREATE TABLE contacts (
-    contact_id integer NOT NULL PRIMARY KEY,
-    user_id integer NOT NULL default '0',
-    changed datetime NOT NULL default '0000-00-00 00:00:00',
-    del tinyint NOT NULL default '0',
-    name varchar(128) NOT NULL default '',
-    email varchar(255) NOT NULL default '',
-    firstname varchar(128) NOT NULL default '',
-    surname varchar(128) NOT NULL default '',
-    vcard text NOT NULL default ''
-);
-
-INSERT INTO contacts (contact_id, user_id, changed, del, name, email, firstname, surname, vcard)
-    SELECT contact_id, user_id, changed, del, name, email, firstname, surname, vcard FROM contacts_tmp;
-
-CREATE INDEX ix_contacts_user_id ON contacts(user_id, email);
-DROP TABLE contacts_tmp;
-
-DELETE FROM messages;
-
-
--- Updates from version 0.5.1
--- Updates from version 0.5.2
--- Updates from version 0.5.3
--- Updates from version 0.5.4
-
-CREATE TABLE contacts_tmp (
-    contact_id integer NOT NULL PRIMARY KEY,
-    user_id integer NOT NULL default '0',
-    changed datetime NOT NULL default '0000-00-00 00:00:00',
-    del tinyint NOT NULL default '0',
-    name varchar(128) NOT NULL default '',
-    email varchar(255) NOT NULL default '',
-    firstname varchar(128) NOT NULL default '',
-    surname varchar(128) NOT NULL default '',
-    vcard text NOT NULL default ''
-);
-
-INSERT INTO contacts_tmp (contact_id, user_id, changed, del, name, email, firstname, surname, vcard)
-    SELECT contact_id, user_id, changed, del, name, email, firstname, surname, vcard FROM contacts;
-
-DROP TABLE contacts;
-CREATE TABLE contacts (
-    contact_id integer NOT NULL PRIMARY KEY,
-    user_id integer NOT NULL default '0',
-    changed datetime NOT NULL default '0000-00-00 00:00:00',
-    del tinyint NOT NULL default '0',
-    name varchar(128) NOT NULL default '',
-    email varchar(255) NOT NULL default '',
-    firstname varchar(128) NOT NULL default '',
-    surname varchar(128) NOT NULL default '',
-    vcard text NOT NULL default '',
-    words text NOT NULL default ''
-);
-
-INSERT INTO contacts (contact_id, user_id, changed, del, name, email, firstname, surname, vcard)
-    SELECT contact_id, user_id, changed, del, name, email, firstname, surname, vcard FROM contacts_tmp;
-
-CREATE INDEX ix_contacts_user_id ON contacts(user_id, email);
-DROP TABLE contacts_tmp;
-
-
-DELETE FROM messages;
-DELETE FROM cache;
-CREATE INDEX ix_contactgroupmembers_contact_id ON contactgroupmembers (contact_id);
-
--- Updates from version 0.6
-
-CREATE TABLE dictionary (
-    user_id integer DEFAULT NULL,
-   "language" varchar(5) NOT NULL,
-    data text NOT NULL
-);
-
-CREATE UNIQUE INDEX ix_dictionary_user_language ON dictionary (user_id, "language");
-
-CREATE TABLE searches (
-  search_id integer NOT NULL PRIMARY KEY,
-  user_id integer NOT NULL DEFAULT '0',
-  "type" smallint NOT NULL DEFAULT '0',
-  name varchar(128) NOT NULL,
-  data text NOT NULL
-);
-
-CREATE UNIQUE INDEX ix_searches_user_type_name ON searches (user_id, type, name);
-
-DROP TABLE messages;
-
-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',
-    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 TABLE cache_thread (
-    user_id integer NOT NULL,
-    mailbox varchar(255) NOT NULL,
-    changed datetime NOT NULL default '0000-00-00 00:00:00',
-    data text NOT NULL,
-    PRIMARY KEY (user_id, mailbox)
-);
-
-CREATE INDEX ix_cache_thread_changed ON cache_thread (changed);
-
-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',
-    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);
-
--- Updates from version 0.7-beta
-
-DROP TABLE session;
-CREATE TABLE session (
-  sess_id varchar(128) NOT NULL PRIMARY KEY,
-  created datetime NOT NULL default '0000-00-00 00:00:00',
-  changed datetime NOT NULL default '0000-00-00 00:00:00',
-  ip varchar(40) NOT NULL default '',
-  vars text NOT NULL
-);
-CREATE INDEX ix_session_changed ON session (changed);
-
--- Updates from version 0.7
-
-CREATE TABLE contacts_tmp (
-  contact_id integer NOT NULL PRIMARY KEY,
-  user_id integer NOT NULL,
-  changed datetime NOT NULL default '0000-00-00 00:00:00',
-  del tinyint NOT NULL default '0',
-  name varchar(128) NOT NULL default '',
-  email text NOT NULL default '',
-  firstname varchar(128) NOT NULL default '',
-  surname varchar(128) NOT NULL default '',
-  vcard text NOT NULL default '',
-  words text NOT NULL default ''
-);
-
-INSERT INTO contacts_tmp (contact_id, user_id, changed, del, name, email, firstname, surname, vcard, words)
-    SELECT contact_id, user_id, changed, del, name, email, firstname, surname, vcard, words FROM contacts;
-
-DROP TABLE contacts;
-
-CREATE TABLE contacts (
-  contact_id integer NOT NULL PRIMARY KEY,
-  user_id integer NOT NULL,
-  changed datetime NOT NULL default '0000-00-00 00:00:00',
-  del tinyint NOT NULL default '0',
-  name varchar(128) NOT NULL default '',
-  email text NOT NULL default '',
-  firstname varchar(128) NOT NULL default '',
-  surname varchar(128) NOT NULL default '',
-  vcard text NOT NULL default '',
-  words text NOT NULL default ''
-);
-
-INSERT INTO contacts (contact_id, user_id, changed, del, name, email, firstname, surname, vcard, words)
-    SELECT contact_id, user_id, changed, del, name, email, firstname, surname, vcard, words FROM contacts_tmp;
-
-CREATE INDEX ix_contacts_user_id ON contacts(user_id, del);
-DROP TABLE contacts_tmp;
-
--- Updates from version 0.8
-
-DROP 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);
-
-CREATE TABLE tmp_users (
-  user_id integer NOT NULL PRIMARY KEY,
-  username varchar(128) NOT NULL default '',
-  mail_host varchar(128) NOT NULL default '',
-  created datetime NOT NULL default '0000-00-00 00:00:00',
-  last_login datetime DEFAULT NULL,
-  language varchar(5),
-  preferences text NOT NULL default ''
-);
-
-INSERT INTO tmp_users (user_id, username, mail_host, created, last_login, language, preferences)
-    SELECT user_id, username, mail_host, created, last_login, language, preferences FROM users;
-
-DROP TABLE users;
-
-CREATE TABLE users (
-  user_id integer NOT NULL PRIMARY KEY,
-  username varchar(128) NOT NULL default '',
-  mail_host varchar(128) NOT NULL default '',
-  created datetime NOT NULL default '0000-00-00 00:00:00',
-  last_login datetime DEFAULT NULL,
-  language varchar(5),
-  preferences text NOT NULL default ''
-);
-
-INSERT INTO users (user_id, username, mail_host, created, last_login, language, preferences)
-    SELECT user_id, username, mail_host, created, last_login, language, preferences FROM tmp_users;
-
-CREATE UNIQUE INDEX ix_users_username ON users(username, mail_host);
-
-CREATE INDEX ix_identities_email ON identities(email, del);
diff --git a/SQL/sqlite/2008030300.sql b/SQL/sqlite/2008030300.sql
new file mode 100644
index 000000000..b5b4890bf
--- /dev/null
+++ b/SQL/sqlite/2008030300.sql
@@ -0,0 +1,25 @@
+-- Updates from version 0.1-stable to 0.1.1
+
+DROP TABLE messages;
+
+CREATE TABLE messages (
+  message_id integer NOT NULL PRIMARY KEY,
+  user_id integer NOT NULL default '0',
+  del tinyint NOT NULL default '0',
+  cache_key varchar(128) NOT NULL default '',
+  created datetime NOT NULL default '0000-00-00 00:00:00',
+  idx integer NOT NULL default '0',
+  uid integer NOT NULL default '0',
+  subject varchar(255) NOT NULL default '',
+  "from" varchar(255) NOT NULL default '',
+  "to" varchar(255) NOT NULL default '',
+  "cc" varchar(255) NOT NULL default '',
+  "date" datetime NOT NULL default '0000-00-00 00:00:00',
+  size integer NOT NULL default '0',
+  headers text NOT NULL,
+  structure text
+);
+
+CREATE INDEX ix_messages_user_cache_uid ON messages(user_id,cache_key,uid);
+CREATE INDEX ix_users_username ON users(username);
+CREATE INDEX ix_users_alias ON users(alias);
diff --git a/SQL/sqlite/2008060900.sql b/SQL/sqlite/2008060900.sql
new file mode 100644
index 000000000..157029c28
--- /dev/null
+++ b/SQL/sqlite/2008060900.sql
@@ -0,0 +1,3 @@
+-- Updates from version 0.2-alpha
+
+CREATE INDEX ix_messages_created ON messages (created);
diff --git a/SQL/sqlite/2008092100.sql b/SQL/sqlite/2008092100.sql
new file mode 100644
index 000000000..8bc081c79
--- /dev/null
+++ b/SQL/sqlite/2008092100.sql
@@ -0,0 +1,4 @@
+-- Updates from version 0.2-beta
+
+CREATE INDEX ix_session_changed ON session (changed);
+CREATE INDEX ix_cache_created ON cache (created);
diff --git a/SQL/sqlite/2009090400.sql b/SQL/sqlite/2009090400.sql
new file mode 100644
index 000000000..c8a53edf1
--- /dev/null
+++ b/SQL/sqlite/2009090400.sql
@@ -0,0 +1,8 @@
+-- Updates from version 0.3-stable
+
+DELETE FROM messages;
+DROP INDEX ix_messages_user_cache_uid;
+CREATE UNIQUE INDEX ix_messages_user_cache_uid ON messages (user_id,cache_key,uid);
+CREATE INDEX ix_messages_index ON messages (user_id,cache_key,idx);
+DROP INDEX ix_contacts_user_id;
+CREATE INDEX ix_contacts_user_id ON contacts(user_id, email);
diff --git a/SQL/sqlite/2009103100.sql b/SQL/sqlite/2009103100.sql
new file mode 100644
index 000000000..bd7b1741c
--- /dev/null
+++ b/SQL/sqlite/2009103100.sql
@@ -0,0 +1,61 @@
+-- Updates from version 0.3.1
+
+-- ALTER TABLE identities ADD COLUMN changed datetime NOT NULL default '0000-00-00 00:00:00'; --
+
+CREATE TABLE temp_identities (
+  identity_id integer NOT NULL PRIMARY KEY,
+  user_id integer NOT NULL default '0',
+  standard tinyint NOT NULL default '0',
+  name varchar(128) NOT NULL default '',
+  organization varchar(128) default '',
+  email varchar(128) NOT NULL default '',
+  "reply-to" varchar(128) NOT NULL default '',
+  bcc varchar(128) NOT NULL default '',
+  signature text NOT NULL default '',
+  html_signature tinyint NOT NULL default '0'
+);
+INSERT INTO temp_identities (identity_id, user_id, standard, name, organization, email, "reply-to", bcc, signature, html_signature)
+  SELECT identity_id, user_id, standard, name, organization, email, "reply-to", bcc, signature, html_signature
+  FROM identities WHERE del=0;
+
+DROP INDEX ix_identities_user_id;
+DROP TABLE identities;
+
+CREATE TABLE identities (
+  identity_id integer NOT NULL PRIMARY KEY,
+  user_id integer NOT NULL default '0',
+  changed datetime NOT NULL default '0000-00-00 00:00:00',
+  del tinyint NOT NULL default '0',
+  standard tinyint NOT NULL default '0',
+  name varchar(128) NOT NULL default '',
+  organization varchar(128) default '',
+  email varchar(128) NOT NULL default '',
+  "reply-to" varchar(128) NOT NULL default '',
+  bcc varchar(128) NOT NULL default '',
+  signature text NOT NULL default '',
+  html_signature tinyint NOT NULL default '0'
+);
+CREATE INDEX ix_identities_user_id ON identities(user_id, del);
+
+INSERT INTO identities (identity_id, user_id, standard, name, organization, email, "reply-to", bcc, signature, html_signature)
+  SELECT identity_id, user_id, standard, name, organization, email, "reply-to", bcc, signature, html_signature
+  FROM temp_identities;
+
+DROP TABLE temp_identities;
+
+CREATE TABLE contactgroups (
+  contactgroup_id integer NOT NULL PRIMARY KEY,
+  user_id integer NOT NULL default '0',
+  changed datetime NOT NULL default '0000-00-00 00:00:00',
+  del tinyint NOT NULL default '0',
+  name varchar(128) NOT NULL default ''
+);
+
+CREATE INDEX ix_contactgroups_user_id ON contactgroups(user_id, del);
+
+CREATE TABLE contactgroupmembers (
+  contactgroup_id integer NOT NULL,
+  contact_id integer NOT NULL default '0',
+  created datetime NOT NULL default '0000-00-00 00:00:00',
+  PRIMARY KEY (contactgroup_id, contact_id)
+);
diff --git a/SQL/sqlite/2010042300.sql b/SQL/sqlite/2010042300.sql
new file mode 100644
index 000000000..1a9023cfc
--- /dev/null
+++ b/SQL/sqlite/2010042300.sql
@@ -0,0 +1,35 @@
+-- Updates from version 0.4-beta
+
+CREATE TABLE tmp_users (
+  user_id integer NOT NULL PRIMARY KEY,
+  username varchar(128) NOT NULL default '',
+  mail_host varchar(128) NOT NULL default '',
+  alias varchar(128) NOT NULL default '',
+  created datetime NOT NULL default '0000-00-00 00:00:00',
+  last_login datetime NOT NULL default '0000-00-00 00:00:00',
+  language varchar(5),
+  preferences text NOT NULL default ''
+);
+
+INSERT INTO tmp_users (user_id, username, mail_host, alias, created, last_login, language, preferences)
+    SELECT user_id, username, mail_host, alias, created, last_login, language, preferences FROM users;
+
+DROP TABLE users;
+
+CREATE TABLE users (
+  user_id integer NOT NULL PRIMARY KEY,
+  username varchar(128) NOT NULL default '',
+  mail_host varchar(128) NOT NULL default '',
+  alias varchar(128) NOT NULL default '',
+  created datetime NOT NULL default '0000-00-00 00:00:00',
+  last_login datetime DEFAULT NULL,
+  language varchar(5),
+  preferences text NOT NULL default ''
+);
+
+INSERT INTO users (user_id, username, mail_host, alias, created, last_login, language, preferences)
+    SELECT user_id, username, mail_host, alias, created, last_login, language, preferences FROM tmp_users;
+
+CREATE INDEX ix_users_username ON users(username);
+CREATE INDEX ix_users_alias ON users(alias);
+DROP TABLE tmp_users;
diff --git a/SQL/sqlite/2010100600.sql b/SQL/sqlite/2010100600.sql
new file mode 100644
index 000000000..5c7259f37
--- /dev/null
+++ b/SQL/sqlite/2010100600.sql
@@ -0,0 +1,40 @@
+-- Updates from version 0.4.2
+
+DROP INDEX ix_users_username;
+CREATE UNIQUE INDEX ix_users_username ON users(username, mail_host);
+
+CREATE TABLE contacts_tmp (
+    contact_id integer NOT NULL PRIMARY KEY,
+    user_id integer NOT NULL default '0',
+    changed datetime NOT NULL default '0000-00-00 00:00:00',
+    del tinyint NOT NULL default '0',
+    name varchar(128) NOT NULL default '',
+    email varchar(255) NOT NULL default '',
+    firstname varchar(128) NOT NULL default '',
+    surname varchar(128) NOT NULL default '',
+    vcard text NOT NULL default ''
+);
+
+INSERT INTO contacts_tmp (contact_id, user_id, changed, del, name, email, firstname, surname, vcard)
+    SELECT contact_id, user_id, changed, del, name, email, firstname, surname, vcard FROM contacts;
+
+DROP TABLE contacts;
+CREATE TABLE contacts (
+    contact_id integer NOT NULL PRIMARY KEY,
+    user_id integer NOT NULL default '0',
+    changed datetime NOT NULL default '0000-00-00 00:00:00',
+    del tinyint NOT NULL default '0',
+    name varchar(128) NOT NULL default '',
+    email varchar(255) NOT NULL default '',
+    firstname varchar(128) NOT NULL default '',
+    surname varchar(128) NOT NULL default '',
+    vcard text NOT NULL default ''
+);
+
+INSERT INTO contacts (contact_id, user_id, changed, del, name, email, firstname, surname, vcard)
+    SELECT contact_id, user_id, changed, del, name, email, firstname, surname, vcard FROM contacts_tmp;
+
+CREATE INDEX ix_contacts_user_id ON contacts(user_id, email);
+DROP TABLE contacts_tmp;
+
+DELETE FROM messages;
diff --git a/SQL/sqlite/2011011200.sql b/SQL/sqlite/2011011200.sql
new file mode 100644
index 000000000..4cca74076
--- /dev/null
+++ b/SQL/sqlite/2011011200.sql
@@ -0,0 +1,41 @@
+-- Updates from version 0.5.x
+
+CREATE TABLE contacts_tmp (
+    contact_id integer NOT NULL PRIMARY KEY,
+    user_id integer NOT NULL default '0',
+    changed datetime NOT NULL default '0000-00-00 00:00:00',
+    del tinyint NOT NULL default '0',
+    name varchar(128) NOT NULL default '',
+    email varchar(255) NOT NULL default '',
+    firstname varchar(128) NOT NULL default '',
+    surname varchar(128) NOT NULL default '',
+    vcard text NOT NULL default ''
+);
+
+INSERT INTO contacts_tmp (contact_id, user_id, changed, del, name, email, firstname, surname, vcard)
+    SELECT contact_id, user_id, changed, del, name, email, firstname, surname, vcard FROM contacts;
+
+DROP TABLE contacts;
+CREATE TABLE contacts (
+    contact_id integer NOT NULL PRIMARY KEY,
+    user_id integer NOT NULL default '0',
+    changed datetime NOT NULL default '0000-00-00 00:00:00',
+    del tinyint NOT NULL default '0',
+    name varchar(128) NOT NULL default '',
+    email varchar(255) NOT NULL default '',
+    firstname varchar(128) NOT NULL default '',
+    surname varchar(128) NOT NULL default '',
+    vcard text NOT NULL default '',
+    words text NOT NULL default ''
+);
+
+INSERT INTO contacts (contact_id, user_id, changed, del, name, email, firstname, surname, vcard)
+    SELECT contact_id, user_id, changed, del, name, email, firstname, surname, vcard FROM contacts_tmp;
+
+CREATE INDEX ix_contacts_user_id ON contacts(user_id, email);
+DROP TABLE contacts_tmp;
+
+
+DELETE FROM messages;
+DELETE FROM cache;
+CREATE INDEX ix_contactgroupmembers_contact_id ON contactgroupmembers (contact_id);
diff --git a/SQL/sqlite/2011092800.sql b/SQL/sqlite/2011092800.sql
new file mode 100644
index 000000000..27dbffc1d
--- /dev/null
+++ b/SQL/sqlite/2011092800.sql
@@ -0,0 +1,54 @@
+-- Updates from version 0.6
+
+CREATE TABLE dictionary (
+    user_id integer DEFAULT NULL,
+   "language" varchar(5) NOT NULL,
+    data text NOT NULL
+);
+
+CREATE UNIQUE INDEX ix_dictionary_user_language ON dictionary (user_id, "language");
+
+CREATE TABLE searches (
+  search_id integer NOT NULL PRIMARY KEY,
+  user_id integer NOT NULL DEFAULT '0',
+  "type" smallint NOT NULL DEFAULT '0',
+  name varchar(128) NOT NULL,
+  data text NOT NULL
+);
+
+CREATE UNIQUE INDEX ix_searches_user_type_name ON searches (user_id, type, name);
+
+DROP TABLE messages;
+
+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',
+    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 TABLE cache_thread (
+    user_id integer NOT NULL,
+    mailbox varchar(255) NOT NULL,
+    changed datetime NOT NULL default '0000-00-00 00:00:00',
+    data text NOT NULL,
+    PRIMARY KEY (user_id, mailbox)
+);
+
+CREATE INDEX ix_cache_thread_changed ON cache_thread (changed);
+
+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',
+    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);
diff --git a/SQL/sqlite/2011111600.sql b/SQL/sqlite/2011111600.sql
new file mode 100644
index 000000000..cea0d129e
--- /dev/null
+++ b/SQL/sqlite/2011111600.sql
@@ -0,0 +1,11 @@
+-- Updates from version 0.7-beta
+
+DROP TABLE session;
+CREATE TABLE session (
+  sess_id varchar(128) NOT NULL PRIMARY KEY,
+  created datetime NOT NULL default '0000-00-00 00:00:00',
+  changed datetime NOT NULL default '0000-00-00 00:00:00',
+  ip varchar(40) NOT NULL default '',
+  vars text NOT NULL
+);
+CREATE INDEX ix_session_changed ON session (changed);
diff --git a/SQL/sqlite/2011121400.sql b/SQL/sqlite/2011121400.sql
new file mode 100644
index 000000000..9d9227673
--- /dev/null
+++ b/SQL/sqlite/2011121400.sql
@@ -0,0 +1,38 @@
+-- Updates from version 0.7
+
+CREATE TABLE contacts_tmp (
+  contact_id integer NOT NULL PRIMARY KEY,
+  user_id integer NOT NULL,
+  changed datetime NOT NULL default '0000-00-00 00:00:00',
+  del tinyint NOT NULL default '0',
+  name varchar(128) NOT NULL default '',
+  email text NOT NULL default '',
+  firstname varchar(128) NOT NULL default '',
+  surname varchar(128) NOT NULL default '',
+  vcard text NOT NULL default '',
+  words text NOT NULL default ''
+);
+
+INSERT INTO contacts_tmp (contact_id, user_id, changed, del, name, email, firstname, surname, vcard, words)
+    SELECT contact_id, user_id, changed, del, name, email, firstname, surname, vcard, words FROM contacts;
+
+DROP TABLE contacts;
+
+CREATE TABLE contacts (
+  contact_id integer NOT NULL PRIMARY KEY,
+  user_id integer NOT NULL,
+  changed datetime NOT NULL default '0000-00-00 00:00:00',
+  del tinyint NOT NULL default '0',
+  name varchar(128) NOT NULL default '',
+  email text NOT NULL default '',
+  firstname varchar(128) NOT NULL default '',
+  surname varchar(128) NOT NULL default '',
+  vcard text NOT NULL default '',
+  words text NOT NULL default ''
+);
+
+INSERT INTO contacts (contact_id, user_id, changed, del, name, email, firstname, surname, vcard, words)
+    SELECT contact_id, user_id, changed, del, name, email, firstname, surname, vcard, words FROM contacts_tmp;
+
+CREATE INDEX ix_contacts_user_id ON contacts(user_id, del);
+DROP TABLE contacts_tmp;
diff --git a/SQL/sqlite/2012080700.sql b/SQL/sqlite/2012080700.sql
new file mode 100644
index 000000000..c6ede89e8
--- /dev/null
+++ b/SQL/sqlite/2012080700.sql
@@ -0,0 +1,44 @@
+-- Updates from version 0.8
+
+DROP 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);
+
+CREATE TABLE tmp_users (
+  user_id integer NOT NULL PRIMARY KEY,
+  username varchar(128) NOT NULL default '',
+  mail_host varchar(128) NOT NULL default '',
+  created datetime NOT NULL default '0000-00-00 00:00:00',
+  last_login datetime DEFAULT NULL,
+  language varchar(5),
+  preferences text NOT NULL default ''
+);
+
+INSERT INTO tmp_users (user_id, username, mail_host, created, last_login, language, preferences)
+    SELECT user_id, username, mail_host, created, last_login, language, preferences FROM users;
+
+DROP TABLE users;
+
+CREATE TABLE users (
+  user_id integer NOT NULL PRIMARY KEY,
+  username varchar(128) NOT NULL default '',
+  mail_host varchar(128) NOT NULL default '',
+  created datetime NOT NULL default '0000-00-00 00:00:00',
+  last_login datetime DEFAULT NULL,
+  language varchar(5),
+  preferences text NOT NULL default ''
+);
+
+INSERT INTO users (user_id, username, mail_host, created, last_login, language, preferences)
+    SELECT user_id, username, mail_host, created, last_login, language, preferences FROM tmp_users;
+
+CREATE UNIQUE INDEX ix_users_username ON users(username, mail_host);
+
+CREATE INDEX ix_identities_email ON identities(email, del);
diff --git a/SQL/sqlite/2013011000.sql b/SQL/sqlite/2013011000.sql
new file mode 100644
index 000000000..ec261a635
--- /dev/null
+++ b/SQL/sqlite/2013011000.sql
@@ -0,0 +1,6 @@
+-- Updates from version 0.9-beta
+
+CREATE TABLE IF NOT EXISTS system (
+  name varchar(64) NOT NULL PRIMARY KEY,
+  value text NOT NULL
+);
diff --git a/SQL/sqlite/2013011700.sql b/SQL/sqlite/2013011700.sql
new file mode 100644
index 000000000..533e70fa4
--- /dev/null
+++ b/SQL/sqlite/2013011700.sql
@@ -0,0 +1,2 @@
+-- drop temp table created in 2012080700.sql
+DROP TABLE IF EXISTS tmp_users;
diff --git a/UPGRADING b/UPGRADING
index babe168aa..03d549920 100644
--- a/UPGRADING
+++ b/UPGRADING
@@ -20,7 +20,7 @@ target location and check and update the configuration and database schema.
 After all is done, the temporary folder with the new Roundcube files can be 
 removed again.
 
-Please also see Post-Upgrade Activities section.
+WARNING: See Post-Upgrade Activities section below.
 
 
 Updating manually
@@ -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.
@@ -53,3 +54,12 @@ Post-Upgrade Activities
 3. When upgrading from version older than 0.6-beta you should make sure
    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/installto.sh b/bin/installto.sh
index de96bf004..e6cf79d7d 100755
--- a/bin/installto.sh
+++ b/bin/installto.sh
@@ -35,7 +35,7 @@ if (!preg_match('/define\(.RCMAIL_VERSION.,\s*.([0-9.]+[a-z-]*)/', $iniset, $m))
 
 $oldversion = $m[1];
 
-if (version_compare($oldversion, RCMAIL_VERSION, '>='))
+if (version_compare(version_parse($oldversion), version_parse(RCMAIL_VERSION), '>='))
   die("Installation at target location is up-to-date!\n");
 
 echo "Upgrading from $oldversion. Do you want to continue? (y/N)\n";
diff --git a/bin/jsshrink.sh b/bin/jsshrink.sh
index 9cfd660bb..c79f90405 100755
--- a/bin/jsshrink.sh
+++ b/bin/jsshrink.sh
@@ -1,11 +1,12 @@
 #!/bin/sh
 JS_DIR=`dirname "$0"`/../program/js
 JAR_DIR='/tmp'
+LANG_IN='ECMASCRIPT3'
 CLOSURE_COMPILER_URL='http://closure-compiler.googlecode.com/files/compiler-latest.zip'
 
 do_shrink() {
 	rm -f "$2"
-	java -jar $JAR_DIR/compiler.jar --compilation_level=SIMPLE_OPTIMIZATIONS --js="$1" --js_output_file="$2"
+	java -jar $JAR_DIR/compiler.jar --compilation_level=SIMPLE_OPTIMIZATIONS --js="$1" --js_output_file="$2" --language_in="$3"
 }
 
 if [ ! -d "$JS_DIR" ]; then
@@ -37,12 +38,30 @@ if [ ! -r "$JAR_DIR/compiler.jar" ]; then
 	rm -f "/tmp/$$.zip"
 fi
 
-for fn in app common googiespell list; do
+# compress single file from argument
+if [ $# -gt 0 ]; then
+	JS_DIR=`dirname "$1"`
+	JS_FILE="$1"
+
+	if [ $# -gt 1 ]; then
+		LANG_IN="$2"
+	fi
+
+	if [ ! -r "${JS_FILE}.src" ]; then
+		mv "$JS_FILE" "${JS_FILE}.src"
+	fi
+	echo "Shrinking $JS_FILE"
+	do_shrink "${JS_FILE}.src" "$JS_FILE" "$LANG_IN"
+	exit
+fi
+
+# default: compress application scripts
+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
 		mv "$JS_DIR/${fn}.js" "$JS_DIR/${fn}.js.src"
 	fi
 	echo "Shrinking $JS_DIR/${fn}.js"
-	do_shrink "$JS_DIR/${fn}.js.src" "$JS_DIR/${fn}.js"
+	do_shrink "$JS_DIR/${fn}.js.src" "$JS_DIR/${fn}.js" "$LANG_IN"
 done
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/makedoc.sh b/bin/makedoc.sh
index 40c75bf47..2a34254cb 100755
--- a/bin/makedoc.sh
+++ b/bin/makedoc.sh
@@ -1,10 +1,11 @@
 #!/bin/sh
 
-TITLE="Roundcube Classes"
+TITLE="Roundcube Webmail"
 PACKAGES="Core"
 
 INSTALL_PATH="`dirname $0`/.."
 PATH_PROJECT=$INSTALL_PATH/program/include
+PATH_FRAMEWORK=$INSTALL_PATH/program/lib/Roundcube
 PATH_DOCS=$INSTALL_PATH/doc/phpdoc
 BIN_PHPDOC="`/usr/bin/which phpdoc`"
 
@@ -20,6 +21,6 @@ TEMPLATE=earthli
 PRIVATE=off
 
 # make documentation
-$BIN_PHPDOC -d $PATH_PROJECT -t $PATH_DOCS -ti "$TITLE" -dn $PACKAGES \
+$BIN_PHPDOC -d $PATH_PROJECT,$PATH_FRAMEWORK -t $PATH_DOCS -ti "$TITLE" -dn $PACKAGES \
 -o $OUTPUTFORMAT:$CONVERTER:$TEMPLATE -pp $PRIVATE
 
diff --git a/bin/moduserprefs.sh b/bin/moduserprefs.sh
index a8fc3f655..b8ba98578 100755
--- a/bin/moduserprefs.sh
+++ b/bin/moduserprefs.sh
@@ -31,7 +31,7 @@ function print_usage()
 
 
 // get arguments
-$args = rcube_utils:get_opt(array('u' => 'user', 'd' => 'delete'));
+$args = rcube_utils::get_opt(array('u' => 'user', 'd' => 'delete'));
 
 if ($_SERVER['argv'][1] == 'help') {
 	print_usage();
diff --git a/bin/update.sh b/bin/update.sh
index 59aa596dd..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($opts['version'], RCMAIL_VERSION, '>'))
+if ($opts['version'] && version_compare(version_parse($opts['version']), version_parse(RCMAIL_VERSION), '>='))
   die("Nothing to be done here. Bye!\n");
 
 
@@ -124,7 +126,7 @@ if ($RCI->configured) {
         }
       }
       else {
-        echo "Please update your config files manually according to the above messages.\n\n";
+        echo "Please update your config files manually according to the above messages.\n";
       }
     }
 
@@ -143,36 +145,18 @@ if ($RCI->configured) {
 
   // check database schema
   if ($RCI->config['db_dsnw']) {
-    $DB = rcube_db::factory($RCI->config['db_dsnw'], '', false);
-    $DB->db_connect('w');
-    if ($db_error_msg = $DB->is_error()) {
-      echo "Error connecting to database: $db_error_msg\n";
-      $success = false;
-    }
-    else if ($err = $RCI->db_schema_check($DB, false)) {
-      $updatefile = INSTALL_PATH . 'SQL/' . (isset($RCI->db_map[$DB->db_provider]) ? $RCI->db_map[$DB->db_provider] : $DB->db_provider) . '.update.sql';
-      echo "WARNING: Database schema needs to be updated!\n";
-      echo join("\n", $err) . "\n\n";
-      $success = false;
-      
-      if ($opts['version']) {
-        echo "Do you want to run the update queries to get the schmea fixed? (y/N)\n";
-        $input = trim(fgets(STDIN));
-        if (strtolower($input) == 'y') {
-          $success = $RCI->update_db($DB, $opts['version']);
-        }
-      }
-      
-      if (!$success)
-        echo "Open $updatefile and execute all queries below the comment with the currently installed version number.\n";
-    }
+    echo "Executing database schema update.\n";
+    system(INSTALL_PATH . "bin/updatedb.sh --package=roundcube --version=" . $opts['version']
+      . " --dir=" . INSTALL_PATH . DIRECTORY_SEPARATOR . "SQL", $res);
+
+    $success = !$res;
   }
-  
+
   // index contacts for fulltext searching
-  if (version_compare($opts['version'], '0.6', '<')) {
+  if (version_compare(version_parse($opts['version']), '0.6.0', '<')) {
     system(INSTALL_PATH . 'bin/indexcontacts.sh');
   }
-  
+
   if ($success) {
     echo "This instance of Roundcube is up-to-date.\n";
     echo "Have fun!\n";
@@ -183,6 +167,4 @@ else {
   echo "Open http://url-to-roundcube/installer/ in your browser and follow the instuctions.\n";
 }
 
-echo "\n";
-
 ?>
diff --git a/bin/updatedb.sh b/bin/updatedb.sh
new file mode 100755
index 000000000..7fa8cceb9
--- /dev/null
+++ b/bin/updatedb.sh
@@ -0,0 +1,201 @@
+#!/usr/bin/env php
+<?php
+/*
+ +-----------------------------------------------------------------------+
+ | bin/updatedb.sh                                                       |
+ |                                                                       |
+ | This file is part of the Roundcube Webmail client                     |
+ | Copyright (C) 2010-2012, The Roundcube Dev Team                       |
+ | Copyright (C) 2010-2012, 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:                                                              |
+ |   Update database schema                                              |
+ +-----------------------------------------------------------------------+
+ | 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(
+    'v' => 'version',
+    'd' => 'dir',
+    'p' => 'package',
+));
+
+if (empty($opts['dir'])) {
+  echo "ERROR: Database schema directory not specified (--dir).\n";
+  exit(1);
+}
+if (empty($opts['package'])) {
+  echo "ERROR: Database schema package name not specified (--package).\n";
+  exit(1);
+}
+
+// Check if directory exists
+if (!file_exists($opts['dir'])) {
+  echo "ERROR: Specified database schema directory doesn't exist.\n";
+  exit(1);
+}
+
+$RC = rcube::get_instance();
+$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);
+}
+
+// Read DB schema version from database (if 'system' table exists)
+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 = preg_replace('/[^0-9]/', '', $row[0]);
+}
+
+// DB version not found, but release version is specified
+if (!$version && $opts['version']) {
+    // Map old release version string to DB schema version
+    // Note: This is for backward compat. only, do not need to be updated
+    $map = array(
+        '0.1-stable' => 1,
+        '0.1.1'      => 2008030300,
+        '0.2-alpha'  => 2008040500,
+        '0.2-beta'   => 2008060900,
+        '0.2-stable' => 2008092100,
+        '0.3-stable' => 2008092100,
+        '0.3.1'      => 2009090400,
+        '0.4-beta'   => 2009103100,
+        '0.4.2'      => 2010042300,
+        '0.5-beta'   => 2010100600,
+        '0.5'        => 2010100600,
+        '0.5.1'      => 2010100600,
+        '0.6-beta'   => 2011011200,
+        '0.6'        => 2011011200,
+        '0.7-beta'   => 2011092800,
+        '0.7'        => 2011111600,
+        '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,
+        '0.8.1'      => 2011121400,
+        '0.8.2'      => 2011121400,
+        '0.8.3'      => 2011121400,
+        '0.8.4'      => 2011121400,
+        '0.8.5'      => 2011121400,
+        '0.8.6'      => 2011121400,
+        '0.9-beta'   => 2012080700,
+    );
+
+    $version = $map[$opts['version']];
+}
+
+// Assume last version before the 'system' table was added
+if (empty($version)) {
+    $version = 2012080700;
+}
+
+$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);
+}
+
+$dh     = opendir($dir);
+$result = array();
+
+while ($file = readdir($dh)) {
+    if (preg_match('/^([0-9]+)\.sql$/', $file, $m) && $m[1] > $version) {
+        $result[] = $m[1];
+    }
+}
+sort($result, SORT_NUMERIC);
+
+foreach ($result as $v) {
+    echo "Updating database schema ($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 "[OK]\n";
+}
+
+exit(0);
+
+function update_db_schema($package, $version, $file)
+{
+    global $DB;
+
+    // read DDL file
+    if ($lines = file($file)) {
+        $sql = '';
+        foreach ($lines as $line) {
+            if (preg_match('/^--/', $line) || trim($line) == '')
+                continue;
+
+            $sql .= $line . "\n";
+            if (preg_match('/(;|^GO)$/', trim($line))) {
+                @$DB->query(fix_table_names($sql));
+                $sql = '';
+                if ($error = $DB->is_error()) {
+                    return $error;
+                }
+            }
+        }
+    }
+
+    // escape if 'system' table does not exist
+    if ($version < 2013011000) {
+        return;
+    }
+
+    $system_table = $DB->quote_identifier($DB->table_name('system'));
+
+    $DB->query("UPDATE " . $system_table
+        ." SET " . $DB->quote_identifier('value') . " = ?"
+        ." WHERE " . $DB->quote_identifier('name') . " = ?",
+        $version, $package . '-version');
+
+    if (!$DB->is_error() && !$DB->affected_rows()) {
+        $DB->query("INSERT INTO " . $system_table
+            ." (" . $DB->quote_identifier('name') . ", " . $DB->quote_identifier('value') . ")"
+            ." VALUES (?, ?)",
+            $package . '-version', $version);
+    }
+
+    return $DB->is_error();
+}
+
+function fix_table_names($sql)
+{
+    global $DB;
+
+    foreach (array('users','identities','contacts','contactgroups','contactgroupmembers','session','cache','cache_index','cache_index','cache_messages','dictionary','searches','system') as $table) {
+        $real_table = $DB->table_name($table);
+        if ($real_table != $table) {
+            $sql = preg_replace("/([^a-z0-9_])$table([^a-z0-9_])/i", "\\1$real_table\\2", $sql);
+        }
+    }
+
+    return $sql;
+}
+
+?>
diff --git a/composer.json-dist b/composer.json-dist
index cfa825a25..846f742eb 100644
--- a/composer.json-dist
+++ b/composer.json-dist
@@ -24,7 +24,7 @@
             }
         }
     ],
-    "require" : {
+    "require": {
         "pear-pear/Mail_Mime": ">=1.8.1",
         "pear-pear/Mail_mimeDecode": ">=1.5.5",
         "Net_SMTP": "dev-master",
diff --git a/config/db.inc.php.dist b/config/db.inc.php.dist
index a596d647d..9bbf7d75b 100644
--- a/config/db.inc.php.dist
+++ b/config/db.inc.php.dist
@@ -49,6 +49,7 @@ $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';
diff --git a/config/main.inc.php.dist b/config/main.inc.php.dist
index 3e7630cd3..5a652a5b1 100644
--- a/config/main.inc.php.dist
+++ b/config/main.inc.php.dist
@@ -63,8 +63,8 @@ $rcmail_config['smtp_debug'] = false;
 // IMAP
 // ----------------------------------
 
-// the mail host chosen to perform the log-in
-// leave blank to show a textbox at login, give a list of hosts
+// The mail host chosen to perform the log-in.
+// Leave blank to show a textbox at login, give a list of hosts
 // to display a pulldown menu or set one host as string.
 // To use SSL/TLS connection, enter hostname with prefix ssl:// or tls://
 // Supported replacement variables:
@@ -73,6 +73,8 @@ $rcmail_config['smtp_debug'] = false;
 // %d - domain (http hostname $_SERVER['HTTP_HOST'] without the first part)
 // %s - domain name after the '@' from e-mail address provided at login screen
 // For example %n = mail.domain.tld, %t = domain.tld
+// WARNING: After hostname change update of mail_host column in users table is
+//          required to match old user data records with the new host.
 $rcmail_config['default_host'] = '';
 
 // TCP port used for IMAP connections
@@ -351,11 +353,16 @@ $rcmail_config['line_length'] = 72;
 // send plaintext messages as format=flowed
 $rcmail_config['send_format_flowed'] = true;
 
+// According to RFC2298, return receipt envelope sender address must be empty.
+// If this option is true, Roundcube will use user's identity as envelope sender for MDN responses.
+$rcmail_config['mdn_use_from'] = false;
+
 // Set identities access level:
 // 0 - many identities with possibility to edit all params
 // 1 - many identities with possibility to edit all params but not email address
 // 2 - one identity with possibility to edit all params
 // 3 - one identity with possibility to edit all params but not email address
+// 4 - one identity with possibility to edit only signature
 $rcmail_config['identities_level'] = 0;
 
 // Mimetypes supported by the browser.
@@ -367,9 +374,10 @@ $rcmail_config['client_mimetypes'] = null;  # null == default
 // Set to null if the default path should be used.
 $rcmail_config['mime_magic'] = null;
 
-// Path to local mime.types mapping table.
+// Absolute path to a local mime.types mapping table file.
 // This is used to derive mime-types from the filename extension or vice versa.
-// Such a file is usually part of the apache webserver.
+// Such a file is usually part of the apache webserver. If you don't find a file named mime.types on your system,
+// download it from http://svn.apache.org/repos/asf/httpd/httpd/trunk/docs/conf/mime.types
 $rcmail_config['mime_types'] = null;
 
 // path to imagemagick identify binary
@@ -569,6 +577,7 @@ $rcmail_config['ldap_public']['Verisign'] = array(
   'port'          => 389,
   'use_tls'	      => false,
   'ldap_version'  => 3,       // using LDAPv3
+  'network_timeout' => 10,    // The timeout (in seconds) for connect + bind arrempts. This is only supported in PHP >= 5.3.0 with OpenLDAP 2.x
   'user_specific' => false,   // If true the base_dn, bind_dn and bind_pass default to the user's IMAP login.
   // %fu - The full username provided, assumes the username is an email
   //       address, uses the username_domain value if not an email address.
@@ -826,9 +835,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;
 
diff --git a/index.php b/index.php
index aee94e971..dc6827a87 100644
--- a/index.php
+++ b/index.php
@@ -2,9 +2,9 @@
 /*
  +-------------------------------------------------------------------------+
  | Roundcube Webmail IMAP Client                                           |
- | Version 0.9-git                                                         |
+ | Version 1.0-git                                                         |
  |                                                                         |
- | Copyright (C) 2005-2012, The Roundcube Dev Team                         |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                         |
  |                                                                         |
  | This program is free software: you can redistribute it and/or modify    |
  | it under the terms of the GNU General Public License (with exceptions   |
diff --git a/installer/check.php b/installer/check.php
index d6c9f5c40..14fc4f06e 100644
--- a/installer/check.php
+++ b/installer/check.php
@@ -1,3 +1,10 @@
+<?php
+
+if (!class_exists('rcube_install') || !is_object($RCI)) {
+    die("Not allowed! Please open installer/index.php instead.");
+}
+
+?>
 <form action="index.php" method="get">
 <?php
 
@@ -130,7 +137,13 @@ foreach ($optional_php_exts as $name => $ext) {
 $prefix = (PHP_SHLIB_SUFFIX === 'dll') ? 'php_' : '';
 foreach ($RCI->supported_dbs as $database => $ext) {
     if (extension_loaded($ext)) {
-        $RCI->pass($database);
+        // MySQL driver requires PHP >= 5.3 (#1488875)
+        if ($ext == 'pdo_mysql' && version_compare(PHP_VERSION, '5.3.0', '<')) {
+            $RCI->fail($database, 'PHP >= 5.3 required');
+        }
+        else {
+            $RCI->pass($database);
+        }
     }
     else {
         $_ext = $ext_dir . '/' . $prefix . $ext . '.' . PHP_SHLIB_SUFFIX;
diff --git a/installer/config.php b/installer/config.php
index 6897ffbba..d6846edc7 100644
--- a/installer/config.php
+++ b/installer/config.php
@@ -1,3 +1,10 @@
+<?php
+
+if (!class_exists('rcube_install') || !is_object($RCI)) {
+    die("Not allowed! Please open installer/index.php instead.");
+}
+
+?>
 <form action="index.php" method="post">
 <input type="hidden" name="_step" value="2" />
 <?php
diff --git a/installer/index.php b/installer/index.php
index 7a78736b8..0e80b1cd6 100644
--- a/installer/index.php
+++ b/installer/index.php
@@ -44,7 +44,6 @@ define('RCUBE_INSTALL_PATH', INSTALL_PATH);
 define('RCUBE_CONFIG_DIR', INSTALL_PATH . 'config/');
 
 $include_path  = INSTALL_PATH . 'program/lib' . PATH_SEPARATOR;
-$include_path .= INSTALL_PATH . 'program' . PATH_SEPARATOR;
 $include_path .= INSTALL_PATH . 'program/include' . PATH_SEPARATOR;
 $include_path .= ini_get('include_path');
 
diff --git a/installer/rcube_install.php b/installer/rcube_install.php
index dfd63562d..08761ce6d 100644
--- a/installer/rcube_install.php
+++ b/installer/rcube_install.php
@@ -29,7 +29,6 @@ class rcube_install
   var $config = array();
   var $configured = false;
   var $last_error = null;
-  var $db_map = array('pgsql' => 'postgres', 'mysqli' => 'mysql', 'sqlsrv' => 'mssql');
   var $email_pattern = '([a-z0-9][a-z0-9\-\.\+\_]*@[a-z0-9]([a-z0-9\-][.]?)*[a-z0-9])';
   var $bool_config_props = array();
 
@@ -65,7 +64,7 @@ class rcube_install
   /**
    * Constructor
    */
-  function rcube_install()
+  function __construct()
   {
     $this->step = intval($_REQUEST['_step']);
     $this->is_post = $_SERVER['REQUEST_METHOD'] == 'POST';
@@ -74,7 +73,7 @@ class rcube_install
   /**
    * Singleton getter
    */
-  function get_instance()
+  static function get_instance()
   {
     static $inst;
 
@@ -261,6 +260,11 @@ class rcube_install
       }
     }
 
+    // the old default mime_magic reference is obsolete
+    if ($this->config['mime_magic'] == '/usr/share/misc/magic') {
+        $out['obsolete'][] = array('prop' => 'mime_magic', 'explain' => "Set value to null in order to use system default");
+    }
+
     // iterate over default config
     foreach ($defaults as $prop => $value) {
       if (!isset($seen[$prop]) && isset($required[$prop]) && !(is_bool($this->config[$prop]) || strlen($this->config[$prop])))
@@ -448,10 +452,11 @@ 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.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',
     ));
     return $select;
   }
@@ -603,7 +608,7 @@ class rcube_install
    */
   function init_db($DB)
   {
-    $engine = isset($this->db_map[$DB->db_provider]) ? $this->db_map[$DB->db_provider] : $DB->db_provider;
+    $engine = $DB->db_provider;
 
     // read schema file from /SQL/*
     $fname = INSTALL_PATH . "SQL/$engine.initial.sql";
@@ -625,46 +630,18 @@ class rcube_install
 
 
   /**
-   * Update database with SQL statements from SQL/*.update.sql
+   * Update database schema
    *
-   * @param object rcube_db Database connection
    * @param string Version to update from
+   *
    * @return boolen True on success, False on error
    */
-  function update_db($DB, $version)
+  function update_db($version)
   {
-    $version = strtolower($version);
-    $engine = isset($this->db_map[$DB->db_provider]) ? $this->db_map[$DB->db_provider] : $DB->db_provider;
-
-    // read schema file from /SQL/*
-    $fname = INSTALL_PATH . "SQL/$engine.update.sql";
-    if ($lines = @file($fname, FILE_SKIP_EMPTY_LINES)) {
-      $from = false; $sql = '';
-      foreach ($lines as $line) {
-        $is_comment = preg_match('/^--/', $line);
-        if (!$from && $is_comment && preg_match('/from version\s([0-9.]+[a-z-]*)/', $line, $m)) {
-          $v = strtolower($m[1]);
-          if ($v == $version || version_compare($version, $v, '<='))
-            $from = true;
-        }
-        if ($from && !$is_comment)
-          $sql .= $line. "\n";
-      }
-
-      if ($sql)
-        $this->exec_sql($sql, $DB);
-    }
-    else {
-      $this->fail('DB Schema', "Cannot read the update file: $fname");
-      return false;
-    }
+    system(INSTALL_PATH . "bin/updatedb.sh --package=roundcube --version=" . $version
+      . " --dir=" . INSTALL_PATH . "SQL", $result);
 
-    if ($err = $this->get_error()) {
-      $this->fail('DB Schema', "Error updating database: $err");
-      return false;
-    }
-
-    return true;
+    return !$result;
   }
 
 
diff --git a/installer/test.php b/installer/test.php
index e266bf05f..bd49ac523 100644
--- a/installer/test.php
+++ b/installer/test.php
@@ -1,3 +1,10 @@
+<?php
+
+if (!class_exists('rcube_install') || !is_object($RCI)) {
+    die("Not allowed! Please open installer/index.php instead.");
+}
+
+?>
 <form action="index.php?_step=3" method="post">
 
 <h3>Check config files</h3>
@@ -157,11 +164,9 @@ if ($db_working && $_POST['initdb']) {
 }
 
 else if ($db_working && $_POST['updatedb']) {
-  if (!($success = $RCI->update_db($DB, $_POST['version']))) {
-      $updatefile = INSTALL_PATH . 'SQL/' . (isset($RCI->db_map[$DB->db_provider]) ? $RCI->db_map[$DB->db_provider] : $DB->db_provider) . '.update.sql';
-      echo '<p class="warning">Please manually execute the SQL statements from '.$updatefile.' on your database.<br/>';
-      echo 'See comments in the file and execute queries below the comment with the currently installed version number.</p>';
-  }
+    if (!($success = $RCI->update_db($_POST['version']))) {
+        echo '<p class="warning">Database schema update failed.</p>';
+    }
 }
 
 // test database
@@ -176,9 +181,8 @@ if ($db_working) {
         $RCI->fail('DB Schema', "Database schema differs");
         echo '<ul style="margin:0"><li>' . join("</li>\n<li>", $err) . "</li></ul>";
         $select = $RCI->versions_select(array('name' => 'version'));
-        echo '<p class="suggestion">You should run the update queries to get the schmea fixed.<br/><br/>Version to update from: ' . $select->show() . '&nbsp;<input type="submit" name="updatedb" value="Update" /></p>';
-//        echo '<p class="warning">Please manually execute the SQL statements from '.$updatefile.' on your database.<br/>';
-//        echo 'See comments in the file and execute queries that are superscribed with the currently installed version number.</p>';
+        $select->add('0.9 or newer', '');
+        echo '<p class="suggestion">You should run the update queries to get the schema fixed.<br/><br/>Version to update from: ' . $select->show() . '&nbsp;<input type="submit" name="updatedb" value="Update" /></p>';
         $db_working = false;
     }
     else {
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 1952dad49..938287b1a 100644
--- a/plugins/acl/acl.php
+++ b/plugins/acl/acl.php
@@ -55,7 +55,7 @@ class acl extends rcube_plugin
      */
     function acl_actions()
     {
-        $action = trim(get_input_value('_act', RCUBE_INPUT_GPC));
+        $action = trim(rcube_utils::get_input_value('_act', rcube_utils::INPUT_GPC));
 
         // Connect to IMAP
         $this->rc->storage_init();
@@ -85,8 +85,8 @@ class acl extends rcube_plugin
     {
         $this->load_config();
 
-        $search = get_input_value('_search', RCUBE_INPUT_GPC, true);
-        $sid    = get_input_value('_id', RCUBE_INPUT_GPC);
+        $search = rcube_utils::get_input_value('_search', rcube_utils::INPUT_GPC, true);
+        $sid    = rcube_utils::get_input_value('_id', rcube_utils::INPUT_GPC);
         $users  = array();
 
         if ($this->init_ldap()) {
@@ -157,12 +157,12 @@ class acl extends rcube_plugin
         // add Info fieldset if it doesn't exist
         if (!isset($args['form']['props']['fieldsets']['info']))
             $args['form']['props']['fieldsets']['info'] = array(
-                'name'  => rcube_label('info'),
+                'name'  => $this->rc->gettext('info'),
                 'content' => array());
 
         // Display folder rights to 'Info' fieldset
         $args['form']['props']['fieldsets']['info']['content']['myrights'] = array(
-            'label' => Q($this->gettext('myrights')),
+            'label' => rcube::Q($this->gettext('myrights')),
             'value' => $this->acl2text($myrights)
         );
 
@@ -186,7 +186,7 @@ class acl extends rcube_plugin
         $this->rc->output->add_label('autocompletechars', 'autocompletemore');
 
         $args['form']['sharing'] = array(
-            'name'    => Q($this->gettext('sharing')),
+            'name'    => rcube::Q($this->gettext('sharing')),
             'content' => $this->rc->output->parse('acl.table', false, false),
         );
 
@@ -233,7 +233,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))
@@ -392,14 +393,14 @@ class acl extends rcube_plugin
 
             // filter out virtual rights (c or d) the server may return
             $userrights = array_intersect($rights, $supported);
-            $userid = html_identifier($user);
+            $userid = rcube_utils::html_identifier($user);
 
             if (!empty($this->specials) && in_array($user, $this->specials)) {
                 $user = $this->gettext($user);
             }
 
             $table->add_row(array('id' => 'rcmrow'.$userid));
-            $table->add('user', Q($user));
+            $table->add('user', rcube::Q($user));
 
             foreach ($items as $key => $right) {
                 $in = $this->acl_compare($userrights, $right);
@@ -427,10 +428,10 @@ class acl extends rcube_plugin
      */
     private function action_save()
     {
-        $mbox  = trim(get_input_value('_mbox', RCUBE_INPUT_GPC, true)); // UTF7-IMAP
-        $user  = trim(get_input_value('_user', RCUBE_INPUT_GPC));
-        $acl   = trim(get_input_value('_acl', RCUBE_INPUT_GPC));
-        $oldid = trim(get_input_value('_old', RCUBE_INPUT_GPC));
+        $mbox  = trim(rcube_utils::get_input_value('_mbox', rcube_utils::INPUT_GPC, true)); // UTF7-IMAP
+        $user  = trim(rcube_utils::get_input_value('_user', rcube_utils::INPUT_GPC));
+        $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);
@@ -441,9 +442,9 @@ 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_idn_to_ascii(preg_replace('/^@/', '', $realm));
+                    $user .= '@' . rcube_utils::idn_to_ascii(preg_replace('/^@/', '', $realm));
                 }
                 $username = $user;
             }
@@ -452,9 +453,12 @@ 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' => html_identifier($user),
+                    $ret = array('id' => rcube_utils::html_identifier($user),
                          'username' => $username, 'acl' => implode($acl), 'old' => $oldid);
                     $this->rc->output->command('acl_update', $ret);
                     $result++;
@@ -475,15 +479,15 @@ class acl extends rcube_plugin
      */
     private function action_delete()
     {
-        $mbox = trim(get_input_value('_mbox', RCUBE_INPUT_GPC, true)); //UTF7-IMAP
-        $user = trim(get_input_value('_user', RCUBE_INPUT_GPC));
+        $mbox = trim(rcube_utils::get_input_value('_mbox', rcube_utils::INPUT_GPC, true)); //UTF7-IMAP
+        $user = trim(rcube_utils::get_input_value('_user', rcube_utils::INPUT_GPC));
 
         $user = explode(',', $user);
 
         foreach ($user as $u) {
             $u = trim($u);
             if ($this->rc->storage->delete_acl($mbox, $u)) {
-                $this->rc->output->command('acl_remove_row', html_identifier($u));
+                $this->rc->output->command('acl_remove_row', rcube_utils::html_identifier($u));
             }
             else {
                 $error = true;
@@ -507,8 +511,8 @@ class acl extends rcube_plugin
             return;
         }
 
-        $this->mbox = trim(get_input_value('_mbox', RCUBE_INPUT_GPC, true)); // UTF7-IMAP
-        $advanced   = trim(get_input_value('_mode', RCUBE_INPUT_GPC));
+        $this->mbox = trim(rcube_utils::get_input_value('_mbox', rcube_utils::INPUT_GPC, true)); // UTF7-IMAP
+        $advanced   = trim(rcube_utils::get_input_value('_mode', rcube_utils::INPUT_GPC));
         $advanced   = $advanced == 'advanced' ? true : false;
 
         // Save state in user preferences
@@ -543,12 +547,12 @@ class acl extends rcube_plugin
 
         foreach ($supported as $right) {
             if (in_array($right, $rights)) {
-                $list[] = html::tag('li', null, Q($this->gettext('acl' . $right)));
+                $list[] = html::tag('li', null, rcube::Q($this->gettext('acl' . $right)));
             }
         }
 
         if (count($list) == count($supported))
-            return Q($this->gettext('aclfull'));
+            return rcube::Q($this->gettext('aclfull'));
 
         return html::tag('ul', $attrib, implode("\n", $list));
     }
@@ -703,4 +707,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..acf80aca9 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'] = 'Access right actions...';
 $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 f90404d19..4f596678c 100644
--- a/plugins/acl/localization/de_CH.inc
+++ b/plugins/acl/localization/de_CH.inc
@@ -2,18 +2,20 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/de_CH/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['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['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'] = 'Behalte';
+$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 ausser "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" markierte Nachrichten können entfernt 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 gespeichert...';
-$labels['updatesuccess'] = 'Zugriffsrechte erfolgreich geändert';
-$labels['deletesuccess'] = 'Zugriffsrechte erfolgreich entzogen';
-$labels['createsuccess'] = 'Zugriffsrechte erfolgreich hinzugefügt';
-$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, dass 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 gespeichert...';
+$messages['updatesuccess'] = 'Zugriffsrechte erfolgreich geändert';
+$messages['deletesuccess'] = 'Zugriffsrechte erfolgreich entzogen';
+$messages['createsuccess'] = 'Zugriffsrechte erfolgreich hinzugefügt';
+$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, dass 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/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 f5b1ae64d..033ac29b2 100644
--- a/plugins/acl/localization/en_US.inc
+++ b/plugins/acl/localization/en_US.inc
@@ -1,5 +1,21 @@
 <?php
 
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/acl/localization/<lang>.inc                                   |
+ |                                                                       |
+ | 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.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
+*/
+
 $labels['sharing'] = 'Sharing';
 $labels['myrights'] = 'Access Rights';
 $labels['username'] = 'User:';
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..a287a413e 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'] = 'Lookup';
 $labels['aclr'] = 'Ler mensaxes';
+$labels['acls'] = 'Keep Seen state';
+$labels['aclw'] = 'Write flags';
+$labels['acli'] = 'Insert (Copy into)';
+$labels['aclp'] = 'Post';
+$labels['aclc'] = 'Create subfolders';
+$labels['aclk'] = 'Create subfolders';
 $labels['acld'] = 'Borrar mensaxes';
 $labels['aclt'] = 'Borrar mensaxes';
+$labels['acle'] = 'Expunge';
 $labels['aclx'] = 'Eliminar carpeta';
 $labels['acla'] = 'Administrar';
+
+$labels['aclfull'] = 'Full control';
+$labels['aclother'] = 'Other';
+$labels['aclread'] = 'Read';
+$labels['aclwrite'] = 'Write';
+$labels['acldelete'] = 'Delete';
+
+$labels['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'] = 'Administrar';
 
+$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/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
new file mode 100644
index 000000000..8e8afc0b8
--- /dev/null
+++ b/plugins/acl/localization/id_ID.inc
@@ -0,0 +1,99 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/acl/localization/<lang>.inc                                   |
+ |                                                                       |
+ | 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.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
+*/
+
+$labels['sharing'] = 'Berbagi';
+$labels['myrights'] = 'Hak Akses';
+$labels['username'] = 'Pengguna:';
+$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['aclr'] = 'Baca pesan';
+$labels['acls'] = 'Jaga status terbaca';
+$labels['aclw'] = 'Membuat tanda';
+$labels['acli'] = 'Sisipkan (Salin kedalam)';
+$labels['aclp'] = '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..b4927fb3f 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['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['shortacld'] = 'Elimina';
+$labels['shortaclt'] = 'Elimina';
+$labels['shortacle'] = 'Elimina';
 $labels['shortaclx'] = 'Cancella cartella';
+$labels['shortacla'] = 'Amministra';
+
+$labels['shortaclother'] = 'Altri';
+$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..85e33725d 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'] = 'advanced mode';
 $labels['newuser'] = '엔트리 추가';
+$labels['actions'] = 'Access right actions...';
+$labels['anyone'] = 'All users (anyone)';
+$labels['anonymous'] = 'Guests (anonymous)';
 $labels['identifier'] = '�별�';
+
+$labels['acll'] = 'Lookup';
+$labels['aclr'] = 'Read messages';
 $labels['acls'] = '�� �태로 유지';
+$labels['aclw'] = 'Write flags';
+$labels['acli'] = 'Insert (Copy into)';
 $labels['aclp'] = '게시';
-$labels['shortaclp'] = '게시';
 $labels['aclc'] = '하위 �� 만들기';
 $labels['aclk'] = '하위 �� 만들기';
 $labels['acld'] = '메시지 삭제';
 $labels['aclt'] = '메시지 삭제';
+$labels['acle'] = 'Expunge';
 $labels['aclx'] = '�� 삭제';
 $labels['acla'] = '관리�';
-$labels['shortacla'] = '관리�';
+
+$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'] = '게시';
+$labels['shortaclc'] = 'Create';
+$labels['shortaclk'] = 'Create';
+$labels['shortacld'] = 'Delete';
+$labels['shortaclt'] = 'Delete';
+$labels['shortacle'] = 'Expunge';
 $labels['shortaclx'] = '�� 삭제';
+$labels['shortacla'] = '관리�';
+
+$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'] = '��� 메시지를 복사하거나 작성할 수 있�';
 $labels['longaclp'] = '� ��로 메시지를 게시할 수 있�';
 $labels['longaclc'] = '� ��� 바로 밑� ��를 �성(�는 �름 변경)할 수 있�';
 $labels['longaclk'] = '� ��� 바로 밑� ��를 �성(�는 �름 변경)할 수 있�';
 $labels['longacld'] = '메시지 삭제 플래그가 변경� 수 있�';
 $labels['longaclt'] = '메시지 삭제 플래그가 변경� 수 있�';
+$labels['longacle'] = 'Messages can be expunged';
 $labels['longaclx'] = '��를 삭제하거나 �름 변경 할 수 있�';
 $labels['longacla'] = '��� 접근 권한� 변경할 수 있�';
+
 $labels['longaclfull'] = '�� 관리를 �함한 모든 제어권';
+$labels['longaclread'] = 'The folder can be opened for reading';
 $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'] = '지정� username� 없�!';
+
+?>
diff --git a/plugins/acl/localization/lt_LT.inc b/plugins/acl/localization/lt_LT.inc
index d43dd2e30..6507504e2 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'] = 'Messages can be posted to this folder';
+$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_NB.inc b/plugins/acl/localization/nb_NB.inc
deleted file mode 100644
index d7b401b22..000000000
--- a/plugins/acl/localization/nb_NB.inc
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-
-/*
- +-----------------------------------------------------------------------+
- | localization/nb_NB/labels.inc                                         |
- |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
- |                                                                       |
- +-----------------------------------------------------------------------+
- | Author: Martin Bore                                                   |
- +-----------------------------------------------------------------------+
-*/
-
-$labels = array();
-$labels['sharing'] = 'Deling';
-$labels['myrights'] = 'Tilgangsrettigheter';
-$labels['username'] = 'Bruker:';
-$labels['advanced'] = 'Avansert modus';
-$labels['newuser'] = 'Legg til oppføring';
-$labels['anyone'] = 'Alle brukere (alle)';
-$labels['anonymous'] = 'Gjester (anononyme)';
-$labels['identifier'] = 'Identifikator';
-$labels['acll'] = 'Oppslag';
-$labels['shortacll'] = 'Oppslag';
-$labels['aclr'] = 'Les meldinger';
-$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['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['shortacls'] = 'Behold';
-$labels['shortacli'] = 'Sett inn';
-$labels['shortaclc'] = 'Opprett';
-$labels['shortaclk'] = 'Opprett';
-$labels['longacldelete'] = 'Meldingen kan slettes';
-$labels['deleting'] = 'Sletter tilgangsrettigheter';
-$labels['saving'] = 'Lagrer tilgangsrettigheter';
-
diff --git a/plugins/acl/localization/nb_NO.inc b/plugins/acl/localization/nb_NO.inc
new file mode 100644
index 000000000..26171578b
--- /dev/null
+++ b/plugins/acl/localization/nb_NO.inc
@@ -0,0 +1,99 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/acl/localization/<lang>.inc                                   |
+ |                                                                       |
+ | 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.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
+*/
+
+$labels['sharing'] = 'Deling';
+$labels['myrights'] = 'Tilgangsrettigheter';
+$labels['username'] = 'Bruker:';
+$labels['advanced'] = 'Avansert modus';
+$labels['newuser'] = 'Legg til oppføring';
+$labels['actions'] = 'Valg for tilgangsrettigheter.';
+$labels['anyone'] = 'Alle brukere (alle)';
+$labels['anonymous'] = 'Gjester (anonyme)';
+$labels['identifier'] = 'Identifikator';
+
+$labels['acll'] = 'Oppslag';
+$labels['aclr'] = 'Les meldinger';
+$labels['acls'] = 'Behold lesestatus';
+$labels['aclw'] = 'Lagre flagg';
+$labels['acli'] = 'Lim inn';
+$labels['aclp'] = 'Post';
+$labels['aclc'] = 'Opprett undermapper';
+$labels['aclk'] = 'Opprett undermapper';
+$labels['acld'] = 'Slett meldinger';
+$labels['aclt'] = 'Slett meldinger';
+$labels['acle'] = 'Slett fullstendig';
+$labels['aclx'] = 'Slett mappe';
+$labels['acla'] = 'Administrer';
+
+$labels['aclfull'] = 'Full kontroll';
+$labels['aclother'] = 'Annet';
+$labels['aclread'] = 'Les';
+$labels['aclwrite'] = 'Skriv';
+$labels['acldelete'] = '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['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';
+$labels['longaclp'] = 'Meldinger kan postes til denne mappen';
+$labels['longaclc'] = 'Mapper kan opprettes (eller navnes om) direkte under denne mappen';
+$labels['longaclk'] = 'Mapper kan opprettes (eller navnes om) direkte under denne mappen';
+$labels['longacld'] = 'Meldingenes flagg for sletting kan endres';
+$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';
+
+$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
new file mode 100644
index 000000000..743d2c8b8
--- /dev/null
+++ b/plugins/acl/localization/nn_NO.inc
@@ -0,0 +1,99 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/acl/localization/<lang>.inc                                   |
+ |                                                                       |
+ | 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.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
+*/
+
+$labels['sharing'] = 'Deling';
+$labels['myrights'] = 'Tilgangsrettar';
+$labels['username'] = 'Brukar:';
+$labels['advanced'] = 'Avansert modus';
+$labels['newuser'] = 'Legg til oppføring';
+$labels['actions'] = 'Val for tilgangsrettar...';
+$labels['anyone'] = 'Alle brukarar (alle)';
+$labels['anonymous'] = 'Gjester (anonyme)';
+$labels['identifier'] = 'Identifikator';
+
+$labels['acll'] = 'Oppslag';
+$labels['aclr'] = 'Les meldingar';
+$labels['acls'] = 'Behald lesestatus';
+$labels['aclw'] = 'Skriveflagg';
+$labels['acli'] = 'Lim inn';
+$labels['aclp'] = 'Post';
+$labels['aclc'] = 'Opprett undermapper';
+$labels['aclk'] = 'Opprett undermapper';
+$labels['acld'] = 'Slett meldingar';
+$labels['aclt'] = 'Slett meldingar';
+$labels['acle'] = 'Slett fullstendig';
+$labels['aclx'] = 'Slett mappe';
+$labels['acla'] = 'Administrér';
+
+$labels['aclfull'] = 'Full kontroll';
+$labels['aclother'] = 'Anna';
+$labels['aclread'] = 'Les';
+$labels['aclwrite'] = 'Skriv';
+$labels['acldelete'] = '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['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';
+$labels['longaclp'] = 'Meldingar kan postast til denne mappa';
+$labels['longaclc'] = 'Mapper kan opprettast (eller namnast om) direkte under denne mappa';
+$labels['longaclk'] = 'Mapper kan opprettast (eller namnast om) direkte under denne mappa';
+$labels['longacld'] = 'Meldingane sine flagg for sletting kan endrast';
+$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';
+
+$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
new file mode 100644
index 000000000..19f744066
--- /dev/null
+++ b/plugins/acl/localization/sr_CS.inc
@@ -0,0 +1,99 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/acl/localization/<lang>.inc                                   |
+ |                                                                       |
+ | 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.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-acl/
+*/
+
+$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 che�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..0c5171664 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['myrights'] = '访问��';
-$labels['username'] = '用户�：';
+$labels['username'] = '用户：';
 $labels['advanced'] = '高级模�';
 $labels['newuser'] = '添加�目';
+$labels['actions'] = 'Access right actions...';
 $labels['anyone'] = '所有用户(任何人)';
 $labels['anonymous'] = '�宾(匿�)';
 $labels['identifier'] = '标识符';
+
 $labels['acll'] = '查找';
-$labels['shortacll'] = '查找';
 $labels['aclr'] = '读�消�';
 $labels['acls'] = '�存已读状�';
+$labels['aclw'] = 'Write flags';
 $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['shortaclother'] = '其他';
+$labels['aclread'] = '阅读';
 $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'] = 'Read';
+$labels['shortaclwrite'] = '撰写';
+$labels['shortacldelete'] = '删除';
+
 $labels['longacll'] = '该文件夹在列表上��且�被订阅';
 $labels['longaclr'] = '该文件夹�被打开阅读';
-$labels['longaclread'] = '该文件夹�被打开阅读';
+$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'] = '消��被清除';
 $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['longacla'] = '文件夹访问���被修改';
+
+$labels['longaclfull'] = 'Full control including folder administration';
+$labels['longaclread'] = '该文件夹�被打开阅读';
+$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..3125c286f 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'] = 'The folder is visible on lists and can be subscribed to';
 $labels['longaclr'] = '資料夾能被打開與讀�';
-$labels['longaclread'] = '資料夾能被打開與讀�';
 $labels['longacls'] = '能修改訊�標幟';
+$labels['longaclw'] = 'Messages flags and keywords can be changed, except Seen and Deleted';
 $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/acl/tests/Acl.php b/plugins/acl/tests/Acl.php
new file mode 100644
index 000000000..e752ac977
--- /dev/null
+++ b/plugins/acl/tests/Acl.php
@@ -0,0 +1,23 @@
+<?php
+
+class Acl_Plugin extends PHPUnit_Framework_TestCase
+{
+
+    function setUp()
+    {
+        include_once dirname(__FILE__) . '/../acl.php';
+    }
+
+    /**
+     * Plugin object construction test
+     */
+    function test_constructor()
+    {
+        $rcube  = rcube::get_instance();
+        $plugin = new acl($rcube->api);
+
+        $this->assertInstanceOf('acl', $plugin);
+        $this->assertInstanceOf('rcube_plugin', $plugin);
+    }
+}
+
diff --git a/plugins/additional_message_headers/tests/AdditionalMessageHeaders.php b/plugins/additional_message_headers/tests/AdditionalMessageHeaders.php
new file mode 100644
index 000000000..1c54ffc42
--- /dev/null
+++ b/plugins/additional_message_headers/tests/AdditionalMessageHeaders.php
@@ -0,0 +1,23 @@
+<?php
+
+class AdditionalMessageHeaders_Plugin extends PHPUnit_Framework_TestCase
+{
+
+    function setUp()
+    {
+        include_once dirname(__FILE__) . '/../additional_message_headers.php';
+    }
+
+    /**
+     * Plugin object construction test
+     */
+    function test_constructor()
+    {
+        $rcube  = rcube::get_instance();
+        $plugin = new additional_message_headers($rcube->api);
+
+        $this->assertInstanceOf('additional_message_headers', $plugin);
+        $this->assertInstanceOf('rcube_plugin', $plugin);
+    }
+}
+
diff --git a/plugins/archive/archive.js b/plugins/archive/archive.js
index af2b0d26d..eee41d336 100644
--- a/plugins/archive/archive.js
+++ b/plugins/archive/archive.js
@@ -1,6 +1,6 @@
 /*
  * Archive plugin script
- * @version @package_version@
+ * @version 2.0
  */
 
 function rcmail_archive(prop)
@@ -8,8 +8,19 @@ function rcmail_archive(prop)
   if (!rcmail.env.uid && (!rcmail.message_list || !rcmail.message_list.get_selection().length))
     return;
   
-  if (rcmail.env.mailbox != rcmail.env.archive_folder)
-    rcmail.command('moveto', rcmail.env.archive_folder);
+  if (rcmail.env.mailbox.indexOf(rcmail.env.archive_folder) != 0) {
+    if (!rcmail.env.archive_type) {
+      // simply move to archive folder (if no partition type is set)
+      rcmail.command('moveto', rcmail.env.archive_folder);
+    }
+    else {
+      // let the server sort the messages to the according subfolders
+      rcmail.http_post(
+        'plugin.move2archive',
+        { _uid: rcmail.message_list.get_selection().join(','), _mbox: rcmail.env.mailbox }
+      );
+    }
+  }
 }
 
 // callback for app-onload event
@@ -29,6 +40,12 @@ if (window.rcmail) {
     var li;
     if (rcmail.env.archive_folder && (li = rcmail.get_folder_li(rcmail.env.archive_folder, '', true)))
       $(li).addClass('archive');
+
+    // callback for server response
+    rcmail.addEventListener('plugin.move2archive_response', function(result) {
+      if (result.update)
+        rcmail.command('checkmail');  // refresh list
+    });
   })
 }
 
diff --git a/plugins/archive/archive.php b/plugins/archive/archive.php
index 0a298cbe3..38b4f9fcb 100644
--- a/plugins/archive/archive.php
+++ b/plugins/archive/archive.php
@@ -6,7 +6,7 @@
  * Plugin that adds a new button to the mailbox toolbar
  * to move messages to a (user selectable) archive folder.
  *
- * @version @package_version@
+ * @version 2.0
  * @license GNU GPLv3+
  * @author Andre Rodier, Thomas Bruederli
  */
@@ -45,14 +45,19 @@ class archive extends rcube_plugin
       // register hook to localize the archive folder
       $this->add_hook('render_mailboxlist', array($this, 'render_mailboxlist'));
 
-      // set env variable for client
+      // set env variables for client
       $rcmail->output->set_env('archive_folder', $archive_folder);
+      $rcmail->output->set_env('archive_type', $rcmail->config->get('archive_type',''));
 
       // add archive folder to the list of default mailboxes
       if (($default_folders = $rcmail->config->get('default_folders')) && !in_array($archive_folder, $default_folders)) {
         $default_folders[] = $archive_folder;
         $rcmail->config->set('default_folders', $default_folders);
-      }  
+      }
+    }
+    else if ($rcmail->task == 'mail') {
+      // handler for ajax request
+      $this->register_action('plugin.move2archive', array($this, 'move_messages'));
     }
     else if ($rcmail->task == 'settings') {
       $dont_override = $rcmail->config->get('dont_override', array());
@@ -62,7 +67,10 @@ class archive extends rcube_plugin
       }
     }
   }
-  
+
+  /**
+   * Hook to give the archive folder a localized name in the mailbox list
+   */
   function render_mailboxlist($p)
   {
     $rcmail = rcmail::get_instance();
@@ -80,7 +88,10 @@ class archive extends rcube_plugin
     return $p;
   }
 
-  function _mod_folder_name(&$list, $folder, $new_name)
+  /**
+   * Helper method to find the archive folder in the mailbox tree
+   */
+  private function _mod_folder_name(&$list, $folder, $new_name)
   {
     foreach ($list as $idx => $item) {
       if ($item['id'] == $folder) {
@@ -93,6 +104,100 @@ class archive extends rcube_plugin
     return false;
   }
 
+  /**
+   * Plugin action to move the submitted list of messages to the archive subfolders
+   * according to the user settings and their headers.
+   */
+  function move_messages()
+  {
+    $rcmail = rcmail::get_instance();
+    $this->add_texts('localization');
+
+    $storage = $rcmail->get_storage();
+    $storage->set_folder(($current_mbox = rcube_utils::get_input_value('_mbox', RCUBE_INPUT_POST)));
+
+    $delimiter = $storage->get_hierarchy_delimiter();
+    $archive_folder = $rcmail->config->get('archive_mbox');
+    $archive_type = $rcmail->config->get('archive_type', '');
+
+    $result = array('reload' => false, 'update' => false, 'errors' => array());
+
+    $uids = explode(',', rcube_utils::get_input_value('_uid', RCUBE_INPUT_POST));
+    foreach ($uids as $uid) {
+      if (!$archive_folder || !($message = $rcmail->storage->get_message($uid))) {
+        continue;
+      }
+
+      $subfolder = null;
+      switch ($archive_type) {
+        case 'year':
+          $subfolder = $rcmail->format_date($message->timestamp, 'Y');
+          break;
+
+        case 'month':
+          $subfolder = $rcmail->format_date($message->timestamp, 'Y') . $delimiter . $rcmail->format_date($message->timestamp, 'm');
+          break;
+
+        case 'folder':
+          $subfolder = $current_mbox;
+          break;
+
+        case 'sender':
+          $from = $message->get('from');
+          if (preg_match('/[\b<](.+@.+)[\b>]/i', $from, $m)) {
+            $subfolder = $m[1];
+          }
+          else {
+            $subfolder = $this->gettext('unkownsender');
+          }
+
+          // replace reserved characters in folder name
+          $repl = $delimiter == '-' ? '_' : '-';
+          $replacements[$delimiter] = $repl;
+          $replacements['.'] = $repl;  // some IMAP server do not allow . characters
+          $subfolder = strtr($subfolder, $replacements);
+          break;
+
+        default:
+          $subfolder = '';
+          break;
+      }
+
+      // compose full folder path
+      $folder =  $archive_folder . ($subfolder ? $delimiter . $subfolder : '');
+
+      // create archive subfolder if it doesn't yet exist
+      if (!$storage->folder_exists($folder, false)) {
+        if ($storage->create_folder($folder, true))
+          $result['reload'] = true;
+      }
+
+      // move message to target folder
+      if ($storage->move_message(array($uid), $folder)) {
+        $result['update'] = true;
+      }
+      else {
+        $result['errors'][] = $uid;
+      }
+    }  // end for
+
+    // send response
+    if ($result['errors']) {
+      $rcmail->output->show_message($this->gettext('archiveerror'), 'warning');
+    }
+    if ($result['reload']) {
+      $rcmail->output->show_message($this->gettext('archivedreload'), 'confirmation');
+    }
+    else if ($result['update']) {
+      $rcmail->output->show_message($this->gettext('archived'), 'confirmation');
+    }
+
+    $rcmail->output->command('plugin.move2archive_response', $result);
+  }
+
+  /**
+   * Hook to inject plugin-specific user settings
+   */
   function prefs_table($args)
   {
     global $CURR_SECTION;
@@ -104,7 +209,7 @@ class archive extends rcube_plugin
 
       // load folders list when needed
       if ($CURR_SECTION)
-        $select = rcmail_mailbox_select(array('noselection' => '---', 'realnames' => true,
+        $select = $rcmail->folder_selector(array('noselection' => '---', 'realnames' => true,
           'maxlength' => 30, 'exceptions' => array('INBOX'), 'folder_filter' => 'mail', 'folder_rights' => 'w'));
       else
         $select = new html_select();
@@ -113,15 +218,36 @@ class archive extends rcube_plugin
           'title' => $this->gettext('archivefolder'),
           'content' => $select->show($rcmail->config->get('archive_mbox'), array('name' => "_archive_mbox"))
       );
+
+      // add option for structuring the archive folder
+      $archive_type = new html_select(array('name' => '_archive_type', 'id' => 'ff_archive_type'));
+      $archive_type->add($this->gettext('none'), '');
+      $archive_type->add($this->gettext('archivetypeyear'), 'year');
+      $archive_type->add($this->gettext('archivetypemonth'), 'month');
+      $archive_type->add($this->gettext('archivetypesender'), 'sender');
+      $archive_type->add($this->gettext('archivetypefolder'), 'folder');
+
+      $args['blocks']['archive'] = array(
+        'name' => Q(rcube_label('settingstitle', 'archive')),
+        'options' => array('archive_type' => array(
+            'title' => $this->gettext('archivetype'),
+            'content' => $archive_type->show($rcmail->config->get('archive_type'))
+          )
+        )
+      );
     }
 
     return $args;
   }
 
+  /**
+   * Hook to save plugin-specific user settings
+   */
   function save_prefs($args)
   {
     if ($args['section'] == 'folders') {
-      $args['prefs']['archive_mbox'] = get_input_value('_archive_mbox', RCUBE_INPUT_POST);
+      $args['prefs']['archive_mbox'] = rcube_utils::get_input_value('_archive_mbox', rcube_utils::INPUT_POST);
+      $args['prefs']['archive_type'] = rcube_utils::get_input_value('_archive_type', rcube_utils::INPUT_POST);
       return $args;
     }
   }
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..8aab6f2da 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'] = 'Successfully archived. Reload the page to see the new archive folders.';
+$labels['archiveerror'] = 'Some messages could not be archived';
+$labels['archivefolder'] = 'Arxiv';
+$labels['settingstitle'] = 'Archive';
+$labels['archivetype'] = 'Divide archive by';
+$labels['archivetypeyear'] = 'Year (e.g. Archive/2012)';
+$labels['archivetypemonth'] = 'Month (e.g. Archive/2012/06)';
+$labels['archivetypefolder'] = 'Original folder';
+$labels['archivetypesender'] = 'Sender email';
+$labels['unkownsender'] = 'unknown';
 
+?>
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..fd32931c2 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'] = '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/br.inc b/plugins/archive/localization/br.inc
new file mode 100644
index 000000000..6b7859936
--- /dev/null
+++ b/plugins/archive/localization/br.inc
@@ -0,0 +1,34 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/archive/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-archive/
+*/
+
+$labels = array();
+$labels['buttontext'] = '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..fde7d358e 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'] = 'Successfully archived. Reload the page to see the new archive folders.';
+$labels['archiveerror'] = 'Some messages could not be archived';
+$labels['archivefolder'] = 'Arxiva';
+$labels['settingstitle'] = 'Archive';
+$labels['archivetype'] = 'Divide archive by';
+$labels['archivetypeyear'] = 'Year (e.g. Archive/2012)';
+$labels['archivetypemonth'] = 'Month (e.g. Archive/2012/06)';
+$labels['archivetypefolder'] = 'Original folder';
+$labels['archivetypesender'] = 'Sender email';
+$labels['unkownsender'] = 'unknown';
 
+?>
diff --git a/plugins/archive/localization/cs_CZ.inc b/plugins/archive/localization/cs_CZ.inc
index 28a41913b..2f2fd95d5 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'] = 'Successfully archived. Reload the page to see the new archive folders.';
+$labels['archiveerror'] = 'Some messages could not be archived';
+$labels['archivefolder'] = 'Archiv';
+$labels['settingstitle'] = 'Archive';
+$labels['archivetype'] = 'Divide archive by';
+$labels['archivetypeyear'] = 'Year (e.g. Archive/2012)';
+$labels['archivetypemonth'] = 'Month (e.g. Archive/2012/06)';
+$labels['archivetypefolder'] = 'Original folder';
+$labels['archivetypesender'] = 'Sender email';
+$labels['unkownsender'] = 'unknown';
 
+?>
diff --git a/plugins/archive/localization/cy_GB.inc b/plugins/archive/localization/cy_GB.inc
index 579c5b16e..fa8e19756 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'] = 'Successfully archived. Reload the page to see the new archive folders.';
+$labels['archiveerror'] = 'Some messages could not be archived';
+$labels['archivefolder'] = 'Archif';
+$labels['settingstitle'] = 'Archive';
+$labels['archivetype'] = 'Divide archive by';
+$labels['archivetypeyear'] = 'Year (e.g. Archive/2012)';
+$labels['archivetypemonth'] = 'Month (e.g. Archive/2012/06)';
+$labels['archivetypefolder'] = 'Original folder';
+$labels['archivetypesender'] = 'Sender email';
+$labels['unkownsender'] = 'unknown';
 
+?>
diff --git a/plugins/archive/localization/da_DK.inc b/plugins/archive/localization/da_DK.inc
index 936c05cbe..d4a88cab4 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'] = 'Successfully archived. Reload the page to see the new archive folders.';
+$labels['archiveerror'] = 'Some messages could not be archived';
+$labels['archivefolder'] = 'Arkiv';
+$labels['settingstitle'] = 'Archive';
+$labels['archivetype'] = 'Divide archive by';
+$labels['archivetypeyear'] = 'Year (e.g. Archive/2012)';
+$labels['archivetypemonth'] = 'Month (e.g. Archive/2012/06)';
+$labels['archivetypefolder'] = 'Original folder';
+$labels['archivetypesender'] = 'Sender email';
+$labels['unkownsender'] = 'unknown';
 
+?>
diff --git a/plugins/archive/localization/de_CH.inc b/plugins/archive/localization/de_CH.inc
index bae441305..65cf6efe0 100644
--- a/plugins/archive/localization/de_CH.inc
+++ b/plugins/archive/localization/de_CH.inc
@@ -2,20 +2,33 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/de_CH/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['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['buttontitle'] = 'Nachricht archivieren';
-$labels['archived'] = 'Nachricht erfolgreich archiviert';
+$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..57a98abc8 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'] = '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/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/en_US.inc b/plugins/archive/localization/en_US.inc
index 01a4f1e13..d3714c118 100644
--- a/plugins/archive/localization/en_US.inc
+++ b/plugins/archive/localization/en_US.inc
@@ -1,9 +1,34 @@
 <?php
 
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/archive/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-archive/
+*/
+
 $labels = array();
 $labels['buttontext'] = '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..ad9e84add 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'] = 'Successfully archived. Reload the page to see the new archive folders.';
+$labels['archiveerror'] = 'Some messages could not be archived';
+$labels['archivefolder'] = 'Archivo';
+$labels['settingstitle'] = 'Archive';
+$labels['archivetype'] = 'Divide archive by';
+$labels['archivetypeyear'] = 'Year (e.g. Archive/2012)';
+$labels['archivetypemonth'] = 'Month (e.g. Archive/2012/06)';
+$labels['archivetypefolder'] = 'Original folder';
+$labels['archivetypesender'] = 'Sender email';
+$labels['unkownsender'] = 'unknown';
 
+?>
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..09b64b2ab 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'] = '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/he_IL.inc b/plugins/archive/localization/he_IL.inc
index 2243bea93..834e46729 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'] = '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/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..e95c2d0d2 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'] = 'Successfully archived. Reload the page to see the new archive folders.';
+$labels['archiveerror'] = 'Some messages could not be archived';
+$labels['archivefolder'] = 'Archiválás';
+$labels['settingstitle'] = 'Archive';
+$labels['archivetype'] = 'Divide archive by';
+$labels['archivetypeyear'] = 'Year (e.g. Archive/2012)';
+$labels['archivetypemonth'] = 'Month (e.g. Archive/2012/06)';
+$labels['archivetypefolder'] = 'Original folder';
+$labels['archivetypesender'] = 'Sender email';
+$labels['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..96a7ac404 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['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/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..36046277a 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'] = 'Successfully archived. Reload the page to see the new archive folders.';
+$labels['archiveerror'] = 'Some messages could not be archived';
+$labels['archivefolder'] = 'Archyvuoti';
+$labels['settingstitle'] = 'Archive';
+$labels['archivetype'] = 'Divide archive by';
+$labels['archivetypeyear'] = 'Year (e.g. Archive/2012)';
+$labels['archivetypemonth'] = 'Month (e.g. Archive/2012/06)';
+$labels['archivetypefolder'] = 'Original folder';
+$labels['archivetypesender'] = 'Sender email';
+$labels['unkownsender'] = 'unknown';
 
+?>
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_NB.inc b/plugins/archive/localization/nb_NB.inc
deleted file mode 100644
index 46e49aba0..000000000
--- a/plugins/archive/localization/nb_NB.inc
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-/*
- +-----------------------------------------------------------------------+
- | localization/nb_NB/labels.inc                                         |
- |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
- |                                                                       |
- +-----------------------------------------------------------------------+
- | Author: Tobias V. Langhoff <spug@thespug.net>                         |
- +-----------------------------------------------------------------------+
-*/
-
-$labels = array();
-$labels['buttontext'] = 'Arkiv';
-$labels['archivefolder'] = 'Arkiv';
-$labels['buttontitle'] = 'Arkiver meldingen';
-$labels['archived'] = 'Arkivert';
-
diff --git a/plugins/archive/localization/nb_NO.inc b/plugins/archive/localization/nb_NO.inc
new file mode 100644
index 000000000..62ea381ca
--- /dev/null
+++ b/plugins/archive/localization/nb_NO.inc
@@ -0,0 +1,34 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/archive/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-archive/
+*/
+
+$labels = array();
+$labels['buttontext'] = '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
new file mode 100644
index 000000000..01effaa62
--- /dev/null
+++ b/plugins/archive/localization/nn_NO.inc
@@ -0,0 +1,34 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/archive/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-archive/
+*/
+
+$labels = array();
+$labels['buttontext'] = '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..94d1f68b1 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'] = 'Successfully archived. Reload the page to see the new archive folders.';
+$labels['archiveerror'] = 'Some messages could not be archived';
+$labels['archivefolder'] = 'Arhiv';
+$labels['settingstitle'] = 'Archive';
+$labels['archivetype'] = 'Divide archive by';
+$labels['archivetypeyear'] = 'Year (e.g. Archive/2012)';
+$labels['archivetypemonth'] = 'Month (e.g. Archive/2012/06)';
+$labels['archivetypefolder'] = 'Original folder';
+$labels['archivetypesender'] = 'Sender email';
+$labels['unkownsender'] = 'unknown';
 
+?>
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..765498301 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'] = 'Successfully archived. Reload the page to see the new archive folders.';
+$labels['archiveerror'] = 'Some messages could not be archived';
+$labels['archivefolder'] = 'ArÅŸiv';
+$labels['settingstitle'] = 'Archive';
+$labels['archivetype'] = 'Divide archive by';
+$labels['archivetypeyear'] = 'Year (e.g. Archive/2012)';
+$labels['archivetypemonth'] = 'Month (e.g. Archive/2012/06)';
+$labels['archivetypefolder'] = 'Original folder';
+$labels['archivetypesender'] = 'Sender email';
+$labels['unkownsender'] = 'unknown';
 
+?>
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..a434f3184 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'] = '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/package.xml b/plugins/archive/package.xml
index 1aeffaf41..62a009a99 100644
--- a/plugins/archive/package.xml
+++ b/plugins/archive/package.xml
@@ -6,17 +6,17 @@
 	<name>archive</name>
 	<channel>pear.roundcube.net</channel>
 	<summary>Archive feature for Roundcube</summary>
-	<description>This adds a button to move the selected messages to an archive folder. The folder can be selected in the settings panel.</description>
+	<description>This adds a button to move the selected messages to an archive folder. The folder (and the optional structure of subfolders) can be selected in the settings panel.</description>
 	<lead>
 		<name>Thomas Bruederli</name>
 		<user>thomasb</user>
 		<email>roundcube@gmail.com</email>
 		<active>yes</active>
 	</lead>
-	<date>2011-11-23</date>
+	<date>2013-01-20</date>
 	<version>
-		<release>1.6</release>
-		<api>1.6</api>
+		<release>2.0</release>
+		<api>2.0</api>
 	</version>
 	<stability>
 		<release>stable</release>
@@ -34,21 +34,55 @@
 				<tasks:replace from="@name@" to="name" type="package-info"/>
 				<tasks:replace from="@package_version@" to="version" type="package-info"/>
 			</file>
+			<file name="localization/ar_SA.inc" role="data"></file>
+			<file name="localization/az_AZ.inc" role="data"></file>
+			<file name="localization/be_BE.inc" role="data"></file>
+			<file name="localization/bg_BG.inc" role="data"></file>
+			<file name="localization/bs_BA.inc" role="data"></file>
+			<file name="localization/ca_ES.inc" role="data"></file>
 			<file name="localization/cs_CZ.inc" role="data"></file>
+			<file name="localization/cy_GB.inc" role="data"></file>
+			<file name="localization/da_DK.inc" role="data"></file>
 			<file name="localization/de_CH.inc" role="data"></file>
 			<file name="localization/de_DE.inc" role="data"></file>
+			<file name="localization/el_GR.inc" role="data"></file>
+			<file name="localization/eb_GB.inc" role="data"></file>
 			<file name="localization/en_US.inc" role="data"></file>
 			<file name="localization/es_AR.inc" role="data"></file>
 			<file name="localization/es_ES.inc" role="data"></file>
 			<file name="localization/et_EE.inc" role="data"></file>
+			<file name="localization/fa_IR.inc" role="data"></file>
+			<file name="localization/fi_FI.inc" role="data"></file>
 			<file name="localization/fr_FR.inc" role="data"></file>
 			<file name="localization/gl_ES.inc" role="data"></file>
+			<file name="localization/he_IL.inc" role="data"></file>
+			<file name="localization/hr_HR.inc" role="data"></file>
+			<file name="localization/hu_HU.inc" role="data"></file>
+			<file name="localization/hy_AM.inc" role="data"></file>
+			<file name="localization/id_ID.inc" role="data"></file>
+			<file name="localization/it_IT.inc" role="data"></file>
 			<file name="localization/ja_JP.inc" role="data"></file>
+			<file name="localization/km_KH.inc" role="data"></file>
+			<file name="localization/ko_KR.inc" role="data"></file>
+			<file name="localization/lt_LT.inc" role="data"></file>
+			<file name="localization/lv_LV.inc" role="data"></file>
+			<file name="localization/ml_IN.inc" role="data"></file>
+			<file name="localization/nb_NO.inc" role="data"></file>
 			<file name="localization/nl_NL.inc" role="data"></file>
+			<file name="localization/nn_NO.inc" role="data"></file>
 			<file name="localization/pl_PL.inc" role="data"></file>
 			<file name="localization/pt_BR.inc" role="data"></file>
+			<file name="localization/pt_PT.inc" role="data"></file>
 			<file name="localization/ru_RU.inc" role="data"></file>
+			<file name="localization/si_LK.inc" role="data"></file>
+			<file name="localization/sk_SK.inc" role="data"></file>
+			<file name="localization/sl_SI.inc" role="data"></file>
+			<file name="localization/sr_CS.inc" role="data"></file>
 			<file name="localization/sv_SE.inc" role="data"></file>
+			<file name="localization/tr_TR.inc" role="data"></file>
+			<file name="localization/uk_UA.inc" role="data"></file>
+			<file name="localization/vi_VN.inc" role="data"></file>
+			<file name="localization/zh_CN.inc" role="data"></file>
 			<file name="localization/zh_TW.inc" role="data"></file>
 			<file name="skins/classic/archive_act.png" role="data"></file>
 			<file name="skins/classic/archive_pas.png" role="data"></file>
diff --git a/plugins/archive/tests/Archive.php b/plugins/archive/tests/Archive.php
new file mode 100644
index 000000000..0a1eeae11
--- /dev/null
+++ b/plugins/archive/tests/Archive.php
@@ -0,0 +1,23 @@
+<?php
+
+class Archive_Plugin extends PHPUnit_Framework_TestCase
+{
+
+    function setUp()
+    {
+        include_once dirname(__FILE__) . '/../archive.php';
+    }
+
+    /**
+     * Plugin object construction test
+     */
+    function test_constructor()
+    {
+        $rcube  = rcube::get_instance();
+        $plugin = new archive($rcube->api);
+
+        $this->assertInstanceOf('archive', $plugin);
+        $this->assertInstanceOf('rcube_plugin', $plugin);
+    }
+}
+
diff --git a/plugins/autologon/tests/Autologon.php b/plugins/autologon/tests/Autologon.php
new file mode 100644
index 000000000..0de193e4a
--- /dev/null
+++ b/plugins/autologon/tests/Autologon.php
@@ -0,0 +1,23 @@
+<?php
+
+class Autologon_Plugin extends PHPUnit_Framework_TestCase
+{
+
+    function setUp()
+    {
+        include_once dirname(__FILE__) . '/../autologon.php';
+    }
+
+    /**
+     * Plugin object construction test
+     */
+    function test_constructor()
+    {
+        $rcube  = rcube::get_instance();
+        $plugin = new autologon($rcube->api);
+
+        $this->assertInstanceOf('autologon', $plugin);
+        $this->assertInstanceOf('rcube_plugin', $plugin);
+    }
+}
+
diff --git a/plugins/database_attachments/database_attachments.php b/plugins/database_attachments/database_attachments.php
index 079f4e567..2511dbbb2 100644
--- a/plugins/database_attachments/database_attachments.php
+++ b/plugins/database_attachments/database_attachments.php
@@ -46,7 +46,7 @@ class database_attachments extends filesystem_attachments
         $data = base64_encode($data);
 
         $status = $rcmail->db->query(
-            "INSERT INTO ".get_table_name('cache')
+            "INSERT INTO ".$rcmail->db->table_name('cache')
              ." (created, user_id, cache_key, data)"
              ." VALUES (".$rcmail->db->now().", ?, ?, ?)",
             $_SESSION['user_id'],
@@ -82,7 +82,7 @@ class database_attachments extends filesystem_attachments
         $data = base64_encode($args['data']);
 
         $status = $rcmail->db->query(
-            "INSERT INTO ".get_table_name('cache')
+            "INSERT INTO ".$rcmail->db->table_name('cache')
              ." (created, user_id, cache_key, data)"
              ." VALUES (".$rcmail->db->now().", ?, ?, ?)",
             $_SESSION['user_id'],
@@ -106,7 +106,7 @@ class database_attachments extends filesystem_attachments
         $args['status'] = false;
         $rcmail = rcmail::get_instance();
         $status = $rcmail->db->query(
-            "DELETE FROM ".get_table_name('cache')
+            "DELETE FROM ".$rcmail->db->table_name('cache')
              ." WHERE user_id = ?"
                 ." AND cache_key = ?",
             $_SESSION['user_id'],
@@ -139,7 +139,7 @@ class database_attachments extends filesystem_attachments
 
         $sql_result = $rcmail->db->query(
             "SELECT data"
-             ." FROM ".get_table_name('cache')
+             ." FROM ".$rcmail->db->table_name('cache')
              ." WHERE user_id=?"
                 ." AND cache_key=?",
             $_SESSION['user_id'],
@@ -161,7 +161,7 @@ class database_attachments extends filesystem_attachments
         $prefix = $this->cache_prefix . $args['group'];
         $rcmail = rcmail::get_instance();
         $rcmail->db->query(
-            "DELETE FROM ".get_table_name('cache')
+            "DELETE FROM ".$rcmail->db->table_name('cache')
             ." WHERE user_id = ?"
                 ." AND cache_key LIKE '{$prefix}%'",
             $_SESSION['user_id']);
diff --git a/plugins/database_attachments/tests/DatabaseAttachments.php b/plugins/database_attachments/tests/DatabaseAttachments.php
new file mode 100644
index 000000000..f260737ab
--- /dev/null
+++ b/plugins/database_attachments/tests/DatabaseAttachments.php
@@ -0,0 +1,23 @@
+<?php
+
+class DatabaseAttachments_Plugin extends PHPUnit_Framework_TestCase
+{
+
+    function setUp()
+    {
+        include_once dirname(__FILE__) . '/../database_attachments.php';
+    }
+
+    /**
+     * Plugin object construction test
+     */
+    function test_constructor()
+    {
+        $rcube  = rcube::get_instance();
+        $plugin = new database_attachments($rcube->api);
+
+        $this->assertInstanceOf('database_attachments', $plugin);
+        $this->assertInstanceOf('rcube_plugin', $plugin);
+    }
+}
+
diff --git a/plugins/debug_logger/debug_logger.php b/plugins/debug_logger/debug_logger.php
index 1e015c201..87a163785 100644
--- a/plugins/debug_logger/debug_logger.php
+++ b/plugins/debug_logger/debug_logger.php
@@ -142,8 +142,9 @@ class debug_logger extends rcube_plugin
         return $args;
     }
 
-    function __destruct(){
-                $this->runlog->end();
+    function __destruct()
+    {
+        if ($this->runlog)
+            $this->runlog->end();
     }
 }
-?>
diff --git a/plugins/debug_logger/tests/DebugLogger.php b/plugins/debug_logger/tests/DebugLogger.php
new file mode 100644
index 000000000..de20a069d
--- /dev/null
+++ b/plugins/debug_logger/tests/DebugLogger.php
@@ -0,0 +1,23 @@
+<?php
+
+class DebugLogger_Plugin extends PHPUnit_Framework_TestCase
+{
+
+    function setUp()
+    {
+        include_once dirname(__FILE__) . '/../debug_logger.php';
+    }
+
+    /**
+     * Plugin object construction test
+     */
+    function test_constructor()
+    {
+        $rcube  = rcube::get_instance();
+        $plugin = new debug_logger($rcube->api);
+
+        $this->assertInstanceOf('debug_logger', $plugin);
+        $this->assertInstanceOf('rcube_plugin', $plugin);
+    }
+}
+
diff --git a/plugins/emoticons/tests/Emoticons.php b/plugins/emoticons/tests/Emoticons.php
new file mode 100644
index 000000000..4b6c303c2
--- /dev/null
+++ b/plugins/emoticons/tests/Emoticons.php
@@ -0,0 +1,23 @@
+<?php
+
+class Emoticons_Plugin extends PHPUnit_Framework_TestCase
+{
+
+    function setUp()
+    {
+        include_once dirname(__FILE__) . '/../emoticons.php';
+    }
+
+    /**
+     * Plugin object construction test
+     */
+    function test_constructor()
+    {
+        $rcube  = rcube::get_instance();
+        $plugin = new emoticons($rcube->api);
+
+        $this->assertInstanceOf('emoticons', $plugin);
+        $this->assertInstanceOf('rcube_plugin', $plugin);
+    }
+}
+
diff --git a/plugins/enigma/enigma.php b/plugins/enigma/enigma.php
index a4009ce26..c96b94620 100644
--- a/plugins/enigma/enigma.php
+++ b/plugins/enigma/enigma.php
@@ -79,7 +79,7 @@ class enigma extends rcube_plugin
             $this->register_action('plugin.enigma', array($this, 'preferences_ui'));
 
             // grab keys/certs management iframe requests
-            $section = get_input_value('_section', RCUBE_INPUT_GET);
+            $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);
@@ -230,7 +230,7 @@ class enigma extends rcube_plugin
     {
         if ($p['section'] == 'enigmasettings') {
             $a['prefs'] = array(
-//                'dummy' => get_input_value('_dummy', RCUBE_INPUT_POST),
+//                'dummy' => rcube_utils::get_input_value('_dummy', rcube_utils::INPUT_POST),
             );
         }
 
@@ -285,16 +285,16 @@ class enigma extends rcube_plugin
                 $attrib['class'] = 'enigmaerror';
                 $code = $status->getCode();
                 if ($code == enigma_error::E_KEYNOTFOUND)
-                    $msg = Q(str_replace('$keyid', enigma_key::format_id($status->getData('id')),
+                    $msg = rcube::Q(str_replace('$keyid', enigma_key::format_id($status->getData('id')),
                         $this->gettext('decryptnokey')));
                 else if ($code == enigma_error::E_BADPASS)
-                    $msg = Q($this->gettext('decryptbadpass'));
+                    $msg = rcube::Q($this->gettext('decryptbadpass'));
                 else
-                    $msg = Q($this->gettext('decrypterror'));
+                    $msg = rcube::Q($this->gettext('decrypterror'));
             }
             else {
                 $attrib['class'] = 'enigmanotice';
-                $msg = Q($this->gettext('decryptok'));
+                $msg = rcube::Q($this->gettext('decryptok'));
             }
 
             $p['prefix'] .= html::div($attrib, $msg);
@@ -315,27 +315,27 @@ class enigma extends rcube_plugin
                 if ($sig->valid) {
                     $attrib['class'] = 'enigmanotice';
                     $sender = ($sig->name ? $sig->name . ' ' : '') . '<' . $sig->email . '>';
-                    $msg = Q(str_replace('$sender', $sender, $this->gettext('sigvalid')));
+                    $msg = rcube::Q(str_replace('$sender', $sender, $this->gettext('sigvalid')));
                 }
                 else {
                     $attrib['class'] = 'enigmawarning';
                     $sender = ($sig->name ? $sig->name . ' ' : '') . '<' . $sig->email . '>';
-                    $msg = Q(str_replace('$sender', $sender, $this->gettext('siginvalid')));
+                    $msg = rcube::Q(str_replace('$sender', $sender, $this->gettext('siginvalid')));
                 }
             }
             else if ($sig->getCode() == enigma_error::E_KEYNOTFOUND) {
                 $attrib['class'] = 'enigmawarning';
-                $msg = Q(str_replace('$keyid', enigma_key::format_id($sig->getData('id')),
+                $msg = rcube::Q(str_replace('$keyid', enigma_key::format_id($sig->getData('id')),
                     $this->gettext('signokey')));
             }
             else {
                 $attrib['class'] = 'enigmaerror';
-                $msg = Q($this->gettext('sigerror'));
+                $msg = rcube::Q($this->gettext('sigerror'));
             }
 /*
             $msg .= '&nbsp;' . html::a(array('href' => "#sigdetails",
-                'onclick' => JS_OBJECT_NAME.".command('enigma-sig-details')"),
-                Q($this->gettext('showdetails')));
+                'onclick' => rcmail_output::JS_OBJECT_NAME.".command('enigma-sig-details')"),
+                rcube::Q($this->gettext('showdetails')));
 */
             // test
 //            $msg .= '<br /><pre>'.$sig->body.'</pre>';
@@ -433,7 +433,7 @@ class enigma extends rcube_plugin
             $p['content'] .= html::p(array('style' => $style),
                 html::a(array(
                     'href' => "#",
-                    'onclick' => "return ".JS_OBJECT_NAME.".enigma_import_attachment('".JQ($part)."')",
+                    'onclick' => "return ".rcmail_output::JS_OBJECT_NAME.".enigma_import_attachment('".rcube::JQ($part)."')",
                     'title' => $this->gettext('keyattimport')),
                     html::img(array('src' => $this->url('skins/classic/key_add.png'), 'style' => "vertical-align:middle")))
                 . ' ' . html::span(null, $this->gettext('keyattfound')));
diff --git a/plugins/enigma/lib/enigma_engine.php b/plugins/enigma/lib/enigma_engine.php
index 89cb4b796..220d6c0b3 100644
--- a/plugins/enigma/lib/enigma_engine.php
+++ b/plugins/enigma/lib/enigma_engine.php
@@ -65,7 +65,7 @@ class enigma_engine
         $this->pgp_driver = new $driver($username);
 
         if (!$this->pgp_driver) {
-            raise_error(array(
+            rcube::raise_error(array(
                 'code' => 600, 'type' => 'php',
                 'file' => __FILE__, 'line' => __LINE__,
                 'message' => "Enigma plugin: Unable to load PGP driver: $driver"
@@ -76,7 +76,7 @@ class enigma_engine
         $result = $this->pgp_driver->init();
 
         if ($result instanceof enigma_error) {
-            raise_error(array(
+            rcube::raise_error(array(
                 'code' => 600, 'type' => 'php',
                 'file' => __FILE__, 'line' => __LINE__,
                 'message' => "Enigma plugin: ".$result->getMessage()
@@ -102,7 +102,7 @@ class enigma_engine
         $this->smime_driver = new $driver($username);
 
         if (!$this->smime_driver) {
-            raise_error(array(
+            rcube::raise_error(array(
                 'code' => 600, 'type' => 'php',
                 'file' => __FILE__, 'line' => __LINE__,
                 'message' => "Enigma plugin: Unable to load S/MIME driver: $driver"
@@ -113,7 +113,7 @@ class enigma_engine
         $result = $this->smime_driver->init();
 
         if ($result instanceof enigma_error) {
-            raise_error(array(
+            rcube::raise_error(array(
                 'code' => 600, 'type' => 'php',
                 'file' => __FILE__, 'line' => __LINE__,
                 'message' => "Enigma plugin: ".$result->getMessage()
@@ -378,7 +378,7 @@ class enigma_engine
          $sig = $this->pgp_driver->verify($msg_body, $sig_body);
 
          if (($sig instanceof enigma_error) && $sig->getCode() != enigma_error::E_KEYNOTFOUND)
-             raise_error(array(
+             rcube::raise_error(array(
                 'code' => 600, 'type' => 'php',
                 'file' => __FILE__, 'line' => __LINE__,
                 'message' => "Enigma plugin: " . $error->getMessage()
@@ -407,7 +407,7 @@ class enigma_engine
         if ($result instanceof enigma_error) {
             $err_code = $result->getCode();
             if (!in_array($err_code, array(enigma_error::E_KEYNOTFOUND, enigma_error::E_BADPASS)))
-                raise_error(array(
+                rcube::raise_error(array(
                     'code' => 600, 'type' => 'php',
                     'file' => __FILE__, 'line' => __LINE__,
                     'message' => "Enigma plugin: " . $result->getMessage()
@@ -432,7 +432,7 @@ class enigma_engine
         $result = $this->pgp_driver->list_keys($pattern);
     
         if ($result instanceof enigma_error) {
-            raise_error(array(
+            rcube::raise_error(array(
                 'code' => 600, 'type' => 'php',
                 'file' => __FILE__, 'line' => __LINE__,
                 'message' => "Enigma plugin: " . $result->getMessage()
@@ -455,7 +455,7 @@ class enigma_engine
         $result = $this->pgp_driver->get_key($keyid);
     
         if ($result instanceof enigma_error) {
-            raise_error(array(
+            rcube::raise_error(array(
                 'code' => 600, 'type' => 'php',
                 'file' => __FILE__, 'line' => __LINE__,
                 'message' => "Enigma plugin: " . $result->getMessage()
@@ -479,7 +479,7 @@ class enigma_engine
         $result = $this->pgp_driver->import($content, $isfile);
 
         if ($result instanceof enigma_error) {
-            raise_error(array(
+            rcube::raise_error(array(
                 'code' => 600, 'type' => 'php',
                 'file' => __FILE__, 'line' => __LINE__,
                 'message' => "Enigma plugin: " . $result->getMessage()
@@ -498,9 +498,9 @@ class enigma_engine
      */
     function import_file()
     {
-        $uid = get_input_value('_uid', RCUBE_INPUT_POST);
-        $mbox = get_input_value('_mbox', RCUBE_INPUT_POST);
-        $mime_id = get_input_value('_part', RCUBE_INPUT_POST);
+        $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);
 
         if ($uid && $mime_id) {
             $part = $this->rc->storage->get_message_part($uid, $mime_id);
diff --git a/plugins/enigma/lib/enigma_ui.php b/plugins/enigma/lib/enigma_ui.php
index dc3580872..47366b7e8 100644
--- a/plugins/enigma/lib/enigma_ui.php
+++ b/plugins/enigma/lib/enigma_ui.php
@@ -49,7 +49,7 @@ class enigma_ui
 
         // Enigma actions
         if ($this->rc->action == 'plugin.enigma') {
-            $action = get_input_value('_a', RCUBE_INPUT_GPC);
+            $action = rcube_utils::get_input_value('_a', rcube_utils::INPUT_GPC);
 
             switch ($action) {
                 case 'keyedit':
@@ -152,7 +152,7 @@ class enigma_ui
         $a_show_cols = array('name');
 
         // create XHTML table
-        $out = rcube_table_output($attrib, array(), $a_show_cols, 'id');
+        $out = $this->rc->table_output($attrib, array(), $a_show_cols, 'id');
 
         // set client env
         $this->rc->output->add_gui_object('keyslist', $attrib['id']);
@@ -172,8 +172,8 @@ class enigma_ui
         $this->enigma->load_engine();
 
         $pagesize = $this->rc->config->get('pagesize', 100);
-        $page     = max(intval(get_input_value('_p', RCUBE_INPUT_GPC)), 1);
-        $search   = get_input_value('_q', RCUBE_INPUT_GPC);
+        $page     = max(intval(rcube_utils::get_input_value('_p', rcube_utils::INPUT_GPC)), 1);
+        $search   = rcube_utils::get_input_value('_q', rcube_utils::INPUT_GPC);
 
         // define list of cols to be displayed
         $a_show_cols = array('name');
@@ -202,7 +202,7 @@ class enigma_ui
                 // Add rows
                 foreach($list as $idx => $key) {
                     $this->rc->output->command('enigma_add_list_row',
-                        array('name' => Q($key->name), 'id' => $key->id));
+                        array('name' => rcube::Q($key->name), 'id' => $key->id));
                 }
             }
         }
@@ -261,7 +261,7 @@ class enigma_ui
      */
     private function key_info()
     {
-        $id = get_input_value('_id', RCUBE_INPUT_GET);
+        $id = rcube_utils::get_input_value('_id', rcube_utils::INPUT_GET);
 
         $this->enigma->load_engine();
         $res = $this->enigma->engine->get_key($id);
@@ -288,7 +288,7 @@ class enigma_ui
      */
     function tpl_key_name($attrib)
     {
-        return Q($this->data->name);
+        return rcube::Q($this->data->name);
     }
 
     /**
@@ -301,7 +301,7 @@ class enigma_ui
 
         // Key user ID
         $table->add('title', $this->enigma->gettext('keyuserid'));
-        $table->add(null, Q($this->data->name));
+        $table->add(null, rcube::Q($this->data->name));
         // Key ID
         $table->add('title', $this->enigma->gettext('keyid'));
         $table->add(null, $this->data->subkeys[0]->get_short_id());
@@ -369,7 +369,7 @@ class enigma_ui
         else if ($err = $_FILES['_file']['error']) {
             if ($err == UPLOAD_ERR_INI_SIZE || $err == UPLOAD_ERR_FORM_SIZE) {
                 $this->rc->output->show_message('filesizeerror', 'error',
-                    array('size' => show_bytes(parse_bytes(ini_get('upload_max_filesize')))));
+                    array('size' => $this->rc->show_bytes(parse_bytes(ini_get('upload_max_filesize')))));
             } else {
                 $this->rc->output->show_message('fileuploaderror', 'error');
             }
@@ -394,7 +394,7 @@ class enigma_ui
             'id' => 'rcmimportfile', 'size' => 30));
 
         $form = html::p(null,
-            Q($this->enigma->gettext('keyimporttext'), 'show')
+            rcube::Q($this->enigma->gettext('keyimporttext'), 'show')
             . html::br() . html::br() . $upload->show()
         );
 
@@ -433,15 +433,15 @@ class enigma_ui
         $chbox = new html_checkbox(array('value' => 1));
 
         $menu->add(null, html::label(array('for' => 'enigmadefaultopt'),
-            Q($this->enigma->gettext('identdefault'))));
+            rcube::Q($this->enigma->gettext('identdefault'))));
         $menu->add(null, $chbox->show(1, array('name' => '_enigma_default', 'id' => 'enigmadefaultopt')));
 
         $menu->add(null, html::label(array('for' => 'enigmasignopt'),
-            Q($this->enigma->gettext('signmsg'))));
+            rcube::Q($this->enigma->gettext('signmsg'))));
         $menu->add(null, $chbox->show(1, array('name' => '_enigma_sign', 'id' => 'enigmasignopt')));
 
         $menu->add(null, html::label(array('for' => 'enigmacryptopt'),
-            Q($this->enigma->gettext('encryptmsg'))));
+            rcube::Q($this->enigma->gettext('encryptmsg'))));
         $menu->add(null, $chbox->show(1, array('name' => '_enigma_crypt', 'id' => 'enigmacryptopt')));
 
         $menu = html::div(array('id' => 'enigmamenu', 'class' => 'popupmenu'),
diff --git a/plugins/enigma/tests/Enigma.php b/plugins/enigma/tests/Enigma.php
new file mode 100644
index 000000000..0d0d8f8ae
--- /dev/null
+++ b/plugins/enigma/tests/Enigma.php
@@ -0,0 +1,23 @@
+<?php
+
+class Enigma_Plugin extends PHPUnit_Framework_TestCase
+{
+
+    function setUp()
+    {
+        include_once dirname(__FILE__) . '/../enigma.php';
+    }
+
+    /**
+     * Plugin object construction test
+     */
+    function test_constructor()
+    {
+        $rcube  = rcube::get_instance();
+        $plugin = new enigma($rcube->api);
+
+        $this->assertInstanceOf('enigma', $plugin);
+        $this->assertInstanceOf('rcube_plugin', $plugin);
+    }
+}
+
diff --git a/plugins/example_addressbook/tests/ExampleAddressbook.php b/plugins/example_addressbook/tests/ExampleAddressbook.php
new file mode 100644
index 000000000..4a54bd950
--- /dev/null
+++ b/plugins/example_addressbook/tests/ExampleAddressbook.php
@@ -0,0 +1,23 @@
+<?php
+
+class ExampleAddressbook_Plugin extends PHPUnit_Framework_TestCase
+{
+
+    function setUp()
+    {
+        include_once dirname(__FILE__) . '/../example_addressbook.php';
+    }
+
+    /**
+     * Plugin object construction test
+     */
+    function test_constructor()
+    {
+        $rcube  = rcube::get_instance();
+        $plugin = new example_addressbook($rcube->api);
+
+        $this->assertInstanceOf('example_addressbook', $plugin);
+        $this->assertInstanceOf('rcube_plugin', $plugin);
+    }
+}
+
diff --git a/plugins/filesystem_attachments/tests/FilesystemAttachments.php b/plugins/filesystem_attachments/tests/FilesystemAttachments.php
new file mode 100644
index 000000000..dcab315d3
--- /dev/null
+++ b/plugins/filesystem_attachments/tests/FilesystemAttachments.php
@@ -0,0 +1,23 @@
+<?php
+
+class FilesystemAttachments_Plugin extends PHPUnit_Framework_TestCase
+{
+
+    function setUp()
+    {
+        include_once dirname(__FILE__) . '/../filesystem_attachments.php';
+    }
+
+    /**
+     * Plugin object construction test
+     */
+    function test_constructor()
+    {
+        $rcube  = rcube::get_instance();
+        $plugin = new filesystem_attachments($rcube->api);
+
+        $this->assertInstanceOf('filesystem_attachments', $plugin);
+        $this->assertInstanceOf('rcube_plugin', $plugin);
+    }
+}
+
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/zipdownload/localization/zh_CN.inc b/plugins/help/localization/ber.inc
index a4c9a2ce2..12fe4442e 100644
--- a/plugins/zipdownload/localization/zh_CN.inc
+++ b/plugins/help/localization/ber.inc
@@ -2,7 +2,7 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/zh_CN/labels.inc                                         |
+ | localization//labels.inc                                         |
  |                                                                       |
  | Language file of the Roundcube Webmail client                         |
  | Copyright (C) 2012, The Roundcube Dev Team                            |
diff --git a/plugins/help/localization/br.inc b/plugins/help/localization/br.inc
new file mode 100644
index 000000000..3ea6c029c
--- /dev/null
+++ b/plugins/help/localization/br.inc
@@ -0,0 +1,24 @@
+<?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'] = '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 ee9c78634..964723993 100644
--- a/plugins/help/localization/de_CH.inc
+++ b/plugins/help/localization/de_CH.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/de_CH/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: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-help/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $labels['help'] = 'Hilfe';
 $labels['about'] = 'Information';
 $labels['license'] = 'Lizenz';
 
+?>
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 8c2d1517c..b81f02fb9 100644
--- a/plugins/help/localization/en_US.inc
+++ b/plugins/help/localization/en_US.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'] = 'Help';
 $labels['about'] = 'About';
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
new file mode 100644
index 000000000..d4bc3d9a0
--- /dev/null
+++ b/plugins/help/localization/id_ID.inc
@@ -0,0 +1,24 @@
+<?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'] = '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..a589d0ce1 100644
--- a/plugins/help/localization/ko_KR.inc
+++ b/plugins/help/localization/ko_KR.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | 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();
@@ -18,3 +21,4 @@ $labels['help'] = '�움�';
 $labels['about'] = 'ì •ë³´';
 $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
new file mode 100644
index 000000000..702489483
--- /dev/null
+++ b/plugins/help/localization/nb_NO.inc
@@ -0,0 +1,24 @@
+<?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'] = '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
new file mode 100644
index 000000000..17a694d80
--- /dev/null
+++ b/plugins/help/localization/nn_NO.inc
@@ -0,0 +1,24 @@
+<?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'] = '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..5d6272eea 100644
--- a/plugins/help/localization/zh_CN.inc
+++ b/plugins/help/localization/zh_CN.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | 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();
@@ -18,3 +21,4 @@ $labels['help'] = '帮助';
 $labels['about'] = '关于';
 $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/help/skins/larry/help.css b/plugins/help/skins/larry/help.css
index 931ae1b61..c2e369af6 100644
--- a/plugins/help/skins/larry/help.css
+++ b/plugins/help/skins/larry/help.css
@@ -17,13 +17,13 @@
 }
 
 #taskbar a.button-help span.button-inner {
-	background: url(help.png) 2px 0px no-repeat;
+	background: url(help.png) 0 0 no-repeat;
 	height: 19px;
 }
 
 #taskbar a.button-help:hover span.button-inner,
 #taskbar a.button-help.button-selected span.button-inner {
-	background: url(help.png) 2px -24px no-repeat;
+	background: url(help.png) 0 -24px no-repeat;
 	height: 19px;
 }
 
diff --git a/plugins/help/skins/larry/templates/help.html b/plugins/help/skins/larry/templates/help.html
index 63cf0c21c..39caaa62f 100644
--- a/plugins/help/skins/larry/templates/help.html
+++ b/plugins/help/skins/larry/templates/help.html
@@ -19,7 +19,7 @@
 
 <div id="pluginbody" class="uibox offset">
 	<div class="iframebox help_<roundcube:var name='env:action' />">
-		<roundcube:object name="helpcontent" id="helpcontentframe" style="width:100%; height:100%" src="/watermark.html" />
+		<roundcube:object name="helpcontent" id="helpcontentframe" style="width:100%; height:100%" frameborder="0" src="/watermark.html" />
 	</div>
 	<roundcube:object name="message" id="message" class="statusbar" />
 </div>
diff --git a/plugins/help/tests/Help.php b/plugins/help/tests/Help.php
new file mode 100644
index 000000000..baba492ae
--- /dev/null
+++ b/plugins/help/tests/Help.php
@@ -0,0 +1,23 @@
+<?php
+
+class Help_Plugin extends PHPUnit_Framework_TestCase
+{
+
+    function setUp()
+    {
+        include_once dirname(__FILE__) . '/../help.php';
+    }
+
+    /**
+     * Plugin object construction test
+     */
+    function test_constructor()
+    {
+        $rcube  = rcube::get_instance();
+        $plugin = new help($rcube->api);
+
+        $this->assertInstanceOf('help', $plugin);
+        $this->assertInstanceOf('rcube_plugin', $plugin);
+    }
+}
+
diff --git a/plugins/hide_blockquote/hide_blockquote.php b/plugins/hide_blockquote/hide_blockquote.php
index 7af163dcd..1168656fd 100644
--- a/plugins/hide_blockquote/hide_blockquote.php
+++ b/plugins/hide_blockquote/hide_blockquote.php
@@ -69,7 +69,7 @@ class hide_blockquote extends rcube_plugin
     function save_prefs($args)
     {
         if ($args['section'] == 'mailview') {
-            $args['prefs']['hide_blockquote_limit'] = (int) get_input_value('_hide_blockquote_limit', RCUBE_INPUT_POST);
+            $args['prefs']['hide_blockquote_limit'] = (int) rcube_utils::get_input_value('_hide_blockquote_limit', rcube_utils::INPUT_POST);
         }
 
         return $args;
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 26b8707f7..66c9e4823 100644
--- a/plugins/hide_blockquote/localization/de_CH.inc
+++ b/plugins/hide_blockquote/localization/de_CH.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/de_CH/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/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 cf7eb137f..90dd28955 100644
--- a/plugins/hide_blockquote/localization/en_US.inc
+++ b/plugins/hide_blockquote/localization/en_US.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'] = 'Hide';
 $labels['show'] = 'Show';
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
new file mode 100644
index 000000000..5b3785d6a
--- /dev/null
+++ b/plugins/hide_blockquote/localization/id_ID.inc
@@ -0,0 +1,24 @@
+<?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'] = 'Sembunyi';
+$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_NB.inc b/plugins/hide_blockquote/localization/nb_NB.inc
deleted file mode 100644
index da50e8560..000000000
--- a/plugins/hide_blockquote/localization/nb_NB.inc
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-/*
- +-----------------------------------------------------------------------+
- | localization/nb_NB/labels.inc                                         |
- |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
- |                                                                       |
- +-----------------------------------------------------------------------+
- | Author: Tobias V. Langhoff <spug@thespug.net>                         |
- +-----------------------------------------------------------------------+
-*/
-
-$labels = array();
-$labels['hide'] = 'Skjul';
-$labels['show'] = 'Vis';
-$labels['quotelimit'] = 'Skjul sitat når antall linjer er flere enn';
-
diff --git a/plugins/hide_blockquote/localization/nb_NO.inc b/plugins/hide_blockquote/localization/nb_NO.inc
new file mode 100644
index 000000000..5dafd7f1c
--- /dev/null
+++ b/plugins/hide_blockquote/localization/nb_NO.inc
@@ -0,0 +1,24 @@
+<?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'] = '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
new file mode 100644
index 000000000..fd7b49d63
--- /dev/null
+++ b/plugins/hide_blockquote/localization/nn_NO.inc
@@ -0,0 +1,24 @@
+<?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'] = '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/hide_blockquote/tests/HideBlockquote.php b/plugins/hide_blockquote/tests/HideBlockquote.php
new file mode 100644
index 000000000..030c05324
--- /dev/null
+++ b/plugins/hide_blockquote/tests/HideBlockquote.php
@@ -0,0 +1,23 @@
+<?php
+
+class HideBlockquote_Plugin extends PHPUnit_Framework_TestCase
+{
+
+    function setUp()
+    {
+        include_once dirname(__FILE__) . '/../hide_blockquote.php';
+    }
+
+    /**
+     * Plugin object construction test
+     */
+    function test_constructor()
+    {
+        $rcube  = rcube::get_instance();
+        $plugin = new hide_blockquote($rcube->api);
+
+        $this->assertInstanceOf('hide_blockquote', $plugin);
+        $this->assertInstanceOf('rcube_plugin', $plugin);
+    }
+}
+
diff --git a/plugins/http_authentication/config.inc.php.dist b/plugins/http_authentication/config.inc.php.dist
new file mode 100644
index 000000000..0d798a586
--- /dev/null
+++ b/plugins/http_authentication/config.inc.php.dist
@@ -0,0 +1,9 @@
+<?php
+
+// HTTP Basic Authentication Plugin options
+// ----------------------------------------
+// Default mail host to log-in using user/password from HTTP Authentication.
+// This is useful if the users are free to choose arbitrary mail hosts (or
+// from a list), but have one host they usually want to log into.
+// Unlike $rcmail_config['default_host'] this must be a string!
+$rcmail_config['http_authentication_host'] = '';
diff --git a/plugins/http_authentication/http_authentication.php b/plugins/http_authentication/http_authentication.php
index a14b5cbcc..57227cb03 100644
--- a/plugins/http_authentication/http_authentication.php
+++ b/plugins/http_authentication/http_authentication.php
@@ -11,6 +11,8 @@
  *
  * See logout.html (in this directory) for an example how HTTP auth can be cleared.
  *
+ * For other configuration options, see config.inc.php.dist!
+ *
  * @version @package_version@
  * @license GNU GPLv3+
  * @author Thomas Bruederli
@@ -36,7 +38,7 @@ class http_authentication extends rcube_plugin
                 $args['action'] = 'login';
             }
             // Set user password in session (see shutdown() method for more info)
-            else if (!empty($_SESSION['user_id']) && empty($_SESION['password'])) {
+            else if (!empty($_SESSION['user_id']) && empty($_SESSION['password'])) {
                 $_SESSION['password'] = $rcmail->encrypt($_SERVER['PHP_AUTH_PW']);
             }
         }
@@ -46,6 +48,13 @@ class http_authentication extends rcube_plugin
 
     function authenticate($args)
     {
+        // Load plugin's config file
+        $this->load_config();
+
+        $host = rcmail::get_instance()->config->get('http_authentication_host');
+        if (is_string($host) && trim($host) !== '')
+            $args['host'] = rcube_utils::idn_to_ascii(rcube_utils::parse_host($host));
+
         // Allow entering other user data in login form,
         // e.g. after log out (#1487953)
         if (!empty($args['user'])) {
diff --git a/plugins/http_authentication/tests/HttpAuthentication.php b/plugins/http_authentication/tests/HttpAuthentication.php
new file mode 100644
index 000000000..c17236821
--- /dev/null
+++ b/plugins/http_authentication/tests/HttpAuthentication.php
@@ -0,0 +1,23 @@
+<?php
+
+class HttpAuthentication_Plugin extends PHPUnit_Framework_TestCase
+{
+
+    function setUp()
+    {
+        include_once dirname(__FILE__) . '/../http_authentication.php';
+    }
+
+    /**
+     * Plugin object construction test
+     */
+    function test_constructor()
+    {
+        $rcube  = rcube::get_instance();
+        $plugin = new http_authentication($rcube->api);
+
+        $this->assertInstanceOf('http_authentication', $plugin);
+        $this->assertInstanceOf('rcube_plugin', $plugin);
+    }
+}
+
diff --git a/plugins/jqueryui/tests/Jqueryui.php b/plugins/jqueryui/tests/Jqueryui.php
new file mode 100644
index 000000000..3bcd27c9f
--- /dev/null
+++ b/plugins/jqueryui/tests/Jqueryui.php
@@ -0,0 +1,23 @@
+<?php
+
+class Jqueryui_Plugin extends PHPUnit_Framework_TestCase
+{
+
+    function setUp()
+    {
+        include_once dirname(__FILE__) . '/../jqueryui.php';
+    }
+
+    /**
+     * Plugin object construction test
+     */
+    function test_constructor()
+    {
+        $rcube  = rcube::get_instance();
+        $plugin = new jqueryui($rcube->api);
+
+        $this->assertInstanceOf('jqueryui', $plugin);
+        $this->assertInstanceOf('rcube_plugin', $plugin);
+    }
+}
+
diff --git a/plugins/managesieve/Changelog b/plugins/managesieve/Changelog
index aa89e69a3..32d87a0d8 100644
--- a/plugins/managesieve/Changelog
+++ b/plugins/managesieve/Changelog
@@ -1,7 +1,18 @@
+- Add vacation-seconds extension support (RFC 6131)
+
+* 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]
+-----------------------------------------------------------
 - Fixed filter activation/deactivation confirmation message (#1488765)
 - Moved rcube_* classes to <plugin>/lib/Roundcube for compat. with Roundcube Framework autoloader
 - Fixed filter selection after filter deletion (#1488832)
 - Fixed compatibility with jQueryUI-1.9
+- Don't force 'stop' action on last rule in a script
 
 * version 6.0 [2012-10-03]
 -----------------------------------------------------------
diff --git a/plugins/managesieve/config.inc.php.dist b/plugins/managesieve/config.inc.php.dist
index 1f34564c5..65dbcfc4e 100644
--- a/plugins/managesieve/config.inc.php.dist
+++ b/plugins/managesieve/config.inc.php.dist
@@ -25,8 +25,7 @@ $rcmail_config['managesieve_auth_cid'] = null;
 $rcmail_config['managesieve_auth_pw'] = null;
 
 // use or not TLS for managesieve server connection
-// it's because I've problems with TLS and dovecot's managesieve plugin
-// and it's not needed on localhost
+// Note: tls:// prefix in managesieve_host is also supported
 $rcmail_config['managesieve_usetls'] = false;
 
 // default contents of filters script (eg. default spam filter)
diff --git a/plugins/managesieve/lib/Roundcube/rcube_sieve.php b/plugins/managesieve/lib/Roundcube/rcube_sieve.php
index 16c584b7d..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)) {
@@ -325,7 +325,7 @@ class rcube_sieve
                         continue 2;
                     }
                 }
-                if (empty($script->content[$idx+1]) || $script->content[$idx+1]['type'] != 'if') {
+                if (!empty($script->content[$idx+1]) && $script->content[$idx+1]['type'] != 'if') {
                     $script->content[$idx]['actions'][] = array('type' => 'stop');
                 }
             }
@@ -379,6 +379,6 @@ class rcube_sieve
      */
     public function debug_handler(&$sieve, $message)
     {
-        write_log('sieve', preg_replace('/\r\n$/', '', $message));
+        rcube::write_log('sieve', preg_replace('/\r\n$/', '', $message));
     }
 }
diff --git a/plugins/managesieve/lib/Roundcube/rcube_sieve_script.php b/plugins/managesieve/lib/Roundcube/rcube_sieve_script.php
index 36eb1bcf8..80f590f4b 100644
--- a/plugins/managesieve/lib/Roundcube/rcube_sieve_script.php
+++ b/plugins/managesieve/lib/Roundcube/rcube_sieve_script.php
@@ -33,6 +33,7 @@ class rcube_sieve_script
         'ereject',                  // RFC5429
         'copy',                     // RFC3894
         'vacation',                 // RFC5230
+        'vacation-seconds',         // RFC6131
         'relational',               // RFC3431
         'regex',                    // draft-ietf-sieve-regex-01
         'imapflags',                // draft-melnikov-sieve-imapflags-06
@@ -447,8 +448,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 +483,15 @@ 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]);
+            }
+
+            $output = 'require ["' . implode('","', $exts) . "\"];\n" . $output;
+        }
 
         if (!empty($this->prefix)) {
             $output = $this->prefix . "\n\n" . $output;
@@ -816,24 +829,12 @@ class rcube_sieve_script
 
                 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') {
+                    if ($tok == ':mime') {
                         $vacation['mime'] = true;
                     }
+                    else if ($tok[0] == ':') {
+                        $vacation[substr($tok, 1)] = $tokens[++$i];
+                    }
                 }
 
                 $result[] = $vacation;
diff --git a/plugins/managesieve/localization/az_AZ.inc b/plugins/managesieve/localization/az_AZ.inc
index 9d1a2766b..b1bfae5e9 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ı';
@@ -24,4 +27,151 @@ $labels['moveup'] = 'Yuxarı apar';
 $labels['movedown'] = 'Aşağı apar';
 $labels['filterallof'] = 'göstərilən bütün qaydalara uyur';
 $labels['filteranyof'] = 'verilmiş istənilən qaydaya uyur';
+$labels['filterany'] = 'bütün məktublar';
+$labels['filtercontains'] = 'daxildir';
+$labels['filternotcontains'] = 'daxil deyil';
+$labels['filteris'] = 'uyÄŸundur';
+$labels['filterisnot'] = 'uyÄŸun deyil';
+$labels['filterexists'] = 'mövcuddur';
+$labels['filternotexists'] = 'mövcud deyil';
+$labels['filtermatches'] = 'ifadə ilə üst-üstə düşür';
+$labels['filternotmatches'] = 'ifadə ilə üst-üstə düşmür';
+$labels['filterregex'] = 'daimi ifadənin nəticəsi ilə üst-üstə düşür';
+$labels['filternotregex'] = 'daimi ifadə ilə üst-üstə düşmür';
+$labels['filterunder'] = 'altında';
+$labels['filterover'] = 'yuxarıda';
+$labels['addrule'] = 'Qayda əlavə et';
+$labels['delrule'] = 'Qaydanı sil';
+$labels['messagemoveto'] = 'Məktubu köçür';
+$labels['messageredirect'] = 'Məktubu yolla';
+$labels['messagecopyto'] = 'Məktubu kopyala';
+$labels['messagesendcopy'] = 'Məktubun kopyasını göndər';
+$labels['messagereply'] = 'Məktubla cavab ver';
+$labels['messagedelete'] = 'Sil';
+$labels['messagediscard'] = 'Məktubla rədd et';
+$labels['messagesrules'] = 'Daxil olan məktub üçün:';
+$labels['messagesactions'] = '...növbəti hərəkəti yerinə yetir:';
+$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['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';
+$labels['enable'] = 'Yandır/Söndür';
+$labels['filterset'] = 'Süzgəc dəsti';
+$labels['filtersets'] = 'Süzgəc dəstləri';
+$labels['filtersetadd'] = 'Süzgəc dəsti əlavə et';
+$labels['filtersetdel'] = 'İndiki sücgəc dəstini sil';
+$labels['filtersetact'] = 'İndiki sücgəc dəstini yandır';
+$labels['filtersetdeact'] = 'İndiki süzgəc dəstini söndür';
+$labels['filterdef'] = 'Süzgəcin təsviri';
+$labels['filtersetname'] = 'Süzgəc dəstinin adı';
+$labels['newfilterset'] = 'Yeni süzgəc dəsti';
+$labels['active'] = 'aktiv';
+$labels['none'] = 'heç biri';
+$labels['fromset'] = 'dəstdən';
+$labels['fromfile'] = 'fayldan';
+$labels['filterdisabled'] = 'Süzgəci söndür';
+$labels['countisgreaterthan'] = 'sayı buradan daha çoxdur';
+$labels['countisgreaterthanequal'] = 'say çox və ya bərabərdir';
+$labels['countislessthan'] = 'say buradan azdır';
+$labels['countislessthanequal'] = 'say azdır və ya bərabərdir';
+$labels['countequals'] = 'say bərabərdir';
+$labels['countnotequals'] = 'say bərabər deyil';
+$labels['valueisgreaterthan'] = 'dəyər buradan daha böyükdür';
+$labels['valueisgreaterthanequal'] = 'dəyər çoxdur və ya bərabərdir';
+$labels['valueislessthan'] = 'dəyər buradan azdır';
+$labels['valueislessthanequal'] = 'dəyər azdır və ya bərabərdir';
+$labels['valueequals'] = 'dəyər bərabərdir';
+$labels['valuenotequals'] = 'dəyər bərabər deyil';
+$labels['setflags'] = 'Məktublara flaq quraşdır';
+$labels['addflags'] = 'Məktuba flaq əlavə et';
+$labels['removeflags'] = 'Məktubdan flaqları sil';
+$labels['flagread'] = 'Oxu';
+$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ı';
+$labels['...'] = '...';
+$labels['advancedopts'] = '�lavə ayarlar';
+$labels['body'] = 'Məzmun';
+$labels['address'] = 'ünvan';
+$labels['envelope'] = 'zərf';
+$labels['modifier'] = 'modifikator:';
+$labels['text'] = 'mətn';
+$labels['undecoded'] = 'emal olunmamış (xammal)';
+$labels['contenttype'] = 'məzmun növü';
+$labels['modtype'] = 'növ:';
+$labels['allparts'] = 'hamısı';
+$labels['domain'] = 'domen';
+$labels['localpart'] = 'lokal hissÉ™';
+$labels['user'] = 'istifadəçi';
+$labels['detail'] = 'təfsilat';
+$labels['comparator'] = 'komparator:';
+$labels['default'] = 'ön qurğulu';
+$labels['octet'] = 'ciddi (oktet)';
+$labels['asciicasemap'] = 'qeydiyyat üzrə müstəqil (ascii-casemap)';
+$labels['asciinumeric'] = 'ədədi (ascii-numeric)';
+
+$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..64f81599e 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['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..a8f75df04 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['vacationaddresses'] = 'Допълнителни 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..6d1ec8d2c 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';
@@ -54,6 +57,9 @@ $labels['sender'] = 'Pošiljaoc';
 $labels['recipient'] = 'Primaoc';
 $labels['vacationaddresses'] = 'Moje dodatne email adrese (odvojite zarezima):';
 $labels['vacationdays'] = 'Frekvencija slanja poruka (u danima):';
+$labels['vacationinterval'] = 'How often send messages:';
+$labels['days'] = 'days';
+$labels['seconds'] = 'seconds';
 $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..df1cdec89 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';
@@ -54,6 +57,9 @@ $labels['sender'] = 'Remitent';
 $labels['recipient'] = 'Destinatari/a';
 $labels['vacationaddresses'] = 'Altres adreces electròniques meves (separades per coma)';
 $labels['vacationdays'] = 'Cada quan enviar un missatge (en dies):';
+$labels['vacationinterval'] = '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..26baeff2b 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['vacationaddresses'] = 'Moje další e-mailové adresy (aliasy) spojené s tímto ú�tem (oddělené �árkou):';
 $labels['vacationdays'] = 'Po�et dnů mezi automatickými odpově�mi:';
+$labels['vacationinterval'] = 'Prodleva mezi automatickými odpově�mi:';
+$labels['days'] = 'dnů';
+$labels['seconds'] = 'sekund';
 $labels['vacationreason'] = 'Zpráva (Důvod nepřítomnosti):';
 $labels['vacationsubject'] = 'Předmět zprávy:';
 $labels['rulestop'] = 'Zastavit pravidla';
@@ -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..800d14b65 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';
@@ -54,6 +57,9 @@ $labels['sender'] = 'Anfonwr';
 $labels['recipient'] = 'Derbynnwr';
 $labels['vacationaddresses'] = 'Fy chyfeiriadau ebost ychwanegol (gwahanir gyda coma):';
 $labels['vacationdays'] = 'Pa mor aml i ddanfon negeseuon (mewn dyddiau):';
+$labels['vacationinterval'] = '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..6bc43cf58 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';
@@ -54,6 +57,9 @@ $labels['sender'] = 'Afsender';
 $labels['recipient'] = 'Modtager';
 $labels['vacationaddresses'] = 'Mine alternative e-mailadresser (kommasepareret):';
 $labels['vacationdays'] = 'Hvor tit skal besked sendes (i dage):';
+$labels['vacationinterval'] = '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 435712d03..b30625fe9 100644
--- a/plugins/managesieve/localization/de_CH.inc
+++ b/plugins/managesieve/localization/de_CH.inc
@@ -2,18 +2,21 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/de_CH/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'] = 'Verwalte eingehende Nachrichtenfilter';
 $labels['filtername'] = 'Filtername';
@@ -54,6 +57,9 @@ $labels['sender'] = 'Absender';
 $labels['recipient'] = 'Empfänger';
 $labels['vacationaddresses'] = 'Zusätzliche Liste von Empfängern (Komma getrennt):';
 $labels['vacationdays'] = 'Antwort wird erneut gesendet nach (in Tagen):';
+$labels['vacationinterval'] = 'Wie oft senden:';
+$labels['days'] = 'Tage';
+$labels['seconds'] = 'Sekunden';
 $labels['vacationreason'] = 'Inhalt der Nachricht (Abwesenheitsgrund):';
 $labels['vacationsubject'] = 'Betreff';
 $labels['rulestop'] = 'Regelauswertung anhalten';
@@ -92,6 +98,25 @@ $labels['flagdeleted'] = 'Gelöscht';
 $labels['flaganswered'] = 'Beantwortet';
 $labels['flagflagged'] = 'Markiert';
 $labels['flagdraft'] = 'Entwurf';
+$labels['setvariable'] = 'Setze Variable';
+$labels['setvarname'] = 'Variablenname:';
+$labels['setvarvalue'] = 'Variablenwert:';
+$labels['setvarmodifiers'] = 'Umwandler:';
+$labels['varlower'] = 'Kleinschreibung';
+$labels['varupper'] = 'Grossschreibung';
+$labels['varlowerfirst'] = 'Erster Buchstabe klein';
+$labels['varupperfirst'] = 'Erster Buchstabe gross';
+$labels['varquotewildcard'] = 'Sonderzeichen auszeichnen';
+$labels['varlength'] = 'Länge';
+$labels['notify'] = 'Mitteilung senden';
+$labels['notifyaddress'] = 'Empfängeradresse:';
+$labels['notifybody'] = 'Mitteilungstext:';
+$labels['notifysubject'] = 'Mitteilungsbetreff:';
+$labels['notifyfrom'] = 'Absender:';
+$labels['notifyimportance'] = 'Wichtigkeit:';
+$labels['notifyimportancelow'] = 'tief';
+$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 (Oktet)';
 $labels['asciicasemap'] = 'Gross-/Kleinschreibung ignorieren';
 $labels['asciinumeric'] = 'numerisch (ascii-numeric)';
-$labels['filterunknownerror'] = 'Unbekannter Serverfehler';
-$labels['filterconnerror'] = 'Kann nicht zum Sieve-Server verbinden';
-$labels['filterdeleteerror'] = 'Fehler beim des löschen  Filters. Serverfehler';
-$labels['filterdeleted'] = 'Filter erfolgreich gelöscht';
-$labels['filtersaved'] = 'Filter gespeichert';
-$labels['filtersaveerror'] = 'Serverfehler, konnte den Filter nicht speichern.';
-$labels['filterdeleteconfirm'] = 'Möchten Sie den Filter löschen ?';
-$labels['ruledeleteconfirm'] = 'Sicher, dass Sie die Regel löschen wollen?';
-$labels['actiondeleteconfirm'] = 'Sicher, dass Sie die ausgewaehlte Aktion löschen wollen?';
-$labels['forbiddenchars'] = 'Unerlaubte Zeichen im Feld';
-$labels['cannotbeempty'] = 'Feld darf nicht leer sein';
-$labels['ruleexist'] = 'Ein Filter mit dem angegebenen Namen existiert bereits.';
-$labels['setactivateerror'] = 'Filtersatz kann nicht aktiviert werden. Serverfehler.';
-$labels['setdeactivateerror'] = 'Filtersatz kann nicht deaktiviert werden. Serverfehler.';
-$labels['setdeleteerror'] = 'Filtersatz kann nicht gelöscht werden. Serverfehler.';
-$labels['setactivated'] = 'Filtersatz erfolgreich aktiviert.';
-$labels['setdeactivated'] = 'Filtersatz erfolgreich deaktiviert.';
-$labels['setdeleted'] = 'Filtersatz erfolgreich gelöscht.';
-$labels['setdeleteconfirm'] = 'Sind Sie sicher, dass Sie den ausgewählten Filtersatz löschen möchten?';
-$labels['setcreateerror'] = 'Filtersatz kann nicht erstellt werden. Serverfehler.';
-$labels['setcreated'] = 'Filter erfolgreich erstellt.';
-$labels['activateerror'] = 'Filter kann nicht aktiviert werden. Serverfehler.';
-$labels['deactivateerror'] = 'Filter kann nicht deaktiviert werden. Serverfehler.';
-$labels['activated'] = 'Filter erfolgreich deaktiviert.';
-$labels['deactivated'] = 'Filter erfolgreich aktiviert.';
-$labels['moved'] = 'Filter erfolgreich verschoben.';
-$labels['moveerror'] = 'Filter kann nicht verschoben werden. Serverfehler.';
-$labels['nametoolong'] = 'Filtersatz kann nicht erstellt werden. 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 nicht zum Sieve-Server verbinden';
+$messages['filterdeleteerror'] = 'Fehler beim des löschen  Filters. Serverfehler';
+$messages['filterdeleted'] = 'Filter erfolgreich gelöscht';
+$messages['filtersaved'] = 'Filter gespeichert';
+$messages['filtersaveerror'] = 'Serverfehler, konnte den Filter nicht speichern.';
+$messages['filterdeleteconfirm'] = 'Möchten Sie den Filter löschen ?';
+$messages['ruledeleteconfirm'] = 'Sicher, dass Sie die Regel löschen wollen?';
+$messages['actiondeleteconfirm'] = 'Sicher, dass Sie die ausgewaehlte Aktion löschen wollen?';
+$messages['forbiddenchars'] = 'Unerlaubte Zeichen im Feld';
+$messages['cannotbeempty'] = 'Feld darf nicht leer sein';
+$messages['ruleexist'] = 'Ein Filter mit dem angegebenen Namen existiert bereits.';
+$messages['setactivateerror'] = 'Filtersatz kann nicht aktiviert werden. Serverfehler.';
+$messages['setdeactivateerror'] = 'Filtersatz kann nicht deaktiviert werden. Serverfehler.';
+$messages['setdeleteerror'] = 'Filtersatz kann nicht gelöscht werden. Serverfehler.';
+$messages['setactivated'] = 'Filtersatz erfolgreich aktiviert.';
+$messages['setdeactivated'] = 'Filtersatz erfolgreich deaktiviert.';
+$messages['setdeleted'] = 'Filtersatz erfolgreich gelöscht.';
+$messages['setdeleteconfirm'] = 'Sind Sie sicher, dass Sie den ausgewählten Filtersatz löschen möchten?';
+$messages['setcreateerror'] = 'Filtersatz kann nicht erstellt werden. Serverfehler.';
+$messages['setcreated'] = 'Filter erfolgreich erstellt.';
+$messages['activateerror'] = 'Filter kann nicht aktiviert werden. Serverfehler.';
+$messages['deactivateerror'] = 'Filter kann nicht deaktiviert werden. Serverfehler.';
+$messages['deactivated'] = 'Filter erfolgreich aktiviert.';
+$messages['activated'] = 'Filter erfolgreich deaktiviert.';
+$messages['moved'] = 'Filter erfolgreich verschoben.';
+$messages['moveerror'] = 'Filter kann nicht verschoben werden. Serverfehler.';
+$messages['nametoolong'] = 'Filtersatz kann nicht erstellt werden. 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/de_DE.inc b/plugins/managesieve/localization/de_DE.inc
index 2b42917cf..1b741efc6 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';
@@ -54,6 +57,9 @@ $labels['sender'] = 'Absender';
 $labels['recipient'] = 'Empfänger';
 $labels['vacationaddresses'] = 'Zusätzliche Liste von E-Mail Empfängern (Komma getrennt):';
 $labels['vacationdays'] = 'Wie oft sollen Nachrichten gesendet werden (in Tagen):';
+$labels['vacationinterval'] = '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..714b7240f 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'] = 'Από��ιψη με μήνυμα';
@@ -49,16 +57,121 @@ $labels['sender'] = 'Αποστολέας';
 $labels['recipient'] = 'Πα�αλήπτης';
 $labels['vacationaddresses'] = 'Π�όσθετη λίστα 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 73882200b..4dd4f7d8b 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: Sebastian Schweizer                                           |
- +-----------------------------------------------------------------------+
+
+ 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';
@@ -54,6 +57,9 @@ $labels['sender'] = 'Sender';
 $labels['recipient'] = 'Recipient';
 $labels['vacationaddresses'] = 'Additional list of recipient e-mails (comma separated):';
 $labels['vacationdays'] = 'How often send messages (in days):';
+$labels['vacationinterval'] = 'How often send messages:';
+$labels['days'] = 'days';
+$labels['seconds'] = 'seconds';
 $labels['vacationreason'] = 'Message body (vacation reason):';
 $labels['vacationsubject'] = 'Message subject:';
 $labels['rulestop'] = 'Stop evaluating rules';
@@ -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,34 +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['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 9336390d1..2b391e0c5 100644
--- a/plugins/managesieve/localization/en_US.inc
+++ b/plugins/managesieve/localization/en_US.inc
@@ -1,5 +1,22 @@
 <?php
 
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/managesieve/localization/<lang>.inc                           |
+ |                                                                       |
+ | 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.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-managesieve/
+*/
+
+
 $labels['filters'] = 'Filters';
 $labels['managefilters'] = 'Manage incoming mail filters';
 $labels['filtername'] = 'Filter name';
@@ -40,6 +57,9 @@ $labels['sender'] = 'Sender';
 $labels['recipient'] = 'Recipient';
 $labels['vacationaddresses'] = 'My additional e-mail addresse(s) (comma-separated):';
 $labels['vacationdays'] = 'How often send messages (in days):';
+$labels['vacationinterval'] = 'How often send messages:';
+$labels['days'] = 'days';
+$labels['seconds'] = 'seconds';
 $labels['vacationreason'] = 'Message body (vacation reason):';
 $labels['vacationsubject'] = 'Message subject:';
 $labels['rulestop'] = 'Stop evaluating rules';
diff --git a/plugins/managesieve/localization/eo.inc b/plugins/managesieve/localization/eo.inc
index 04ce69d87..3ce49ddb2 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['vacationaddresses'] = 'My additional e-mail addresse(s) (comma-separated):';
+$labels['vacationdays'] = 'How often send messages (in days):';
+$labels['vacationinterval'] = 'How often send messages:';
+$labels['days'] = 'days';
+$labels['seconds'] = 'seconds';
+$labels['vacationreason'] = 'Message body (vacation reason):';
+$labels['vacationsubject'] = 'Message subject:';
+$labels['rulestop'] = 'Stop evaluating rules';
+$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..c9c6e70f8 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';
@@ -51,9 +57,15 @@ $labels['sender'] = 'Remitente';
 $labels['recipient'] = 'Destinatario';
 $labels['vacationaddresses'] = 'Lista de direcciones de correo de destinatarios adicionales (separados por comas):';
 $labels['vacationdays'] = 'Cada cuanto enviar mensajes (en días):';
+$labels['vacationinterval'] = 'How often send messages:';
+$labels['days'] = 'days';
+$labels['seconds'] = 'seconds';
 $labels['vacationreason'] = 'Cuerpo del mensaje (razón de vacaciones):';
+$labels['vacationsubject'] = 'Message subject:';
 $labels['rulestop'] = 'Parar de evaluar reglas';
+$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..9673a9959 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';
@@ -53,13 +56,16 @@ $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['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..334a65cee 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';
@@ -54,6 +57,9 @@ $labels['sender'] = 'Saatja';
 $labels['recipient'] = 'Saaja';
 $labels['vacationaddresses'] = 'Lisanimekiri saaja e-posti aadressidest (komadega eraldatud):';
 $labels['vacationdays'] = 'Kui tihti kirju saata (päevades):';
+$labels['vacationinterval'] = 'How often send messages:';
+$labels['days'] = 'days';
+$labels['seconds'] = 'seconds';
 $labels['vacationreason'] = 'Kirja sisu (puhkuse põhjus):';
 $labels['vacationsubject'] = 'Kirja teema:';
 $labels['rulestop'] = 'Peata reeglite otsimine';
@@ -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..91dfcb605 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'] = 'نام صا�ی';
@@ -54,6 +57,9 @@ $labels['sender'] = '�رستنده';
 $labels['recipient'] = 'گیرنده';
 $labels['vacationaddresses'] = 'آدرس‌های ایمیل دیگر من (جدا شده با ویرگول):';
 $labels['vacationdays'] = 'پیغام ها در چه مواقعی �رستاده شدند (در روزهای):';
+$labels['vacationinterval'] = 'How often send messages:';
+$labels['days'] = 'days';
+$labels['seconds'] = 'seconds';
 $labels['vacationreason'] = 'بدنه پیغام (علت مسا�رت):';
 $labels['vacationsubject'] = 'موضوع پیغام:';
 $labels['rulestop'] = 'توق� قوانین ارزیابی';
@@ -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/fi_FI.inc b/plugins/managesieve/localization/fi_FI.inc
index 841eeec14..71856c95f 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['vacationaddresses'] = 'My additional e-mail addresse(s) (comma-separated):';
+$labels['vacationdays'] = 'How often send messages (in days):';
+$labels['vacationinterval'] = 'How often send messages:';
+$labels['days'] = 'days';
+$labels['seconds'] = 'seconds';
+$labels['vacationreason'] = 'Message body (vacation reason):';
 $labels['vacationsubject'] = 'Viestin aihe:';
-$labels['rulestop'] = '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..9be9f1054 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';
@@ -54,6 +57,9 @@ $labels['sender'] = 'Expéditeur';
 $labels['recipient'] = 'Destinataire';
 $labels['vacationaddresses'] = 'Liste des destinataires (séparés par une virgule) :';
 $labels['vacationdays'] = 'Ne pas renvoyer un message avant (jours) :';
+$labels['vacationinterval'] = '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';
@@ -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..3f492ad46 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';
@@ -51,10 +57,15 @@ $labels['sender'] = 'Remitente';
 $labels['recipient'] = 'Destinatario';
 $labels['vacationaddresses'] = 'Lista de enderezos de correo de destinatarios adicionais (separados por comas):';
 $labels['vacationdays'] = 'Cada canto enviar mensaxes (en días):';
+$labels['vacationinterval'] = '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..0b2f67ede 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'] = 'ש� המסנן';
@@ -54,6 +57,9 @@ $labels['sender'] = 'השולח';
 $labels['recipient'] = 'הנמען';
 $labels['vacationaddresses'] = 'כתובות דו�"ל נוספות שלי (מופרדות ע"י פסיקי�)';
 $labels['vacationdays'] = 'ב�יזו תדירות ( בימי� ) לשלוח הודעות:';
+$labels['vacationinterval'] = 'How often send messages:';
+$labels['days'] = 'days';
+$labels['seconds'] = 'seconds';
 $labels['vacationreason'] = 'גוף ההודעה (סיבת החופשה):';
 $labels['vacationsubject'] = 'נוש� ההודעה:';
 $labels['rulestop'] = 'עצירה של בחינת הכללי�';
@@ -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'] = '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..c7c648ded 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';
@@ -54,6 +57,9 @@ $labels['sender'] = 'Feladó';
 $labels['recipient'] = 'Címzett';
 $labels['vacationaddresses'] = 'További címzettek (vesszővel elválasztva):';
 $labels['vacationdays'] = 'Válaszüzenet küldése ennyi naponként:';
+$labels['vacationinterval'] = 'How often send messages:';
+$labels['days'] = 'days';
+$labels['seconds'] = 'seconds';
 $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..908175f1d 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'] = 'Ô¶Õ¿Õ«Õ¹Õ« Õ¡Õ¶Õ¸Ö‚Õ¶';
@@ -54,6 +57,9 @@ $labels['sender'] = 'ÕˆÖ‚Õ²Õ¡Ö€Õ¯Õ¸Õ²';
 $labels['recipient'] = 'Õ�Õ¿Õ¡Ö�Õ¸Õ²';
 $labels['vacationaddresses'] = 'Ô»Õ´ Õ°Õ¡Õ¾Õ¥Õ¬ÕµÕ¡Õ¬ Õ§Õ¬ÖƒÕ¸Õ½Õ¿Õ« Õ°Õ¡Õ½Ö�Õ¥Õ¶Õ¥Ö€ (Õ¢Õ¡ÕªÕ¡Õ¶Õ¾Õ¡Õ® Õ½Õ¿Õ¸Ö€Õ¡Õ¯Õ¥Õ¿Õ¶Õ¥Ö€Õ¸Õ¾).';
 $labels['vacationdays'] = 'Ô»Õ¶Õ¹ Õ°Õ¡Õ³Õ¡Õ­Õ¸Ö‚Õ©ÕµÕ¡Õ´Õ¢ Õ¸Ö‚Õ²Õ¡Ö€Õ¯Õ¥Õ¬ Õ°Õ¡Õ²Õ¸Ö€Õ¤Õ¡Õ£Ö€Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Õ¶Õ¥Ö€Õ¨ (Ö…Ö€Õ¥Ö€)`';
+$labels['vacationinterval'] = 'How often send messages:';
+$labels['days'] = 'days';
+$labels['seconds'] = 'seconds';
 $labels['vacationreason'] = 'Õ€Õ¡Õ²Õ¸Ö€Õ¤Õ¡Õ£Ö€Õ¸Ö‚Õ©ÕµÕ¡Õ¶ Õ¢Õ¸Õ¾Õ¡Õ¶Õ¤Õ¡Õ¯Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶ (Õ¡Ö€Õ±Õ¡Õ¯Õ¸Ö‚Ö€Õ¤Õ« ÕºÕ¡Õ¿Õ³Õ¡Õ¼)`';
 $labels['vacationsubject'] = 'Õ€Õ¡Õ²Õ¸Ö€Õ¤Õ¡Õ£Ö€Õ¸Ö‚Õ©ÕµÕ¡Õ¶ Õ¾Õ¥Ö€Õ¶Õ¡Õ£Õ«Ö€`';
 $labels['rulestop'] = 'Ô´Õ¡Õ¤Õ¡Ö€Õ¥Õ¬ ÕºÕ¡ÕµÕ´Õ¡Õ¶Õ¶Õ¥Ö€Õ« Õ½Õ¿Õ¸Ö‚Õ£Õ¸Ö‚Õ´Õ¨';
@@ -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..45f6e5263 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['vacationaddresses'] = 'My additional e-mail addresse(s) (comma-separated):';
+$labels['vacationdays'] = 'How often send messages (in days):';
+$labels['vacationinterval'] = 'How often send messages:';
+$labels['days'] = 'days';
+$labels['seconds'] = 'seconds';
+$labels['vacationreason'] = 'Message body (vacation reason):';
+$labels['vacationsubject'] = 'Message subject:';
+$labels['rulestop'] = 'Stop evaluating rules';
+$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/ia_IA.inc b/plugins/managesieve/localization/ia_IA.inc
deleted file mode 100644
index 7e74a53af..000000000
--- a/plugins/managesieve/localization/ia_IA.inc
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-/*
- +-----------------------------------------------------------------------+
- | localization/ia_IA/labels.inc                                         |
- |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
- |                                                                       |
- +-----------------------------------------------------------------------+
- | Author: Emilio Sepulveda <emilio@chilemoz.org>                        |
- +-----------------------------------------------------------------------+
- @version $Id$
-*/
-
-$labels = array();
-$labels['filters'] = 'Filtros';
-$labels['filteradd'] = 'Adder filtro';
-$labels['filterdel'] = 'Deler filtro';
-
diff --git a/plugins/managesieve/localization/id_ID.inc b/plugins/managesieve/localization/id_ID.inc
index fe79f2765..a30c2a0b0 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['vacationaddresses'] = 'Alamat email tambahan saya (dipisahkan koma):';
 $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..6fb2c424f 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';
@@ -54,6 +57,9 @@ $labels['sender'] = 'Mittente';
 $labels['recipient'] = 'Destinatario';
 $labels['vacationaddresses'] = 'Lista di indirizzi e-mail di destinatari addizionali (separati da virgola):';
 $labels['vacationdays'] = 'Ogni quanti giorni ribadire il messaggio allo stesso mittente';
+$labels['vacationinterval'] = '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..0cd4f44b9 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'] = 'フィルター�';
@@ -54,6 +57,9 @@ $labels['sender'] = '�信者';
 $labels['recipient'] = '宛先';
 $labels['vacationaddresses'] = '電�メール�宛先�(コンマ区切��)追加�リスト:';
 $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..5ab4fc220 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['vacationaddresses'] = '나� 추가 �메� 주소 (쉼표로 구분�):';
+$labels['vacationdays'] = '메시지 발신 주기 (�):';
+$labels['vacationinterval'] = 'How often send messages:';
+$labels['days'] = 'days';
+$labels['seconds'] = 'seconds';
 $labels['vacationreason'] = '메시지 본문 (휴가 사유):';
 $labels['vacationsubject'] = '메시지 제목:';
-$labels['rulestop'] = '규칙� 실행� 멈춤';
-$labels['enable'] = '사용/사용안함';
-$labels['filterset'] = '필터 묶�';
-$labels['filtersets'] = '필터 묶�';
-$labels['filtersetadd'] = '필터 묶� 추가';
-$labels['filtersetdel'] = '현재 필터 묶�� 삭제';
+$labels['rulestop'] = '규칙 �가를 중단';
+$labels['enable'] = '활성화/비활성화';
+$labels['filterset'] = '필터 세트';
+$labels['filtersets'] = '필터 세트';
+$labels['filtersetadd'] = '필터 세트 추가';
+$labels['filtersetdel'] = '현재 필터 세트를 삭제';
 $labels['filtersetact'] = '현재 필터 세트를 활성화';
 $labels['filtersetdeact'] = '현재 필터 세트를 비활성화';
 $labels['filterdef'] = '필터 정�';
-$labels['filtersetname'] = '필터 세트 �름';
-$labels['newfilterset'] = '새로운 필터 세트';
+$labels['filtersetname'] = '필터 세트명';
+$labels['newfilterset'] = '새 필터 세트';
 $labels['active'] = '활성';
 $labels['none'] = '없�';
-$labels['fromset'] = '묶�으로 부터';
-$labels['fromfile'] = '파�로 부터';
-$labels['filterdisabled'] = '필터 사용하지 않�';
-$labels['countisgreaterthan'] = '갯수가 �';
-$labels['countisgreaterthanequal'] = '갯수가 �거나 같�';
-$labels['countislessthan'] = '갯수가 작�';
-$labels['countislessthanequal'] = '갯수가 작거나 같�';
-$labels['countequals'] = '갯수가 같�';
-$labels['countnotequals'] = '갯수가 같지 않�';
-$labels['valueisgreaterthan'] = '값� �';
-$labels['valueisgreaterthanequal'] = '값� �거나 같�';
-$labels['valueislessthan'] = '값� 작�';
-$labels['valueislessthanequal'] = '값� 작거나 같�';
-$labels['valueequals'] = '값� 같�';
-$labels['valuenotequals'] = '값� 같지 않�';
-$labels['setflags'] = '메시지� 플래그를 설정';
-$labels['addflags'] = '메시지� 플래그를 추가';
-$labels['removeflags'] = '메시지�서 플래그를 제거';
+$labels['fromset'] = '세트로부터';
+$labels['fromfile'] = '파�로부터';
+$labels['filterdisabled'] = '필터가 비활성화�';
+$labels['countisgreaterthan'] = '개수가 다�보다 �';
+$labels['countisgreaterthanequal'] = '개수가 다�보다 �거나 같�';
+$labels['countislessthan'] = '개수가 다�보다 작�';
+$labels['countislessthanequal'] = '개수가 작거나 같�';
+$labels['countequals'] = '개수가 다�과 같�';
+$labels['countnotequals'] = '개수가 다�과 같지 않�';
+$labels['valueisgreaterthan'] = '값� 다�보다 �';
+$labels['valueisgreaterthanequal'] = '값� 다�보다 �거나 같�';
+$labels['valueislessthan'] = '값� 다�보다 작�';
+$labels['valueislessthanequal'] = '값� 다�보다 작거나 같�';
+$labels['valueequals'] = '값� 다�과 같�';
+$labels['valuenotequals'] = '값� 다�과 같지 않�';
+$labels['setflags'] = '메시지� 깃발� 설정';
+$labels['addflags'] = '메시지� 깃발� 추가';
+$labels['removeflags'] = '메시지�서 깃발� 제거';
 $labels['flagread'] = '��';
 $labels['flagdeleted'] = '삭제�';
 $labels['flaganswered'] = '�답함';
-$labels['flagflagged'] = '표시함';
+$labels['flagflagged'] = '깃발� 추가함';
 $labels['flagdraft'] = '임시 보관함';
+$labels['setvariable'] = '변수 설정';
+$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..fecd3d6bc 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,6 +48,7 @@ $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';
@@ -54,6 +57,9 @@ $labels['sender'] = 'SiuntÄ—jas';
 $labels['recipient'] = 'GavÄ—jas';
 $labels['vacationaddresses'] = 'Papildomas gavėjų adresų sąrašas (skirti kableliais):';
 $labels['vacationdays'] = 'Kaip dažnai išsiųsti laiškus (dienomis):';
+$labels['vacationinterval'] = '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..f1f85c2e0 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';
@@ -55,6 +57,9 @@ $labels['sender'] = 'Sūtīt�js';
 $labels['recipient'] = 'Saņēmējs';
 $labels['vacationaddresses'] = 'Ievadiet vienu vai vair�kus e-pastu(s), atdalot tos komatu:';
 $labels['vacationdays'] = 'Cik dienu laik� vienam un tam pašam sūtīt�jam neatbildēt atk�rtoti (piem., 7):';
+$labels['vacationinterval'] = 'How often send messages:';
+$labels['days'] = 'days';
+$labels['seconds'] = 'seconds';
 $labels['vacationreason'] = 'Atvaļin�juma paziņojuma teksts:';
 $labels['vacationsubject'] = 'Vēstules tēma:';
 $labels['rulestop'] = 'Apturēt nosacījumu p�rbaudi';
@@ -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..67cd6829f 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'] = 'അരിപ�പയ�ടെ പേര�';
@@ -54,6 +57,9 @@ $labels['sender'] = 'അയചയാള��';
 $labels['recipient'] = 'സ�വീകര��ത�താവ�';
 $labels['vacationaddresses'] = 'സ�വീകര��ത�താവിന�റെ ഇമെയില�� വിലാസങ�ങള�ടെ അധികമ�ള�ള പട�ടിക (കോമയിട�ട� തിരിച�ച)';
 $labels['vacationdays'] = 'എത�ര ഭിവസം കൂട�മ�പോള�� സന�ദേശം അയക�കണം:';
+$labels['vacationinterval'] = 'How often send messages:';
+$labels['days'] = 'days';
+$labels['seconds'] = 'seconds';
 $labels['vacationreason'] = 'സന�ദേശത�തിന�റെ ഉള�ളടക�കം (അവധിയ�ടെ കാരണം):';
 $labels['vacationsubject'] = 'സന�ദേശത�തിന�റെ വിഷയം:';
 $labels['rulestop'] = 'നിയമങ�ങള�� വിലയിര�ത�ത�ന�നത� നിര��ത�ത�ക';
@@ -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'] = 'കര��ശനം (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..3339737e0 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['vacationaddresses'] = 'My additional e-mail addresse(s) (comma-separated):';
+$labels['vacationdays'] = 'How often send messages (in days):';
+$labels['vacationinterval'] = 'How often send messages:';
+$labels['days'] = 'days';
+$labels['seconds'] = 'seconds';
+$labels['vacationreason'] = 'Message body (vacation reason):';
+$labels['vacationsubject'] = 'Message subject:';
+$labels['rulestop'] = 'Stop evaluating rules';
+$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 b172685a2..39653b8a1 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: Tobias V. Langhoff <spug@thespug.net>                         |
- +-----------------------------------------------------------------------+
+
+ 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';
@@ -57,7 +60,7 @@ $labels['vacationdays'] = 'Periode mellom meldinger (i dager):';
 $labels['vacationreason'] = 'Innhold (begrunnelse for fravær)';
 $labels['vacationsubject'] = 'Meldingsemne:';
 $labels['rulestop'] = 'Stopp evaluering av regler';
-$labels['enable'] = 'Aktiver / deaktiver';
+$labels['enable'] = 'Aktiver/Deaktiver';
 $labels['filterset'] = 'Filtersett';
 $labels['filtersets'] = 'Filtersett';
 $labels['filtersetadd'] = 'Nytt filtersett';
@@ -82,8 +85,8 @@ $labels['valueisgreaterthan'] = 'verdien er høyrere enn';
 $labels['valueisgreaterthanequal'] = 'verdien er høyere eller lik';
 $labels['valueislessthan'] = 'verdien er lavere enn';
 $labels['valueislessthanequal'] = 'verdien er lavere eller lik';
-$labels['valueequals'] = 'verdien er';
-$labels['valuenotequals'] = 'verdien er ikke';
+$labels['valueequals'] = 'verdien er lik';
+$labels['valuenotequals'] = 'verdien er ulik';
 $labels['setflags'] = 'Sett meldingsflagg';
 $labels['addflags'] = 'Legg til flagg på meldingen';
 $labels['removeflags'] = 'Fjern flagg fra meldingen';
@@ -92,6 +95,25 @@ $labels['flagdeleted'] = 'Slettet';
 $labels['flaganswered'] = 'Besvart';
 $labels['flagflagged'] = 'Flagget';
 $labels['flagdraft'] = 'Utkast';
+$labels['setvariable'] = 'Set variable';
+$labels['setvarname'] = 'Variabelnavn:';
+$labels['setvarvalue'] = 'Variable value:';
+$labels['setvarmodifiers'] = 'Modifiers:';
+$labels['varlower'] = 'med små bokstaver';
+$labels['varupper'] = 'med store bokstaver';
+$labels['varlowerfirst'] = 'first character lower-case';
+$labels['varupperfirst'] = 'first character upper-case';
+$labels['varquotewildcard'] = 'quote special characters';
+$labels['varlength'] = 'lengde';
+$labels['notify'] = 'Send melding';
+$labels['notifyaddress'] = 'Til e-postadresse:';
+$labels['notifybody'] = 'Notification body:';
+$labels['notifysubject'] = 'Notification subject:';
+$labels['notifyfrom'] = 'Notification sender:';
+$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';
@@ -100,50 +122,53 @@ $labels['advancedopts'] = 'Avanserte alternativer';
 $labels['body'] = 'Meldingstekst';
 $labels['address'] = 'adresse';
 $labels['envelope'] = 'konvolutt';
-$labels['modifier'] = 'modifikator';
+$labels['modifier'] = 'modifikator:';
 $labels['text'] = 'tekst';
 $labels['undecoded'] = 'ikke dekodet (rå)';
 $labels['contenttype'] = 'innholdstype';
 $labels['modtype'] = 'type:';
 $labels['allparts'] = 'alle';
 $labels['domain'] = 'domene';
-$labels['localpart'] = 'lokal del (localpart)';
+$labels['localpart'] = 'lokal del (local part)';
 $labels['user'] = 'bruker';
 $labels['detail'] = 'detalj';
 $labels['comparator'] = 'sammenligning:';
 $labels['default'] = 'standard';
-$labels['octet'] = 'streng (octet)';
+$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 MANAGESIEVE-tjener';
-$labels['filterdeleteerror'] = 'Kunne ikke slette filter. Det dukket opp en feil på tjeneren.';
-$labels['filterdeleted'] = 'Filteret er blitt slettet';
-$labels['filtersaved'] = 'Filter 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 ble 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..1fd6eee4e 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';
@@ -54,6 +57,9 @@ $labels['sender'] = 'Afzender';
 $labels['recipient'] = 'Ontvanger';
 $labels['vacationaddresses'] = 'Aanvullende lijst van geadresseerden (gescheiden met komma\'s):';
 $labels['vacationdays'] = 'Hoe vaak moet een bericht verstuurd worden (in dagen):';
+$labels['vacationinterval'] = 'Hoe vaak moet een bericht verstuurd worden:';
+$labels['days'] = 'dagen';
+$labels['seconds'] = 'seconden';
 $labels['vacationreason'] = 'Bericht (vakantiereden):';
 $labels['vacationsubject'] = 'Onderwerp:';
 $labels['rulestop'] = 'Stop met regels uitvoeren';
@@ -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
new file mode 100644
index 000000000..69af8cde4
--- /dev/null
+++ b/plugins/managesieve/localization/nn_NO.inc
@@ -0,0 +1,174 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/managesieve/localization/<lang>.inc                           |
+ |                                                                       |
+ | 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.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-managesieve/
+*/
+
+
+$labels['filters'] = 'Filter';
+$labels['managefilters'] = 'Rediger filter for innkommande e-post';
+$labels['filtername'] = 'Filternamn';
+$labels['newfilter'] = 'Nytt filter';
+$labels['filteradd'] = 'Legg til filter';
+$labels['filterdel'] = 'Slett filter';
+$labels['moveup'] = 'Flytt opp';
+$labels['movedown'] = 'Flytt ned';
+$labels['filterallof'] = 'som treffer alle følgjande regler';
+$labels['filteranyof'] = 'som treffer ein av følgjande regler';
+$labels['filterany'] = 'alle meldingar';
+$labels['filtercontains'] = 'inneheld';
+$labels['filternotcontains'] = 'ikkje inneheld';
+$labels['filteris'] = 'er lik';
+$labels['filterisnot'] = 'er ikkje lik';
+$labels['filterexists'] = 'eksisterer';
+$labels['filternotexists'] = 'ikkje eksisterer';
+$labels['filtermatches'] = 'treffer uttrykk';
+$labels['filternotmatches'] = 'ikkje treffer uttrykk';
+$labels['filterregex'] = 'treffer regulært uttrykk';
+$labels['filternotregex'] = 'ikkje treffer regulært uttrykk';
+$labels['filterunder'] = 'under';
+$labels['filterover'] = 'over';
+$labels['addrule'] = 'Legg til regel';
+$labels['delrule'] = 'Slett regel';
+$labels['messagemoveto'] = 'Flytt meldinga til';
+$labels['messageredirect'] = 'Vidaresend meldinga til';
+$labels['messagecopyto'] = 'Kopier meldinga til';
+$labels['messagesendcopy'] = 'Send ein kopi av meldinga til';
+$labels['messagereply'] = 'Svar med melding';
+$labels['messagedelete'] = 'Slett melding';
+$labels['messagediscard'] = 'Avvis med melding';
+$labels['messagesrules'] = 'For innkommande e-post';
+$labels['messagesactions'] = '…gjer følgjande:';
+$labels['add'] = 'Legg til';
+$labels['del'] = 'Slett';
+$labels['sender'] = 'Avsendar';
+$labels['recipient'] = 'Mottakar';
+$labels['vacationaddresses'] = 'Liste med mottakaradresser (komma-separert):';
+$labels['vacationdays'] = 'Periode mellom meldingar (i dagar):';
+$labels['vacationreason'] = 'Innhald (grunngjeving for fråvær)';
+$labels['vacationsubject'] = 'Meldingsemne:';
+$labels['rulestop'] = 'Stopp evaluering av regler';
+$labels['enable'] = 'Aktiver/Deaktiver';
+$labels['filterset'] = 'Filtersett';
+$labels['filtersets'] = 'Filtersett';
+$labels['filtersetadd'] = 'Nytt filtersett';
+$labels['filtersetdel'] = 'Slett gjeldande filtersett';
+$labels['filtersetact'] = 'Aktiver gjeldande filtersett';
+$labels['filtersetdeact'] = 'Deaktiver gjeldande filtersett';
+$labels['filterdef'] = 'Filterdefinisjon';
+$labels['filtersetname'] = 'Namn på filtersett';
+$labels['newfilterset'] = 'Nytt filtersett';
+$labels['active'] = 'aktiv';
+$labels['none'] = 'ingen';
+$labels['fromset'] = 'frå sett';
+$labels['fromfile'] = 'frå fil';
+$labels['filterdisabled'] = 'Filter deaktivert';
+$labels['countisgreaterthan'] = 'mengd er fleire enn';
+$labels['countisgreaterthanequal'] = 'mengd er fleire enn eller lik';
+$labels['countislessthan'] = 'mengd er færre enn';
+$labels['countislessthanequal'] = 'mengd er færre enn eller lik';
+$labels['countequals'] = 'mengd er lik';
+$labels['countnotequals'] = 'mengd er ulik';
+$labels['valueisgreaterthan'] = 'verdien er høgare enn';
+$labels['valueisgreaterthanequal'] = 'verdien er høgare eller lik';
+$labels['valueislessthan'] = 'verdien er lågare enn';
+$labels['valueislessthanequal'] = 'verdien er lågare eller lik';
+$labels['valueequals'] = 'verdien er lik';
+$labels['valuenotequals'] = 'verdien er ulik';
+$labels['setflags'] = 'Sett meldingsflagg';
+$labels['addflags'] = 'Legg til flagg på meldinga';
+$labels['removeflags'] = 'Fjern flagg fra meldinga';
+$labels['flagread'] = 'Lese';
+$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';
+$labels['...'] = '…';
+$labels['advancedopts'] = 'Avanserte val';
+$labels['body'] = 'Meldingstekst';
+$labels['address'] = 'adresse';
+$labels['envelope'] = 'konvolutt';
+$labels['modifier'] = 'modifikator:';
+$labels['text'] = 'tekst';
+$labels['undecoded'] = 'ikkje dekoda (rå)';
+$labels['contenttype'] = 'innhaldstype';
+$labels['modtype'] = 'type:';
+$labels['allparts'] = 'alle';
+$labels['domain'] = 'domene';
+$labels['localpart'] = 'lokal del (local part)';
+$labels['user'] = 'brukar';
+$labels['detail'] = 'detalj';
+$labels['comparator'] = 'samanlikning:';
+$labels['default'] = 'standard';
+$labels['octet'] = 'streng (oktett)';
+$labels['asciicasemap'] = 'ikkje skil mellom store og små bokstavar (ascii-casemap)';
+$labels['asciinumeric'] = 'numerisk (ascii-numeric)';
+
+$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..f2ec96eb9 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';
@@ -54,6 +57,9 @@ $labels['sender'] = 'Nadawca';
 $labels['recipient'] = 'Odbiorca';
 $labels['vacationaddresses'] = 'Lista dodatkowych adresów odbiorców (oddzielonych przecinkami):';
 $labels['vacationdays'] = 'Częstotliwość wysyłania wiadomości (w dniach):';
+$labels['vacationinterval'] = '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..fb4699fd2 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';
@@ -54,6 +57,9 @@ $labels['sender'] = 'Remetente';
 $labels['recipient'] = 'Destinatário';
 $labels['vacationaddresses'] = 'Lista adicional de e-mails destinatários (separado por vírgula):';
 $labels['vacationdays'] = 'Enviar mensagens com que frequência (em dias):';
+$labels['vacationinterval'] = '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..bfb3f296a 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';
@@ -54,6 +57,9 @@ $labels['sender'] = 'Remetente';
 $labels['recipient'] = 'Destinatário';
 $labels['vacationaddresses'] = 'Lista adicional de destinatários de e-mails (separados por vírgula):';
 $labels['vacationdays'] = 'Enviar mensagens com que frequência (em dias):';
+$labels['vacationinterval'] = 'Com que frequência envia mensagens:';
+$labels['days'] = 'dias';
+$labels['seconds'] = 'segundos';
 $labels['vacationreason'] = 'Conteúdo da mensagem (motivo da ausência):';
 $labels['vacationsubject'] = 'Assunto da mensagem:';
 $labels['rulestop'] = 'Parar de avaliar regras';
@@ -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..2c917cbdd 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['vacationaddresses'] = 'Adresele mele de e-mail adiționale (împărțite cu virgulă):';
 $labels['vacationdays'] = 'Cât de des să trimit mesajele (în zile):';
+$labels['vacationinterval'] = 'How often send messages:';
+$labels['days'] = 'days';
+$labels['seconds'] = 'seconds';
 $labels['vacationreason'] = 'Corpul mesajului (motivul vacanţei):';
 $labels['vacationsubject'] = 'Subiectul mesajului:';
 $labels['rulestop'] = 'Nu mai evalua reguli';
@@ -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..b05074c22 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'] = '�азвание фильтра';
@@ -54,6 +57,9 @@ $labels['sender'] = 'Отправитель';
 $labels['recipient'] = 'Получатель';
 $labels['vacationaddresses'] = 'Спи�ок моих дополнительных адре�ов (разделённых зап�тыми):';
 $labels['vacationdays'] = 'Как ча�то отправл�ть �ообщени� (в дн�х):';
+$labels['vacationinterval'] = 'How often send messages:';
+$labels['days'] = 'days';
+$labels['seconds'] = 'seconds';
 $labels['vacationreason'] = 'Тек�т �ообщени� (причина от�ут�тви�):';
 $labels['vacationsubject'] = 'Тема �ообщени�:';
 $labels['rulestop'] = 'Закончить выполнение';
@@ -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..afc2e3851 100644
--- a/plugins/managesieve/localization/si_LK.inc
+++ b/plugins/managesieve/localization/si_LK.inc
@@ -2,41 +2,176 @@
 
 /*
  +-----------------------------------------------------------------------+
- | 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['vacationaddresses'] = 'My additional e-mail addresse(s) (comma-separated):';
+$labels['vacationdays'] = 'How often send messages (in days):';
+$labels['vacationinterval'] = 'How often send messages:';
+$labels['days'] = 'days';
+$labels['seconds'] = 'seconds';
+$labels['vacationreason'] = 'Message body (vacation reason):';
 $labels['vacationsubject'] = 'පණිවිඩයේ ම�තෘක�ව:';
+$labels['rulestop'] = 'Stop evaluating rules';
 $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..f336cf2c5 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';
@@ -54,6 +57,9 @@ $labels['sender'] = 'Odosielateľ';
 $labels['recipient'] = 'Adresát';
 $labels['vacationaddresses'] = 'Dodato�ní príjemcovia správy (oddelení �iarkami):';
 $labels['vacationdays'] = 'Po�et dní medzi odoslaním správy:';
+$labels['vacationinterval'] = 'How often send messages:';
+$labels['days'] = 'days';
+$labels['seconds'] = 'seconds';
 $labels['vacationreason'] = 'Dôvod neprítomnosti:';
 $labels['vacationsubject'] = 'Predmet správy:';
 $labels['rulestop'] = 'Koniec pravidiel';
@@ -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..f1c3b983b 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';
@@ -54,6 +57,9 @@ $labels['sender'] = 'Pošiljatelj';
 $labels['recipient'] = 'Prejemnik';
 $labels['vacationaddresses'] = 'Dodaten seznam naslovov prejemnikov (lo�enih z vejico):';
 $labels['vacationdays'] = 'Kako pogosto naj bodo sporo�ila poslana (v dnevih):';
+$labels['vacationinterval'] = '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..49d5b1222 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';
@@ -54,6 +57,9 @@ $labels['sender'] = 'Avsändare';
 $labels['recipient'] = 'Mottagare';
 $labels['vacationaddresses'] = 'Ytterligare mottagaradresser (avdelade med kommatecken)';
 $labels['vacationdays'] = 'Antal dagar mellan auto-svar:';
+$labels['vacationinterval'] = 'Tid mellan auto-svar:';
+$labels['days'] = 'Dagar';
+$labels['seconds'] = 'Sekunder';
 $labels['vacationreason'] = 'Meddelande i auto-svar:';
 $labels['vacationsubject'] = 'Meddelandeämne:';
 $labels['rulestop'] = 'Avsluta filtrering';
@@ -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..c36869d29 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ı';
@@ -54,6 +57,9 @@ $labels['sender'] = 'Gönderici';
 $labels['recipient'] = 'Alıcı';
 $labels['vacationaddresses'] = 'İlave e-posta adreslerim(virgül ile ayrılmış)';
 $labels['vacationdays'] = 'Ne sıklıkla mesajlar gönderilir(gün)';
+$labels['vacationinterval'] = 'Ne kadar sıklıkla mesaj gönderirsiniz:';
+$labels['days'] = 'günler';
+$labels['seconds'] = 'saniyeler';
 $labels['vacationreason'] = 'Mesaj gövdesi(tatil sebebi):';
 $labels['vacationsubject'] = 'Mesaj konusu:';
 $labels['rulestop'] = 'Kuralları değerlendirmeyi bitir';
@@ -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 etkinleştirildi.';
+$messages['activated'] = 'Filtre(ler) başarıyla iptal edildi.';
+$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..41623df35 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'] = 'Відхилити з повідомленн�м';
@@ -49,12 +57,19 @@ $labels['sender'] = 'Відправник';
 $labels['recipient'] = 'Отримувач';
 $labels['vacationaddresses'] = 'Додатковий �пи�ок адре� отримувачів (розділених комою)';
 $labels['vacationdays'] = 'Як ча�то повторювати (у дн�х):';
+$labels['vacationinterval'] = 'How often send messages:';
+$labels['days'] = 'days';
+$labels['seconds'] = 'seconds';
 $labels['vacationreason'] = 'Тек�т повідомленн�:';
+$labels['vacationsubject'] = 'Message subject:';
 $labels['rulestop'] = 'Зупинити перевірку правил';
+$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..8d6fcd348 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';
@@ -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..79b705c54 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['vacationaddresses'] = '收件人地�的附加��（以�角逗�分隔）';
+$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..3f3fc1313 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'] = '篩�器�稱';
@@ -54,11 +57,15 @@ $labels['sender'] = '寄件者';
 $labels['recipient'] = '收件者';
 $labels['vacationaddresses'] = '其他收件者（用�形逗號隔開）：';
 $labels['vacationdays'] = '多久回覆一次（單�：天）：';
+$labels['vacationinterval'] = 'How often send messages:';
+$labels['days'] = 'days';
+$labels['seconds'] = 'seconds';
 $labels['vacationreason'] = '信件內容（休�原因）：';
 $labels['vacationsubject'] = '訊�主旨:';
 $labels['rulestop'] = '�止評估�則';
 $labels['enable'] = '啟用/�用';
 $labels['filterset'] = '篩�器集�';
+$labels['filtersets'] = '篩�器集�';
 $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.php b/plugins/managesieve/managesieve.php
index 1d8248ed2..817fa8650 100644
--- a/plugins/managesieve/managesieve.php
+++ b/plugins/managesieve/managesieve.php
@@ -62,7 +62,7 @@ class managesieve extends rcube_plugin
         "x-beenthere",
     );
 
-    const VERSION  = '6.0';
+    const VERSION  = '6.2';
     const PROGNAME = 'Roundcube (Managesieve)';
     const PORT     = 4190;
 
@@ -200,10 +200,19 @@ class managesieve extends rcube_plugin
         $include_path .= ini_get('include_path');
         set_include_path($include_path);
 
-        $host = rcube_parse_host($this->rc->config->get('managesieve_host', 'localhost'));
-        $host = rcube_idn_to_ascii($host);
-
+        // 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)) {
@@ -216,8 +225,8 @@ class managesieve extends rcube_plugin
             'password'  => $this->rc->decrypt($_SESSION['password']),
             'host'      => $host,
             'port'      => $port,
+            'usetls'    => $tls,
             'auth_type' => $this->rc->config->get('managesieve_auth_type'),
-            'usetls'    => $this->rc->config->get('managesieve_usetls', false),
             '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'),
@@ -243,7 +252,7 @@ class managesieve extends rcube_plugin
             $list = $this->list_scripts();
 
             if (!empty($_GET['_set']) || !empty($_POST['_set'])) {
-                $script_name = get_input_value('_set', RCUBE_INPUT_GPC, true);
+                $script_name = rcube_utils::get_input_value('_set', rcube_utils::INPUT_GPC, true);
             }
             else if (!empty($_SESSION['managesieve_current'])) {
                 $script_name = $_SESSION['managesieve_current'];
@@ -295,7 +304,7 @@ class managesieve extends rcube_plugin
                     break;
             }
 
-            raise_error(array('code' => 403, 'type' => 'php',
+            rcube::raise_error(array('code' => 403, 'type' => 'php',
                 'file' => __FILE__, 'line' => __LINE__,
                 'message' => "Unable to connect to managesieve on $host:$port"), true, false);
 
@@ -320,8 +329,8 @@ class managesieve extends rcube_plugin
         $error = $this->managesieve_start();
 
         // Handle user requests
-        if ($action = get_input_value('_act', RCUBE_INPUT_GPC)) {
-            $fid = (int) get_input_value('_fid', RCUBE_INPUT_POST);
+        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])) {
@@ -338,7 +347,7 @@ class managesieve extends rcube_plugin
             }
             else if ($action == 'move' && !$error) {
                 if (isset($this->script[$fid])) {
-                    $to   = (int) get_input_value('_to', RCUBE_INPUT_POST);
+                    $to   = (int) rcube_utils::get_input_value('_to', rcube_utils::INPUT_POST);
                     $rule = $this->script[$fid];
 
                     // remove rule
@@ -399,7 +408,7 @@ class managesieve extends rcube_plugin
                 }
             }
             else if ($action == 'setact' && !$error) {
-                $script_name = get_input_value('_set', RCUBE_INPUT_GPC, true);
+                $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');
 
@@ -413,7 +422,7 @@ class managesieve extends rcube_plugin
                 }
             }
             else if ($action == 'deact' && !$error) {
-                $script_name = get_input_value('_set', RCUBE_INPUT_GPC, true);
+                $script_name = rcube_utils::get_input_value('_set', rcube_utils::INPUT_GPC, true);
                 $result = $this->deactivate_script($script_name);
 
                 if ($result === true) {
@@ -426,7 +435,7 @@ class managesieve extends rcube_plugin
                 }
             }
             else if ($action == 'setdel' && !$error) {
-                $script_name = get_input_value('_set', RCUBE_INPUT_GPC, true);
+                $script_name = rcube_utils::get_input_value('_set', rcube_utils::INPUT_GPC, true);
                 $result = $this->remove_script($script_name);
 
                 if ($result === true) {
@@ -439,7 +448,7 @@ class managesieve extends rcube_plugin
                 }
             }
             else if ($action == 'setget') {
-                $script_name = get_input_value('_set', RCUBE_INPUT_GPC, true);
+                $script_name = rcube_utils::get_input_value('_set', rcube_utils::INPUT_GPC, true);
                 $script = $this->sieve->get_script($script_name);
 
                 if (PEAR::isError($script))
@@ -470,14 +479,14 @@ class managesieve extends rcube_plugin
                 $this->rc->output->command('managesieve_updatelist', 'list', array('list' => $result));
             }
             else if ($action == 'ruleadd') {
-                $rid = get_input_value('_rid', RCUBE_INPUT_GPC);
+                $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 = get_input_value('_aid', RCUBE_INPUT_GPC);
+                $aid = rcube_utils::get_input_value('_aid', rcube_utils::INPUT_GPC);
                 $id = $this->genid();
                 $content = $this->action_div($fid, $id, false);
 
@@ -488,7 +497,7 @@ class managesieve extends rcube_plugin
         }
         else if ($this->rc->task == 'mail') {
             // Initialize the form
-            $rules = get_input_value('r', RCUBE_INPUT_GET);
+            $rules = rcube_utils::get_input_value('r', rcube_utils::INPUT_GET);
             if (!empty($rules)) {
                 $i = 0;
                 foreach ($rules as $rule) {
@@ -561,9 +570,9 @@ class managesieve extends rcube_plugin
         }
         // filters set add action
         else if (!empty($_POST['_newset'])) {
-            $name       = get_input_value('_name', RCUBE_INPUT_POST, true);
-            $copy       = get_input_value('_copy', RCUBE_INPUT_POST, true);
-            $from       = get_input_value('_from', RCUBE_INPUT_POST);
+            $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);
@@ -600,9 +609,9 @@ class managesieve extends rcube_plugin
                     $err = $_FILES['_file']['error'];
 
                     if ($err == UPLOAD_ERR_INI_SIZE || $err == UPLOAD_ERR_FORM_SIZE) {
-                        $msg = rcube_label(array('name' => 'filesizeerror',
+                        $msg = $this->rc->gettext(array('name' => 'filesizeerror',
                             'vars' => array('size' =>
-                                show_bytes(parse_bytes(ini_get('upload_max_filesize'))))));
+                                $this->rc->show_bytes(parse_bytes(ini_get('upload_max_filesize'))))));
                     }
                     else {
                         $this->errors['file'] = $this->gettext('fileuploaderror');
@@ -631,40 +640,41 @@ class managesieve extends rcube_plugin
         }
         // filter add/edit action
         else if (isset($_POST['_name'])) {
-            $name = trim(get_input_value('_name', RCUBE_INPUT_POST, true));
-            $fid  = trim(get_input_value('_fid', RCUBE_INPUT_POST));
-            $join = trim(get_input_value('_join', RCUBE_INPUT_POST));
+            $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        = get_input_value('_header', RCUBE_INPUT_POST);
-            $cust_headers   = get_input_value('_custom_header', RCUBE_INPUT_POST);
-            $ops            = get_input_value('_rule_op', RCUBE_INPUT_POST);
-            $sizeops        = get_input_value('_rule_size_op', RCUBE_INPUT_POST);
-            $sizeitems      = get_input_value('_rule_size_item', RCUBE_INPUT_POST);
-            $sizetargets    = get_input_value('_rule_size_target', RCUBE_INPUT_POST);
-            $targets        = get_input_value('_rule_target', RCUBE_INPUT_POST, true);
-            $mods           = get_input_value('_rule_mod', RCUBE_INPUT_POST);
-            $mod_types      = get_input_value('_rule_mod_type', RCUBE_INPUT_POST);
-            $body_trans     = get_input_value('_rule_trans', RCUBE_INPUT_POST);
-            $body_types     = get_input_value('_rule_trans_type', RCUBE_INPUT_POST, true);
-            $comparators    = get_input_value('_rule_comp', RCUBE_INPUT_POST);
-            $act_types      = get_input_value('_action_type', RCUBE_INPUT_POST, true);
-            $mailboxes      = get_input_value('_action_mailbox', RCUBE_INPUT_POST, true);
-            $act_targets    = get_input_value('_action_target', RCUBE_INPUT_POST, true);
-            $area_targets   = get_input_value('_action_target_area', RCUBE_INPUT_POST, true);
-            $reasons        = get_input_value('_action_reason', RCUBE_INPUT_POST, true);
-            $addresses      = get_input_value('_action_addresses', RCUBE_INPUT_POST, true);
-            $days           = get_input_value('_action_days', RCUBE_INPUT_POST);
-            $subject        = get_input_value('_action_subject', RCUBE_INPUT_POST, true);
-            $flags          = get_input_value('_action_flags', RCUBE_INPUT_POST);
-            $varnames       = get_input_value('_action_varname', RCUBE_INPUT_POST);
-            $varvalues      = get_input_value('_action_varvalue', RCUBE_INPUT_POST);
-            $varmods        = get_input_value('_action_varmods', RCUBE_INPUT_POST);
-            $notifyaddrs    = get_input_value('_action_notifyaddress', RCUBE_INPUT_POST);
-            $notifybodies   = get_input_value('_action_notifybody', RCUBE_INPUT_POST);
-            $notifymessages = get_input_value('_action_notifymessage', RCUBE_INPUT_POST);
-            $notifyfrom     = get_input_value('_action_notifyfrom', RCUBE_INPUT_POST);
-            $notifyimp      = get_input_value('_action_notifyimportance', RCUBE_INPUT_POST);
+            $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);
+            $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)
@@ -826,7 +836,7 @@ class managesieve extends rcube_plugin
 
                 case 'fileinto':
                 case 'fileinto_copy':
-                    $mailbox = $this->strip_value($mailboxes[$idx]);
+                    $mailbox = $this->strip_value($mailboxes[$idx], false, false);
                     $this->form['actions'][$i]['target'] = $this->mod_mailbox($mailbox, 'in');
                     if ($type == 'fileinto_copy') {
                         $type = 'fileinto';
@@ -849,7 +859,7 @@ class managesieve extends rcube_plugin
 
                     if ($this->form['actions'][$i]['target'] == '')
                         $this->errors['actions'][$i]['target'] = $this->gettext('cannotbeempty');
-                    else if (!check_email($this->form['actions'][$i]['target']))
+                    else if (!rcube_utils::check_email($this->form['actions'][$i]['target']))
                         $this->errors['actions'][$i]['target'] = $this->gettext('noemailwarning');
 
                     if ($type == 'redirect_copy') {
@@ -874,11 +884,12 @@ class managesieve extends rcube_plugin
                     break;
 
                 case 'vacation':
-                    $reason = $this->strip_value($reasons[$idx]);
+                    $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]['days']      = $days[$idx];
                     $this->form['actions'][$i]['subject']   = $subject[$idx];
                     $this->form['actions'][$i]['addresses'] = explode(',', $addresses[$idx]);
+                    $this->form['actions'][$i][$interval_type] = $intervals[$idx];
 // @TODO: vacation :mime, :from, :handle
 
                     if ($this->form['actions'][$i]['addresses']) {
@@ -886,7 +897,7 @@ class managesieve extends rcube_plugin
                             $address = trim($address);
                             if (!$address)
                                 unset($this->form['actions'][$i]['addresses'][$aidx]);
-                            else if(!check_email($address)) {
+                            else if(!rcube_utils::check_email($address)) {
                                 $this->errors['actions'][$i]['addresses'] = $this->gettext('noemailwarning');
                                 break;
                             } else
@@ -896,8 +907,8 @@ class managesieve extends rcube_plugin
 
                     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');
+                    if ($this->form['actions'][$i][$interval_type] && !preg_match('/^[0-9]+$/', $this->form['actions'][$i][$interval_type]))
+                        $this->errors['actions'][$i]['interval'] = $this->gettext('forbiddenchars');
                     break;
 
                 case 'set':
@@ -923,10 +934,10 @@ class managesieve extends rcube_plugin
                     if (empty($notifyaddrs[$idx])) {
                         $this->errors['actions'][$i]['address'] = $this->gettext('cannotbeempty');
                     }
-                    else if (!check_email($notifyaddrs[$idx])) {
+                    else if (!rcube_utils::check_email($notifyaddrs[$idx])) {
                         $this->errors['actions'][$i]['address'] = $this->gettext('noemailwarning');
                     }
-                    if (!empty($notifyfrom[$idx]) && !check_email($notifyfrom[$idx])) {
+                    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];
@@ -958,7 +969,7 @@ class managesieve extends rcube_plugin
                         $this->rc->output->command('parent.managesieve_updatelist',
                             isset($new) ? 'add' : 'update',
                             array(
-                                'name' => Q($this->form['name']),
+                                'name' => rcube::Q($this->form['name']),
                                 'id' => $fid,
                                 'disabled' => $this->form['disabled']
                         ));
@@ -1007,7 +1018,7 @@ class managesieve extends rcube_plugin
         $result = $this->list_rules();
 
         // create XHTML table
-        $out = rcube_table_output($attrib, $result, $a_show_cols, 'id');
+        $out = $this->rc->table_output($attrib, $result, $a_show_cols, 'id');
 
         // set client env
         $this->rc->output->add_gui_object('filterslist', $attrib['id']);
@@ -1040,7 +1051,7 @@ class managesieve extends rcube_plugin
                 foreach ($list as $idx => $set) {
                     $scripts['S'.$idx] = $set;
                     $result[] = array(
-                        'name' => Q($set),
+                        'name' => rcube::Q($set),
                         'id' => 'S'.$idx,
                         'class' => !in_array($set, $this->active) ? 'disabled' : '',
                     );
@@ -1048,7 +1059,7 @@ class managesieve extends rcube_plugin
             }
 
             // create XHTML table
-            $out = rcube_table_output($attrib, $result, $a_show_cols, 'id');
+            $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');
@@ -1102,21 +1113,21 @@ class managesieve extends rcube_plugin
 
         $out .= $hiddenfields->show();
 
-        $name     = get_input_value('_name', RCUBE_INPUT_POST);
-        $copy     = get_input_value('_copy', RCUBE_INPUT_POST);
-        $selected = get_input_value('_from', RCUBE_INPUT_POST);
+        $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', Q($this->gettext('filtersetname')), $input_name->show($name));
+            '_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', Q($this->gettext('none')));
+        $out .= sprintf('<label for="%s">%s</label> ', 'from_none', rcube::Q($this->gettext('none')));
 
         // filters set list
         $list   = $this->list_scripts();
@@ -1134,7 +1145,7 @@ class managesieve extends rcube_plugin
 
             $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', Q($this->gettext('fromset')));
+            $out .= sprintf('<label for="%s">%s:</label> ', 'from_set', rcube::Q($this->gettext('fromset')));
             $out .= $select->show($copy);
         }
 
@@ -1144,7 +1155,7 @@ class managesieve extends rcube_plugin
 
         $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', Q($this->gettext('fromfile')));
+        $out .= sprintf('<label for="%s">%s:</label> ', 'from_file', rcube::Q($this->gettext('fromfile')));
         $out .= $upload->show();
         $out .= '</fieldset>';
 
@@ -1166,7 +1177,7 @@ class managesieve extends rcube_plugin
         if (!$attrib['id'])
             $attrib['id'] = 'rcmfilterform';
 
-        $fid = get_input_value('_fid', RCUBE_INPUT_GPC);
+        $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));
@@ -1195,16 +1206,16 @@ class managesieve extends rcube_plugin
             $input_name = $input_name->show();
 
         $out .= sprintf("\n<label for=\"%s\"><b>%s:</b></label> %s\n",
-            $field_id, Q($this->gettext('filtername')), $input_name);
+            $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, Q($this->gettext('filterset')),
+                $field_id, rcube::Q($this->gettext('filterset')),
                 $this->filtersets_list(array('id' => 'sievescriptname'), true));
         }
 
-        $out .= '<br /><br /><fieldset><legend>' . Q($this->gettext('messagesrules')) . "</legend>\n";
+        $out .= '<br /><br /><fieldset><legend>' . rcube::Q($this->gettext('messagesrules')) . "</legend>\n";
 
         // any, allof, anyof radio buttons
         $field_id = '_allof';
@@ -1217,7 +1228,7 @@ class managesieve extends rcube_plugin
             $input_join = $input_join->show();
 
         $out .= sprintf("%s<label for=\"%s\">%s</label>&nbsp;\n",
-            $input_join, $field_id, Q($this->gettext('filterallof')));
+            $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',
@@ -1229,7 +1240,7 @@ class managesieve extends rcube_plugin
             $input_join = $input_join->show('anyof'); // default
 
         $out .= sprintf("%s<label for=\"%s\">%s</label>\n",
-            $input_join, $field_id, Q($this->gettext('filteranyof')));
+            $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',
@@ -1238,7 +1249,7 @@ class managesieve extends rcube_plugin
         $input_join = $input_join->show($any ? 'any' : '');
 
         $out .= sprintf("%s<label for=\"%s\">%s</label>\n",
-            $input_join, $field_id, Q($this->gettext('filterany')));
+            $input_join, $field_id, rcube::Q($this->gettext('filterany')));
 
         $rows_num = isset($scr) ? sizeof($scr['tests']) : 1;
 
@@ -1250,7 +1261,7 @@ class managesieve extends rcube_plugin
         $out .= "</fieldset>\n";
 
         // actions
-        $out .= '<fieldset><legend>' . Q($this->gettext('messagesactions')) . "</legend>\n";
+        $out .= '<fieldset><legend>' . rcube::Q($this->gettext('messagesactions')) . "</legend>\n";
 
         $rows_num = isset($scr) ? sizeof($scr['actions']) : 1;
 
@@ -1284,11 +1295,11 @@ class managesieve extends rcube_plugin
         $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(Q($this->gettext($name)), Q($val));
+            $select_header->add(rcube::Q($this->gettext($name)), Q($val));
         if (in_array('body', $this->exts))
-            $select_header->add(Q($this->gettext('body')), 'body');
-        $select_header->add(Q($this->gettext('size')), 'size');
-        $select_header->add(Q($this->gettext('...')), '...');
+            $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 = '';
@@ -1328,38 +1339,38 @@ class managesieve extends rcube_plugin
         $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="' .Q($custom). '" size="15" />&nbsp;</div>' . "\n";
+            .' 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(Q($this->gettext('filtercontains')), 'contains');
-        $select_op->add(Q($this->gettext('filternotcontains')), 'notcontains');
-        $select_op->add(Q($this->gettext('filteris')), 'is');
-        $select_op->add(Q($this->gettext('filterisnot')), 'notis');
-        $select_op->add(Q($this->gettext('filterexists')), 'exists');
-        $select_op->add(Q($this->gettext('filternotexists')), 'notexists');
-        $select_op->add(Q($this->gettext('filtermatches')), 'matches');
-        $select_op->add(Q($this->gettext('filternotmatches')), 'notmatches');
+        $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(Q($this->gettext('filterregex')), 'regex');
-            $select_op->add(Q($this->gettext('filternotregex')), 'notregex');
+            $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(Q($this->gettext('countisgreaterthan')), 'count-gt');
-            $select_op->add(Q($this->gettext('countisgreaterthanequal')), 'count-ge');
-            $select_op->add(Q($this->gettext('countislessthan')), 'count-lt');
-            $select_op->add(Q($this->gettext('countislessthanequal')), 'count-le');
-            $select_op->add(Q($this->gettext('countequals')), 'count-eq');
-            $select_op->add(Q($this->gettext('countnotequals')), 'count-ne');
-            $select_op->add(Q($this->gettext('valueisgreaterthan')), 'value-gt');
-            $select_op->add(Q($this->gettext('valueisgreaterthanequal')), 'value-ge');
-            $select_op->add(Q($this->gettext('valueislessthan')), 'value-lt');
-            $select_op->add(Q($this->gettext('valueislessthanequal')), 'value-le');
-            $select_op->add(Q($this->gettext('valueequals')), 'value-eq');
-            $select_op->add(Q($this->gettext('valuenotequals')), 'value-ne');
+            $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)
@@ -1391,53 +1402,53 @@ class managesieve extends rcube_plugin
 
         $tout .= $select_op->show($test);
         $tout .= '<input type="text" name="_rule_target[]" id="rule_target' .$id. '"
-            value="' .Q($target). '" size="20" ' . $this->error_class($id, 'test', 'target', 'rule_target')
+            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(Q($this->gettext('filterover')), 'over');
-        $select_size_op->add(Q($this->gettext('filterunder')), 'under');
+        $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" />'.rcube_label('B').'
-            <input type="radio" name="_rule_size_item['.$id.']" value="K"'
-                . ($sizeitem=='K' ? ' checked="checked"' : '') .' class="radio" />'.rcube_label('KB').'
-            <input type="radio" name="_rule_size_item['.$id.']" value="M"'
-                . ($sizeitem=='M' ? ' checked="checked"' : '') .' class="radio" />'.rcube_label('MB').'
-            <input type="radio" name="_rule_size_item['.$id.']" value="G"'
-                . ($sizeitem=='G' ? ' checked="checked"' : '') .' class="radio" />'.rcube_label('GB');
+            <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(Q($this->gettext('none')), '');
-        $select_mod->add(Q($this->gettext('address')), 'address');
+        $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(Q($this->gettext('envelope')), 'envelope');
+            $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(Q($this->gettext('allparts')), 'all');
-        $select_type->add(Q($this->gettext('domain')), 'domain');
-        $select_type->add(Q($this->gettext('localpart')), 'localpart');
+        $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(Q($this->gettext('user')), 'user');
-            $select_type->add(Q($this->gettext('detail')), 'detail');
+            $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 .= Q($this->gettext('modifier')) . ' ';
+        $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 .= Q($this->gettext('modtype')) . ' ';
+        $mout .= rcube::Q($this->gettext('modtype')) . ' ';
         $mout .= $select_type->show($rule['part']);
         $mout .= '</span>';
         $mout .= '</div>';
@@ -1445,13 +1456,13 @@ class managesieve extends rcube_plugin
         // 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(Q($this->gettext('text')), 'text');
-        $select_mod->add(Q($this->gettext('undecoded')), 'raw');
-        $select_mod->add(Q($this->gettext('contenttype')), 'content');
+        $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 .= Q($this->gettext('modifier')) . ' ';
+        $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'])
@@ -1462,16 +1473,16 @@ class managesieve extends rcube_plugin
 
         // Advanced modifiers (body transformations)
         $select_comp = new html_select(array('name' => "_rule_comp[]", 'id' => 'rule_comp_op'.$id));
-        $select_comp->add(Q($this->gettext('default')), '');
-        $select_comp->add(Q($this->gettext('octet')), 'i;octet');
-        $select_comp->add(Q($this->gettext('asciicasemap')), 'i;ascii-casemap');
+        $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(Q($this->gettext('asciinumeric')), 'i;ascii-numeric');
+            $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 .= Q($this->gettext('comparator')) . ' ';
+        $mout .= rcube::Q($this->gettext('comparator')) . ' ';
         $mout .= $select_comp->show($rule['comparator']);
         $mout .= '</span>';
         $mout .= '</div>';
@@ -1480,7 +1491,7 @@ class managesieve extends rcube_plugin
         $out = $div ? '<div class="rulerow" id="rulerow' .$id .'">'."\n" : '';
         $out .= '<table><tr>';
         $out .= '<td class="advbutton">';
-        $out .= '<a href="#" id="ruleadv' . $id .'" title="'. Q($this->gettext('advancedopts')). '"
+        $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>';
@@ -1490,9 +1501,9 @@ class managesieve extends rcube_plugin
 
         // add/del buttons
         $out .= '<td class="rowbuttons">';
-        $out .= '<a href="#" id="ruleadd' . $id .'" title="'. Q($this->gettext('add')). '"
+        $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="'. Q($this->gettext('del')). '"
+        $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>';
@@ -1515,31 +1526,31 @@ class managesieve extends rcube_plugin
         $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(Q($this->gettext('messagemoveto')), 'fileinto');
+            $select_action->add(rcube::Q($this->gettext('messagemoveto')), 'fileinto');
         if (in_array('fileinto', $this->exts) && in_array('copy', $this->exts))
-            $select_action->add(Q($this->gettext('messagecopyto')), 'fileinto_copy');
-        $select_action->add(Q($this->gettext('messageredirect')), 'redirect');
+            $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(Q($this->gettext('messagesendcopy')), 'redirect_copy');
+            $select_action->add(rcube::Q($this->gettext('messagesendcopy')), 'redirect_copy');
         if (in_array('reject', $this->exts))
-            $select_action->add(Q($this->gettext('messagediscard')), 'reject');
+            $select_action->add(rcube::Q($this->gettext('messagediscard')), 'reject');
         else if (in_array('ereject', $this->exts))
-            $select_action->add(Q($this->gettext('messagediscard')), 'ereject');
+            $select_action->add(rcube::Q($this->gettext('messagediscard')), 'ereject');
         if (in_array('vacation', $this->exts))
-            $select_action->add(Q($this->gettext('messagereply')), 'vacation');
-        $select_action->add(Q($this->gettext('messagedelete')), 'discard');
+            $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(Q($this->gettext('setflags')), 'setflag');
-            $select_action->add(Q($this->gettext('addflags')), 'addflag');
-            $select_action->add(Q($this->gettext('removeflags')), 'removeflag');
+            $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(Q($this->gettext('setvariable')), 'set');
+            $select_action->add(rcube::Q($this->gettext('setvariable')), 'set');
         }
         if (in_array('enotify', $this->exts) || in_array('notify', $this->exts)) {
-            $select_action->add(Q($this->gettext('notify')), 'notify');
+            $select_action->add(rcube::Q($this->gettext('notify')), 'notify');
         }
-        $select_action->add(Q($this->gettext('rulestop')), 'stop');
+        $select_action->add(rcube::Q($this->gettext('rulestop')), 'stop');
 
         $select_type = $action['type'];
         if (in_array($action['type'], array('fileinto', 'redirect')) && $action['copy']) {
@@ -1553,33 +1564,40 @@ class managesieve extends rcube_plugin
         $out .= '<td class="rowtargets">';
         // shared targets
         $out .= '<input type="text" name="_action_target['.$id.']" id="action_target' .$id. '" '
-            .'value="' .($action['type']=='redirect' ? Q($action['target'], 'strict', false) : ''). '" size="35" '
+            .'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')) ? Q($action['target'], 'strict', false) : '')
+            . (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">'. Q($this->gettext('vacationreason')) .'</span><br />'
+        $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">' .Q($this->gettext('vacationsubject')) . '</span><br />'
+        $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']) ? Q(implode(', ', $action['subject']), 'strict', false) : $action['subject']) . '" size="35" '
+            .'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">' .Q($this->gettext('vacationaddresses')) . '</span><br />'
+        $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']) ? Q(implode(', ', $action['addresses']), 'strict', false) : $action['addresses']) . '" size="35" '
+            .'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">' . Q($this->gettext('vacationdays')) . '</span><br />'
-            .'<input type="text" name="_action_days['.$id.']" id="action_days'.$id.'" '
-            .'value="' .Q($action['days'], 'strict', false) . '" size="2" '
-            . $this->error_class($id, 'action', 'days', 'action_days') .' />';
+        $out .= '<br /><span class="label">' . rcube::Q($this->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->gettext('days').'</label>'
+                . '&nbsp;<label><input type="radio" name="_action_interval_type['.$id.']" value="seconds"'
+                . (isset($action['seconds']) ? ' checked="checked"' : '') .' class="radio" />'.$this->gettext('seconds').'</label>';
+        }
         $out .= '</div>';
 
         // flags
@@ -1598,7 +1616,7 @@ class managesieve extends rcube_plugin
         foreach ($flags as $fidx => $flag) {
             $out .= '<input type="checkbox" name="_action_flags[' .$id .'][]" value="' . $flag . '"'
                 . (in_array_nocase($flag, $flags_target) ? 'checked="checked"' : '') . ' />'
-                . Q($this->gettext('flag'.$fidx)) .'<br>';
+                . rcube::Q($this->gettext('flag'.$fidx)) .'<br>';
         }
         $out .= '</div>';
 
@@ -1613,42 +1631,42 @@ class managesieve extends rcube_plugin
         );
 
         $out .= '<div id="action_set' .$id.'" style="display:' .($action['type']=='set' ? 'inline' : 'none') .'">';
-        $out .= '<span class="label">' .Q($this->gettext('setvarname')) . '</span><br />'
+        $out .= '<span class="label">' .rcube::Q($this->gettext('setvarname')) . '</span><br />'
             .'<input type="text" name="_action_varname['.$id.']" id="action_varname'.$id.'" '
-            .'value="' . Q($action['name']) . '" size="35" '
+            .'value="' . rcube::Q($action['name']) . '" size="35" '
             . $this->error_class($id, 'action', 'name', 'action_varname') .' />';
-        $out .= '<br /><span class="label">' .Q($this->gettext('setvarvalue')) . '</span><br />'
+        $out .= '<br /><span class="label">' .rcube::Q($this->gettext('setvarvalue')) . '</span><br />'
             .'<input type="text" name="_action_varvalue['.$id.']" id="action_varvalue'.$id.'" '
-            .'value="' . Q($action['value']) . '" size="35" '
+            .'value="' . rcube::Q($action['value']) . '" size="35" '
             . $this->error_class($id, 'action', 'value', 'action_varvalue') .' />';
-        $out .= '<br /><span class="label">' .Q($this->gettext('setvarmodifiers')) . '</span><br />';
+        $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"' : ''),
-                Q($this->gettext('var' . $s_m)));
+                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">' .Q($this->gettext('notifyaddress')) . '</span><br />'
+        $out .= '<span class="label">' .rcube::Q($this->gettext('notifyaddress')) . '</span><br />'
             .'<input type="text" name="_action_notifyaddress['.$id.']" id="action_notifyaddress'.$id.'" '
-            .'value="' . Q($action['address']) . '" size="35" '
+            .'value="' . rcube::Q($action['address']) . '" size="35" '
             . $this->error_class($id, 'action', 'address', 'action_notifyaddress') .' />';
-        $out .= '<br /><span class="label">'. Q($this->gettext('notifybody')) .'</span><br />'
+        $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') . '>'
-            . Q($action['body'], 'strict', false) . "</textarea>\n";
-        $out .= '<br /><span class="label">' .Q($this->gettext('notifysubject')) . '</span><br />'
+            . 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="' . Q($action['message']) . '" size="35" '
+            .'value="' . rcube::Q($action['message']) . '" size="35" '
             . $this->error_class($id, 'action', 'message', 'action_notifymessage') .' />';
-        $out .= '<br /><span class="label">' .Q($this->gettext('notifyfrom')) . '</span><br />'
+        $out .= '<br /><span class="label">' .rcube::Q($this->gettext('notifyfrom')) . '</span><br />'
             .'<input type="text" name="_action_notifyfrom['.$id.']" id="action_notifyfrom'.$id.'" '
-            .'value="' . Q($action['from']) . '" size="35" '
+            .'value="' . rcube::Q($action['from']) . '" size="35" '
             . $this->error_class($id, 'action', 'from', 'action_notifyfrom') .' />';
         $importance_options = array(
             3 => 'notifyimportancelow',
@@ -1660,9 +1678,9 @@ class managesieve extends rcube_plugin
             'id' => '_action_notifyimportance' . $id,
             'class' => $this->error_class($id, 'action', 'importance', 'action_notifyimportance')));
         foreach ($importance_options as $io_v => $io_n) {
-            $select_importance->add(Q($this->gettext($io_n)), $io_v);
+            $select_importance->add(rcube::Q($this->gettext($io_n)), $io_v);
         }
-        $out .= '<br /><span class="label">' . Q($this->gettext('notifyimportance')) . '</span><br />';
+        $out .= '<br /><span class="label">' . rcube::Q($this->gettext('notifyimportance')) . '</span><br />';
         $out .= $select_importance->show($action['importance'] ? $action['importance'] : 2);
         $out .= '</div>';
 
@@ -1672,7 +1690,7 @@ class managesieve extends rcube_plugin
         else
             $mailbox = '';
 
-        $select = rcmail_mailbox_select(array(
+        $select = $this->rc->folder_selector(array(
             'realnames' => false,
             'maxlength' => 100,
             'id' => 'action_mailbox' . $id,
@@ -1684,9 +1702,9 @@ class managesieve extends rcube_plugin
 
         // add/del buttons
         $out .= '<td class="rowbuttons">';
-        $out .= '<a href="#" id="actionadd' . $id .'" title="'. Q($this->gettext('add')). '"
+        $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="'. Q($this->gettext('del')). '"
+        $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>';
 
@@ -1699,16 +1717,16 @@ class managesieve extends rcube_plugin
 
     private function genid()
     {
-        $result = preg_replace('/[^0-9]/', '', microtime(true));
-        return $result;
+        return preg_replace('/[^0-9]/', '', microtime(true));
     }
 
-    private function strip_value($str, $allow_html=false)
+    private function strip_value($str, $allow_html = false, $trim = true)
     {
-        if (!$allow_html)
+        if (!$allow_html) {
             $str = strip_tags($str);
+        }
 
-        return trim($str);
+        return $trim ? trim($str) : $str;
     }
 
     private function error_class($id, $type, $target, $elem_prefix='')
@@ -1737,7 +1755,7 @@ class managesieve extends rcube_plugin
         if (empty($this->tips))
             return;
 
-        $script = JS_OBJECT_NAME.'.managesieve_tip_register('.json_encode($this->tips).');';
+        $script = rcmail_output::JS_OBJECT_NAME.'.managesieve_tip_register('.json_encode($this->tips).');';
         $this->rc->output->add_script($script, 'foot');
     }
 
@@ -1757,12 +1775,12 @@ class managesieve extends rcube_plugin
         $mbox_encoding     = $this->rc->config->get('managesieve_mbox_encoding', 'UTF7-IMAP');
 
         if ($mode == 'out') {
-            $mailbox = rcube_charset_convert($mailbox, $mbox_encoding, 'UTF7-IMAP');
+            $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);
+            $mailbox = rcube_charset::convert($mailbox, 'UTF7-IMAP', $mbox_encoding);
             if ($replace_delimiter && $replace_delimiter != $delimiter)
                 $mailbox = str_replace($delimiter, $replace_delimiter, $mailbox);
         }
@@ -2030,7 +2048,7 @@ class managesieve extends rcube_plugin
             $fname = $filter['name'] ? $filter['name'] : "#$i";
             $result[] = array(
                 'id'    => $idx,
-                'name'  => Q($fname),
+                'name'  => rcube::Q($fname),
                 'class' => $filter['disabled'] ? 'disabled' : '',
             );
             $i++;
diff --git a/plugins/managesieve/package.xml b/plugins/managesieve/package.xml
index e8e8102b0..a0c38b82d 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-10-03</date>
+	<date>2013-02-17</date>
 	<version>
-		<release>6.0</release>
+		<release>6.2</release>
 		<api>6.0</api>
 	</version>
 	<stability>
diff --git a/plugins/managesieve/skins/classic/managesieve.css b/plugins/managesieve/skins/classic/managesieve.css
index 9527b44e9..86a0d197d 100644
--- a/plugins/managesieve/skins/classic/managesieve.css
+++ b/plugins/managesieve/skins/classic/managesieve.css
@@ -236,6 +236,11 @@ span.label
   white-space: nowrap;
 }
 
+td.rowtargets label
+{
+  color: black;
+}
+
 #footer
 {
   padding-top: 5px;
diff --git a/plugins/managesieve/skins/larry/managesieve.css b/plugins/managesieve/skins/larry/managesieve.css
index 49ebe007f..099f05f0d 100644
--- a/plugins/managesieve/skins/larry/managesieve.css
+++ b/plugins/managesieve/skins/larry/managesieve.css
@@ -197,6 +197,11 @@ input.radio
   margin-top: 0;
 }
 
+input.radio
+{
+  vertical-align: middle;
+}
+
 select.operator_selector
 {
   width: 200px;
@@ -210,6 +215,11 @@ span.label
   white-space: nowrap;
 }
 
+td.rowtargets label
+{
+  color: black;
+}
+
 #footer
 {
   padding-top: 5px;
diff --git a/plugins/managesieve/tests/Managesieve.php b/plugins/managesieve/tests/Managesieve.php
new file mode 100644
index 000000000..d802f5614
--- /dev/null
+++ b/plugins/managesieve/tests/Managesieve.php
@@ -0,0 +1,23 @@
+<?php
+
+class Managesieve_Plugin extends PHPUnit_Framework_TestCase
+{
+
+    function setUp()
+    {
+        include_once dirname(__FILE__) . '/../managesieve.php';
+    }
+
+    /**
+     * Plugin object construction test
+     */
+    function test_constructor()
+    {
+        $rcube  = rcube::get_instance();
+        $plugin = new managesieve($rcube->api);
+
+        $this->assertInstanceOf('managesieve', $plugin);
+        $this->assertInstanceOf('rcube_plugin', $plugin);
+    }
+}
+
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 dedc58f1d..420cd036a 100644
--- a/plugins/markasjunk/localization/az_AZ.inc
+++ b/plugins/markasjunk/localization/az_AZ.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/az_AZ/labels.inc                                         |
+ | plugins/markasjunk/localization/<lang>.inc                            |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Mark-As-Junk plugin        |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU 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-markasjunk/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $labels['buttontext'] = 'Spam';
 $labels['buttontitle'] = 'Spam qovluğuna köçür';
 $labels['reportedasjunk'] = 'Spam qovluğuna köçürüldü';
 
+?>
\ No newline at end of file
diff --git a/plugins/markasjunk/localization/be_BE.inc b/plugins/markasjunk/localization/be_BE.inc
index e415040a1..d11e34bdd 100644
--- a/plugins/markasjunk/localization/be_BE.inc
+++ b/plugins/markasjunk/localization/be_BE.inc
@@ -2,19 +2,23 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/be_BE/labels.inc                                         |
+ | plugins/markasjunk/localization/<lang>.inc                            |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Mark-As-Junk plugin        |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU 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-markasjunk/
 */
 
 $labels = array();
+$labels['buttontext'] = 'Junk';
 $labels['buttontitle'] = 'Пазначыць �к �пам';
 $labels['reportedasjunk'] = 'Па�п�хова пазначаны �к �пам';
 
+?>
\ No newline at end of file
diff --git a/plugins/subscriptions_option/localization/nb_NB.inc b/plugins/markasjunk/localization/ber.inc
index 1024b1a8f..12fe4442e 100644
--- a/plugins/subscriptions_option/localization/nb_NB.inc
+++ b/plugins/markasjunk/localization/ber.inc
@@ -2,17 +2,16 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/nb_NB/labels.inc                                         |
+ | localization//labels.inc                                         |
  |                                                                       |
  | Language file of the Roundcube Webmail client                         |
  | Copyright (C) 2012, The Roundcube Dev Team                            |
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Tobias V. Langhoff <spug@thespug.net>                         |
+ | Author: FULL NAME <EMAIL@ADDRESS>                                     |
  +-----------------------------------------------------------------------+
 */
 
 $labels = array();
-$labels['useimapsubscriptions'] = 'Bruk IMAP-abonnementer';
 
diff --git a/plugins/markasjunk/localization/br.inc b/plugins/markasjunk/localization/br.inc
new file mode 100644
index 000000000..4ae4190be
--- /dev/null
+++ b/plugins/markasjunk/localization/br.inc
@@ -0,0 +1,24 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/markasjunk/localization/<lang>.inc                            |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail Mark-As-Junk plugin        |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the 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-markasjunk/
+*/
+
+$labels = array();
+$labels['buttontext'] = 'Lastez';
+$labels['buttontitle'] = 'Merkañ evel lastez';
+$labels['reportedasjunk'] = 'Danevellet evel lastez gant berzh';
+
+?>
\ No newline at end of file
diff --git a/plugins/markasjunk/localization/bs_BA.inc b/plugins/markasjunk/localization/bs_BA.inc
index 81c9b1bca..aaa093300 100644
--- a/plugins/markasjunk/localization/bs_BA.inc
+++ b/plugins/markasjunk/localization/bs_BA.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/bs_BA/labels.inc                                         |
+ | plugins/markasjunk/localization/<lang>.inc                            |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Mark-As-Junk plugin        |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU 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-markasjunk/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $labels['buttontext'] = 'Spam';
 $labels['buttontitle'] = 'Ozna�i kao spam';
 $labels['reportedasjunk'] = 'Uspješno ozna�eno kao spam';
 
+?>
\ No newline at end of file
diff --git a/plugins/markasjunk/localization/ca_ES.inc b/plugins/markasjunk/localization/ca_ES.inc
index 16a5e3e3c..4b05d9248 100644
--- a/plugins/markasjunk/localization/ca_ES.inc
+++ b/plugins/markasjunk/localization/ca_ES.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ca_ES/labels.inc                                         |
+ | plugins/markasjunk/localization/<lang>.inc                            |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Mark-As-Junk plugin        |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU 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-markasjunk/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $labels['buttontext'] = 'Correu brossa';
 $labels['buttontitle'] = 'Marca com a Spam';
 $labels['reportedasjunk'] = 'S\'ha reportat correctament com a Spam';
 
+?>
\ No newline at end of file
diff --git a/plugins/markasjunk/localization/cs_CZ.inc b/plugins/markasjunk/localization/cs_CZ.inc
index c353b2e1c..b56cb5c88 100644
--- a/plugins/markasjunk/localization/cs_CZ.inc
+++ b/plugins/markasjunk/localization/cs_CZ.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/cs_CZ/labels.inc                                         |
+ | plugins/markasjunk/localization/<lang>.inc                            |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Mark-As-Junk plugin        |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU 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-markasjunk/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $labels['buttontext'] = 'Spam';
 $labels['buttontitle'] = 'Ozna�it jako Spam';
 $labels['reportedasjunk'] = 'Úspěšně nahlášeno jako Spam';
 
+?>
\ No newline at end of file
diff --git a/plugins/markasjunk/localization/cy_GB.inc b/plugins/markasjunk/localization/cy_GB.inc
index cc9a07058..7b1b6e6d3 100644
--- a/plugins/markasjunk/localization/cy_GB.inc
+++ b/plugins/markasjunk/localization/cy_GB.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/cy_GB/labels.inc                                         |
+ | plugins/markasjunk/localization/<lang>.inc                            |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Mark-As-Junk plugin        |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU 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-markasjunk/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $labels['buttontext'] = 'Sothach';
 $labels['buttontitle'] = 'Nodi fel Sbwriel';
 $labels['reportedasjunk'] = 'Adroddwyd yn llwyddiannus fel Sbwriel';
 
+?>
\ No newline at end of file
diff --git a/plugins/markasjunk/localization/da_DK.inc b/plugins/markasjunk/localization/da_DK.inc
index e50016e5f..bd76b6ba7 100644
--- a/plugins/markasjunk/localization/da_DK.inc
+++ b/plugins/markasjunk/localization/da_DK.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/da_DK/labels.inc                                         |
+ | plugins/markasjunk/localization/<lang>.inc                            |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Mark-As-Junk plugin        |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU 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-markasjunk/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $labels['buttontext'] = 'Spam';
 $labels['buttontitle'] = 'Marker som spam mail';
 $labels['reportedasjunk'] = 'Successfuldt rapporteret som spam mail';
 
+?>
\ No newline at end of file
diff --git a/plugins/markasjunk/localization/de_CH.inc b/plugins/markasjunk/localization/de_CH.inc
index 89285709e..89b22b7b4 100644
--- a/plugins/markasjunk/localization/de_CH.inc
+++ b/plugins/markasjunk/localization/de_CH.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/de_CH/labels.inc                                         |
+ | plugins/markasjunk/localization/<lang>.inc                            |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Mark-As-Junk plugin        |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU 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-markasjunk/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $labels['buttontext'] = 'Spam';
 $labels['buttontitle'] = 'Als SPAM markieren';
 $labels['reportedasjunk'] = 'Erfolgreich als SPAM gemeldet';
 
+?>
\ No newline at end of file
diff --git a/plugins/markasjunk/localization/de_DE.inc b/plugins/markasjunk/localization/de_DE.inc
index 2455911fa..f158d78ac 100644
--- a/plugins/markasjunk/localization/de_DE.inc
+++ b/plugins/markasjunk/localization/de_DE.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/de_DE/labels.inc                                         |
+ | plugins/markasjunk/localization/<lang>.inc                            |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Mark-As-Junk plugin        |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU 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-markasjunk/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $labels['buttontext'] = 'Spam';
 $labels['buttontitle'] = 'als SPAM markieren';
 $labels['reportedasjunk'] = 'Erfolgreich als SPAM gemeldet';
 
+?>
\ No newline at end of file
diff --git a/plugins/markasjunk/localization/el_GR.inc b/plugins/markasjunk/localization/el_GR.inc
index e86d2ec05..78cfaf060 100644
--- a/plugins/markasjunk/localization/el_GR.inc
+++ b/plugins/markasjunk/localization/el_GR.inc
@@ -2,19 +2,23 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/el_GR/labels.inc                                         |
+ | plugins/markasjunk/localization/<lang>.inc                            |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Mark-As-Junk plugin        |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU 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-markasjunk/
 */
 
 $labels = array();
+$labels['buttontext'] = 'Junk';
 $labels['buttontitle'] = 'Σήμανση ως Ανεπιθ�μητου';
 $labels['reportedasjunk'] = 'Αναφέ�θηκε ως Ανεπιθήμητο';
 
+?>
\ No newline at end of file
diff --git a/plugins/markasjunk/localization/en_GB.inc b/plugins/markasjunk/localization/en_GB.inc
index 0ecbf7aec..aaa3c91ac 100644
--- a/plugins/markasjunk/localization/en_GB.inc
+++ b/plugins/markasjunk/localization/en_GB.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/en_GB/labels.inc                                         |
+ | plugins/markasjunk/localization/<lang>.inc                            |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Mark-As-Junk plugin        |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Christian Foellmann <foellmann@foe-services.de>               |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $labels['buttontext'] = 'Junk';
 $labels['buttontitle'] = 'Mark as Junk';
 $labels['reportedasjunk'] = 'Successfully reported as Junk';
 
+?>
\ No newline at end of file
diff --git a/plugins/markasjunk/localization/en_US.inc b/plugins/markasjunk/localization/en_US.inc
index c1f56ad1d..aaa3c91ac 100644
--- a/plugins/markasjunk/localization/en_US.inc
+++ b/plugins/markasjunk/localization/en_US.inc
@@ -1,5 +1,21 @@
 <?php
 
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/markasjunk/localization/<lang>.inc                            |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail Mark-As-Junk plugin        |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the 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-markasjunk/
+*/
+
 $labels = array();
 $labels['buttontext'] = 'Junk';
 $labels['buttontitle'] = 'Mark as Junk';
diff --git a/plugins/markasjunk/localization/eo.inc b/plugins/markasjunk/localization/eo.inc
index 0d90ee87c..220750a20 100644
--- a/plugins/markasjunk/localization/eo.inc
+++ b/plugins/markasjunk/localization/eo.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/eo/labels.inc                                         |
+ | plugins/markasjunk/localization/<lang>.inc                            |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Mark-As-Junk plugin        |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU 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-markasjunk/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $labels['buttontext'] = 'Rubaĵo';
 $labels['buttontitle'] = 'Marki kiel rubaĵo';
 $labels['reportedasjunk'] = 'Sukcese raportita kiel rubaĵo';
 
+?>
\ No newline at end of file
diff --git a/plugins/markasjunk/localization/es_AR.inc b/plugins/markasjunk/localization/es_AR.inc
index fd24564e9..58e1f25b4 100644
--- a/plugins/markasjunk/localization/es_AR.inc
+++ b/plugins/markasjunk/localization/es_AR.inc
@@ -2,19 +2,23 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/es_AR/labels.inc                                         |
+ | plugins/markasjunk/localization/<lang>.inc                            |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Mark-As-Junk plugin        |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU 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-markasjunk/
 */
 
 $labels = array();
+$labels['buttontext'] = 'Correo no deseado';
 $labels['buttontitle'] = 'Marcar como SPAM';
 $labels['reportedasjunk'] = 'Mensaje reportado como SPAM';
 
+?>
\ No newline at end of file
diff --git a/plugins/markasjunk/localization/es_ES.inc b/plugins/markasjunk/localization/es_ES.inc
index d018513ce..5bb75548b 100644
--- a/plugins/markasjunk/localization/es_ES.inc
+++ b/plugins/markasjunk/localization/es_ES.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/es_ES/labels.inc                                         |
+ | plugins/markasjunk/localization/<lang>.inc                            |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Mark-As-Junk plugin        |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU 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-markasjunk/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $labels['buttontext'] = 'SPAM';
 $labels['buttontitle'] = 'Marcar como SPAM';
 $labels['reportedasjunk'] = 'Mensaje informado como SPAM';
 
+?>
\ No newline at end of file
diff --git a/plugins/markasjunk/localization/et_EE.inc b/plugins/markasjunk/localization/et_EE.inc
index d9b28918d..2d90a4a8c 100644
--- a/plugins/markasjunk/localization/et_EE.inc
+++ b/plugins/markasjunk/localization/et_EE.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/et_EE/labels.inc                                         |
+ | plugins/markasjunk/localization/<lang>.inc                            |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Mark-As-Junk plugin        |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU 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-markasjunk/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $labels['buttontext'] = 'Rämps';
 $labels['buttontitle'] = 'Märgista Rämpsuks';
 $labels['reportedasjunk'] = 'Edukalt Rämpsuks märgitud';
 
+?>
\ No newline at end of file
diff --git a/plugins/markasjunk/localization/fa_IR.inc b/plugins/markasjunk/localization/fa_IR.inc
index 72511e0f9..2dc051890 100644
--- a/plugins/markasjunk/localization/fa_IR.inc
+++ b/plugins/markasjunk/localization/fa_IR.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/fa_IR/labels.inc                                         |
+ | plugins/markasjunk/localization/<lang>.inc                            |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Mark-As-Junk plugin        |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU 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-markasjunk/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $labels['buttontext'] = 'بنجل';
 $labels['buttontitle'] = 'علامت گذاری به عنوان بنجل';
 $labels['reportedasjunk'] = 'با مو�قیت به عنوان بنجل گزارش شد';
 
+?>
\ No newline at end of file
diff --git a/plugins/markasjunk/localization/fi_FI.inc b/plugins/markasjunk/localization/fi_FI.inc
index 622b33915..4af075f33 100644
--- a/plugins/markasjunk/localization/fi_FI.inc
+++ b/plugins/markasjunk/localization/fi_FI.inc
@@ -2,19 +2,23 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/fi_FI/labels.inc                                         |
+ | plugins/markasjunk/localization/<lang>.inc                            |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Mark-As-Junk plugin        |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU 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-markasjunk/
 */
 
 $labels = array();
 $labels['buttontext'] = 'Roskaposti';
 $labels['buttontitle'] = 'Merkitse roskapostiksi';
-$labels['reportedasjunk'] = 'Ilmoitettu onnistuneesti roskapostista';
+$labels['reportedasjunk'] = 'Roskapostista on ilmoitettu onnistuneesti';
 
+?>
\ No newline at end of file
diff --git a/plugins/markasjunk/localization/fr_FR.inc b/plugins/markasjunk/localization/fr_FR.inc
index e310c541a..ff96e6a1e 100644
--- a/plugins/markasjunk/localization/fr_FR.inc
+++ b/plugins/markasjunk/localization/fr_FR.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/fr_FR/labels.inc                                         |
+ | plugins/markasjunk/localization/<lang>.inc                            |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Mark-As-Junk plugin        |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU 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-markasjunk/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $labels['buttontext'] = 'Indésirables';
 $labels['buttontitle'] = 'Marquer comme indésirable';
 $labels['reportedasjunk'] = 'Notification de message indésirable envoyée';
 
+?>
\ No newline at end of file
diff --git a/plugins/markasjunk/localization/gl_ES.inc b/plugins/markasjunk/localization/gl_ES.inc
index ce70e78e8..dd0c0ad40 100644
--- a/plugins/markasjunk/localization/gl_ES.inc
+++ b/plugins/markasjunk/localization/gl_ES.inc
@@ -2,19 +2,23 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/gl_ES/labels.inc                                         |
+ | plugins/markasjunk/localization/<lang>.inc                            |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Mark-As-Junk plugin        |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU 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-markasjunk/
 */
 
 $labels = array();
+$labels['buttontext'] = 'Junk';
 $labels['buttontitle'] = 'Marcar como correo lixo';
 $labels['reportedasjunk'] = 'Mensaxe marcada como correo lixo';
 
+?>
\ No newline at end of file
diff --git a/plugins/markasjunk/localization/he_IL.inc b/plugins/markasjunk/localization/he_IL.inc
index 0dbc31520..bb2cc266b 100644
--- a/plugins/markasjunk/localization/he_IL.inc
+++ b/plugins/markasjunk/localization/he_IL.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/he_IL/labels.inc                                         |
+ | plugins/markasjunk/localization/<lang>.inc                            |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Mark-As-Junk plugin        |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU 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-markasjunk/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $labels['buttontext'] = 'זבל';
 $labels['buttontitle'] = 'סמן כדו�ר זבל';
 $labels['reportedasjunk'] = 'דו�ר הזבל דווח בהצלחה';
 
+?>
\ No newline at end of file
diff --git a/plugins/markasjunk/localization/hr_HR.inc b/plugins/markasjunk/localization/hr_HR.inc
index 8e0a6b27f..b1da8b128 100644
--- a/plugins/markasjunk/localization/hr_HR.inc
+++ b/plugins/markasjunk/localization/hr_HR.inc
@@ -2,19 +2,23 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/hr_HR/labels.inc                                         |
+ | plugins/markasjunk/localization/<lang>.inc                            |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Mark-As-Junk plugin        |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU 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-markasjunk/
 */
 
 $labels = array();
+$labels['buttontext'] = 'Junk';
 $labels['buttontitle'] = 'Ozna�i kao smeće (spam)';
 $labels['reportedasjunk'] = 'Uspješno prijavljeno kao smeće (spam)';
 
+?>
\ No newline at end of file
diff --git a/plugins/markasjunk/localization/hu_HU.inc b/plugins/markasjunk/localization/hu_HU.inc
index a96f88f7a..b5529f024 100644
--- a/plugins/markasjunk/localization/hu_HU.inc
+++ b/plugins/markasjunk/localization/hu_HU.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/hu_HU/labels.inc                                         |
+ | plugins/markasjunk/localization/<lang>.inc                            |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Mark-As-Junk plugin        |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Németh András <narzym@hotmail.com>                          |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-markasjunk/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $labels['buttontext'] = 'Levélszemét';
 $labels['buttontitle'] = 'Szemétnek jelölés';
 $labels['reportedasjunk'] = 'Sikeresen szemétnek jelentve';
 
+?>
\ No newline at end of file
diff --git a/plugins/markasjunk/localization/hy_AM.inc b/plugins/markasjunk/localization/hy_AM.inc
index b30707ef0..f614b5814 100644
--- a/plugins/markasjunk/localization/hy_AM.inc
+++ b/plugins/markasjunk/localization/hy_AM.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/hy_AM/labels.inc                                         |
+ | plugins/markasjunk/localization/<lang>.inc                            |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Mark-As-Junk plugin        |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU 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-markasjunk/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $labels['buttontext'] = 'Ô¹Õ¡ÖƒÕ¸Õ¶';
 $labels['buttontitle'] = 'Õ†Õ·Õ¥Õ¬ Õ¸Ö€ÕºÕ¥Õ½ Ô¹Õ¡ÖƒÕ¸Õ¶';
 $labels['reportedasjunk'] = 'Ô²Õ¡Ö€Õ¥Õ°Õ¡Õ»Õ¸Õ² Õ°Õ¡Õ²Õ¸Ö€Õ¤Õ¾Õ¥Ö� Õ¸Ö€ÕºÕ¥Õ½ Ô¹Õ¡ÖƒÕ¸Õ¶';
 
+?>
\ No newline at end of file
diff --git a/plugins/markasjunk/localization/id_ID.inc b/plugins/markasjunk/localization/id_ID.inc
index 4389c3354..b5cf0e9de 100644
--- a/plugins/markasjunk/localization/id_ID.inc
+++ b/plugins/markasjunk/localization/id_ID.inc
@@ -2,19 +2,23 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/id_ID/labels.inc                                         |
+ | plugins/markasjunk/localization/<lang>.inc                            |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Mark-As-Junk plugin        |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU 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-markasjunk/
 */
 
 $labels = array();
+$labels['buttontext'] = 'Sampah';
 $labels['buttontitle'] = 'Tandai sebagai sampah';
 $labels['reportedasjunk'] = 'Berhasil dilaporkan sebagai sampah';
 
+?>
\ No newline at end of file
diff --git a/plugins/markasjunk/localization/it_IT.inc b/plugins/markasjunk/localization/it_IT.inc
index 3c26a10d0..8ffa1eb23 100644
--- a/plugins/markasjunk/localization/it_IT.inc
+++ b/plugins/markasjunk/localization/it_IT.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/it_IT/labels.inc                                         |
+ | plugins/markasjunk/localization/<lang>.inc                            |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Mark-As-Junk plugin        |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU 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-markasjunk/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $labels['buttontext'] = 'Spam';
 $labels['buttontitle'] = 'Marca come Spam';
 $labels['reportedasjunk'] = 'Messaggio marcato come Spam';
 
+?>
\ No newline at end of file
diff --git a/plugins/markasjunk/localization/ja_JP.inc b/plugins/markasjunk/localization/ja_JP.inc
index fa17bd095..52811505e 100644
--- a/plugins/markasjunk/localization/ja_JP.inc
+++ b/plugins/markasjunk/localization/ja_JP.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ja_JP/labels.inc                                         |
+ | plugins/markasjunk/localization/<lang>.inc                            |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Mark-As-Junk plugin        |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU 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-markasjunk/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $labels['buttontext'] = '迷惑メール';
 $labels['buttontitle'] = '迷惑メール���設定';
 $labels['reportedasjunk'] = '迷惑メール���報告����。';
 
+?>
\ No newline at end of file
diff --git a/plugins/markasjunk/localization/km_KH.inc b/plugins/markasjunk/localization/km_KH.inc
index 43b54cd9d..655af9cb8 100644
--- a/plugins/markasjunk/localization/km_KH.inc
+++ b/plugins/markasjunk/localization/km_KH.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/km_KH/labels.inc                                         |
+ | plugins/markasjunk/localization/<lang>.inc                            |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Mark-As-Junk plugin        |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU 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-markasjunk/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $labels['buttontext'] = 'សំបុ�្រមិនល្អ';
 $labels['buttontitle'] = 'ចា�់ជា សំបុ�្រមិនល្អ';
 $labels['reportedasjunk'] = 'រាយការណ��ាជា សំបុ�្រមិនល្អ បានសំរ�ច';
 
+?>
\ No newline at end of file
diff --git a/plugins/markasjunk/localization/ko_KR.inc b/plugins/markasjunk/localization/ko_KR.inc
index bfc38d1d5..dd2d1e798 100644
--- a/plugins/markasjunk/localization/ko_KR.inc
+++ b/plugins/markasjunk/localization/ko_KR.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ko_KR/labels.inc                                         |
+ | plugins/markasjunk/localization/<lang>.inc                            |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Mark-As-Junk plugin        |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU 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-markasjunk/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $labels['buttontext'] = '정�메�';
 $labels['buttontitle'] = '정�메�로 표시';
 $labels['reportedasjunk'] = '성공�으로, 정�메��� 보고 �';
 
+?>
\ No newline at end of file
diff --git a/plugins/markasjunk/localization/ku.inc b/plugins/markasjunk/localization/ku.inc
index beb7623c1..da3dda775 100644
--- a/plugins/markasjunk/localization/ku.inc
+++ b/plugins/markasjunk/localization/ku.inc
@@ -2,19 +2,23 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ku/labels.inc                                         |
+ | plugins/markasjunk/localization/<lang>.inc                            |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Mark-As-Junk plugin        |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU 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-markasjunk/
 */
 
 $labels = array();
+$labels['buttontext'] = 'Junk';
 $labels['buttontitle'] = 'nawniÅŸani bka ba ÅŸkaw';
 $labels['reportedasjunk'] = 'ba gÅŸti raport kra';
 
+?>
\ No newline at end of file
diff --git a/plugins/markasjunk/localization/lt_LT.inc b/plugins/markasjunk/localization/lt_LT.inc
index bd2e0e7c8..b1973dee0 100644
--- a/plugins/markasjunk/localization/lt_LT.inc
+++ b/plugins/markasjunk/localization/lt_LT.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/lt_LT/labels.inc                                         |
+ | plugins/markasjunk/localization/<lang>.inc                            |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Mark-As-Junk plugin        |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU 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-markasjunk/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $labels['buttontext'] = 'Brukalas';
 $labels['buttontitle'] = 'Žymėti kaip brukalą';
 $labels['reportedasjunk'] = 'Sėkmingai pranešta, jog laiškas yra brukalas';
 
+?>
\ No newline at end of file
diff --git a/plugins/markasjunk/localization/lv_LV.inc b/plugins/markasjunk/localization/lv_LV.inc
index 121b48583..f0ea921ba 100644
--- a/plugins/markasjunk/localization/lv_LV.inc
+++ b/plugins/markasjunk/localization/lv_LV.inc
@@ -2,19 +2,23 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/lv_LV/labels.inc                                         |
+ | plugins/markasjunk/localization/<lang>.inc                            |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Mark-As-Junk plugin        |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU 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-markasjunk/
 */
 
 $labels = array();
+$labels['buttontext'] = 'Junk';
 $labels['buttontitle'] = 'Iezīmēt k� mēstuli';
 $labels['reportedasjunk'] = 'Sekmīgi iezīmēta k� mēstule';
 
+?>
\ No newline at end of file
diff --git a/plugins/markasjunk/localization/ml_IN.inc b/plugins/markasjunk/localization/ml_IN.inc
index 780a53d7b..faeea49ed 100644
--- a/plugins/markasjunk/localization/ml_IN.inc
+++ b/plugins/markasjunk/localization/ml_IN.inc
@@ -2,18 +2,23 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ml_IN/labels.inc                                         |
+ | plugins/markasjunk/localization/<lang>.inc                            |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Mark-As-Junk plugin        |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU 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-markasjunk/
 */
 
 $labels = array();
+$labels['buttontext'] = 'Junk';
 $labels['buttontitle'] = 'സ�പാം ആയി അടയാളപ�പെട�ത�ത�ക';
 $labels['reportedasjunk'] = 'സ�പാം ആയി അടയാളപ�പെട�ത�തി';
 
+?>
\ No newline at end of file
diff --git a/plugins/markasjunk/localization/mr_IN.inc b/plugins/markasjunk/localization/mr_IN.inc
index 07e62f992..e5d4e89d3 100644
--- a/plugins/markasjunk/localization/mr_IN.inc
+++ b/plugins/markasjunk/localization/mr_IN.inc
@@ -2,19 +2,23 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/mr_IN/labels.inc                                         |
+ | plugins/markasjunk/localization/<lang>.inc                            |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Mark-As-Junk plugin        |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU 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-markasjunk/
 */
 
 $labels = array();
+$labels['buttontext'] = 'Junk';
 $labels['buttontitle'] = 'नको असलेला अशी खूण करा';
 $labels['reportedasjunk'] = 'नको आहे असे यशस�वीरीत�या नक�की केले';
 
+?>
\ No newline at end of file
diff --git a/plugins/markasjunk/localization/nb_NB.inc b/plugins/markasjunk/localization/nb_NB.inc
deleted file mode 100644
index 7dce36cb8..000000000
--- a/plugins/markasjunk/localization/nb_NB.inc
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-/*
- +-----------------------------------------------------------------------+
- | localization/nb_NB/labels.inc                                         |
- |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
- |                                                                       |
- +-----------------------------------------------------------------------+
- | Author: Patrick Kvaksrud <patrick@idrettsforbundet.no>                |
- +-----------------------------------------------------------------------+
-*/
-
-$labels = array();
-$labels['buttontext'] = 'Useriøs e-post';
-$labels['buttontitle'] = 'Marker som useriøs e-post';
-$labels['reportedasjunk'] = 'Rapportering av useriøs e-post var vellykket';
-
diff --git a/plugins/markasjunk/localization/nb_NO.inc b/plugins/markasjunk/localization/nb_NO.inc
new file mode 100644
index 000000000..1c8058b23
--- /dev/null
+++ b/plugins/markasjunk/localization/nb_NO.inc
@@ -0,0 +1,24 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/markasjunk/localization/<lang>.inc                            |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail Mark-As-Junk plugin        |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the 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-markasjunk/
+*/
+
+$labels = array();
+$labels['buttontext'] = 'Useriøs e-post';
+$labels['buttontitle'] = 'Marker som useriøs e-post';
+$labels['reportedasjunk'] = 'Rapportering av useriøs e-post var vellykket';
+
+?>
\ No newline at end of file
diff --git a/plugins/markasjunk/localization/nl_NL.inc b/plugins/markasjunk/localization/nl_NL.inc
index 1f82298ef..235ad8e0f 100644
--- a/plugins/markasjunk/localization/nl_NL.inc
+++ b/plugins/markasjunk/localization/nl_NL.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/nl_NL/labels.inc                                         |
+ | plugins/markasjunk/localization/<lang>.inc                            |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Mark-As-Junk plugin        |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU 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-markasjunk/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $labels['buttontext'] = 'Spam';
 $labels['buttontitle'] = 'Markeer als spam';
 $labels['reportedasjunk'] = 'Succesvol gemarkeerd als spam';
 
+?>
\ No newline at end of file
diff --git a/plugins/markasjunk/localization/nn_NO.inc b/plugins/markasjunk/localization/nn_NO.inc
new file mode 100644
index 000000000..977f4bd01
--- /dev/null
+++ b/plugins/markasjunk/localization/nn_NO.inc
@@ -0,0 +1,24 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/markasjunk/localization/<lang>.inc                            |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail Mark-As-Junk plugin        |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the 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-markasjunk/
+*/
+
+$labels = array();
+$labels['buttontext'] = 'Useriøs e-post';
+$labels['buttontitle'] = 'Marker som useriøs e-post';
+$labels['reportedasjunk'] = 'Rapportering av useriøs e-post var vellykka';
+
+?>
\ No newline at end of file
diff --git a/plugins/markasjunk/localization/pl_PL.inc b/plugins/markasjunk/localization/pl_PL.inc
index cd3520ec7..3078967cc 100644
--- a/plugins/markasjunk/localization/pl_PL.inc
+++ b/plugins/markasjunk/localization/pl_PL.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/pl_PL/labels.inc                                         |
+ | plugins/markasjunk/localization/<lang>.inc                            |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Mark-As-Junk plugin        |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU 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-markasjunk/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $labels['buttontext'] = 'Spam';
 $labels['buttontitle'] = 'Oznacz jako SPAM';
 $labels['reportedasjunk'] = 'Pomyślnie oznaczono jako SPAM';
 
+?>
\ No newline at end of file
diff --git a/plugins/markasjunk/localization/pt_BR.inc b/plugins/markasjunk/localization/pt_BR.inc
index b93bfc20a..578d1de1c 100644
--- a/plugins/markasjunk/localization/pt_BR.inc
+++ b/plugins/markasjunk/localization/pt_BR.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/pt_BR/labels.inc                                         |
+ | plugins/markasjunk/localization/<lang>.inc                            |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Mark-As-Junk plugin        |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU 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-markasjunk/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $labels['buttontext'] = 'Spam';
 $labels['buttontitle'] = 'Marcar como Spam';
 $labels['reportedasjunk'] = 'Marcado como Spam com sucesso';
 
+?>
\ No newline at end of file
diff --git a/plugins/markasjunk/localization/pt_PT.inc b/plugins/markasjunk/localization/pt_PT.inc
index 45c9202f8..20cb00356 100644
--- a/plugins/markasjunk/localization/pt_PT.inc
+++ b/plugins/markasjunk/localization/pt_PT.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/pt_PT/labels.inc                                         |
+ | plugins/markasjunk/localization/<lang>.inc                            |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Mark-As-Junk plugin        |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU 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-markasjunk/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $labels['buttontext'] = 'Lixo';
 $labels['buttontitle'] = 'Marcar como Lixo';
 $labels['reportedasjunk'] = 'Reportado como Lixo com sucesso';
 
+?>
\ No newline at end of file
diff --git a/plugins/markasjunk/localization/ro_RO.inc b/plugins/markasjunk/localization/ro_RO.inc
index 0fac4fd07..03e5824c2 100644
--- a/plugins/markasjunk/localization/ro_RO.inc
+++ b/plugins/markasjunk/localization/ro_RO.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ro_RO/labels.inc                                         |
+ | plugins/markasjunk/localization/<lang>.inc                            |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Mark-As-Junk plugin        |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU 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-markasjunk/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $labels['buttontext'] = 'Vechituri';
 $labels['buttontitle'] = 'Marchează ca SPAM';
 $labels['reportedasjunk'] = 'Raportat cu succes ca SPAM';
 
+?>
\ No newline at end of file
diff --git a/plugins/markasjunk/localization/ru_RU.inc b/plugins/markasjunk/localization/ru_RU.inc
index acac7e180..cbf99d253 100644
--- a/plugins/markasjunk/localization/ru_RU.inc
+++ b/plugins/markasjunk/localization/ru_RU.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/ru_RU/labels.inc                                         |
+ | plugins/markasjunk/localization/<lang>.inc                            |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Mark-As-Junk plugin        |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU 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-markasjunk/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $labels['buttontext'] = 'СП�М';
 $labels['buttontitle'] = 'Переме�тить в "СП�М';
 $labels['reportedasjunk'] = 'Перемещено в "СП�М';
 
+?>
\ No newline at end of file
diff --git a/plugins/markasjunk/localization/si_LK.inc b/plugins/markasjunk/localization/si_LK.inc
index 81c33cf88..2a60675af 100644
--- a/plugins/markasjunk/localization/si_LK.inc
+++ b/plugins/markasjunk/localization/si_LK.inc
@@ -2,19 +2,23 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/si_LK/labels.inc                                         |
+ | plugins/markasjunk/localization/<lang>.inc                            |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Mark-As-Junk plugin        |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU 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-markasjunk/
 */
 
 $labels = array();
+$labels['buttontext'] = 'Junk';
 $labels['buttontitle'] = 'සුන්බුන් ලෙස සලකුණු කරන්න';
 $labels['reportedasjunk'] = 'සුන්බුන් ලෙස ව�ර්ත� කිරීම ස�ර්ථකයි';
 
+?>
\ No newline at end of file
diff --git a/plugins/markasjunk/localization/sk_SK.inc b/plugins/markasjunk/localization/sk_SK.inc
index ee208347d..51b45b835 100644
--- a/plugins/markasjunk/localization/sk_SK.inc
+++ b/plugins/markasjunk/localization/sk_SK.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/sk_SK/labels.inc                                         |
+ | plugins/markasjunk/localization/<lang>.inc                            |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Mark-As-Junk plugin        |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU 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-markasjunk/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $labels['buttontext'] = 'Spam';
 $labels['buttontitle'] = 'Ozna�iť ako Spam';
 $labels['reportedasjunk'] = 'Úspešne nahlásené ako Spam';
 
+?>
\ No newline at end of file
diff --git a/plugins/markasjunk/localization/sl_SI.inc b/plugins/markasjunk/localization/sl_SI.inc
index ab7832430..c9f585143 100644
--- a/plugins/markasjunk/localization/sl_SI.inc
+++ b/plugins/markasjunk/localization/sl_SI.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/sl_SI/labels.inc                                         |
+ | plugins/markasjunk/localization/<lang>.inc                            |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Mark-As-Junk plugin        |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU 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-markasjunk/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $labels['buttontext'] = 'Nezaželena sporo�ila';
 $labels['buttontitle'] = 'Ozna�i kot spam';
 $labels['reportedasjunk'] = 'Uspešno ozna�eno kot spam';
 
+?>
\ No newline at end of file
diff --git a/plugins/markasjunk/localization/sr_CS.inc b/plugins/markasjunk/localization/sr_CS.inc
index aa26dddc7..d1d67c3d7 100644
--- a/plugins/markasjunk/localization/sr_CS.inc
+++ b/plugins/markasjunk/localization/sr_CS.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/sr_CS/labels.inc                                         |
+ | plugins/markasjunk/localization/<lang>.inc                            |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Mark-As-Junk plugin        |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU 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-markasjunk/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $labels['buttontext'] = 'Смеће';
 $labels['buttontitle'] = 'Означи као cмеће';
 $labels['reportedasjunk'] = 'У�пешно пријављени као cмеће';
 
+?>
\ No newline at end of file
diff --git a/plugins/markasjunk/localization/sv_SE.inc b/plugins/markasjunk/localization/sv_SE.inc
index 4ff14bec9..5b8ddf559 100644
--- a/plugins/markasjunk/localization/sv_SE.inc
+++ b/plugins/markasjunk/localization/sv_SE.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/sv_SE/labels.inc                                         |
+ | plugins/markasjunk/localization/<lang>.inc                            |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Mark-As-Junk plugin        |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU 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-markasjunk/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $labels['buttontext'] = 'Skräp';
 $labels['buttontitle'] = 'Märk som skräp';
 $labels['reportedasjunk'] = 'Framgångsrikt rapporterat som skräp';
 
+?>
\ No newline at end of file
diff --git a/plugins/markasjunk/localization/tr_TR.inc b/plugins/markasjunk/localization/tr_TR.inc
index 42a0de236..2b07e4dbc 100644
--- a/plugins/markasjunk/localization/tr_TR.inc
+++ b/plugins/markasjunk/localization/tr_TR.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/tr_TR/labels.inc                                         |
+ | plugins/markasjunk/localization/<lang>.inc                            |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Mark-As-Junk plugin        |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU 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-markasjunk/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $labels['buttontext'] = 'Ä°stenmeyen';
 $labels['buttontitle'] = 'Çöp olarak işaretle';
 $labels['reportedasjunk'] = 'Spam olarak rapor edildi';
 
+?>
\ No newline at end of file
diff --git a/plugins/markasjunk/localization/uk_UA.inc b/plugins/markasjunk/localization/uk_UA.inc
index 1e77f2a9c..17e90447c 100644
--- a/plugins/markasjunk/localization/uk_UA.inc
+++ b/plugins/markasjunk/localization/uk_UA.inc
@@ -2,19 +2,23 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/uk_UA/labels.inc                                         |
+ | plugins/markasjunk/localization/<lang>.inc                            |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Mark-As-Junk plugin        |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU 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-markasjunk/
 */
 
 $labels = array();
+$labels['buttontext'] = 'Junk';
 $labels['buttontitle'] = 'Перемі�тити в "Спам';
 $labels['reportedasjunk'] = 'Переміщено до "Спаму';
 
+?>
\ No newline at end of file
diff --git a/plugins/markasjunk/localization/vi_VN.inc b/plugins/markasjunk/localization/vi_VN.inc
index 3d00d923b..5a97db7bc 100644
--- a/plugins/markasjunk/localization/vi_VN.inc
+++ b/plugins/markasjunk/localization/vi_VN.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/vi_VN/labels.inc                                         |
+ | plugins/markasjunk/localization/<lang>.inc                            |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Mark-As-Junk plugin        |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU 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-markasjunk/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $labels['buttontext'] = 'Thư rác';
 $labels['buttontitle'] = '�ánh dấu để được xem là thư rác';
 $labels['reportedasjunk'] = '�ánh dấu để được xem là thư rác thành công';
 
+?>
\ No newline at end of file
diff --git a/plugins/markasjunk/localization/zh_CN.inc b/plugins/markasjunk/localization/zh_CN.inc
index c5d50362b..118e3a956 100644
--- a/plugins/markasjunk/localization/zh_CN.inc
+++ b/plugins/markasjunk/localization/zh_CN.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/zh_CN/labels.inc                                         |
+ | plugins/markasjunk/localization/<lang>.inc                            |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Mark-As-Junk plugin        |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU 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-markasjunk/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $labels['buttontext'] = '垃圾邮件';
 $labels['buttontitle'] = '标记为垃圾邮件';
 $labels['reportedasjunk'] = '�功报告该邮件为垃圾邮件';
 
+?>
\ No newline at end of file
diff --git a/plugins/markasjunk/localization/zh_TW.inc b/plugins/markasjunk/localization/zh_TW.inc
index 372d8d6c5..3deb85caa 100644
--- a/plugins/markasjunk/localization/zh_TW.inc
+++ b/plugins/markasjunk/localization/zh_TW.inc
@@ -2,15 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/zh_TW/labels.inc                                         |
+ | plugins/markasjunk/localization/<lang>.inc                            |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
+ | Localization file of the Roundcube Webmail Mark-As-Junk plugin        |
+ | Copyright (C) 2012-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU 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-markasjunk/
 */
 
 $labels = array();
@@ -18,3 +21,4 @@ $labels['buttontext'] = '垃圾郵件';
 $labels['buttontitle'] = '標示為垃圾信';
 $labels['reportedasjunk'] = '�功回報垃圾信';
 
+?>
\ No newline at end of file
diff --git a/plugins/markasjunk/markasjunk.php b/plugins/markasjunk/markasjunk.php
index 4db90c1bc..76b14c140 100644
--- a/plugins/markasjunk/markasjunk.php
+++ b/plugins/markasjunk/markasjunk.php
@@ -45,8 +45,8 @@ class markasjunk extends rcube_plugin
     $GLOBALS['IMAP_FLAGS']['JUNK'] = 'Junk';
     $GLOBALS['IMAP_FLAGS']['NONJUNK'] = 'NonJunk';
     
-    $uids = get_input_value('_uid', RCUBE_INPUT_POST);
-    $mbox = get_input_value('_mbox', RCUBE_INPUT_POST);
+    $uids = rcube_utils::get_input_value('_uid', rcube_utils::INPUT_POST);
+    $mbox = rcube_utils::get_input_value('_mbox', rcube_utils::INPUT_POST);
     
     $rcmail = rcmail::get_instance();
     $rcmail->storage->unset_flag($uids, 'NONJUNK');
diff --git a/plugins/markasjunk/tests/Markasjunk.php b/plugins/markasjunk/tests/Markasjunk.php
new file mode 100644
index 000000000..cdf13255e
--- /dev/null
+++ b/plugins/markasjunk/tests/Markasjunk.php
@@ -0,0 +1,23 @@
+<?php
+
+class Markasjunk_Plugin extends PHPUnit_Framework_TestCase
+{
+
+    function setUp()
+    {
+        include_once dirname(__FILE__) . '/../markasjunk.php';
+    }
+
+    /**
+     * Plugin object construction test
+     */
+    function test_constructor()
+    {
+        $rcube  = rcube::get_instance();
+        $plugin = new markasjunk($rcube->api);
+
+        $this->assertInstanceOf('markasjunk', $plugin);
+        $this->assertInstanceOf('rcube_plugin', $plugin);
+    }
+}
+
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 36500ce0c..23a897d47 100644
--- a/plugins/new_user_dialog/localization/de_CH.inc
+++ b/plugins/new_user_dialog/localization/de_CH.inc
@@ -2,19 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/de_CH/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/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 d9f531ba7..d508cfc9c 100644
--- a/plugins/new_user_dialog/localization/en_US.inc
+++ b/plugins/new_user_dialog/localization/en_US.inc
@@ -1,5 +1,21 @@
 <?php
 
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/new_user_dialog/localization/<lang>.inc                       |
+ |                                                                       |
+ | 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.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ 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.';
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..82240f37d 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'] = '� 박스는 최초로 로그�할 때만 나타납니다.';
 
+?>
\ 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_NB.inc b/plugins/new_user_dialog/localization/nb_NB.inc
deleted file mode 100644
index f4594378c..000000000
--- a/plugins/new_user_dialog/localization/nb_NB.inc
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-/*
- +-----------------------------------------------------------------------+
- | localization/nb_NB/labels.inc                                         |
- |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
- |                                                                       |
- +-----------------------------------------------------------------------+
- | Author: Peter Grindem <peter@grindem.no>                              |
- +-----------------------------------------------------------------------+
-*/
-
-$labels = array();
-$labels['identitydialogtitle'] = 'Vennligst fullfør din avvsender identitet.';
-$labels['identitydialoghint'] = 'Denne boksen kommer kun ved første pålogging.';
-
diff --git a/plugins/new_user_dialog/localization/nb_NO.inc b/plugins/new_user_dialog/localization/nb_NO.inc
new file mode 100644
index 000000000..18ddd9ce7
--- /dev/null
+++ b/plugins/new_user_dialog/localization/nb_NO.inc
@@ -0,0 +1,23 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/new_user_dialog/localization/<lang>.inc                       |
+ |                                                                       |
+ | 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.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ 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..4d5d41185 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.';
 
+?>
\ 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
new file mode 100644
index 000000000..a7fd7d650
--- /dev/null
+++ b/plugins/new_user_dialog/localization/nn_NO.inc
@@ -0,0 +1,23 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/new_user_dialog/localization/<lang>.inc                       |
+ |                                                                       |
+ | 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.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ 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 60040b1d6..71ecfc7fe 100644
--- a/plugins/new_user_dialog/localization/sv_SE.inc
+++ b/plugins/new_user_dialog/localization/sv_SE.inc
@@ -2,19 +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: Thomas <Unknown>                                              |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-new_user_dialog/
 */
 
 $labels = array();
-$labels['identitydialogtitle'] = 'Vänligen fyll i namn och avsändaradress under personliga inställningar';
+$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..99b2de701 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['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 9c9dcce1c..871384e47 100644
--- a/plugins/new_user_dialog/new_user_dialog.php
+++ b/plugins/new_user_dialog/new_user_dialog.php
@@ -63,7 +63,7 @@ class new_user_dialog extends rcube_plugin
       $table->add(null, html::tag('input', array(
         'type' => 'text',
         'name' => '_email',
-        'value' => rcube_idn_to_utf8($identity['email']),
+        'value' => rcube_utils::idn_to_utf8($identity['email']),
         'disabled' => ($identities_level == 1 || $identities_level == 3)
       )));
 
@@ -86,8 +86,8 @@ class new_user_dialog extends rcube_plugin
             'id' => 'newuserdialog',
             'action' => $rcmail->url('plugin.newusersave'),
             'method' => 'post'),
-          html::tag('h3', null, Q($this->gettext('identitydialogtitle'))) .
-          html::p('hint', Q($this->gettext('identitydialoghint'))) .
+          html::tag('h3', null, rcube::Q($this->gettext('identitydialogtitle'))) .
+          html::p('hint', rcube::Q($this->gettext('identitydialoghint'))) .
           $table->show() .
           html::p(array('class' => 'formbuttons'),
             html::tag('input', array('type' => 'submit',
@@ -119,17 +119,17 @@ class new_user_dialog extends rcube_plugin
     $identities_level = intval($rcmail->config->get('identities_level', 0));
 
     $save_data = array(
-      'name' => get_input_value('_name', RCUBE_INPUT_POST),
-      'email' => get_input_value('_email', RCUBE_INPUT_POST),
-      'organization' => get_input_value('_organization', RCUBE_INPUT_POST),
-      'signature' => get_input_value('_signature', RCUBE_INPUT_POST),
+      'name'         => rcube_utils::get_input_value('_name', rcube_utils::INPUT_POST),
+      'email'        => rcube_utils::get_input_value('_email', rcube_utils::INPUT_POST),
+      'organization' => rcube_utils::get_input_value('_organization', rcube_utils::INPUT_POST),
+      'signature'    => rcube_utils::get_input_value('_signature', rcube_utils::INPUT_POST),
     );
 
     // don't let the user alter the e-mail address if disabled by config
     if ($identities_level == 1 || $identities_level == 3)
       $save_data['email'] = $identity['email'];
     else
-      $save_data['email'] = rcube_idn_to_ascii($save_data['email']);
+      $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'])) {
diff --git a/plugins/new_user_dialog/tests/NewUserDialog.php b/plugins/new_user_dialog/tests/NewUserDialog.php
new file mode 100644
index 000000000..3a52f20f3
--- /dev/null
+++ b/plugins/new_user_dialog/tests/NewUserDialog.php
@@ -0,0 +1,23 @@
+<?php
+
+class NewUserDialog_Plugin extends PHPUnit_Framework_TestCase
+{
+
+    function setUp()
+    {
+        include_once dirname(__FILE__) . '/../new_user_dialog.php';
+    }
+
+    /**
+     * Plugin object construction test
+     */
+    function test_constructor()
+    {
+        $rcube  = rcube::get_instance();
+        $plugin = new new_user_dialog($rcube->api);
+
+        $this->assertInstanceOf('new_user_dialog', $plugin);
+        $this->assertInstanceOf('rcube_plugin', $plugin);
+    }
+}
+
diff --git a/plugins/new_user_identity/new_user_identity.php b/plugins/new_user_identity/new_user_identity.php
index 200d9accd..f98145b6c 100644
--- a/plugins/new_user_identity/new_user_identity.php
+++ b/plugins/new_user_identity/new_user_identity.php
@@ -43,7 +43,7 @@ class new_user_identity extends rcube_plugin
 
                 $args['user_name'] = $user_name;
                 if (!$args['user_email'] && strpos($user_email, '@')) {
-                    $args['user_email'] = rcube_idn_to_ascii($user_email);
+                    $args['user_email'] = rcube_utils::idn_to_ascii($user_email);
                 }
             }
         }
diff --git a/plugins/new_user_identity/tests/NewUserIdentity.php b/plugins/new_user_identity/tests/NewUserIdentity.php
new file mode 100644
index 000000000..c1d385853
--- /dev/null
+++ b/plugins/new_user_identity/tests/NewUserIdentity.php
@@ -0,0 +1,23 @@
+<?php
+
+class NewUserIdentity_Plugin extends PHPUnit_Framework_TestCase
+{
+
+    function setUp()
+    {
+        include_once dirname(__FILE__) . '/../new_user_identity.php';
+    }
+
+    /**
+     * Plugin object construction test
+     */
+    function test_constructor()
+    {
+        $rcube  = rcube::get_instance();
+        $plugin = new new_user_identity($rcube->api);
+
+        $this->assertInstanceOf('new_user_identity', $plugin);
+        $this->assertInstanceOf('rcube_plugin', $plugin);
+    }
+}
+
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
new file mode 100644
index 000000000..540876eb3
--- /dev/null
+++ b/plugins/newmail_notifier/localization/br.inc
@@ -0,0 +1,29 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/newmail_notifier/localization/<lang>.inc                      |
+ |                                                                       |
+ | 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.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-newmail_notifier/
+*/
+
+$labels['basic'] = 'Display browser notifications on new message';
+$labels['desktop'] = 'Display desktop notifications on new message';
+$labels['sound'] = '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 4ce6134d1..03a3957c9 100644
--- a/plugins/newmail_notifier/localization/de_CH.inc
+++ b/plugins/newmail_notifier/localization/de_CH.inc
@@ -2,19 +2,20 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/de_CH/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'] = 'Anzeige 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/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 3017c43dc..7c1c5cf3f 100644
--- a/plugins/newmail_notifier/localization/en_US.inc
+++ b/plugins/newmail_notifier/localization/en_US.inc
@@ -1,5 +1,21 @@
 <?php
 
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/newmail_notifier/localization/<lang>.inc                      |
+ |                                                                       |
+ | 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.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-newmail_notifier/
+*/
+
 $labels['basic'] = 'Display browser notifications on new message';
 $labels['desktop'] = 'Display desktop notifications on new message';
 $labels['sound'] = 'Play the sound on new message';
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..6c1129b31 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'] = 'Display browser notifications on new message';
+$labels['desktop'] = 'Display desktop notifications on new message';
+$labels['sound'] = 'Play the sound on new message';
 $labels['test'] = 'Proba';
 $labels['title'] = 'Novo Correo!';
+$labels['body'] = 'You\'ve received a new message.';
+$labels['testbody'] = 'This is a test notification.';
+$labels['desktopdisabled'] = 'Desktop notifications are disabled in your browser.';
 $labels['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/ia_IA.inc b/plugins/newmail_notifier/localization/ia_IA.inc
deleted file mode 100644
index b4cd8c814..000000000
--- a/plugins/newmail_notifier/localization/ia_IA.inc
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-/*
- +-----------------------------------------------------------------------+
- | localization/ia_IA/labels.inc                                         |
- |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
- |                                                                       |
- +-----------------------------------------------------------------------+
- | Author: Emilio Sepulveda <emilio@chilemoz.org>                        |
- +-----------------------------------------------------------------------+
- @version $Id$
-*/
-
-$labels = array();
-$labels['basic'] = 'Monstrar notificationes de navigator in cata nove message';
-$labels['test'] = 'Prova';
-$labels['title'] = 'Nove message!';
-$labels['testbody'] = 'Iste es un notification de prova.';
-
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_NB.inc b/plugins/newmail_notifier/localization/nb_NB.inc
deleted file mode 100644
index a1d0a037d..000000000
--- a/plugins/newmail_notifier/localization/nb_NB.inc
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-/*
- +-----------------------------------------------------------------------+
- | localization/nb_NB/labels.inc                                         |
- |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
- |                                                                       |
- +-----------------------------------------------------------------------+
- | Author: Einar Svensen <Unknown>                                       |
- +-----------------------------------------------------------------------+
- @version $Id$
-*/
-
-$labels = array();
-$labels['basic'] = 'Vis nettleser hendlese ved ny melding';
-$labels['desktop'] = 'Vis skirivebord hendlese ved ny melding';
-$labels['sound'] = 'Spill av lyd ved ny melding';
-$labels['test'] = 'Test';
-$labels['title'] = 'Ny e-post!';
-$labels['body'] = 'Du har mottatt en ny melding';
-$labels['testbody'] = 'Dette er en test hendlese';
-$labels['desktopdisabled'] = 'Skrivebord hendelse er deaktivert i din nettleser.';
-$labels['desktopunsupported'] = 'Din nettleser støtter ikke skrivebord\'s hendelser.';
-
diff --git a/plugins/newmail_notifier/localization/nb_NO.inc b/plugins/newmail_notifier/localization/nb_NO.inc
new file mode 100644
index 000000000..83adf6e86
--- /dev/null
+++ b/plugins/newmail_notifier/localization/nb_NO.inc
@@ -0,0 +1,29 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/newmail_notifier/localization/<lang>.inc                      |
+ |                                                                       |
+ | 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.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-newmail_notifier/
+*/
+
+$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';
+$labels['test'] = 'Test';
+$labels['title'] = 'Ny e-post!';
+$labels['body'] = 'Du har mottatt en ny melding';
+$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..e18a6ff2d 100644
--- a/plugins/newmail_notifier/localization/nl_NL.inc
+++ b/plugins/newmail_notifier/localization/nl_NL.inc
@@ -2,19 +2,20 @@
 
 /*
  +-----------------------------------------------------------------------+
- | 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';
@@ -25,3 +26,4 @@ $labels['testbody'] = 'Dit is een testmelding.';
 $labels['desktopdisabled'] = 'Desktopmeldingen zijn uitgeschakeld in uw browser.';
 $labels['desktopunsupported'] = 'Uw browser ondersteunt geen desktopmeldingen.';
 
+?>
diff --git a/plugins/newmail_notifier/localization/nn_NO.inc b/plugins/newmail_notifier/localization/nn_NO.inc
new file mode 100644
index 000000000..24ba91d18
--- /dev/null
+++ b/plugins/newmail_notifier/localization/nn_NO.inc
@@ -0,0 +1,29 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/newmail_notifier/localization/<lang>.inc                      |
+ |                                                                       |
+ | 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.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-newmail_notifier/
+*/
+
+$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';
+$labels['test'] = 'Test';
+$labels['title'] = 'Ny e-post!';
+$labels['body'] = 'Du har mottatt ei ny melding.';
+$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 818f9b60c..55e342a27 100644
--- a/plugins/newmail_notifier/localization/sr_CS.inc
+++ b/plugins/newmail_notifier/localization/sr_CS.inc
@@ -2,20 +2,28 @@
 
 /*
  +-----------------------------------------------------------------------+
- | 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: Saša Zejnilović <zejnils@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'] = 'Пу�ти звук по пријему поруке';
 $labels['test'] = 'И�пробај';
-$labels['title'] = '�ови маил!';
+$labels['title'] = '�ова порука!';
 $labels['body'] = 'Примили �те нову поруку.';
-$labels['testbody'] = 'Ово је те�т обавештење.';
+$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 942421166..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'));
+                }
+             }
         }
     }
 
@@ -93,7 +117,7 @@ class newmail_notifier extends rcube_plugin
                         $this->gettext('test'));
 
                 $args['blocks']['new_message']['options'][$key] = array(
-                    'title' => html::label($field_id, Q($this->gettext($type))),
+                    'title' => html::label($field_id, rcube::Q($this->gettext($type))),
                     'content' => $content
                 );
             }
@@ -120,7 +144,7 @@ class newmail_notifier extends rcube_plugin
         foreach (array('basic', 'desktop', 'sound') as $type) {
             $key = 'newmail_notifier_' . $type;
             if (!in_array($key, $dont_override)) {
-                $args['prefs'][$key] = get_input_value('_'.$key, RCUBE_INPUT_POST) ? true : false;
+                $args['prefs'][$key] = rcube_utils::get_input_value('_'.$key, rcube_utils::INPUT_POST) ? true : false;
             }
         }
 
@@ -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/newmail_notifier/tests/NewmailNotifier.php b/plugins/newmail_notifier/tests/NewmailNotifier.php
new file mode 100644
index 000000000..571912a61
--- /dev/null
+++ b/plugins/newmail_notifier/tests/NewmailNotifier.php
@@ -0,0 +1,23 @@
+<?php
+
+class NewmailNotifier_Plugin extends PHPUnit_Framework_TestCase
+{
+
+    function setUp()
+    {
+        include_once dirname(__FILE__) . '/../newmail_notifier.php';
+    }
+
+    /**
+     * Plugin object construction test
+     */
+    function test_constructor()
+    {
+        $rcube  = rcube::get_instance();
+        $plugin = new newmail_notifier($rcube->api);
+
+        $this->assertInstanceOf('newmail_notifier', $plugin);
+        $this->assertInstanceOf('rcube_plugin', $plugin);
+    }
+}
+
diff --git a/plugins/password/README b/plugins/password/README
index 25af8cbcd..2c57e0cf6 100644
--- a/plugins/password/README
+++ b/plugins/password/README
@@ -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..87758d84f 100644
--- a/plugins/password/config.inc.php.dist
+++ b/plugins/password/config.inc.php.dist
@@ -265,13 +265,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 +351,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/chpasswd.php b/plugins/password/drivers/chpasswd.php
index 3ea10159c..137275e69 100644
--- a/plugins/password/drivers/chpasswd.php
+++ b/plugins/password/drivers/chpasswd.php
@@ -26,7 +26,7 @@ class rcube_chpasswd_password
             return PASSWORD_SUCCESS;
         }
         else {
-            raise_error(array(
+            rcube::raise_error(array(
                 'code' => 600,
                 'type' => 'php',
                 'file' => __FILE__, 'line' => __LINE__,
diff --git a/plugins/password/drivers/cpanel.php b/plugins/password/drivers/cpanel.php
index 58351143b..b71c33ec1 100644
--- a/plugins/password/drivers/cpanel.php
+++ b/plugins/password/drivers/cpanel.php
@@ -4,99 +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
@@ -105,16 +49,24 @@ class emailAccount
      * @param string $password email account password
      * @return bool
      */
-	function setPassword($password)
-	{
-		$data['email'] = $this->email;
-		$data['domain'] = $this->domain;
-		$data['password'] = $password;
-		$response = $this->HTTP->getData('mail/dopasswdpop.html', $data);
-		if(strpos($response, 'success') && !strpos($response, 'failure'))
-		{
-			return true;
-		}
-		return false;
-	}
+    function setPassword($address, $password)
+    {
+        if (strpos($address, '@')) {
+            list($data['email'], $data['domain']) = explode('@', $address);
+        }
+        else {
+            list($data['email'], $data['domain']) = array($address, '');
+        }
+
+        $data['password'] = $password;
+
+        $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/dbmail.php b/plugins/password/drivers/dbmail.php
index e4c0d52e3..529027b8d 100644
--- a/plugins/password/drivers/dbmail.php
+++ b/plugins/password/drivers/dbmail.php
@@ -29,7 +29,7 @@ class rcube_dbmail_password
             return PASSWORD_SUCCESS;
         }
         else {
-            raise_error(array(
+            rcube::raise_error(array(
                 'code' => 600,
                 'type' => 'php',
                 'file' => __FILE__, 'line' => __LINE__,
diff --git a/plugins/password/drivers/directadmin.php b/plugins/password/drivers/directadmin.php
index 657c21eb4..8bf0dc613 100644
--- a/plugins/password/drivers/directadmin.php
+++ b/plugins/password/drivers/directadmin.php
@@ -34,16 +34,16 @@ class rcube_directadmin_password
         $Socket->set_method('POST');
         $Socket->query('/CMD_CHANGE_EMAIL_PASSWORD',
             array(
-                'email' 		=> $da_user,
-                'oldpassword' 	=> $da_curpass,
-                'password1' 	=> $da_newpass,
-                'password2' 	=> $da_newpass,
-                'api' 			=> '1'
+                'email'         => $da_user,
+                'oldpassword'   => $da_curpass,
+                'password1'     => $da_newpass,
+                'password2'     => $da_newpass,
+                'api'           => '1'
             ));
         $response = $Socket->fetch_parsed_body();
 
         //DEBUG
-        //console("Password Plugin: [USER: $da_user] [HOST: $da_host] - Response: [SOCKET: ".$Socket->result_status_code."] [DA ERROR: ".strip_tags($response['error'])."] [TEXT: ".$response[text]."]");
+        //rcube::console("Password Plugin: [USER: $da_user] [HOST: $da_host] - Response: [SOCKET: ".$Socket->result_status_code."] [DA ERROR: ".strip_tags($response['error'])."] [TEXT: ".$response[text]."]");
 
         if($Socket->result_status_code != 200)
             return array('code' => PASSWORD_CONNECT_ERROR, 'message' => $Socket->error[0]);
@@ -72,7 +72,7 @@ class rcube_directadmin_password
 class HTTPSocket {
 
     var $version = '2.8';
-    
+
     /* all vars are private except $error, $query_cache, and $doFollowLocationHeader */
 
     var $method = 'GET';
@@ -173,7 +173,7 @@ class HTTPSocket {
             $location = parse_url($request);
             $this->connect($location['host'],$location['port']);
             $this->set_login($location['user'],$location['pass']);
-            
+
             $request = $location['path'];
             $content = $location['query'];
 
@@ -326,7 +326,7 @@ class HTTPSocket {
             }
 
         }
-        
+
         list($this->result_header,$this->result_body) = preg_split("/\r\n\r\n/",$this->result,2);
 
         if ($this->bind_host)
@@ -365,7 +365,6 @@ class HTTPSocket {
                 $this->query($headers['location']);
             }
         }
-        
     }
 
     function getTransferSpeed()
@@ -449,8 +448,7 @@ class HTTPSocket {
     function fetch_header( $header = '' )
     {
         $array_headers = preg_split("/\r\n/",$this->result_header);
-        
-        $array_return = array( 0 => $array_headers[0] );
+        $array_return  = array( 0 => $array_headers[0] );
         unset($array_headers[0]);
 
         foreach ( $array_headers as $pair )
diff --git a/plugins/password/drivers/expect.php b/plugins/password/drivers/expect.php
index 7a191e254..1f68924df 100644
--- a/plugins/password/drivers/expect.php
+++ b/plugins/password/drivers/expect.php
@@ -45,7 +45,7 @@ class rcube_expect_password
             return PASSWORD_SUCCESS;
         }
         else {
-            raise_error(array(
+            rcube::raise_error(array(
                 'code' => 600,
                 'type' => 'php',
                 'file' => __FILE__, 'line' => __LINE__,
diff --git a/plugins/password/drivers/hmail.php b/plugins/password/drivers/hmail.php
index 104c851ae..a8f07a23b 100644
--- a/plugins/password/drivers/hmail.php
+++ b/plugins/password/drivers/hmail.php
@@ -26,8 +26,8 @@ class rcube_hmail_password
                 $obApp = new COM("hMailServer.Application");
         }
         catch (Exception $e) {
-            write_log('errors', "Plugin password (hmail driver): " . trim(strip_tags($e->getMessage())));
-            write_log('errors', "Plugin password (hmail driver): This problem is often caused by DCOM permissions not being set.");
+            rcube::write_log('errors', "Plugin password (hmail driver): " . trim(strip_tags($e->getMessage())));
+            rcube::write_log('errors', "Plugin password (hmail driver): This problem is often caused by DCOM permissions not being set.");
             return PASSWORD_ERROR;
         }
 
@@ -39,8 +39,8 @@ class rcube_hmail_password
         else {
             $domain = $rcmail->config->get('username_domain',false);
             if (!$domain) {
-                write_log('errors','Plugin password (hmail driver): $rcmail_config[\'username_domain\'] is not defined.');
-                write_log('errors','Plugin password (hmail driver): Hint: Use hmail_login plugin (http://myroundcube.googlecode.com');
+                rcube::write_log('errors','Plugin password (hmail driver): $rcmail_config[\'username_domain\'] is not defined.');
+                rcube::write_log('errors','Plugin password (hmail driver): Hint: Use hmail_login plugin (http://myroundcube.googlecode.com');
                 return PASSWORD_ERROR;
             }
             $username = $username . "@" . $domain;
@@ -55,8 +55,8 @@ class rcube_hmail_password
             return PASSWORD_SUCCESS;
         }
         catch (Exception $e) {
-            write_log('errors', "Plugin password (hmail driver): " . trim(strip_tags($e->getMessage())));
-            write_log('errors', "Plugin password (hmail driver): This problem is often caused by DCOM permissions not being set.");
+            rcube::write_log('errors', "Plugin password (hmail driver): " . trim(strip_tags($e->getMessage())));
+            rcube::write_log('errors', "Plugin password (hmail driver): This problem is often caused by DCOM permissions not being set.");
             return PASSWORD_ERROR;
         }
     }
diff --git a/plugins/password/drivers/ldap.php b/plugins/password/drivers/ldap.php
index def07a175..548d327e1 100644
--- a/plugins/password/drivers/ldap.php
+++ b/plugins/password/drivers/ldap.php
@@ -85,7 +85,7 @@ class rcube_ldap_password
 
         // Crypt new samba password
         if ($smbpwattr && !($samba_pass = $this->hashPassword($passwd, 'samba'))) {
-	        return PASSWORD_CRYPT_ERROR;
+            return PASSWORD_CRYPT_ERROR;
         }
 
         // Writing new crypted password to LDAP
@@ -271,11 +271,11 @@ class rcube_ldap_password
 
         case 'samba':
             if (function_exists('hash')) {
-                $cryptedPassword = hash('md4', rcube_charset_convert($passwordClear, RCMAIL_CHARSET, 'UTF-16LE'));
+                $cryptedPassword = hash('md4', rcube_charset::convert($passwordClear, RCUBE_CHARSET, 'UTF-16LE'));
                 $cryptedPassword = strtoupper($cryptedPassword);
             } else {
-				/* Your PHP install does not have the hash() function */
-				return false;
+                /* Your PHP install does not have the hash() function */
+                return false;
             }
             break;
 
diff --git a/plugins/password/drivers/ldap_simple.php b/plugins/password/drivers/ldap_simple.php
index e1daed9f3..d47e14492 100644
--- a/plugins/password/drivers/ldap_simple.php
+++ b/plugins/password/drivers/ldap_simple.php
@@ -15,57 +15,57 @@ class rcube_ldap_simple_password
 {
     function save($curpass, $passwd)
     {
-	    $rcmail = rcmail::get_instance();
-
-    	// Connect
-	    if (!$ds = ldap_connect($rcmail->config->get('password_ldap_host'), $rcmail->config->get('password_ldap_port'))) {
-		    ldap_unbind($ds);
-    		return PASSWORD_CONNECT_ERROR;
-	    }
-
-    	// Set protocol version
-	    if (!ldap_set_option($ds, LDAP_OPT_PROTOCOL_VERSION, $rcmail->config->get('password_ldap_version'))) {
-		    ldap_unbind($ds);
-    		return PASSWORD_CONNECT_ERROR;
-	    }
-
-    	// Start TLS
-	    if ($rcmail->config->get('password_ldap_starttls')) {
-		    if (!ldap_start_tls($ds)) {
-    			ldap_unbind($ds);
-	    		return PASSWORD_CONNECT_ERROR;
-		    }
-	    }
-
-    	// Build user DN
-	    if ($user_dn = $rcmail->config->get('password_ldap_userDN_mask')) {
-		    $user_dn = $this->substitute_vars($user_dn);
-    	}
-    	else {
-	    	$user_dn = $this->search_userdn($rcmail, $ds);
-	    }
-
-	    if (empty($user_dn)) {
-		    ldap_unbind($ds);
-    		return PASSWORD_CONNECT_ERROR;
-	    }
-
-    	// Connection method
-	    switch ($rcmail->config->get('password_ldap_method')) {
-		case 'admin':
-			$binddn = $rcmail->config->get('password_ldap_adminDN');
-			$bindpw = $rcmail->config->get('password_ldap_adminPW');
-			break;
-		case 'user':
-		default:
-			$binddn = $user_dn;
-			$bindpw = $curpass;
-			break;
-	    }
-
-    	$crypted_pass = $this->hash_password($passwd, $rcmail->config->get('password_ldap_encodage'));
-	    $lchattr      = $rcmail->config->get('password_ldap_lchattr');
-    	$pwattr       = $rcmail->config->get('password_ldap_pwattr');
+        $rcmail = rcmail::get_instance();
+
+        // Connect
+        if (!$ds = ldap_connect($rcmail->config->get('password_ldap_host'), $rcmail->config->get('password_ldap_port'))) {
+            ldap_unbind($ds);
+            return PASSWORD_CONNECT_ERROR;
+        }
+
+        // Set protocol version
+        if (!ldap_set_option($ds, LDAP_OPT_PROTOCOL_VERSION, $rcmail->config->get('password_ldap_version'))) {
+            ldap_unbind($ds);
+            return PASSWORD_CONNECT_ERROR;
+        }
+
+        // Start TLS
+        if ($rcmail->config->get('password_ldap_starttls')) {
+            if (!ldap_start_tls($ds)) {
+                ldap_unbind($ds);
+                return PASSWORD_CONNECT_ERROR;
+            }
+        }
+
+        // Build user DN
+        if ($user_dn = $rcmail->config->get('password_ldap_userDN_mask')) {
+            $user_dn = $this->substitute_vars($user_dn);
+        }
+        else {
+            $user_dn = $this->search_userdn($rcmail, $ds);
+        }
+
+        if (empty($user_dn)) {
+            ldap_unbind($ds);
+            return PASSWORD_CONNECT_ERROR;
+        }
+
+        // Connection method
+        switch ($rcmail->config->get('password_ldap_method')) {
+        case 'admin':
+            $binddn = $rcmail->config->get('password_ldap_adminDN');
+            $bindpw = $rcmail->config->get('password_ldap_adminPW');
+            break;
+        case 'user':
+        default:
+            $binddn = $user_dn;
+            $bindpw = $curpass;
+            break;
+        }
+
+        $crypted_pass = $this->hash_password($passwd, $rcmail->config->get('password_ldap_encodage'));
+        $lchattr      = $rcmail->config->get('password_ldap_lchattr');
+        $pwattr       = $rcmail->config->get('password_ldap_pwattr');
         $smbpwattr    = $rcmail->config->get('password_ldap_samba_pwattr');
         $smblchattr   = $rcmail->config->get('password_ldap_samba_lchattr');
         $samba        = $rcmail->config->get('password_ldap_samba');
@@ -76,28 +76,28 @@ class rcube_ldap_simple_password
             $smblchattr = 'sambaPwdLastSet';
         }
 
-    	// Crypt new password
-	    if (!$crypted_pass) {
-		    return PASSWORD_CRYPT_ERROR;
-	    }
+        // Crypt new password
+        if (!$crypted_pass) {
+            return PASSWORD_CRYPT_ERROR;
+        }
 
         // Crypt new Samba password
         if ($smbpwattr && !($samba_pass = $this->hash_password($passwd, 'samba'))) {
-	        return PASSWORD_CRYPT_ERROR;
+            return PASSWORD_CRYPT_ERROR;
         }
 
-    	// Bind
-	    if (!ldap_bind($ds, $binddn, $bindpw)) {
-		    ldap_unbind($ds);
-    		return PASSWORD_CONNECT_ERROR;
-	    }
+        // Bind
+        if (!ldap_bind($ds, $binddn, $bindpw)) {
+            ldap_unbind($ds);
+            return PASSWORD_CONNECT_ERROR;
+        }
 
-    	$entree[$pwattr] = $crypted_pass;
+        $entree[$pwattr] = $crypted_pass;
 
-	    // Update PasswordLastChange Attribute if desired
-    	if ($lchattr) {
-	    	$entree[$lchattr] = (int)(time() / 86400);
-	    }
+        // Update PasswordLastChange Attribute if desired
+        if ($lchattr) {
+            $entree[$lchattr] = (int)(time() / 86400);
+        }
 
         // Update Samba password
         if ($smbpwattr) {
@@ -109,14 +109,14 @@ class rcube_ldap_simple_password
             $entree[$smblchattr] = time();
         }
 
-    	if (!ldap_modify($ds, $user_dn, $entree)) {
-	    	ldap_unbind($ds);
-		    return PASSWORD_CONNECT_ERROR;
-    	}
+        if (!ldap_modify($ds, $user_dn, $entree)) {
+            ldap_unbind($ds);
+            return PASSWORD_CONNECT_ERROR;
+        }
 
-    	// All done, no error
-	    ldap_unbind($ds);
-	    return PASSWORD_SUCCESS;
+        // All done, no error
+        ldap_unbind($ds);
+        return PASSWORD_SUCCESS;
     }
 
     /**
@@ -126,22 +126,22 @@ class rcube_ldap_simple_password
      */
     function search_userdn($rcmail, $ds)
     {
-	    /* Bind */
-    	if (!ldap_bind($ds, $rcmail->config->get('password_ldap_searchDN'), $rcmail->config->get('password_ldap_searchPW'))) {
-	    	return false;
-	    }
-
-    	/* Search for the DN */
-	    if (!$sr = ldap_search($ds, $rcmail->config->get('password_ldap_search_base'), $this->substitute_vars($rcmail->config->get('password_ldap_search_filter')))) {
-		    return false;
-	    }
-
-    	/* If no or more entries were found, return false */
-	    if (ldap_count_entries($ds, $sr) != 1) {
-		    return false;
-	    }
-
-	    return ldap_get_dn($ds, ldap_first_entry($ds, $sr));
+        /* Bind */
+        if (!ldap_bind($ds, $rcmail->config->get('password_ldap_searchDN'), $rcmail->config->get('password_ldap_searchPW'))) {
+            return false;
+        }
+
+        /* Search for the DN */
+        if (!$sr = ldap_search($ds, $rcmail->config->get('password_ldap_search_base'), $this->substitute_vars($rcmail->config->get('password_ldap_search_filter')))) {
+            return false;
+        }
+
+        /* If no or more entries were found, return false */
+        if (ldap_count_entries($ds, $sr) != 1) {
+            return false;
+        }
+
+        return ldap_get_dn($ds, ldap_first_entry($ds, $sr));
     }
 
     /**
@@ -150,22 +150,22 @@ class rcube_ldap_simple_password
      */
     function substitute_vars($str)
     {
-	    $str = str_replace('%login', $_SESSION['username'], $str);
-    	$str = str_replace('%l', $_SESSION['username'], $str);
+        $str = str_replace('%login', $_SESSION['username'], $str);
+        $str = str_replace('%l', $_SESSION['username'], $str);
 
-	    $parts = explode('@', $_SESSION['username']);
+        $parts = explode('@', $_SESSION['username']);
 
-    	if (count($parts) == 2) {
+        if (count($parts) == 2) {
             $dc = 'dc='.strtr($parts[1], array('.' => ',dc=')); // hierarchal domain string
 
-    		$str = str_replace('%name', $parts[0], $str);
+            $str = str_replace('%name', $parts[0], $str);
             $str = str_replace('%n', $parts[0], $str);
             $str = str_replace('%dc', $dc, $str);
-	    	$str = str_replace('%domain', $parts[1], $str);
-		    $str = str_replace('%d', $parts[1], $str);
-    	}
+            $str = str_replace('%domain', $parts[1], $str);
+            $str = str_replace('%d', $parts[1], $str);
+        }
 
-	    return $str;
+        return $str;
     }
 
     /**
@@ -176,83 +176,83 @@ class rcube_ldap_simple_password
      */
     function hash_password($password_clear, $encodage_type)
     {
-    	$encodage_type = strtolower($encodage_type);
-	    switch ($encodage_type) {
-		case 'crypt':
-			$crypted_password = '{CRYPT}' . crypt($password_clear, $this->random_salt(2));
-			break;
-		case 'ext_des':
-			/* Extended DES crypt. see OpenBSD crypt man page */
-			if (!defined('CRYPT_EXT_DES') || CRYPT_EXT_DES == 0) {
-				/* Your system crypt library does not support extended DES encryption */
-				return false;
-			}
-			$crypted_password = '{CRYPT}' . crypt($password_clear, '_' . $this->random_salt(8));
-			break;
-		case 'md5crypt':
-			if (!defined('CRYPT_MD5') || CRYPT_MD5 == 0) {
-				/* Your system crypt library does not support md5crypt encryption */
-				return false;
-			}
-			$crypted_password = '{CRYPT}' . crypt($password_clear, '$1$' . $this->random_salt(9));
-			break;
-		case 'blowfish':
-			if (!defined('CRYPT_BLOWFISH') || CRYPT_BLOWFISH == 0) {
-				/* Your system crypt library does not support blowfish encryption */
-				return false;
-			}
-			/* Hardcoded to second blowfish version and set number of rounds */
-			$crypted_password = '{CRYPT}' . crypt($password_clear, '$2a$12$' . $this->random_salt(13));
-			break;
-		case 'md5':
-			$crypted_password = '{MD5}' . base64_encode(pack('H*', md5($password_clear)));
-			break;
-		case 'sha':
-			if (function_exists('sha1')) {
-				/* Use PHP 4.3.0+ sha1 function, if it is available */
-				$crypted_password = '{SHA}' . base64_encode(pack('H*', sha1($password_clear)));
-			} else if (function_exists('mhash')) {
-				$crypted_password = '{SHA}' . base64_encode(mhash(MHASH_SHA1, $password_clear));
-			} else {
-				/* Your PHP install does not have the mhash() function */
-				return false;
-			}
-			break;
-		case 'ssha':
-			if (function_exists('mhash') && function_exists('mhash_keygen_s2k')) {
-				mt_srand((double) microtime() * 1000000 );
-				$salt = mhash_keygen_s2k(MHASH_SHA1, $password_clear, substr(pack('h*', md5(mt_rand())), 0, 8), 4);
-				$crypted_password = '{SSHA}' . base64_encode(mhash(MHASH_SHA1, $password_clear . $salt) . $salt);
-			} else {
-				/* Your PHP install does not have the mhash() function */
-				return false;
-			}
-			break;
-		case 'smd5':
-			if (function_exists('mhash') && function_exists('mhash_keygen_s2k')) {
-				mt_srand((double) microtime() * 1000000 );
-				$salt = mhash_keygen_s2k(MHASH_MD5, $password_clear, substr(pack('h*', md5(mt_rand())), 0, 8), 4);
-				$crypted_password = '{SMD5}' . base64_encode(mhash(MHASH_MD5, $password_clear . $salt) . $salt);
-			} else {
-				/* Your PHP install does not have the mhash() function */
-				return false;
-			}
-			break;
+        $encodage_type = strtolower($encodage_type);
+        switch ($encodage_type) {
+        case 'crypt':
+            $crypted_password = '{CRYPT}' . crypt($password_clear, $this->random_salt(2));
+            break;
+        case 'ext_des':
+            /* Extended DES crypt. see OpenBSD crypt man page */
+            if (!defined('CRYPT_EXT_DES') || CRYPT_EXT_DES == 0) {
+                /* Your system crypt library does not support extended DES encryption */
+                return false;
+            }
+            $crypted_password = '{CRYPT}' . crypt($password_clear, '_' . $this->random_salt(8));
+            break;
+        case 'md5crypt':
+            if (!defined('CRYPT_MD5') || CRYPT_MD5 == 0) {
+                /* Your system crypt library does not support md5crypt encryption */
+                return false;
+            }
+            $crypted_password = '{CRYPT}' . crypt($password_clear, '$1$' . $this->random_salt(9));
+            break;
+        case 'blowfish':
+            if (!defined('CRYPT_BLOWFISH') || CRYPT_BLOWFISH == 0) {
+                /* Your system crypt library does not support blowfish encryption */
+                return false;
+            }
+            /* Hardcoded to second blowfish version and set number of rounds */
+            $crypted_password = '{CRYPT}' . crypt($password_clear, '$2a$12$' . $this->random_salt(13));
+            break;
+        case 'md5':
+            $crypted_password = '{MD5}' . base64_encode(pack('H*', md5($password_clear)));
+            break;
+        case 'sha':
+            if (function_exists('sha1')) {
+                /* Use PHP 4.3.0+ sha1 function, if it is available */
+                $crypted_password = '{SHA}' . base64_encode(pack('H*', sha1($password_clear)));
+            } else if (function_exists('mhash')) {
+                $crypted_password = '{SHA}' . base64_encode(mhash(MHASH_SHA1, $password_clear));
+            } else {
+                /* Your PHP install does not have the mhash() function */
+                return false;
+            }
+            break;
+        case 'ssha':
+            if (function_exists('mhash') && function_exists('mhash_keygen_s2k')) {
+                mt_srand((double) microtime() * 1000000 );
+                $salt = mhash_keygen_s2k(MHASH_SHA1, $password_clear, substr(pack('h*', md5(mt_rand())), 0, 8), 4);
+                $crypted_password = '{SSHA}' . base64_encode(mhash(MHASH_SHA1, $password_clear . $salt) . $salt);
+            } else {
+                /* Your PHP install does not have the mhash() function */
+                return false;
+            }
+            break;
+        case 'smd5':
+            if (function_exists('mhash') && function_exists('mhash_keygen_s2k')) {
+                mt_srand((double) microtime() * 1000000 );
+                $salt = mhash_keygen_s2k(MHASH_MD5, $password_clear, substr(pack('h*', md5(mt_rand())), 0, 8), 4);
+                $crypted_password = '{SMD5}' . base64_encode(mhash(MHASH_MD5, $password_clear . $salt) . $salt);
+            } else {
+                /* Your PHP install does not have the mhash() function */
+                return false;
+            }
+            break;
         case 'samba':
             if (function_exists('hash')) {
-                $crypted_password = hash('md4', rcube_charset_convert($password_clear, RCMAIL_CHARSET, 'UTF-16LE'));
+                $crypted_password = hash('md4', rcube_charset::convert($password_clear, RCUBE_CHARSET, 'UTF-16LE'));
                 $crypted_password = strtoupper($crypted_password);
             } else {
-				/* Your PHP install does not have the hash() function */
-				return false;
+                /* Your PHP install does not have the hash() function */
+                return false;
             }
             break;
-		case 'clear':
-		default:
-			$crypted_password = $password_clear;
-	    }
+        case 'clear':
+        default:
+            $crypted_password = $password_clear;
+        }
 
-    	return $crypted_password;
+        return $crypted_password;
     }
 
     /**
@@ -263,14 +263,14 @@ class rcube_ldap_simple_password
      */
     function random_salt($length)
     {
-	    $possible = '0123456789' . 'abcdefghijklmnopqrstuvwxyz' . 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' . './';
-    	$str = '';
-	    // mt_srand((double)microtime() * 1000000);
+        $possible = '0123456789' . 'abcdefghijklmnopqrstuvwxyz' . 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' . './';
+        $str = '';
+        // mt_srand((double)microtime() * 1000000);
 
-    	while (strlen($str) < $length) {
-	    	$str .= substr($possible, (rand() % strlen($possible)), 1);
-	    }
+        while (strlen($str) < $length) {
+            $str .= substr($possible, (rand() % strlen($possible)), 1);
+        }
 
-	    return $str;
+        return $str;
     }
 }
diff --git a/plugins/password/drivers/pam.php b/plugins/password/drivers/pam.php
index ed60bd841..8cd94c737 100644
--- a/plugins/password/drivers/pam.php
+++ b/plugins/password/drivers/pam.php
@@ -13,14 +13,14 @@ class rcube_pam_password
     {
         $user = $_SESSION['username'];
 
-        if (extension_loaded('pam')) {
+        if (extension_loaded('pam') || extension_loaded('pam_auth')) {
             if (pam_auth($user, $currpass, $error, false)) {
                 if (pam_chpass($user, $currpass, $newpass)) {
                     return PASSWORD_SUCCESS;
                 }
             }
             else {
-                raise_error(array(
+                rcube::raise_error(array(
                     'code' => 600,
                     'type' => 'php',
                     'file' => __FILE__, 'line' => __LINE__,
@@ -29,7 +29,7 @@ class rcube_pam_password
             }
         }
         else {
-            raise_error(array(
+            rcube::raise_error(array(
                 'code' => 600,
                 'type' => 'php',
                 'file' => __FILE__, 'line' => __LINE__,
diff --git a/plugins/password/drivers/pw_usermod.php b/plugins/password/drivers/pw_usermod.php
index 5b92fcbfb..237e275a7 100644
--- a/plugins/password/drivers/pw_usermod.php
+++ b/plugins/password/drivers/pw_usermod.php
@@ -28,7 +28,7 @@ class rcube_pw_usermod_password
             return PASSWORD_SUCCESS;
         }
         else {
-            raise_error(array(
+            rcube::raise_error(array(
                 'code' => 600,
                 'type' => 'php',
                 'file' => __FILE__, 'line' => __LINE__,
diff --git a/plugins/password/drivers/sasl.php b/plugins/password/drivers/sasl.php
index 9380cf838..8776eff2e 100644
--- a/plugins/password/drivers/sasl.php
+++ b/plugins/password/drivers/sasl.php
@@ -32,7 +32,7 @@ class rcube_sasl_password
                 return PASSWORD_SUCCESS;
         }
         else {
-            raise_error(array(
+            rcube::raise_error(array(
                 'code' => 600,
                 'type' => 'php',
                 'file' => __FILE__, 'line' => __LINE__,
diff --git a/plugins/password/drivers/smb.php b/plugins/password/drivers/smb.php
index 138313be8..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");
@@ -44,7 +46,7 @@ class rcube_smb_password
             return PASSWORD_SUCCESS;
         }
         else {
-            raise_error(array(
+            rcube::raise_error(array(
                 'code' => 600,
                 'type' => 'php',
                 'file' => __FILE__, 'line' => __LINE__,
@@ -56,4 +58,3 @@ class rcube_smb_password
     }
 
 }
-?>
diff --git a/plugins/password/drivers/sql.php b/plugins/password/drivers/sql.php
index 8bdcabf83..e02bff146 100644
--- a/plugins/password/drivers/sql.php
+++ b/plugins/password/drivers/sql.php
@@ -20,11 +20,11 @@ class rcube_sql_password
             $sql = 'SELECT update_passwd(%c, %u)';
 
         if ($dsn = $rcmail->config->get('password_db_dsn')) {
-	        // #1486067: enable new_link option
-	        if (is_array($dsn) && empty($dsn['new_link']))
-	            $dsn['new_link'] = true;
-    	    else if (!is_array($dsn) && !preg_match('/\?new_link=true/', $dsn))
-	            $dsn .= '?new_link=true';
+            // #1486067: enable new_link option
+            if (is_array($dsn) && empty($dsn['new_link']))
+                $dsn['new_link'] = true;
+            else if (!is_array($dsn) && !preg_match('/\?new_link=true/', $dsn))
+                $dsn .= '?new_link=true';
 
             $db = rcube_db::factory($dsn, '', false);
             $db->set_debug((bool)$rcmail->config->get('sql_debug'));
@@ -48,7 +48,7 @@ class rcube_sql_password
                 else if (CRYPT_STD_DES)
                     $crypt_hash = 'des';
             }
-            
+
             switch ($crypt_hash)
             {
             case 'md5':
@@ -77,7 +77,7 @@ class rcube_sql_password
             //Restrict the character set used as salt (#1488136)
             $seedchars = './0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz';
             for ($i = 0; $i < $len ; $i++) {
-    	        $salt .= $seedchars[rand(0, 63)];
+                $salt .= $seedchars[rand(0, 63)];
             }
 
             $sql = str_replace('%c',  $db->quote(crypt($passwd, $salt_hashindicator ? $salt_hashindicator .$salt.'$' : $salt)), $sql);
@@ -116,30 +116,30 @@ class rcube_sql_password
 
         // hashed passwords
         if (preg_match('/%[n|q]/', $sql)) {
-    	    if (!extension_loaded('hash')) {
-	            raise_error(array(
-	                'code' => 600,
-		            'type' => 'php',
-		            'file' => __FILE__, 'line' => __LINE__,
-    		        'message' => "Password plugin: 'hash' extension not loaded!"
-	    	    ), true, false);
-
-	            return PASSWORD_ERROR;
-    	    }
-
-	        if (!($hash_algo = strtolower($rcmail->config->get('password_hash_algorithm'))))
+            if (!extension_loaded('hash')) {
+                rcube::raise_error(array(
+                    'code' => 600,
+                    'type' => 'php',
+                    'file' => __FILE__, 'line' => __LINE__,
+                    'message' => "Password plugin: 'hash' extension not loaded!"
+                ), true, false);
+
+                return PASSWORD_ERROR;
+            }
+
+            if (!($hash_algo = strtolower($rcmail->config->get('password_hash_algorithm'))))
                 $hash_algo = 'sha1';
 
-    	    $hash_passwd = hash($hash_algo, $passwd);
+            $hash_passwd = hash($hash_algo, $passwd);
             $hash_curpass = hash($hash_algo, $curpass);
 
-	        if ($rcmail->config->get('password_hash_base64')) {
+            if ($rcmail->config->get('password_hash_base64')) {
                 $hash_passwd = base64_encode(pack('H*', $hash_passwd));
                 $hash_curpass = base64_encode(pack('H*', $hash_curpass));
             }
 
-    	    $sql = str_replace('%n', $db->quote($hash_passwd, 'text'), $sql);
-	        $sql = str_replace('%q', $db->quote($hash_curpass, 'text'), $sql);
+            $sql = str_replace('%n', $db->quote($hash_passwd, 'text'), $sql);
+            $sql = str_replace('%q', $db->quote($hash_curpass, 'text'), $sql);
         }
 
         // Handle clear text passwords securely (#1487034)
@@ -164,14 +164,14 @@ class rcube_sql_password
 
         // convert domains to/from punnycode
         if ($rcmail->config->get('password_idn_ascii')) {
-            $domain_part = rcube_idn_to_ascii($domain_part);
-            $username    = rcube_idn_to_ascii($username);
-            $host        = rcube_idn_to_ascii($host);
+            $domain_part = rcube_utils::idn_to_ascii($domain_part);
+            $username    = rcube_utils::idn_to_ascii($username);
+            $host        = rcube_utils::idn_to_ascii($host);
         }
         else {
-            $domain_part = rcube_idn_to_utf8($domain_part);
-            $username    = rcube_idn_to_utf8($username);
-            $host        = rcube_idn_to_utf8($host);
+            $domain_part = rcube_utils::idn_to_utf8($domain_part);
+            $username    = rcube_utils::idn_to_utf8($username);
+            $host        = rcube_utils::idn_to_utf8($host);
         }
 
         // at least we should always have the local part
@@ -183,16 +183,16 @@ 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))
-		            return PASSWORD_SUCCESS;
-    	    } else {
+            if (strtolower(substr(trim($query),0,6))=='select') {
+                if ($result = $db->fetch_array($res))
+                    return PASSWORD_SUCCESS;
+            } else {
                 // This is the good case: 1 row updated
-    	        if ($db->affected_rows($res) == 1)
-	                return PASSWORD_SUCCESS;
+                if ($db->affected_rows($res) == 1)
+                    return PASSWORD_SUCCESS;
                 // @TODO: Some queries don't affect any rows
                 // Should we assume a success if there was no error?
-	        }
+            }
         }
 
         return PASSWORD_ERROR;
diff --git a/plugins/password/drivers/virtualmin.php b/plugins/password/drivers/virtualmin.php
index 69f1475d4..2c7aee617 100644
--- a/plugins/password/drivers/virtualmin.php
+++ b/plugins/password/drivers/virtualmin.php
@@ -48,10 +48,10 @@ class rcube_virtualmin_password
             $pieces = explode("_", $username);
             $domain = $pieces[0];
             break;
-		case 8: // domain taken from alias, username left as it was
-			$email = $rcmail->user->data['alias'];
-			$domain = substr(strrchr($email, "@"), 1);
-			break;
+        case 8: // domain taken from alias, username left as it was
+            $email = $rcmail->user->data['alias'];
+            $domain = substr(strrchr($email, "@"), 1);
+            break;
         default: // username@domain
             $domain = substr(strrchr($username, "@"), 1);
         }
@@ -67,7 +67,7 @@ class rcube_virtualmin_password
             return PASSWORD_SUCCESS;
         }
         else {
-            raise_error(array(
+            rcube::raise_error(array(
                 'code' => 600,
                 'type' => 'php',
                 'file' => __FILE__, 'line' => __LINE__,
diff --git a/plugins/password/drivers/vpopmaild.php b/plugins/password/drivers/vpopmaild.php
index 510cf3338..6c1a9ee9d 100644
--- a/plugins/password/drivers/vpopmaild.php
+++ b/plugins/password/drivers/vpopmaild.php
@@ -19,7 +19,7 @@ class rcube_vpopmaild_password
         $vpopmaild = new Net_Socket();
 
         if (PEAR::isError($vpopmaild->connect($rcmail->config->get('password_vpopmaild_host'),
-	        $rcmail->config->get('password_vpopmaild_port'), null))) {
+            $rcmail->config->get('password_vpopmaild_port'), null))) {
             return PASSWORD_CONNECT_ERROR;
         }
 
diff --git a/plugins/password/drivers/xmail.php b/plugins/password/drivers/xmail.php
index 33a49ffe3..37abc3001 100644
--- a/plugins/password/drivers/xmail.php
+++ b/plugins/password/drivers/xmail.php
@@ -32,7 +32,7 @@ class rcube_xmail_password
         $xmail->port = $rcmail->config->get('xmail_port');
 
         if (!$xmail->connect()) {
-            raise_error(array(
+            rcube::raise_error(array(
                 'code' => 600,
                 'type' => 'php',
                 'file' => __FILE__, 'line' => __LINE__,
@@ -42,7 +42,7 @@ class rcube_xmail_password
         }
         else if (!$xmail->send("userpasswd\t".$domain."\t".$user."\t".$newpass."\n")) {
             $xmail->close();
-            raise_error(array(
+            rcube::raise_error(array(
                 'code' => 600,
                 'type' => 'php',
                 'file' => __FILE__, 'line' => __LINE__,
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/help/localization/nb_NB.inc b/plugins/password/localization/ber.inc
index 34881d61d..12fe4442e 100644
--- a/plugins/help/localization/nb_NB.inc
+++ b/plugins/password/localization/ber.inc
@@ -2,19 +2,16 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/nb_NB/labels.inc                                         |
+ | localization//labels.inc                                         |
  |                                                                       |
  | Language file of the Roundcube Webmail client                         |
  | Copyright (C) 2012, The Roundcube Dev Team                            |
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Tobias V. Langhoff <spug@thespug.net>                         |
+ | Author: FULL NAME <EMAIL@ADDRESS>                                     |
  +-----------------------------------------------------------------------+
 */
 
 $labels = array();
-$labels['help'] = 'Hjelp';
-$labels['about'] = 'Om';
-$labels['license'] = 'Lisensvilkå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
new file mode 100644
index 000000000..f07786b39
--- /dev/null
+++ b/plugins/password/localization/br.inc
@@ -0,0 +1,37 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/password/localization/<lang>.inc                              |
+ |                                                                       |
+ | 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.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ 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 :';
+
+$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 492a48df0..6016ffeac 100644
--- a/plugins/password/localization/de_CH.inc
+++ b/plugins/password/localization/de_CH.inc
@@ -2,30 +2,36 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/de_CH/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'] = 'Passwort ändern';
-$labels['curpasswd'] = 'Aktuelles Passwort';
-$labels['newpasswd'] = 'Neues Passwort';
-$labels['confpasswd'] = 'Passwort Wiederholung';
-$labels['nopassword'] = 'Bitte geben Sie ein neues Passwort ein';
-$labels['nocurpassword'] = 'Bitte geben Sie Ihr aktuelles Passwort an';
-$labels['passwordincorrect'] = 'Das aktuelle Passwort ist nicht korrekt';
-$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']  = 'Passwort ändern';
+$labels['curpasswd']  = 'Aktuelles Passwort';
+$labels['newpasswd']  = 'Neues Passwort';
+$labels['confpasswd']  = 'Passwort Wiederholung';
+
+$messages = array();
+$messages['nopassword'] = 'Bitte geben Sie ein neues Passwort ein';
+$messages['nocurpassword'] = 'Bitte geben Sie Ihr aktuelles Passwort an';
+$messages['passwordincorrect'] = 'Das aktuelle Passwort ist nicht korrekt';
+$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/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 1ae2158b0..a4c077fe5 100644
--- a/plugins/password/localization/en_US.inc
+++ b/plugins/password/localization/en_US.inc
@@ -1,5 +1,21 @@
 <?php
 
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/password/localization/<lang>.inc                              |
+ |                                                                       |
+ | 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.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
+*/
+
 $labels = array();
 $labels['changepasswd']  = 'Change Password';
 $labels['curpasswd']  = 'Current Password:';
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
new file mode 100644
index 000000000..5026de259
--- /dev/null
+++ b/plugins/password/localization/id_ID.inc
@@ -0,0 +1,37 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/password/localization/<lang>.inc                              |
+ |                                                                       |
+ | 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.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-password/
+*/
+
+$labels = array();
+$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_NB.inc b/plugins/password/localization/nb_NB.inc
deleted file mode 100644
index ce4679bb1..000000000
--- a/plugins/password/localization/nb_NB.inc
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-/*
- +-----------------------------------------------------------------------+
- | localization/nb_NB/labels.inc                                         |
- |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
- |                                                                       |
- +-----------------------------------------------------------------------+
- | Author: Tobias V. Langhoff <spug@thespug.net>                         |
- +-----------------------------------------------------------------------+
-*/
-
-$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. Tilkoblings feil.';
-$labels['internalerror'] = 'Kunne ikke lagre nytt passord';
-$labels['passwordshort'] = 'Passordet må minumum være $length karakterer langt.';
-$labels['passwordweak'] = 'Passordet må inneholde minst ett tall og ett tegnsettingssymbol.';
-$labels['passwordforbidden'] = 'Passordet inneholder forbudte tegn.';
-
diff --git a/plugins/password/localization/nb_NO.inc b/plugins/password/localization/nb_NO.inc
new file mode 100644
index 000000000..6d8440bf3
--- /dev/null
+++ b/plugins/password/localization/nb_NO.inc
@@ -0,0 +1,37 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/password/localization/<lang>.inc                              |
+ |                                                                       |
+ | 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.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ 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';
+
+$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..c2c4599bc 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']  = 'Wijzig Wachtwoord';
+$labels['curpasswd']  = 'Huidig Wachtwoord:';
+$labels['newpasswd']  = 'Nieuw Wachtwoord:';
+$labels['confpasswd']  = 'Bevestig Nieuw Wachtwoord:';
+
+$messages = array();
+$messages['nopassword'] = 'Vul een wachtwoord in.';
+$messages['nocurpassword'] = 'vul het huidige wachtwoord in.';
+$messages['passwordincorrect'] = 'Huidig wachtwoord is onjuist.';
+$messages['passwordinconsistency'] = 'Wachtwoorden komen niet overeen, probeer het opnieuw.';
+$messages['crypterror'] = 'De server mist een functie om uw wachtwoord et beveiligen.';
+$messages['connecterror'] = 'Kan het nieuwe wachtwoord niet opslaan. Verbindingsfout.';
+$messages['internalerror'] = 'Uw wachtwoord kan niet worden opgeslagen.';
+$messages['passwordshort'] = 'Het wachtwoord moet minimaal $length tekens lang zijn.';
+$messages['passwordweak'] = 'Het wachtwoord moet minimaal één nummer 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
new file mode 100644
index 000000000..dc7c8f390
--- /dev/null
+++ b/plugins/password/localization/nn_NO.inc
@@ -0,0 +1,37 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/password/localization/<lang>.inc                              |
+ |                                                                       |
+ | 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.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ 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';
+
+$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 67e71a424..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: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ 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'] = 'Vänligen ange nytt lösenord.';
-$labels['nocurpassword'] = 'Vänligen ange nuvarande lösenord.';
-$labels['passwordincorrect'] = 'Felaktigt nuvarande lösenord.';
-$labels['passwordinconsistency'] = 'Nya lösenordet och bekräftelsen överensstä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'] = 'Xa�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 đu�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ã ho�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 i�t nhâ�t $ ky� 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']  = 'Xa�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 đu�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ã ho�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 i�t nhâ�t $ ky� 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..5a15635e7 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..be917917f 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-03-30</date>
 	<version>
-		<release>3.2</release>
+		<release>3.3</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 new cPanel driver - fixes localization related issues (#1487015)
     </notes>
 	<contents>
 		<dir baseinstalldir="/" name="/">
@@ -347,5 +346,21 @@
 - 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>
     </changelog>
 </package>
diff --git a/plugins/password/password.php b/plugins/password/password.php
index 806db0586..39020a0bf 100644
--- a/plugins/password/password.php
+++ b/plugins/password/password.php
@@ -112,22 +112,22 @@ class password extends rcube_plugin
             $rc_charset = strtoupper($rcmail->output->get_charset());
 
             $sespwd = $rcmail->decrypt($_SESSION['password']);
-            $curpwd = $confirm ? get_input_value('_curpasswd', RCUBE_INPUT_POST, true, $charset) : $sespwd;
-            $newpwd = get_input_value('_newpasswd', RCUBE_INPUT_POST, true);
-            $conpwd = get_input_value('_confpasswd', RCUBE_INPUT_POST, true);
+            $curpwd = $confirm ? rcube_utils::get_input_value('_curpasswd', rcube_utils::INPUT_POST, true, $charset) : $sespwd;
+            $newpwd = rcube_utils::get_input_value('_newpasswd', rcube_utils::INPUT_POST, true);
+            $conpwd = rcube_utils::get_input_value('_confpasswd', rcube_utils::INPUT_POST, true);
 
             // check allowed characters according to the configured 'password_charset' option
             // by converting the password entered by the user to this charset and back to UTF-8
             $orig_pwd = $newpwd;
-            $chk_pwd = rcube_charset_convert($orig_pwd, $rc_charset, $charset);
-            $chk_pwd = rcube_charset_convert($chk_pwd, $charset, $rc_charset);
+            $chk_pwd = rcube_charset::convert($orig_pwd, $rc_charset, $charset);
+            $chk_pwd = rcube_charset::convert($chk_pwd, $charset, $rc_charset);
 
             // WARNING: Default password_charset is ISO-8859-1, so conversion will
             // change national characters. This may disable possibility of using
             // the same password in other MUA's.
             // We're doing this for consistence with Roundcube core
-            $newpwd = rcube_charset_convert($newpwd, $rc_charset, $charset);
-            $conpwd = rcube_charset_convert($conpwd, $rc_charset, $charset);
+            $newpwd = rcube_charset::convert($newpwd, $rc_charset, $charset);
+            $conpwd = rcube_charset::convert($conpwd, $rc_charset, $charset);
 
             if ($chk_pwd != $orig_pwd) {
                 $rcmail->output->command('display_message', $this->gettext('passwordforbidden'), 'error');
@@ -141,7 +141,7 @@ class password extends rcube_plugin
             }
             else if ($required_length && strlen($newpwd) < $required_length) {
                 $rcmail->output->command('display_message', $this->gettext(
-	                array('name' => 'passwordshort', 'vars' => array('length' => $required_length))), 'error');
+                    array('name' => 'passwordshort', 'vars' => array('length' => $required_length))), 'error');
             }
             else if ($check_strength && (!preg_match("/[0-9]/", $newpwd) || !preg_match("/[^A-Za-z0-9]/", $newpwd))) {
                 $rcmail->output->command('display_message', $this->gettext('passwordweak'), 'error');
@@ -163,8 +163,8 @@ class password extends rcube_plugin
 
                 // Log password change
                 if ($rcmail->config->get('password_log')) {
-                    write_log('password', sprintf('Password changed for user %s (ID: %d) from %s',
-                        $rcmail->get_user_name(), $rcmail->user->ID, rcmail_remote_ip()));
+                    rcube::write_log('password', sprintf('Password changed for user %s (ID: %d) from %s',
+                        $rcmail->get_user_name(), $rcmail->user->ID, rcube_utils::remote_ip()));
                 }
             }
             else {
@@ -172,7 +172,7 @@ class password extends rcube_plugin
             }
         }
 
-        rcmail_overwrite_action('plugin.password');
+        $rcmail->overwrite_action('plugin.password');
         $rcmail->output->send('plugin');
     }
 
@@ -197,7 +197,7 @@ class password extends rcube_plugin
             $input_curpasswd = new html_passwordfield(array('name' => '_curpasswd', 'id' => $field_id,
                 'size' => 20, 'autocomplete' => 'off'));
 
-            $table->add('title', html::label($field_id, Q($this->gettext('curpasswd'))));
+            $table->add('title', html::label($field_id, rcube::Q($this->gettext('curpasswd'))));
             $table->add(null, $input_curpasswd->show());
         }
 
@@ -206,7 +206,7 @@ class password extends rcube_plugin
         $input_newpasswd = new html_passwordfield(array('name' => '_newpasswd', 'id' => $field_id,
             'size' => 20, 'autocomplete' => 'off'));
 
-        $table->add('title', html::label($field_id, Q($this->gettext('newpasswd'))));
+        $table->add('title', html::label($field_id, rcube::Q($this->gettext('newpasswd'))));
         $table->add(null, $input_newpasswd->show());
 
         // show confirm password selection
@@ -214,7 +214,7 @@ class password extends rcube_plugin
         $input_confpasswd = new html_passwordfield(array('name' => '_confpasswd', 'id' => $field_id,
             'size' => 20, 'autocomplete' => 'off'));
 
-        $table->add('title', html::label($field_id, Q($this->gettext('confpasswd'))));
+        $table->add('title', html::label($field_id, rcube::Q($this->gettext('confpasswd'))));
         $table->add(null, $input_confpasswd->show());
 
         $out = html::div(array('class' => 'box'),
@@ -246,7 +246,7 @@ class password extends rcube_plugin
         $file   = $this->home . "/drivers/$driver.php";
 
         if (!file_exists($file)) {
-            raise_error(array(
+            rcube::raise_error(array(
                 'code' => 600,
                 'type' => 'php',
                 'file' => __FILE__, 'line' => __LINE__,
@@ -258,7 +258,7 @@ class password extends rcube_plugin
         include_once $file;
 
         if (!class_exists($class, false) || !method_exists($class, 'save')) {
-            raise_error(array(
+            rcube::raise_error(array(
                 'code' => 600,
                 'type' => 'php',
                 'file' => __FILE__, 'line' => __LINE__,
diff --git a/plugins/password/tests/Password.php b/plugins/password/tests/Password.php
new file mode 100644
index 000000000..a9663a946
--- /dev/null
+++ b/plugins/password/tests/Password.php
@@ -0,0 +1,23 @@
+<?php
+
+class Password_Plugin extends PHPUnit_Framework_TestCase
+{
+
+    function setUp()
+    {
+        include_once dirname(__FILE__) . '/../password.php';
+    }
+
+    /**
+     * Plugin object construction test
+     */
+    function test_constructor()
+    {
+        $rcube  = rcube::get_instance();
+        $plugin = new password($rcube->api);
+
+        $this->assertInstanceOf('password', $plugin);
+        $this->assertInstanceOf('rcube_plugin', $plugin);
+    }
+}
+
diff --git a/plugins/redundant_attachments/tests/RedundantAttachments.php b/plugins/redundant_attachments/tests/RedundantAttachments.php
new file mode 100644
index 000000000..386f97e59
--- /dev/null
+++ b/plugins/redundant_attachments/tests/RedundantAttachments.php
@@ -0,0 +1,23 @@
+<?php
+
+class RedundantAttachments_Plugin extends PHPUnit_Framework_TestCase
+{
+
+    function setUp()
+    {
+        include_once dirname(__FILE__) . '/../redundant_attachments.php';
+    }
+
+    /**
+     * Plugin object construction test
+     */
+    function test_constructor()
+    {
+        $rcube  = rcube::get_instance();
+        $plugin = new redundant_attachments($rcube->api);
+
+        $this->assertInstanceOf('redundant_attachments', $plugin);
+        $this->assertInstanceOf('rcube_plugin', $plugin);
+    }
+}
+
diff --git a/plugins/show_additional_headers/show_additional_headers.php b/plugins/show_additional_headers/show_additional_headers.php
index 69ac7f2a7..1375348c2 100644
--- a/plugins/show_additional_headers/show_additional_headers.php
+++ b/plugins/show_additional_headers/show_additional_headers.php
@@ -43,7 +43,7 @@ class show_additional_headers extends rcube_plugin
     $rcmail = rcmail::get_instance();
     foreach ((array)$rcmail->config->get('show_additional_headers', array()) as $header) {
       if ($value = $p['headers']->get($header))
-        $p['output'][$header] = array('title' => $header, 'value' => Q($value));
+        $p['output'][$header] = array('title' => $header, 'value' => $value);
     }
 
     return $p;
diff --git a/plugins/show_additional_headers/tests/ShowAdditionalHeaders.php b/plugins/show_additional_headers/tests/ShowAdditionalHeaders.php
new file mode 100644
index 000000000..902ce510b
--- /dev/null
+++ b/plugins/show_additional_headers/tests/ShowAdditionalHeaders.php
@@ -0,0 +1,23 @@
+<?php
+
+class ShowAdditionalHeaders_Plugin extends PHPUnit_Framework_TestCase
+{
+
+    function setUp()
+    {
+        include_once dirname(__FILE__) . '/../show_additional_headers.php';
+    }
+
+    /**
+     * Plugin object construction test
+     */
+    function test_constructor()
+    {
+        $rcube  = rcube::get_instance();
+        $plugin = new show_additional_headers($rcube->api);
+
+        $this->assertInstanceOf('show_additional_headers', $plugin);
+        $this->assertInstanceOf('rcube_plugin', $plugin);
+    }
+}
+
diff --git a/plugins/squirrelmail_usercopy/squirrelmail_usercopy.php b/plugins/squirrelmail_usercopy/squirrelmail_usercopy.php
index bfa489ae5..d5d0d47ec 100644
--- a/plugins/squirrelmail_usercopy/squirrelmail_usercopy.php
+++ b/plugins/squirrelmail_usercopy/squirrelmail_usercopy.php
@@ -73,8 +73,8 @@ class squirrelmail_usercopy extends rcube_plugin
 				foreach ($this->abook as $rec) {
 				    // #1487096 handle multi-address and/or too long items
 				    $rec['email'] = array_shift(explode(';', $rec['email']));
-                    if (check_email(rcube_idn_to_ascii($rec['email']))) {
-                        $rec['email'] = rcube_idn_to_utf8($rec['email']);
+                    if (rcube_utils::check_email(rcube_utils::idn_to_ascii($rec['email']))) {
+                        $rec['email'] = rcube_utils::idn_to_utf8($rec['email']);
     					$contacts->insert($rec, true);
 			        }
 			    }
@@ -167,7 +167,7 @@ class squirrelmail_usercopy extends rcube_plugin
 			$sql_result = $db->query('SELECT * FROM '.$userprefs_table.' WHERE user=?', $uname); // ? is replaced with emailaddress
 
 			while ($sql_array = $db->fetch_assoc($sql_result) ) { // fetch one row from result
-				$this->prefs[$sql_array['prefkey']] = rcube_charset_convert(rtrim($sql_array['prefval']), $db_charset);
+				$this->prefs[$sql_array['prefkey']] = rcube_charset::convert(rtrim($sql_array['prefval']), $db_charset);
 			}
 
 			/* retrieve address table data */
@@ -175,11 +175,11 @@ class squirrelmail_usercopy extends rcube_plugin
 
 			// parse addres book
 			while ($sql_array = $db->fetch_assoc($sql_result) ) { // fetch one row from result
-				$rec['name']      = rcube_charset_convert(rtrim($sql_array['nickname']), $db_charset);
-				$rec['firstname'] = rcube_charset_convert(rtrim($sql_array['firstname']), $db_charset);
-				$rec['surname']   = rcube_charset_convert(rtrim($sql_array['lastname']), $db_charset);
-				$rec['email']     = rcube_charset_convert(rtrim($sql_array['email']), $db_charset);
-				$rec['note']      = rcube_charset_convert(rtrim($sql_array['label']), $db_charset);
+				$rec['name']      = rcube_charset::convert(rtrim($sql_array['nickname']), $db_charset);
+				$rec['firstname'] = rcube_charset::convert(rtrim($sql_array['firstname']), $db_charset);
+				$rec['surname']   = rcube_charset::convert(rtrim($sql_array['lastname']), $db_charset);
+				$rec['email']     = rcube_charset::convert(rtrim($sql_array['email']), $db_charset);
+				$rec['notes']     = rcube_charset::convert(rtrim($sql_array['label']), $db_charset);
 
 				if ($rec['name'] && $rec['email'])
 					$this->abook[] = $rec;
diff --git a/plugins/squirrelmail_usercopy/tests/SquirrelmailUsercopy.php b/plugins/squirrelmail_usercopy/tests/SquirrelmailUsercopy.php
new file mode 100644
index 000000000..2e35509f0
--- /dev/null
+++ b/plugins/squirrelmail_usercopy/tests/SquirrelmailUsercopy.php
@@ -0,0 +1,23 @@
+<?php
+
+class SquirrelmailUsercopy_Plugin extends PHPUnit_Framework_TestCase
+{
+
+    function setUp()
+    {
+        include_once dirname(__FILE__) . '/../squirrelmail_usercopy.php';
+    }
+
+    /**
+     * Plugin object construction test
+     */
+    function test_constructor()
+    {
+        $rcube  = rcube::get_instance();
+        $plugin = new squirrelmail_usercopy($rcube->api);
+
+        $this->assertInstanceOf('squirrelmail_usercopy', $plugin);
+        $this->assertInstanceOf('rcube_plugin', $plugin);
+    }
+}
+
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 5a3e6908e..8d48bb4c8 100644
--- a/plugins/subscriptions_option/localization/de_CH.inc
+++ b/plugins/subscriptions_option/localization/de_CH.inc
@@ -2,17 +2,21 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/de_CH/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/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 5a348e0ee..3eb18fc1d 100644
--- a/plugins/subscriptions_option/localization/en_US.inc
+++ b/plugins/subscriptions_option/localization/en_US.inc
@@ -1,5 +1,21 @@
 <?php
 
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/subscriptions_option/localization/<lang>.inc                  |
+ |                                                                       |
+ | 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.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-subscriptions_option/
+*/
+
 $labels = array();
 $labels['useimapsubscriptions']  = 'Use IMAP Subscriptions';
 
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
new file mode 100644
index 000000000..c65b5cad7
--- /dev/null
+++ b/plugins/subscriptions_option/localization/nb_NO.inc
@@ -0,0 +1,22 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/subscriptions_option/localization/<lang>.inc                  |
+ |                                                                       |
+ | 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.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-subscriptions_option/
+*/
+
+$labels = array();
+$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/subscriptions_option/subscriptions_option.php b/plugins/subscriptions_option/subscriptions_option.php
index b81a5ac8a..7678d8e94 100644
--- a/plugins/subscriptions_option/subscriptions_option.php
+++ b/plugins/subscriptions_option/subscriptions_option.php
@@ -46,7 +46,7 @@ class subscriptions_option extends rcube_plugin
             $checkbox = new html_checkbox(array('name' => '_use_subscriptions', 'id' => $field_id, 'value' => 1));
 
             $args['blocks']['main']['options']['use_subscriptions'] = array(
-                'title' => html::label($field_id, Q($this->gettext('useimapsubscriptions'))),
+                'title' => html::label($field_id, rcube::Q($this->gettext('useimapsubscriptions'))),
                 'content' => $checkbox->show($use_subscriptions?1:0),
             );
         }
diff --git a/plugins/subscriptions_option/tests/SubscriptionsOption.php b/plugins/subscriptions_option/tests/SubscriptionsOption.php
new file mode 100644
index 000000000..6932a955f
--- /dev/null
+++ b/plugins/subscriptions_option/tests/SubscriptionsOption.php
@@ -0,0 +1,23 @@
+<?php
+
+class SubscriptionsOption_Plugin extends PHPUnit_Framework_TestCase
+{
+
+    function setUp()
+    {
+        include_once dirname(__FILE__) . '/../subscriptions_option.php';
+    }
+
+    /**
+     * Plugin object construction test
+     */
+    function test_constructor()
+    {
+        $rcube  = rcube::get_instance();
+        $plugin = new subscriptions_option($rcube->api);
+
+        $this->assertInstanceOf('subscriptions_option', $plugin);
+        $this->assertInstanceOf('rcube_plugin', $plugin);
+    }
+}
+
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/zipdownload/localization/nb_NB.inc b/plugins/userinfo/localization/ber.inc
index d8f548044..12fe4442e 100644
--- a/plugins/zipdownload/localization/nb_NB.inc
+++ b/plugins/userinfo/localization/ber.inc
@@ -2,18 +2,16 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/nb_NB/labels.inc                                         |
+ | localization//labels.inc                                         |
  |                                                                       |
  | Language file of the Roundcube Webmail client                         |
  | Copyright (C) 2012, The Roundcube Dev Team                            |
  | Licensed under the GNU General Public License                         |
  |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Martin Bore                                                   |
+ | Author: FULL NAME <EMAIL@ADDRESS>                                     |
  +-----------------------------------------------------------------------+
 */
 
 $labels = array();
-$labels['downloadall'] = 'Last ned alle vedlegg';
-$labels['downloadfolder'] = 'Nedlastningsmappe';
 
diff --git a/plugins/userinfo/localization/br.inc b/plugins/userinfo/localization/br.inc
new file mode 100644
index 000000000..560e61788
--- /dev/null
+++ b/plugins/userinfo/localization/br.inc
@@ -0,0 +1,25 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/userinfo/localization/<lang>.inc                              |
+ |                                                                       |
+ | 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.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ 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 47c80f9c5..7c20f52df 100644
--- a/plugins/userinfo/localization/de_CH.inc
+++ b/plugins/userinfo/localization/de_CH.inc
@@ -2,16 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/de_CH/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'] = 'Erstellt';
 $labels['lastlogin'] = 'Letztes Login';
 $labels['defaultidentity'] = 'Standard-Absender';
 
+?>
\ No newline at end of file
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 1a2fd9016..01230de85 100644
--- a/plugins/userinfo/localization/en_US.inc
+++ b/plugins/userinfo/localization/en_US.inc
@@ -1,5 +1,21 @@
 <?php
 
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/userinfo/localization/<lang>.inc                              |
+ |                                                                       |
+ | 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.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-userinfo/
+*/
+
 $labels = array();
 $labels['userinfo'] = 'User info';
 $labels['created'] = 'Created';
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/ia_IA.inc b/plugins/userinfo/localization/ia_IA.inc
deleted file mode 100644
index d18686369..000000000
--- a/plugins/userinfo/localization/ia_IA.inc
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-/*
- +-----------------------------------------------------------------------+
- | localization/ia_IA/labels.inc                                         |
- |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
- |                                                                       |
- +-----------------------------------------------------------------------+
- | Author: Emilio Sepulveda <emilio@chilemoz.org>                        |
- +-----------------------------------------------------------------------+
- @version $Id$
-*/
-
-$labels = array();
-$labels['userinfo'] = 'Information de usator';
-$labels['created'] = 'Create';
-$labels['lastlogin'] = 'Ultime initio de session';
-$labels['defaultidentity'] = 'Identitate predeterminate';
-
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_NB.inc b/plugins/userinfo/localization/nb_NB.inc
deleted file mode 100644
index 7ae2832dd..000000000
--- a/plugins/userinfo/localization/nb_NB.inc
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-/*
- +-----------------------------------------------------------------------+
- | localization/nb_NB/labels.inc                                         |
- |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
- |                                                                       |
- +-----------------------------------------------------------------------+
- | Author: Patrick Kvaksrud <patrick@idrettsforbundet.no>                |
- +-----------------------------------------------------------------------+
-*/
-
-$labels = array();
-$labels['userinfo'] = 'Brukerinformasjon';
-$labels['created'] = 'Opprettet';
-$labels['lastlogin'] = 'Sist logget inn';
-$labels['defaultidentity'] = 'Standard identitet';
-
diff --git a/plugins/userinfo/localization/nb_NO.inc b/plugins/userinfo/localization/nb_NO.inc
new file mode 100644
index 000000000..f674375ef
--- /dev/null
+++ b/plugins/userinfo/localization/nb_NO.inc
@@ -0,0 +1,25 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/userinfo/localization/<lang>.inc                              |
+ |                                                                       |
+ | 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.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-userinfo/
+*/
+
+$labels = array();
+$labels['userinfo'] = 'Brukerinformasjon';
+$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..8c636e700 100644
--- a/plugins/userinfo/localization/nl_NL.inc
+++ b/plugins/userinfo/localization/nl_NL.inc
@@ -2,16 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | 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();
@@ -20,3 +22,4 @@ $labels['created'] = 'Aangemaakt';
 $labels['lastlogin'] = 'Laatste login';
 $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
new file mode 100644
index 000000000..749935414
--- /dev/null
+++ b/plugins/userinfo/localization/nn_NO.inc
@@ -0,0 +1,25 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/userinfo/localization/<lang>.inc                              |
+ |                                                                       |
+ | 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.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-userinfo/
+*/
+
+$labels = array();
+$labels['userinfo'] = 'Brukarinfo';
+$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 3da833196..0b8d5fedd 100644
--- a/plugins/userinfo/localization/sv_SE.inc
+++ b/plugins/userinfo/localization/sv_SE.inc
@@ -2,21 +2,24 @@
 
 /*
  +-----------------------------------------------------------------------+
- | 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: Thomas <Unknown>                                              |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/plugin-userinfo/
 */
 
 $labels = array();
 $labels['userinfo'] = 'Användarinfo';
 $labels['created'] = 'Skapad';
 $labels['lastlogin'] = 'Senast inloggad';
-$labels['defaultidentity'] = 'Standardprofil';
+$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..265c0704a 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['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/userinfo/tests/Userinfo.php b/plugins/userinfo/tests/Userinfo.php
new file mode 100644
index 000000000..762d5a1fa
--- /dev/null
+++ b/plugins/userinfo/tests/Userinfo.php
@@ -0,0 +1,23 @@
+<?php
+
+class Userinfo_Plugin extends PHPUnit_Framework_TestCase
+{
+
+    function setUp()
+    {
+        include_once dirname(__FILE__) . '/../userinfo.php';
+    }
+
+    /**
+     * Plugin object construction test
+     */
+    function test_constructor()
+    {
+        $rcube  = rcube::get_instance();
+        $plugin = new userinfo($rcube->api);
+
+        $this->assertInstanceOf('userinfo', $plugin);
+        $this->assertInstanceOf('rcube_plugin', $plugin);
+    }
+}
+
diff --git a/plugins/userinfo/userinfo.php b/plugins/userinfo/userinfo.php
index efb65f51d..a175563ef 100644
--- a/plugins/userinfo/userinfo.php
+++ b/plugins/userinfo/userinfo.php
@@ -31,25 +31,25 @@ class userinfo extends rcube_plugin
     $table = new html_table(array('cols' => 2, 'cellpadding' => 3));
 
     $table->add('title', 'ID');
-    $table->add('', Q($user->ID));
+    $table->add('', rcube::Q($user->ID));
     
-    $table->add('title', Q($this->gettext('username')));
-    $table->add('', Q($user->data['username']));
+    $table->add('title', rcube::Q($this->gettext('username')));
+    $table->add('', rcube::Q($user->data['username']));
     
-    $table->add('title', Q($this->gettext('server')));
-    $table->add('', Q($user->data['mail_host']));
+    $table->add('title', rcube::Q($this->gettext('server')));
+    $table->add('', rcube::Q($user->data['mail_host']));
 
-    $table->add('title', Q($this->gettext('created')));
-    $table->add('', Q($user->data['created']));
+    $table->add('title', rcube::Q($this->gettext('created')));
+    $table->add('', rcube::Q($user->data['created']));
 
-    $table->add('title', Q($this->gettext('lastlogin')));
-    $table->add('', Q($user->data['last_login']));
+    $table->add('title', rcube::Q($this->gettext('lastlogin')));
+    $table->add('', rcube::Q($user->data['last_login']));
     
     $identity = $user->get_identity();
-    $table->add('title', Q($this->gettext('defaultidentity')));
-    $table->add('', Q($identity['name'] . ' <' . $identity['email'] . '>'));
+    $table->add('title', rcube::Q($this->gettext('defaultidentity')));
+    $table->add('', rcube::Q($identity['name'] . ' <' . $identity['email'] . '>'));
     
-    return html::tag('h4', null, Q('Infos for ' . $user->get_username())) . $table->show();
+    return html::tag('h4', null, rcube::Q('Infos for ' . $user->get_username())) . $table->show();
   }
 
 }
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 46ed9cbf5..577586994 100644
--- a/plugins/vcard_attachments/localization/de_CH.inc
+++ b/plugins/vcard_attachments/localization/de_CH.inc
@@ -2,19 +2,22 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/de_CH/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/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 bce44d739..a52a93228 100644
--- a/plugins/vcard_attachments/localization/en_US.inc
+++ b/plugins/vcard_attachments/localization/en_US.inc
@@ -1,5 +1,21 @@
 <?php
 
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/vcard_attachments/localization/<lang>.inc                     |
+ |                                                                       |
+ | 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.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ 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';
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_NB.inc b/plugins/vcard_attachments/localization/nb_NB.inc
deleted file mode 100644
index 6568b7a12..000000000
--- a/plugins/vcard_attachments/localization/nb_NB.inc
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-/*
- +-----------------------------------------------------------------------+
- | localization/nb_NB/labels.inc                                         |
- |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2012, The Roundcube Dev Team                            |
- | Licensed under the GNU General Public License                         |
- |                                                                       |
- +-----------------------------------------------------------------------+
- | Author: Runar Furenes <Unknown>                                       |
- +-----------------------------------------------------------------------+
- @version $Id$
-*/
-
-$labels = array();
-$labels['addvcardmsg'] = 'Legg til vCard i adresseboken';
-$labels['vcardsavefailed'] = 'Ikke i stand til å lagre vCard';
-
diff --git a/plugins/vcard_attachments/localization/nb_NO.inc b/plugins/vcard_attachments/localization/nb_NO.inc
new file mode 100644
index 000000000..c6e4fd4cd
--- /dev/null
+++ b/plugins/vcard_attachments/localization/nb_NO.inc
@@ -0,0 +1,23 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/vcard_attachments/localization/<lang>.inc                     |
+ |                                                                       |
+ | 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.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ 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
new file mode 100644
index 000000000..398e08bb4
--- /dev/null
+++ b/plugins/vcard_attachments/localization/nn_NO.inc
@@ -0,0 +1,23 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | plugins/vcard_attachments/localization/<lang>.inc                     |
+ |                                                                       |
+ | 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.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ 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..6deb21da4 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['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/tests/VcardAttachments.php b/plugins/vcard_attachments/tests/VcardAttachments.php
new file mode 100644
index 000000000..35fd7f447
--- /dev/null
+++ b/plugins/vcard_attachments/tests/VcardAttachments.php
@@ -0,0 +1,23 @@
+<?php
+
+class VcardAttachments_Plugin extends PHPUnit_Framework_TestCase
+{
+
+    function setUp()
+    {
+        include_once dirname(__FILE__) . '/../vcard_attachments.php';
+    }
+
+    /**
+     * Plugin object construction test
+     */
+    function test_constructor()
+    {
+        $rcube  = rcube::get_instance();
+        $plugin = new vcard_attachments($rcube->api);
+
+        $this->assertInstanceOf('vcard_attachments', $plugin);
+        $this->assertInstanceOf('rcube_plugin', $plugin);
+    }
+}
+
diff --git a/plugins/vcard_attachments/vcard_attachments.php b/plugins/vcard_attachments/vcard_attachments.php
index e7f7d5f1f..4905b373e 100644
--- a/plugins/vcard_attachments/vcard_attachments.php
+++ b/plugins/vcard_attachments/vcard_attachments.php
@@ -90,10 +90,10 @@ class vcard_attachments extends rcube_plugin
                 $p['content'] .= html::p(array('class' => 'vcardattachment'),
                     html::a(array(
                         'href' => "#",
-                        'onclick' => "return plugin_vcard_save_contact('" . JQ($part.':'.$idx) . "')",
+                        'onclick' => "return plugin_vcard_save_contact('" . rcube::JQ($part.':'.$idx) . "')",
                         'title' => $this->gettext('addvcardmsg'),
                         ),
-                        html::span(null, Q($display)))
+                        html::span(null, rcube::Q($display)))
                     );
             }
 
@@ -115,9 +115,9 @@ class vcard_attachments extends rcube_plugin
     {
         $this->add_texts('localization', true);
 
-        $uid = get_input_value('_uid', RCUBE_INPUT_POST);
-        $mbox = get_input_value('_mbox', RCUBE_INPUT_POST);
-        $mime_id = get_input_value('_part', RCUBE_INPUT_POST);
+        $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);
 
         $rcmail  = rcmail::get_instance();
         $storage = $rcmail->get_storage();
@@ -144,7 +144,7 @@ class vcard_attachments extends rcube_plugin
             }
             else {
                 // We're using UTF8 internally
-                $email = rcube_idn_to_utf8($email);
+                $email = rcube_utils::idn_to_utf8($email);
 
                 // compare e-mail address
                 $existing = $CONTACTS->search('email', $email, 1, false);
diff --git a/plugins/virtuser_file/tests/VirtuserFile.php b/plugins/virtuser_file/tests/VirtuserFile.php
new file mode 100644
index 000000000..a4362c3dc
--- /dev/null
+++ b/plugins/virtuser_file/tests/VirtuserFile.php
@@ -0,0 +1,23 @@
+<?php
+
+class VirtuserFile_Plugin extends PHPUnit_Framework_TestCase
+{
+
+    function setUp()
+    {
+        include_once dirname(__FILE__) . '/../virtuser_file.php';
+    }
+
+    /**
+     * Plugin object construction test
+     */
+    function test_constructor()
+    {
+        $rcube  = rcube::get_instance();
+        $plugin = new virtuser_file($rcube->api);
+
+        $this->assertInstanceOf('virtuser_file', $plugin);
+        $this->assertInstanceOf('rcube_plugin', $plugin);
+    }
+}
+
diff --git a/plugins/virtuser_file/virtuser_file.php b/plugins/virtuser_file/virtuser_file.php
index 01032616c..2c705b2d0 100644
--- a/plugins/virtuser_file/virtuser_file.php
+++ b/plugins/virtuser_file/virtuser_file.php
@@ -41,7 +41,7 @@ class virtuser_file extends rcube_plugin
 	        $arr = preg_split('/\s+/', $r[$i]);
 
 	        if (count($arr) > 0 && strpos($arr[0], '@')) {
-		        $result[] = rcube_idn_to_ascii(trim(str_replace('\\@', '@', $arr[0])));
+		        $result[] = rcube_utils::idn_to_ascii(trim(str_replace('\\@', '@', $arr[0])));
 
 		        if ($p['first']) {
 		            $p['email'] = $result[0];
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/tests/VirtuserQuery.php b/plugins/virtuser_query/tests/VirtuserQuery.php
new file mode 100644
index 000000000..d5bd4ee4b
--- /dev/null
+++ b/plugins/virtuser_query/tests/VirtuserQuery.php
@@ -0,0 +1,23 @@
+<?php
+
+class VirtuserQuery_Plugin extends PHPUnit_Framework_TestCase
+{
+
+    function setUp()
+    {
+        include_once dirname(__FILE__) . '/../virtuser_query.php';
+    }
+
+    /**
+     * Plugin object construction test
+     */
+    function test_constructor()
+    {
+        $rcube  = rcube::get_instance();
+        $plugin = new virtuser_query($rcube->api);
+
+        $this->assertInstanceOf('virtuser_query', $plugin);
+        $this->assertInstanceOf('rcube_plugin', $plugin);
+    }
+}
+
diff --git a/plugins/virtuser_query/virtuser_query.php b/plugins/virtuser_query/virtuser_query.php
index 073b4e230..675eb7c1b 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,11 +28,12 @@ class virtuser_query extends rcube_plugin
 {
     private $config;
     private $app;
+    private $db;
 
     function init()
     {
-	    $this->app = rcmail::get_instance();
-	    $this->config = $this->app->config->get('virtuser_query');
+        $this->app    = rcmail::get_instance();
+        $this->config = $this->app->config->get('virtuser_query');
 
         if (!empty($this->config)) {
             if (is_string($this->config)) {
@@ -53,35 +57,35 @@ class virtuser_query extends rcube_plugin
      */
     function user2email($p)
     {
-	    $dbh = $this->app->get_dbh();
-
-	    $sql_result = $dbh->query(preg_replace('/%u/', $dbh->escapeSimple($p['user']), $this->config['email']));
-
-	    while ($sql_arr = $dbh->fetch_array($sql_result)) {
-	        if (strpos($sql_arr[0], '@')) {
-		        if ($p['extended'] && count($sql_arr) > 1) {
-		            $result[] = array(
-			            'email' 	    => rcube_idn_to_ascii($sql_arr[0]),
-            			'name' 		    => $sql_arr[1],
-			            'organization'  => $sql_arr[2],
-            			'reply-to' 	    => rcube_idn_to_ascii($sql_arr[3]),
-			            'bcc' 		    => rcube_idn_to_ascii($sql_arr[4]),
-        			    'signature' 	=> $sql_arr[5],
-		            	'html_signature' => (int)$sql_arr[6],
-    		        );
-		        }
-		        else {
-		            $result[] = $sql_arr[0];
-		        }
-
-		        if ($p['first'])
-		            break;
-	        }
-	    }
-
-	    $p['email'] = $result;
-
-	    return $p;
+        $dbh = $this->get_dbh();
+
+        $sql_result = $dbh->query(preg_replace('/%u/', $dbh->escapeSimple($p['user']), $this->config['email']));
+
+        while ($sql_arr = $dbh->fetch_array($sql_result)) {
+            if (strpos($sql_arr[0], '@')) {
+                if ($p['extended'] && count($sql_arr) > 1) {
+                    $result[] = array(
+                        'email'         => rcube_utils::idn_to_ascii($sql_arr[0]),
+                        'name'          => $sql_arr[1],
+                        'organization'  => $sql_arr[2],
+                        'reply-to'      => rcube_utils::idn_to_ascii($sql_arr[3]),
+                        'bcc'           => rcube_utils::idn_to_ascii($sql_arr[4]),
+                        'signature'     => $sql_arr[5],
+                        'html_signature' => (int)$sql_arr[6],
+                    );
+                }
+                else {
+                    $result[] = $sql_arr[0];
+                }
+
+                if ($p['first'])
+                    break;
+            }
+        }
+
+        $p['email'] = $result;
+
+        return $p;
     }
 
     /**
@@ -89,7 +93,7 @@ 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']));
 
@@ -105,7 +109,7 @@ 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']));
 
@@ -116,5 +120,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
new file mode 100644
index 000000000..6e6cdb342
--- /dev/null
+++ b/plugins/zipdownload/localization/br.inc
@@ -0,0 +1,23 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | 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'] = '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 68725605b..6106c2c72 100644
--- a/plugins/zipdownload/localization/de_CH.inc
+++ b/plugins/zipdownload/localization/de_CH.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/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 0db6f8f8c..aee8a5e15 100644
--- a/plugins/zipdownload/localization/en_US.inc
+++ b/plugins/zipdownload/localization/en_US.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/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
new file mode 100644
index 000000000..637df9063
--- /dev/null
+++ b/plugins/zipdownload/localization/nb_NO.inc
@@ -0,0 +1,23 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | 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'] = '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
new file mode 100644
index 000000000..637df9063
--- /dev/null
+++ b/plugins/zipdownload/localization/nn_NO.inc
@@ -0,0 +1,23 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | 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'] = '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
new file mode 100644
index 000000000..b8d63b3f5
--- /dev/null
+++ b/plugins/zipdownload/localization/sr_CS.inc
@@ -0,0 +1,23 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | 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'] = 'Фа�цикла за преузимање';
+
+?>
\ 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/tests/Zipdownload.php b/plugins/zipdownload/tests/Zipdownload.php
new file mode 100644
index 000000000..f3b4e1b35
--- /dev/null
+++ b/plugins/zipdownload/tests/Zipdownload.php
@@ -0,0 +1,23 @@
+<?php
+
+class Zipdownload_Plugin extends PHPUnit_Framework_TestCase
+{
+
+    function setUp()
+    {
+        include_once dirname(__FILE__) . '/../zipdownload.php';
+    }
+
+    /**
+     * Plugin object construction test
+     */
+    function test_constructor()
+    {
+        $rcube  = rcube::get_instance();
+        $plugin = new zipdownload($rcube->api);
+
+        $this->assertInstanceOf('zipdownload', $plugin);
+        $this->assertInstanceOf('rcube_plugin', $plugin);
+    }
+}
+
diff --git a/plugins/zipdownload/zipdownload.php b/plugins/zipdownload/zipdownload.php
index 8bad9b341..7e132bfbb 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', RCMAIL_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'))
@@ -62,11 +62,14 @@ class zipdownload extends rcube_plugin
 
 		// only show the link if there is more than the configured number of attachments
 		if (substr_count($p['content'], '<li') > $rcmail->config->get('zipdownload_attachments', 1)) {
-			$link = html::a(array(
-				'href' => rcmail_url('plugin.zipdownload.zip_attachments', array('_mbox' => $rcmail->output->env['mailbox'], '_uid' => $rcmail->output->env['uid'])),
-				'class' => 'button zipdownload',
-				),
-				Q($this->gettext('downloadall'))
+		    $href = $rcmail->url(array(
+		        '_action' => 'plugin.zipdownload.zip_attachments',
+		        '_mbox'   => $rcmail->output->env['mailbox'],
+		        '_uid'    => $rcmail->output->env['uid'],
+		    ));
+
+			$link = html::a(array('href' => $href, 'class' => 'button zipdownload'),
+				rcube::Q($this->gettext('downloadall'))
 			);
 
 			// append link to attachments list, slightly different in some skins
@@ -96,7 +99,7 @@ class zipdownload extends rcube_plugin
 		$temp_dir = $rcmail->config->get('temp_dir');
 		$tmpfname = tempnam($temp_dir, 'zipdownload');
 		$tempfiles = array($tmpfname);
-		$message = new rcube_message(get_input_value('_uid', RCUBE_INPUT_GET));
+		$message = new rcube_message(rcube_utils::get_input_value('_uid', rcube_utils::INPUT_GET));
 
 		// open zip file
 		$zip = new ZipArchive();
@@ -140,7 +143,7 @@ class zipdownload extends rcube_plugin
 	public function download_selection()
 	{
 		if (isset($_REQUEST['_uid'])) {
-			$uids = explode(",", get_input_value('_uid', RCUBE_INPUT_GPC));
+			$uids = explode(",", rcube_utils::get_input_value('_uid', rcube_utils::INPUT_GPC));
 
 			if (sizeof($uids) > 0)
 				$this->_download_messages($uids);
@@ -157,7 +160,7 @@ class zipdownload extends rcube_plugin
 
 		// initialize searching result if search_filter is used
 		if ($_SESSION['search_filter'] && $_SESSION['search_filter'] != 'ALL') {
-			$imap->search($mbox_name, $_SESSION['search_filter'], RCMAIL_CHARSET);
+			$imap->search($mbox_name, $_SESSION['search_filter'], RCUBE_CHARSET);
 		}
 
 		// fetch message headers for all pages
@@ -208,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);
@@ -234,7 +237,9 @@ class zipdownload extends rcube_plugin
 	private function _deliver_zipfile($tmpfname, $filename)
 	{
 		$browser = new rcube_browser;
-		send_nocacheing_headers();
+		$rcmail  = rcmail::get_instance();
+
+		$rcmail->output->nocacheing_headers();
 
 		if ($browser->ie && $browser->ver < 7)
 			$filename = rawurlencode(abbreviate_string($filename, 55));
@@ -258,10 +263,10 @@ class zipdownload extends rcube_plugin
 	/**
 	 * Helper function to convert filenames to the configured charset
 	 */
-	private function _convert_filename($str, $from = RCMAIL_CHARSET)
+	private function _convert_filename($str, $from = RCUBE_CHARSET)
 	{
-		return strtr(rcube_charset_convert($str, $from, $this->charset), array(':'=>'', '/'=>'-'));
+        $str = rcube_charset::convert($str, $from == '' ? RCUBE_CHARSET : $from, $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 5047e0a84..d8356338d 100644
--- a/program/include/bc.php
+++ b/program/include/bc.php
@@ -23,6 +23,7 @@
  * Roundcube Webmail deprecated functions
  *
  * @package Core
+ * @subpackage Legacy
  * @author Thomas Bruederli <roundcube@gmail.com>
  */
 
@@ -204,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)
@@ -399,7 +400,19 @@ function get_boolean($str)
     return rcube_utils::get_boolean($str);
 }
 
+function enriched_to_html($data)
+{
+    return rcube_enriched::to_html($data);
+}
+
 class rcube_html_page extends rcmail_html_page
 {
-    
+}
+
+class washtml extends rcube_washtml
+{
+}
+
+class html2text extends rcube_html2text
+{
 }
diff --git a/program/include/iniset.php b/program/include/iniset.php
index be71fc084..b32ae4e8e 100644
--- a/program/include/iniset.php
+++ b/program/include/iniset.php
@@ -5,7 +5,7 @@
  | program/include/iniset.php                                            |
  |                                                                       |
  | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2008-2012, The Roundcube Dev Team                       |
+ | Copyright (C) 2008-2013, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -21,7 +21,7 @@
 */
 
 // application constants
-define('RCMAIL_VERSION', '0.9-git');
+define('RCMAIL_VERSION', '1.0-git');
 define('RCMAIL_START', microtime(true));
 
 $config = array(
diff --git a/program/include/rcmail.php b/program/include/rcmail.php
index 8e01a2155..1bde4034f 100644
--- a/program/include/rcmail.php
+++ b/program/include/rcmail.php
@@ -123,7 +123,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;
@@ -934,15 +934,26 @@ class rcmail extends rcube
      * @param object $message    Reference to Mail_MIME object
      * @param string $from       Sender address string
      * @param array  $mailto     Array of recipient address strings
-     * @param array  $smtp_error SMTP error array (reference)
+     * @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  $smtp_opts  SMTP options (e.g. DSN request)
+     * @param array  $options    SMTP options (e.g. DSN request)
      *
      * @return boolean Send status.
      */
-    public function deliver_message(&$message, $from, $mailto, &$smtp_error, &$body_file = null, $smtp_opts = null)
+    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
@@ -985,15 +996,15 @@ class rcmail extends rcube
                 $this->smtp_init(true);
             }
 
-            $sent = $this->smtp->send_mail($from, $a_recipients, $smtp_headers, $msg_body, $smtp_opts);
-            $smtp_response = $this->smtp->get_response();
-            $smtp_error = $this->smtp->get_error();
+            $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", $smtp_response)), TRUE, FALSE);
+                    'message' => "SMTP error: ".join("\n", $response)), TRUE, FALSE);
             }
         }
         // send mail using PHP's mail() function
@@ -1061,7 +1072,7 @@ class rcmail extends rcube
                     $this->user->get_username(),
                     $_SERVER['REMOTE_ADDR'],
                     $mailto,
-                    !empty($smtp_response) ? join('; ', $smtp_response) : ''));
+                    !empty($response) ? join('; ', $response) : ''));
             }
         }
 
@@ -1395,6 +1406,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']);
@@ -1573,14 +1585,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']
@@ -1666,12 +1677,31 @@ class rcmail extends rcube
      * Try to localize the given IMAP folder name.
      * UTF-7 decode it in case no localized text was found
      *
-     * @param string $name  Folder name
+     * @param string $name      Folder name
+     * @param bool   $with_path Enable path localization
      *
      * @return string Localized folder name in UTF-8 encoding
      */
-    public function localize_foldername($name)
+    public function localize_foldername($name, $with_path = true)
     {
+        // try to localize path of the folder
+        if ($with_path) {
+            $storage   = $this->get_storage();
+            $delimiter = $storage->get_hierarchy_delimiter();
+            $path      = explode($delimiter, $name);
+            $count     = count($path);
+
+            if ($count > 1) {
+                for ($i = 0; $i < $count; $i++) {
+                    $folder = implode($delimiter, array_slice($path, 0, -$i));
+                    if ($folder_class = $this->folder_classname($folder)) {
+                        $name = implode($delimiter, array_slice($path, $count - $i));
+                        return $this->gettext($folder_class) . $delimiter . rcube_charset::convert($name, 'UTF7-IMAP');
+                    }
+                }
+            }
+        }
+
         if ($folder_class = $this->folder_classname($name)) {
             return $this->gettext($folder_class);
         }
@@ -1768,32 +1798,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 2624d590a..5d07b8d04 100644
--- a/program/include/rcmail_html_page.php
+++ b/program/include/rcmail_html_page.php
@@ -5,7 +5,7 @@
  | program/include/rcmail_html_page.php                                  |
  |                                                                       |
  | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2006-2012, 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.                |
@@ -21,7 +21,7 @@
 
 
 /**
- * Class to create HTML page output using a skin template
+ * Class to create an empty HTML page with some default styles
  *
  * @package    Core
  * @subpackage View
@@ -30,7 +30,19 @@ 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')) {
+            $this->include_css($embed_css);
+        }
+        else {  // set default styles for warning blocks inside the attachment part frame
+            $this->add_header(html::tag('style', array('type' => 'text/css'),
+                ".rcmail-inline-message { font-family: sans-serif; border:2px solid #ffdf0e; background:#fef893; padding:0.6em 1em; margin-bottom:0.6em }\n" .
+                ".rcmail-inline-buttons { margin-bottom:0 }"
+            ));
+        }
+
         parent::write($contents);
     }
 }
\ No newline at end of file
diff --git a/program/include/rcmail_output_html.php b/program/include/rcmail_output_html.php
index 795c0b381..f2bdd95a7 100644
--- a/program/include/rcmail_output_html.php
+++ b/program/include/rcmail_output_html.php
@@ -80,6 +80,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');
@@ -164,6 +166,7 @@ class rcmail_output_html extends rcmail_output
         }
 
         $this->config->set('skin_path', $skin_path);
+        $this->base_path = $skin_path;
 
         // register skin path(s)
         $this->skin_paths = array();
@@ -214,7 +217,7 @@ class rcmail_output_html extends rcmail_output
      * @param string Additional path to search in
      * @return mixed Relative path to the requested file or False if not found
      */
-    public function get_skin_file($file, &$skin_path, $add_path = null)
+    public function get_skin_file($file, &$skin_path = null, $add_path = null)
     {
         $skin_paths = $this->skin_paths;
         if ($add_path)
@@ -304,13 +307,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       = '';
@@ -355,7 +364,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();
         }
 
@@ -379,7 +388,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));
@@ -389,9 +398,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']);
@@ -462,6 +473,7 @@ class rcmail_output_html extends rcmail_output
             if (is_readable($path)) {
                 $this->config->set('skin_path', $skin_path);
                 $this->base_path = preg_replace('!plugins/\w+/!', '', $skin_path);  // set base_path to core skin directory (not plugin's skin)
+                $skin_dir = preg_replace('!^plugins/!', '', $skin_path);
                 break;
             }
             else {
@@ -643,6 +655,7 @@ class rcmail_output_html extends rcmail_output
     protected function file_callback($matches)
     {
         $file = $matches[3];
+        $file[0] = preg_replace('!^/this/!', '/', $file[0]);
 
         // correct absolute paths
         if ($file[0] == '/') {
@@ -665,12 +678,15 @@ 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)
     {
-        return $this->parse_xml($input);
+        $input = $this->parse_conditions($input);
+        $input = $this->parse_xml($input);
+
+        return $input;
     }
 
 
@@ -888,6 +904,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);
@@ -1194,6 +1211,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;
     }
 
@@ -1576,10 +1597,10 @@ class rcmail_output_html extends rcmail_output
                 }
             }
         }
-        else if (is_array($default_host) && ($host = array_pop($default_host))) {
+        else if (is_array($default_host) && ($host = key($default_host)) !== null) {
             $hide_host = true;
             $input_host = new html_hiddenfield(array(
-                'name' => '_host', 'id' => 'rcmloginhost', 'value' => $host) + $attrib);
+                'name' => '_host', 'id' => 'rcmloginhost', 'value' => is_numeric($host) ? $default_host[$host] : $host) + $attrib);
         }
         else if (empty($default_host)) {
             $input_host = new html_inputfield(array('name' => '_host', 'id' => 'rcmloginhost')
diff --git a/program/js/app.js b/program/js/app.js
index 955c77ff5..5d7e28640 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -3,8 +3,8 @@
  | Roundcube Webmail Client Script                                       |
  |                                                                       |
  | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2005-2012, The Roundcube Dev Team                       |
- | Copyright (C) 2011, Kolab Systems AG                                  |
+ | Copyright (C) 2005-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.                |
@@ -179,7 +179,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);
@@ -205,12 +206,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');
@@ -219,14 +221,15 @@ function rcube_webmail()
         if (this.gui_objects.qsearchbox) {
           if (this.env.search_text != null)
             this.gui_objects.qsearchbox.value = this.env.search_text;
-          $(this.gui_objects.qsearchbox).focusin(function() { rcmail.message_list.blur(); });
+          $(this.gui_objects.qsearchbox).focusin(function() { rcmail.message_list && rcmail.message_list.blur(); });
         }
 
         this.set_button_titles();
 
-        this.env.message_commands = ['show', 'reply', 'reply-all', 'reply-list', 'forward',
-          'moveto', 'copy', 'delete', 'open', 'mark', 'edit', 'viewsource', 'download',
-          'print', 'load-attachment', 'show-headers', 'hide-headers', 'forward-attachment'];
+        this.env.message_commands = ['show', 'reply', 'reply-all', 'reply-list',
+          'moveto', 'copy', 'delete', 'open', 'mark', 'edit', 'viewsource',
+          '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);
@@ -250,7 +253,7 @@ function rcube_webmail()
           }
         }
         else if (this.env.action == 'compose') {
-          this.env.compose_commands = ['send-attachment', 'remove-attachment', 'send', 'cancel', 'toggle-editor', 'list-adresses', 'extwin'];
+          this.env.compose_commands = ['send-attachment', 'remove-attachment', 'send', 'cancel', 'toggle-editor', 'list-adresses', 'search', 'reset-search', 'extwin'];
 
           if (this.env.drafts_mailbox)
             this.env.compose_commands.push('savedraft')
@@ -311,7 +314,7 @@ function rcube_webmail()
         }
 
         // detect browser capabilities
-        if (!this.is_framed())
+        if (!this.is_framed() && !this.env.extwin)
           this.browser_capabilities_check();
 
         break;
@@ -360,7 +363,7 @@ function rcube_webmail()
 
         if (this.gui_objects.editform) {
           this.enable_command('save', true);
-          if (this.env.action == 'add' || this.env.action == 'edit')
+          if (this.env.action == 'add' || this.env.action == 'edit' || this.env.action == 'search')
               this.init_contact_form();
         }
 
@@ -440,10 +443,11 @@ function rcube_webmail()
 
         this.enable_command('login', true);
         break;
+    }
 
-      default:
-        break;
-      }
+    // unset contentframe variable if preview_pane is enabled
+    if (this.env.contentframe && !$('#' + this.env.contentframe).is(':visible'))
+      this.env.contentframe = null;
 
     // prevent from form submit with Enter key in file input fields
     if (bw.ie)
@@ -457,9 +461,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'); });
@@ -507,7 +525,7 @@ function rcube_webmail()
       return false;
 
     // let the browser handle this click (shift/ctrl usually opens the link in a new window/tab)
-    if ((obj && obj.href && String(obj.href).indexOf(location.href) < 0) && rcube_event.get_modifier(event)) {
+    if ((obj && obj.href && String(obj.href).indexOf('#') < 0) && rcube_event.get_modifier(event)) {
       return true;
     }
 
@@ -578,18 +596,35 @@ 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('', 1150, 900);
-          this.gui_objects.messageform.submit();
+          var form = this.gui_objects.messageform;
+
+          $("input[name='_action']", form).val('compose');
+          form.action = this.url('mail/compose', { _id: this.env.compose_id, _extwin: 1 });
+          form.target = this.open_window('', 1100, 900);
+          form.submit();
         }
         else {
-          this.open_window(this.env.permaurl, 1000, 1200);
+          this.open_window(this.env.permaurl, 900, 900);
         }
         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;
@@ -650,13 +685,13 @@ function rcube_webmail()
         break;
 
       case 'expunge':
-        if (this.env.messagecount)
+        if (this.env.exists)
           this.expunge_mailbox(this.env.mailbox);
         break;
 
       case 'purge':
       case 'empty-mailbox':
-        if (this.env.messagecount)
+        if (this.env.exists)
           this.purge_mailbox(this.env.mailbox);
         break;
 
@@ -754,7 +789,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;
 
@@ -815,15 +850,16 @@ 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, $.map(this.env.mimetypes, function(v,k){ return v })) >= 0) {
-          if (props.mimetype == 'text/html')
-            qstring += '&_safe=1';
-          this.attachment_win = window.open(this.env.comm_path+'&_action=get&'+qstring+'&_frame=1', 'rcubemailattachment');
-          if (this.attachment_win) {
-            setTimeout(function(){ ref.attachment_win.focus(); }, 10);
+        if (command != 'download-attachment' && mimetype && this.env.mimetypes && $.inArray(mimetype, this.env.mimetypes) >= 0) {
+          var attachment_win = window.open(this.env.comm_path+'&_action=get&'+qstring+'&_frame=1', this.html_identifier('rcubemailattachment'+this.env.uid+props));
+          if (attachment_win) {
+            setTimeout(function(){ attachment_win.focus(); }, 10);
             break;
           }
         }
@@ -864,7 +900,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':
@@ -944,8 +980,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;
         }
@@ -989,7 +1025,7 @@ function rcube_webmail()
         if (uid = this.get_single_uid()) {
           url = {_reply_uid: uid, _mbox: this.env.mailbox};
           if (command == 'reply-all')
-            // do reply-list, when list is detected and popup menu wasn't used 
+            // do reply-list, when list is detected and popup menu wasn't used
             url._all = (!props && this.commands['reply-list'] ? 'list' : 'all');
           else if (command == 'reply-list')
             url._all = 'list';
@@ -999,10 +1035,12 @@ function rcube_webmail()
         break;
 
       case 'forward-attachment':
+      case 'forward-inline':
       case 'forward':
-        if (uid = this.get_single_uid()) {
-          url = { _forward_uid: uid, _mbox: this.env.mailbox };
-          if (command == 'forward-attachment' || (!props && this.env.forward_attachment))
+        var uids = this.env.uid ? [this.env.uid] : (this.message_list ? this.message_list.get_selection() : []);
+        if (uids.length) {
+          url = { _forward_uid: this.uids_to_list(uids), _mbox: this.env.mailbox };
+          if (command == 'forward-attachment' || (!props && this.env.forward_attachment) || uids.length > 1)
             url._attachment = 1;
           this.open_compose_step(url);
         }
@@ -1048,8 +1086,13 @@ function rcube_webmail()
         this.reset_qsearch();
         this.select_all_mode = false;
 
-        if (s && this.env.mailbox)
+        if (s && this.env.action == 'compose') {
+          if (this.contact_list)
+            this.list_contacts_clear();
+        }
+        else if (s && this.env.mailbox) {
           this.list_mailbox(this.env.mailbox, 1);
+        }
         else if (s && this.task == 'addressbook') {
           if (this.env.source == '') {
             for (n in this.env.address_sources) break;
@@ -1086,6 +1129,12 @@ function rcube_webmail()
         }
         break;
 
+      case 'export-selected':
+        if (this.contact_list.rowcount > 0) {
+          this.goto_url('export', { _source: this.env.source, _gid: this.env.group, _cid: this.contact_list.get_selection().join(',') });
+        }
+        break;
+
       case 'upload-photo':
         this.upload_contact_photo(props || this.gui_objects.uploadform);
         break;
@@ -1197,7 +1246,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)
@@ -1250,11 +1299,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)
@@ -1307,29 +1357,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)
@@ -1337,85 +1367,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');
-          } else { // Clear target, otherwise drag end will trigger move into last valid droptarget
-            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)
@@ -1425,40 +1398,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)
@@ -1483,9 +1449,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);
@@ -1520,22 +1486,22 @@ function rcube_webmail()
     if (this.preview_read_timer)
       clearTimeout(this.preview_read_timer);
 
-    var selected = list.get_single_selection() != null;
+    var selected = list.get_single_selection();
 
-    this.enable_command(this.env.message_commands, selected);
+    this.enable_command(this.env.message_commands, selected != null);
     if (selected) {
       // Hide certain command buttons when Drafts folder is selected
       if (this.env.mailbox == this.env.drafts_mailbox)
-        this.enable_command('reply', 'reply-all', 'reply-list', 'forward', 'forward-attachment', false);
+        this.enable_command('reply', 'reply-all', 'reply-list', 'forward', 'forward-attachment', 'forward-inline', false);
       // Disable reply-list when List-Post header is not set
       else {
-        var msg = this.env.messages[list.get_single_selection()];
+        var msg = this.env.messages[selected];
         if (!msg.ml)
           this.enable_command('reply-list', false);
       }
     }
     // Multi-message commands
-    this.enable_command('delete', 'moveto', 'copy', 'mark', (list.selection.length > 0 ? true : false));
+    this.enable_command('delete', 'moveto', 'copy', 'mark', 'forward', 'forward-attachment', list.selection.length > 0);
 
     // reset all-pages-selection
     if (selected || (list.selection.length && list.selection.length != list.rowcount))
@@ -1637,27 +1603,31 @@ function rcube_webmail()
 
   this.check_droptarget = function(id)
   {
-    var allow = false, copy = false;
-
     if (this.task == 'mail')
-      allow = (this.env.mailboxes[id] && this.env.mailboxes[id].id != this.env.mailbox && !this.env.mailboxes[id].virtual);
-    else if (this.task == 'settings')
-      allow = (id != this.env.mailbox);
-    else if (this.task == 'addressbook') {
+      return (this.env.mailboxes[id] && this.env.mailboxes[id].id != this.env.mailbox && !this.env.mailboxes[id].virtual) ? 1 : 0;
+
+    if (this.task == 'settings')
+      return id != this.env.mailbox ? 1 : 0;
+
+    if (this.task == 'addressbook') {
       if (id != this.env.source && this.env.contactfolders[id]) {
+        // droptarget is a group - contact add to group action
         if (this.env.contactfolders[id].type == 'group') {
           var target_abook = this.env.contactfolders[id].source;
-          allow = this.env.contactfolders[id].id != this.env.group && !this.env.contactfolders[target_abook].readonly;
-          copy = target_abook != this.env.source;
+          if (this.env.contactfolders[id].id != this.env.group && !this.env.contactfolders[target_abook].readonly) {
+            // search result may contain contacts from many sources
+            return (this.env.selection_sources.length > 1 || $.inArray(target_abook, this.env.selection_sources) == -1) ? 2 : 1;
+          }
         }
-        else {
-          allow = !this.env.contactfolders[id].readonly;
-          copy = true;
+        // droptarget is a (writable) addressbook - contact copy action
+        else if (!this.env.contactfolders[id].readonly) {
+          // search result may contain contacts from many sources
+          return (this.env.selection_sources.length > 1 || $.inArray(id, this.env.selection_sources) == -1) ? 2 : 0;
         }
       }
     }
 
-    return allow ? (copy ? 2 : 1) : 0;
+    return 0;
   };
 
   this.open_window = function(url, width, height)
@@ -1665,11 +1635,10 @@ function rcube_webmail()
     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);
-
-    var 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');
-    extwin.moveTo(l,t);
+      t = Math.max(0, (screen.height - h) / 2 + (screen.top || 0) - 20),
+      wname = 'rcmextwin' + new Date().getTime(),
+      extwin = window.open(url + (url.match(/\?/) ? '&' : '?') + '_extwin=1', wname,
+        'width='+w+',height='+h+',top='+t+',left='+l+',resizable=yes,toolbar=no,status=no,location=no');
 
     // write loading... message to empty windows
     if (!url && extwin.document) {
@@ -1677,7 +1646,9 @@ function rcube_webmail()
     }
 
     // focus window, delayed to bring to front
-    window.setTimeout(function(){ extwin.focus(); }, 10);
+    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;
   };
@@ -2550,27 +2521,18 @@ function rcube_webmail()
     if (mbox && typeof mbox === 'object')
       mbox = mbox.id;
 
-    // exit if current or no mailbox specified or if selection is empty
-    if (!mbox || mbox == this.env.mailbox || (!this.env.uid && (!this.message_list || !this.message_list.get_selection().length)))
+    // exit if current or no mailbox specified
+    if (!mbox || mbox == this.env.mailbox)
       return;
 
-    var a_uids = [], n, selection,
-      lock = this.display_message(this.get_label('copyingmessage'), 'loading'),
-      post_data = {_mbox: this.env.mailbox, _target_mbox: mbox, _from: (this.env.action ? this.env.action : '')};
-
-    if (this.env.uid)
-      a_uids[0] = this.env.uid;
-    else {
-      selection = this.message_list.get_selection();
-      for (n in selection) {
-        a_uids.push(selection[n]);
-      }
-    }
+    var post_data = this.selection_post_data({_target_mbox: mbox});
 
-    post_data._uid = this.uids_to_list(a_uids);
+    // exit if selection is empty
+    if (!post_data._uid)
+      return;
 
     // send request to server
-    this.http_post('copy', post_data, lock);
+    this.http_post('copy', post_data, this.display_message(this.get_label('copyingmessage'), 'loading'));
   };
 
   // move selected messages to the specified mailbox
@@ -2579,12 +2541,15 @@ function rcube_webmail()
     if (mbox && typeof mbox === 'object')
       mbox = mbox.id;
 
-    // exit if current or no mailbox specified or if selection is empty
-    if (!mbox || mbox == this.env.mailbox || (!this.env.uid && (!this.message_list || !this.message_list.get_selection().length)))
+    // exit if current or no mailbox specified
+    if (!mbox || mbox == this.env.mailbox)
       return;
 
-    var lock = false,
-      add_post = {_target_mbox: mbox, _from: (this.env.action ? this.env.action : '')};
+    var lock = false, post_data = this.selection_post_data({_target_mbox: mbox});
+
+    // exit if selection is empty
+    if (!post_data._uid)
+      return;
 
     // show wait message
     if (this.env.action == 'show')
@@ -2595,7 +2560,7 @@ function rcube_webmail()
     // Hide message command buttons until a message is selected
     this.enable_command(this.env.message_commands, false);
 
-    this._with_selected_messages('moveto', lock, add_post);
+    this._with_selected_messages('moveto', post_data, lock);
   };
 
   // delete selected messages from the current mailbox
@@ -2603,7 +2568,7 @@ function rcube_webmail()
   {
     var uid, i, len, trash = this.env.trash_mailbox,
       list = this.message_list,
-      selection = list ? $.merge([], list.get_selection()) : [];
+      selection = list ? list.get_selection() : [];
 
     // exit if no mailbox specified or if selection is empty
     if (!this.env.uid && !selection.length)
@@ -2622,7 +2587,6 @@ function rcube_webmail()
       return false;
     }
     // if there isn't a defined trash mailbox or we are in it
-    // @TODO: we should check if defined trash mailbox exists
     else if (!trash || this.env.mailbox == trash)
       this.permanently_remove_messages();
     // we're in Junk folder and delete_junk is enabled
@@ -2645,32 +2609,29 @@ function rcube_webmail()
   // delete the selected messages permanently
   this.permanently_remove_messages = function()
   {
-    // exit if no mailbox specified or if selection is empty
-    if (!this.env.uid && (!this.message_list || !this.message_list.get_selection().length))
+    var post_data = this.selection_post_data();
+
+    // exit if selection is empty
+    if (!post_data._uid)
       return;
 
     this.show_contentframe(false);
-    this._with_selected_messages('delete', false, {_from: this.env.action ? this.env.action : ''});
+    this._with_selected_messages('delete', post_data);
   };
 
   // Send a specifc moveto/delete request with UIDs of all selected messages
   // @private
-  this._with_selected_messages = function(action, lock, post_data)
+  this._with_selected_messages = function(action, post_data, lock)
   {
-    var a_uids = [], count = 0, msg, lock;
-
-    if (typeof(post_data) != 'object')
-      post_data = {};
+    var count = 0, msg;
 
-    if (this.env.uid)
-      a_uids[0] = this.env.uid;
-    else {
+    // update the list (remove rows, clear selection)
+    if (this.message_list) {
       var n, id, root, roots = [],
         selection = this.message_list.get_selection();
 
       for (n=0, len=selection.length; n<len; n++) {
         id = selection[n];
-        a_uids.push(id);
 
         if (this.env.threading) {
           count += this.update_thread(id);
@@ -2690,10 +2651,6 @@ function rcube_webmail()
       }
     }
 
-    // also send search request to get the right messages
-    if (this.env.search_request)
-      post_data._search = this.env.search_request;
-
     if (this.env.display_next && this.env.next_uid)
       post_data._next_uid = this.env.next_uid;
 
@@ -2703,9 +2660,6 @@ function rcube_webmail()
     else if (count > 0)
       this.delete_excessive_thread_rows();
 
-    post_data._uid = this.uids_to_list(a_uids);
-    post_data._mbox = this.env.mailbox;
-
     if (!lock) {
       msg = action == 'moveto' ? 'movingmessage' : 'deletingmessage';
       lock = this.display_message(this.get_label(msg), 'loading');
@@ -2715,22 +2669,41 @@ function rcube_webmail()
     this.http_post(action, post_data, lock);
   };
 
+  // build post data for message delete/move/copy/flag requests
+  this.selection_post_data = function(data)
+  {
+    if (typeof(data) != 'object')
+      data = {};
+
+    data._mbox = this.env.mailbox;
+
+    if (!data._uid) {
+      var uids = this.env.uid ? [this.env.uid] : this.message_list.get_selection();
+      data._uid = this.uids_to_list(uids);
+    }
+
+    if (this.env.action)
+      data._from = this.env.action;
+
+    // also send search request to get the right messages
+    if (this.env.search_request)
+      data._search = this.env.search_request;
+
+    return data;
+  };
+
   // set a specific flag to one or more messages
   this.mark_message = function(flag, uid)
   {
-    var a_uids = [], r_uids = [], len, n, id, selection,
+    var a_uids = [], r_uids = [], len, n, id,
       list = this.message_list;
 
     if (uid)
       a_uids[0] = uid;
     else if (this.env.uid)
       a_uids[0] = this.env.uid;
-    else if (list) {
-      selection = list.get_selection();
-      for (n=0, len=selection.length; n<len; n++) {
-          a_uids.push(selection[n]);
-      }
-    }
+    else if (list)
+      a_uids = list.get_selection();
 
     if (!list)
       r_uids = a_uids;
@@ -2738,12 +2711,12 @@ function rcube_webmail()
       list.focus();
       for (n=0, len=a_uids.length; n<len; n++) {
         id = a_uids[n];
-        if ((flag=='read' && list.rows[id].unread) 
-            || (flag=='unread' && !list.rows[id].unread)
-            || (flag=='delete' && !list.rows[id].deleted)
-            || (flag=='undelete' && list.rows[id].deleted)
-            || (flag=='flagged' && !list.rows[id].flagged)
-            || (flag=='unflagged' && list.rows[id].flagged))
+        if ((flag == 'read' && list.rows[id].unread)
+            || (flag == 'unread' && !list.rows[id].unread)
+            || (flag == 'delete' && !list.rows[id].deleted)
+            || (flag == 'undelete' && list.rows[id].deleted)
+            || (flag == 'flagged' && !list.rows[id].flagged)
+            || (flag == 'unflagged' && list.rows[id].flagged))
         {
           r_uids.push(id);
         }
@@ -2774,16 +2747,12 @@ function rcube_webmail()
   this.toggle_read_status = function(flag, a_uids)
   {
     var i, len = a_uids.length,
-      post_data = {_uid: this.uids_to_list(a_uids), _flag: flag},
+      post_data = this.selection_post_data({_uid: this.uids_to_list(a_uids), _flag: flag}),
       lock = this.display_message(this.get_label('markingmessage'), 'loading');
 
     // mark all message rows as read/unread
     for (i=0; i<len; i++)
-      this.set_message(a_uids[i], 'unread', (flag=='unread' ? true : false));
-
-    // also send search request to get the right messages
-    if (this.env.search_request)
-      post_data._search = this.env.search_request;
+      this.set_message(a_uids[i], 'unread', (flag == 'unread' ? true : false));
 
     this.http_post('mark', post_data, lock);
 
@@ -2795,16 +2764,12 @@ function rcube_webmail()
   this.toggle_flagged_status = function(flag, a_uids)
   {
     var i, len = a_uids.length,
-      post_data = {_uid: this.uids_to_list(a_uids), _flag: flag},
+      post_data = this.selection_post_data({_uid: this.uids_to_list(a_uids), _flag: flag}),
       lock = this.display_message(this.get_label('markingmessage'), 'loading');
 
     // mark all message rows as flagged/unflagged
     for (i=0; i<len; i++)
-      this.set_message(a_uids[i], 'flagged', (flag=='flagged' ? true : false));
-
-    // also send search request to get the right messages
-    if (this.env.search_request)
-      post_data._search = this.env.search_request;
+      this.set_message(a_uids[i], 'flagged', (flag == 'flagged' ? true : false));
 
     this.http_post('mark', post_data, lock);
   };
@@ -2843,25 +2808,20 @@ function rcube_webmail()
 
   this.flag_as_undeleted = function(a_uids)
   {
-    var i, len=a_uids.length,
-      post_data = {_uid: this.uids_to_list(a_uids), _flag: 'undelete'},
+    var i, len = a_uids.length,
+      post_data = this.selection_post_data({_uid: this.uids_to_list(a_uids), _flag: 'undelete'}),
       lock = this.display_message(this.get_label('markingmessage'), 'loading');
 
     for (i=0; i<len; i++)
       this.set_message(a_uids[i], 'deleted', false);
 
-    // also send search request to get the right messages
-    if (this.env.search_request)
-      post_data._search = this.env.search_request;
-
     this.http_post('mark', post_data, lock);
-    return true;
   };
 
   this.flag_as_deleted = function(a_uids)
   {
     var r_uids = [],
-      post_data = {_uid: this.uids_to_list(a_uids), _flag: 'delete'},
+      post_data = this.selection_post_data({_uid: this.uids_to_list(a_uids), _flag: 'delete'}),
       lock = this.display_message(this.get_label('markingmessage'), 'loading'),
       rows = this.message_list ? this.message_list.rows : [],
       count = 0;
@@ -2892,9 +2852,6 @@ function rcube_webmail()
         this.delete_excessive_thread_rows();
     }
 
-    if (this.env.action)
-      post_data._from = this.env.action;
-
     // ??
     if (r_uids.length)
       post_data._ruid = this.uids_to_list(r_uids);
@@ -2902,12 +2859,7 @@ function rcube_webmail()
     if (this.env.skip_deleted && this.env.display_next && this.env.next_uid)
       post_data._next_uid = this.env.next_uid;
 
-    // also send search request to get the right messages
-    if (this.env.search_request)
-      post_data._search = this.env.search_request;
-
     this.http_post('mark', post_data, lock);
-    return true;
   };
 
   // flag as read without mark request (called from backend)
@@ -2987,7 +2939,7 @@ function rcube_webmail()
   // test if purge command is allowed
   this.purge_mailbox_test = function()
   {
-    return (this.env.messagecount && (this.env.mailbox == this.env.trash_mailbox || this.env.mailbox == this.env.junk_mailbox
+    return (this.env.exists && (this.env.mailbox == this.env.trash_mailbox || this.env.mailbox == this.env.junk_mailbox
       || this.env.mailbox.match('^' + RegExp.escape(this.env.trash_mailbox) + RegExp.escape(this.env.delimiter))
       || this.env.mailbox.match('^' + RegExp.escape(this.env.junk_mailbox) + RegExp.escape(this.env.delimiter))));
   };
@@ -3043,10 +2995,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 && 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;
     }
@@ -3118,6 +3070,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();
   };
 
@@ -3338,6 +3297,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);
   };
 
@@ -3403,7 +3371,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);
       }
@@ -3412,7 +3380,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;
@@ -3456,7 +3424,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
 
@@ -3657,7 +3625,8 @@ function rcube_webmail()
       // reset vars
       this.env.current_page = 1;
 
-      r = this.http_request('search', url, lock);
+      var action = this.env.action == 'compose' && this.contact_list ? 'search-contacts' : 'search';
+      r = this.http_request(action, url, lock);
 
       this.env.qsearch = {lock: lock, request: r};
     }
@@ -3712,13 +3681,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 && window.opener && opener.rcmail) {
+    if (this.env.extwin) {
+      var rc = this.opener();
       this.lock_form(this.gui_objects.messageform);
-      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 {
@@ -4098,19 +4073,24 @@ function rcube_webmail()
     else if (this.env.contentframe)
       this.show_contentframe(false);
 
-    // no source = search result, we'll need to detect if any of
-    // selected contacts are in writable addressbook to enable edit/delete
     if (list.selection.length) {
+      // no source = search result, we'll need to detect if any of
+      // selected contacts are in writable addressbook to enable edit/delete
+      // we'll also need to know sources used in selection for copy
+      // and group-addmember operations (drag&drop)
+      this.env.selection_sources = [];
       if (!source) {
         for (n in list.selection) {
           sid = String(list.selection[n]).replace(/^[^-]+-/, '');
-          if (sid && this.env.address_sources[sid] && !this.env.address_sources[sid].readonly) {
-            writable = true;
-            break;
+          if (sid && this.env.address_sources[sid]) {
+            writable = writable || !this.env.address_sources[sid].readonly;
+            this.env.selection_sources.push(sid);
           }
         }
+        this.env.selection_sources = $.unique(this.env.selection_sources);
       }
       else {
+        this.env.selection_sources.push(this.env.source);
         writable = !source.readonly;
       }
     }
@@ -4119,6 +4099,7 @@ function rcube_webmail()
     // thend we can enable the group-remove-selected command
     this.enable_command('group-remove-selected', this.env.group && list.selection.length > 0);
     this.enable_command('compose', this.env.group || list.selection.length > 0);
+    this.enable_command('export-selected', list.selection.length > 0);
     this.enable_command('edit', id && writable);
     this.enable_command('delete', list.selection.length && writable);
 
@@ -4145,10 +4126,10 @@ function rcube_webmail()
 
     if (this.env.search_id)
       folder = 'S'+this.env.search_id;
-    else
+    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;
@@ -4198,7 +4179,7 @@ function rcube_webmail()
     this.env.source = src;
     this.env.group = group;
 
-    // also send search request to get the right messages
+    // also send search request to get the right records
     if (this.env.search_request)
       url._search = this.env.search_request;
 
@@ -4223,12 +4204,10 @@ function rcube_webmail()
       target = win;
       this.show_contentframe(true);
 
-      // load dummy content
-      if (!cid) {
-        // unselect selected row(s)
+      // load dummy content, unselect selected row(s)
+      if (!cid)
         this.contact_list.clear_selection();
-        this.enable_command('delete', 'compose', false);
-      }
+      this.enable_command('delete', 'compose', 'export-selected', cid);
     }
     else if (framed)
       return false;
@@ -4261,22 +4240,35 @@ function rcube_webmail()
   // copy a contact to the specified target (group or directory)
   this.copy_contact = function(cid, to)
   {
+    var n, dest = to.type == 'group' ? to.source : to.id,
+      source = this.env.source,
+      group = this.env.group ? this.env.group : '';
+
     if (!cid)
       cid = this.contact_list.get_selection().join(',');
 
-    if (to.type == 'group' && to.source == this.env.source)
-      this.group_member_change('add', cid, to.source, to.id);
-    else if (to.type == 'group' && !this.env.address_sources[to.source].readonly) {
-      var lock = this.display_message(this.get_label('copyingcontact'), 'loading'),
-        post_data = {_cid: cid, _source: this.env.source, _to: to.source, _togid: to.id,
-          _gid: (this.env.group ? this.env.group : '')};
+    if (!cid || !this.env.address_sources[dest] || this.env.address_sources[dest].readonly)
+      return;
 
-      this.http_post('copy', post_data, lock);
+    // search result may contain contacts from many sources, but if there is only one...
+    if (source == '' && this.env.selection_sources.length == 1)
+      source = this.env.selection_sources[0];
+
+    // tagret is a group
+    if (to.type == 'group') {
+      if (dest == source)
+        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: this.env.source, _to: dest, _togid: to.id, _gid: group};
+
+        this.http_post('copy', post_data, lock);
+      }
     }
-    else if (to.id != this.env.source && cid && this.env.address_sources[to.id] && !this.env.address_sources[to.id].readonly) {
+    // target is an addressbook
+    else if (to.id != source) {
       var lock = this.display_message(this.get_label('copyingcontact'), 'loading'),
-        post_data = {_cid: cid, _source: this.env.source, _to: to.id,
-          _gid: (this.env.group ? this.env.group : '')};
+        post_data = {_cid: cid, _source: this.env.source, _to: to.id, _gid: group};
 
       this.http_post('copy', post_data, lock);
     }
@@ -4387,10 +4379,11 @@ function rcube_webmail()
   {
     var ref = this, col;
 
-    this.set_photo_actions($('#ff_photo').val());
-
-    for (col in this.env.coltypes)
-      this.init_edit_field(col, null);
+    if (this.env.coltypes) {
+      this.set_photo_actions($('#ff_photo').val());
+      for (col in this.env.coltypes)
+        this.init_edit_field(col, null);
+    }
 
     $('.contactfieldgroup .row a.deletebutton').click(function() {
       ref.delete_edit_field(this);
@@ -4417,6 +4410,11 @@ function rcube_webmail()
     }
 
     $("input[type='text']:visible").first().focus();
+
+    // Submit search form on Enter
+    if (this.env.action == 'search')
+      $(this.gui_objects.editform).append($('<input type="submit">').hide())
+        .submit(function() { $('input.mainaction').click(); return false; });
   };
 
   this.group_create = function()
@@ -4435,7 +4433,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);
       }
@@ -4455,11 +4453,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];
     }
@@ -4478,8 +4473,11 @@ 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 li = type == 'contactsearch' ? $('li:last', this.gui_objects.folderlist) : $('ul.groups li:last', this.get_folder_li(this.env.source,'',true));
+      if (li.length)
+        this.name_input_li.insertAfter(li);
+      else
+        this.name_input_li.appendTo(type == 'contactsearch' ? this.gui_objects.folderlist : $('ul.groups', this.get_folder_li(this.env.source,'',true)));
     }
 
     this.name_input.select().focus();
@@ -4563,14 +4561,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
@@ -4579,15 +4575,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;
@@ -4598,45 +4592,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()
@@ -4868,47 +4839,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()
   {
@@ -4927,10 +4867,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;
@@ -4949,7 +4887,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;
@@ -5664,14 +5602,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 {
@@ -5681,7 +5620,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
@@ -5691,9 +5630,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);
               }
             }
           }
@@ -5702,6 +5641,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()
   {
@@ -5714,7 +5662,7 @@ 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 = {};
   };
@@ -5755,7 +5703,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))) {
@@ -6043,9 +5994,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
@@ -6120,14 +6071,14 @@ function rcube_webmail()
     // send request
     this.log('HTTP GET: ' + url);
 
+    // reset keep-alive interval
+    this.start_keepalive();
+
     return $.ajax({
       type: 'GET', url: url, data: { _unlock:(lock?lock:0) }, dataType: 'json',
       success: function(data){ ref.http_response(data); },
       error: function(o, status, err) { ref.http_error(o, status, err, lock, action); }
     });
-
-    // reset keep-alive interval
-    this.start_keepalive();
   };
 
   // send a http POST request to the server
@@ -6155,14 +6106,14 @@ function rcube_webmail()
     // send request
     this.log('HTTP POST: ' + url);
 
+    // reset keep-alive interval
+    this.start_keepalive();
+
     return $.ajax({
       type: 'POST', url: url, data: postdata, dataType: 'json',
       success: function(data){ ref.http_response(data); },
       error: function(o, status, err) { ref.http_error(o, status, err, lock, action); }
     });
-
-    // reset keep-alive interval
-    this.start_keepalive();
   };
 
   // aborts ajax request
@@ -6228,6 +6179,7 @@ function rcube_webmail()
           this.enable_command('compose', (uid && this.contact_list.rows[uid]));
           this.enable_command('delete', 'edit', writable);
           this.enable_command('export', (this.contact_list && this.contact_list.rowcount > 0));
+          this.enable_command('export-selected', false);
         }
 
       case 'moveto':
@@ -6244,7 +6196,7 @@ function rcube_webmail()
       case 'purge':
       case 'expunge':
         if (this.task == 'mail') {
-          if (!this.env.messagecount) {
+          if (!this.env.exists) {
             // clear preview pane content
             if (this.env.contentframe)
               this.show_contentframe(false);
@@ -6264,7 +6216,8 @@ function rcube_webmail()
         this.env.qsearch = null;
       case 'list':
         if (this.task == 'mail') {
-          this.enable_command('show', 'expunge', 'select-all', 'select-none', (this.env.messagecount > 0));
+          this.enable_command('show', 'select-all', 'select-none', this.env.messagecount > 0);
+          this.enable_command('expunge', this.env.exists);
           this.enable_command('purge', this.purge_mailbox_test());
           this.enable_command('expand-all', 'expand-unread', 'collapse-all', this.env.threading && this.env.messagecount);
 
@@ -6317,14 +6270,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)
   {
@@ -6563,6 +6533,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..f7c0a7536 100644
--- a/program/js/common.js
+++ b/program/js/common.js
@@ -717,13 +717,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 +742,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/googiespell.js b/program/js/googiespell.js
index 478858bac..9832116dd 100644
--- a/program/js/googiespell.js
+++ b/program/js/googiespell.js
@@ -30,16 +30,16 @@ function GoogieSpell(img_dir, server_url, has_dict)
     GOOGIE_CUR_LANG = cookie_value != null ? cookie_value : GOOGIE_DEFAULT_LANG;
 
     this.array_keys = function(arr) {
-	    var res = [];
-	    for (var key in arr) { res.push([key]); }
-	    return res;
+        var res = [];
+        for (var key in arr) { res.push([key]); }
+        return res;
     }
 
     this.img_dir = img_dir;
     this.server_url = server_url;
 
     this.org_lang_to_word = {
-	    "da": "Dansk", "de": "Deutsch", "en": "English",
+        "da": "Dansk", "de": "Deutsch", "en": "English",
         "es": "Español", "fr": "Français", "it": "Italiano",
         "nl": "Nederlands", "pl": "Polski", "pt": "Português",
         "ru": "Ру��кий", "fi": "Suomi", "sv": "Svenska"
@@ -96,8 +96,8 @@ function GoogieSpell(img_dir, server_url, has_dict)
     $(document).bind('click', function(e) {
         var target = $(e.target);
         if(target.attr('googie_action_btn') != '1' && ref.isLangWindowShown())
-	        ref.hideLangWindow();
-	    if(target.attr('googie_action_btn') != '1' && ref.isErrorWindowShown())
+            ref.hideLangWindow();
+        if(target.attr('googie_action_btn') != '1' && ref.isErrorWindowShown())
             ref.hideErrorWindow();
     });
 
@@ -225,8 +225,8 @@ this.escapeSpecial = function(val)
 this.createXMLReq = function (text)
 {
     return '<?xml version="1.0" encoding="utf-8" ?>'
-	+ '<spellrequest textalreadyclipped="0" ignoredups="0" ignoredigits="1" ignoreallcaps="1">'
-	+ '<text>' + text + '</text></spellrequest>';
+        + '<spellrequest textalreadyclipped="0" ignoredups="0" ignoredigits="1" ignoreallcaps="1">'
+        + '<text>' + text + '</text></spellrequest>';
 };
 
 this.spellCheck = function(ignore)
@@ -237,27 +237,27 @@ this.spellCheck = function(ignore)
         ref = this;
 
     $.ajax({ type: 'POST', url: this.getUrl(), data: this.createXMLReq(req_text), dataType: 'text',
-	    error: function(o) {
+        error: function(o) {
             if (ref.custom_ajax_error)
-        	    ref.custom_ajax_error(ref);
+                ref.custom_ajax_error(ref);
             else
-        	    alert('An error was encountered on the server. Please try again later.');
+                alert('An error was encountered on the server. Please try again later.');
             if (ref.main_controller) {
-        	    $(ref.spell_span).remove();
-        	    ref.removeIndicator();
+                $(ref.spell_span).remove();
+                ref.removeIndicator();
             }
             ref.checkSpellingState();
-	    },
+        },
         success: function(data) {
-    	    ref.processData(data);
-    	    if (!ref.results.length) {
-        	    if (!ref.custom_no_spelling_error)
-	    	        ref.flashNoSpellingErrorState();
-            	else
-                	ref.custom_no_spelling_error(ref);
-    	    }
-    	    ref.removeIndicator();
-	    }
+            ref.processData(data);
+            if (!ref.results.length) {
+                if (!ref.custom_no_spelling_error)
+                    ref.flashNoSpellingErrorState();
+                else
+                    ref.custom_no_spelling_error(ref);
+            }
+            ref.removeIndicator();
+        }
     });
 };
 
@@ -269,14 +269,14 @@ this.learnWord = function(word, id)
         req_text = '<?xml version="1.0" encoding="utf-8" ?><learnword><text>' + word + '</text></learnword>';
 
     $.ajax({ type: 'POST', url: this.getUrl(), data: req_text, dataType: 'text',
-	    error: function(o) {
+        error: function(o) {
             if (ref.custom_ajax_error)
-        	    ref.custom_ajax_error(ref);
+                ref.custom_ajax_error(ref);
             else
-        	    alert('An error was encountered on the server. Please try again later.');
-	    },
+                alert('An error was encountered on the server. Please try again later.');
+        },
         success: function(data) {
-	    }
+        }
     });
 };
 
@@ -350,9 +350,9 @@ this.parseResult = function(r_text)
         var only_text = matched_c[i].replace(/<[^>]*>/g, ''),
             split_t = only_text.split(re_split_text);
         for (var k=0; k < split_t.length; k++) {
-    	    if(split_t[k] != '')
-        	item['suggestions'].push(split_t[k]);
-    	}
+            if(split_t[k] != '')
+            item['suggestions'].push(split_t[k]);
+        }
         results.push(item);
     }
 
@@ -363,8 +363,8 @@ this.processData = function(data)
 {
     this.results = this.parseResult(data);
     if (this.results.length) {
-   	    this.showErrorsInIframe();
-   	    this.resumeEditingState();
+        this.showErrorsInIframe();
+        this.resumeEditingState();
     }
 };
 
@@ -414,7 +414,7 @@ this.createListSeparator = function()
         tr = document.createElement('tr');
 
     $(td).html(' ').attr('googie_action_btn', '1')
-	    .css({'cursor': 'default', 'font-size': '3px', 'border-top': '1px solid #ccc', 'padding-top': '3px'});
+        .css({'cursor': 'default', 'font-size': '3px', 'border-top': '1px solid #ccc', 'padding-top': '3px'});
     tr.appendChild(td);
 
     return tr;
@@ -493,10 +493,10 @@ this.showErrorWindow = function(elm, id)
             $(item).attr('googie_action_btn', '1').css('cursor', 'default')
                 .mouseover(ref.item_onmouseover)
                 .mouseout(ref.item_onmouseout)
-			    .click(function(e) {
-			        ref.learnWord(elm, id);
-			        ref.ignoreError(elm, id);
-			    });
+                .click(function(e) {
+                    ref.learnWord(elm, id);
+                    ref.ignoreError(elm, id);
+                });
 
             item.appendChild(dummy);
             row.appendChild(item);
@@ -538,14 +538,14 @@ this.showErrorWindow = function(elm, id)
                 revert = document.createElement('td'),
                 rev_span = document.createElement('span');
 
-	        $(rev_span).addClass('googie_list_revert').html(this.lang_revert + ' ' + old_value);
+            $(rev_span).addClass('googie_list_revert').html(this.lang_revert + ' ' + old_value);
 
             $(revert).mouseover(this.item_onmouseover).mouseout(this.item_onmouseout)
-        	    .click(function(e) {
-            	    ref.updateOrginalText(offset, elm.innerHTML, old_value, id);
-            	    $(elm).removeAttr('is_corrected').css('color', '#b91414').html(old_value);
-            	    ref.hideErrorWindow();
-        	    });
+                .click(function(e) {
+                    ref.updateOrginalText(offset, elm.innerHTML, old_value, id);
+                    $(elm).removeAttr('is_corrected').css('color', '#b91414').html(old_value);
+                    ref.hideErrorWindow();
+                });
 
             revert.appendChild(rev_span);
             revert_row.appendChild(revert);
@@ -557,7 +557,7 @@ this.showErrorWindow = function(elm, id)
             edit = document.createElement('td'),
             edit_input = document.createElement('input'),
             ok_pic = document.createElement('img'),
-	        edit_form = document.createElement('form');
+            edit_form = document.createElement('form');
 
         var onsub = function () {
             if (edit_input.value != '') {
@@ -565,34 +565,34 @@ this.showErrorWindow = function(elm, id)
                     ref.saveOldValue(elm, elm.innerHTML);
 
                 ref.updateOrginalText(offset, elm.innerHTML, edit_input.value, id);
-		        $(elm).attr('is_corrected', true).css('color', 'green').html(edit_input.value);
+                $(elm).attr('is_corrected', true).css('color', 'green').html(edit_input.value);
                 ref.hideErrorWindow();
             }
             return false;
         };
 
-	    $(edit_input).width(120).css({'margin': 0, 'padding': 0});
-	    $(edit_input).val(elm.innerHTML).attr('googie_action_btn', '1');
-	    $(edit).css('cursor', 'default').attr('googie_action_btn', '1');
+        $(edit_input).width(120).css({'margin': 0, 'padding': 0});
+        $(edit_input).val(elm.innerHTML).attr('googie_action_btn', '1');
+        $(edit).css('cursor', 'default').attr('googie_action_btn', '1');
 
-	    $(ok_pic).attr('src', this.img_dir + 'ok.gif')
-	        .width(32).height(16)
-    	    .css({'cursor': 'pointer', 'margin-left': '2px', 'margin-right': '2px'})
-	        .click(onsub);
+        $(ok_pic).attr('src', this.img_dir + 'ok.gif')
+            .width(32).height(16)
+            .css({'cursor': 'pointer', 'margin-left': '2px', 'margin-right': '2px'})
+            .click(onsub);
 
         $(edit_form).attr('googie_action_btn', '1')
-	        .css({'margin': 0, 'padding': 0, 'cursor': 'default', 'white-space': 'nowrap'})
-	        .submit(onsub);
+            .css({'margin': 0, 'padding': 0, 'cursor': 'default', 'white-space': 'nowrap'})
+            .submit(onsub);
 
-	    edit_form.appendChild(edit_input);
-	    edit_form.appendChild(ok_pic);
+        edit_form.appendChild(edit_input);
+        edit_form.appendChild(ok_pic);
         edit.appendChild(edit_form);
         edit_row.appendChild(edit);
         list.appendChild(edit_row);
 
         // Append extra menu items
         if (this.extra_menu_items.length > 0)
-	        list.appendChild(this.createListSeparator());
+            list.appendChild(this.createListSeparator());
 
         var loop = function(i) {
             if (i < ref.extra_menu_items.length) {
@@ -602,12 +602,12 @@ this.showErrorWindow = function(elm, id)
                     var e_row = document.createElement('tr'),
                       e_col = document.createElement('td');
 
-			        $(e_col).html(e_elm[0])
+                    $(e_col).html(e_elm[0])
                         .mouseover(ref.item_onmouseover)
-                    	.mouseout(ref.item_onmouseout)
-			            .click(function() { return e_elm[1](elm, ref) });
+                        .mouseout(ref.item_onmouseout)
+                        .click(function() { return e_elm[1](elm, ref) });
 
-			        e_row.appendChild(e_col);
+                    e_row.appendChild(e_col);
                     list.appendChild(e_row);
                 }
                 loop(i+1);
@@ -619,7 +619,7 @@ this.showErrorWindow = function(elm, id)
 
         //Close button
         if (this.use_close_btn) {
-    	    list.appendChild(this.createCloseButton(this.hideErrorWindow));
+            list.appendChild(this.createCloseButton(this.hideErrorWindow));
         }
     }
 
@@ -637,17 +637,17 @@ this.showErrorWindow = function(elm, id)
     $(this.error_window).css({'top': top+'px', 'left': left+'px'}).show();
 
     // Dummy for IE - dropdown bug fix
-    if ($.browser.msie) {
-	    if (!this.error_window_iframe) {
+    if (document.all && !window.opera) {
+        if (!this.error_window_iframe) {
             var iframe = $('<iframe>').css({'position': 'absolute', 'z-index': -1});
-	        $('body').append(iframe);
-    	    this.error_window_iframe = iframe;
+            $('body').append(iframe);
+            this.error_window_iframe = iframe;
         }
 
-	    $(this.error_window_iframe)
-	        .css({'top': this.error_window.offsetTop, 'left': this.error_window.offsetLeft,
-    	        'width': this.error_window.offsetWidth, 'height': this.error_window.offsetHeight})
-    	    .show();
+        $(this.error_window_iframe)
+            .css({'top': this.error_window.offsetTop, 'left': this.error_window.offsetLeft,
+                'width': this.error_window.offsetWidth, 'height': this.error_window.offsetHeight})
+            .show();
     }
 };
 
@@ -716,13 +716,13 @@ this.createErrorLink = function(text, id)
     var elm = document.createElement('span'),
         ref = this,
         d = function (e) {
-    	    ref.showErrorWindow(elm, id);
-    	    d = null;
-    	    return false;
+            ref.showErrorWindow(elm, id);
+            d = null;
+            return false;
         };
 
     $(elm).html(text).addClass('googie_link').click(d).removeAttr('is_corrected')
-	    .attr({'googie_action_btn' : '1', 'g_id' : id});
+        .attr({'googie_action_btn' : '1', 'g_id' : id});
 
     return elm;
 };
@@ -806,7 +806,7 @@ this.createLangWindow = function()
 {
     this.language_window = document.createElement('div');
     $(this.language_window).addClass('googie_window popupmenu')
-	    .width(100).attr('googie_action_btn', '1');
+        .width(100).attr('googie_action_btn', '1');
 
     // Build up the result list
     var table = document.createElement('table'),
@@ -822,31 +822,31 @@ this.createLangWindow = function()
         item = document.createElement('td');
         span = document.createElement('span');
 
-	    $(span).text(this.lang_to_word[this.langlist_codes[i]]);
+        $(span).text(this.lang_to_word[this.langlist_codes[i]]);
         this.lang_elms.push(item);
 
         $(item).attr('googieId', this.langlist_codes[i])
-    	    .bind('click', function(e) {
-        	    ref.deHighlightCurSel();
-        	    ref.setCurrentLanguage($(this).attr('googieId'));
-
-        	    if (ref.lang_state_observer != null) {
-            	    ref.lang_state_observer();
-        	    }
-
-        	    ref.highlightCurSel();
-        	    ref.hideLangWindow();
-    	    })
-    	    .bind('mouseover', function(e) {
-        	    if (this.className != "googie_list_selected")
-            	    this.className = "googie_list_onhover";
-    	    })
-    	    .bind('mouseout', function(e) {
-        	    if (this.className != "googie_list_selected")
-            	    this.className = "googie_list_onout";
-    	    });
-
-	    item.appendChild(span);
+            .bind('click', function(e) {
+                ref.deHighlightCurSel();
+                ref.setCurrentLanguage($(this).attr('googieId'));
+
+                if (ref.lang_state_observer != null) {
+                    ref.lang_state_observer();
+                }
+
+                ref.highlightCurSel();
+                ref.hideLangWindow();
+            })
+            .bind('mouseover', function(e) {
+                if (this.className != "googie_list_selected")
+                    this.className = "googie_list_onhover";
+            })
+            .bind('mouseout', function(e) {
+                if (this.className != "googie_list_selected")
+                    this.className = "googie_list_onout";
+            });
+
+        item.appendChild(span);
         row.appendChild(item);
         list.appendChild(row);
     }
@@ -887,7 +887,7 @@ this.showLangWindow = function(elm)
         h = $(this.language_window).height(),
         pageheight = $(document).height(),
         left = this.change_lang_pic_placement == 'right' ?
-	        pos.left - 100 + width : pos.left + width,
+            pos.left - 100 + width : pos.left + width,
         top = pos.top + h < pageheight ? pos.top + height : pos.top - h - 4;
 
     $(this.language_window).css({'top' : top+'px','left' : left+'px'}).show();
@@ -918,23 +918,23 @@ this.highlightCurSel = function()
 this.createChangeLangPic = function()
 {
     var img = $('<img>')
-	    .attr({src: this.img_dir + 'change_lang.gif', 'alt': 'Change language', 'googie_action_btn': '1'}),
+        .attr({src: this.img_dir + 'change_lang.gif', 'alt': 'Change language', 'googie_action_btn': '1'}),
         switch_lan = document.createElement('span');
         ref = this;
 
     $(switch_lan).addClass('googie_lang_3d_on')
-	    .append(img)
-	    .bind('click', function(e) {
-    	    var elm = this.tagName.toLowerCase() == 'img' ? this.parentNode : this;
-    	    if($(elm).hasClass('googie_lang_3d_click')) {
-            	elm.className = 'googie_lang_3d_on';
-        	    ref.hideLangWindow();
-    	    }
-    	    else {
-        	    elm.className = 'googie_lang_3d_click';
-        	    ref.showLangWindow(elm);
-    	    }
-	    });
+        .append(img)
+        .bind('click', function(e) {
+            var elm = this.tagName.toLowerCase() == 'img' ? this.parentNode : this;
+            if($(elm).hasClass('googie_lang_3d_click')) {
+                elm.className = 'googie_lang_3d_on';
+                ref.hideLangWindow();
+            }
+            else {
+                elm.className = 'googie_lang_3d_click';
+                ref.showLangWindow(elm);
+            }
+        });
 
     return switch_lan;
 };
@@ -946,7 +946,7 @@ this.createSpellDiv = function()
     $(span).addClass('googie_check_spelling_link').text(this.lang_chck_spell);
 
     if (this.show_spell_img) {
-	    $(span).append(' ').append($('<img>').attr('src', this.img_dir + 'spellc.gif'));
+        $(span).append(' ').append($('<img>').attr('src', this.img_dir + 'spellc.gif'));
     }
     return span;
 };
@@ -961,22 +961,22 @@ this.flashNoSpellingErrorState = function(on_finish)
 
     var ref = this;
     if (this.main_controller) {
-	    var no_spell_errors;
-	    if (on_finish) {
-    	    var fn = function() {
-            	on_finish();
-        	    ref.checkSpellingState();
-    	    };
-    	    no_spell_errors = fn;
-	    }
-	    else
-    	    no_spell_errors = function () { ref.checkSpellingState() };
+        var no_spell_errors;
+        if (on_finish) {
+            var fn = function() {
+                on_finish();
+                ref.checkSpellingState();
+            };
+            no_spell_errors = fn;
+        }
+        else
+            no_spell_errors = function () { ref.checkSpellingState() };
 
         var rsm = $('<span>').text(this.lang_no_error_found);
 
         $(this.switch_lan_pic).hide();
-	    $(this.spell_span).empty().append(rsm)
-	    .removeClass().addClass('googie_check_spelling_ok');
+        $(this.spell_span).empty().append(rsm)
+        .removeClass().addClass('googie_check_spelling_ok');
 
         window.setTimeout(no_spell_errors, 1000);
     }
@@ -989,12 +989,12 @@ this.resumeEditingState = function()
     //Change link text to resume
     if (this.main_controller) {
         var rsm = $('<span>').text(this.lang_rsm_edt);
-	var ref = this;
+    var ref = this;
 
         $(this.switch_lan_pic).hide();
         $(this.spell_span).empty().unbind().append(rsm)
-    	    .bind('click', function() { ref.resumeEditing() })
-    	    .removeClass().addClass('googie_resume_editing');
+            .bind('click', function() { ref.resumeEditing() })
+            .removeClass().addClass('googie_resume_editing');
     }
 
     try { this.edit_layer.scrollTop = this.ta_scroll_top; }
@@ -1022,10 +1022,10 @@ this.checkSpellingState = function(fire)
 
     if (this.main_controller) {
         if (this.change_lang_pic_placement == 'left') {
-	        $(this.spell_container).empty().append(this.switch_lan_pic).append(' ').append(span_chck);
+            $(this.spell_container).empty().append(this.switch_lan_pic).append(' ').append(span_chck);
         } else {
-	        $(this.spell_container).empty().append(span_chck).append(' ').append(this.switch_lan_pic);
-	    }
+            $(this.spell_container).empty().append(span_chck).append(' ').append(this.switch_lan_pic);
+        }
     }
 
     this.spell_span = span_chck;
@@ -1068,14 +1068,14 @@ this.createButton = function(name, css_class, c_fn)
 
     if (css_class) {
         spn_btn = document.createElement('span');
-	    $(spn_btn).addClass(css_class).html(name);
+        $(spn_btn).addClass(css_class).html(name);
     } else {
         spn_btn = document.createTextNode(name);
     }
 
     $(btn).bind('click', c_fn)
-	    .bind('mouseover', this.item_onmouseover)
-	    .bind('mouseout', this.item_onmouseout);
+        .bind('mouseover', this.item_onmouseover)
+        .bind('mouseout', this.item_onmouseout);
 
     btn.appendChild(spn_btn);
     btn_row.appendChild(btn);
@@ -1095,16 +1095,16 @@ this.appendIndicator = function(elm)
 {
     // modified by roundcube
     if (window.rcmail)
-	    this.rc_msg_id = rcmail.set_busy(true, 'checking');
+        this.rc_msg_id = rcmail.set_busy(true, 'checking');
 /*
     this.indicator = document.createElement('img');
     $(this.indicator).attr('src', this.img_dir + 'indicator.gif')
-	    .css({'margin-right': '5px', 'text-decoration': 'none'}).width(16).height(16);
+        .css({'margin-right': '5px', 'text-decoration': 'none'}).width(16).height(16);
 
     if (elm)
-	    $(this.indicator).insertBefore(elm);
+        $(this.indicator).insertBefore(elm);
     else
-    	$('body').append(this.indicator);
+        $('body').append(this.indicator);
 */
 }
 
diff --git a/program/js/list.js b/program/js/list.js
index 660b74d85..8b4857d6d 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.                |
@@ -434,6 +434,7 @@ collapse: function(row)
     new_row = new_row.nextSibling;
   }
 
+  this.triggerEvent('listupdate');
   return false;
 },
 
@@ -481,6 +482,7 @@ expand: function(row)
     new_row = new_row.nextSibling;
   }
 
+  this.triggerEvent('listupdate');
   return false;
 },
 
@@ -523,6 +525,7 @@ collapse_all: function(row)
     new_row = new_row.nextSibling;
   }
 
+  this.triggerEvent('listupdate');
   return false;
 },
 
@@ -559,6 +562,8 @@ expand_all: function(row)
     }
     new_row = new_row.nextSibling;
   }
+
+  this.triggerEvent('listupdate');
   return false;
 },
 
@@ -687,6 +692,7 @@ select_row: function(id, mod_key, with_mouse)
     this.shift_start = null;
 
   this.last_selected = id;
+  this.list.focus();
 },
 
 
@@ -1138,7 +1144,7 @@ drag_mouse_move: function(e)
     this.draglayer.html('');
 
     // get subjects of selected messages
-    var c, i, n, subject, obj;
+    var i, n, obj;
     for (n=0; n<this.selection.length; n++) {
       // only show 12 lines
       if (n>12) {
@@ -1147,35 +1153,26 @@ drag_mouse_move: function(e)
       }
 
       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') {
+        for (i=0; i<obj.childNodes.length; i++) {
+          if (obj.childNodes[i].nodeName == 'TD') {
             if (n == 0)
-	          this.drag_start_pos = $(obj.childNodes[i]).offset();
+              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 (this.subject_col < 0 || (this.subject_col >= 0 && this.subject_col == i)) {
+              var subject = $(obj.childNodes[i]).text();
 
-	          if (!node)
-	            break;
+              if (!subject)
+                break;
 
-              subject = $(node).text();
-	          // remove leading spaces
+              // 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);
+              var entry = $('<div>').text(subject);
+              this.draglayer.append(entry);
               break;
             }
-            c++;
           }
         }
       }
@@ -1232,7 +1229,7 @@ drag_mouse_up: function(e)
   // remove temp divs
   this.del_dragfix();
 
-  this.triggerEvent('dragend');
+  this.triggerEvent('dragend', e);
 
   return rcube_event.cancel(e);
 },
@@ -1345,7 +1342,7 @@ column_drag_mouse_up: function(e)
     }
   }
 
-  this.triggerEvent('column_dragend');
+  this.triggerEvent('column_dragend', e);
 
   return rcube_event.cancel(e);
 },
diff --git a/program/js/treelist.js b/program/js/treelist.js
new file mode 100644
index 000000000..fec2d7f21
--- /dev/null
+++ b/program/js/treelist.js
@@ -0,0 +1,577 @@
+/*
+ +-----------------------------------------------------------------------+
+ | 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);
+	var data = p.data || [];
+	var indexbyid = {};
+	var selection = null;
+	var drag_active = false;
+	var box_coords = {};
+	var item_coords = [];
+	var autoexpand_timer;
+	var autoexpand_item;
+	var body_scroll_top = 0;
+	var list_scroll_top = 0;
+	var 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/Mail/mime.php b/program/lib/Mail/mime.php
index c459b9123..69a032cb8 100644
--- a/program/lib/Mail/mime.php
+++ b/program/lib/Mail/mime.php
@@ -48,7 +48,7 @@
  * @author    Aleksander Machniak <alec@php.net>
  * @copyright 2003-2006 PEAR <pear-group@php.net>
  * @license   http://www.opensource.org/licenses/bsd-license.php BSD License
- * @version   1.8.5
+ * @version   Release: 1.8.7
  * @link      http://pear.php.net/package/Mail_mime
  *
  *            This class is based on HTML Mime Mail class from
@@ -89,7 +89,7 @@ require_once 'Mail/mimePart.php';
  * @author    Sean Coates <sean@php.net>
  * @copyright 2003-2006 PEAR <pear-group@php.net>
  * @license   http://www.opensource.org/licenses/bsd-license.php BSD License
- * @version   Release: 1.8.5
+ * @version   Release: 1.8.7
  * @link      http://pear.php.net/package/Mail_mime
  */
 class Mail_mime
@@ -245,7 +245,7 @@ class Mail_mime
             }
         } else {
             $cont = $this->_file2str($data);
-            if (PEAR::isError($cont)) {
+            if ($this->_isError($cont)) {
                 return $cont;
             }
             if (!$append) {
@@ -286,7 +286,7 @@ class Mail_mime
             $this->_htmlbody = $data;
         } else {
             $cont = $this->_file2str($data);
-            if (PEAR::isError($cont)) {
+            if ($this->_isError($cont)) {
                 return $cont;
             }
             $this->_htmlbody = $cont;
@@ -336,7 +336,7 @@ class Mail_mime
                 $filedata = null;
                 $bodyfile = $file;
             } else {
-                if (PEAR::isError($filedata = $this->_file2str($file))) {
+                if ($this->_isError($filedata = $this->_file2str($file))) {
                     return $filedata;
                 }
             }
@@ -416,12 +416,12 @@ class Mail_mime
                 $filedata = null;
                 $bodyfile = $file;
             } else {
-                if (PEAR::isError($filedata = $this->_file2str($file))) {
+                if ($this->_isError($filedata = $this->_file2str($file))) {
                     return $filedata;
                 }
             }
             // Force the name the user supplied, otherwise use $file
-            $filename = ($name ? $name : $file);
+            $filename = ($name ? $name : $this->_basename($file));
         } else {
             $filedata = $file;
             $filename = $name;
@@ -432,7 +432,6 @@ class Mail_mime
             $err = PEAR::raiseError($msg);
             return $err;
         }
-        $filename = $this->_basename($filename);
 
         $this->_parts[] = array(
             'body'        => $filedata,
@@ -462,7 +461,7 @@ class Mail_mime
      * @return string           Contents of $file_name
      * @access private
      */
-    function &_file2str($file_name)
+    function _file2str($file_name)
     {
         // Check state of file and raise an error properly
         if (!file_exists($file_name)) {
@@ -501,7 +500,7 @@ class Mail_mime
      * @return object      The text mimePart object
      * @access private
      */
-    function &_addTextPart(&$obj, $text)
+    function _addTextPart(&$obj, $text)
     {
         $params['content_type'] = 'text/plain';
         $params['encoding']     = $this->_build_params['text_encoding'];
@@ -527,7 +526,7 @@ class Mail_mime
      * @return object     The html mimePart object
      * @access private
      */
-    function &_addHtmlPart(&$obj)
+    function _addHtmlPart(&$obj)
     {
         $params['content_type'] = 'text/html';
         $params['encoding']     = $this->_build_params['html_encoding'];
@@ -551,7 +550,7 @@ class Mail_mime
      * @return object The multipart/mixed mimePart object
      * @access private
      */
-    function &_addMixedPart()
+    function _addMixedPart()
     {
         $params                 = array();
         $params['content_type'] = 'multipart/mixed';
@@ -573,7 +572,7 @@ class Mail_mime
      * @return object     The multipart/mixed mimePart object
      * @access private
      */
-    function &_addAlternativePart(&$obj)
+    function _addAlternativePart(&$obj)
     {
         $params['content_type'] = 'multipart/alternative';
         $params['eol']          = $this->_build_params['eol'];
@@ -597,7 +596,7 @@ class Mail_mime
      * @return object     The multipart/mixed mimePart object
      * @access private
      */
-    function &_addRelatedPart(&$obj)
+    function _addRelatedPart(&$obj)
     {
         $params['content_type'] = 'multipart/related';
         $params['eol']          = $this->_build_params['eol'];
@@ -620,7 +619,7 @@ class Mail_mime
      * @return object       The image mimePart object
      * @access private
      */
-    function &_addHtmlImagePart(&$obj, $value)
+    function _addHtmlImagePart(&$obj, $value)
     {
         $params['content_type'] = $value['c_type'];
         $params['encoding']     = 'base64';
@@ -651,7 +650,7 @@ class Mail_mime
      * @return object       The image mimePart object
      * @access private
      */
-    function &_addAttachmentPart(&$obj, $value)
+    function _addAttachmentPart(&$obj, $value)
     {
         $params['eol']          = $this->_build_params['eol'];
         $params['filename']     = $value['name'];
@@ -719,7 +718,7 @@ class Mail_mime
 
         $body = $this->get($params);
 
-        if (PEAR::isError($body)) {
+        if ($this->_isError($body)) {
             return $body;
         }
 
@@ -1020,7 +1019,7 @@ class Mail_mime
         if ($filename) {
             // Append mimePart message headers and body into file
             $headers = $message->encodeToFile($filename, $boundary, $skip_head);
-            if (PEAR::isError($headers)) {
+            if ($this->_isError($headers)) {
                 return $headers;
             }
             $this->_headers = array_merge($this->_headers, $headers);
@@ -1028,7 +1027,7 @@ class Mail_mime
             return $ret;
         } else {
             $output = $message->encode($boundary, $skip_head);
-            if (PEAR::isError($output)) {
+            if ($this->_isError($output)) {
                 return $output;
             }
             $this->_headers = array_merge($this->_headers, $output['headers']);
@@ -1090,7 +1089,7 @@ class Mail_mime
 
     /**
      * Get the text version of the headers
-     * (useful if you want to use the PHP mail() function)
+     * (usefull if you want to use the PHP mail() function)
      *
      * @param array $xtra_headers Assoc array with any extra headers (optional)
      *                            (Don't set Content-Type for multipart messages here!)
@@ -1473,4 +1472,22 @@ class Mail_mime
         }
     }
 
+    /**
+     * PEAR::isError wrapper
+     *
+     * @param mixed $data Object
+     *
+     * @return bool True if object is an instance of PEAR_Error
+     * @access private
+     */
+    function _isError($data)
+    {
+        // PEAR::isError() is not PHP 5.4 compatible (see Bug #19473)
+        if (is_object($data) && is_a($data, 'PEAR_Error')) {
+            return true;
+        }
+
+        return false;
+    }
+
 } // End of class
diff --git a/program/lib/Mail/mimeDecode.php b/program/lib/Mail/mimeDecode.php
index 677d245e3..9f4589441 100644
--- a/program/lib/Mail/mimeDecode.php
+++ b/program/lib/Mail/mimeDecode.php
@@ -52,7 +52,7 @@
  * @author     Sean Coates <sean@php.net>
  * @copyright  2003-2006 PEAR <pear-group@php.net>
  * @license    http://www.opensource.org/licenses/bsd-license.php BSD License
- * @version    CVS: $Id$
+ * @version    CVS: $Id: mimeDecode.php 305875 2010-12-01 07:17:10Z alan_k $
  * @link       http://pear.php.net/package/Mail_mime
  */
 
@@ -85,7 +85,7 @@ require_once 'PEAR.php';
  * @author     Sean Coates <sean@php.net>
  * @copyright  2003-2006 PEAR <pear-group@php.net>
  * @license    http://www.opensource.org/licenses/bsd-license.php BSD License
- * @version    Release: @package_version@
+ * @version    Release: 1.5.5
  * @link       http://pear.php.net/package/Mail_mime
  */
 class Mail_mimeDecode extends PEAR
diff --git a/program/lib/Mail/mimePart.php b/program/lib/Mail/mimePart.php
index 292227fb0..f3e75dd10 100644
--- a/program/lib/Mail/mimePart.php
+++ b/program/lib/Mail/mimePart.php
@@ -48,7 +48,7 @@
  * @author    Aleksander Machniak <alec@php.net>
  * @copyright 2003-2006 PEAR <pear-group@php.net>
  * @license   http://www.opensource.org/licenses/bsd-license.php BSD License
- * @version   1.8.5
+ * @version   Release: 1.8.7
  * @link      http://pear.php.net/package/Mail_mime
  */
 
@@ -70,7 +70,7 @@
  * @author    Aleksander Machniak <alec@php.net>
  * @copyright 2003-2006 PEAR <pear-group@php.net>
  * @license   http://www.opensource.org/licenses/bsd-license.php BSD License
- * @version   Release: 1.8.5
+ * @version   Release: 1.8.7
  * @link      http://pear.php.net/package/Mail_mime
  */
 class Mail_mimePart
@@ -315,7 +315,7 @@ class Mail_mimePart
             for ($i = 0; $i < count($this->_subparts); $i++) {
                 $encoded['body'] .= '--' . $boundary . $eol;
                 $tmp = $this->_subparts[$i]->encode();
-                if (PEAR::isError($tmp)) {
+                if ($this->_isError($tmp)) {
                     return $tmp;
                 }
                 foreach ($tmp['headers'] as $key => $value) {
@@ -338,7 +338,7 @@ class Mail_mimePart
                 @ini_set('magic_quotes_runtime', $magic_quote_setting);
             }
 
-            if (PEAR::isError($body)) {
+            if ($this->_isError($body)) {
                 return $body;
             }
             $encoded['body'] = $body;
@@ -390,7 +390,7 @@ class Mail_mimePart
             @ini_set('magic_quotes_runtime', $magic_quote_setting);
         }
 
-        return PEAR::isError($res) ? $res : $this->_headers;
+        return $this->_isError($res) ? $res : $this->_headers;
     }
 
     /**
@@ -425,7 +425,7 @@ class Mail_mimePart
             for ($i = 0; $i < count($this->_subparts); $i++) {
                 fwrite($fh, $f_eol . '--' . $boundary . $eol);
                 $res = $this->_subparts[$i]->_encodePartToFile($fh);
-                if (PEAR::isError($res)) {
+                if ($this->_isError($res)) {
                     return $res;
                 }
                 $f_eol = $eol;
@@ -440,7 +440,7 @@ class Mail_mimePart
             $res = $this->_getEncodedDataFromFile(
                 $this->_body_file, $this->_encoding, $fh
             );
-            if (PEAR::isError($res)) {
+            if ($this->_isError($res)) {
                 return $res;
             }
         }
@@ -648,7 +648,7 @@ class Mail_mimePart
     }
 
     /**
-     * Encodes the parameter of a header.
+     * Encodes the paramater of a header.
      *
      * @param string $name      The name of the header-parameter
      * @param string $value     The value of the paramter
@@ -815,6 +815,7 @@ class Mail_mimePart
             'from', 'to', 'cc', 'bcc', 'sender', 'reply-to',
             'resent-from', 'resent-to', 'resent-cc', 'resent-bcc',
             'resent-sender', 'resent-reply-to',
+            'mail-reply-to', 'mail-followup-to',
             'return-receipt-to', 'disposition-notification-to',
         );
         $other_headers = array(
@@ -1225,4 +1226,22 @@ class Mail_mimePart
         return sprintf('%%%02X', ord($matches[1]));
     }
 
+    /**
+     * PEAR::isError wrapper
+     *
+     * @param mixed $data Object
+     *
+     * @return bool True if object is an instance of PEAR_Error
+     * @access private
+     */
+    function _isError($data)
+    {
+        // PEAR::isError() is not PHP 5.4 compatible (see Bug #19473)
+        if (is_object($data) && is_a($data, 'PEAR_Error')) {
+            return true;
+        }
+
+        return false;
+    }
+
 } // End of class
diff --git a/program/lib/Roundcube/README.md b/program/lib/Roundcube/README.md
new file mode 100644
index 000000000..88f2d076e
--- /dev/null
+++ b/program/lib/Roundcube/README.md
@@ -0,0 +1,102 @@
+Roundcube Framework
+===================
+
+INTRODUCTION
+------------
+The Roundcube Framework is the basic library used for the Roundcube Webmail
+application. It is an extract of classes providing the core functionality for
+an email system. They can be used individually or as package for the following
+tasks:
+
+- IMAP mailbox access with optional caching
+- MIME message handling
+- Email message creation and sending through SMTP
+- General caching utilities using the local database
+- Database abstraction using PDO
+- VCard parsing and writing
+
+
+INSTALLATION
+------------
+Copy all files of this directory to your project or install it in the default
+include_path directory of your webserver. Some classes of the framework require
+one or multiple of the following [PEAR][pear] libraries:
+
+- Mail_Mime 1.8.1 or newer
+- Mail_mimeDecode 1.5.5 or newer
+- Net_SMTP (latest from https://github.com/pear/Net_SMTP/)
+- Net_IDNA2 0.1.1 or newer
+- Auth_SASL 1.0.6 or newer
+
+
+USAGE
+-----
+The Roundcube Framework provides a bootstrapping file which registers an
+autoloader and sets up the environment necessary for the Roundcube classes.
+In order to make use of the framework, simply include the bootstrap.php file
+from this directory in your application and start using the classes by simply
+instantiating them.
+
+If you wanna use more complex functionality like IMAP access with database
+caching or plugins, the rcube singleton helps you loading the necessary files:
+
+```php
+<?php
+
+define('RCUBE_CONFIG_DIR',  '<path-to-config-directory>');
+define('RCUBE_PLUGINS_DIR', '<path-to-roundcube-plugins-directory');
+
+require_once '<path-to-roundcube-framework/bootstrap.php';
+
+$rcube = rcube::get_instance(rcube::INIT_WITH_DB | rcube::INIT_WITH_PLUGINS);
+$imap = $rcube->get_storage();
+
+// do cool stuff here...
+
+?>
+```
+
+LICENSE
+-------
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License (**with exceptions
+for plugins**) 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 [www.gnu.org/licenses/][gpl].
+
+This file forms part of the Roundcube Webmail Framework for which the
+following exception is added: Plugins which merely make function calls to the
+Roundcube Webmail Framework, and for that purpose include it by reference
+shall not be considered modifications of the software.
+
+If you wish to use this file in another project or create a modified
+version that will not be part of the Roundcube Webmail Framework, you
+may remove the exception above and use this source code under the
+original version of the license.
+
+For more details about licensing and the exceptions for skins and plugins
+see [roundcube.net/license][license]
+
+
+CONTACT
+-------
+For any bug reports or feature requests please refer to the tracking system
+at [trac.roundcube.net][tracreport] or subscribe to our mailing list.
+See [roundcube.net/support][support] for details.
+
+You're always welcome to send a message to the project admins:
+hello(at)roundcube(dot)net
+
+
+[pear]:         http://pear.php.net
+[gpl]:          http://www.gnu.org/licenses/
+[license]:      http://roundcube.net/license
+[support]:      http://roundcube.net/support
+[tracreport]:   http://trac.roundcube.net/wiki/Howto_ReportIssues
\ No newline at end of file
diff --git a/program/lib/Roundcube/bootstrap.php b/program/lib/Roundcube/bootstrap.php
index eed7db8c1..929a4ff79 100644
--- a/program/lib/Roundcube/bootstrap.php
+++ b/program/lib/Roundcube/bootstrap.php
@@ -2,10 +2,8 @@
 
 /*
  +-----------------------------------------------------------------------+
- | program/include/bootstrap.php                                         |
- |                                                                       |
  | This file is part of the Roundcube PHP suite                          |
- | 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.                |
@@ -13,7 +11,6 @@
  |                                                                       |
  | CONTENTS:                                                             |
  |   Roundcube Framework Initialization                                  |
- |                                                                       |
  +-----------------------------------------------------------------------+
  | Author: Thomas Bruederli <roundcube@gmail.com>                        |
  | Author: Aleksander Machniak <alec@alec.pl>                            |
@@ -34,12 +31,19 @@ $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,
+        '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"
@@ -48,7 +52,7 @@ foreach ($config as $optname => $optval) {
 }
 
 // framework constants
-define('RCUBE_VERSION', '0.9-git');
+define('RCUBE_VERSION', '1.0-git');
 define('RCUBE_CHARSET', 'UTF-8');
 
 if (!defined('RCUBE_LIB_DIR')) {
@@ -361,6 +365,22 @@ function format_email($email)
 
 
 /**
+ * Fix version number so it can be used correctly in version_compare()
+ *
+ * @param string $version Version number string
+ *
+ * @param return Version number string
+ */
+function version_parse($version)
+{
+    return str_replace(
+        array('-stable', '-git'),
+        array('.0', '.99'),
+        $version);
+}
+
+
+/**
  * mbstring replacement functions
  */
 if (!extension_loaded('mbstring'))
diff --git a/program/lib/Roundcube/html.php b/program/lib/Roundcube/html.php
index 5fb574b97..592720308 100644
--- a/program/lib/Roundcube/html.php
+++ b/program/lib/Roundcube/html.php
@@ -2,8 +2,6 @@
 
 /*
  +-----------------------------------------------------------------------+
- | program/include/html.php                                              |
- |                                                                       |
  | This file is part of the Roundcube Webmail client                     |
  | Copyright (C) 2005-2011, The Roundcube Dev Team                       |
  |                                                                       |
@@ -13,7 +11,6 @@
  |                                                                       |
  | PURPOSE:                                                              |
  |   Helper class to create valid XHTML code                             |
- |                                                                       |
  +-----------------------------------------------------------------------+
  | Author: Thomas Bruederli <roundcube@gmail.com>                        |
  +-----------------------------------------------------------------------+
@@ -24,7 +21,7 @@
  * Class for HTML code creation
  *
  * @package    Framework
- * @subpackage HTML
+ * @subpackage View
  */
 class html
 {
@@ -172,7 +169,7 @@ class html
             $attr = array('href' => $attr);
         }
         return self::tag('a', $attr, $cont, array_merge(self::$common_attrib,
-        array('href','target','name','rel','onclick','onmouseover','onmouseout','onmousedown','onmouseup')));
+            array('href','target','name','rel','onclick','onmouseover','onmouseout','onmousedown','onmouseup')));
     }
 
     /**
@@ -290,7 +287,7 @@ class html
             }
 
             // attributes with no value
-            if (in_array($key, array('checked', 'multiple', 'disabled', 'selected'))) {
+            if (in_array($key, array('checked', 'multiple', 'disabled', 'selected', 'autofocus'))) {
                 if ($value) {
                     $attrib_arr[] = $key . '="' . $key . '"';
                 }
@@ -343,7 +340,8 @@ class html
 /**
  * Class to create an HTML input field
  *
- * @package HTML
+ * @package    Framework
+ * @subpackage View
  */
 class html_inputfield extends html
 {
@@ -353,6 +351,7 @@ class html_inputfield extends html
         'type','name','value','size','tabindex','autocapitalize',
         'autocomplete','checked','onchange','onclick','disabled','readonly',
         'spellcheck','results','maxlength','src','multiple','placeholder',
+        'autofocus',
     );
 
     /**
@@ -398,7 +397,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
 {
@@ -408,9 +408,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';
@@ -458,7 +458,8 @@ class html_hiddenfield extends html
 /**
  * Class to create HTML radio buttons
  *
- * @package HTML
+ * @package    Framework
+ * @subpackage View
  */
 class html_radiobutton extends html_inputfield
 {
@@ -488,7 +489,8 @@ class html_radiobutton extends html_inputfield
 /**
  * Class to create HTML checkboxes
  *
- * @package HTML
+ * @package    Framework
+ * @subpackage View
  */
 class html_checkbox extends html_inputfield
 {
@@ -518,7 +520,8 @@ class html_checkbox extends html_inputfield
 /**
  * Class to create an HTML textarea
  *
- * @package HTML
+ * @package    Framework
+ * @subpackage View
  */
 class html_textarea extends html
 {
@@ -576,7 +579,8 @@ class html_textarea extends html
  * print $select->show('CH');
  * </pre>
  *
- * @package HTML
+ * @package    Framework
+ * @subpackage View
  */
 class html_select extends html
 {
@@ -641,7 +645,8 @@ class html_select extends html
 /**
  * Class to build an HTML table
  *
- * @package HTML
+ * @package    Framework
+ * @subpackage View
  */
 class html_table extends html
 {
@@ -678,7 +683,7 @@ class html_table extends html
         }
 
         $cell = new stdClass;
-        $cell->attrib = $attr;
+        $cell->attrib  = $attr;
         $cell->content = $cont;
 
         $this->rows[$this->rowindex]->cells[$this->colindex] = $cell;
@@ -702,16 +707,16 @@ class html_table extends html
         }
 
         $cell = new stdClass;
-        $cell->attrib = $attr;
-        $cell->content = $cont;
+        $cell->attrib   = $attr;
+        $cell->content  = $cont;
         $this->header[] = $cell;
     }
 
-     /**
+    /**
      * Remove a column from a table
      * Useful for plugins making alterations
-     * 
-     * @param string $class 
+     *
+     * @param string $class
      */
     public function remove_column($class)
     {
@@ -791,8 +796,9 @@ class html_table extends html
      */
     public function show($attrib = null)
     {
-        if (is_array($attrib))
+        if (is_array($attrib)) {
             $this->attrib = array_merge($this->attrib, $attrib);
+        }
 
         $thead = $tbody = "";
 
@@ -834,7 +840,7 @@ class html_table extends html
      */
     public function size()
     {
-      return count($this->rows);
+        return count($this->rows);
     }
 
     /**
diff --git a/program/lib/Roundcube/rcube.php b/program/lib/Roundcube/rcube.php
index c3aa8ffa5..77da83d8e 100644
--- a/program/lib/Roundcube/rcube.php
+++ b/program/lib/Roundcube/rcube.php
@@ -2,8 +2,6 @@
 
 /*
  +-----------------------------------------------------------------------+
- | program/include/rcube.php                                             |
- |                                                                       |
  | This file is part of the Roundcube Webmail client                     |
  | Copyright (C) 2008-2012, The Roundcube Dev Team                       |
  | Copyright (C) 2011-2012, Kolab Systems AG                             |
@@ -36,7 +34,7 @@ class rcube
     /**
      * Singleton instace of rcube
      *
-     * @var rcmail
+     * @var rcube
      */
     static protected $instance;
 
@@ -407,6 +405,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) {
@@ -421,7 +420,7 @@ 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);
@@ -1075,14 +1074,17 @@ 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;
+        }
+
+        if (empty($arg['code'])) {
+            $arg['code'] = 500;
         }
 
         // installer
@@ -1260,13 +1262,30 @@ class rcube
             return $this->decrypt($_SESSION['password']);
         }
     }
+
+
+    /**
+     * Getter for logged user language code.
+     *
+     * @return string User language code
+     */
+    public function get_user_language()
+    {
+        if (is_object($this->user)) {
+            return $this->user->language;
+        }
+        else if (isset($_SESSION['language'])) {
+            return $_SESSION['language'];
+        }
+    }
 }
 
 
 /**
  * Lightweight plugin API class serving as a dummy if plugins are not enabled
  *
- * @package Core
+ * @package Framework
+ * @subpackage Core
  */
 class rcube_dummy_plugin_api
 {
diff --git a/program/lib/Roundcube/rcube_addressbook.php b/program/lib/Roundcube/rcube_addressbook.php
index d14fc587a..cbc3c6773 100644
--- a/program/lib/Roundcube/rcube_addressbook.php
+++ b/program/lib/Roundcube/rcube_addressbook.php
@@ -2,8 +2,6 @@
 
 /*
  +-----------------------------------------------------------------------+
- | program/include/rcube_addressbook.php                                 |
- |                                                                       |
  | This file is part of the Roundcube Webmail client                     |
  | Copyright (C) 2006-2012, The Roundcube Dev Team                       |
  |                                                                       |
@@ -13,7 +11,6 @@
  |                                                                       |
  | PURPOSE:                                                              |
  |   Interface to the local address book database                        |
- |                                                                       |
  +-----------------------------------------------------------------------+
  | Author: Thomas Bruederli <roundcube@gmail.com>                        |
  +-----------------------------------------------------------------------+
@@ -48,6 +45,7 @@ abstract class rcube_addressbook
     public $sort_col = 'name';
     public $sort_order = 'ASC';
     public $coltypes = array('name' => array('limit'=>1), 'firstname' => array('limit'=>1), 'surname' => array('limit'=>1), 'email' => array('limit'=>1));
+    public $date_cols = array();
 
     protected $error;
 
@@ -141,7 +139,7 @@ abstract class rcube_addressbook
      */
     function get_error()
     {
-      return $this->error;
+        return $this->error;
     }
 
     /**
@@ -152,7 +150,7 @@ abstract class rcube_addressbook
      */
     protected function set_error($type, $message)
     {
-      $this->error = array('type' => $type, 'message' => $message);
+        $this->error = array('type' => $type, 'message' => $message);
     }
 
     /**
@@ -209,13 +207,13 @@ abstract class rcube_addressbook
      */
     public function validate(&$save_data, $autofix = false)
     {
-        $rcmail = rcube::get_instance();
+        $rcube = rcube::get_instance();
 
         // check validity of email addresses
         foreach ($this->get_col_values('email', $save_data, true) as $email) {
             if (strlen($email)) {
                 if (!rcube_utils::check_email(rcube_utils::idn_to_ascii($email))) {
-                    $error = $rcmail->gettext(array('name' => 'emailformaterror', 'vars' => array('email' => $email)));
+                    $error = $rcube->gettext(array('name' => 'emailformaterror', 'vars' => array('email' => $email)));
                     $this->set_error(self::ERROR_VALIDATE, $error);
                     return false;
                 }
@@ -225,7 +223,6 @@ abstract class rcube_addressbook
         return true;
     }
 
-
     /**
      * Create a new contact record
      *
@@ -410,7 +407,6 @@ abstract class rcube_addressbook
         return array();
     }
 
-
     /**
      * Utility function to return all values of a certain data column
      * either as flat list or grouped by subtype
@@ -443,7 +439,6 @@ abstract class rcube_addressbook
         return $out;
     }
 
-
     /**
      * Normalize the given string for fulltext search.
      * Currently only optimized for Latin-1 characters; to be extended
@@ -491,7 +486,6 @@ abstract class rcube_addressbook
         return $fn;
     }
 
-
     /**
      * Compose the name to display in the contacts list for the given contact record.
      * This respects the settings parameter how to list conacts.
@@ -529,5 +523,66 @@ abstract class rcube_addressbook
         return $fn;
     }
 
+    /**
+     * Create a unique key for sorting contacts
+     */
+    public static function compose_contact_key($contact, $sort_col)
+    {
+        $key = $contact[$sort_col] . ':' . $row['sourceid'];
+
+        // add email to a key to not skip contacts with the same name (#1488375)
+        if (!empty($contact['email'])) {
+             $key .= ':' . implode(':', (array)$contact['email']);
+         }
+
+         return $key;
+    }
+
+
+    /**
+     * Compare search value with contact data
+     *
+     * @param string       $colname Data name
+     * @param string|array $value   Data value
+     * @param string       $search  Search value
+     * @param int          $mode    Search mode
+     *
+     * @return bool Comparision result
+     */
+    protected function compare_search_value($colname, $value, $search, $mode)
+    {
+        // The value is a date string, for date we'll
+        // use only strict comparison (mode = 1)
+        // @TODO: partial search, e.g. match only day and month
+        if (in_array($colname, $this->date_cols)) {
+            return (($value = rcube_utils::strtotime($value))
+                && ($search = rcube_utils::strtotime($search))
+                && date('Ymd', $value) == date('Ymd', $search));
+        }
+
+        // composite field, e.g. address
+        foreach ((array)$value as $val) {
+            $val = mb_strtolower($val);
+            switch ($mode) {
+            case 1:
+                $got = ($val == $search);
+                break;
+
+            case 2:
+                $got = ($search == substr($val, 0, strlen($search)));
+                break;
+
+            default:
+                $got = (strpos($val, $search) !== false);
+            }
+
+            if ($got) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
 }
 
diff --git a/program/lib/Roundcube/rcube_base_replacer.php b/program/lib/Roundcube/rcube_base_replacer.php
index b2a0fc13c..e41ccb1d9 100644
--- a/program/lib/Roundcube/rcube_base_replacer.php
+++ b/program/lib/Roundcube/rcube_base_replacer.php
@@ -2,8 +2,6 @@
 
 /*
  +-----------------------------------------------------------------------+
- | program/include/rcube_base_replacer.php                               |
- |                                                                       |
  | This file is part of the Roundcube Webmail client                     |
  | Copyright (C) 2005-2012, The Roundcube Dev Team                       |
  |                                                                       |
@@ -13,7 +11,6 @@
  |                                                                       |
  | PURPOSE:                                                              |
  |   Provide basic functions for base URL replacement                    |
- |                                                                       |
  +-----------------------------------------------------------------------+
  | Author: Thomas Bruederli <roundcube@gmail.com>                        |
  +-----------------------------------------------------------------------+
@@ -24,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 154e7ef4e..34128291b 100644
--- a/program/lib/Roundcube/rcube_browser.php
+++ b/program/lib/Roundcube/rcube_browser.php
@@ -2,8 +2,6 @@
 
 /*
  +-----------------------------------------------------------------------+
- | program/include/rcube_browser.php                                     |
- |                                                                       |
  | This file is part of the Roundcube Webmail client                     |
  | Copyright (C) 2007-2009, The Roundcube Dev Team                       |
  |                                                                       |
@@ -13,7 +11,6 @@
  |                                                                       |
  | PURPOSE:                                                              |
  |   Class representing the client browser's properties                  |
- |                                                                       |
  +-----------------------------------------------------------------------+
  | Author: Thomas Bruederli <roundcube@gmail.com>                        |
  +-----------------------------------------------------------------------+
@@ -23,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 3e1ce4fc8..92f12a8bf 100644
--- a/program/lib/Roundcube/rcube_cache.php
+++ b/program/lib/Roundcube/rcube_cache.php
@@ -2,8 +2,6 @@
 
 /*
  +-----------------------------------------------------------------------+
- | program/include/rcube_cache.php                                       |
- |                                                                       |
  | This file is part of the Roundcube Webmail client                     |
  | Copyright (C) 2011, The Roundcube Dev Team                            |
  | Copyright (C) 2011, Kolab Systems AG                                  |
@@ -14,7 +12,6 @@
  |                                                                       |
  | PURPOSE:                                                              |
  |   Caching engine                                                      |
- |                                                                       |
  +-----------------------------------------------------------------------+
  | Author: Thomas Bruederli <roundcube@gmail.com>                        |
  | Author: Aleksander Machniak <alec@alec.pl>                            |
diff --git a/program/lib/Roundcube/rcube_charset.php b/program/lib/Roundcube/rcube_charset.php
index 6135a5711..a7f26a3f4 100644
--- a/program/lib/Roundcube/rcube_charset.php
+++ b/program/lib/Roundcube/rcube_charset.php
@@ -2,8 +2,6 @@
 
 /*
  +-----------------------------------------------------------------------+
- | program/include/rcube_charset.php                                     |
- |                                                                       |
  | This file is part of the Roundcube Webmail client                     |
  | Copyright (C) 2005-2012, The Roundcube Dev Team                       |
  | Copyright (C) 2011-2012, Kolab Systems AG                             |
@@ -15,7 +13,6 @@
  |                                                                       |
  | PURPOSE:                                                              |
  |   Provide charset conversion functionality                            |
- |                                                                       |
  +-----------------------------------------------------------------------+
  | Author: Thomas Bruederli <roundcube@gmail.com>                        |
  | Author: Aleksander Machniak <alec@alec.pl>                            |
@@ -649,12 +646,13 @@ class rcube_charset
     /**
      * A method to guess character set of a string.
      *
-     * @param string $string    String.
-     * @param string $failover 	Default result for failover.
+     * @param string $string   String
+     * @param string $failover Default result for failover
+     * @param string $language User language
      *
      * @return string Charset name
      */
-    public static function detect($string, $failover='')
+    public static function detect($string, $failover = null, $language = null)
     {
         if (substr($string, 0, 4) == "\0\0\xFE\xFF") return 'UTF-32BE';  // Big Endian
         if (substr($string, 0, 4) == "\xFF\xFE\0\0") return 'UTF-32LE';  // Little Endian
@@ -669,38 +667,62 @@ class rcube_charset
         if ($string[0] != "\0" && $string[1] == "\0" && $string[2] != "\0" && $string[3] == "\0") return 'UTF-16LE';
 
         if (function_exists('mb_detect_encoding')) {
-            // FIXME: the order is important, because sometimes
-            // iso string is detected as euc-jp and etc.
-            $enc = array(
-                'UTF-8', 'SJIS', 'GB2312',
-                'ISO-8859-1', 'ISO-8859-2', 'ISO-8859-3', 'ISO-8859-4',
-                'ISO-8859-5', 'ISO-8859-6', 'ISO-8859-7', 'ISO-8859-8', 'ISO-8859-9',
-                'ISO-8859-10', 'ISO-8859-13', 'ISO-8859-14', 'ISO-8859-15', 'ISO-8859-16',
-                'WINDOWS-1252', 'WINDOWS-1251', 'EUC-JP', 'EUC-TW', 'KOI8-R', 'BIG5',
-                'ISO-2022-KR', 'ISO-2022-JP',
-            );
+            if (empty($language)) {
+                $rcube    = rcube::get_instance();
+                $language = $rcube->get_user_language();
+            }
+
+            // Prioritize charsets according to current language (#1485669)
+            switch ($language) {
+            case 'ja_JP': // for Japanese
+                $prio = array('ISO-2022-JP', 'JIS', 'UTF-8', 'EUC-JP', 'eucJP-win', 'SJIS', 'SJIS-win');
+                break;
+
+            case 'zh_CN': // for Chinese (Simplified)
+            case 'zh_TW': // for Chinese (Traditional)
+                $prio = array('UTF-8', 'BIG-5', 'GB2312', 'EUC-TW');
+                break;
+
+            case 'ko_KR': // for Korean
+                $prio = array('UTF-8', 'EUC-KR', 'ISO-2022-KR');
+                break;
 
-            $result = mb_detect_encoding($string, join(',', $enc));
+            case 'ru_RU': // for Russian
+                $prio = array('UTF-8', 'WINDOWS-1251', 'KOI8-R');
+                break;
+
+            default:
+                $prio = array('UTF-8', 'SJIS', 'GB2312',
+                    'ISO-8859-1', 'ISO-8859-2', 'ISO-8859-3', 'ISO-8859-4',
+                    'ISO-8859-5', 'ISO-8859-6', 'ISO-8859-7', 'ISO-8859-8', 'ISO-8859-9',
+                    'ISO-8859-10', 'ISO-8859-13', 'ISO-8859-14', 'ISO-8859-15', 'ISO-8859-16',
+                    'WINDOWS-1252', 'WINDOWS-1251', 'EUC-JP', 'EUC-TW', 'KOI8-R', 'BIG-5',
+                    'ISO-2022-KR', 'ISO-2022-JP',
+                );
+            }
+
+            $encodings = array_unique(array_merge($prio, mb_list_encodings()));
+
+            return mb_detect_encoding($string, $encodings);
         }
-        else {
-            // No match, check for UTF-8
-            // from http://w3.org/International/questions/qa-forms-utf-8.html
-            if (preg_match('/\A(
-                [\x09\x0A\x0D\x20-\x7E]
-                | [\xC2-\xDF][\x80-\xBF]
-                | \xE0[\xA0-\xBF][\x80-\xBF]
-                | [\xE1-\xEC\xEE\xEF][\x80-\xBF]{2}
-                | \xED[\x80-\x9F][\x80-\xBF]
-                | \xF0[\x90-\xBF][\x80-\xBF]{2}
-                | [\xF1-\xF3][\x80-\xBF]{3}
-                | \xF4[\x80-\x8F][\x80-\xBF]{2}
-                )*\z/xs', substr($string, 0, 2048))
-            ) {
+
+        // No match, check for UTF-8
+        // from http://w3.org/International/questions/qa-forms-utf-8.html
+        if (preg_match('/\A(
+            [\x09\x0A\x0D\x20-\x7E]
+            | [\xC2-\xDF][\x80-\xBF]
+            | \xE0[\xA0-\xBF][\x80-\xBF]
+            | [\xE1-\xEC\xEE\xEF][\x80-\xBF]{2}
+            | \xED[\x80-\x9F][\x80-\xBF]
+            | \xF0[\x90-\xBF][\x80-\xBF]{2}
+            | [\xF1-\xF3][\x80-\xBF]{3}
+            | \xF4[\x80-\x8F][\x80-\xBF]{2}
+            )*\z/xs', substr($string, 0, 2048))
+        ) {
             return 'UTF-8';
-            }
         }
 
-        return $result ? $result : $failover;
+        return $failover;
     }
 
 
diff --git a/program/lib/Roundcube/rcube_config.php b/program/lib/Roundcube/rcube_config.php
index 615faf3ad..2190dc4c2 100644
--- a/program/lib/Roundcube/rcube_config.php
+++ b/program/lib/Roundcube/rcube_config.php
@@ -2,8 +2,6 @@
 
 /*
  +-----------------------------------------------------------------------+
- | program/include/rcube_config.php                                      |
- |                                                                       |
  | This file is part of the Roundcube Webmail client                     |
  | Copyright (C) 2008-2012, The Roundcube Dev Team                       |
  |                                                                       |
@@ -13,7 +11,6 @@
  |                                                                       |
  | PURPOSE:                                                              |
  |   Class to read configuration settings                                |
- |                                                                       |
  +-----------------------------------------------------------------------+
  | Author: Thomas Bruederli <roundcube@gmail.com>                        |
  +-----------------------------------------------------------------------+
diff --git a/program/lib/Roundcube/rcube_contacts.php b/program/lib/Roundcube/rcube_contacts.php
index 5b4292a4c..c66e98687 100644
--- a/program/lib/Roundcube/rcube_contacts.php
+++ b/program/lib/Roundcube/rcube_contacts.php
@@ -2,8 +2,6 @@
 
 /*
  +-----------------------------------------------------------------------+
- | program/include/rcube_contacts.php                                    |
- |                                                                       |
  | This file is part of the Roundcube Webmail client                     |
  | Copyright (C) 2006-2012, The Roundcube Dev Team                       |
  |                                                                       |
@@ -13,7 +11,6 @@
  |                                                                       |
  | PURPOSE:                                                              |
  |   Interface to the local address book database                        |
- |                                                                       |
  +-----------------------------------------------------------------------+
  | Author: Thomas Bruederli <roundcube@gmail.com>                        |
  +-----------------------------------------------------------------------+
@@ -63,6 +60,7 @@ class rcube_contacts extends rcube_addressbook
       'jobtitle', 'organization', 'department', 'assistant', 'manager',
       'gender', 'maidenname', 'spouse', 'email', 'phone', 'address',
       'birthday', 'anniversary', 'website', 'im', 'notes', 'photo');
+    public $date_cols = array('birthday', 'anniversary');
 
     const SEPARATOR = ',';
 
@@ -404,32 +402,16 @@ class rcube_contacts extends rcube_addressbook
             for ($i=0; $i<$pages; $i++) {
                 $this->list_records(null, $i, true);
                 while ($row = $this->result->next()) {
-                    $id = $row[$this->primary_key];
+                    $id    = $row[$this->primary_key];
                     $found = array();
                     foreach (preg_grep($regexp, array_keys($row)) as $col) {
                         $pos     = strpos($col, ':');
                         $colname = $pos ? substr($col, 0, $pos) : $col;
                         $search  = $post_search[$colname];
                         foreach ((array)$row[$col] as $value) {
-                            // composite field, e.g. address
-                            foreach ((array)$value as $val) {
-                                $val = mb_strtolower($val);
-                                switch ($mode) {
-                                case 1:
-                                    $got = ($val == $search);
-                                    break;
-                                case 2:
-                                    $got = ($search == substr($val, 0, strlen($search)));
-                                    break;
-                                default:
-                                    $got = (strpos($val, $search) !== false);
-                                    break;
-                                }
-
-                                if ($got) {
-                                    $found[$colname] = true;
-                                    break 2;
-                                }
+                            if ($this->compare_search_value($colname, $value, $search, $mode)) {
+                                $found[$colname] = true;
+                                break 2;
                             }
                         }
                     }
diff --git a/program/lib/Roundcube/rcube_content_filter.php b/program/lib/Roundcube/rcube_content_filter.php
index 99916a300..ae6617d1b 100644
--- a/program/lib/Roundcube/rcube_content_filter.php
+++ b/program/lib/Roundcube/rcube_content_filter.php
@@ -2,8 +2,6 @@
 
 /*
  +-----------------------------------------------------------------------+
- | program/include/rcube_content_filter.php                              |
- |                                                                       |
  | This file is part of the Roundcube Webmail client                     |
  | Copyright (C) 2011, The Roundcube Dev Team                            |
  |                                                                       |
@@ -13,7 +11,6 @@
  |                                                                       |
  | PURPOSE:                                                              |
  |   PHP stream filter to detect evil content in mail attachments        |
- |                                                                       |
  +-----------------------------------------------------------------------+
  | Author: Thomas Bruederli <roundcube@gmail.com>                        |
  +-----------------------------------------------------------------------+
@@ -23,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 850c0c4c3..0d3276b84 100644
--- a/program/lib/Roundcube/rcube_csv2vcard.php
+++ b/program/lib/Roundcube/rcube_csv2vcard.php
@@ -2,8 +2,6 @@
 
 /*
  +-----------------------------------------------------------------------+
- | program/include/rcube_csv2vcard.php                                   |
- |                                                                       |
  | This file is part of the Roundcube Webmail client                     |
  | Copyright (C) 2008-2012, The Roundcube Dev Team                       |
  |                                                                       |
@@ -126,6 +124,12 @@ class rcube_csv2vcard
         //'work_address_2'        => '',
         'work_country'          => 'country:work',
         'work_zipcode'          => 'zipcode:work',
+        'last'                  => 'surname',
+        'first'                 => 'firstname',
+        'work_city'             => 'locality:work',
+        'work_state'            => 'region:work',
+        'home_city_short'       => 'locality:home',
+        'home_state_short'      => 'region:home',
     );
 
     /**
@@ -273,13 +277,7 @@ class rcube_csv2vcard
 
         // Parse file
         foreach (preg_split("/[\r\n]+/", $csv) as $i => $line) {
-            $line = trim($line);
-            if (empty($line)) {
-                continue;
-            }
-
-            $elements = rcube_utils::explode_quoted_string(',', $line);
-
+            $elements = $this->parse_line($line);
             if (empty($elements)) {
                 continue;
             }
@@ -307,6 +305,35 @@ class rcube_csv2vcard
     }
 
     /**
+     * Parse CSV file line
+     */
+    protected function parse_line($line)
+    {
+        $line = trim($line);
+        if (empty($line)) {
+            return null;
+        }
+
+        $fields = rcube_utils::explode_quoted_string(',', $line);
+
+        // remove quotes if needed
+        if (!empty($fields)) {
+            foreach ($fields as $idx => $value) {
+                if (($len = strlen($value)) > 1 && $value[0] == '"' && $value[$len-1] == '"') {
+                    // remove surrounding quotes
+                    $value = substr($value, 1, -1);
+                    // replace doubled quotes inside the string with single quote
+                    $value = str_replace('""', '"', $value);
+
+                    $fields[$idx] = $value;
+                }
+            }
+        }
+
+        return $fields;
+    }
+
+    /**
      * Parse CSV header line, detect fields mapping
      */
     protected function parse_header($elements)
@@ -369,6 +396,15 @@ class rcube_csv2vcard
             }
         }
 
+        // Convert address(es) to rcube_vcard data
+        foreach ($contact as $idx => $value) {
+            $name = explode(':', $idx);
+            if (in_array($name[0], array('street', 'locality', 'region', 'zipcode', 'country'))) {
+                $contact['address:'.$name[1]][$name[0]] = $value;
+                unset($contact[$idx]);
+            }
+        }
+
         // Create vcard object
         $vcard = new rcube_vcard();
         foreach ($contact as $name => $value) {
diff --git a/program/lib/Roundcube/rcube_db.php b/program/lib/Roundcube/rcube_db.php
index 5d8c4a534..4e6684c51 100644
--- a/program/lib/Roundcube/rcube_db.php
+++ b/program/lib/Roundcube/rcube_db.php
@@ -2,8 +2,6 @@
 
 /**
  +-----------------------------------------------------------------------+
- | program/include/rcube_db.php                                          |
- |                                                                       |
  | This file is part of the Roundcube Webmail client                     |
  | Copyright (C) 2005-2012, The Roundcube Dev Team                       |
  |                                                                       |
@@ -13,19 +11,17 @@
  |                                                                       |
  | PURPOSE:                                                              |
  |   Database wrapper class that implements PHP PDO functions            |
- |                                                                       |
  +-----------------------------------------------------------------------+
  | Author: Aleksander Machniak <alec@alec.pl>                            |
  +-----------------------------------------------------------------------+
 */
 
-
 /**
  * Database independent query interface.
  * This is a wrapper for the PHP PDO.
  *
  * @package   Framework
- * @sbpackage Database
+ * @subpackage Database
  */
 class rcube_db
 {
@@ -37,12 +33,11 @@ class rcube_db
     protected $db_mode;               // Connection mode
     protected $dbh;                   // Connection handle
 
-    protected $db_error        = false;
-    protected $db_error_msg    = '';
-    protected $conn_failure    = false;
-    protected $a_query_results = array('dummy');
-    protected $last_res_id     = 0;
-    protected $db_index        = 0;
+    protected $db_error     = false;
+    protected $db_error_msg = '';
+    protected $conn_failure = false;
+    protected $db_index     = 0;
+    protected $last_result;
     protected $tables;
     protected $variables;
 
@@ -75,7 +70,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"),
@@ -227,7 +222,7 @@ class rcube_db
         $this->db_connected = is_object($this->dbh);
 
         // use write-master when read-only fails
-        if (!$this->db_connected && $mode == 'r') {
+        if (!$this->db_connected && $mode == 'r' && $this->is_replicated()) {
             $mode = 'w';
             $this->dbh          = $this->dsn_connect($this->db_dsnw_array);
             $this->db_connected = is_object($this->dbh);
@@ -267,14 +262,14 @@ class rcube_db
     /**
      * Getter for error state
      *
-     * @param int $res_id Optional query result identifier
+     * @param mixed $result Optional query result
      *
      * @return string Error message
      */
-    public function is_error($res_id = null)
+    public function is_error($result = null)
     {
-        if ($res_id !== null) {
-            return $this->_get_result($res_id) === false ? $this->db_error_msg : null;
+        if ($result !== null) {
+            return $result === false ? $this->db_error_msg : null;
         }
 
         return $this->db_error ? $this->db_error_msg : null;
@@ -343,7 +338,7 @@ class rcube_db
      * @param int    Number of rows for LIMIT statement
      * @param mixed  Values to be inserted in query
      *
-     * @return int Query handle identifier
+     * @return PDOStatement|bool Query handle or False on error
      */
     public function limitquery()
     {
@@ -363,7 +358,7 @@ class rcube_db
      * @param int    $numrows Number of rows for LIMIT statement
      * @param array  $params  Values to be inserted in query
      *
-     * @return int Query handle identifier
+     * @return PDOStatement|bool Query handle or False on error
      */
     protected function _query($query, $offset, $numrows, $params)
     {
@@ -374,7 +369,7 @@ class rcube_db
 
         // check connection before proceeding
         if (!$this->is_connected()) {
-            return null;
+            return $this->last_result = false;
         }
 
         if ($numrows || $offset) {
@@ -405,6 +400,11 @@ class rcube_db
 
         $this->debug($query);
 
+        // destroy reference to previous result, required for SQLite driver (#1488874)
+        $this->last_result = null;
+        $this->db_error_msg = null;
+
+        // send query
         $query = $this->dbh->query($query);
 
         if ($query === false) {
@@ -417,20 +417,21 @@ class rcube_db
                 'message' => $this->db_error_msg), true, false);
         }
 
-        // add result, even if it's an error
-        return $this->_add_result($query);
+        $this->last_result = $query;
+
+        return $query;
     }
 
     /**
      * Get number of affected rows for the last query
      *
-     * @param  number $res_id Optional query handle identifier
+     * @param mixed $result Optional query handle
      *
-     * @return int Number of rows or false on failure
+     * @return int Number of (matching) rows
      */
-    public function affected_rows($res_id = null)
+    public function affected_rows($result = null)
     {
-        if ($result = $this->_get_result($res_id)) {
+        if ($result || ($result === null && ($result = $this->last_result))) {
             return $result->rowCount();
         }
 
@@ -438,6 +439,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)
@@ -464,13 +491,12 @@ class rcube_db
      * Get an associative array for one row
      * If no query handle is specified, the last query will be taken as reference
      *
-     * @param int $res_id Optional query handle identifier
+     * @param mixed $result Optional query handle
      *
      * @return mixed Array with col values or false on failure
      */
-    public function fetch_assoc($res_id = null)
+    public function fetch_assoc($result = null)
     {
-        $result = $this->_get_result($res_id);
         return $this->_fetch_row($result, PDO::FETCH_ASSOC);
     }
 
@@ -478,31 +504,30 @@ class rcube_db
      * Get an index array for one row
      * If no query handle is specified, the last query will be taken as reference
      *
-     * @param int $res_id Optional query handle identifier
+     * @param mixed $result Optional query handle
      *
      * @return mixed Array with col values or false on failure
      */
-    public function fetch_array($res_id = null)
+    public function fetch_array($result = null)
     {
-        $result = $this->_get_result($res_id);
         return $this->_fetch_row($result, PDO::FETCH_NUM);
     }
 
     /**
      * Get col values for a result row
      *
-     * @param PDOStatement $result Result handle
-     * @param int          $mode   Fetch mode identifier
+     * @param mixed $result Optional query handle
+     * @param int   $mode   Fetch mode identifier
      *
      * @return mixed Array with col values or false on failure
      */
     protected function _fetch_row($result, $mode)
     {
-        if (!is_object($result) || !$this->is_connected()) {
-            return false;
+        if ($result || ($result === null && ($result = $this->last_result))) {
+            return $result->fetch($mode);
         }
 
-        return $result->fetch($mode);
+        return false;
     }
 
     /**
@@ -538,8 +563,8 @@ class rcube_db
         if ($this->tables === null) {
             $q = $this->query('SELECT TABLE_NAME FROM INFORMATION_SCHEMA.TABLES ORDER BY TABLE_NAME');
 
-            if ($res = $this->_get_result($q)) {
-                $this->tables = $res->fetchAll(PDO::FETCH_COLUMN, 0);
+            if ($q) {
+                $this->tables = $q->fetchAll(PDO::FETCH_COLUMN, 0);
             }
             else {
                 $this->tables = array();
@@ -561,8 +586,8 @@ class rcube_db
         $q = $this->query('SELECT COLUMN_NAME FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = ?',
             array($table));
 
-        if ($res = $this->_get_result($q)) {
-            return $res->fetchAll(PDO::FETCH_COLUMN, 0);
+        if ($q) {
+            return $q->fetchAll(PDO::FETCH_COLUMN, 0);
         }
 
         return array();
@@ -572,7 +597,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
      */
@@ -587,6 +612,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');
@@ -636,7 +665,7 @@ class rcube_db
             $name[] = $start . $elem . $end;
         }
 
-        return  implode($name, '.');
+        return implode($name, '.');
     }
 
     /**
@@ -653,7 +682,7 @@ class rcube_db
      * 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
      */
@@ -777,42 +806,6 @@ class rcube_db
     }
 
     /**
-     * Adds a query result and returns a handle ID
-     *
-     * @param object $res Query handle
-     *
-     * @return int Handle ID
-     */
-    protected function _add_result($res)
-    {
-        $this->last_res_id = sizeof($this->a_query_results);
-        $this->a_query_results[$this->last_res_id] = $res;
-
-        return $this->last_res_id;
-    }
-
-    /**
-     * Resolves a given handle ID and returns the according query handle
-     * If no ID is specified, the last resource handle will be returned
-     *
-     * @param int $res_id Handle ID
-     *
-     * @return mixed Resource handle or false on failure
-     */
-    protected function _get_result($res_id = null)
-    {
-        if ($res_id == null) {
-            $res_id = $this->last_res_id;
-        }
-
-        if (!empty($this->a_query_results[$res_id])) {
-            return $this->a_query_results[$res_id];
-        }
-
-        return false;
-    }
-
-    /**
      * Return correct name for a specific database table
      *
      * @param string $table Table name
diff --git a/program/lib/Roundcube/rcube_db_mssql.php b/program/lib/Roundcube/rcube_db_mssql.php
index c95663c74..37a42678a 100644
--- a/program/lib/Roundcube/rcube_db_mssql.php
+++ b/program/lib/Roundcube/rcube_db_mssql.php
@@ -2,8 +2,6 @@
 
 /**
  +-----------------------------------------------------------------------+
- | program/include/rcube_db_mssql.php                                    |
- |                                                                       |
  | This file is part of the Roundcube Webmail client                     |
  | Copyright (C) 2005-2012, The Roundcube Dev Team                       |
  |                                                                       |
@@ -14,13 +12,11 @@
  | PURPOSE:                                                              |
  |   Database wrapper class that implements PHP PDO functions            |
  |   for MS SQL Server database                                          |
- |                                                                       |
  +-----------------------------------------------------------------------+
  | Author: Aleksander Machniak <alec@alec.pl>                            |
  +-----------------------------------------------------------------------+
 */
 
-
 /**
  * Database independent query interface
  * This is a wrapper for the PHP PDO
@@ -104,26 +100,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 1c5ba1de7..8ab6403c8 100644
--- a/program/lib/Roundcube/rcube_db_mysql.php
+++ b/program/lib/Roundcube/rcube_db_mysql.php
@@ -2,8 +2,6 @@
 
 /**
  +-----------------------------------------------------------------------+
- | program/include/rcube_db_mysql.php                                    |
- |                                                                       |
  | This file is part of the Roundcube Webmail client                     |
  | Copyright (C) 2005-2012, The Roundcube Dev Team                       |
  |                                                                       |
@@ -14,13 +12,11 @@
  | PURPOSE:                                                              |
  |   Database wrapper class that implements PHP PDO functions            |
  |   for MySQL database                                                  |
- |                                                                       |
  +-----------------------------------------------------------------------+
  | Author: Aleksander Machniak <alec@alec.pl>                            |
  +-----------------------------------------------------------------------+
 */
 
-
 /**
  * Database independent query interface
  *
@@ -130,6 +126,9 @@ class rcube_db_mysql extends rcube_db
         // Always return matching (not affected only) rows count
         $result[PDO::MYSQL_ATTR_FOUND_ROWS] = true;
 
+        // Enable AUTOCOMMIT mode (#1488902)
+        $dsn_options[PDO::ATTR_AUTOCOMMIT] = true;
+
         return $result;
     }
 
diff --git a/program/lib/Roundcube/rcube_db_pgsql.php b/program/lib/Roundcube/rcube_db_pgsql.php
index 797860a84..cf23c5e48 100644
--- a/program/lib/Roundcube/rcube_db_pgsql.php
+++ b/program/lib/Roundcube/rcube_db_pgsql.php
@@ -2,8 +2,6 @@
 
 /**
  +-----------------------------------------------------------------------+
- | program/include/rcube_db_pgsql.php                                    |
- |                                                                       |
  | This file is part of the Roundcube Webmail client                     |
  | Copyright (C) 2005-2012, The Roundcube Dev Team                       |
  |                                                                       |
@@ -14,13 +12,11 @@
  | PURPOSE:                                                              |
  |   Database wrapper class that implements PHP PDO functions            |
  |   for PostgreSQL database                                             |
- |                                                                       |
  +-----------------------------------------------------------------------+
  | Author: Aleksander Machniak <alec@alec.pl>                            |
  +-----------------------------------------------------------------------+
 */
 
-
 /**
  * Database independent query interface
  * This is a wrapper for the PHP PDO
diff --git a/program/lib/Roundcube/rcube_db_sqlite.php b/program/lib/Roundcube/rcube_db_sqlite.php
index 65dcb6d6e..145b8a371 100644
--- a/program/lib/Roundcube/rcube_db_sqlite.php
+++ b/program/lib/Roundcube/rcube_db_sqlite.php
@@ -2,8 +2,6 @@
 
 /**
  +-----------------------------------------------------------------------+
- | program/include/rcube_db_sqlite.php                                   |
- |                                                                       |
  | This file is part of the Roundcube Webmail client                     |
  | Copyright (C) 2005-2012, The Roundcube Dev Team                       |
  |                                                                       |
@@ -14,13 +12,11 @@
  | PURPOSE:                                                              |
  |   Database wrapper class that implements PHP PDO functions            |
  |   for SQLite database                                                 |
- |                                                                       |
  +-----------------------------------------------------------------------+
  | Author: Aleksander Machniak <alec@alec.pl>                            |
  +-----------------------------------------------------------------------+
 */
 
-
 /**
  * Database independent query interface
  * This is a wrapper for the PHP PDO
@@ -124,12 +120,7 @@ class rcube_db_sqlite extends rcube_db
             $q = $this->query('SELECT name FROM sqlite_master'
                 .' WHERE type = \'table\' ORDER BY name');
 
-            if ($res = $this->_get_result($q)) {
-                $this->tables = $res->fetchAll(PDO::FETCH_COLUMN, 0);
-            }
-            else {
-                $this->tables = array();
-            }
+            $this->tables = $q ? $q->fetchAll(PDO::FETCH_COLUMN, 0) : array();
         }
 
         return $this->tables;
diff --git a/program/lib/Roundcube/rcube_db_sqlsrv.php b/program/lib/Roundcube/rcube_db_sqlsrv.php
index 8b6ffe807..e5dfb1154 100644
--- a/program/lib/Roundcube/rcube_db_sqlsrv.php
+++ b/program/lib/Roundcube/rcube_db_sqlsrv.php
@@ -2,8 +2,6 @@
 
 /**
  +-----------------------------------------------------------------------+
- | program/include/rcube_db_sqlsrv.php                                   |
- |                                                                       |
  | This file is part of the Roundcube Webmail client                     |
  | Copyright (C) 2005-2012, The Roundcube Dev Team                       |
  |                                                                       |
@@ -14,13 +12,11 @@
  | PURPOSE:                                                              |
  |   Database wrapper class that implements PHP PDO functions            |
  |   for MS SQL Server database                                          |
- |                                                                       |
  +-----------------------------------------------------------------------+
  | Author: Aleksander Machniak <alec@alec.pl>                            |
  +-----------------------------------------------------------------------+
 */
 
-
 /**
  * Database independent query interface
  * This is a wrapper for the PHP PDO
@@ -104,26 +100,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
new file mode 100644
index 000000000..8c628c912
--- /dev/null
+++ b/program/lib/Roundcube/rcube_enriched.php
@@ -0,0 +1,143 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | This file is part of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2012, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the 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:                                                              |
+ |   Helper class to convert Enriched to HTML format (RFC 1523, 1896)    |
+ +-----------------------------------------------------------------------+
+ | Author: Aleksander Machniak <alec@alec.pl>                            |
+ | Author: Ryo Chijiiwa (IlohaMail)                                      |
+ +-----------------------------------------------------------------------+
+*/
+
+/**
+ * Class for Enriched to HTML conversion
+ *
+ * @package    Framework
+ * @subpackage Utils
+ */
+class rcube_enriched
+{
+    protected static function convert_newlines($body)
+    {
+        // remove single newlines, convert N newlines to N-1
+        $body = str_replace("\r\n", "\n", $body);
+        $len  = strlen($body);
+        $nl   = 0;
+        $out  = '';
+
+        for ($i=0; $i<$len; $i++) {
+            $c = $body[$i];
+            if (ord($c) == 10)
+                $nl++;
+            if ($nl && ord($c) != 10)
+                $nl = 0;
+            if ($nl != 1)
+                $out .= $c;
+            else
+                $out .= ' ';
+        }
+
+        return $out;
+    }
+
+    protected static function convert_formatting($body)
+    {
+        $replace = array(
+            '<bold>'        => '<b>',            '</bold>'   => '</b>',
+            '<italic>'      => '<i>',            '</italic>' => '</i>',
+            '<fixed>'       => '<tt>',           '</fixed>'  => '</tt>',
+            '<smaller>'     => '<font size=-1>', '</smaller>'=> '</font>',
+            '<bigger>'      => '<font size=+1>', '</bigger>' => '</font>',
+            '<underline>'   => '<span style="text-decoration: underline">', '</underline>'   => '</span>',
+            '<flushleft>'   => '<span style="text-align: left">',           '</flushleft>'   => '</span>',
+            '<flushright>'  => '<span style="text-align: right">',          '</flushright>'  => '</span>',
+            '<flushboth>'   => '<span style="text-align: justified">',      '</flushboth>'   => '</span>',
+            '<indent>'      => '<span style="padding-left: 20px">',         '</indent>'      => '</span>',
+            '<indentright>' => '<span style="padding-right: 20px">',        '</indentright>' => '</span>',
+        );
+
+        return str_ireplace(array_keys($replace), array_values($replace), $body);
+    }
+
+    protected static function convert_font($body)
+    {
+        $pattern = '/(.*)\<fontfamily\>\<param\>(.*)\<\/param\>(.*)\<\/fontfamily\>(.*)/ims';
+
+        while (preg_match($pattern, $body, $a)) {
+            if (count($a) != 5)
+                continue;
+
+            $body = $a[1].'<span style="font-family: '.$a[2].'">'.$a[3].'</span>'.$a[4];
+        }
+
+        return $body;
+    }
+
+    protected static function convert_color($body)
+    {
+        $pattern = '/(.*)\<color\>\<param\>(.*)\<\/param\>(.*)\<\/color\>(.*)/ims';
+
+        while (preg_match($pattern, $body, $a)) {
+            if (count($a) != 5)
+                continue;
+
+            // extract color (either by name, or ####,####,####)
+            if (strpos($a[2],',')) {
+                $rgb   = explode(',',$a[2]);
+                $color = '#';
+                for ($i=0; $i<3; $i++)
+                    $color .= substr($rgb[$i], 0, 2); // just take first 2 bytes
+            }
+            else {
+                $color = $a[2];
+            }
+
+            // put it all together
+            $body = $a[1].'<span style="color: '.$color.'">'.$a[3].'</span>'.$a[4];
+        }
+
+        return $body;
+    }
+
+    protected static function convert_excerpt($body)
+    {
+        $pattern = '/(.*)\<excerpt\>(.*)\<\/excerpt\>(.*)/i';
+
+        while (preg_match($pattern, $body, $a)) {
+            if (count($a) != 4)
+                continue;
+
+            $quoted = '';
+            $lines  = explode('<br>', $a[2]);
+
+            foreach ($lines as $n => $line)
+                $quoted .= '&gt;'.$line.'<br>';
+
+            $body = $a[1].'<span class="quotes">'.$quoted.'</span>'.$a[3];
+        }
+
+        return $body;
+    }
+
+    public static function to_html($body)
+    {
+        $body = str_replace('<<','&lt;',$body);
+        $body = self::convert_newlines($body);
+        $body = str_replace("\n", '<br>', $body);
+        $body = self::convert_formatting($body);
+        $body = self::convert_color($body);
+        $body = self::convert_font($body);
+        $body = self::convert_excerpt($body);
+        //$body = nl2br($body);
+
+        return $body;
+    }
+}
diff --git a/program/lib/html2text.php b/program/lib/Roundcube/rcube_html2text.php
index 34c719302..9b248a3a8 100644
--- a/program/lib/html2text.php
+++ b/program/lib/Roundcube/rcube_html2text.php
@@ -1,35 +1,23 @@
 <?php
 
-/*************************************************************************
- *                                                                       *
- * class.html2text.inc                                                   *
- *                                                                       *
- *************************************************************************
- *                                                                       *
- * Converts HTML to formatted plain text                                 *
- *                                                                       *
- * Copyright (c) 2005-2007 Jon Abernathy <jon@chuggnutt.com>             *
- * All rights reserved.                                                  *
- *                                                                       *
- * This script 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 2 of the License, or     *
- * (at your option) any later version.                                   *
- *                                                                       *
- * The GNU General Public License can be found at                        *
- * http://www.gnu.org/copyleft/gpl.html.                                 *
- *                                                                       *
- * This script 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.                          *
- *                                                                       *
- * Author(s): Jon Abernathy <jon@chuggnutt.com>                          *
- *                                                                       *
- * Last modified: 08/08/07                                               *
- *                                                                       *
- *************************************************************************/
-
+/**
+ +-----------------------------------------------------------------------+
+ | This file is part of the Roundcube Webmail client                     |
+ | Copyright (C) 2008-2012, The Roundcube Dev Team                       |
+ | Copyright (c) 2005-2007, Jon Abernathy <jon@chuggnutt.com>            |
+ |                                                                       |
+ | Licensed under the 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:                                                              |
+ |   Converts HTML to formatted plain text (based on html2text class)    |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas Bruederli <roundcube@gmail.com>                        |
+ | Author: Aleksander Machniak <alec@alec.pl>                            |
+ | Author: Jon Abernathy <jon@chuggnutt.com>                             |
+ +-----------------------------------------------------------------------+
+ */
 
 /**
  *  Takes HTML and converts it to formatted, plain text.
@@ -99,58 +87,55 @@
  *  future time.
  *
  *  *** End of the housecleaning updates. Updated 08/08/07.
+ */
+
+/**
+ * Converts HTML to formatted plain text
  *
- *  @author Jon Abernathy <jon@chuggnutt.com>
- *  @version 1.0.0
- *  @since PHP 4.0.2
+ * @package    Framework
+ * @subpackage Utils
  */
-class html2text
+class rcube_html2text
 {
-
     /**
-     *  Contains the HTML content to convert.
+     * Contains the HTML content to convert.
      *
-     *  @var string $html
-     *  @access public
+     * @var string $html
      */
-    var $html;
+    protected $html;
 
     /**
-     *  Contains the converted, formatted text.
+     * Contains the converted, formatted text.
      *
-     *  @var string $text
-     *  @access public
+     * @var string $text
      */
-    var $text;
+    protected $text;
 
     /**
-     *  Maximum width of the formatted text, in columns.
+     * Maximum width of the formatted text, in columns.
      *
-     *  Set this value to 0 (or less) to ignore word wrapping
-     *  and not constrain text to a fixed-width column.
+     * Set this value to 0 (or less) to ignore word wrapping
+     * and not constrain text to a fixed-width column.
      *
-     *  @var integer $width
-     *  @access public
+     * @var integer $width
      */
-    var $width = 70;
+    protected $width = 70;
 
     /**
-     *  Target character encoding for output text
+     * Target character encoding for output text
      *
-     *  @var string $charset
-     *  @access public
+     * @var string $charset
      */
-    var $charset = 'UTF-8';
+    protected $charset = 'UTF-8';
 
     /**
-     *  List of preg* regular expression patterns to search for,
-     *  used in conjunction with $replace.
+     * List of preg* regular expression patterns to search for,
+     * used in conjunction with $replace.
      *
-     *  @var array $search
-     *  @access public
-     *  @see $replace
+     * @var array $search
+     * @see $replace
      */
-    var $search = array(
+    protected $search = array(
         "/\r/",                                  // Non-legal carriage return
         "/[\n\t]+/",                             // Newlines and tabs
         '/<head[^>]*>.*?<\/head>/i',             // <head>
@@ -172,13 +157,12 @@ class html2text
     );
 
     /**
-     *  List of pattern replacements corresponding to patterns searched.
+     * List of pattern replacements corresponding to patterns searched.
      *
-     *  @var array $replace
-     *  @access public
-     *  @see $search
+     * @var array $replace
+     * @see $search
      */
-    var $replace = array(
+    protected $replace = array(
         '',                                     // Non-legal carriage return
         ' ',                                    // Newlines and tabs
         '',                                     // <head>
@@ -200,14 +184,13 @@ class html2text
     );
 
     /**
-     *  List of preg* regular expression patterns to search for,
-     *  used in conjunction with $ent_replace.
+     * List of preg* regular expression patterns to search for,
+     * used in conjunction with $ent_replace.
      *
-     *  @var array $ent_search
-     *  @access public
-     *  @see $ent_replace
+     * @var array $ent_search
+     * @see $ent_replace
      */
-    var $ent_search = array(
+    protected $ent_search = array(
         '/&(nbsp|#160);/i',                      // Non-breaking space
         '/&(quot|rdquo|ldquo|#8220|#8221|#147|#148);/i',
                                          // Double quotes
@@ -227,13 +210,12 @@ class html2text
     );
 
     /**
-     *  List of pattern replacements corresponding to patterns searched.
+     * List of pattern replacements corresponding to patterns searched.
      *
-     *  @var array $ent_replace
-     *  @access public
-     *  @see $ent_search
+     * @var array $ent_replace
+     * @see $ent_search
      */
-    var $ent_replace = array(
+    protected $ent_replace = array(
         ' ',                                    // Non-breaking space
         '"',                                    // Double quotes
         "'",                                    // Single quotes
@@ -252,13 +234,12 @@ class html2text
     );
 
     /**
-     *  List of preg* regular expression patterns to search for
-     *  and replace using callback function.
+     * List of preg* regular expression patterns to search for
+     * and replace using callback function.
      *
-     *  @var array $callback_search
-     *  @access public
+     * @var array $callback_search
      */
-    var $callback_search = array(
+    protected $callback_search = array(
         '/<(a) [^>]*href=("|\')([^"\']+)\2[^>]*>(.*?)<\/a>/i', // <a href="">
         '/<(h)[123456]( [^>]*)?>(.*?)<\/h[123456]>/i',         // h1 - h6
         '/<(b)( [^>]*)?>(.*?)<\/b>/i',                         // <b>
@@ -267,14 +248,13 @@ class html2text
     );
 
    /**
-    *  List of preg* regular expression patterns to search for in PRE body,
-    *  used in conjunction with $pre_replace.
+    * List of preg* regular expression patterns to search for in PRE body,
+    * used in conjunction with $pre_replace.
     *
-    *  @var array $pre_search
-    *  @access public
-    *  @see $pre_replace
+    * @var array $pre_search
+    * @see $pre_replace
     */
-    var $pre_search = array(
+    protected $pre_search = array(
         "/\n/",
         "/\t/",
         '/ /',
@@ -283,13 +263,12 @@ class html2text
     );
 
     /**
-     *  List of pattern replacements corresponding to patterns searched for PRE body.
+     * List of pattern replacements corresponding to patterns searched for PRE body.
      *
-     *  @var array $pre_replace
-     *  @access public
-     *  @see $pre_search
+     * @var array $pre_replace
+     * @see $pre_search
      */
-    var $pre_replace = array(
+    protected $pre_replace = array(
         '<br>',
         '&nbsp;&nbsp;&nbsp;&nbsp;',
         '&nbsp;',
@@ -298,103 +277,95 @@ class html2text
     );
 
     /**
-     *  Contains a list of HTML tags to allow in the resulting text.
+     * Contains a list of HTML tags to allow in the resulting text.
      *
-     *  @var string $allowed_tags
-     *  @access public
-     *  @see set_allowed_tags()
+     * @var string $allowed_tags
+     * @see set_allowed_tags()
      */
-    var $allowed_tags = '';
+    protected $allowed_tags = '';
 
     /**
-     *  Contains the base URL that relative links should resolve to.
+     * Contains the base URL that relative links should resolve to.
      *
-     *  @var string $url
-     *  @access public
+     * @var string $url
      */
-    var $url;
+    protected $url;
 
     /**
-     *  Indicates whether content in the $html variable has been converted yet.
+     * Indicates whether content in the $html variable has been converted yet.
      *
-     *  @var boolean $_converted
-     *  @access private
-     *  @see $html, $text
+     * @var boolean $_converted
+     * @see $html, $text
      */
-    var $_converted = false;
+    protected $_converted = false;
 
     /**
-     *  Contains URL addresses from links to be rendered in plain text.
+     * Contains URL addresses from links to be rendered in plain text.
      *
-     *  @var array $_link_list
-     *  @access private
-     *  @see _build_link_list()
+     * @var array $_link_list
+     * @see _build_link_list()
      */
-    var $_link_list = array();
+    protected $_link_list = array();
 
     /**
      * Boolean flag, true if a table of link URLs should be listed after the text.
      *
      * @var boolean $_do_links
-     * @access private
-     * @see html2text()
+     * @see __construct()
      */
-    var $_do_links = true;
+    protected $_do_links = true;
 
     /**
-     *  Constructor.
+     * Constructor.
      *
-     *  If the HTML source string (or file) is supplied, the class
-     *  will instantiate with that source propagated, all that has
-     *  to be done it to call get_text().
+     * If the HTML source string (or file) is supplied, the class
+     * will instantiate with that source propagated, all that has
+     * to be done it to call get_text().
      *
-     *  @param string $source HTML content
-     *  @param boolean $from_file Indicates $source is a file to pull content from
-     *  @param boolean $do_links Indicate whether a table of link URLs is desired
-     *  @param integer $width Maximum width of the formatted text, 0 for no limit
-     *  @access public
-     *  @return void
+     * @param string $source HTML content
+     * @param boolean $from_file Indicates $source is a file to pull content from
+     * @param boolean $do_links Indicate whether a table of link URLs is desired
+     * @param integer $width Maximum width of the formatted text, 0 for no limit
      */
-    function html2text( $source = '', $from_file = false, $do_links = true, $width = 75, $charset = 'UTF-8' )
+    function __construct($source = '', $from_file = false, $do_links = true, $width = 75, $charset = 'UTF-8')
     {
-        if ( !empty($source) ) {
+        if (!empty($source)) {
             $this->set_html($source, $from_file);
         }
 
         $this->set_base_url();
+
         $this->_do_links = $do_links;
-        $this->width = $width;
-        $this->charset = $charset;
+        $this->width     = $width;
+        $this->charset   = $charset;
     }
 
     /**
-     *  Loads source HTML into memory, either from $source string or a file.
+     * Loads source HTML into memory, either from $source string or a file.
      *
-     *  @param string $source HTML content
-     *  @param boolean $from_file Indicates $source is a file to pull content from
-     *  @access public
-     *  @return void
+     * @param string $source HTML content
+     * @param boolean $from_file Indicates $source is a file to pull content from
      */
-    function set_html( $source, $from_file = false )
+    function set_html($source, $from_file = false)
     {
-        if ( $from_file && file_exists($source) ) {
+        if ($from_file && file_exists($source)) {
             $this->html = file_get_contents($source);
         }
-        else
+        else {
             $this->html = $source;
+        }
 
         $this->_converted = false;
     }
 
     /**
-     *  Returns the text, converted from HTML.
+     * Returns the text, converted from HTML.
      *
-     *  @access public
-     *  @return string
+     * @return string Plain text
      */
     function get_text()
     {
-        if ( !$this->_converted ) {
+        if (!$this->_converted) {
             $this->_convert();
         }
 
@@ -402,10 +373,7 @@ class html2text
     }
 
     /**
-     *  Prints the text, converted from HTML.
-     *
-     *  @access public
-     *  @return void
+     * Prints the text, converted from HTML.
      */
     function print_text()
     {
@@ -413,50 +381,34 @@ class html2text
     }
 
     /**
-     *  Alias to print_text(), operates identically.
+     * Sets the allowed HTML tags to pass through to the resulting text.
      *
-     *  @access public
-     *  @return void
-     *  @see print_text()
+     * Tags should be in the form "<p>", with no corresponding closing tag.
      */
-    function p()
+    function set_allowed_tags($allowed_tags = '')
     {
-        print $this->get_text();
-    }
-
-    /**
-     *  Sets the allowed HTML tags to pass through to the resulting text.
-     *
-     *  Tags should be in the form "<p>", with no corresponding closing tag.
-     *
-     *  @access public
-     *  @return void
-     */
-    function set_allowed_tags( $allowed_tags = '' )
-    {
-        if ( !empty($allowed_tags) ) {
+        if (!empty($allowed_tags)) {
             $this->allowed_tags = $allowed_tags;
         }
     }
 
     /**
-     *  Sets a base URL to handle relative links.
-     *
-     *  @access public
-     *  @return void
+     * Sets a base URL to handle relative links.
      */
-    function set_base_url( $url = '' )
+    function set_base_url($url = '')
     {
-        if ( empty($url) ) {
-            if ( !empty($_SERVER['HTTP_HOST']) ) {
+        if (empty($url)) {
+            if (!empty($_SERVER['HTTP_HOST'])) {
                 $this->url = 'http://' . $_SERVER['HTTP_HOST'];
-            } else {
+            }
+            else {
                 $this->url = '';
             }
-        } else {
+        }
+        else {
             // Strip any trailing slashes for consistency (relative
             // URLs may already start with a slash like "/file.html")
-            if ( substr($url, -1) == '/' ) {
+            if (substr($url, -1) == '/') {
                 $url = substr($url, 0, -1);
             }
             $this->url = $url;
@@ -464,12 +416,9 @@ class html2text
     }
 
     /**
-     *  Workhorse function that does actual conversion (calls _converter() method).
-     *
-     *  @access private
-     *  @return void
+     * Workhorse function that does actual conversion (calls _converter() method).
      */
-    function _convert()
+    protected function _convert()
     {
         // Variables used for building the link list
         $this->_link_list = array();
@@ -487,25 +436,21 @@ class html2text
             }
         }
 
-        $this->text = $text;
-
+        $this->text       = $text;
         $this->_converted = true;
     }
 
     /**
-     *  Workhorse function that does actual conversion.
-     *
-     *  First performs custom tag replacement specified by $search and
-     *  $replace arrays. Then strips any remaining HTML tags, reduces whitespace
-     *  and newlines to a readable format, and word wraps the text to
-     *  $width characters.
+     * Workhorse function that does actual conversion.
      *
-     *  @param string Reference to HTML content string
+     * First performs custom tag replacement specified by $search and
+     * $replace arrays. Then strips any remaining HTML tags, reduces whitespace
+     * and newlines to a readable format, and word wraps the text to
+     * $width characters.
      *
-     *  @access private
-     *  @return void
+     * @param string Reference to HTML content string
      */
-    function _converter(&$text)
+    protected function _converter(&$text)
     {
         // Convert <BLOCKQUOTE> (before PRE!)
         $this->_convert_blockquotes($text);
@@ -517,7 +462,7 @@ class html2text
         $text = preg_replace($this->search, $this->replace, $text);
 
         // Run our defined tags search-and-replace with callback
-        $text = preg_replace_callback($this->callback_search, array('html2text', '_preg_callback'), $text);
+        $text = preg_replace_callback($this->callback_search, array($this, 'tags_preg_callback'), $text);
 
         // Strip any other HTML tags
         $text = strip_tags($text, $this->allowed_tags);
@@ -551,19 +496,17 @@ class html2text
     }
 
     /**
-     *  Helper function called by preg_replace() on link replacement.
+     * Helper function called by preg_replace() on link replacement.
      *
-     *  Maintains an internal list of links to be displayed at the end of the
-     *  text, with numeric indices to the original point in the text they
-     *  appeared. Also makes an effort at identifying and handling absolute
-     *  and relative links.
+     * Maintains an internal list of links to be displayed at the end of the
+     * text, with numeric indices to the original point in the text they
+     * appeared. Also makes an effort at identifying and handling absolute
+     * and relative links.
      *
-     *  @param string $link URL of the link
-     *  @param string $display Part of the text to associate number with
-     *  @access private
-     *  @return string
+     * @param string $link URL of the link
+     * @param string $display Part of the text to associate number with
      */
-    function _build_link_list( $link, $display )
+    protected function _build_link_list( $link, $display )
     {
         if (!$this->_do_links || empty($link)) {
             return $display;
@@ -594,12 +537,11 @@ class html2text
     }
 
     /**
-     *  Helper function for PRE body conversion.
+     * Helper function for PRE body conversion.
      *
-     *  @param string HTML content
-     *  @access private
+     * @param string HTML content
      */
-    function _convert_pre(&$text)
+    protected function _convert_pre(&$text)
     {
         // get the content of PRE element
         while (preg_match('/<pre[^>]*>(.*)<\/pre>/ismU', $text, $matches)) {
@@ -607,7 +549,7 @@ class html2text
 
             // Run our defined tags search-and-replace with callback
             $this->pre_content = preg_replace_callback($this->callback_search,
-                array('html2text', '_preg_callback'), $this->pre_content);
+                array($this, 'tags_preg_callback'), $this->pre_content);
 
             // convert the content
             $this->pre_content = sprintf('<div><br>%s<br></div>',
@@ -615,7 +557,7 @@ class html2text
 
             // replace the content (use callback because content can contain $0 variable)
             $text = preg_replace_callback('/<pre[^>]*>.*<\/pre>/ismU',
-                array('html2text', '_preg_pre_callback'), $text, 1);
+                array($this, 'pre_preg_callback'), $text, 1);
 
             // free memory
             $this->pre_content = '';
@@ -623,68 +565,77 @@ class html2text
     }
 
     /**
-     *  Helper function for BLOCKQUOTE body conversion.
+     * Helper function for BLOCKQUOTE body conversion.
      *
-     *  @param string HTML content
-     *  @access private
+     * @param string HTML content
      */
-    function _convert_blockquotes(&$text)
+    protected function _convert_blockquotes(&$text)
     {
-        if (preg_match_all('/<\/*blockquote[^>]*>/i', $text, $matches, PREG_OFFSET_CAPTURE)) {
-            $level = 0;
-            $diff = 0;
-            foreach ($matches[0] as $m) {
-                if ($m[0][0] == '<' && $m[0][1] == '/') {
+        $level = 0;
+        $offset = 0;
+        while (($start = strpos($text, '<blockquote', $offset)) !== false) {
+            $offset = $start + 12;
+            do {
+                $end = strpos($text, '</blockquote>', $offset);
+                $next = strpos($text, '<blockquote', $offset);
+
+                // nested <blockquote>, skip
+                if ($next !== false && $next < $end) {
+                    $offset = $next + 12;
+                    $level++;
+                }
+                // nested </blockquote> tag
+                if ($end !== false && $level > 0) {
+                    $offset = $end + 12;
                     $level--;
-                    if ($level < 0) {
-                        $level = 0; // malformed HTML: go to next blockquote
-                    }
-                    else if ($level > 0) {
-                        // skip inner blockquote
-                    }
-                    else {
-                        $end  = $m[1];
-                        $len  = $end - $taglen - $start;
-                        // Get blockquote content
-                        $body = substr($text, $start + $taglen - $diff, $len);
-
-                        // Set text width
-                        $p_width = $this->width;
-                        if ($this->width > 0) $this->width -= 2;
-                        // Convert blockquote content
-                        $body = trim($body);
-                        $this->_converter($body);
-                        // Add citation markers and create PRE block
-                        $body = preg_replace('/((^|\n)>*)/', '\\1> ', trim($body));
-                        $body = '<pre>' . htmlspecialchars($body) . '</pre>';
-                        // Re-set text width
-                        $this->width = $p_width;
-                        // Replace content
-                        $text = substr($text, 0, $start - $diff)
-                            . $body . substr($text, $end + strlen($m[0]) - $diff);
-
-                        $diff = $len + $taglen + strlen($m[0]) - strlen($body);
-                        unset($body);
-                    }
                 }
-                else {
-                    if ($level == 0) {
-                        $start = $m[1];
-                        $taglen = strlen($m[0]);
-                    }
-                    $level ++;
+                // found matching end tag
+                else if ($end !== false && $level == 0) {
+                    $taglen = strpos($text, '>', $start) - $start;
+                    $startpos = $start + $taglen + 1;
+
+                    // 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>';
+
+                    $text = substr($text, 0, $start) . $body . "\n" . substr($text, $end + 13);
+                    $offset = 0;
+                    break;
                 }
-            }
+            } while ($end || $next);
         }
     }
 
     /**
-     *  Callback function for preg_replace_callback use.
+     * Callback function to correctly add citation markers for blockquote contents
+     */
+    public function blockquote_citation_ballback($m)
+    {
+        $line = ltrim($m[2]);
+        $space = $line[0] == '>' ? '' : ' ';
+        return $m[1] . '>' . $space . $line;
+    }
+
+    /**
+     * Callback function for preg_replace_callback use.
      *
-     *  @param  array PREG matches
-     *  @return string
+     * @param  array PREG matches
+     * @return string
      */
-    private function _preg_callback($matches)
+    public function tags_preg_callback($matches)
     {
         switch (strtolower($matches[1])) {
         case 'b':
@@ -702,12 +653,12 @@ class html2text
     }
 
     /**
-     *  Callback function for preg_replace_callback use in PRE content handler.
+     * Callback function for preg_replace_callback use in PRE content handler.
      *
-     *  @param  array PREG matches
-     *  @return string
+     * @param array PREG matches
+     * @return string
      */
-    private function _preg_pre_callback($matches)
+    public function pre_preg_callback($matches)
     {
         return $this->pre_content;
     }
@@ -742,12 +693,7 @@ class html2text
     private function _strtoupper($str)
     {
         $str = html_entity_decode($str, ENT_COMPAT, $this->charset);
-
-        if (function_exists('mb_strtoupper'))
-            $str = mb_strtoupper($str);
-        else
-            $str = strtoupper($str);
-
+        $str = mb_strtoupper($str);
         $str = htmlspecialchars($str, ENT_COMPAT, $this->charset);
 
         return $str;
diff --git a/program/lib/Roundcube/rcube_image.php b/program/lib/Roundcube/rcube_image.php
index b72a24c51..a55ba1600 100644
--- a/program/lib/Roundcube/rcube_image.php
+++ b/program/lib/Roundcube/rcube_image.php
@@ -2,8 +2,6 @@
 
 /*
  +-----------------------------------------------------------------------+
- | program/include/rcube_image.php                                       |
- |                                                                       |
  | This file is part of the Roundcube Webmail client                     |
  | Copyright (C) 2005-2012, The Roundcube Dev Team                       |
  | Copyright (C) 2011-2012, Kolab Systems AG                             |
@@ -14,7 +12,6 @@
  |                                                                       |
  | PURPOSE:                                                              |
  |   Image resizer and converter                                         |
- |                                                                       |
  +-----------------------------------------------------------------------+
  | Author: Thomas Bruederli <roundcube@gmail.com>                        |
  | Author: Aleksander Machniak <alec@alec.pl>                            |
@@ -80,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
@@ -131,19 +129,33 @@ class rcube_image
         }
 
         // use GD extension
-        $gd_types = array(IMAGETYPE_JPEG, IMAGETYPE_GIF, IMAGETYPE_PNG);
-        if ($props['gd_type'] && in_array($props['gd_type'], $gd_types)) {
-            if ($props['gd_type'] == IMAGETYPE_JPEG) {
+        if ($props['gd_type']) {
+            if ($props['gd_type'] == IMAGETYPE_JPEG && function_exists('imagecreatefromjpeg')) {
                 $image = imagecreatefromjpeg($this->image_file);
+                $type  = 'jpg';
             }
-            elseif($props['gd_type'] == IMAGETYPE_GIF) {
+            else if($props['gd_type'] == IMAGETYPE_GIF && function_exists('imagecreatefromgif')) {
                 $image = imagecreatefromgif($this->image_file);
+                $type  = 'gid';
             }
-            elseif($props['gd_type'] == IMAGETYPE_PNG) {
+            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']);
+
+            // 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;
             }
 
-            $scale  = $size / max($props['width'], $props['height']);
             $width  = $props['width']  * $scale;
             $height = $props['height'] * $scale;
 
@@ -162,15 +174,12 @@ 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) {
@@ -219,19 +228,22 @@ class rcube_image
         }
 
         // use GD extension (TIFF isn't supported)
-        $props    = $this->props();
-        $gd_types = array(IMAGETYPE_JPEG, IMAGETYPE_GIF, IMAGETYPE_PNG);
+        $props = $this->props();
 
-        if ($props['gd_type'] && in_array($props['gd_type'], $gd_types)) {
-            if ($props['gd_type'] == IMAGETYPE_JPEG) {
+        if ($props['gd_type']) {
+            if ($props['gd_type'] == IMAGETYPE_JPEG && function_exists('imagecreatefromjpeg')) {
                 $image = imagecreatefromjpeg($this->image_file);
             }
-            else if ($props['gd_type'] == IMAGETYPE_GIF) {
+            else if ($props['gd_type'] == IMAGETYPE_GIF && function_exists('imagecreatefromgif')) {
                 $image = imagecreatefromgif($this->image_file);
             }
-            else if ($props['gd_type'] == IMAGETYPE_PNG) {
+            else if ($props['gd_type'] == IMAGETYPE_PNG && function_exists('imagecreatefrompng')) {
                 $image = imagecreatefrompng($this->image_file);
             }
+            else {
+                // @TODO: print error to the log?
+                return false;
+            }
 
             if ($type == self::TYPE_JPG) {
                 $result = imagejpeg($image, $filename, 75);
@@ -242,6 +254,10 @@ class rcube_image
             else if ($type == self::TYPE_PNG) {
                 $result = imagepng($image, $filename, 6, PNG_ALL_FILTERS);
             }
+
+            if ($result) {
+                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 8ca24dec7..c67985186 100644
--- a/program/lib/Roundcube/rcube_imap.php
+++ b/program/lib/Roundcube/rcube_imap.php
@@ -2,8 +2,6 @@
 
 /*
  +-----------------------------------------------------------------------+
- | program/include/rcube_imap.php                                        |
- |                                                                       |
  | This file is part of the Roundcube Webmail client                     |
  | Copyright (C) 2005-2012, The Roundcube Dev Team                       |
  | Copyright (C) 2011-2012, Kolab Systems AG                             |
@@ -14,14 +12,12 @@
  |                                                                       |
  | PURPOSE:                                                              |
  |   IMAP Storage Engine                                                 |
- |                                                                       |
  +-----------------------------------------------------------------------+
  | Author: Thomas Bruederli <roundcube@gmail.com>                        |
  | Author: Aleksander Machniak <alec@alec.pl>                            |
  +-----------------------------------------------------------------------+
 */
 
-
 /**
  * Interface class for accessing an IMAP server
  *
@@ -151,7 +147,7 @@ class rcube_imap extends rcube_storage
 
         $attempt = 0;
         do {
-            $data = rcube::get_instance()->plugins->exec_hook('imap_connect',
+            $data = rcube::get_instance()->plugins->exec_hook('storage_connect',
                 array_merge($this->options, array('host' => $host, 'user' => $user,
                     'attempt' => ++$attempt)));
 
@@ -571,7 +567,7 @@ class rcube_imap extends rcube_storage
      * Get message count for a specific folder
      *
      * @param  string  $folder  Folder name
-     * @param  string  $mode    Mode for count [ALL|THREADS|UNSEEN|RECENT]
+     * @param  string  $mode    Mode for count [ALL|THREADS|UNSEEN|RECENT|EXISTS]
      * @param  boolean $force   Force reading from server and update cache
      * @param  boolean $status  Enables storing folder status info (max UID/count),
      *                          required for folder_status()
@@ -592,7 +588,7 @@ class rcube_imap extends rcube_storage
      * protected method for getting nr of messages
      *
      * @param string  $folder  Folder name
-     * @param string  $mode    Mode for count [ALL|THREADS|UNSEEN|RECENT]
+     * @param string  $mode    Mode for count [ALL|THREADS|UNSEEN|RECENT|EXISTS]
      * @param boolean $force   Force reading from server and update cache
      * @param boolean $status  Enables storing folder status info (max UID/count),
      *                         required for folder_status()
@@ -614,6 +610,10 @@ class rcube_imap extends rcube_storage
             }
         }
 
+        // EXISTS is a special alias for ALL, it allows to get the number
+        // of all messages in a folder also when search is active and with
+        // any skip_deleted setting
+
         $a_folder_cache = $this->get_cache('messagecount');
 
         // return cached value
@@ -644,7 +644,7 @@ class rcube_imap extends rcube_storage
             $count = $this->conn->countRecent($folder);
         }
         // use SEARCH for message counting
-        else if (!empty($this->options['skip_deleted'])) {
+        else if ($mode != 'EXISTS' && !empty($this->options['skip_deleted'])) {
             $search_str = "ALL UNDELETED";
             $keys       = array('COUNT');
 
@@ -683,8 +683,8 @@ class rcube_imap extends rcube_storage
             }
             else {
                 $count = $this->conn->countMessages($folder);
-                if ($status) {
-                    $this->set_folder_stats($folder,'cnt', $count);
+                if ($status && $mode == 'ALL') {
+                    $this->set_folder_stats($folder, 'cnt', $count);
                     $this->set_folder_stats($folder, 'maxuid', $count ? $this->id2uid($count, $folder) : 0);
                 }
             }
@@ -1096,16 +1096,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 +1127,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']) {
@@ -1634,9 +1638,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 +1670,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;
@@ -2226,10 +2246,11 @@ class rcube_imap extends rcube_storage
      * @param boolean $is_file True if $message is a filename
      * @param array   $flags   Message flags
      * @param mixed   $date    Message internal date
+     * @param bool    $binary  Enables BINARY append
      *
      * @return int|bool Appended message UID or True on success, False on error
      */
-    public function save_message($folder, &$message, $headers='', $is_file=false, $flags = array(), $date = null)
+    public function save_message($folder, &$message, $headers='', $is_file=false, $flags = array(), $date = null, $binary = false)
     {
         if (!strlen($folder)) {
             $folder = $this->folder;
@@ -2247,10 +2268,10 @@ class rcube_imap extends rcube_storage
         $date = $this->date_format($date);
 
         if ($is_file) {
-            $saved = $this->conn->appendFromFile($folder, $message, $headers, $flags, $date);
+            $saved = $this->conn->appendFromFile($folder, $message, $headers, $flags, $date, $binary);
         }
         else {
-            $saved = $this->conn->append($folder, $message, $flags, $date);
+            $saved = $this->conn->append($folder, $message, $flags, $date, $binary);
         }
 
         if ($saved) {
@@ -2316,10 +2337,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);
         }
@@ -3354,7 +3372,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();
@@ -3364,7 +3381,7 @@ class rcube_imap extends rcube_storage
             $headers = array_merge($headers, $this->all_headers);
         }
 
-        return implode(' ', array_unique($headers));
+        return $headers;
     }
 
 
diff --git a/program/lib/Roundcube/rcube_imap_cache.php b/program/lib/Roundcube/rcube_imap_cache.php
index 31214cfbf..748474af2 100644
--- a/program/lib/Roundcube/rcube_imap_cache.php
+++ b/program/lib/Roundcube/rcube_imap_cache.php
@@ -2,8 +2,6 @@
 
 /*
  +-----------------------------------------------------------------------+
- | program/include/rcube_imap_cache.php                                  |
- |                                                                       |
  | This file is part of the Roundcube Webmail client                     |
  | Copyright (C) 2005-2012, The Roundcube Dev Team                       |
  |                                                                       |
@@ -13,14 +11,12 @@
  |                                                                       |
  | PURPOSE:                                                              |
  |   Caching of IMAP folder contents (messages and index)                |
- |                                                                       |
  +-----------------------------------------------------------------------+
  | Author: Thomas Bruederli <roundcube@gmail.com>                        |
  | Author: Aleksander Machniak <alec@alec.pl>                            |
  +-----------------------------------------------------------------------+
 */
 
-
 /**
  * Interface class for accessing Roundcube messages cache
  *
@@ -489,7 +485,7 @@ class rcube_imap_cache
             .", 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);
     }
diff --git a/program/lib/Roundcube/rcube_imap_generic.php b/program/lib/Roundcube/rcube_imap_generic.php
index 70fd6eb2c..04dc594ae 100644
--- a/program/lib/Roundcube/rcube_imap_generic.php
+++ b/program/lib/Roundcube/rcube_imap_generic.php
@@ -2,8 +2,6 @@
 
 /**
  +-----------------------------------------------------------------------+
- | program/include/rcube_imap_generic.php                                |
- |                                                                       |
  | This file is part of the Roundcube Webmail client                     |
  | Copyright (C) 2005-2012, The Roundcube Dev Team                       |
  | Copyright (C) 2011-2012, Kolab Systems AG                             |
@@ -19,14 +17,12 @@
  |   functionality built-in.                                             |
  |                                                                       |
  |   Based on Iloha IMAP Library. See http://ilohamail.org/ for details  |
- |                                                                       |
  +-----------------------------------------------------------------------+
  | Author: Aleksander Machniak <alec@alec.pl>                            |
  | Author: Ryo Chijiiwa <Ryo@IlohaMail.org>                              |
  +-----------------------------------------------------------------------+
 */
 
-
 /**
  * PHP based wrapper class to connect to an IMAP server
  *
@@ -757,12 +753,16 @@ class rcube_imap_generic
         $this->fp = @fsockopen($host, $this->prefs['port'], $errno, $errstr, $this->prefs['timeout']);
 
         if (!$this->fp) {
+            if (!$errstr) {
+                $errstr = "Unknown reason (fsockopen() function disabled?)";
+            }
             $this->setError(self::ERROR_BAD, sprintf("Could not connect to %s:%d: %s", $host, $this->prefs['port'], $errstr));
             return false;
         }
 
-        if ($this->prefs['timeout'] > 0)
+        if ($this->prefs['timeout'] > 0) {
             stream_set_timeout($this->fp, $this->prefs['timeout']);
+        }
 
         $line = trim(fgets($this->fp, 8192));
 
@@ -906,7 +906,7 @@ class rcube_imap_generic
      */
     function closeConnection()
     {
-        if ($this->putLine($this->nextTag() . ' LOGOUT')) {
+        if ($this->logged && $this->putLine($this->nextTag() . ' LOGOUT')) {
             $this->readReply();
         }
 
@@ -1065,8 +1065,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
      */
@@ -1084,10 +1084,13 @@ class rcube_imap_generic
         // 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
@@ -1311,6 +1314,11 @@ class rcube_imap_generic
                 if ($cmd == 'LIST' || $cmd == 'LSUB') {
                     list($opts, $delim, $mailbox) = $this->tokenizeResponse($line, 3);
 
+                    // Remove redundant separator at the end of folder name, UW-IMAP bug? (#1488879)
+                    if ($delim) {
+                        $mailbox = rtrim($mailbox, $delim);
+                    }
+
                     // Add to result array
                     if (!$lstatus) {
                         $folders[] = $mailbox;
@@ -1975,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
@@ -1994,15 +2001,41 @@ class rcube_imap_generic
             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;
     }
 
     /**
@@ -2206,10 +2239,13 @@ class rcube_imap_generic
                             }
                             break;
                         default:
-                            if (strlen($field) > 2) {
-                                $result[$id]->others[$field] = $string;
+                            if (strlen($field) < 3) {
+                                break;
                             }
-                            break;
+                            if ($result[$id]->others[$field]) {
+                                $string = array_merge((array)$result[$id]->others[$field], (array)$string);
+                            }
+                            $result[$id]->others[$field] = $string;
                         }
                     }
                 }
@@ -2217,7 +2253,6 @@ class rcube_imap_generic
 
             // VANISHED response (QRESYNC RFC5162)
             // Sample: * VANISHED (EARLIER) 300:310,405,411
-
             else if (preg_match('/^\* VANISHED [()EARLIER]*/i', $line, $match)) {
                 $line   = substr($line, strlen($match[0]));
                 $v_data = $this->tokenizeResponse($line, 1);
@@ -2230,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);
         }
@@ -2408,8 +2472,9 @@ class rcube_imap_generic
         $partial    = $max_bytes ? sprintf('<0.%d>', $max_bytes) : '';
 
         // format request
-        $key       = $this->nextTag();
-        $request   = $key . ($is_uid ? ' UID' : '') . " FETCH $id ($fetch_mode.PEEK[$part]$partial)";
+        $key     = $this->nextTag();
+        $request = $key . ($is_uid ? ' UID' : '') . " FETCH $id ($fetch_mode.PEEK[$part]$partial)";
+        $result  = false;
 
         // send request
         if (!$this->putLine($request)) {
@@ -2422,118 +2487,117 @@ class rcube_imap_generic
             $mode = -1;
         }
 
-        // receive reply line
         do {
-            $line = rtrim($this->readLine(1024));
-            $a    = explode(' ', $line);
-        } while (!($end = $this->startsWith($line, $key, true)) && $a[2] != 'FETCH');
-
-        $len    = strlen($line);
-        $result = false;
+            $line = trim($this->readLine(1024));
 
-        if ($a[2] != 'FETCH') {
-        }
-        // handle empty "* X FETCH ()" response
-        else if ($line[$len-1] == ')' && $line[$len-2] != '(') {
-            // one line response, get everything between first and last quotes
-            if (substr($line, -4, 3) == 'NIL') {
-                // NIL response
-                $result = '';
-            } else {
-                $from = strpos($line, '"') + 1;
-                $to   = strrpos($line, '"');
-                $len  = $to - $from;
-                $result = substr($line, $from, $len);
+            if (!$line) {
+                break;
             }
 
-            if ($mode == 1) {
-                $result = base64_decode($result);
-            }
-            else if ($mode == 2) {
-                $result = quoted_printable_decode($result);
-            }
-            else if ($mode == 3) {
-                $result = convert_uudecode($result);
+            if (!preg_match('/^\* ([0-9]+) FETCH (.*)$/', $line, $m)) {
+                continue;
             }
 
-        } else if ($line[$len-1] == '}') {
-            // multi-line request, find sizes of content and receive that many bytes
-            $from     = strpos($line, '{') + 1;
-            $to       = strrpos($line, '}');
-            $len      = $to - $from;
-            $sizeStr  = substr($line, $from, $len);
-            $bytes    = (int)$sizeStr;
-            $prev     = '';
+            $line = $m[2];
+            $last = substr($line, -1);
 
-            while ($bytes > 0) {
-                $line = $this->readLine(8192);
+            // handle one line response
+            if ($line[0] == '(' && $last == ')') {
+                // tokenize content inside brackets
+                $tokens = $this->tokenizeResponse(preg_replace('/(^\(|\$)/', '', $line));
+                $result = count($tokens) == 1 ? $tokens[0] : false;
 
-                if ($line === NULL) {
-                    break;
+                if ($result !== false) {
+                    if ($mode == 1) {
+                        $result = base64_decode($result);
+                    }
+                    else if ($mode == 2) {
+                        $result = quoted_printable_decode($result);
+                    }
+                    else if ($mode == 3) {
+                        $result = convert_uudecode($result);
+                    }
                 }
+            }
+            // response with string literal
+            else if (preg_match('/\{([0-9]+)\}$/', $line, $m)) {
+                $bytes = (int) $m[1];
+                $prev  = '';
+
+                while ($bytes > 0) {
+                    $line = $this->readLine(8192);
 
-                $len = strlen($line);
+                    if ($line === NULL) {
+                        break;
+                    }
 
-                if ($len > $bytes) {
-                    $line = substr($line, 0, $bytes);
                     $len = strlen($line);
-                }
-                $bytes -= $len;
-
-                // BASE64
-                if ($mode == 1) {
-                    $line = rtrim($line, "\t\r\n\0\x0B");
-                    // create chunks with proper length for base64 decoding
-                    $line = $prev.$line;
-                    $length = strlen($line);
-                    if ($length % 4) {
-                        $length = floor($length / 4) * 4;
-                        $prev = substr($line, $length);
-                        $line = substr($line, 0, $length);
+
+                    if ($len > $bytes) {
+                        $line = substr($line, 0, $bytes);
+                        $len  = strlen($line);
+                    }
+                    $bytes -= $len;
+
+                    // BASE64
+                    if ($mode == 1) {
+                        $line = rtrim($line, "\t\r\n\0\x0B");
+                        // create chunks with proper length for base64 decoding
+                        $line = $prev.$line;
+                        $length = strlen($line);
+                        if ($length % 4) {
+                            $length = floor($length / 4) * 4;
+                            $prev = substr($line, $length);
+                            $line = substr($line, 0, $length);
+                        }
+                        else {
+                            $prev = '';
+                        }
+                        $line = base64_decode($line);
+                    }
+                    // QUOTED-PRINTABLE
+                    else if ($mode == 2) {
+                        $line = rtrim($line, "\t\r\0\x0B");
+                        $line = quoted_printable_decode($line);
+                    }
+                    // UUENCODE
+                    else if ($mode == 3) {
+                        $line = rtrim($line, "\t\r\n\0\x0B");
+                        if ($line == 'end' || preg_match('/^begin\s+[0-7]+\s+.+$/', $line)) {
+                            continue;
+                        }
+                        $line = convert_uudecode($line);
+                    }
+                    // default
+                    else if ($formatted) {
+                        $line = rtrim($line, "\t\r\n\0\x0B") . "\n";
                     }
-                    else
-                        $prev = '';
-                    $line = base64_decode($line);
-                // QUOTED-PRINTABLE
-                } else if ($mode == 2) {
-                    $line = rtrim($line, "\t\r\0\x0B");
-                    $line = quoted_printable_decode($line);
-                // UUENCODE
-                } else if ($mode == 3) {
-                    $line = rtrim($line, "\t\r\n\0\x0B");
-                    if ($line == 'end' || preg_match('/^begin\s+[0-7]+\s+.+$/', $line))
-                        continue;
-                    $line = convert_uudecode($line);
-                // default
-                } else if ($formatted) {
-                    $line = rtrim($line, "\t\r\n\0\x0B") . "\n";
-                }
 
-                if ($file) {
-                    if (fwrite($file, $line) === false)
-                        break;
+                    if ($file) {
+                        if (fwrite($file, $line) === false) {
+                            break;
+                        }
+                    }
+                    else if ($print) {
+                        echo $line;
+                    }
+                    else {
+                        $result .= $line;
+                    }
                 }
-                else if ($print)
-                    echo $line;
-                else
-                    $result .= $line;
             }
-        }
-
-        // read in anything up until last line
-        if (!$end)
-            do {
-                $line = $this->readLine(1024);
-            } while (!$this->startsWith($line, $key, true));
+        } while (!$this->startsWith($line, $key, true));
 
         if ($result !== false) {
             if ($file) {
                 return fwrite($file, $result);
-            } else if ($print) {
+            }
+            else if ($print) {
                 echo $result;
-            } else
-                return $result;
-            return true;
+                return true;
+            }
+
+            return $result;
         }
 
         return false;
@@ -2546,10 +2610,11 @@ class rcube_imap_generic
      * @param string $message Message content
      * @param array  $flags   Message flags
      * @param string $date    Message internal date
+     * @param bool   $binary  Enable BINARY append (RFC3516)
      *
      * @return string|bool On success APPENDUID response (if available) or True, False on failure
      */
-    function append($mailbox, &$message, $flags = array(), $date = null)
+    function append($mailbox, &$message, $flags = array(), $date = null, $binary = false)
     {
         unset($this->data['APPENDUID']);
 
@@ -2557,8 +2622,13 @@ class rcube_imap_generic
             return false;
         }
 
-        $message = str_replace("\r", '', $message);
-        $message = str_replace("\n", "\r\n", $message);
+        $binary       = $binary && $this->getCapability('BINARY');
+        $literal_plus = !$binary && $this->prefs['literal+'];
+
+        if (!$binary) {
+            $message = str_replace("\r", '', $message);
+            $message = str_replace("\n", "\r\n", $message);
+        }
 
         $len = strlen($message);
         if (!$len) {
@@ -2571,12 +2641,12 @@ class rcube_imap_generic
         if (!empty($date)) {
             $request .= ' ' . $this->escape($date);
         }
-        $request .= ' {' . $len . ($this->prefs['literal+'] ? '+' : '') . '}';
+        $request .= ' ' . ($binary ? '~' : '') . '{' . $len . ($literal_plus ? '+' : '') . '}';
 
         // send APPEND command
         if ($this->putLine($request)) {
             // Do not wait when LITERAL+ is supported
-            if (!$this->prefs['literal+']) {
+            if (!$literal_plus) {
                 $line = $this->readReply();
 
                 if ($line[0] != '+') {
@@ -2618,10 +2688,11 @@ class rcube_imap_generic
      * @param string $headers Message headers
      * @param array  $flags   Message flags
      * @param string $date    Message internal date
+     * @param bool   $binary  Enable BINARY append (RFC3516)
      *
      * @return string|bool On success APPENDUID response (if available) or True, False on failure
      */
-    function appendFromFile($mailbox, $path, $headers=null, $flags = array(), $date = null)
+    function appendFromFile($mailbox, $path, $headers=null, $flags = array(), $date = null, $binary = false)
     {
         unset($this->data['APPENDUID']);
 
@@ -2652,18 +2723,21 @@ class rcube_imap_generic
             $len += strlen($headers) + strlen($body_separator);
         }
 
+        $binary       = $binary && $this->getCapability('BINARY');
+        $literal_plus = !$binary && $this->prefs['literal+'];
+
         // build APPEND command
         $key = $this->nextTag();
         $request = "$key APPEND " . $this->escape($mailbox) . ' (' . $this->flagsToStr($flags) . ')';
         if (!empty($date)) {
             $request .= ' ' . $this->escape($date);
         }
-        $request .= ' {' . $len . ($this->prefs['literal+'] ? '+' : '') . '}';
+        $request .= ' ' . ($binary ? '~' : '') . '{' . $len . ($literal_plus ? '+' : '') . '}';
 
         // send APPEND command
         if ($this->putLine($request)) {
             // Don't wait when LITERAL+ is supported
-            if (!$this->prefs['literal+']) {
+            if (!$literal_plus) {
                 $line = $this->readReply();
 
                 if ($line[0] != '+') {
@@ -3485,7 +3559,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) {
diff --git a/program/lib/Roundcube/rcube_ldap.php b/program/lib/Roundcube/rcube_ldap.php
index c9a14d863..a2dd163e9 100644
--- a/program/lib/Roundcube/rcube_ldap.php
+++ b/program/lib/Roundcube/rcube_ldap.php
@@ -2,8 +2,6 @@
 
 /*
  +-----------------------------------------------------------------------+
- | program/include/rcube_ldap.php                                        |
- |                                                                       |
  | This file is part of the Roundcube Webmail client                     |
  | Copyright (C) 2006-2012, The Roundcube Dev Team                       |
  | Copyright (C) 2011-2012, Kolab Systems AG                             |
@@ -14,7 +12,6 @@
  |                                                                       |
  | PURPOSE:                                                              |
  |   Interface to an LDAP address directory                              |
- |                                                                       |
  +-----------------------------------------------------------------------+
  | Author: Thomas Bruederli <roundcube@gmail.com>                        |
  |         Andreas Dick <andudi (at) gmx (dot) ch>                       |
@@ -22,7 +19,6 @@
  +-----------------------------------------------------------------------+
 */
 
-
 /**
  * Model class to access an LDAP address directory
  *
@@ -218,15 +214,16 @@ class rcube_ldap extends rcube_addressbook
         if (empty($this->prop['ldap_version']))
             $this->prop['ldap_version'] = 3;
 
-        foreach ($this->prop['hosts'] as $host)
-        {
+        // try to connect + bind for every host configured
+        // with OpenLDAP 2.x ldap_connect() always succeeds but ldap_bind will fail if host isn't reachable
+        // see http://www.php.net/manual/en/function.ldap-connect.php
+        foreach ($this->prop['hosts'] as $host) {
             $host     = rcube_utils::idn_to_ascii(rcube_utils::parse_host($host));
             $hostname = $host.($this->prop['port'] ? ':'.$this->prop['port'] : '');
 
             $this->_debug("C: Connect [$hostname] [{$this->prop['name']}]");
 
-            if ($lc = @ldap_connect($host, $this->prop['port']))
-            {
+            if ($lc = @ldap_connect($host, $this->prop['port'])) {
                 if ($this->prop['use_tls'] === true)
                     if (!ldap_start_tls($lc))
                         continue;
@@ -237,113 +234,124 @@ class rcube_ldap extends rcube_addressbook
                 $this->prop['host'] = $host;
                 $this->conn = $lc;
 
+                if (!empty($this->prop['network_timeout']))
+                  ldap_set_option($lc, LDAP_OPT_NETWORK_TIMEOUT, $this->prop['network_timeout']);
+
                 if (isset($this->prop['referrals']))
                     ldap_set_option($lc, LDAP_OPT_REFERRALS, $this->prop['referrals']);
-                break;
             }
-            $this->_debug("S: NOT OK");
-        }
-
-        // See if the directory is writeable.
-        if ($this->prop['writable']) {
-            $this->readonly = false;
-        }
-
-        if (!is_resource($this->conn)) {
-            rcube::raise_error(array('code' => 100, 'type' => 'ldap',
-                'file' => __FILE__, 'line' => __LINE__,
-                'message' => "Could not connect to any LDAP server, last tried $hostname"), true);
+            else {
+                $this->_debug("S: NOT OK");
+                continue;
+            }
 
-            return false;
-        }
+            // See if the directory is writeable.
+            if ($this->prop['writable']) {
+                $this->readonly = false;
+            }
 
-        $bind_pass = $this->prop['bind_pass'];
-        $bind_user = $this->prop['bind_user'];
-        $bind_dn   = $this->prop['bind_dn'];
+            $bind_pass = $this->prop['bind_pass'];
+            $bind_user = $this->prop['bind_user'];
+            $bind_dn   = $this->prop['bind_dn'];
 
-        $this->base_dn        = $this->prop['base_dn'];
-        $this->groups_base_dn = ($this->prop['groups']['base_dn']) ?
-        $this->prop['groups']['base_dn'] : $this->base_dn;
+            $this->base_dn        = $this->prop['base_dn'];
+            $this->groups_base_dn = ($this->prop['groups']['base_dn']) ?
+            $this->prop['groups']['base_dn'] : $this->base_dn;
 
-        // User specific access, generate the proper values to use.
-        if ($this->prop['user_specific']) {
-            // No password set, use the session password
-            if (empty($bind_pass)) {
-                $bind_pass = $rcube->get_user_password();
-            }
+            // User specific access, generate the proper values to use.
+            if ($this->prop['user_specific']) {
+                // No password set, use the session password
+                if (empty($bind_pass)) {
+                    $bind_pass = $rcube->get_user_password();
+                }
 
-            // Get the pieces needed for variable replacement.
-            if ($fu = $rcube->get_user_email())
-                list($u, $d) = explode('@', $fu);
-            else
-                $d = $this->mail_domain;
+                // Get the pieces needed for variable replacement.
+                if ($fu = $rcube->get_user_email())
+                    list($u, $d) = explode('@', $fu);
+                else
+                    $d = $this->mail_domain;
 
-            $dc = 'dc='.strtr($d, array('.' => ',dc=')); // hierarchal domain string
+                $dc = 'dc='.strtr($d, array('.' => ',dc=')); // hierarchal domain string
 
-            $replaces = array('%dn' => '', '%dc' => $dc, '%d' => $d, '%fu' => $fu, '%u' => $u);
+                $replaces = array('%dn' => '', '%dc' => $dc, '%d' => $d, '%fu' => $fu, '%u' => $u);
 
-            if ($this->prop['search_base_dn'] && $this->prop['search_filter']) {
-                if (!empty($this->prop['search_bind_dn']) && !empty($this->prop['search_bind_pw'])) {
-                    $this->bind($this->prop['search_bind_dn'], $this->prop['search_bind_pw']);
-                }
+                if ($this->prop['search_base_dn'] && $this->prop['search_filter']) {
+                    if (!empty($this->prop['search_bind_dn']) && !empty($this->prop['search_bind_pw'])) {
+                        $this->bind($this->prop['search_bind_dn'], $this->prop['search_bind_pw']);
+                    }
 
-                // Search for the dn to use to authenticate
-                $this->prop['search_base_dn'] = strtr($this->prop['search_base_dn'], $replaces);
-                $this->prop['search_filter'] = strtr($this->prop['search_filter'], $replaces);
+                    // Search for the dn to use to authenticate
+                    $this->prop['search_base_dn'] = strtr($this->prop['search_base_dn'], $replaces);
+                    $this->prop['search_filter'] = strtr($this->prop['search_filter'], $replaces);
 
-                $this->_debug("S: searching with base {$this->prop['search_base_dn']} for {$this->prop['search_filter']}");
+                    $this->_debug("S: searching with base {$this->prop['search_base_dn']} for {$this->prop['search_filter']}");
 
-                $res = @ldap_search($this->conn, $this->prop['search_base_dn'], $this->prop['search_filter'], array('uid'));
-                if ($res) {
-                    if (($entry = ldap_first_entry($this->conn, $res))
-                        && ($bind_dn = ldap_get_dn($this->conn, $entry))
-                    ) {
-                        $this->_debug("S: search returned dn: $bind_dn");
-                        $dn = ldap_explode_dn($bind_dn, 1);
-                        $replaces['%dn'] = $dn[0];
+                    $res = @ldap_search($this->conn, $this->prop['search_base_dn'], $this->prop['search_filter'], array('uid'));
+                    if ($res) {
+                        if (($entry = ldap_first_entry($this->conn, $res))
+                            && ($bind_dn = ldap_get_dn($this->conn, $entry))
+                        ) {
+                            $this->_debug("S: search returned dn: $bind_dn");
+                            $dn = ldap_explode_dn($bind_dn, 1);
+                            $replaces['%dn'] = $dn[0];
+                        }
                     }
-                }
-                else {
-                    $this->_debug("S: ".ldap_error($this->conn));
-                }
-
-                // DN not found
-                if (empty($replaces['%dn'])) {
-                    if (!empty($this->prop['search_dn_default']))
-                        $replaces['%dn'] = $this->prop['search_dn_default'];
                     else {
-                        rcube::raise_error(array(
-                            'code' => 100, 'type' => 'ldap',
-                            'file' => __FILE__, 'line' => __LINE__,
-                            'message' => "DN not found using LDAP search."), true);
-                        return false;
+                        $this->_debug("S: ".ldap_error($this->conn));
+                    }
+
+                    // DN not found
+                    if (empty($replaces['%dn'])) {
+                        if (!empty($this->prop['search_dn_default']))
+                            $replaces['%dn'] = $this->prop['search_dn_default'];
+                        else {
+                            rcube::raise_error(array(
+                                'code' => 100, 'type' => 'ldap',
+                                'file' => __FILE__, 'line' => __LINE__,
+                                'message' => "DN not found using LDAP search."), true);
+                            return false;
+                        }
                     }
                 }
-            }
 
-            // Replace the bind_dn and base_dn variables.
-            $bind_dn              = strtr($bind_dn, $replaces);
-            $this->base_dn        = strtr($this->base_dn, $replaces);
-            $this->groups_base_dn = strtr($this->groups_base_dn, $replaces);
+                // Replace the bind_dn and base_dn variables.
+                $bind_dn              = strtr($bind_dn, $replaces);
+                $this->base_dn        = strtr($this->base_dn, $replaces);
+                $this->groups_base_dn = strtr($this->groups_base_dn, $replaces);
 
-            if (empty($bind_user)) {
-                $bind_user = $u;
+                if (empty($bind_user)) {
+                    $bind_user = $u;
+                }
             }
-        }
 
-        if (empty($bind_pass)) {
-            $this->ready = true;
-        }
-        else {
-            if (!empty($bind_dn)) {
-                $this->ready = $this->bind($bind_dn, $bind_pass);
-            }
-            else if (!empty($this->prop['auth_cid'])) {
-                $this->ready = $this->sasl_bind($this->prop['auth_cid'], $bind_pass, $bind_user);
+            if (empty($bind_pass)) {
+                $this->ready = true;
             }
             else {
-                $this->ready = $this->sasl_bind($bind_user, $bind_pass);
+                if (!empty($bind_dn)) {
+                    $this->ready = $this->bind($bind_dn, $bind_pass);
+                }
+                else if (!empty($this->prop['auth_cid'])) {
+                    $this->ready = $this->sasl_bind($this->prop['auth_cid'], $bind_pass, $bind_user);
+                }
+                else {
+                    $this->ready = $this->sasl_bind($bind_user, $bind_pass);
+                }
+            }
+
+            // connection established, we're done here
+            if ($this->ready) {
+                break;
             }
+
+        }  // end foreach hosts
+
+        if (!is_resource($this->conn)) {
+            rcube::raise_error(array('code' => 100, 'type' => 'ldap',
+                'file' => __FILE__, 'line' => __LINE__,
+                'message' => "Could not connect to any LDAP server, last tried $hostname"), true);
+
+            return false;
         }
 
         return $this->ready;
@@ -798,27 +806,14 @@ class rcube_ldap extends rcube_addressbook
             $this->_debug("S: ".ldap_count_entries($this->conn, $this->ldap_result)." record(s)");
 
             // get all entries of this page and post-filter those that really match the query
-            $search = mb_strtolower($value);
+            $search  = mb_strtolower($value);
             $entries = ldap_get_entries($this->conn, $this->ldap_result);
 
             for ($i = 0; $i < $entries['count']; $i++) {
                 $rec = $this->_ldap2result($entries[$i]);
                 foreach ($fields as $f) {
                     foreach ((array)$rec[$f] as $val) {
-                        $val = mb_strtolower($val);
-                        switch ($mode) {
-                        case 1:
-                            $got = ($val == $search);
-                            break;
-                        case 2:
-                            $got = ($search == substr($val, 0, strlen($search)));
-                            break;
-                        default:
-                            $got = (strpos($val, $search) !== false);
-                            break;
-                        }
-
-                        if ($got) {
+                        if ($this->compare_search_value($f, $val, $search, $mode)) {
                             $this->result->add($rec);
                             $this->result->count++;
                             break 2;
@@ -1455,6 +1450,7 @@ class rcube_ldap extends rcube_addressbook
                 if ($this->vlv_active && function_exists('ldap_parse_virtuallist_control')) {
                     if (ldap_parse_result($this->conn, $this->ldap_result,
                         $errcode, $matcheddn, $errmsg, $referrals, $serverctrls)
+                        && $serverctrls // can be null e.g. in case of adm. limit error
                     ) {
                         ldap_parse_virtuallist_control($this->conn, $serverctrls,
                             $last_offset, $this->vlv_count, $vresult);
diff --git a/program/lib/Roundcube/rcube_message.php b/program/lib/Roundcube/rcube_message.php
index 4ef534a0a..41a114f7f 100644
--- a/program/lib/Roundcube/rcube_message.php
+++ b/program/lib/Roundcube/rcube_message.php
@@ -2,8 +2,6 @@
 
 /*
  +-----------------------------------------------------------------------+
- | program/include/rcube_message.php                                     |
- |                                                                       |
  | This file is part of the Roundcube Webmail client                     |
  | Copyright (C) 2008-2010, The Roundcube Dev Team                       |
  |                                                                       |
@@ -19,7 +17,6 @@
  +-----------------------------------------------------------------------+
 */
 
-
 /**
  * Logical representation of a mail message with all its data
  * and related functions
@@ -96,7 +93,7 @@ class rcube_message
         $this->subject = $this->mime->decode_mime_string($this->headers->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'),
@@ -147,8 +144,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;
     }
 
 
@@ -197,39 +193,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;
+                }
             }
         }
 
@@ -274,7 +313,7 @@ class rcube_message
                 $out = $this->get_part_content($mime_id);
 
                 // create instance of html2text class
-                $txt = new html2text($out);
+                $txt = new rcube_html2text($out);
                 return $txt->get_text();
             }
         }
@@ -320,16 +359,23 @@ class rcube_message
     private function parse_structure($structure, $recursive = false)
     {
         // real content-type of message/rfc822 part
-        if ($structure->mimetype == 'message/rfc822' && $structure->real_mimetype)
+        if ($structure->mimetype == 'message/rfc822' && $structure->real_mimetype) {
             $mimetype = $structure->real_mimetype;
+
+            // 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));
+                $structure->headers = rcube_mime::parse_headers($headers);
+            }
+        }
         else
             $mimetype = $structure->mimetype;
 
         // show message headers
-        if ($recursive && is_array($structure->headers) && isset($structure->headers['subject'])) {
+        if ($recursive && is_array($structure->headers) && (isset($structure->headers['subject']) || isset($structure->headers['from']))) {
             $c = new stdClass;
             $c->type = 'headers';
-            $c->headers = &$structure->headers;
+            $c->headers = $structure->headers;
             $this->parts[] = $c;
         }
 
@@ -346,45 +392,59 @@ class rcube_message
 
         // print body if message doesn't have multiple parts
         if ($message_ctype_primary == 'text' && !$recursive) {
+            // parts with unsupported type add to attachments list
+            if (!in_array($message_ctype_secondary, array('plain', 'html', 'enriched'))) {
+                $this->attachments[] = $structure;
+                return;
+            }
+
             $structure->type = 'content';
-            $this->parts[] = &$structure;
+            $this->parts[] = $structure;
 
             // Parse simple (plain text) message body
-            if ($message_ctype_secondary == 'plain')
+            if ($message_ctype_secondary == 'plain') {
                 foreach ((array)$this->uu_decode($structure) as $uupart) {
                     $this->mime_parts[$uupart->mime_id] = $uupart;
                     $this->attachments[] = $uupart;
                 }
+            }
         }
         // the same for pgp signed messages
         else if ($mimetype == 'application/pgp' && !$recursive) {
             $structure->type = 'content';
-            $this->parts[] = &$structure;
+            $this->parts[] = $structure;
         }
         // message contains (more than one!) alternative parts
         else if ($mimetype == 'multipart/alternative'
             && is_array($structure->parts) && count($structure->parts) > 1
         ) {
-            // get html/plaintext parts
-            $plain_part = $html_part = $print_part = $related_part = null;
+            $plain_part   = null;
+            $html_part    = null;
+            $print_part   = null;
+            $related_part = null;
+            $attach_part  = null;
 
+            // get html/plaintext parts, other add to attachments list
             foreach ($structure->parts as $p => $sub_part) {
                 $sub_mimetype = $sub_part->mimetype;
+                $is_multipart = preg_match('/^multipart\/(related|relative|mixed|alternative)/', $sub_mimetype);
 
                 // skip empty text parts
-                if (!$sub_part->size && preg_match('#^text/(plain|html|enriched)$#', $sub_mimetype)) {
+                if (!$sub_part->size && !$is_multipart) {
                     continue;
                 }
 
                 // check if sub part is
-                if ($sub_mimetype == 'text/plain')
+                if ($is_multipart)
+                    $related_part = $p;
+                else if ($sub_mimetype == 'text/plain')
                     $plain_part = $p;
                 else if ($sub_mimetype == 'text/html')
                     $html_part = $p;
                 else if ($sub_mimetype == 'text/enriched')
                     $enriched_part = $p;
-                else if (in_array($sub_mimetype, array('multipart/related', 'multipart/mixed', 'multipart/alternative')))
-                    $related_part = $p;
+                else
+                    $attach_part = $p;
             }
 
             // parse related part (alternative part could be in here)
@@ -400,13 +460,13 @@ class rcube_message
 
             // choose html/plain part to print
             if ($html_part !== null && $this->opt['prefer_html']) {
-                $print_part = &$structure->parts[$html_part];
+                $print_part = $structure->parts[$html_part];
             }
             else if ($enriched_part !== null) {
-                $print_part = &$structure->parts[$enriched_part];
+                $print_part = $structure->parts[$enriched_part];
             }
             else if ($plain_part !== null) {
-                $print_part = &$structure->parts[$plain_part];
+                $print_part = $structure->parts[$plain_part];
             }
 
             // add the right message body
@@ -426,12 +486,9 @@ 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];
             }
         }
         // this is an ecrypted message -> create a plaintext body with the according message
@@ -445,6 +502,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
@@ -502,10 +570,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') {
@@ -537,7 +601,7 @@ class rcube_message
                         continue;
 
                     // part belongs to a related message and is linked
-                    if ($mimetype == 'multipart/related'
+                    if (preg_match('/^multipart\/(related|relative)/', $mimetype)
                         && ($mail_part->headers['content-id'] || $mail_part->headers['content-location'])) {
                         if ($mail_part->headers['content-id'])
                             $mail_part->content_id = preg_replace(array('/^</', '/>$/'), '', $mail_part->headers['content-id']);
@@ -557,9 +621,6 @@ class rcube_message
                     // regular attachment with valid content type
                     // (content-type name regexp according to RFC4288.4.2)
                     else if (preg_match('/^[a-z0-9!#$&.+^_-]+\/[a-z0-9!#$&.+^_-]+$/i', $part_mimetype)) {
-                        if (!$mail_part->filename)
-                            $mail_part->filename = 'Part '.$mail_part->mime_id;
-
                         $this->attachments[] = $mail_part;
                     }
                     // attachment with invalid content type
@@ -579,13 +640,13 @@ class rcube_message
             }
 
             // if this was a related part try to resolve references
-            if ($mimetype == 'multipart/related' && sizeof($this->inline_parts)) {
+            if (preg_match('/^multipart\/(related|relative)/', $mimetype) && sizeof($this->inline_parts)) {
                 $a_replaces = array();
                 $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)
+                    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;
@@ -624,7 +685,6 @@ class rcube_message
         }
         // message is a single part non-text (without filename)
         else if (preg_match('/application\//i', $mimetype)) {
-            $structure->filename = 'Part '.$structure->mime_id;
             $this->attachments[] = $structure;
         }
     }
diff --git a/program/lib/Roundcube/rcube_message_header.php b/program/lib/Roundcube/rcube_message_header.php
index 445d0bd39..274ae7f9f 100644
--- a/program/lib/Roundcube/rcube_message_header.php
+++ b/program/lib/Roundcube/rcube_message_header.php
@@ -2,8 +2,6 @@
 
 /**
  +-----------------------------------------------------------------------+
- | program/include/rcube_message_header.php                              |
- |                                                                       |
  | This file is part of the Roundcube Webmail client                     |
  | Copyright (C) 2005-2012, The Roundcube Dev Team                       |
  | Copyright (C) 2011-2012, Kolab Systems AG                             |
@@ -14,7 +12,6 @@
  |                                                                       |
  | PURPOSE:                                                              |
  |   E-mail message headers representation                               |
- |                                                                       |
  +-----------------------------------------------------------------------+
  | Author: Aleksander Machniak <alec@alec.pl>                            |
  +-----------------------------------------------------------------------+
@@ -235,13 +232,30 @@ class rcube_message_header
             $this->others[$name] = $value;
         }
     }
+
+
+    /**
+     * Factory method to instantiate headers from a data array
+     *
+     * @param array Hash array with header values
+     * @return object rcube_message_header instance filled with headers values
+     */
+    public static function from_array($arr)
+    {
+        $obj = new rcube_message_header;
+        foreach ($arr as $k => $v)
+            $obj->set($k, $v);
+
+        return $obj;
+    }
 }
 
 
 /**
  * Class for sorting an array of rcube_message_header objects in a predetermined order.
  *
- * @package Mail
+ * @package    Framework
+ * @subpackage Storage
  * @author  Aleksander Machniak <alec@alec.pl>
  */
 class rcube_message_header_sorter
diff --git a/program/lib/Roundcube/rcube_message_part.php b/program/lib/Roundcube/rcube_message_part.php
index c9c9257eb..4222ba390 100644
--- a/program/lib/Roundcube/rcube_message_part.php
+++ b/program/lib/Roundcube/rcube_message_part.php
@@ -2,8 +2,6 @@
 
 /*
  +-----------------------------------------------------------------------+
- | program/include/rcube_message_part.php                                |
- |                                                                       |
  | This file is part of the Roundcube Webmail client                     |
  | Copyright (C) 2005-2012, The Roundcube Dev Team                       |
  | Copyright (C) 2011-2012, Kolab Systems AG                             |
@@ -14,14 +12,12 @@
  |                                                                       |
  | PURPOSE:                                                              |
  |   Class representing a message part                                   |
- |                                                                       |
  +-----------------------------------------------------------------------+
  | Author: Thomas Bruederli <roundcube@gmail.com>                        |
  | Author: Aleksander Machniak <alec@alec.pl>                            |
  +-----------------------------------------------------------------------+
 */
 
-
 /**
  * Class representing a message part
  *
diff --git a/program/lib/Roundcube/rcube_mime.php b/program/lib/Roundcube/rcube_mime.php
index 17cb3f015..7cd520752 100644
--- a/program/lib/Roundcube/rcube_mime.php
+++ b/program/lib/Roundcube/rcube_mime.php
@@ -2,8 +2,6 @@
 
 /*
  +-----------------------------------------------------------------------+
- | program/include/rcube_mime.php                                        |
- |                                                                       |
  | This file is part of the Roundcube Webmail client                     |
  | Copyright (C) 2005-2012, The Roundcube Dev Team                       |
  | Copyright (C) 2011-2012, Kolab Systems AG                             |
@@ -14,14 +12,12 @@
  |                                                                       |
  | PURPOSE:                                                              |
  |   MIME message parsing utilities                                      |
- |                                                                       |
  +-----------------------------------------------------------------------+
  | Author: Thomas Bruederli <roundcube@gmail.com>                        |
  | Author: Aleksander Machniak <alec@alec.pl>                            |
  +-----------------------------------------------------------------------+
 */
 
-
 /**
  * Class for parsing MIME messages
  *
@@ -480,13 +476,19 @@ class rcube_mime
         $q_level = 0;
 
         foreach ($text as $idx => $line) {
-            if ($line[0] == '>' && preg_match('/^(>+\s*)/', $line, $regs)) {
-                $q = strlen(str_replace(' ', '', $regs[0]));
-                $line = substr($line, strlen($regs[0]));
-
-                if ($q == $q_level && $line
-                    && isset($text[$last])
-                    && $text[$last][strlen($text[$last])-1] == ' '
+            if ($line[0] == '>') {
+                // remove quote chars, store level in $q
+                $line = preg_replace('/^>+/', '', $line, -1, $q);
+                // remove (optional) space-staffing
+                $line = preg_replace('/^ /', '', $line);
+
+                // The same paragraph (We join current line with the previous one) when:
+                // - the same level of quoting
+                // - previous line was flowed
+                // - previous line contains more than only one single space (and quote char(s))
+                if ($q == $q_level
+                    && isset($text[$last]) && $text[$last][strlen($text[$last])-1] == ' '
+                    && !preg_match('/^>+ {0,1}$/', $text[$last])
                 ) {
                     $text[$last] .= $line;
                     unset($text[$idx]);
@@ -539,10 +541,12 @@ class rcube_mime
 
         foreach ($text as $idx => $line) {
             if ($line != '-- ') {
-                if ($line[0] == '>' && preg_match('/^(>+ {0,1})+/', $line, $regs)) {
-                    $level  = substr_count($regs[0], '>');
+                if ($line[0] == '>') {
+                    // remove quote chars, store level in $level
+                    $line   = preg_replace('/^>+/', '', $line, -1, $level);
+                    // remove (optional) space-staffing and spaces before the line end
+                    $line   = preg_replace('/(^ | +$)/', '', $line);
                     $prefix = str_repeat('>', $level) . ' ';
-                    $line   = rtrim(substr($line, strlen($regs[0])));
                     $line   = $prefix . self::wordwrap($line, $length - $level - 2, " \r\n$prefix", false, $charset);
                 }
                 else if ($line) {
@@ -582,7 +586,7 @@ class rcube_mime
         while (count($para)) {
             $line = array_shift($para);
             if ($line[0] == '>') {
-                $string .= $line.$break;
+                $string .= $line . (count($para) ? $break : '');
                 continue;
             }
 
@@ -591,11 +595,12 @@ class rcube_mime
             while (count($list)) {
                 $line   = array_shift($list);
                 $l      = mb_strlen($line);
-                $newlen = $len + $l + ($len ? 1 : 0);
+                $space  = $len ? 1 : 0;
+                $newlen = $len + $l + $space;
 
                 if ($newlen <= $width) {
-                    $string .= ($len ? ' ' : '').$line;
-                    $len += (1 + $l);
+                    $string .= ($space ? ' ' : '').$line;
+                    $len += ($space + $l);
                 }
                 else {
                     if ($l > $width) {
@@ -667,7 +672,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
@@ -713,20 +727,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/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);
+                $lines = file($fp, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
                 break;
             }
         }
@@ -748,11 +769,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/jpg', '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 4ef42f598..b8ae86cf6 100644
--- a/program/lib/Roundcube/rcube_output.php
+++ b/program/lib/Roundcube/rcube_output.php
@@ -2,17 +2,15 @@
 
 /*
  +-----------------------------------------------------------------------+
- | program/include/rcube_output.php                                      |
- |                                                                       |
  | This file is part of the Roundcube PHP suite                          |
  | Copyright (C) 2005-2012 The Roundcube Dev Team                        |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
  | See the README file for a full license statement.                     |
+ |                                                                       |
  | CONTENTS:                                                             |
  |   Abstract class for output generation                                |
- |                                                                       |
  +-----------------------------------------------------------------------+
  | Author: Thomas Bruederli <roundcube@gmail.com>                        |
  | Author: Aleksander Machniak <alec@alec.pl>                            |
diff --git a/program/lib/Roundcube/rcube_plugin.php b/program/lib/Roundcube/rcube_plugin.php
index dbb15e8be..167a9eb4f 100644
--- a/program/lib/Roundcube/rcube_plugin.php
+++ b/program/lib/Roundcube/rcube_plugin.php
@@ -2,10 +2,8 @@
 
 /*
  +-----------------------------------------------------------------------+
- | program/include/rcube_plugin.php                                      |
- |                                                                       |
  | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2008-2009, The Roundcube Dev Team                       |
+ | Copyright (C) 2008-2012, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -27,334 +25,361 @@
  */
 abstract class rcube_plugin
 {
-  /**
-   * Class name of the plugin instance
-   *
-   * @var string
-   */
-  public $ID;
-
-  /**
-   * Instance of Plugin API
-   *
-   * @var rcube_plugin_api
-   */
-  public $api;
-
-  /**
-   * Regular expression defining task(s) to bind with 
-   *
-   * @var string
-   */
-  public $task;
-
-  /**
-   * Disables plugin in AJAX requests
-   *
-   * @var boolean
-   */
-  public $noajax = false;
-
-  /**
-   * Disables plugin in framed mode
-   *
-   * @var boolean
-   */
-  public $noframe = false;
-
-  protected $home;
-  protected $urlbase;
-  private $mytask;
-
-
-  /**
-   * Default constructor.
-   *
-   * @param rcube_plugin_api $api Plugin API
-   */
-  public function __construct($api)
-  {
-    $this->ID = get_class($this);
-    $this->api = $api;
-    $this->home = $api->dir . $this->ID;
-    $this->urlbase = $api->url . $this->ID . '/';
-  }
-
-  /**
-   * Initialization method, needs to be implemented by the plugin itself
-   */
-  abstract function init();
-
-
-  /**
-   * Attempt to load the given plugin which is required for the current plugin
-   *
-   * @param string Plugin name
-   * @return boolean True on success, false on failure
-   */
-  public function require_plugin($plugin_name)
-  {
-    return $this->api->load_plugin($plugin_name);
-  }
-
-
-  /**
-   * Load local config file from plugins directory.
-   * The loaded values are patched over the global configuration.
-   *
-   * @param string $fname Config file name relative to the plugin's folder
-   * @return boolean True on success, false on failure
-   */
-  public function load_config($fname = 'config.inc.php')
-  {
-    $fpath = $this->home.'/'.$fname;
-    $rcube = rcube::get_instance();
-    if (is_file($fpath) && !$rcube->config->load_from_file($fpath)) {
-      rcube::raise_error(array(
-        'code' => 527, 'type' => 'php',
-        'file' => __FILE__, 'line' => __LINE__,
-        'message' => "Failed to load config from $fpath"), true, false);
-      return false;
+    /**
+     * Class name of the plugin instance
+     *
+     * @var string
+     */
+    public $ID;
+
+    /**
+     * Instance of Plugin API
+     *
+     * @var rcube_plugin_api
+     */
+    public $api;
+
+    /**
+     * Regular expression defining task(s) to bind with 
+     *
+     * @var string
+     */
+    public $task;
+
+    /**
+     * Disables plugin in AJAX requests
+     *
+     * @var boolean
+     */
+    public $noajax = false;
+
+    /**
+     * Disables plugin in framed mode
+     *
+     * @var boolean
+     */
+    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;
+
+
+    /**
+     * Default constructor.
+     *
+     * @param rcube_plugin_api $api Plugin API
+     */
+    public function __construct($api)
+    {
+        $this->ID      = get_class($this);
+        $this->api     = $api;
+        $this->home    = $api->dir . $this->ID;
+        $this->urlbase = $api->url . $this->ID . '/';
+    }
+
+    /**
+     * Initialization method, needs to be implemented by the plugin itself
+     */
+    abstract function init();
+
+    /**
+     * Attempt to load the given plugin which is required for the current plugin
+     *
+     * @param string Plugin name
+     * @return boolean True on success, false on failure
+     */
+    public function require_plugin($plugin_name)
+    {
+        return $this->api->load_plugin($plugin_name);
+    }
+
+    /**
+     * Load local config file from plugins directory.
+     * The loaded values are patched over the global configuration.
+     *
+     * @param string $fname Config file name relative to the plugin's folder
+     *
+     * @return boolean True on success, false on failure
+     */
+    public function load_config($fname = 'config.inc.php')
+    {
+        $fpath = $this->home.'/'.$fname;
+        $rcube = rcube::get_instance();
+
+        if (is_file($fpath) && !$rcube->config->load_from_file($fpath)) {
+            rcube::raise_error(array(
+                'code' => 527, 'type' => 'php',
+                'file' => __FILE__, 'line' => __LINE__,
+                'message' => "Failed to load config from $fpath"), true, false);
+            return false;
+        }
+
+        return true;
     }
 
-    return true;
-  }
-
-  /**
-   * Register a callback function for a specific (server-side) hook
-   *
-   * @param string $hook Hook name
-   * @param mixed  $callback Callback function as string or array with object reference and method name
-   */
-  public function add_hook($hook, $callback)
-  {
-    $this->api->register_hook($hook, $callback);
-  }
-
-  /**
-   * Unregister a callback function for a specific (server-side) hook.
-   *
-   * @param string $hook Hook name
-   * @param mixed  $callback Callback function as string or array with object reference and method name
-   */
-  public function remove_hook($hook, $callback)
-  {
-    $this->api->unregister_hook($hook, $callback);
-  }
-
-  /**
-   * Load localized texts from the plugins dir
-   *
-   * @param string $dir Directory to search in
-   * @param mixed  $add2client Make texts also available on the client (array with list or true for all)
-   */
-  public function add_texts($dir, $add2client = false)
-  {
-    $domain = $this->ID;
-    $lang   = $_SESSION['language'];
-    $langs  = array_unique(array('en_US', $lang));
-    $locdir = slashify(realpath(slashify($this->home) . $dir));
-    $texts  = array();
-
-    // Language aliases used to find localization in similar lang, see below
-    $aliases = array(
-        'de_CH' => 'de_DE',
-        'es_AR' => 'es_ES',
-        'fa_AF' => 'fa_IR',
-        'nl_BE' => 'nl_NL',
-        'pt_BR' => 'pt_PT',
-        'zh_CN' => 'zh_TW',
-    );
-
-    // use buffering to handle empty lines/spaces after closing PHP tag
-    ob_start();
-
-    foreach ($langs as $lng) {
-      $fpath = $locdir . $lng . '.inc';
-      if (is_file($fpath) && is_readable($fpath)) {
-        include $fpath;
-        $texts = (array)$labels + (array)$messages + (array)$texts;
-      }
-      else if ($lng != 'en_US') {
-        // Find localization in similar language (#1488401)
-        $alias = null;
-        if (!empty($aliases[$lng])) {
-          $alias = $aliases[$lng];
+    /**
+     * Register a callback function for a specific (server-side) hook
+     *
+     * @param string $hook     Hook name
+     * @param mixed  $callback Callback function as string or array
+     *                         with object reference and method name
+     */
+    public function add_hook($hook, $callback)
+    {
+        $this->api->register_hook($hook, $callback);
+    }
+
+    /**
+     * Unregister a callback function for a specific (server-side) hook.
+     *
+     * @param string $hook     Hook name
+     * @param mixed  $callback Callback function as string or array
+     *                         with object reference and method name
+     */
+    public function remove_hook($hook, $callback)
+    {
+        $this->api->unregister_hook($hook, $callback);
+    }
+
+    /**
+     * Load localized texts from the plugins dir
+     *
+     * @param string $dir        Directory to search in
+     * @param mixed  $add2client Make texts also available on the client
+     *                           (array with list or true for all)
+     */
+    public function add_texts($dir, $add2client = false)
+    {
+        $domain = $this->ID;
+        $lang   = $_SESSION['language'];
+        $langs  = array_unique(array('en_US', $lang));
+        $locdir = slashify(realpath(slashify($this->home) . $dir));
+        $texts  = array();
+
+        // Language aliases used to find localization in similar lang, see below
+        $aliases = array(
+            'de_CH' => 'de_DE',
+            'es_AR' => 'es_ES',
+            'fa_AF' => 'fa_IR',
+            'nl_BE' => 'nl_NL',
+            'pt_BR' => 'pt_PT',
+            'zh_CN' => 'zh_TW',
+        );
+
+        // use buffering to handle empty lines/spaces after closing PHP tag
+        ob_start();
+
+        foreach ($langs as $lng) {
+            $fpath = $locdir . $lng . '.inc';
+            if (is_file($fpath) && is_readable($fpath)) {
+                include $fpath;
+                $texts = (array)$labels + (array)$messages + (array)$texts;
+            }
+            else if ($lng != 'en_US') {
+                // Find localization in similar language (#1488401)
+                $alias = null;
+                if (!empty($aliases[$lng])) {
+                    $alias = $aliases[$lng];
+                }
+                else if ($key = array_search($lng, $aliases)) {
+                    $alias = $key;
+                }
+
+                if (!empty($alias)) {
+                    $fpath = $locdir . $alias . '.inc';
+                    if (is_file($fpath) && is_readable($fpath)) {
+                        include $fpath;
+                        $texts = (array)$labels + (array)$messages + (array)$texts;
+                    }
+                }
+            }
         }
-        else if ($key = array_search($lng, $aliases)) {
-          $alias = $key;
+
+        ob_end_clean();
+
+        // prepend domain to text keys and add to the application texts repository
+        if (!empty($texts)) {
+            $add = array();
+            foreach ($texts as $key => $value) {
+                $add[$domain.'.'.$key] = $value;
+            }
+
+            $rcube = rcube::get_instance();
+            $rcube->load_language($lang, $add);
+
+            // add labels to client
+            if ($add2client) {
+                if (is_array($add2client)) {
+                    $js_labels = array_map(array($this, 'label_map_callback'), $add2client);
+                }
+                else {
+                    $js_labels = array_keys($add);
+                }
+                $rcube->output->add_label($js_labels);
+            }
         }
+    }
+
+    /**
+     * Wrapper for rcube::gettext() adding the plugin ID as domain
+     *
+     * @param string $p Message identifier
+     *
+     * @return string Localized text
+     * @see rcube::gettext()
+     */
+    public function gettext($p)
+    {
+        return rcube::get_instance()->gettext($p, $this->ID);
+    }
 
-        if (!empty($alias)) {
-          $fpath = $locdir . $alias . '.inc';
-          if (is_file($fpath) && is_readable($fpath)) {
-            include $fpath;
-            $texts = (array)$labels + (array)$messages + (array)$texts;
-          }
+    /**
+     * Register this plugin to be responsible for a specific task
+     *
+     * @param string $task Task name (only characters [a-z0-9_-] are allowed)
+     */
+    public function register_task($task)
+    {
+        if ($this->api->register_task($task, $this->ID)) {
+            $this->mytask = $task;
         }
-      }
     }
 
-    ob_end_clean();
+    /**
+     * Register a handler for a specific client-request action
+     *
+     * The callback will be executed upon a request like /?_task=mail&_action=plugin.myaction
+     *
+     * @param string $action  Action name (should be unique)
+     * @param mixed $callback Callback function as string
+     *                        or array with object reference and method name
+     */
+    public function register_action($action, $callback)
+    {
+        $this->api->register_action($action, $this->ID, $callback, $this->mytask);
+    }
 
-    // prepend domain to text keys and add to the application texts repository
-    if (!empty($texts)) {
-      $add = array();
-      foreach ($texts as $key => $value)
-        $add[$domain.'.'.$key] = $value;
+    /**
+     * Register a handler function for a template object
+     *
+     * When parsing a template for display, tags like <roundcube:object name="plugin.myobject" />
+     * will be replaced by the return value if the registered callback function.
+     *
+     * @param string $name     Object name (should be unique and start with 'plugin.')
+     * @param mixed  $callback Callback function as string or array with object reference
+     *                         and method name
+     */
+    public function register_handler($name, $callback)
+    {
+        $this->api->register_handler($name, $this->ID, $callback);
+    }
 
-      $rcmail = rcube::get_instance();
-      $rcmail->load_language($lang, $add);
+    /**
+     * Make this javascipt file available on the client
+     *
+     * @param string $fn File path; absolute or relative to the plugin directory
+     */
+    public function include_script($fn)
+    {
+        $this->api->include_script($this->resource_url($fn));
+    }
 
-      // add labels to client
-      if ($add2client) {
-        $js_labels = is_array($add2client) ? array_map(array($this, 'label_map_callback'), $add2client) : array_keys($add);
-        $rcmail->output->add_label($js_labels);
-      }
+    /**
+     * Make this stylesheet available on the client
+     *
+     * @param string $fn File path; absolute or relative to the plugin directory
+     */
+    public function include_stylesheet($fn)
+    {
+        $this->api->include_stylesheet($this->resource_url($fn));
+    }
+
+    /**
+     * Append a button to a certain container
+     *
+     * @param array $p Hash array with named parameters (as used in skin templates)
+     * @param string $container Container name where the buttons should be added to
+     *
+     * @see rcube_remplate::button()
+     */
+    public function add_button($p, $container)
+    {
+        if ($this->api->output->type == 'html') {
+            // fix relative paths
+            foreach (array('imagepas', 'imageact', 'imagesel') as $key) {
+                if ($p[$key]) {
+                    $p[$key] = $this->api->url . $this->resource_url($p[$key]);
+                }
+            }
+
+            $this->api->add_content($this->api->output->button($p), $container);
+        }
     }
-  }
-
-  /**
-   * Wrapper for rcmail::gettext() adding the plugin ID as domain
-   *
-   * @param string $p Message identifier
-   * @return string Localized text
-   * @see rcmail::gettext()
-   */
-  public function gettext($p)
-  {
-    return rcube::get_instance()->gettext($p, $this->ID);
-  }
-
-  /**
-   * Register this plugin to be responsible for a specific task
-   *
-   * @param string $task Task name (only characters [a-z0-9_.-] are allowed)
-   */
-  public function register_task($task)
-  {
-    if ($this->api->register_task($task, $this->ID))
-      $this->mytask = $task;
-  }
-
-  /**
-    * Register a handler for a specific client-request action
-    *
-    * The callback will be executed upon a request like /?_task=mail&_action=plugin.myaction
-    *
-    * @param string $action  Action name (should be unique)
-    * @param mixed $callback Callback function as string or array with object reference and method name
-   */
-  public function register_action($action, $callback)
-  {
-    $this->api->register_action($action, $this->ID, $callback, $this->mytask);
-  }
-
-  /**
-   * Register a handler function for a template object
-   *
-   * When parsing a template for display, tags like <roundcube:object name="plugin.myobject" />
-   * will be replaced by the return value if the registered callback function.
-   *
-   * @param string $name Object name (should be unique and start with 'plugin.')
-   * @param mixed  $callback Callback function as string or array with object reference and method name
-   */
-  public function register_handler($name, $callback)
-  {
-    $this->api->register_handler($name, $this->ID, $callback);
-  }
-
-  /**
-   * Make this javascipt file available on the client
-   *
-   * @param string $fn File path; absolute or relative to the plugin directory
-   */
-  public function include_script($fn)
-  {
-    $this->api->include_script($this->resource_url($fn));
-  }
-
-  /**
-   * Make this stylesheet available on the client
-   *
-   * @param string $fn File path; absolute or relative to the plugin directory
-   */
-  public function include_stylesheet($fn)
-  {
-    $this->api->include_stylesheet($this->resource_url($fn));
-  }
-
-  /**
-   * Append a button to a certain container
-   *
-   * @param array $p Hash array with named parameters (as used in skin templates)
-   * @param string $container Container name where the buttons should be added to
-   * @see rcube_remplate::button()
-   */
-  public function add_button($p, $container)
-  {
-    if ($this->api->output->type == 'html') {
-      // fix relative paths
-      foreach (array('imagepas', 'imageact', 'imagesel') as $key)
-        if ($p[$key])
-          $p[$key] = $this->api->url . $this->resource_url($p[$key]);
-
-      $this->api->add_content($this->api->output->button($p), $container);
+
+    /**
+     * Generate an absolute URL to the given resource within the current
+     * plugin directory
+     *
+     * @param string $fn The file name
+     *
+     * @return string Absolute URL to the given resource
+     */
+    public function url($fn)
+    {
+        return $this->api->url . $this->resource_url($fn);
     }
-  }
-
-  /**
-   * Generate an absolute URL to the given resource within the current
-   * plugin directory
-   *
-   * @param string $fn The file name
-   * @return string Absolute URL to the given resource
-   */
-  public function url($fn)
-  {
-      return $this->api->url . $this->resource_url($fn);
-  }
-
-  /**
-   * Make the given file name link into the plugin directory
-   *
-   * @param string $fn Filename
-   */
-  private function resource_url($fn)
-  {
-    if ($fn[0] != '/' && !preg_match('|^https?://|i', $fn))
-      return $this->ID . '/' . $fn;
-    else
-      return $fn;
-  }
-
-  /**
-   * Provide path to the currently selected skin folder within the plugin directory
-   * with a fallback to the default skin folder.
-   *
-   * @return string Skin path relative to plugins directory
-   */
-  public function local_skin_path()
-  {
-    $rcmail = rcube::get_instance();
-    foreach (array($rcmail->config->get('skin'), 'larry') as $skin) {
-      $skin_path = 'skins/' . $skin;
-      if (is_dir(realpath(slashify($this->home) . $skin_path)))
-        break;
+
+    /**
+     * Make the given file name link into the plugin directory
+     *
+     * @param string $fn Filename
+     */
+    private function resource_url($fn)
+    {
+        if ($fn[0] != '/' && !preg_match('|^https?://|i', $fn)) {
+            return $this->ID . '/' . $fn;
+        }
+        else {
+            return $fn;
+        }
     }
 
-    return $skin_path;
-  }
+    /**
+     * Provide path to the currently selected skin folder within the plugin directory
+     * with a fallback to the default skin folder.
+     *
+     * @return string Skin path relative to plugins directory
+     */
+    public function local_skin_path()
+    {
+        $rcube = rcube::get_instance();
+        foreach (array($rcube->config->get('skin'), 'larry') as $skin) {
+            $skin_path = 'skins/' . $skin;
+            if (is_dir(realpath(slashify($this->home) . $skin_path))) {
+                break;
+            }
+        }
 
-  /**
-   * Callback function for array_map
-   *
-   * @param string $key Array key.
-   * @return string
-   */
-  private function label_map_callback($key)
-  {
-    return $this->ID.'.'.$key;
-  }
+        return $skin_path;
+    }
 
+    /**
+     * Callback function for array_map
+     *
+     * @param string $key Array key.
+     * @return string
+     */
+    private function label_map_callback($key)
+    {
+        return $this->ID.'.'.$key;
+    }
 }
diff --git a/program/lib/Roundcube/rcube_plugin_api.php b/program/lib/Roundcube/rcube_plugin_api.php
index 51cf5d246..a89f14712 100644
--- a/program/lib/Roundcube/rcube_plugin_api.php
+++ b/program/lib/Roundcube/rcube_plugin_api.php
@@ -2,10 +2,8 @@
 
 /*
  +-----------------------------------------------------------------------+
- | program/include/rcube_plugin_api.php                                  |
- |                                                                       |
  | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2008-2011, The Roundcube Dev Team                       |
+ | Copyright (C) 2008-2012, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -13,16 +11,15 @@
  |                                                                       |
  | PURPOSE:                                                              |
  |   Plugins repository                                                  |
- |                                                                       |
  +-----------------------------------------------------------------------+
  | Author: Thomas Bruederli <roundcube@gmail.com>                        |
  +-----------------------------------------------------------------------+
 */
 
 // location where plugins are loade from
-if (!defined('RCUBE_PLUGINS_DIR'))
-  define('RCUBE_PLUGINS_DIR', RCUBE_INSTALL_PATH . 'plugins/');
-
+if (!defined('RCUBE_PLUGINS_DIR')) {
+    define('RCUBE_PLUGINS_DIR', RCUBE_INSTALL_PATH . 'plugins/');
+}
 
 /**
  * The plugin loader and global API
@@ -32,468 +29,482 @@ if (!defined('RCUBE_PLUGINS_DIR'))
  */
 class rcube_plugin_api
 {
-  static protected $instance;
-
-  public $dir;
-  public $url = 'plugins/';
-  public $task = '';
-  public $output;
-
-  public $handlers = array();
-  protected $plugins = array();
-  protected $tasks = array();
-  protected $actions = array();
-  protected $actionmap = array();
-  protected $objectsmap = array();
-  protected $template_contents = array();
-  protected $active_hook = false;
-
-  // Deprecated names of hooks, will be removed after 0.5-stable release
-  protected $deprecated_hooks = array(
-    'create_user'       => 'user_create',
-    'kill_session'      => 'session_destroy',
-    'upload_attachment' => 'attachment_upload',
-    'save_attachment'   => 'attachment_save',
-    'get_attachment'    => 'attachment_get',
-    'cleanup_attachments' => 'attachments_cleanup',
-    'display_attachment' => 'attachment_display',
-    'remove_attachment' => 'attachment_delete',
-    'outgoing_message_headers' => 'message_outgoing_headers',
-    'outgoing_message_body' => 'message_outgoing_body',
-    'address_sources'   => 'addressbooks_list',
-    'get_address_book'  => 'addressbook_get',
-    'create_contact'    => 'contact_create',
-    'save_contact'      => 'contact_update',
-    'contact_save'      => 'contact_update',
-    'delete_contact'    => 'contact_delete',
-    'manage_folders'    => 'folders_list',
-    'list_mailboxes'    => 'mailboxes_list',
-    'save_preferences'  => 'preferences_save',
-    'user_preferences'  => 'preferences_list',
-    'list_prefs_sections' => 'preferences_sections_list',
-    'list_identities'   => 'identities_list',
-    'create_identity'   => 'identity_create',
-    'delete_identity'   => 'identity_delete',
-    'save_identity'     => 'identity_update',
-    'identity_save'     => 'identity_update',
-    // to be removed after 0.8
-    'imap_init'         => 'storage_init',
-    'mailboxes_list'    => 'storage_folders', 
-  );
-
-  /**
-   * This implements the 'singleton' design pattern
-   *
-   * @return rcube_plugin_api The one and only instance if this class
-   */
-  static function get_instance()
-  {
-    if (!self::$instance) {
-      self::$instance = new rcube_plugin_api();
-    }
+    static protected $instance;
+
+    public $dir;
+    public $url = 'plugins/';
+    public $task = '';
+    public $output;
+    public $handlers = array();
+    public $allowed_prefs = array();
+
+    protected $plugins = array();
+    protected $tasks = array();
+    protected $actions = array();
+    protected $actionmap = array();
+    protected $objectsmap = array();
+    protected $template_contents = array();
+    protected $active_hook = false;
+
+    // Deprecated names of hooks, will be removed after 0.5-stable release
+    protected $deprecated_hooks = array(
+        'create_user'       => 'user_create',
+        'kill_session'      => 'session_destroy',
+        'upload_attachment' => 'attachment_upload',
+        'save_attachment'   => 'attachment_save',
+        'get_attachment'    => 'attachment_get',
+        'cleanup_attachments' => 'attachments_cleanup',
+        'display_attachment' => 'attachment_display',
+        'remove_attachment' => 'attachment_delete',
+        'outgoing_message_headers' => 'message_outgoing_headers',
+        'outgoing_message_body' => 'message_outgoing_body',
+        'address_sources'   => 'addressbooks_list',
+        'get_address_book'  => 'addressbook_get',
+        'create_contact'    => 'contact_create',
+        'save_contact'      => 'contact_update',
+        'contact_save'      => 'contact_update',
+        'delete_contact'    => 'contact_delete',
+        'manage_folders'    => 'folders_list',
+        'list_mailboxes'    => 'mailboxes_list',
+        'save_preferences'  => 'preferences_save',
+        'user_preferences'  => 'preferences_list',
+        'list_prefs_sections' => 'preferences_sections_list',
+        'list_identities'   => 'identities_list',
+        'create_identity'   => 'identity_create',
+        'delete_identity'   => 'identity_delete',
+        'save_identity'     => 'identity_update',
+        'identity_save'     => 'identity_update',
+        // to be removed after 0.8
+        'imap_init'         => 'storage_init',
+        'mailboxes_list'    => 'storage_folders',
+        'imap_connect'      => 'storage_connect',
+    );
+
+    /**
+     * This implements the 'singleton' design pattern
+     *
+     * @return rcube_plugin_api The one and only instance if this class
+     */
+    static function get_instance()
+    {
+        if (!self::$instance) {
+            self::$instance = new rcube_plugin_api();
+        }
 
-    return self::$instance;
-  }
-
-
-  /**
-   * Private constructor
-   */
-  protected function __construct()
-  {
-    $this->dir = slashify(RCUBE_PLUGINS_DIR);
-  }
-
-
-  /**
-   * Initialize plugin engine
-   *
-   * This has to be done after rcmail::load_gui() or rcmail::json_init()
-   * was called because plugins need to have access to rcmail->output
-   *
-   * @param object rcube Instance of the rcube base class
-   * @param string Current application task (used for conditional plugin loading)
-   */
-  public function init($app, $task = '')
-  {
-    $this->task = $task;
-    $this->output = $app->output;
-
-    // register an internal hook
-    $this->register_hook('template_container', array($this, 'template_container_hook'));
-
-    // maybe also register a shudown function which triggers shutdown functions of all plugin objects
-  }
-
-
-  /**
-   * Load and init all enabled plugins
-   *
-   * This has to be done after rcmail::load_gui() or rcmail::json_init()
-   * was called because plugins need to have access to rcmail->output
-   *
-   * @param array List of configured plugins to load
-   * @param array List of plugins required by the application
-   */
-  public function load_plugins($plugins_enabled, $required_plugins = array())
-  {
-    foreach ($plugins_enabled as $plugin_name) {
-      $this->load_plugin($plugin_name);
+        return self::$instance;
     }
 
-    // check existance of all required core plugins
-    foreach ($required_plugins as $plugin_name) {
-      $loaded = false;
-      foreach ($this->plugins as $plugin) {
-        if ($plugin instanceof $plugin_name) {
-          $loaded = true;
-          break;
-        }
-      }
-
-      // load required core plugin if no derivate was found
-      if (!$loaded)
-        $loaded = $this->load_plugin($plugin_name);
-
-      // trigger fatal error if still not loaded
-      if (!$loaded) {
-        rcube::raise_error(array('code' => 520, 'type' => 'php',
-          'file' => __FILE__, 'line' => __LINE__,
-          'message' => "Requried plugin $plugin_name was not loaded"), true, true);
-      }
+    /**
+     * Private constructor
+     */
+    protected function __construct()
+    {
+        $this->dir = slashify(RCUBE_PLUGINS_DIR);
     }
-  }
-
-  /**
-   * Load the specified plugin
-   *
-   * @param string Plugin name
-   * @return boolean True on success, false if not loaded or failure
-   */
-  public function load_plugin($plugin_name)
-  {
-    static $plugins_dir;
-
-    if (!$plugins_dir) {
-      $dir = dir($this->dir);
-      $plugins_dir = unslashify($dir->path);
+
+    /**
+     * Initialize plugin engine
+     *
+     * This has to be done after rcmail::load_gui() or rcmail::json_init()
+     * was called because plugins need to have access to rcmail->output
+     *
+     * @param object rcube Instance of the rcube base class
+     * @param string Current application task (used for conditional plugin loading)
+     */
+    public function init($app, $task = '')
+    {
+        $this->task   = $task;
+        $this->output = $app->output;
+
+        // register an internal hook
+        $this->register_hook('template_container', array($this, 'template_container_hook'));
+
+        // maybe also register a shudown function which triggers
+        // shutdown functions of all plugin objects
     }
 
-    // plugin already loaded
-    if ($this->plugins[$plugin_name] || class_exists($plugin_name, false))
-      return true;
-
-    $fn = $plugins_dir . DIRECTORY_SEPARATOR . $plugin_name . DIRECTORY_SEPARATOR . $plugin_name . '.php';
-
-    if (file_exists($fn)) {
-      include($fn);
-
-      // instantiate class if exists
-      if (class_exists($plugin_name, false)) {
-        $plugin = new $plugin_name($this);
-        // check inheritance...
-        if (is_subclass_of($plugin, 'rcube_plugin')) {
-          // ... task, request type and framed mode
-          if ((!$plugin->task || preg_match('/^('.$plugin->task.')$/i', $this->task))
-              && (!$plugin->noajax || (is_object($this->output) && $this->output->type == 'html'))
-              && (!$plugin->noframe || empty($_REQUEST['_framed']))
-          ) {
-            $plugin->init();
-            $this->plugins[$plugin_name] = $plugin;
-          }
-          return true;
+    /**
+     * Load and init all enabled plugins
+     *
+     * This has to be done after rcmail::load_gui() or rcmail::json_init()
+     * was called because plugins need to have access to rcmail->output
+     *
+     * @param array List of configured plugins to load
+     * @param array List of plugins required by the application
+     */
+    public function load_plugins($plugins_enabled, $required_plugins = array())
+    {
+        foreach ($plugins_enabled as $plugin_name) {
+            $this->load_plugin($plugin_name);
+        }
+
+        // check existance of all required core plugins
+        foreach ($required_plugins as $plugin_name) {
+            $loaded = false;
+            foreach ($this->plugins as $plugin) {
+                if ($plugin instanceof $plugin_name) {
+                    $loaded = true;
+                    break;
+                }
+            }
+
+            // load required core plugin if no derivate was found
+            if (!$loaded) {
+                $loaded = $this->load_plugin($plugin_name);
+            }
+
+            // trigger fatal error if still not loaded
+            if (!$loaded) {
+                rcube::raise_error(array(
+                    'code' => 520, 'type' => 'php',
+                    'file' => __FILE__, 'line' => __LINE__,
+                    'message' => "Requried plugin $plugin_name was not loaded"), true, true);
+            }
         }
-      }
-      else {
-        rcube::raise_error(array('code' => 520, 'type' => 'php',
-          'file' => __FILE__, 'line' => __LINE__,
-          'message' => "No plugin class $plugin_name found in $fn"), true, false);
-      }
     }
-    else {
-      rcube::raise_error(array('code' => 520, 'type' => 'php',
-        'file' => __FILE__, 'line' => __LINE__,
-        'message' => "Failed to load plugin file $fn"), true, false);
+
+    /**
+     * Load the specified plugin
+     *
+     * @param string Plugin name
+     *
+     * @return boolean True on success, false if not loaded or failure
+     */
+    public function load_plugin($plugin_name)
+    {
+        static $plugins_dir;
+
+        if (!$plugins_dir) {
+            $dir         = dir($this->dir);
+            $plugins_dir = unslashify($dir->path);
+        }
+
+        // plugin already loaded
+        if ($this->plugins[$plugin_name] || class_exists($plugin_name, false)) {
+            return true;
+        }
+
+        $fn = $plugins_dir . DIRECTORY_SEPARATOR . $plugin_name
+            . DIRECTORY_SEPARATOR . $plugin_name . '.php';
+
+        if (file_exists($fn)) {
+            include $fn;
+
+            // instantiate class if exists
+            if (class_exists($plugin_name, false)) {
+                $plugin = new $plugin_name($this);
+                // check inheritance...
+                if (is_subclass_of($plugin, 'rcube_plugin')) {
+                    // ... task, request type and framed mode
+                    if ((!$plugin->task || preg_match('/^('.$plugin->task.')$/i', $this->task))
+                        && (!$plugin->noajax || (is_object($this->output) && $this->output->type == 'html'))
+                        && (!$plugin->noframe || empty($_REQUEST['_framed']))
+                    ) {
+                        $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;
+                }
+            }
+            else {
+                rcube::raise_error(array('code' => 520, 'type' => 'php',
+                    'file' => __FILE__, 'line' => __LINE__,
+                    'message' => "No plugin class $plugin_name found in $fn"),
+                    true, false);
+            }
+        }
+        else {
+            rcube::raise_error(array('code' => 520, 'type' => 'php',
+                'file' => __FILE__, 'line' => __LINE__,
+                'message' => "Failed to load plugin file $fn"), true, false);
+        }
+
+        return false;
     }
 
-    return false;
-  }
-
-
-  /**
-   * Allows a plugin object to register a callback for a certain hook
-   *
-   * @param string $hook Hook name
-   * @param mixed  $callback String with global function name or array($obj, 'methodname')
-   */
-  public function register_hook($hook, $callback)
-  {
-    if (is_callable($callback)) {
-      if (isset($this->deprecated_hooks[$hook])) {
-        rcube::raise_error(array('code' => 522, 'type' => 'php',
-          'file' => __FILE__, 'line' => __LINE__,
-          'message' => "Deprecated hook name. ".$hook.' -> '.$this->deprecated_hooks[$hook]), true, false);
-        $hook = $this->deprecated_hooks[$hook];
-      }
-      $this->handlers[$hook][] = $callback;
+    /**
+     * Allows a plugin object to register a callback for a certain hook
+     *
+     * @param string $hook Hook name
+     * @param mixed  $callback String with global function name or array($obj, 'methodname')
+     */
+    public function register_hook($hook, $callback)
+    {
+        if (is_callable($callback)) {
+            if (isset($this->deprecated_hooks[$hook])) {
+                rcube::raise_error(array('code' => 522, 'type' => 'php',
+                    'file' => __FILE__, 'line' => __LINE__,
+                    'message' => "Deprecated hook name. "
+                        . $hook . ' -> ' . $this->deprecated_hooks[$hook]), true, false);
+                $hook = $this->deprecated_hooks[$hook];
+            }
+            $this->handlers[$hook][] = $callback;
+        }
+        else {
+            rcube::raise_error(array('code' => 521, 'type' => 'php',
+                'file' => __FILE__, 'line' => __LINE__,
+                'message' => "Invalid callback function for $hook"), true, false);
+        }
     }
-    else
-      rcube::raise_error(array('code' => 521, 'type' => 'php',
-        'file' => __FILE__, 'line' => __LINE__,
-        'message' => "Invalid callback function for $hook"), true, false);
-  }
-
-  /**
-   * Allow a plugin object to unregister a callback.
-   *
-   * @param string $hook Hook name
-   * @param mixed  $callback String with global function name or array($obj, 'methodname')
-   */
-  public function unregister_hook($hook, $callback)
-  {
-    $callback_id = array_search($callback, $this->handlers[$hook]);
-    if ($callback_id !== false) {
-      unset($this->handlers[$hook][$callback_id]);
+
+    /**
+     * Allow a plugin object to unregister a callback.
+     *
+     * @param string $hook Hook name
+     * @param mixed  $callback String with global function name or array($obj, 'methodname')
+     */
+    public function unregister_hook($hook, $callback)
+    {
+        $callback_id = array_search($callback, $this->handlers[$hook]);
+        if ($callback_id !== false) {
+            unset($this->handlers[$hook][$callback_id]);
+        }
     }
-  }
-
-
-  /**
-   * Triggers a plugin hook.
-   * This is called from the application and executes all registered handlers
-   *
-   * @param string $hook Hook name
-   * @param array $args Named arguments (key->value pairs)
-   * @return array The (probably) altered hook arguments
-   */
-  public function exec_hook($hook, $args = array())
-  {
-    if (!is_array($args))
-      $args = array('arg' => $args);
-
-    $args += array('abort' => false);
-    $this->active_hook = $hook;
-
-    foreach ((array)$this->handlers[$hook] as $callback) {
-      $ret = call_user_func($callback, $args);
-      if ($ret && is_array($ret))
-        $args = $ret + $args;
-
-      if ($args['abort'])
-        break;
+
+    /**
+     * Triggers a plugin hook.
+     * This is called from the application and executes all registered handlers
+     *
+     * @param string $hook Hook name
+     * @param array $args Named arguments (key->value pairs)
+     *
+     * @return array The (probably) altered hook arguments
+     */
+    public function exec_hook($hook, $args = array())
+    {
+        if (!is_array($args)) {
+            $args = array('arg' => $args);
+        }
+
+        $args += array('abort' => false);
+        $this->active_hook = $hook;
+
+        foreach ((array)$this->handlers[$hook] as $callback) {
+            $ret = call_user_func($callback, $args);
+            if ($ret && is_array($ret)) {
+                $args = $ret + $args;
+            }
+
+            if ($args['abort']) {
+                break;
+            }
+        }
+
+        $this->active_hook = false;
+        return $args;
     }
 
-    $this->active_hook = false;
-    return $args;
-  }
-
-
-  /**
-   * Let a plugin register a handler for a specific request
-   *
-   * @param string $action Action name (_task=mail&_action=plugin.foo)
-   * @param string $owner Plugin name that registers this action
-   * @param mixed  $callback Callback: string with global function name or array($obj, 'methodname')
-   * @param string $task Task name registered by this plugin
-   */
-  public function register_action($action, $owner, $callback, $task = null)
-  {
-    // check action name
-    if ($task)
-      $action = $task.'.'.$action;
-    else if (strpos($action, 'plugin.') !== 0)
-      $action = 'plugin.'.$action;
-
-    // can register action only if it's not taken or registered by myself
-    if (!isset($this->actionmap[$action]) || $this->actionmap[$action] == $owner) {
-      $this->actions[$action] = $callback;
-      $this->actionmap[$action] = $owner;
+    /**
+     * Let a plugin register a handler for a specific request
+     *
+     * @param string $action   Action name (_task=mail&_action=plugin.foo)
+     * @param string $owner    Plugin name that registers this action
+     * @param mixed  $callback Callback: string with global function name or array($obj, 'methodname')
+     * @param string $task     Task name registered by this plugin
+     */
+    public function register_action($action, $owner, $callback, $task = null)
+    {
+        // check action name
+        if ($task)
+            $action = $task.'.'.$action;
+        else if (strpos($action, 'plugin.') !== 0)
+            $action = 'plugin.'.$action;
+
+        // can register action only if it's not taken or registered by myself
+        if (!isset($this->actionmap[$action]) || $this->actionmap[$action] == $owner) {
+            $this->actions[$action] = $callback;
+            $this->actionmap[$action] = $owner;
+        }
+        else {
+            rcube::raise_error(array('code' => 523, 'type' => 'php',
+                'file' => __FILE__, 'line' => __LINE__,
+                'message' => "Cannot register action $action;"
+                    ." already taken by another plugin"), true, false);
+        }
     }
-    else {
-      rcube::raise_error(array('code' => 523, 'type' => 'php',
-        'file' => __FILE__, 'line' => __LINE__,
-        'message' => "Cannot register action $action; already taken by another plugin"), true, false);
+
+    /**
+     * This method handles requests like _task=mail&_action=plugin.foo
+     * It executes the callback function that was registered with the given action.
+     *
+     * @param string $action Action name
+     */
+    public function exec_action($action)
+    {
+        if (isset($this->actions[$action])) {
+            call_user_func($this->actions[$action]);
+        }
+        else if (rcube::get_instance()->action != 'refresh') {
+            rcube::raise_error(array('code' => 524, 'type' => 'php',
+                'file' => __FILE__, 'line' => __LINE__,
+                'message' => "No handler found for action $action"), true, true);
+        }
     }
-  }
-
-
-  /**
-   * This method handles requests like _task=mail&_action=plugin.foo
-   * It executes the callback function that was registered with the given action.
-   *
-   * @param string $action Action name
-   */
-  public function exec_action($action)
-  {
-    if (isset($this->actions[$action])) {
-      call_user_func($this->actions[$action]);
+
+    /**
+     * Register a handler function for template objects
+     *
+     * @param string $name Object name
+     * @param string $owner Plugin name that registers this action
+     * @param mixed  $callback Callback: string with global function name or array($obj, 'methodname')
+     */
+    public function register_handler($name, $owner, $callback)
+    {
+        // check name
+        if (strpos($name, 'plugin.') !== 0) {
+            $name = 'plugin.' . $name;
+        }
+
+        // can register handler only if it's not taken or registered by myself
+        if (is_object($this->output)
+            && (!isset($this->objectsmap[$name]) || $this->objectsmap[$name] == $owner)
+        ) {
+            $this->output->add_handler($name, $callback);
+            $this->objectsmap[$name] = $owner;
+        }
+        else {
+            rcube::raise_error(array('code' => 525, 'type' => 'php',
+                'file' => __FILE__, 'line' => __LINE__,
+                'message' => "Cannot register template handler $name;"
+                    ." already taken by another plugin or no output object available"), true, false);
+        }
     }
-    else if (rcube::get_instance()->action != 'refresh') {
-      rcube::raise_error(array('code' => 524, 'type' => 'php',
-        'file' => __FILE__, 'line' => __LINE__,
-        'message' => "No handler found for action $action"), true, true);
+
+    /**
+     * Register this plugin to be responsible for a specific task
+     *
+     * @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)
+    {
+        // tasks are irrelevant in framework mode
+        if (!class_exists('rcmail', false)) {
+            return true;
+        }
+
+        if ($task != asciiwords($task, true)) {
+            rcube::raise_error(array('code' => 526, 'type' => 'php',
+                'file' => __FILE__, 'line' => __LINE__,
+                'message' => "Invalid task name: $task."
+                    ." Only characters [a-z0-9_.-] are allowed"), true, false);
+        }
+        else if (in_array($task, rcmail::$main_tasks)) {
+            rcube::raise_error(array('code' => 526, 'type' => 'php',
+                'file' => __FILE__, 'line' => __LINE__,
+                'message' => "Cannot register taks $task;"
+                    ." already taken by another plugin or the application itself"), true, false);
+        }
+        else {
+            $this->tasks[$task] = $owner;
+            rcmail::$main_tasks[] = $task;
+            return true;
+        }
+
+        return false;
     }
-  }
-
-
-  /**
-   * Register a handler function for template objects
-   *
-   * @param string $name Object name
-   * @param string $owner Plugin name that registers this action
-   * @param mixed  $callback Callback: string with global function name or array($obj, 'methodname')
-   */
-  public function register_handler($name, $owner, $callback)
-  {
-    // check name
-    if (strpos($name, 'plugin.') !== 0)
-      $name = 'plugin.'.$name;
-
-    // can register handler only if it's not taken or registered by myself
-    if (is_object($this->output) && (!isset($this->objectsmap[$name]) || $this->objectsmap[$name] == $owner)) {
-      $this->output->add_handler($name, $callback);
-      $this->objectsmap[$name] = $owner;
+
+    /**
+     * Checks whether the given task is registered by a plugin
+     *
+     * @param string $task Task name
+     *
+     * @return boolean True if registered, otherwise false
+     */
+    public function is_plugin_task($task)
+    {
+        return $this->tasks[$task] ? true : false;
     }
-    else {
-      rcube::raise_error(array('code' => 525, 'type' => 'php',
-        'file' => __FILE__, 'line' => __LINE__,
-        'message' => "Cannot register template handler $name; already taken by another plugin or no output object available"), true, false);
+
+    /**
+     * Check if a plugin hook is currently processing.
+     * Mainly used to prevent loops and recursion.
+     *
+     * @param string $hook Hook to check (optional)
+     *
+     * @return boolean True if any/the given hook is currently processed, otherwise false
+     */
+    public function is_processing($hook = null)
+    {
+        return $this->active_hook && (!$hook || $this->active_hook == $hook);
     }
-  }
-
-
-  /**
-   * Register this plugin to be responsible for a specific task
-   *
-   * @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)
-  {
-    // tasks are irrelevant in framework mode
-    if (!class_exists('rcmail', false))
-      return true;
-
-    if ($task != asciiwords($task)) {
-      rcube::raise_error(array('code' => 526, 'type' => 'php',
-        'file' => __FILE__, 'line' => __LINE__,
-        'message' => "Invalid task name: $task. Only characters [a-z0-9_.-] are allowed"), true, false);
+
+    /**
+     * Include a plugin script file in the current HTML page
+     *
+     * @param string $fn Path to script
+     */
+    public function include_script($fn)
+    {
+        if (is_object($this->output) && $this->output->type == 'html') {
+            $src = $this->resource_url($fn);
+            $this->output->add_header(html::tag('script',
+                array('type' => "text/javascript", 'src' => $src)));
+        }
     }
-    else if (in_array($task, rcmail::$main_tasks)) {
-      rcube::raise_error(array('code' => 526, 'type' => 'php',
-        'file' => __FILE__, 'line' => __LINE__,
-        'message' => "Cannot register taks $task; already taken by another plugin or the application itself"), true, false);
+
+    /**
+     * Include a plugin stylesheet in the current HTML page
+     *
+     * @param string $fn Path to stylesheet
+     */
+    public function include_stylesheet($fn)
+    {
+        if (is_object($this->output) && $this->output->type == 'html') {
+            $src = $this->resource_url($fn);
+            $this->output->include_css($src);
+        }
     }
-    else {
-      $this->tasks[$task] = $owner;
-      rcmail::$main_tasks[] = $task;
-      return true;
+
+    /**
+     * Save the given HTML content to be added to a template container
+     *
+     * @param string $html HTML content
+     * @param string $container Template container identifier
+     */
+    public function add_content($html, $container)
+    {
+        $this->template_contents[$container] .= $html . "\n";
     }
 
-    return false;
-  }
-
-
-  /**
-   * Checks whether the given task is registered by a plugin
-   *
-   * @param string $task Task name
-   * @return boolean True if registered, otherwise false
-   */
-  public function is_plugin_task($task)
-  {
-    return $this->tasks[$task] ? true : false;
-  }
-
-
-  /**
-   * Check if a plugin hook is currently processing.
-   * Mainly used to prevent loops and recursion.
-   *
-   * @param string $hook Hook to check (optional)
-   * @return boolean True if any/the given hook is currently processed, otherwise false
-   */
-  public function is_processing($hook = null)
-  {
-    return $this->active_hook && (!$hook || $this->active_hook == $hook);
-  }
-
-  /**
-   * Include a plugin script file in the current HTML page
-   *
-   * @param string $fn Path to script
-   */
-  public function include_script($fn)
-  {
-    if (is_object($this->output) && $this->output->type == 'html') {
-      $src = $this->resource_url($fn);
-      $this->output->add_header(html::tag('script', array('type' => "text/javascript", 'src' => $src)));
+    /**
+     * Returns list of loaded plugins names
+     *
+     * @return array List of plugin names
+     */
+    public function loaded_plugins()
+    {
+        return array_keys($this->plugins);
     }
-  }
-
-
-  /**
-   * Include a plugin stylesheet in the current HTML page
-   *
-   * @param string $fn Path to stylesheet
-   */
-  public function include_stylesheet($fn)
-  {
-    if (is_object($this->output) && $this->output->type == 'html') {
-      $src = $this->resource_url($fn);
-      $this->output->include_css($src);
+
+    /**
+     * Callback for template_container hooks
+     *
+     * @param array $attrib
+     * @return array
+     */
+    protected function template_container_hook($attrib)
+    {
+        $container = $attrib['name'];
+        return array('content' => $attrib['content'] . $this->template_contents[$container]);
     }
-  }
-
-
-  /**
-   * Save the given HTML content to be added to a template container
-   *
-   * @param string $html HTML content
-   * @param string $container Template container identifier
-   */
-  public function add_content($html, $container)
-  {
-    $this->template_contents[$container] .= $html . "\n";
-  }
-
-
-  /**
-   * Returns list of loaded plugins names
-   *
-   * @return array List of plugin names
-   */
-  public function loaded_plugins()
-  {
-    return array_keys($this->plugins);
-  }
-
-
-  /**
-   * Callback for template_container hooks
-   *
-   * @param array $attrib
-   * @return array
-   */
-  protected function template_container_hook($attrib)
-  {
-    $container = $attrib['name'];
-    return array('content' => $attrib['content'] . $this->template_contents[$container]);
-  }
-
-
-  /**
-   * Make the given file name link into the plugins directory
-   *
-   * @param string $fn Filename
-   * @return string 
-   */
-  protected function resource_url($fn)
-  {
-    if ($fn[0] != '/' && !preg_match('|^https?://|i', $fn))
-      return $this->url . $fn;
-    else
-      return $fn;
-  }
 
+    /**
+     * Make the given file name link into the plugins directory
+     *
+     * @param string $fn Filename
+     * @return string
+     */
+    protected function resource_url($fn)
+    {
+        if ($fn[0] != '/' && !preg_match('|^https?://|i', $fn))
+            return $this->url . $fn;
+        else
+            return $fn;
+    }
 }
diff --git a/program/lib/Roundcube/rcube_result_index.php b/program/lib/Roundcube/rcube_result_index.php
index 4d1ae13b6..5f592c54f 100644
--- a/program/lib/Roundcube/rcube_result_index.php
+++ b/program/lib/Roundcube/rcube_result_index.php
@@ -2,8 +2,6 @@
 
 /*
  +-----------------------------------------------------------------------+
- | program/include/rcube_result_index.php                                |
- |                                                                       |
  | This file is part of the Roundcube Webmail client                     |
  | Copyright (C) 2005-2011, The Roundcube Dev Team                       |
  | Copyright (C) 2011, Kolab Systems AG                                  |
@@ -14,14 +12,12 @@
  |                                                                       |
  | PURPOSE:                                                              |
  |   SORT/SEARCH/ESEARCH response handler                                |
- |                                                                       |
  +-----------------------------------------------------------------------+
  | Author: Thomas Bruederli <roundcube@gmail.com>                        |
  | Author: Aleksander Machniak <alec@alec.pl>                            |
  +-----------------------------------------------------------------------+
 */
 
-
 /**
  * Class for accessing IMAP's SORT/SEARCH/ESEARCH result
  *
diff --git a/program/lib/Roundcube/rcube_result_set.php b/program/lib/Roundcube/rcube_result_set.php
index 456d1c9d6..a4b070e28 100644
--- a/program/lib/Roundcube/rcube_result_set.php
+++ b/program/lib/Roundcube/rcube_result_set.php
@@ -2,10 +2,8 @@
 
 /*
  +-----------------------------------------------------------------------+
- | program/include/rcube_result_set.php                                  |
- |                                                                       |
  | 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.                |
@@ -13,28 +11,28 @@
  |                                                                       |
  | PURPOSE:                                                              |
  |   Class representing an address directory result set                  |
- |                                                                       |
  +-----------------------------------------------------------------------+
  | Author: Thomas Bruederli <roundcube@gmail.com>                        |
  +-----------------------------------------------------------------------+
 */
 
-
 /**
- * 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)
     {
@@ -55,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_result_thread.php b/program/lib/Roundcube/rcube_result_thread.php
index c609bdc39..7657550be 100644
--- a/program/lib/Roundcube/rcube_result_thread.php
+++ b/program/lib/Roundcube/rcube_result_thread.php
@@ -2,8 +2,6 @@
 
 /*
  +-----------------------------------------------------------------------+
- | program/include/rcube_result_thread.php                               |
- |                                                                       |
  | This file is part of the Roundcube Webmail client                     |
  | Copyright (C) 2005-2011, The Roundcube Dev Team                       |
  | Copyright (C) 2011, Kolab Systems AG                                  |
@@ -14,14 +12,12 @@
  |                                                                       |
  | PURPOSE:                                                              |
  |   THREAD response handler                                             |
- |                                                                       |
  +-----------------------------------------------------------------------+
  | Author: Thomas Bruederli <roundcube@gmail.com>                        |
  | Author: Aleksander Machniak <alec@alec.pl>                            |
  +-----------------------------------------------------------------------+
 */
 
-
 /**
  * Class for accessing IMAP's THREAD result
  *
diff --git a/program/lib/Roundcube/rcube_session.php b/program/lib/Roundcube/rcube_session.php
index fdbf668ca..dedde2284 100644
--- a/program/lib/Roundcube/rcube_session.php
+++ b/program/lib/Roundcube/rcube_session.php
@@ -2,8 +2,6 @@
 
 /*
  +-----------------------------------------------------------------------+
- | program/include/rcube_session.php                                     |
- |                                                                       |
  | This file is part of the Roundcube Webmail client                     |
  | Copyright (C) 2005-2012, The Roundcube Dev Team                       |
  | Copyright (C) 2011, Kolab Systems AG                                  |
@@ -14,7 +12,6 @@
  |                                                                       |
  | PURPOSE:                                                              |
  |   Provide database supported session management                       |
- |                                                                       |
  +-----------------------------------------------------------------------+
  | Author: Thomas Bruederli <roundcube@gmail.com>                        |
  | Author: Aleksander Machniak <alec@alec.pl>                            |
@@ -31,602 +28,689 @@
  */
 class rcube_session
 {
-  private $db;
-  private $ip;
-  private $start;
-  private $changed;
-  private $unsets = array();
-  private $gc_handlers = array();
-  private $cookiename = 'roundcube_sessauth';
-  private $vars;
-  private $key;
-  private $now;
-  private $secret = '';
-  private $ip_check = false;
-  private $logging = false;
-  private $memcache;
-
-  /**
-   * Default constructor
-   */
-  public function __construct($db, $config)
-  {
-    $this->db      = $db;
-    $this->start   = microtime(true);
-    $this->ip      = $_SERVER['REMOTE_ADDR'];
-    $this->logging = $config->get('log_session', false);
-
-    $lifetime = $config->get('session_lifetime', 1) * 60;
-    $this->set_lifetime($lifetime);
-
-    // use memcache backend
-    if ($config->get('session_storage', 'db') == 'memcache') {
-      $this->memcache = rcube::get_instance()->get_memcache();
-
-      // set custom functions for PHP session management if memcache is available
-      if ($this->memcache) {
-        session_set_save_handler(
-          array($this, 'open'),
-          array($this, 'close'),
-          array($this, 'mc_read'),
-          array($this, 'mc_write'),
-          array($this, 'mc_destroy'),
-          array($this, 'gc'));
-      }
-      else {
-        rcube::raise_error(array('code' => 604, 'type' => 'db',
-          'line' => __LINE__, 'file' => __FILE__,
-          'message' => "Failed to connect to memcached. Please check configuration"),
-          true, true);
-      }
+    private $db;
+    private $ip;
+    private $start;
+    private $changed;
+    private $reloaded = false;
+    private $unsets = array();
+    private $gc_handlers = array();
+    private $cookiename = 'roundcube_sessauth';
+    private $vars;
+    private $key;
+    private $now;
+    private $secret = '';
+    private $ip_check = false;
+    private $logging = false;
+    private $memcache;
+
+
+    /**
+     * Default constructor
+     */
+    public function __construct($db, $config)
+    {
+        $this->db      = $db;
+        $this->start   = microtime(true);
+        $this->ip      = $_SERVER['REMOTE_ADDR'];
+        $this->logging = $config->get('log_session', false);
+
+        $lifetime = $config->get('session_lifetime', 1) * 60;
+        $this->set_lifetime($lifetime);
+
+        // use memcache backend
+        if ($config->get('session_storage', 'db') == 'memcache') {
+            $this->memcache = rcube::get_instance()->get_memcache();
+
+            // set custom functions for PHP session management if memcache is available
+            if ($this->memcache) {
+                session_set_save_handler(
+                    array($this, 'open'),
+                    array($this, 'close'),
+                    array($this, 'mc_read'),
+                    array($this, 'mc_write'),
+                    array($this, 'mc_destroy'),
+                    array($this, 'gc'));
+            }
+            else {
+                rcube::raise_error(array('code' => 604, 'type' => 'db',
+                    'line' => __LINE__, 'file' => __FILE__,
+                    'message' => "Failed to connect to memcached. Please check configuration"),
+                true, true);
+            }
+        }
+        else {
+            // set custom functions for PHP session management
+            session_set_save_handler(
+                array($this, 'open'),
+                array($this, 'close'),
+                array($this, 'db_read'),
+                array($this, 'db_write'),
+                array($this, 'db_destroy'),
+                array($this, 'db_gc'));
+        }
     }
-    else {
-      // set custom functions for PHP session management
-      session_set_save_handler(
-        array($this, 'open'),
-        array($this, 'close'),
-        array($this, 'db_read'),
-        array($this, 'db_write'),
-        array($this, 'db_destroy'),
-        array($this, 'db_gc'));
-      }
-  }
-
-
-  public function open($save_path, $session_name)
-  {
-    return true;
-  }
-
-
-  public function close()
-  {
-    return true;
-  }
-
-
-  /**
-   * Delete session data for the given key
-   *
-   * @param string Session ID
-   */
-  public function destroy($key)
-  {
-    return $this->memcache ? $this->mc_destroy($key) : $this->db_destroy($key);
-  }
-
-
-  /**
-   * Read session data from database
-   *
-   * @param string Session ID
-   * @return string Session vars
-   */
-  public function db_read($key)
-  {
-    $sql_result = $this->db->query(
-      "SELECT vars, ip, changed 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;
-
-      return !empty($this->vars) ? (string) $this->vars : '';
+
+
+    public function open($save_path, $session_name)
+    {
+        return true;
     }
 
-    return null;
-  }
-
-
-  /**
-   * Save session data.
-   * handler for session_read()
-   *
-   * @param string Session ID
-   * @param string Serialized session vars
-   * @return boolean True on success
-   */
-  public function db_write($key, $vars)
-  {
-    $ts = microtime(true);
-    $now = $this->db->fromunixtime((int)$ts);
-
-    // no session row in DB (db_read() returns false)
-    if (!$this->key) {
-      $oldvars = null;
+
+    public function close()
+    {
+        return true;
     }
-    // use internal data from read() for fast requests (up to 0.5 sec.)
-    else if ($key == $this->key && (!$this->vars || $ts - $this->start < 0.5)) {
-      $oldvars = $this->vars;
+
+
+    /**
+     * Delete session data for the given key
+     *
+     * @param string Session ID
+     */
+    public function destroy($key)
+    {
+        return $this->memcache ? $this->mc_destroy($key) : $this->db_destroy($key);
     }
-    else { // else read data again from DB
-      $oldvars = $this->db_read($key);
+
+
+    /**
+     * Read session data from database
+     *
+     * @param string Session ID
+     *
+     * @return string Session vars
+     */
+    public function db_read($key)
+    {
+        $sql_result = $this->db->query(
+            "SELECT vars, ip, changed 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;
+
+            return !empty($this->vars) ? (string) $this->vars : '';
+        }
+
+        return null;
     }
 
-    if ($oldvars !== null) {
-      $newvars = $this->_fixvars($vars, $oldvars);
 
-      if ($newvars !== $oldvars) {
+    /**
+     * Save session data.
+     * handler for session_read()
+     *
+     * @param string Session ID
+     * @param string Serialized session vars
+     *
+     * @return boolean True on success
+     */
+    public function db_write($key, $vars)
+    {
+        $ts  = microtime(true);
+        $now = $this->db->fromunixtime((int)$ts);
+
+        // no session row in DB (db_read() returns false)
+        if (!$this->key) {
+            $oldvars = null;
+        }
+        // use internal data from read() for fast requests (up to 0.5 sec.)
+        else if ($key == $this->key && (!$this->vars || $ts - $this->start < 0.5)) {
+            $oldvars = $this->vars;
+        }
+        else { // else read data again from DB
+            $oldvars = $this->db_read($key);
+        }
+
+        if ($oldvars !== null) {
+            $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);
+            }
+            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 {
+            $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);
+        }
+
+        return true;
+    }
+
+
+    /**
+     * Merge vars with old vars and apply unsets
+     */
+    private function _fixvars($vars, $oldvars)
+    {
+        if ($oldvars !== null) {
+            $a_oldvars = $this->unserialize($oldvars);
+            if (is_array($a_oldvars)) {
+                // 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)));
+            }
+            else {
+                $newvars = $vars;
+            }
+        }
+
+        $this->unsets = array();
+        return $newvars;
+    }
+
+
+    /**
+     * Handler for session_destroy()
+     *
+     * @param string Session ID
+     *
+     * @return boolean True on success
+     */
+    public function db_destroy($key)
+    {
+        if ($key) {
+            $this->db->query(sprintf("DELETE FROM %s WHERE sess_id = ?",
+                $this->db->table_name('session')), $key);
+        }
+
+        return true;
+    }
+
+
+    /**
+     * 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("UPDATE %s SET vars=?, changed=%s WHERE sess_id=?",
-            $this->db->table_name('session'), $now),
-          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);
-      }
+            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
+     * @return string Session vars
+     */
+    public function mc_read($key)
+    {
+        if ($value = $this->memcache->get($key)) {
+            $arr = unserialize($value);
+            $this->changed = $arr['changed'];
+            $this->ip      = $arr['ip'];
+            $this->vars    = $arr['vars'];
+            $this->key     = $key;
+
+            return !empty($this->vars) ? (string) $this->vars : '';
+        }
+
+        return null;
+    }
+
+
+    /**
+     * Save session data.
+     * handler for session_read()
+     *
+     * @param string Session ID
+     * @param string Serialized session vars
+     *
+     * @return boolean True on success
+     */
+    public function mc_write($key, $vars)
+    {
+        $ts = microtime(true);
+
+        // no session data in cache (mc_read() returns false)
+        if (!$this->key)
+            $oldvars = null;
+        // use internal data for fast requests (up to 0.5 sec.)
+        else if ($key == $this->key && (!$this->vars || $ts - $this->start < 0.5))
+            $oldvars = $this->vars;
+        else // else read data again
+            $oldvars = $this->mc_read($key);
+
+        $newvars = $oldvars !== null ? $this->_fixvars($vars, $oldvars) : $vars;
+
+        if ($newvars !== $oldvars || $ts - $this->changed > $this->lifetime / 2) {
+            return $this->memcache->set($key, serialize(array('changed' => time(), 'ip' => $this->ip, 'vars' => $newvars)),
+                MEMCACHE_COMPRESSED, $this->lifetime);
+        }
+
+        return true;
+    }
+
+
+    /**
+     * Handler for session_destroy() with memcache backend
+     *
+     * @param string Session ID
+     *
+     * @return boolean True on success
+     */
+    public function mc_destroy($key)
+    {
+        if ($key) {
+            // #1488592: use 2nd argument
+            $this->memcache->delete($key, 0);
+        }
+
+        return true;
+    }
+
+
+    /**
+     * Execute registered garbage collector routines
+     */
+    public function gc()
+    {
+        foreach ($this->gc_handlers as $fct) {
+            call_user_func($fct);
+        }
+    }
+
+
+    /**
+     * Register additional garbage collector functions
+     *
+     * @param mixed Callback function
+     */
+    public function register_gc_handler($func)
+    {
+        foreach ($this->gc_handlers as $handler) {
+            if ($handler == $func) {
+                return;
+            }
+        }
+
+        $this->gc_handlers[] = $func;
     }
-    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);
+
+
+    /**
+     * Generate and set new session id
+     *
+     * @param boolean $destroy If enabled the current session will be destroyed
+     */
+    public function regenerate_id($destroy=true)
+    {
+        session_regenerate_id($destroy);
+
+        $this->vars = null;
+        $this->key  = session_id();
+
+        return true;
     }
 
-    return true;
-  }
-
-
-  /**
-   * Merge vars with old vars and apply unsets
-   */
-  private function _fixvars($vars, $oldvars)
-  {
-    if ($oldvars !== null) {
-      $a_oldvars = $this->unserialize($oldvars);
-      if (is_array($a_oldvars)) {
-        foreach ((array)$this->unsets as $k)
-          unset($a_oldvars[$k]);
-
-        $newvars = $this->serialize(array_merge(
-          (array)$a_oldvars, (array)$this->unserialize($vars)));
-      }
-      else
-        $newvars = $vars;
+
+    /**
+     * 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;
     }
 
-    $this->unsets = array();
-    return $newvars;
-  }
-
-
-  /**
-   * Handler for session_destroy()
-   *
-   * @param string Session ID
-   *
-   * @return boolean True on success
-   */
-  public function db_destroy($key)
-  {
-    if ($key) {
-      $this->db->query(sprintf("DELETE FROM %s WHERE sess_id = ?", $this->db->table_name('session')), $key);
+
+    /**
+     * Unset a session variable
+     *
+     * @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)
+    {
+        if (empty($var)) {
+            return $this->destroy(session_id());
+        }
+
+        $this->unsets[] = $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;
     }
 
-    return true;
-  }
-
-
-  /**
-   * 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
-   * @return string Session vars
-   */
-  public function mc_read($key)
-  {
-    if ($value = $this->memcache->get($key)) {
-      $arr = unserialize($value);
-      $this->changed = $arr['changed'];
-      $this->ip      = $arr['ip'];
-      $this->vars    = $arr['vars'];
-      $this->key     = $key;
-
-      return !empty($this->vars) ? (string) $this->vars : '';
+
+    /**
+     * Kill this session
+     */
+    public function kill()
+    {
+        $this->vars = null;
+        $this->ip = $_SERVER['REMOTE_ADDR']; // update IP (might have changed)
+        $this->destroy(session_id());
+        rcube_utils::setcookie($this->cookiename, '-del-', time() - 60);
     }
 
-    return null;
-  }
-
-
-  /**
-   * Save session data.
-   * handler for session_read()
-   *
-   * @param string Session ID
-   * @param string Serialized session vars
-   * @return boolean True on success
-   */
-  public function mc_write($key, $vars)
-  {
-    $ts = microtime(true);
-
-    // no session data in cache (mc_read() returns false)
-    if (!$this->key)
-      $oldvars = null;
-    // use internal data for fast requests (up to 0.5 sec.)
-    else if ($key == $this->key && (!$this->vars || $ts - $this->start < 0.5))
-      $oldvars = $this->vars;
-    else // else read data again
-      $oldvars = $this->mc_read($key);
-
-    $newvars = $oldvars !== null ? $this->_fixvars($vars, $oldvars) : $vars;
-
-    if ($newvars !== $oldvars || $ts - $this->changed > $this->lifetime / 2)
-      return $this->memcache->set($key, serialize(array('changed' => time(), 'ip' => $this->ip, 'vars' => $newvars)), MEMCACHE_COMPRESSED, $this->lifetime);
-
-    return true;
-  }
-
-
-  /**
-   * Handler for session_destroy() with memcache backend
-   *
-   * @param string Session ID
-   *
-   * @return boolean True on success
-   */
-  public function mc_destroy($key)
-  {
-    if ($key) {
-      // #1488592: use 2nd argument
-      $this->memcache->delete($key, 0);
+
+    /**
+     * Re-read session data from storage backend
+     */
+    public function reload()
+    {
+        if ($this->key && $this->memcache)
+            $data = $this->mc_read($this->key);
+        else if ($this->key)
+            $data = $this->db_read($this->key);
+
+        if ($data)
+            session_decode($data);
     }
 
-    return true;
-  }
+    /**
+     * 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
+     */
+    private function serialize($vars)
+    {
+        $data = '';
+        if (is_array($vars)) {
+            foreach ($vars as $var=>$value)
+                $data .= $var.'|'.serialize($value);
+        }
+        else {
+            $data = 'b:0;';
+        }
 
-  /**
-   * Execute registered garbage collector routines
-   */
-  public function gc()
-  {
-    foreach ($this->gc_handlers as $fct) {
-      call_user_func($fct);
+        return $data;
     }
-  }
-
-
-  /**
-   * Register additional garbage collector functions
-   *
-   * @param mixed Callback function
-   */
-  public function register_gc_handler($func)
-  {
-    foreach ($this->gc_handlers as $handler) {
-      if ($handler == $func) {
-        return;
-      }
+
+
+    /**
+     * Unserialize session data
+     * http://www.php.net/manual/en/function.session-decode.php#56106
+     */
+    private function unserialize($str)
+    {
+        $str    = (string)$str;
+        $endptr = strlen($str);
+        $p      = 0;
+
+        $serialized = '';
+        $items      = 0;
+        $level      = 0;
+
+        while ($p < $endptr) {
+            $q = $p;
+            while ($str[$q] != '|')
+                if (++$q >= $endptr)
+                    break 2;
+
+            if ($str[$p] == '!') {
+                $p++;
+                $has_value = false;
+            }
+            else {
+                $has_value = true;
+            }
+
+            $name = substr($str, $p, $q - $p);
+            $q++;
+
+            $serialized .= 's:' . strlen($name) . ':"' . $name . '";';
+
+            if ($has_value) {
+                for (;;) {
+                    $p = $q;
+                    switch (strtolower($str[$q])) {
+                    case 'n': // null
+                    case 'b': // boolean
+                    case 'i': // integer
+                    case 'd': // decimal
+                        do $q++;
+                        while ( ($q < $endptr) && ($str[$q] != ';') );
+                        $q++;
+                        $serialized .= substr($str, $p, $q - $p);
+                        if ($level == 0)
+                            break 2;
+                        break;
+                    case 'r': // reference
+                        $q+= 2;
+                        for ($id = ''; ($q < $endptr) && ($str[$q] != ';'); $q++)
+                            $id .= $str[$q];
+                        $q++;
+                        // increment pointer because of outer array
+                        $serialized .= 'R:' . ($id + 1) . ';';
+                        if ($level == 0)
+                            break 2;
+                        break;
+                    case 's': // string
+                        $q+=2;
+                        for ($length=''; ($q < $endptr) && ($str[$q] != ':'); $q++)
+                            $length .= $str[$q];
+                        $q+=2;
+                        $q+= (int)$length + 2;
+                        $serialized .= substr($str, $p, $q - $p);
+                        if ($level == 0)
+                            break 2;
+                        break;
+                    case 'a': // array
+                    case 'o': // object
+                        do $q++;
+                        while ($q < $endptr && $str[$q] != '{');
+                        $q++;
+                        $level++;
+                        $serialized .= substr($str, $p, $q - $p);
+                        break;
+                    case '}': // end of array|object
+                        $q++;
+                        $serialized .= substr($str, $p, $q - $p);
+                        if (--$level == 0)
+                            break 2;
+                        break;
+                    default:
+                        return false;
+                    }
+                }
+            }
+            else {
+                $serialized .= 'N;';
+                $q += 2;
+            }
+            $items++;
+            $p = $q;
+        }
+
+        return unserialize( 'a:' . $items . ':{' . $serialized . '}' );
     }
 
-    $this->gc_handlers[] = $func;
-  }
-
-
-  /**
-   * Generate and set new session id
-   *
-   * @param boolean $destroy If enabled the current session will be destroyed
-   */
-  public function regenerate_id($destroy=true)
-  {
-    session_regenerate_id($destroy);
-
-    $this->vars = null;
-    $this->key  = session_id();
-
-    return true;
-  }
-
-
-  /**
-   * Unset a session variable
-   *
-   * @param string Varibale name
-   * @return boolean True on success
-   */
-  public function remove($var=null)
-  {
-    if (empty($var))
-      return $this->destroy(session_id());
-
-    $this->unsets[] = $var;
-    unset($_SESSION[$var]);
-
-    return true;
-  }
-
-
-  /**
-   * Kill this session
-   */
-  public function kill()
-  {
-    $this->vars = null;
-    $this->ip = $_SERVER['REMOTE_ADDR']; // update IP (might have changed)
-    $this->destroy(session_id());
-    rcube_utils::setcookie($this->cookiename, '-del-', time() - 60);
-  }
-
-
-  /**
-   * Re-read session data from storage backend
-   */
-  public function reload()
-  {
-    if ($this->key && $this->memcache)
-      $data = $this->mc_read($this->key);
-    else if ($this->key)
-      $data = $this->db_read($this->key);
-
-    if ($data)
-     session_decode($data);
-  }
-
-
-  /**
-   * Serialize session data
-   */
-  private function serialize($vars)
-  {
-    $data = '';
-    if (is_array($vars))
-      foreach ($vars as $var=>$value)
-        $data .= $var.'|'.serialize($value);
-    else
-      $data = 'b:0;';
-    return $data;
-  }
-
-
-  /**
-   * Unserialize session data
-   * http://www.php.net/manual/en/function.session-decode.php#56106
-   */
-  private function unserialize($str)
-  {
-    $str = (string)$str;
-    $endptr = strlen($str);
-    $p = 0;
-
-    $serialized = '';
-    $items = 0;
-    $level = 0;
-
-    while ($p < $endptr) {
-      $q = $p;
-      while ($str[$q] != '|')
-        if (++$q >= $endptr) break 2;
-
-      if ($str[$p] == '!') {
-        $p++;
-        $has_value = false;
-      } else {
-        $has_value = true;
-      }
-
-      $name = substr($str, $p, $q - $p);
-      $q++;
-
-      $serialized .= 's:' . strlen($name) . ':"' . $name . '";';
-
-      if ($has_value) {
-        for (;;) {
-          $p = $q;
-          switch (strtolower($str[$q])) {
-            case 'n': /* null */
-            case 'b': /* boolean */
-            case 'i': /* integer */
-            case 'd': /* decimal */
-              do $q++;
-              while ( ($q < $endptr) && ($str[$q] != ';') );
-              $q++;
-              $serialized .= substr($str, $p, $q - $p);
-              if ($level == 0) break 2;
-              break;
-            case 'r': /* reference  */
-              $q+= 2;
-              for ($id = ''; ($q < $endptr) && ($str[$q] != ';'); $q++) $id .= $str[$q];
-              $q++;
-              $serialized .= 'R:' . ($id + 1) . ';'; /* increment pointer because of outer array */
-              if ($level == 0) break 2;
-              break;
-            case 's': /* string */
-              $q+=2;
-              for ($length=''; ($q < $endptr) && ($str[$q] != ':'); $q++) $length .= $str[$q];
-              $q+=2;
-              $q+= (int)$length + 2;
-              $serialized .= substr($str, $p, $q - $p);
-              if ($level == 0) break 2;
-              break;
-            case 'a': /* array */
-            case 'o': /* object */
-              do $q++;
-              while ( ($q < $endptr) && ($str[$q] != '{') );
-              $q++;
-              $level++;
-              $serialized .= substr($str, $p, $q - $p);
-              break;
-            case '}': /* end of array|object */
-              $q++;
-              $serialized .= substr($str, $p, $q - $p);
-              if (--$level == 0) break 2;
-              break;
-            default:
-              return false;
-          }
+
+    /**
+     * Setter for session lifetime
+     */
+    public function set_lifetime($lifetime)
+    {
+        $this->lifetime = max(120, $lifetime);
+
+        // valid time range is now - 1/2 lifetime to now + 1/2 lifetime
+        $now = time();
+        $this->now = $now - ($now % ($this->lifetime / 2));
+    }
+
+
+    /**
+     * Getter for remote IP saved with this session
+     */
+    public function get_ip()
+    {
+        return $this->ip;
+    }
+
+
+    /**
+     * Setter for cookie encryption secret
+     */
+    function set_secret($secret)
+    {
+        $this->secret = $secret;
+    }
+
+
+    /**
+     * Enable/disable IP check
+     */
+    function set_ip_check($check)
+    {
+        $this->ip_check = $check;
+    }
+
+
+    /**
+     * Setter for the cookie name used for session cookie
+     */
+    function set_cookiename($cookiename)
+    {
+        if ($cookiename) {
+            $this->cookiename = $cookiename;
         }
-      } else {
-        $serialized .= 'N;';
-        $q += 2;
-      }
-      $items++;
-      $p = $q;
     }
 
-    return unserialize( 'a:' . $items . ':{' . $serialized . '}' );
-  }
-
-
-  /**
-   * Setter for session lifetime
-   */
-  public function set_lifetime($lifetime)
-  {
-      $this->lifetime = max(120, $lifetime);
-
-      // valid time range is now - 1/2 lifetime to now + 1/2 lifetime
-      $now = time();
-      $this->now = $now - ($now % ($this->lifetime / 2));
-  }
-
-
-  /**
-   * Getter for remote IP saved with this session
-   */
-  public function get_ip()
-  {
-    return $this->ip;
-  }
-
-
-  /**
-   * Setter for cookie encryption secret
-   */
-  function set_secret($secret)
-  {
-    $this->secret = $secret;
-  }
-
-
-  /**
-   * Enable/disable IP check
-   */
-  function set_ip_check($check)
-  {
-    $this->ip_check = $check;
-  }
-
-
-  /**
-   * Setter for the cookie name used for session cookie
-   */
-  function set_cookiename($cookiename)
-  {
-    if ($cookiename)
-      $this->cookiename = $cookiename;
-  }
-
-
-  /**
-   * Check session authentication cookie
-   *
-   * @return boolean True if valid, False if not
-   */
-  function check_auth()
-  {
-    $this->cookie = $_COOKIE[$this->cookiename];
-    $result = $this->ip_check ? $_SERVER['REMOTE_ADDR'] == $this->ip : true;
-
-    if (!$result)
-      $this->log("IP check failed for " . $this->key . "; expected " . $this->ip . "; got " . $_SERVER['REMOTE_ADDR']);
-
-    if ($result && $this->_mkcookie($this->now) != $this->cookie) {
-      $this->log("Session auth check failed for " . $this->key . "; timeslot = " . date('Y-m-d H:i:s', $this->now));
-      $result = false;
-
-      // Check if using id from a previous time slot
-      for ($i = 1; $i <= 2; $i++) {
-        $prev = $this->now - ($this->lifetime / 2) * $i;
-        if ($this->_mkcookie($prev) == $this->cookie) {
-          $this->log("Send new auth cookie for " . $this->key . ": " . $this->cookie);
-          $this->set_auth_cookie();
-          $result = true;
+
+    /**
+     * Check session authentication cookie
+     *
+     * @return boolean True if valid, False if not
+     */
+    function check_auth()
+    {
+        $this->cookie = $_COOKIE[$this->cookiename];
+        $result = $this->ip_check ? $_SERVER['REMOTE_ADDR'] == $this->ip : true;
+
+        if (!$result) {
+            $this->log("IP check failed for " . $this->key . "; expected " . $this->ip . "; got " . $_SERVER['REMOTE_ADDR']);
+        }
+
+        if ($result && $this->_mkcookie($this->now) != $this->cookie) {
+            $this->log("Session auth check failed for " . $this->key . "; timeslot = " . date('Y-m-d H:i:s', $this->now));
+            $result = false;
+
+            // Check if using id from a previous time slot
+            for ($i = 1; $i <= 2; $i++) {
+                $prev = $this->now - ($this->lifetime / 2) * $i;
+                if ($this->_mkcookie($prev) == $this->cookie) {
+                    $this->log("Send new auth cookie for " . $this->key . ": " . $this->cookie);
+                    $this->set_auth_cookie();
+                    $result = true;
+                }
+            }
         }
-      }
+
+        if (!$result) {
+            $this->log("Session authentication failed for " . $this->key
+                . "; invalid auth cookie sent; timeslot = " . date('Y-m-d H:i:s', $prev));
+        }
+
+        return $result;
     }
 
-    if (!$result)
-      $this->log("Session authentication failed for " . $this->key . "; invalid auth cookie sent; timeslot = " . date('Y-m-d H:i:s', $prev));
-
-    return $result;
-  }
-
-
-  /**
-   * Set session authentication cookie
-   */
-  function set_auth_cookie()
-  {
-    $this->cookie = $this->_mkcookie($this->now);
-    rcube_utils::setcookie($this->cookiename, $this->cookie, 0);
-    $_COOKIE[$this->cookiename] = $this->cookie;
-  }
-
-
-  /**
-   * Create session cookie from session data
-   *
-   * @param int Time slot to use
-   */
-  function _mkcookie($timeslot)
-  {
-    $auth_string = "$this->key,$this->secret,$timeslot";
-    return "S" . (function_exists('sha1') ? sha1($auth_string) : md5($auth_string));
-  }
-
-  /**
-   * Writes debug information to the log
-   */
-  function log($line)
-  {
-    if ($this->logging)
-      rcube::write_log('session', $line);
-  }
 
+    /**
+     * Set session authentication cookie
+     */
+    function set_auth_cookie()
+    {
+        $this->cookie = $this->_mkcookie($this->now);
+        rcube_utils::setcookie($this->cookiename, $this->cookie, 0);
+        $_COOKIE[$this->cookiename] = $this->cookie;
+    }
+
+
+    /**
+     * Create session cookie from session data
+     *
+     * @param int Time slot to use
+     */
+    function _mkcookie($timeslot)
+    {
+        $auth_string = "$this->key,$this->secret,$timeslot";
+        return "S" . (function_exists('sha1') ? sha1($auth_string) : md5($auth_string));
+    }
+
+    /**
+     * Writes debug information to the log
+     */
+    function log($line)
+    {
+        if ($this->logging) {
+            rcube::write_log('session', $line);
+        }
+    }
 }
diff --git a/program/lib/Roundcube/rcube_smtp.php b/program/lib/Roundcube/rcube_smtp.php
index 96534c0b8..5c7d2203c 100644
--- a/program/lib/Roundcube/rcube_smtp.php
+++ b/program/lib/Roundcube/rcube_smtp.php
@@ -2,10 +2,8 @@
 
 /*
  +-----------------------------------------------------------------------+
- | program/include/rcube_smtp.php                                        |
- |                                                                       |
  | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2005-2010, The Roundcube Dev Team                       |
+ | Copyright (C) 2005-2012, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -13,15 +11,11 @@
  |                                                                       |
  | PURPOSE:                                                              |
  |   Provide SMTP functionality using socket connections                 |
- |                                                                       |
  +-----------------------------------------------------------------------+
  | Author: Thomas Bruederli <roundcube@gmail.com>                        |
  +-----------------------------------------------------------------------+
 */
 
-// define headers delimiter
-define('SMTP_MIME_CRLF', "\r\n");
-
 /**
  * Class to provide SMTP functionality using PEAR Net_SMTP
  *
@@ -32,439 +26,425 @@ define('SMTP_MIME_CRLF', "\r\n");
  */
 class rcube_smtp
 {
-
-  private $conn = null;
-  private $response;
-  private $error;
-
-
-  /**
-   * SMTP Connection and authentication
-   *
-   * @param string Server host
-   * @param string Server port
-   * @param string User name
-   * @param string Password
-   *
-   * @return bool  Returns true on success, or false on error
-   */
-  public function connect($host=null, $port=null, $user=null, $pass=null)
-  {
-    $rcube = rcube::get_instance();
-
-    // disconnect/destroy $this->conn
-    $this->disconnect();
-
-    // reset error/response var
-    $this->error = $this->response = null;
-
-    // let plugins alter smtp connection config
-    $CONFIG = $rcube->plugins->exec_hook('smtp_connect', array(
-      'smtp_server'    => $host ? $host : $rcube->config->get('smtp_server'),
-      'smtp_port'      => $port ? $port : $rcube->config->get('smtp_port', 25),
-      'smtp_user'      => $user ? $user : $rcube->config->get('smtp_user'),
-      'smtp_pass'      => $pass ? $pass : $rcube->config->get('smtp_pass'),
-      'smtp_auth_cid'  => $rcube->config->get('smtp_auth_cid'),
-      'smtp_auth_pw'   => $rcube->config->get('smtp_auth_pw'),
-      'smtp_auth_type' => $rcube->config->get('smtp_auth_type'),
-      'smtp_helo_host' => $rcube->config->get('smtp_helo_host'),
-      'smtp_timeout'   => $rcube->config->get('smtp_timeout'),
-      'smtp_auth_callbacks' => array(),
-    ));
-
-    $smtp_host = rcube_utils::parse_host($CONFIG['smtp_server']);
-    // when called from Installer it's possible to have empty $smtp_host here
-    if (!$smtp_host) $smtp_host = 'localhost';
-    $smtp_port = is_numeric($CONFIG['smtp_port']) ? $CONFIG['smtp_port'] : 25;
-    $smtp_host_url = parse_url($smtp_host);
-
-    // overwrite port
-    if (isset($smtp_host_url['host']) && isset($smtp_host_url['port']))
+    private $conn = null;
+    private $response;
+    private $error;
+
+    // define headers delimiter
+    const SMTP_MIME_CRLF = "\r\n";
+
+
+    /**
+     * SMTP Connection and authentication
+     *
+     * @param string Server host
+     * @param string Server port
+     * @param string User name
+     * @param string Password
+     *
+     * @return bool  Returns true on success, or false on error
+     */
+    public function connect($host=null, $port=null, $user=null, $pass=null)
     {
-      $smtp_host = $smtp_host_url['host'];
-      $smtp_port = $smtp_host_url['port'];
-    }
+        $rcube = rcube::get_instance();
 
-    // re-write smtp host
-    if (isset($smtp_host_url['host']) && isset($smtp_host_url['scheme']))
-      $smtp_host = sprintf('%s://%s', $smtp_host_url['scheme'], $smtp_host_url['host']);
+        // disconnect/destroy $this->conn
+        $this->disconnect();
 
-    // remove TLS prefix and set flag for use in Net_SMTP::auth()
-    if (preg_match('#^tls://#i', $smtp_host)) {
-      $smtp_host = preg_replace('#^tls://#i', '', $smtp_host);
-      $use_tls = true;
-    }
+        // reset error/response var
+        $this->error = $this->response = null;
+
+        // let plugins alter smtp connection config
+        $CONFIG = $rcube->plugins->exec_hook('smtp_connect', array(
+            'smtp_server'    => $host ? $host : $rcube->config->get('smtp_server'),
+            'smtp_port'      => $port ? $port : $rcube->config->get('smtp_port', 25),
+            'smtp_user'      => $user ? $user : $rcube->config->get('smtp_user'),
+            'smtp_pass'      => $pass ? $pass : $rcube->config->get('smtp_pass'),
+            'smtp_auth_cid'  => $rcube->config->get('smtp_auth_cid'),
+            'smtp_auth_pw'   => $rcube->config->get('smtp_auth_pw'),
+            'smtp_auth_type' => $rcube->config->get('smtp_auth_type'),
+            'smtp_helo_host' => $rcube->config->get('smtp_helo_host'),
+            'smtp_timeout'   => $rcube->config->get('smtp_timeout'),
+            'smtp_auth_callbacks' => array(),
+        ));
+
+        $smtp_host = rcube_utils::parse_host($CONFIG['smtp_server']);
+        // when called from Installer it's possible to have empty $smtp_host here
+        if (!$smtp_host) $smtp_host = 'localhost';
+        $smtp_port     = is_numeric($CONFIG['smtp_port']) ? $CONFIG['smtp_port'] : 25;
+        $smtp_host_url = parse_url($smtp_host);
+
+        // overwrite port
+        if (isset($smtp_host_url['host']) && isset($smtp_host_url['port'])) {
+            $smtp_host = $smtp_host_url['host'];
+            $smtp_port = $smtp_host_url['port'];
+        }
 
-    if (!empty($CONFIG['smtp_helo_host']))
-      $helo_host = $CONFIG['smtp_helo_host'];
-    else if (!empty($_SERVER['SERVER_NAME']))
-      $helo_host = preg_replace('/:\d+$/', '', $_SERVER['SERVER_NAME']);
-    else
-      $helo_host = 'localhost';
+        // re-write smtp host
+        if (isset($smtp_host_url['host']) && isset($smtp_host_url['scheme'])) {
+            $smtp_host = sprintf('%s://%s', $smtp_host_url['scheme'], $smtp_host_url['host']);
+        }
 
-    // IDNA Support
-    $smtp_host = rcube_utils::idn_to_ascii($smtp_host);
+        // remove TLS prefix and set flag for use in Net_SMTP::auth()
+        if (preg_match('#^tls://#i', $smtp_host)) {
+            $smtp_host = preg_replace('#^tls://#i', '', $smtp_host);
+            $use_tls   = true;
+        }
 
-    $this->conn = new Net_SMTP($smtp_host, $smtp_port, $helo_host);
+        if (!empty($CONFIG['smtp_helo_host'])) {
+            $helo_host = $CONFIG['smtp_helo_host'];
+        }
+        else if (!empty($_SERVER['SERVER_NAME'])) {
+            $helo_host = preg_replace('/:\d+$/', '', $_SERVER['SERVER_NAME']);
+        }
+        else {
+            $helo_host = 'localhost';
+        }
 
-    if ($rcube->config->get('smtp_debug'))
-      $this->conn->setDebug(true, array($this, 'debug_handler'));
+        // IDNA Support
+        $smtp_host = rcube_utils::idn_to_ascii($smtp_host);
 
-    // register authentication methods
-    if (!empty($CONFIG['smtp_auth_callbacks']) && method_exists($this->conn, 'setAuthMethod')) {
-      foreach ($CONFIG['smtp_auth_callbacks'] as $callback) {
-        $this->conn->setAuthMethod($callback['name'], $callback['function'],
-          isset($callback['prepend']) ? $callback['prepend'] : true);
-      }
-    }
+        $this->conn = new Net_SMTP($smtp_host, $smtp_port, $helo_host);
 
-    // try to connect to server and exit on failure
-    $result = $this->conn->connect($smtp_timeout);
+        if ($rcube->config->get('smtp_debug')) {
+            $this->conn->setDebug(true, array($this, 'debug_handler'));
+        }
 
-    if (PEAR::isError($result)) {
-      $this->response[] = "Connection failed: ".$result->getMessage();
-      $this->error = array('label' => 'smtpconnerror', 'vars' => array('code' => $this->conn->_code));
-      $this->conn = null;
-      return false;
-    }
+        // register authentication methods
+        if (!empty($CONFIG['smtp_auth_callbacks']) && method_exists($this->conn, 'setAuthMethod')) {
+            foreach ($CONFIG['smtp_auth_callbacks'] as $callback) {
+                $this->conn->setAuthMethod($callback['name'], $callback['function'],
+                    isset($callback['prepend']) ? $callback['prepend'] : true);
+            }
+        }
 
-    // workaround for timeout bug in Net_SMTP 1.5.[0-1] (#1487843)
-    if (method_exists($this->conn, 'setTimeout')
-      && ($timeout = ini_get('default_socket_timeout'))
-    ) {
-      $this->conn->setTimeout($timeout);
-    }
+        // try to connect to server and exit on failure
+        $result = $this->conn->connect($smtp_timeout);
 
-    $smtp_user = str_replace('%u', $rcube->get_user_name(), $CONFIG['smtp_user']);
-    $smtp_pass = str_replace('%p', $rcube->get_user_password(), $CONFIG['smtp_pass']);
-    $smtp_auth_type = empty($CONFIG['smtp_auth_type']) ? NULL : $CONFIG['smtp_auth_type'];
+        if (PEAR::isError($result)) {
+            $this->response[] = "Connection failed: ".$result->getMessage();
+            $this->error = array('label' => 'smtpconnerror', 'vars' => array('code' => $this->conn->_code));
+            $this->conn  = null;
+            return false;
+        }
 
-    if (!empty($CONFIG['smtp_auth_cid'])) {
-      $smtp_authz = $smtp_user;
-      $smtp_user  = $CONFIG['smtp_auth_cid'];
-      $smtp_pass  = $CONFIG['smtp_auth_pw'];
-    }
+        // workaround for timeout bug in Net_SMTP 1.5.[0-1] (#1487843)
+        if (method_exists($this->conn, 'setTimeout')
+            && ($timeout = ini_get('default_socket_timeout'))
+        ) {
+            $this->conn->setTimeout($timeout);
+        }
 
-    // attempt to authenticate to the SMTP server
-    if ($smtp_user && $smtp_pass)
-    {
-      // IDNA Support
-      if (strpos($smtp_user, '@')) {
-        $smtp_user = rcube_utils::idn_to_ascii($smtp_user);
-      }
-
-      $result = $this->conn->auth($smtp_user, $smtp_pass, $smtp_auth_type, $use_tls, $smtp_authz);
-
-      if (PEAR::isError($result))
-      {
-        $this->error = array('label' => 'smtpautherror', 'vars' => array('code' => $this->conn->_code));
-        $this->response[] .= 'Authentication failure: ' . $result->getMessage() . ' (Code: ' . $result->getCode() . ')';
-        $this->reset();
-        $this->disconnect();
-        return false;
-      }
-    }
+        $smtp_user = str_replace('%u', $rcube->get_user_name(), $CONFIG['smtp_user']);
+        $smtp_pass = str_replace('%p', $rcube->get_user_password(), $CONFIG['smtp_pass']);
+        $smtp_auth_type = empty($CONFIG['smtp_auth_type']) ? NULL : $CONFIG['smtp_auth_type'];
 
-    return true;
-  }
-
-
-  /**
-   * Function for sending mail
-   *
-   * @param string Sender e-Mail address
-   *
-   * @param mixed  Either a comma-seperated list of recipients
-   *               (RFC822 compliant), or an array of recipients,
-   *               each RFC822 valid. This may contain recipients not
-   *               specified in the headers, for Bcc:, resending
-   *               messages, etc.
-   * @param mixed  The message headers to send with the mail
-   *               Either as an associative array or a finally
-   *               formatted string
-   * @param mixed  The full text of the message body, including any Mime parts
-   *               or file handle
-   * @param array  Delivery options (e.g. DSN request)
-   *
-   * @return bool  Returns true on success, or false on error
-   */
-  public function send_mail($from, $recipients, &$headers, &$body, $opts=null)
-  {
-    if (!is_object($this->conn))
-      return false;
-
-    // prepare message headers as string
-    if (is_array($headers))
-    {
-      if (!($headerElements = $this->_prepare_headers($headers))) {
-        $this->reset();
-        return false;
-      }
+        if (!empty($CONFIG['smtp_auth_cid'])) {
+            $smtp_authz = $smtp_user;
+            $smtp_user  = $CONFIG['smtp_auth_cid'];
+            $smtp_pass  = $CONFIG['smtp_auth_pw'];
+        }
 
-      list($from, $text_headers) = $headerElements;
-    }
-    else if (is_string($headers))
-      $text_headers = $headers;
-    else
-    {
-      $this->reset();
-      $this->response[] = "Invalid message headers";
-      return false;
+        // attempt to authenticate to the SMTP server
+        if ($smtp_user && $smtp_pass) {
+            // IDNA Support
+            if (strpos($smtp_user, '@')) {
+                $smtp_user = rcube_utils::idn_to_ascii($smtp_user);
+            }
+
+            $result = $this->conn->auth($smtp_user, $smtp_pass, $smtp_auth_type, $use_tls, $smtp_authz);
+
+            if (PEAR::isError($result)) {
+                $this->error = array('label' => 'smtpautherror', 'vars' => array('code' => $this->conn->_code));
+                $this->response[] .= 'Authentication failure: ' . $result->getMessage() . ' (Code: ' . $result->getCode() . ')';
+                $this->reset();
+                $this->disconnect();
+                return false;
+            }
+        }
+
+        return true;
     }
 
-    // exit if no from address is given
-    if (!isset($from))
+    /**
+     * Function for sending mail
+     *
+     * @param string Sender e-Mail address
+     *
+     * @param mixed  Either a comma-seperated list of recipients
+     *               (RFC822 compliant), or an array of recipients,
+     *               each RFC822 valid. This may contain recipients not
+     *               specified in the headers, for Bcc:, resending
+     *               messages, etc.
+     * @param mixed  The message headers to send with the mail
+     *               Either as an associative array or a finally
+     *               formatted string
+     * @param mixed  The full text of the message body, including any Mime parts
+     *               or file handle
+     * @param array  Delivery options (e.g. DSN request)
+     *
+     * @return bool  Returns true on success, or false on error
+     */
+    public function send_mail($from, $recipients, &$headers, &$body, $opts=null)
     {
-      $this->reset();
-      $this->response[] = "No From address has been provided";
-      return false;
-    }
+        if (!is_object($this->conn)) {
+            return false;
+        }
 
-    // RFC3461: Delivery Status Notification
-    if ($opts['dsn']) {
-      $exts = $this->conn->getServiceExtensions();
+        // prepare message headers as string
+        if (is_array($headers)) {
+            if (!($headerElements = $this->_prepare_headers($headers))) {
+                $this->reset();
+                return false;
+            }
 
-      if (isset($exts['DSN'])) {
-        $from_params      = 'RET=HDRS';
-        $recipient_params = 'NOTIFY=SUCCESS,FAILURE';
-      }
-    }
+            list($from, $text_headers) = $headerElements;
+        }
+        else if (is_string($headers)) {
+            $text_headers = $headers;
+        }
+        else {
+            $this->reset();
+            $this->response[] = "Invalid message headers";
+            return false;
+        }
+
+        // exit if no from address is given
+        if (!isset($from)) {
+            $this->reset();
+            $this->response[] = "No From address has been provided";
+            return false;
+        }
+
+        // RFC3461: Delivery Status Notification
+        if ($opts['dsn']) {
+            $exts = $this->conn->getServiceExtensions();
+
+            if (isset($exts['DSN'])) {
+                $from_params      = 'RET=HDRS';
+                $recipient_params = 'NOTIFY=SUCCESS,FAILURE';
+            }
+        }
+
+        // RFC2298.3: remove envelope sender address
+        if (empty($opts['mdn_use_from'])
+            && preg_match('/Content-Type: multipart\/report/', $text_headers)
+            && preg_match('/report-type=disposition-notification/', $text_headers)
+        ) {
+            $from = '';
+        }
+
+        // set From: address
+        if (PEAR::isError($this->conn->mailFrom($from, $from_params))) {
+            $err = $this->conn->getResponse();
+            $this->error = array('label' => 'smtpfromerror', 'vars' => array(
+                'from' => $from, 'code' => $this->conn->_code, 'msg' => $err[1]));
+            $this->response[] = "Failed to set sender '$from'";
+            $this->reset();
+            return false;
+        }
+
+        // prepare list of recipients
+        $recipients = $this->_parse_rfc822($recipients);
+        if (PEAR::isError($recipients)) {
+            $this->error = array('label' => 'smtprecipientserror');
+            $this->reset();
+            return false;
+        }
 
-    // RFC2298.3: remove envelope sender address
-    if (preg_match('/Content-Type: multipart\/report/', $text_headers)
-      && preg_match('/report-type=disposition-notification/', $text_headers)
-    ) {
-      $from = '';
+        // set mail recipients
+        foreach ($recipients as $recipient) {
+            if (PEAR::isError($this->conn->rcptTo($recipient, $recipient_params))) {
+                $err = $this->conn->getResponse();
+                $this->error = array('label' => 'smtptoerror', 'vars' => array(
+                    'to' => $recipient, 'code' => $this->conn->_code, 'msg' => $err[1]));
+                $this->response[] = "Failed to add recipient '$recipient'";
+                $this->reset();
+                return false;
+            }
+        }
+
+        if (is_resource($body)) {
+            // file handle
+            $data         = $body;
+            $text_headers = preg_replace('/[\r\n]+$/', '', $text_headers);
+        }
+        else {
+            // Concatenate headers and body so it can be passed by reference to SMTP_CONN->data
+            // so preg_replace in SMTP_CONN->quotedata will store a reference instead of a copy.
+            // We are still forced to make another copy here for a couple ticks so we don't really
+            // get to save a copy in the method call.
+            $data = $text_headers . "\r\n" . $body;
+
+            // unset old vars to save data and so we can pass into SMTP_CONN->data by reference.
+            unset($text_headers, $body);
+        }
+
+        // Send the message's headers and the body as SMTP data.
+        if (PEAR::isError($result = $this->conn->data($data, $text_headers))) {
+            $err = $this->conn->getResponse();
+            if (!in_array($err[0], array(354, 250, 221))) {
+                $msg = sprintf('[%d] %s', $err[0], $err[1]);
+            }
+            else {
+                $msg = $result->getMessage();
+            }
+
+            $this->error = array('label' => 'smtperror', 'vars' => array('msg' => $msg));
+            $this->response[] = "Failed to send data";
+            $this->reset();
+            return false;
+        }
+
+        $this->response[] = join(': ', $this->conn->getResponse());
+        return true;
     }
 
-    // set From: address
-    if (PEAR::isError($this->conn->mailFrom($from, $from_params)))
+    /**
+     * Reset the global SMTP connection
+     */
+    public function reset()
     {
-      $err = $this->conn->getResponse();
-      $this->error = array('label' => 'smtpfromerror', 'vars' => array(
-        'from' => $from, 'code' => $this->conn->_code, 'msg' => $err[1]));
-      $this->response[] = "Failed to set sender '$from'";
-      $this->reset();
-      return false;
+        if (is_object($this->conn)) {
+            $this->conn->rset();
+        }
     }
 
-    // prepare list of recipients
-    $recipients = $this->_parse_rfc822($recipients);
-    if (PEAR::isError($recipients))
+    /**
+     * Disconnect the global SMTP connection
+     */
+    public function disconnect()
     {
-      $this->error = array('label' => 'smtprecipientserror');
-      $this->reset();
-      return false;
+        if (is_object($this->conn)) {
+            $this->conn->disconnect();
+            $this->conn = null;
+        }
     }
 
-    // set mail recipients
-    foreach ($recipients as $recipient)
+
+    /**
+     * This is our own debug handler for the SMTP connection
+     */
+    public function debug_handler(&$smtp, $message)
     {
-      if (PEAR::isError($this->conn->rcptTo($recipient, $recipient_params))) {
-        $err = $this->conn->getResponse();
-        $this->error = array('label' => 'smtptoerror', 'vars' => array(
-          'to' => $recipient, 'code' => $this->conn->_code, 'msg' => $err[1]));
-        $this->response[] = "Failed to add recipient '$recipient'";
-        $this->reset();
-        return false;
-      }
+        rcube::write_log('smtp', preg_replace('/\r\n$/', '', $message));
     }
 
-    if (is_resource($body))
+    /**
+     * Get error message
+     */
+    public function get_error()
     {
-      // file handle
-      $data = $body;
-      $text_headers = preg_replace('/[\r\n]+$/', '', $text_headers);
-    } else {
-      // Concatenate headers and body so it can be passed by reference to SMTP_CONN->data
-      // so preg_replace in SMTP_CONN->quotedata will store a reference instead of a copy. 
-      // We are still forced to make another copy here for a couple ticks so we don't really 
-      // get to save a copy in the method call.
-      $data = $text_headers . "\r\n" . $body;
-
-      // unset old vars to save data and so we can pass into SMTP_CONN->data by reference.
-      unset($text_headers, $body);
+        return $this->error;
     }
 
-    // Send the message's headers and the body as SMTP data.
-    if (PEAR::isError($result = $this->conn->data($data, $text_headers)))
+    /**
+     * Get server response messages array
+     */
+    public function get_response()
     {
-      $err = $this->conn->getResponse();
-      if (!in_array($err[0], array(354, 250, 221)))
-        $msg = sprintf('[%d] %s', $err[0], $err[1]);
-      else
-        $msg = $result->getMessage();
-
-      $this->error = array('label' => 'smtperror', 'vars' => array('msg' => $msg));
-      $this->response[] = "Failed to send data";
-      $this->reset();
-      return false;
+         return $this->response;
     }
 
-    $this->response[] = join(': ', $this->conn->getResponse());
-    return true;
-  }
-
-
-  /**
-   * Reset the global SMTP connection
-   * @access public
-   */
-  public function reset()
-  {
-    if (is_object($this->conn))
-      $this->conn->rset();
-  }
-
-
-  /**
-   * Disconnect the global SMTP connection
-   * @access public
-   */
-  public function disconnect()
-  {
-    if (is_object($this->conn)) {
-      $this->conn->disconnect();
-      $this->conn = null;
-    }
-  }
-
-
-  /**
-   * This is our own debug handler for the SMTP connection
-   * @access public
-   */
-  public function debug_handler(&$smtp, $message)
-  {
-    rcube::write_log('smtp', preg_replace('/\r\n$/', '', $message));
-  }
-
-
-  /**
-   * Get error message
-   * @access public
-   */
-  public function get_error()
-  {
-    return $this->error;
-  }
-
-
-  /**
-   * Get server response messages array
-   * @access public
-   */
-  public function get_response()
-  {
-    return $this->response;
-  }
-
-
-  /**
-   * Take an array of mail headers and return a string containing
-   * text usable in sending a message.
-   *
-   * @param array $headers The array of headers to prepare, in an associative
-   *              array, where the array key is the header name (ie,
-   *              'Subject'), and the array value is the header
-   *              value (ie, 'test'). The header produced from those
-   *              values would be 'Subject: test'.
-   *
-   * @return mixed Returns false if it encounters a bad address,
-   *               otherwise returns an array containing two
-   *               elements: Any From: address found in the headers,
-   *               and the plain text version of the headers.
-   * @access private
-   */
-  private function _prepare_headers($headers)
-  {
-    $lines = array();
-    $from = null;
-
-    foreach ($headers as $key => $value)
+    /**
+     * Take an array of mail headers and return a string containing
+     * text usable in sending a message.
+     *
+     * @param array $headers The array of headers to prepare, in an associative
+     *              array, where the array key is the header name (ie,
+     *              'Subject'), and the array value is the header
+     *              value (ie, 'test'). The header produced from those
+     *              values would be 'Subject: test'.
+     *
+     * @return mixed Returns false if it encounters a bad address,
+     *               otherwise returns an array containing two
+     *               elements: Any From: address found in the headers,
+     *               and the plain text version of the headers.
+     */
+    private function _prepare_headers($headers)
     {
-      if (strcasecmp($key, 'From') === 0)
-      {
-        $addresses = $this->_parse_rfc822($value);
-
-        if (is_array($addresses))
-          $from = $addresses[0];
-
-        // Reject envelope From: addresses with spaces.
-        if (strpos($from, ' ') !== false)
-          return false;
-
-        $lines[] = $key . ': ' . $value;
-      }
-      else if (strcasecmp($key, 'Received') === 0)
-      {
-        $received = array();
-        if (is_array($value))
-        {
-          foreach ($value as $line)
-            $received[] = $key . ': ' . $line;
-        }
-        else
-        {
-          $received[] = $key . ': ' . $value;
+        $lines = array();
+        $from  = null;
+
+        foreach ($headers as $key => $value) {
+            if (strcasecmp($key, 'From') === 0) {
+                $addresses = $this->_parse_rfc822($value);
+
+                if (is_array($addresses)) {
+                    $from = $addresses[0];
+                }
+
+                // Reject envelope From: addresses with spaces.
+                if (strpos($from, ' ') !== false) {
+                    return false;
+                }
+
+                $lines[] = $key . ': ' . $value;
+            }
+            else if (strcasecmp($key, 'Received') === 0) {
+                $received = array();
+                if (is_array($value)) {
+                    foreach ($value as $line) {
+                        $received[] = $key . ': ' . $line;
+                    }
+                }
+                else {
+                    $received[] = $key . ': ' . $value;
+                }
+
+                // Put Received: headers at the top.  Spam detectors often
+                // flag messages with Received: headers after the Subject:
+                // as spam.
+                $lines = array_merge($received, $lines);
+            }
+            else {
+                // If $value is an array (i.e., a list of addresses), convert
+                // it to a comma-delimited string of its elements (addresses).
+                if (is_array($value)) {
+                    $value = implode(', ', $value);
+                }
+
+                $lines[] = $key . ': ' . $value;
+            }
         }
 
-        // Put Received: headers at the top.  Spam detectors often
-        // flag messages with Received: headers after the Subject:
-        // as spam.
-        $lines = array_merge($received, $lines);
-      }
-      else
-      {
-        // If $value is an array (i.e., a list of addresses), convert
-        // it to a comma-delimited string of its elements (addresses).
-        if (is_array($value))
-          $value = implode(', ', $value);
-
-        $lines[] = $key . ': ' . $value;
-      }
+        return array($from, join(self::SMTP_MIME_CRLF, $lines) . self::SMTP_MIME_CRLF);
     }
 
-    return array($from, join(SMTP_MIME_CRLF, $lines) . SMTP_MIME_CRLF);
-  }
-
-  /**
-   * Take a set of recipients and parse them, returning an array of
-   * bare addresses (forward paths) that can be passed to sendmail
-   * or an smtp server with the rcpt to: command.
-   *
-   * @param mixed Either a comma-seperated list of recipients
-   *              (RFC822 compliant), or an array of recipients,
-   *              each RFC822 valid.
-   *
-   * @return array An array of forward paths (bare addresses).
-   * @access private
-   */
-  private function _parse_rfc822($recipients)
-  {
-    // if we're passed an array, assume addresses are valid and implode them before parsing.
-    if (is_array($recipients))
-      $recipients = implode(', ', $recipients);
-
-    $addresses = array();
-    $recipients = rcube_utils::explode_quoted_string(',', $recipients);
-
-    reset($recipients);
-    while (list($k, $recipient) = each($recipients))
+    /**
+     * Take a set of recipients and parse them, returning an array of
+     * bare addresses (forward paths) that can be passed to sendmail
+     * or an smtp server with the rcpt to: command.
+     *
+     * @param mixed Either a comma-seperated list of recipients
+     *              (RFC822 compliant), or an array of recipients,
+     *              each RFC822 valid.
+     *
+     * @return array An array of forward paths (bare addresses).
+     */
+    private function _parse_rfc822($recipients)
     {
-      $a = rcube_utils::explode_quoted_string(' ', $recipient);
-      while (list($k2, $word) = each($a))
-      {
-        if (strpos($word, "@") > 0 && $word[strlen($word)-1] != '"')
-        {
-          $word = preg_replace('/^<|>$/', '', trim($word));
-          if (in_array($word, $addresses)===false)
-            array_push($addresses, $word);
+        // if we're passed an array, assume addresses are valid and implode them before parsing.
+        if (is_array($recipients)) {
+            $recipients = implode(', ', $recipients);
         }
-      }
-    }
 
-    return $addresses;
-  }
+        $addresses  = array();
+        $recipients = rcube_utils::explode_quoted_string(',', $recipients);
+
+        reset($recipients);
+        while (list($k, $recipient) = each($recipients)) {
+            $a = rcube_utils::explode_quoted_string(' ', $recipient);
+            while (list($k2, $word) = each($a)) {
+                if (strpos($word, "@") > 0 && $word[strlen($word)-1] != '"') {
+                    $word = preg_replace('/^<|>$/', '', trim($word));
+                    if (in_array($word, $addresses) === false) {
+                        array_push($addresses, $word);
+                    }
+                }
+            }
+        }
 
+        return $addresses;
+    }
 }
diff --git a/program/lib/Roundcube/rcube_spellchecker.php b/program/lib/Roundcube/rcube_spellchecker.php
index fce2cac75..816bcad2f 100644
--- a/program/lib/Roundcube/rcube_spellchecker.php
+++ b/program/lib/Roundcube/rcube_spellchecker.php
@@ -2,8 +2,6 @@
 
 /*
  +-----------------------------------------------------------------------+
- | program/include/rcube_spellchecker.php                                |
- |                                                                       |
  | This file is part of the Roundcube Webmail client                     |
  | Copyright (C) 2011, Kolab Systems AG                                  |
  | Copyright (C) 2008-2011, The Roundcube Dev Team                       |
@@ -14,14 +12,12 @@
  |                                                                       |
  | PURPOSE:                                                              |
  |   Spellchecking using different backends                              |
- |                                                                       |
  +-----------------------------------------------------------------------+
  | Author: Aleksander Machniak <machniak@kolabsys.com>                   |
  | Author: Thomas Bruederli <roundcube@gmail.com>                        |
  +-----------------------------------------------------------------------+
 */
 
-
 /**
  * Helper class for spellchecking with Googielspell and PSpell support.
  *
@@ -35,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;
@@ -447,7 +443,7 @@ class rcube_spellchecker
 
     private function html2text($text)
     {
-        $h2t = new html2text($text, false, true, 0);
+        $h2t = new rcube_html2text($text, false, true, 0);
         return $h2t->get_text();
     }
 
diff --git a/program/lib/Roundcube/rcube_storage.php b/program/lib/Roundcube/rcube_storage.php
index 1556aae41..700d12ffb 100644
--- a/program/lib/Roundcube/rcube_storage.php
+++ b/program/lib/Roundcube/rcube_storage.php
@@ -2,8 +2,6 @@
 
 /*
  +-----------------------------------------------------------------------+
- | program/include/rcube_storage.php                                     |
- |                                                                       |
  | This file is part of the Roundcube Webmail client                     |
  | Copyright (C) 2005-2012, The Roundcube Dev Team                       |
  | Copyright (C) 2012, Kolab Systems AG                                  |
@@ -14,14 +12,12 @@
  |                                                                       |
  | PURPOSE:                                                              |
  |   Mail Storage Engine                                                 |
- |                                                                       |
  +-----------------------------------------------------------------------+
  | Author: Thomas Bruederli <roundcube@gmail.com>                        |
  | Author: Aleksander Machniak <alec@alec.pl>                            |
  +-----------------------------------------------------------------------+
 */
 
-
 /**
  * Abstract class for accessing mail messages storage server
  *
@@ -57,6 +53,7 @@ abstract class rcube_storage
     protected $all_headers = array(
         'IN-REPLY-TO',
         'BCC',
+        'SENDER',
         'MESSAGE-ID',
         'CONTENT-TRANSFER-ENCODING',
         'REFERENCES',
@@ -64,6 +61,8 @@ abstract class rcube_storage
         'MAIL-FOLLOWUP-TO',
         'MAIL-REPLY-TO',
         'RETURN-PATH',
+        'DELIVERED-TO',
+        'ENVELOPE-TO',
     );
 
     const UNKNOWN       = 0;
@@ -352,7 +351,7 @@ abstract class rcube_storage
      * Get messages count for a specific folder.
      *
      * @param  string  $folder  Folder name
-     * @param  string  $mode    Mode for count [ALL|THREADS|UNSEEN|RECENT]
+     * @param  string  $mode    Mode for count [ALL|THREADS|UNSEEN|RECENT|EXISTS]
      * @param  boolean $force   Force reading from server and update cache
      * @param  boolean $status  Enables storing folder status info (max UID/count),
      *                          required for folder_status()
@@ -808,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());
 
 
     /**
diff --git a/program/lib/Roundcube/rcube_string_replacer.php b/program/lib/Roundcube/rcube_string_replacer.php
index 584b9f68c..b8768bc98 100644
--- a/program/lib/Roundcube/rcube_string_replacer.php
+++ b/program/lib/Roundcube/rcube_string_replacer.php
@@ -2,8 +2,6 @@
 
 /*
  +-----------------------------------------------------------------------+
- | program/include/rcube_string_replacer.php                             |
- |                                                                       |
  | This file is part of the Roundcube Webmail client                     |
  | Copyright (C) 2009-2012, The Roundcube Dev Team                       |
  |                                                                       |
@@ -13,13 +11,11 @@
  |                                                                       |
  | PURPOSE:                                                              |
  |   Handle string replacements based on preg_replace_callback           |
- |                                                                       |
  +-----------------------------------------------------------------------+
  | Author: Thomas Bruederli <roundcube@gmail.com>                        |
  +-----------------------------------------------------------------------+
 */
 
-
 /**
  * Helper class for string replacements based on preg_replace_callback
  *
@@ -28,164 +24,192 @@
  */
 class rcube_string_replacer
 {
-  public static $pattern = '/##str_replacement\[([0-9]+)\]##/';
-  public $mailto_pattern;
-  public $link_pattern;
-  private $values = array();
-
-
-  function __construct()
-  {
-    // Simplified domain expression for UTF8 characters handling
-    // Support unicode/punycode in top-level domain part
-    $utf_domain = '[^?&@"\'\\/()\s\r\t\n]+\\.?([^\\x00-\\x2f\\x3b-\\x40\\x5b-\\x60\\x7b-\\x7f]{2,}|xn--[a-zA-Z0-9]{2,})';
-    $url1 = '.:;,';
-    $url2 = 'a-zA-Z0-9%=#$@+?!&\\/_~\\[\\]{}\*-';
-
-    $this->link_pattern = "/([\w]+:\/\/|\W[Ww][Ww][Ww]\.|^[Ww][Ww][Ww]\.)($utf_domain([$url1]?[$url2]+)*)/";
-    $this->mailto_pattern = "/("
-        ."[-\w!\#\$%&\'*+~\/^`|{}=]+(?:\.[-\w!\#\$%&\'*+~\/^`|{}=]+)*"  // local-part
-        ."@$utf_domain"                                                 // domain-part
-        ."(\?[$url1$url2]+)?"                                           // e.g. ?subject=test...
-        .")/";
-  }
-
-  /**
-   * Add a string to the internal list
-   *
-   * @param string String value 
-   * @return int Index of value for retrieval
-   */
-  public function add($str)
-  {
-    $i = count($this->values);
-    $this->values[$i] = $str;
-    return $i;
-  }
-
-  /**
-   * Build replacement string
-   */
-  public function get_replacement($i)
-  {
-    return '##str_replacement['.$i.']##';
-  }
-
-  /**
-   * Callback function used to build HTML links around URL strings
-   *
-   * @param array Matches result from preg_replace_callback
-   * @return int Index of saved string value
-   */
-  public function link_callback($matches)
-  {
-    $i = -1;
-    $scheme = strtolower($matches[1]);
-
-    if (preg_match('!^(http|ftp|file)s?://!i', $scheme)) {
-      $url = $matches[1] . $matches[2];
+    public static $pattern = '/##str_replacement\[([0-9]+)\]##/';
+    public $mailto_pattern;
+    public $link_pattern;
+    private $values = array();
+    private $options = array();
+
+
+    function __construct($options = array())
+    {
+        // Simplified domain expression for UTF8 characters handling
+        // Support unicode/punycode in top-level domain part
+        $utf_domain = '[^?&@"\'\\/()<>\s\r\t\n]+\\.?([^\\x00-\\x2f\\x3b-\\x40\\x5b-\\x60\\x7b-\\x7f]{2,}|xn--[a-zA-Z0-9]{2,})';
+        $url1       = '.:;,';
+        $url2       = 'a-zA-Z0-9%=#$@+?!&\\/_~\\[\\]\\(\\){}\*-';
+
+        $this->link_pattern = "/([\w]+:\/\/|\W[Ww][Ww][Ww]\.|^[Ww][Ww][Ww]\.)($utf_domain([$url1]?[$url2]+)*)/";
+        $this->mailto_pattern = "/("
+            ."[-\w!\#\$%&\'*+~\/^`|{}=]+(?:\.[-\w!\#\$%&\'*+~\/^`|{}=]+)*"  // local-part
+            ."@$utf_domain"                                                 // domain-part
+            ."(\?[$url1$url2]+)?"                                           // e.g. ?subject=test...
+            .")/";
+
+        $this->options = $options;
     }
-    else if (preg_match('/^(\W*)(www\.)$/i', $matches[1], $m)) {
-      $url        = $m[2] . $matches[2];
-      $url_prefix = 'http://';
-      $prefix     = $m[1];
+
+    /**
+     * Add a string to the internal list
+     *
+     * @param string String value 
+     * @return int Index of value for retrieval
+     */
+    public function add($str)
+    {
+        $i = count($this->values);
+        $this->values[$i] = $str;
+        return $i;
     }
 
-    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);
+    /**
+     * Build replacement string
+     */
+    public function get_replacement($i)
+    {
+        return '##str_replacement['.$i.']##';
     }
 
-    // Return valid link for recognized schemes, otherwise, return the unmodified string for unrecognized schemes.
-    return $i >= 0 ? $this->get_replacement($i) : $matches[0];
-  }
-
-  /**
-   * Callback function used to build mailto: links around e-mail strings
-   *
-   * @param array Matches result from preg_replace_callback
-   * @return int Index of saved string value
-   */
-  public function mailto_callback($matches)
-  {
-    $href   = $matches[1];
-    $suffix = $this->parse_url_brackets($href);
-    $i = $this->add(html::a('mailto:' . $href, rcube::Q($href)) . $suffix);
-
-    return $i >= 0 ? $this->get_replacement($i) : '';
-  }
-
-  /**
-   * Look up the index from the preg_replace matches array
-   * and return the substitution value.
-   *
-   * @param array Matches result from preg_replace_callback
-   * @return string Value at index $matches[1]
-   */
-  public function replace_callback($matches)
-  {
-    return $this->values[$matches[1]];
-  }
-
-  /**
-   * Replace all defined (link|mailto) patterns with replacement string
-   *
-   * @param string $str Text
-   *
-   * @return string Text
-   */
-  public function replace($str)
-  {
-    // search for patterns like links and e-mail addresses
-    $str = preg_replace_callback($this->link_pattern, array($this, 'link_callback'), $str);
-    $str = preg_replace_callback($this->mailto_pattern, array($this, 'mailto_callback'), $str);
-
-    return $str;
-  }
-
-  /**
-   * Replace substituted strings with original values
-   */
-  public function resolve($str)
-  {
-    return preg_replace_callback(self::$pattern, array($this, 'replace_callback'), $str);
-  }
-
-  /**
-   * Fixes bracket characters in URL handling
-   */
-  public static function parse_url_brackets(&$url)
-  {
-    // #1487672: special handling of square brackets,
-    // URL regexp allows [] characters in URL, for example:
-    // "http://example.com/?a[b]=c". However we need to handle
-    // properly situation when a bracket is placed at the end
-    // of the link e.g. "[http://example.com]"
-    if (preg_match('/(\\[|\\])/', $url)) {
-      $in = false;
-      for ($i=0, $len=strlen($url); $i<$len; $i++) {
-        if ($url[$i] == '[') {
-          if ($in)
-            break;
-          $in = true;
+    /**
+     * Callback function used to build HTML links around URL strings
+     *
+     * @param array Matches result from preg_replace_callback
+     * @return int Index of saved string value
+     */
+    public function link_callback($matches)
+    {
+        $i = -1;
+        $scheme = strtolower($matches[1]);
+
+        if (preg_match('!^(http|ftp|file)s?://!i', $scheme)) {
+            $url = $matches[1] . $matches[2];
+        }
+        else if (preg_match('/^(\W*)(www\.)$/i', $matches[1], $m)) {
+            $url        = $m[2] . $matches[2];
+            $url_prefix = 'http://';
+            $prefix     = $m[1];
         }
-        else if ($url[$i] == ']') {
-          if (!$in)
-            break;
-          $in = false;
+
+        if ($url) {
+            $suffix = $this->parse_url_brackets($url);
+            $attrib = (array)$this->options['link_attribs'];
+            $attrib['href'] = $url_prefix . $url;
+
+            $i = $this->add($prefix . html::a($attrib, rcube::Q($url)) . $suffix);
         }
-      }
 
-      if ($i<$len) {
-        $suffix = substr($url, $i);
-        $url    = substr($url, 0, $i);
-      }
+        // Return valid link for recognized schemes, otherwise
+        // return the unmodified string for unrecognized schemes.
+        return $i >= 0 ? $this->get_replacement($i) : $matches[0];
     }
 
-    return $suffix;
-  }
+    /**
+     * Callback function used to build mailto: links around e-mail strings
+     *
+     * @param array Matches result from preg_replace_callback
+     * @return int Index of saved string value
+     */
+    public function mailto_callback($matches)
+    {
+        $href   = $matches[1];
+        $suffix = $this->parse_url_brackets($href);
+        $i = $this->add(html::a('mailto:' . $href, rcube::Q($href)) . $suffix);
+
+        return $i >= 0 ? $this->get_replacement($i) : '';
+    }
+
+    /**
+     * Look up the index from the preg_replace matches array
+     * and return the substitution value.
+     *
+     * @param array Matches result from preg_replace_callback
+     * @return string Value at index $matches[1]
+     */
+    public function replace_callback($matches)
+    {
+        return $this->values[$matches[1]];
+    }
 
+    /**
+     * Replace all defined (link|mailto) patterns with replacement string
+     *
+     * @param string $str Text
+     *
+     * @return string Text
+     */
+    public function replace($str)
+    {
+        // search for patterns like links and e-mail addresses
+        $str = preg_replace_callback($this->link_pattern, array($this, 'link_callback'), $str);
+        $str = preg_replace_callback($this->mailto_pattern, array($this, 'mailto_callback'), $str);
+
+        return $str;
+    }
+
+    /**
+     * Replace substituted strings with original values
+     */
+    public function resolve($str)
+    {
+        return preg_replace_callback(self::$pattern, array($this, 'replace_callback'), $str);
+    }
+
+    /**
+     * Fixes bracket characters in URL handling
+     */
+    public static function parse_url_brackets(&$url)
+    {
+        // #1487672: special handling of square brackets,
+        // URL regexp allows [] characters in URL, for example:
+        // "http://example.com/?a[b]=c". However we need to handle
+        // properly situation when a bracket is placed at the end
+        // of the link e.g. "[http://example.com]"
+        // Yes, this is not perfect handles correctly only paired characters
+        // but it should work for common cases
+
+        if (preg_match('/(\\[|\\])/', $url)) {
+            $in = false;
+            for ($i=0, $len=strlen($url); $i<$len; $i++) {
+                if ($url[$i] == '[') {
+                    if ($in)
+                        break;
+                    $in = true;
+                }
+                else if ($url[$i] == ']') {
+                    if (!$in)
+                        break;
+                    $in = false;
+                }
+            }
+
+            if ($i < $len) {
+                $suffix = substr($url, $i);
+                $url    = substr($url, 0, $i);
+            }
+        }
+
+        // Do the same for parentheses
+        if (preg_match('/(\\(|\\))/', $url)) {
+            $in = false;
+            for ($i=0, $len=strlen($url); $i<$len; $i++) {
+                if ($url[$i] == '(') {
+                    if ($in)
+                        break;
+                    $in = true;
+                }
+                else if ($url[$i] == ')') {
+                    if (!$in)
+                        break;
+                    $in = false;
+                }
+            }
+
+            if ($i < $len) {
+                $suffix = substr($url, $i);
+                $url    = substr($url, 0, $i);
+            }
+        }
+
+        return $suffix;
+    }
 }
diff --git a/program/lib/Roundcube/rcube_user.php b/program/lib/Roundcube/rcube_user.php
index 864f2e098..505b190d1 100644
--- a/program/lib/Roundcube/rcube_user.php
+++ b/program/lib/Roundcube/rcube_user.php
@@ -2,8 +2,6 @@
 
 /*
  +-----------------------------------------------------------------------+
- | program/include/rcube_user.inc                                        |
- |                                                                       |
  | This file is part of the Roundcube Webmail client                     |
  | Copyright (C) 2005-2012, The Roundcube Dev Team                       |
  |                                                                       |
@@ -14,14 +12,12 @@
  | PURPOSE:                                                              |
  |   This class represents a system user linked and provides access      |
  |   to the related database records.                                    |
- |                                                                       |
  +-----------------------------------------------------------------------+
  | Author: Thomas Bruederli <roundcube@gmail.com>                        |
  | Author: Aleksander Machniak <alec@alec.pl>                            |
  +-----------------------------------------------------------------------+
 */
 
-
 /**
  * Class representing a system user
  *
@@ -240,10 +236,12 @@ class rcube_user
     /**
      * Return a list of all identities linked with this user
      *
-     * @param string $sql_add Optional WHERE clauses
+     * @param string $sql_add   Optional WHERE clauses
+     * @param bool   $formatted Format identity email and name
+     *
      * @return array List of identities
      */
-    function list_identities($sql_add = '')
+    function list_identities($sql_add = '', $formatted = false)
     {
         $result = array();
 
@@ -255,6 +253,15 @@ class rcube_user
             $this->ID);
 
         while ($sql_arr = $this->db->fetch_assoc($sql_result)) {
+            if ($formatted) {
+                $ascii_email = format_email($sql_arr['email']);
+                $utf8_email  = format_email(rcube_utils::idn_to_utf8($ascii_email));
+
+                $sql_arr['email_ascii'] = $ascii_email;
+                $sql_arr['email']       = $utf8_email;
+                $sql_arr['ident']       = format_email_recipient($ascii_email, $sql_arr['name']);
+            }
+
             $result[] = $sql_arr;
         }
 
diff --git a/program/lib/Roundcube/rcube_utils.php b/program/lib/Roundcube/rcube_utils.php
index 500f2c371..1ae782a25 100644
--- a/program/lib/Roundcube/rcube_utils.php
+++ b/program/lib/Roundcube/rcube_utils.php
@@ -2,8 +2,6 @@
 
 /*
  +-----------------------------------------------------------------------+
- | program/include/rcube_utils.php                                       |
- |                                                                       |
  | This file is part of the Roundcube Webmail client                     |
  | Copyright (C) 2008-2012, The Roundcube Dev Team                       |
  | Copyright (C) 2011-2012, Kolab Systems AG                             |
@@ -20,7 +18,6 @@
  +-----------------------------------------------------------------------+
 */
 
-
 /**
  * Utility class providing common functions
  *
@@ -159,7 +156,7 @@ class rcube_utils
     {
         // IPv6, but there's no build-in IPv6 support
         if (strpos($ip, ':') !== false && !defined('AF_INET6')) {
-            $parts = explode(':', $domain_part);
+            $parts = explode(':', $ip);
             $count = count($parts);
 
             if ($count > 8 || $count < 2) {
diff --git a/program/lib/Roundcube/rcube_vcard.php b/program/lib/Roundcube/rcube_vcard.php
index 45ee601e5..54bb9521d 100644
--- a/program/lib/Roundcube/rcube_vcard.php
+++ b/program/lib/Roundcube/rcube_vcard.php
@@ -2,8 +2,6 @@
 
 /*
  +-----------------------------------------------------------------------+
- | program/include/rcube_vcard.php                                       |
- |                                                                       |
  | This file is part of the Roundcube Webmail client                     |
  | Copyright (C) 2008-2012, The Roundcube Dev Team                       |
  |                                                                       |
@@ -19,7 +17,6 @@
  +-----------------------------------------------------------------------+
 */
 
-
 /**
  * Logical representation of a vcard-based address record
  * Provides functions to parse and export vCard data format
@@ -29,765 +26,826 @@
  */
 class rcube_vcard
 {
-  private static $values_decoded = false;
-  private $raw = array(
-    'FN' => array(),
-    'N' => array(array('','','','','')),
-  );
-  private static $fieldmap = array(
-    'phone'    => 'TEL',
-    'birthday' => 'BDAY',
-    'website'  => 'URL',
-    'notes'    => 'NOTE',
-    'email'    => 'EMAIL',
-    'address'  => 'ADR',
-    'jobtitle' => 'TITLE',
-    'department'  => 'X-DEPARTMENT',
-    'gender'      => 'X-GENDER',
-    'maidenname'  => 'X-MAIDENNAME',
-    'anniversary' => 'X-ANNIVERSARY',
-    'assistant'   => 'X-ASSISTANT',
-    'manager'     => 'X-MANAGER',
-    'spouse'      => 'X-SPOUSE',
-    'edit'        => 'X-AB-EDIT',
-  );
-  private $typemap = array('IPHONE' => 'mobile', 'CELL' => 'mobile', 'WORK,FAX' => 'workfax');
-  private $phonetypemap = array('HOME1' => 'HOME', 'BUSINESS1' => 'WORK', 'BUSINESS2' => 'WORK2', 'BUSINESSFAX' => 'WORK,FAX', 'MOBILE' => 'CELL');
-  private $addresstypemap = array('BUSINESS' => 'WORK');
-  private $immap = array('X-JABBER' => 'jabber', 'X-ICQ' => 'icq', 'X-MSN' => 'msn', 'X-AIM' => 'aim', 'X-YAHOO' => 'yahoo', 'X-SKYPE' => 'skype', 'X-SKYPE-USERNAME' => 'skype');
-
-  public $business = false;
-  public $displayname;
-  public $surname;
-  public $firstname;
-  public $middlename;
-  public $nickname;
-  public $organization;
-  public $email = array();
-
-  public static $eol = "\r\n";
-
-  /**
-   * Constructor
-   */
-  public function __construct($vcard = null, $charset = RCUBE_CHARSET, $detect = false, $fieldmap = array())
-  {
-    if (!empty($fielmap))
-      $this->extend_fieldmap($fieldmap);
-
-    if (!empty($vcard))
-      $this->load($vcard, $charset, $detect);
-  }
-
-
-  /**
-   * Load record from (internal, unfolded) vcard 3.0 format
-   *
-   * @param string vCard string to parse
-   * @param string Charset of string values
-   * @param boolean True if loading a 'foreign' vcard and extra heuristics for charset detection is required
-   */
-  public function load($vcard, $charset = RCUBE_CHARSET, $detect = false)
-  {
-    self::$values_decoded = false;
-    $this->raw = self::vcard_decode($vcard);
-
-    // resolve charset parameters
-    if ($charset == null) {
-      $this->raw = self::charset_convert($this->raw);
+    private static $values_decoded = false;
+    private $raw = array(
+        'FN' => array(),
+        'N'  => array(array('','','','','')),
+    );
+    private static $fieldmap = array(
+        'phone'    => 'TEL',
+        'birthday' => 'BDAY',
+        'website'  => 'URL',
+        'notes'    => 'NOTE',
+        'email'    => 'EMAIL',
+        'address'  => 'ADR',
+        'jobtitle' => 'TITLE',
+        'department'  => 'X-DEPARTMENT',
+        'gender'      => 'X-GENDER',
+        'maidenname'  => 'X-MAIDENNAME',
+        'anniversary' => 'X-ANNIVERSARY',
+        'assistant'   => 'X-ASSISTANT',
+        'manager'     => 'X-MANAGER',
+        'spouse'      => 'X-SPOUSE',
+        'edit'        => 'X-AB-EDIT',
+    );
+    private $typemap = array(
+        'IPHONE'   => 'mobile',
+        'CELL'     => 'mobile',
+        'WORK,FAX' => 'workfax',
+    );
+    private $phonetypemap = array(
+        'HOME1'       => 'HOME',
+        'BUSINESS1'   => 'WORK',
+        'BUSINESS2'   => 'WORK2',
+        'BUSINESSFAX' => 'WORK,FAX',
+        'MOBILE'      => 'CELL',
+    );
+    private $addresstypemap = array(
+        'BUSINESS' => 'WORK',
+    );
+    private $immap = array(
+        'X-JABBER' => 'jabber',
+        'X-ICQ'    => 'icq',
+        'X-MSN'    => 'msn',
+        'X-AIM'    => 'aim',
+        'X-YAHOO'  => 'yahoo',
+        'X-SKYPE'  => 'skype',
+        'X-SKYPE-USERNAME' => 'skype',
+    );
+
+    public $business = false;
+    public $displayname;
+    public $surname;
+    public $firstname;
+    public $middlename;
+    public $nickname;
+    public $organization;
+    public $email = array();
+
+    public static $eol = "\r\n";
+
+
+    /**
+     * Constructor
+     */
+    public function __construct($vcard = null, $charset = RCUBE_CHARSET, $detect = false, $fieldmap = array())
+    {
+        if (!empty($fielmap)) {
+            $this->extend_fieldmap($fieldmap);
+        }
+
+        if (!empty($vcard)) {
+            $this->load($vcard, $charset, $detect);
+        }
     }
-    // vcard has encoded values and charset should be detected
-    else if ($detect && self::$values_decoded &&
-      ($detected_charset = self::detect_encoding(self::vcard_encode($this->raw))) && $detected_charset != RCUBE_CHARSET) {
-        $this->raw = self::charset_convert($this->raw, $detected_charset);
+
+    /**
+     * Load record from (internal, unfolded) vcard 3.0 format
+     *
+     * @param string vCard string to parse
+     * @param string Charset of string values
+     * @param boolean True if loading a 'foreign' vcard and extra heuristics for charset detection is required
+     */
+    public function load($vcard, $charset = RCUBE_CHARSET, $detect = false)
+    {
+        self::$values_decoded = false;
+        $this->raw = self::vcard_decode($vcard);
+
+        // resolve charset parameters
+        if ($charset == null) {
+            $this->raw = self::charset_convert($this->raw);
+        }
+        // vcard has encoded values and charset should be detected
+        else if ($detect && self::$values_decoded
+            && ($detected_charset = self::detect_encoding(self::vcard_encode($this->raw)))
+            && $detected_charset != RCUBE_CHARSET
+        ) {
+            $this->raw = self::charset_convert($this->raw, $detected_charset);
+        }
+
+        // consider FN empty if the same as the primary e-mail address
+        if ($this->raw['FN'][0][0] == $this->raw['EMAIL'][0][0]) {
+            $this->raw['FN'][0][0] = '';
+        }
+
+        // find well-known address fields
+        $this->displayname  = $this->raw['FN'][0][0];
+        $this->surname      = $this->raw['N'][0][0];
+        $this->firstname    = $this->raw['N'][0][1];
+        $this->middlename   = $this->raw['N'][0][2];
+        $this->nickname     = $this->raw['NICKNAME'][0][0];
+        $this->organization = $this->raw['ORG'][0][0];
+        $this->business     = ($this->raw['X-ABSHOWAS'][0][0] == 'COMPANY') || (join('', (array)$this->raw['N'][0]) == '' && !empty($this->organization));
+
+        foreach ((array)$this->raw['EMAIL'] as $i => $raw_email) {
+            $this->email[$i] = is_array($raw_email) ? $raw_email[0] : $raw_email;
+        }
+
+        // make the pref e-mail address the first entry in $this->email
+        $pref_index = $this->get_type_index('EMAIL', 'pref');
+        if ($pref_index > 0) {
+            $tmp = $this->email[0];
+            $this->email[0] = $this->email[$pref_index];
+            $this->email[$pref_index] = $tmp;
+        }
     }
 
-    // consider FN empty if the same as the primary e-mail address
-    if ($this->raw['FN'][0][0] == $this->raw['EMAIL'][0][0])
-      $this->raw['FN'][0][0] = '';
-
-    // find well-known address fields
-    $this->displayname = $this->raw['FN'][0][0];
-    $this->surname = $this->raw['N'][0][0];
-    $this->firstname = $this->raw['N'][0][1];
-    $this->middlename = $this->raw['N'][0][2];
-    $this->nickname = $this->raw['NICKNAME'][0][0];
-    $this->organization = $this->raw['ORG'][0][0];
-    $this->business = ($this->raw['X-ABSHOWAS'][0][0] == 'COMPANY') || (join('', (array)$this->raw['N'][0]) == '' && !empty($this->organization));
-
-    foreach ((array)$this->raw['EMAIL'] as $i => $raw_email)
-      $this->email[$i] = is_array($raw_email) ? $raw_email[0] : $raw_email;
-
-    // make the pref e-mail address the first entry in $this->email
-    $pref_index = $this->get_type_index('EMAIL', 'pref');
-    if ($pref_index > 0) {
-      $tmp = $this->email[0];
-      $this->email[0] = $this->email[$pref_index];
-      $this->email[$pref_index] = $tmp;
+    /**
+     * Return vCard data as associative array to be unsed in Roundcube address books
+     *
+     * @return array Hash array with key-value pairs
+     */
+    public function get_assoc()
+    {
+        $out     = array('name' => $this->displayname);
+        $typemap = $this->typemap;
+
+        // copy name fields to output array
+        foreach (array('firstname','surname','middlename','nickname','organization') as $col) {
+            if (strlen($this->$col)) {
+                $out[$col] = $this->$col;
+            }
+        }
+
+        if ($this->raw['N'][0][3])
+            $out['prefix'] = $this->raw['N'][0][3];
+        if ($this->raw['N'][0][4])
+            $out['suffix'] = $this->raw['N'][0][4];
+
+        // convert from raw vcard data into associative data for Roundcube
+        foreach (array_flip(self::$fieldmap) as $tag => $col) {
+            foreach ((array)$this->raw[$tag] as $i => $raw) {
+                if (is_array($raw)) {
+                    $k       = -1;
+                    $key     = $col;
+                    $subtype = '';
+
+                    if (!empty($raw['type'])) {
+                        $combined = join(',', self::array_filter((array)$raw['type'], 'internet,pref', true));
+                        $combined = strtoupper($combined);
+
+                        if ($typemap[$combined]) {
+                            $subtype = $typemap[$combined];
+                        }
+                        else if ($typemap[$raw['type'][++$k]]) {
+                            $subtype = $typemap[$raw['type'][$k]];
+                        }
+                        else {
+                            $subtype = strtolower($raw['type'][$k]);
+                        }
+
+                        while ($k < count($raw['type']) && ($subtype == 'internet' || $subtype == 'pref')) {
+                            $subtype = $typemap[$raw['type'][++$k]] ? $typemap[$raw['type'][$k]] : strtolower($raw['type'][$k]);
+                        }
+                    }
+
+                    // read vcard 2.1 subtype
+                    if (!$subtype) {
+                        foreach ($raw as $k => $v) {
+                            if (!is_numeric($k) && $v === true && ($k = strtolower($k))
+                                && !in_array($k, array('pref','internet','voice','base64'))
+                            ) {
+                                $k_uc    = strtoupper($k);
+                                $subtype = $typemap[$k_uc] ? $typemap[$k_uc] : $k;
+                                break;
+                            }
+                        }
+                    }
+
+                    // force subtype if none set
+                    if (!$subtype && preg_match('/^(email|phone|address|website)/', $key)) {
+                        $subtype = 'other';
+                    }
+
+                    if ($subtype) {
+                        $key .= ':' . $subtype;
+                    }
+
+                    // split ADR values into assoc array
+                    if ($tag == 'ADR') {
+                        list(,, $value['street'], $value['locality'], $value['region'], $value['zipcode'], $value['country']) = $raw;
+                        $out[$key][] = $value;
+                    }
+                    else {
+                        $out[$key][] = $raw[0];
+                    }
+                }
+                else {
+                    $out[$col][] = $raw;
+                }
+            }
+        }
+
+        // handle special IM fields as used by Apple
+        foreach ($this->immap as $tag => $type) {
+            foreach ((array)$this->raw[$tag] as $i => $raw) {
+                $out['im:'.$type][] = $raw[0];
+            }
+        }
+
+        // copy photo data
+        if ($this->raw['PHOTO']) {
+            $out['photo'] = $this->raw['PHOTO'][0][0];
+        }
+
+        return $out;
     }
-  }
-
-
-  /**
-   * Return vCard data as associative array to be unsed in Roundcube address books
-   *
-   * @return array Hash array with key-value pairs
-   */
-  public function get_assoc()
-  {
-    $out = array('name' => $this->displayname);
-    $typemap = $this->typemap;
-
-    // copy name fields to output array
-    foreach (array('firstname','surname','middlename','nickname','organization') as $col) {
-      if (strlen($this->$col))
-        $out[$col] = $this->$col;
+
+    /**
+     * Convert the data structure into a vcard 3.0 string
+     */
+    public function export($folded = true)
+    {
+        $vcard = self::vcard_encode($this->raw);
+        return $folded ? self::rfc2425_fold($vcard) : $vcard;
     }
 
-    if ($this->raw['N'][0][3])
-      $out['prefix'] = $this->raw['N'][0][3];
-    if ($this->raw['N'][0][4])
-      $out['suffix'] = $this->raw['N'][0][4];
-
-    // convert from raw vcard data into associative data for Roundcube
-    foreach (array_flip(self::$fieldmap) as $tag => $col) {
-      foreach ((array)$this->raw[$tag] as $i => $raw) {
-        if (is_array($raw)) {
-          $k = -1;
-          $key = $col;
-          $subtype = '';
-
-          if (!empty($raw['type'])) {
-            $combined = join(',', self::array_filter((array)$raw['type'], 'internet,pref', true));
-            $combined = strtoupper($combined);
-
-            if ($typemap[$combined]) {
-                $subtype = $typemap[$combined];
-            }
-            else if ($typemap[$raw['type'][++$k]]) {
-                $subtype = $typemap[$raw['type'][$k]];
+    /**
+     * Clear the given fields in the loaded vcard data
+     *
+     * @param array List of field names to be reset
+     */
+    public function reset($fields = null)
+    {
+        if (!$fields) {
+            $fields = array_merge(array_values(self::$fieldmap), array_keys($this->immap),
+                array('FN','N','ORG','NICKNAME','EMAIL','ADR','BDAY'));
+        }
+
+        foreach ($fields as $f) {
+            unset($this->raw[$f]);
+        }
+
+        if (!$this->raw['N']) {
+            $this->raw['N'] = array(array('','','','',''));
+        }
+        if (!$this->raw['FN']) {
+            $this->raw['FN'] = array();
+        }
+
+        $this->email = array();
+    }
+
+    /**
+     * Setter for address record fields
+     *
+     * @param string Field name
+     * @param string Field value
+     * @param string Type/section name
+     */
+    public function set($field, $value, $type = 'HOME')
+    {
+        $field   = strtolower($field);
+        $type_uc = strtoupper($type);
+
+        switch ($field) {
+        case 'name':
+        case 'displayname':
+            $this->raw['FN'][0][0] = $this->displayname = $value;
+            break;
+
+        case 'surname':
+            $this->raw['N'][0][0] = $this->surname = $value;
+            break;
+
+        case 'firstname':
+            $this->raw['N'][0][1] = $this->firstname = $value;
+            break;
+
+        case 'middlename':
+            $this->raw['N'][0][2] = $this->middlename = $value;
+            break;
+
+        case 'prefix':
+            $this->raw['N'][0][3] = $value;
+            break;
+
+        case 'suffix':
+            $this->raw['N'][0][4] = $value;
+            break;
+
+        case 'nickname':
+            $this->raw['NICKNAME'][0][0] = $this->nickname = $value;
+            break;
+
+        case 'organization':
+            $this->raw['ORG'][0][0] = $this->organization = $value;
+            break;
+
+        case 'photo':
+            if (strpos($value, 'http:') === 0) {
+                // TODO: fetch file from URL and save it locally?
+                $this->raw['PHOTO'][0] = array(0 => $value, 'url' => true);
             }
             else {
-                $subtype = strtolower($raw['type'][$k]);
+                $this->raw['PHOTO'][0] = array(0 => $value, 'base64' => (bool) preg_match('![^a-z0-9/=+-]!i', $value));
             }
+            break;
+
+        case 'email':
+            $this->raw['EMAIL'][] = array(0 => $value, 'type' => array_filter(array('INTERNET', $type_uc)));
+            $this->email[] = $value;
+            break;
+
+        case 'im':
+            // save IM subtypes into extension fields
+            $typemap = array_flip($this->immap);
+            if ($field = $typemap[strtolower($type)]) {
+                $this->raw[$field][] = array(0 => $value);
+            }
+            break;
 
-            while ($k < count($raw['type']) && ($subtype == 'internet' || $subtype == 'pref'))
-              $subtype = $typemap[$raw['type'][++$k]] ? $typemap[$raw['type'][$k]] : strtolower($raw['type'][$k]);
-          }
-
-          // read vcard 2.1 subtype
-          if (!$subtype) {
-            foreach ($raw as $k => $v) {
-              if (!is_numeric($k) && $v === true && ($k = strtolower($k))
-                && !in_array($k, array('pref','internet','voice','base64'))
-              ) {
-                $k_uc    = strtoupper($k);
-                $subtype = $typemap[$k_uc] ? $typemap[$k_uc] : $k;
-                break;
-              }
+        case 'birthday':
+        case 'anniversary':
+            if (($val = rcube_utils::strtotime($value)) && ($fn = self::$fieldmap[$field])) {
+                $this->raw[$fn][] = array(0 => date('Y-m-d', $val), 'value' => array('date'));
             }
-          }
+            break;
 
-          // force subtype if none set
-          if (!$subtype && preg_match('/^(email|phone|address|website)/', $key))
-            $subtype = 'other';
+        case 'address':
+            if ($this->addresstypemap[$type_uc]) {
+                $type = $this->addresstypemap[$type_uc];
+            }
 
-          if ($subtype)
-            $key .= ':' . $subtype;
+            $value = $value[0] ? $value : array('', '', $value['street'], $value['locality'], $value['region'], $value['zipcode'], $value['country']);
 
-          // split ADR values into assoc array
-          if ($tag == 'ADR') {
-            list(,, $value['street'], $value['locality'], $value['region'], $value['zipcode'], $value['country']) = $raw;
-            $out[$key][] = $value;
-          }
-          else
-            $out[$key][] = $raw[0];
-        }
-        else {
-          $out[$col][] = $raw;
+            // fall through if not empty
+            if (!strlen(join('', $value))) {
+                break;
+            }
+
+        default:
+            if ($field == 'phone' && $this->phonetypemap[$type_uc]) {
+                $type = $this->phonetypemap[$type_uc];
+             }
+
+            if (($tag = self::$fieldmap[$field]) && (is_array($value) || strlen($value))) {
+                $index = count($this->raw[$tag]);
+                $this->raw[$tag][$index] = (array)$value;
+                if ($type) {
+                    $typemap = array_flip($this->typemap);
+                    $this->raw[$tag][$index]['type'] = explode(',', ($typemap[$type_uc] ? $typemap[$type_uc] : $type));
+                }
+            }
+            break;
         }
-      }
     }
 
-    // handle special IM fields as used by Apple
-    foreach ($this->immap as $tag => $type) {
-      foreach ((array)$this->raw[$tag] as $i => $raw) {
-        $out['im:'.$type][] = $raw[0];
-      }
+    /**
+     * Setter for individual vcard properties
+     *
+     * @param string VCard tag name
+     * @param array Value-set of this vcard property
+     * @param boolean Set to true if the value-set should be appended instead of replacing any existing value-set
+     */
+    public function set_raw($tag, $value, $append = false)
+    {
+        $index = $append ? count($this->raw[$tag]) : 0;
+        $this->raw[$tag][$index] = (array)$value;
     }
 
-    // copy photo data
-    if ($this->raw['PHOTO'])
-      $out['photo'] = $this->raw['PHOTO'][0][0];
-
-    return $out;
-  }
-
-
-  /**
-   * Convert the data structure into a vcard 3.0 string
-   */
-  public function export($folded = true)
-  {
-    $vcard = self::vcard_encode($this->raw);
-    return $folded ? self::rfc2425_fold($vcard) : $vcard;
-  }
-
-
-  /**
-   * Clear the given fields in the loaded vcard data
-   *
-   * @param array List of field names to be reset
-   */
-  public function reset($fields = null)
-  {
-    if (!$fields)
-      $fields = array_merge(array_values(self::$fieldmap), array_keys($this->immap), array('FN','N','ORG','NICKNAME','EMAIL','ADR','BDAY'));
-
-    foreach ($fields as $f)
-      unset($this->raw[$f]);
-
-    if (!$this->raw['N'])
-      $this->raw['N'] = array(array('','','','',''));
-    if (!$this->raw['FN'])
-      $this->raw['FN'] = array();
-
-    $this->email = array();
-  }
-
-
-  /**
-   * Setter for address record fields
-   *
-   * @param string Field name
-   * @param string Field value
-   * @param string Type/section name
-   */
-  public function set($field, $value, $type = 'HOME')
-  {
-    $field   = strtolower($field);
-    $type_uc = strtoupper($type);
-
-    switch ($field) {
-      case 'name':
-      case 'displayname':
-        $this->raw['FN'][0][0] = $this->displayname = $value;
-        break;
-
-      case 'surname':
-        $this->raw['N'][0][0] = $this->surname = $value;
-        break;
-
-      case 'firstname':
-        $this->raw['N'][0][1] = $this->firstname = $value;
-        break;
-
-      case 'middlename':
-        $this->raw['N'][0][2] = $this->middlename = $value;
-        break;
-
-      case 'prefix':
-        $this->raw['N'][0][3] = $value;
-        break;
-
-      case 'suffix':
-        $this->raw['N'][0][4] = $value;
-        break;
-
-      case 'nickname':
-        $this->raw['NICKNAME'][0][0] = $this->nickname = $value;
-        break;
-
-      case 'organization':
-        $this->raw['ORG'][0][0] = $this->organization = $value;
-        break;
-
-      case 'photo':
-        if (strpos($value, 'http:') === 0) {
-            // TODO: fetch file from URL and save it locally?
-            $this->raw['PHOTO'][0] = array(0 => $value, 'url' => true);
-        }
-        else {
-            $this->raw['PHOTO'][0] = array(0 => $value, 'base64' => (bool) preg_match('![^a-z0-9/=+-]!i', $value));
-        }
-        break;
-
-      case 'email':
-        $this->raw['EMAIL'][] = array(0 => $value, 'type' => array_filter(array('INTERNET', $type_uc)));
-        $this->email[] = $value;
-        break;
-
-      case 'im':
-        // save IM subtypes into extension fields
-        $typemap = array_flip($this->immap);
-        if ($field = $typemap[strtolower($type)])
-          $this->raw[$field][] = array(0 => $value);
-        break;
-
-      case 'birthday':
-      case 'anniversary':
-        if (($val = rcube_utils::strtotime($value)) && ($fn = self::$fieldmap[$field]))
-          $this->raw[$fn][] = array(0 => date('Y-m-d', $val), 'value' => array('date'));
-        break;
-
-      case 'address':
-        if ($this->addresstypemap[$type_uc])
-          $type = $this->addresstypemap[$type_uc];
-
-        $value = $value[0] ? $value : array('', '', $value['street'], $value['locality'], $value['region'], $value['zipcode'], $value['country']);
-
-        // fall through if not empty
-        if (!strlen(join('', $value)))
-          break;
-
-      default:
-        if ($field == 'phone' && $this->phonetypemap[$type_uc])
-          $type = $this->phonetypemap[$type_uc];
-
-        if (($tag = self::$fieldmap[$field]) && (is_array($value) || strlen($value))) {
-          $index = count($this->raw[$tag]);
-          $this->raw[$tag][$index] = (array)$value;
-          if ($type) {
-            $typemap = array_flip($this->typemap);
-            $this->raw[$tag][$index]['type'] = explode(',', ($typemap[$type_uc] ? $typemap[$type_uc] : $type));
-          }
-        }
-        break;
-    }
-  }
-
-  /**
-   * Setter for individual vcard properties
-   *
-   * @param string VCard tag name
-   * @param array Value-set of this vcard property
-   * @param boolean Set to true if the value-set should be appended instead of replacing any existing value-set
-   */
-  public function set_raw($tag, $value, $append = false)
-  {
-    $index = $append ? count($this->raw[$tag]) : 0;
-    $this->raw[$tag][$index] = (array)$value;
-  }
-
-
-  /**
-   * Find index with the '$type' attribute
-   *
-   * @param string Field name
-   * @return int Field index having $type set
-   */
-  private function get_type_index($field, $type = 'pref')
-  {
-    $result = 0;
-    if ($this->raw[$field]) {
-      foreach ($this->raw[$field] as $i => $data) {
-        if (is_array($data['type']) && in_array_nocase('pref', $data['type']))
-          $result = $i;
-      }
+    /**
+     * Find index with the '$type' attribute
+     *
+     * @param string Field name
+     * @return int Field index having $type set
+     */
+    private function get_type_index($field, $type = 'pref')
+    {
+        $result = 0;
+        if ($this->raw[$field]) {
+            foreach ($this->raw[$field] as $i => $data) {
+                if (is_array($data['type']) && in_array_nocase('pref', $data['type'])) {
+                    $result = $i;
+                }
+            }
+        }
+
+        return $result;
     }
 
-    return $result;
-  }
-
-
-  /**
-   * Convert a whole vcard (array) to UTF-8.
-   * If $force_charset is null, each member value that has a charset parameter will be converted
-   */
-  private static function charset_convert($card, $force_charset = null)
-  {
-    foreach ($card as $key => $node) {
-      foreach ($node as $i => $subnode) {
-        if (is_array($subnode) && (($charset = $force_charset) || ($subnode['charset'] && ($charset = $subnode['charset'][0])))) {
-          foreach ($subnode as $j => $value) {
-            if (is_numeric($j) && is_string($value))
-              $card[$key][$i][$j] = rcube_charset::convert($value, $charset);
-          }
-          unset($card[$key][$i]['charset']);
-        }
-      }
+    /**
+     * Convert a whole vcard (array) to UTF-8.
+     * If $force_charset is null, each member value that has a charset parameter will be converted
+     */
+    private static function charset_convert($card, $force_charset = null)
+    {
+        foreach ($card as $key => $node) {
+            foreach ($node as $i => $subnode) {
+                if (is_array($subnode) && (($charset = $force_charset) || ($subnode['charset'] && ($charset = $subnode['charset'][0])))) {
+                    foreach ($subnode as $j => $value) {
+                        if (is_numeric($j) && is_string($value)) {
+                            $card[$key][$i][$j] = rcube_charset::convert($value, $charset);
+                        }
+                    }
+                    unset($card[$key][$i]['charset']);
+                }
+            }
+        }
+
+        return $card;
     }
 
-    return $card;
-  }
-
-
-  /**
-   * Extends fieldmap definition
-   */
-  public function extend_fieldmap($map)
-  {
-    if (is_array($map))
-      self::$fieldmap = array_merge($map, self::$fieldmap);
-  }
-
-
-  /**
-   * Factory method to import a vcard file
-   *
-   * @param string vCard file content
-   * @return array List of rcube_vcard objects
-   */
-  public static function import($data)
-  {
-    $out = array();
-
-    // check if charsets are specified (usually vcard version < 3.0 but this is not reliable)
-    if (preg_match('/charset=/i', substr($data, 0, 2048)))
-      $charset = null;
-    // detect charset and convert to utf-8
-    else if (($charset = self::detect_encoding($data)) && $charset != RCUBE_CHARSET) {
-      $data = rcube_charset::convert($data, $charset);
-      $data = preg_replace(array('/^[\xFE\xFF]{2}/', '/^\xEF\xBB\xBF/', '/^\x00+/'), '', $data); // also remove BOM
-      $charset = RCUBE_CHARSET;
+    /**
+     * Extends fieldmap definition
+     */
+    public function extend_fieldmap($map)
+    {
+        if (is_array($map)) {
+            self::$fieldmap = array_merge($map, self::$fieldmap);
+        }
     }
 
-    $vcard_block = '';
-    $in_vcard_block = false;
+    /**
+     * Factory method to import a vcard file
+     *
+     * @param string vCard file content
+     *
+     * @return array List of rcube_vcard objects
+     */
+    public static function import($data)
+    {
+        $out = array();
+
+        // check if charsets are specified (usually vcard version < 3.0 but this is not reliable)
+        if (preg_match('/charset=/i', substr($data, 0, 2048))) {
+            $charset = null;
+        }
+        // detect charset and convert to utf-8
+        else if (($charset = self::detect_encoding($data)) && $charset != RCUBE_CHARSET) {
+            $data = rcube_charset::convert($data, $charset);
+            $data = preg_replace(array('/^[\xFE\xFF]{2}/', '/^\xEF\xBB\xBF/', '/^\x00+/'), '', $data); // also remove BOM
+            $charset = RCUBE_CHARSET;
+        }
 
-    foreach (preg_split("/[\r\n]+/", $data) as $i => $line) {
-      if ($in_vcard_block && !empty($line))
-        $vcard_block .= $line . "\n";
+        $vcard_block    = '';
+        $in_vcard_block = false;
 
-      $line = trim($line);
+        foreach (preg_split("/[\r\n]+/", $data) as $i => $line) {
+            if ($in_vcard_block && !empty($line)) {
+                $vcard_block .= $line . "\n";
+            }
 
-      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))
-          $out[] = $obj;
+            $line = trim($line);
 
-        $in_vcard_block = false;
-      }
-      else if (preg_match('/^BEGIN:VCARD$/i', $line)) {
-        $vcard_block = $line . "\n";
-        $in_vcard_block = true;
-      }
+            if (preg_match('/^END:VCARD$/i', $line)) {
+                // parse vcard
+                $obj = new rcube_vcard(self::cleanup($vcard_block), $charset, true, self::$fieldmap);
+                // 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;
+                }
+
+                $in_vcard_block = false;
+            }
+            else if (preg_match('/^BEGIN:VCARD$/i', $line)) {
+                $vcard_block    = $line . "\n";
+                $in_vcard_block = true;
+            }
+        }
+
+        return $out;
     }
 
-    return $out;
-  }
-
-
-  /**
-   * Normalize vcard data for better parsing
-   *
-   * @param string vCard block
-   * @return string Cleaned vcard block
-   */
-  private static function cleanup($vcard)
-  {
-    // Convert special types (like Skype) to normal type='skype' classes with this simple regex ;)
-    $vcard = preg_replace(
-      '/item(\d+)\.(TEL|EMAIL|URL)([^:]*?):(.*?)item\1.X-ABLabel:(?:_\$!<)?([\w-() ]*)(?:>!\$_)?./s',
-      '\2;type=\5\3:\4',
-      $vcard);
-
-    // convert Apple X-ABRELATEDNAMES into X-* fields for better compatibility
-    $vcard = preg_replace_callback(
-      '/item(\d+)\.(X-ABRELATEDNAMES)([^:]*?):(.*?)item\1.X-ABLabel:(?:_\$!<)?([\w-() ]*)(?:>!\$_)?./s',
-      array('self', 'x_abrelatednames_callback'),
-      $vcard);
-
-    // Remove cruft like item1.X-AB*, item1.ADR instead of ADR, and empty lines
-    $vcard = preg_replace(array('/^item\d*\.X-AB.*$/m', '/^item\d*\./m', "/\n+/"), array('', '', "\n"), $vcard);
-
-    // convert X-WAB-GENDER to X-GENDER
-    if (preg_match('/X-WAB-GENDER:(\d)/', $vcard, $matches)) {
-      $value = $matches[1] == '2' ? 'male' : 'female';
-      $vcard = preg_replace('/X-WAB-GENDER:\d/', 'X-GENDER:' . $value, $vcard);
+    /**
+     * Normalize vcard data for better parsing
+     *
+     * @param string vCard block
+     *
+     * @return string Cleaned vcard block
+     */
+    public static function cleanup($vcard)
+    {
+        // Convert special types (like Skype) to normal type='skype' classes with this simple regex ;)
+        $vcard = preg_replace(
+            '/item(\d+)\.(TEL|EMAIL|URL)([^:]*?):(.*?)item\1.X-ABLabel:(?:_\$!<)?([\w-() ]*)(?:>!\$_)?./s',
+            '\2;type=\5\3:\4',
+            $vcard);
+
+        // convert Apple X-ABRELATEDNAMES into X-* fields for better compatibility
+        $vcard = preg_replace_callback(
+            '/item(\d+)\.(X-ABRELATEDNAMES)([^:]*?):(.*?)item\1.X-ABLabel:(?:_\$!<)?([\w-() ]*)(?:>!\$_)?./s',
+            array('self', 'x_abrelatednames_callback'),
+            $vcard);
+
+        // Remove cruft like item1.X-AB*, item1.ADR instead of ADR, and empty lines
+        $vcard = preg_replace(array('/^item\d*\.X-AB.*$/m', '/^item\d*\./m', "/\n+/"), array('', '', "\n"), $vcard);
+
+        // convert X-WAB-GENDER to X-GENDER
+        if (preg_match('/X-WAB-GENDER:(\d)/', $vcard, $matches)) {
+            $value = $matches[1] == '2' ? 'male' : 'female';
+            $vcard = preg_replace('/X-WAB-GENDER:\d/', 'X-GENDER:' . $value, $vcard);
+        }
+
+        // if N doesn't have any semicolons, add some 
+        $vcard = preg_replace('/^(N:[^;\R]*)$/m', '\1;;;;', $vcard);
+
+        return $vcard;
     }
 
-    // if N doesn't have any semicolons, add some 
-    $vcard = preg_replace('/^(N:[^;\R]*)$/m', '\1;;;;', $vcard);
-
-    return $vcard;
-  }
-
-  private static function x_abrelatednames_callback($matches)
-  {
-    return 'X-' . strtoupper($matches[5]) . $matches[3] . ':'. $matches[4];
-  }
-
-  private static function rfc2425_fold_callback($matches)
-  {
-    // chunk_split string and avoid lines breaking multibyte characters
-    $c = 71;
-    $out .= substr($matches[1], 0, $c);
-    for ($n = $c; $c < strlen($matches[1]); $c++) {
-      // break if length > 75 or mutlibyte character starts after position 71
-      if ($n > 75 || ($n > 71 && ord($matches[1][$c]) >> 6 == 3)) {
-        $out .= "\r\n ";
-        $n = 0;
-      }
-      $out .= $matches[1][$c];
-      $n++;
+    private static function x_abrelatednames_callback($matches)
+    {
+        return 'X-' . strtoupper($matches[5]) . $matches[3] . ':'. $matches[4];
     }
 
-    return $out;
-  }
-
-  public static function rfc2425_fold($val)
-  {
-    return preg_replace_callback('/([^\n]{72,})/', array('self', 'rfc2425_fold_callback'), $val);
-  }
-
-
-  /**
-   * Decodes a vcard block (vcard 3.0 format, unfolded)
-   * into an array structure
-   *
-   * @param string vCard block to parse
-   * @return array Raw data structure
-   */
-  private static function vcard_decode($vcard)
-  {
-    // Perform RFC2425 line unfolding and split lines
-    $vcard = preg_replace(array("/\r/", "/\n\s+/"), '', $vcard);
-    $lines = explode("\n", $vcard);
-    $data  = array();
-
-    for ($i=0; $i < count($lines); $i++) {
-      if (!preg_match('/^([^:]+):(.+)$/', $lines[$i], $line))
-        continue;
-
-      if (preg_match('/^(BEGIN|END)$/i', $line[1]))
-        continue;
-
-      // convert 2.1-style "EMAIL;internet;home:" to 3.0-style "EMAIL;TYPE=internet;TYPE=home:"
-      if (($data['VERSION'][0] == "2.1") && preg_match('/^([^;]+);([^:]+)/', $line[1], $regs2) && !preg_match('/^TYPE=/i', $regs2[2])) {
-        $line[1] = $regs2[1];
-        foreach (explode(';', $regs2[2]) as $prop)
-          $line[1] .= ';' . (strpos($prop, '=') ? $prop : 'TYPE='.$prop);
-      }
-
-      if (preg_match_all('/([^\\;]+);?/', $line[1], $regs2)) {
-        $entry = array();
-        $field = strtoupper($regs2[1][0]);
-        $enc   = null;
-
-        foreach($regs2[1] as $attrid => $attr) {
-          if ((list($key, $value) = explode('=', $attr)) && $value) {
-            $value = trim($value);
-            if ($key == 'ENCODING') {
-              $value = strtoupper($value);
-              // add next line(s) to value string if QP line end detected
-              if ($value == 'QUOTED-PRINTABLE') {
-                while (preg_match('/=$/', $lines[$i]))
-                  $line[2] .= "\n" . $lines[++$i];
-              }
-              $enc = $value;
-            }
-            else {
-              $lc_key = strtolower($key);
-              $entry[$lc_key] = array_merge((array)$entry[$lc_key], (array)self::vcard_unquote($value, ','));
+    private static function rfc2425_fold_callback($matches)
+    {
+        // chunk_split string and avoid lines breaking multibyte characters
+        $c = 71;
+        $out .= substr($matches[1], 0, $c);
+        for ($n = $c; $c < strlen($matches[1]); $c++) {
+            // break if length > 75 or mutlibyte character starts after position 71
+            if ($n > 75 || ($n > 71 && ord($matches[1][$c]) >> 6 == 3)) {
+                $out .= "\r\n ";
+                $n = 0;
             }
-          }
-          else if ($attrid > 0) {
-            $entry[strtolower($key)] = true;  // true means attr without =value
-          }
+            $out .= $matches[1][$c];
+            $n++;
         }
 
-        // decode value
-        if ($enc || !empty($entry['base64'])) {
-          // save encoding type (#1488432)
-          if ($enc == 'B') {
-            $entry['encoding'] = 'B';
-            // should we use vCard 3.0 instead?
-            // $entry['base64'] = true;
-          }
-          $line[2] = self::decode_value($line[2], $enc ? $enc : 'base64');
-        }
+        return $out;
+    }
+
+    public static function rfc2425_fold($val)
+    {
+        return preg_replace_callback('/([^\n]{72,})/', array('self', 'rfc2425_fold_callback'), $val);
+    }
 
-        if ($enc != 'B' && empty($entry['base64'])) {
-          $line[2] = self::vcard_unquote($line[2]);
+    /**
+     * Decodes a vcard block (vcard 3.0 format, unfolded)
+     * into an array structure
+     *
+     * @param string vCard block to parse
+     *
+     * @return array Raw data structure
+     */
+    private static function vcard_decode($vcard)
+    {
+        // Perform RFC2425 line unfolding and split lines
+        $vcard = preg_replace(array("/\r/", "/\n\s+/"), '', $vcard);
+        $lines = explode("\n", $vcard);
+        $data  = array();
+
+        for ($i=0; $i < count($lines); $i++) {
+            if (!preg_match('/^([^:]+):(.+)$/', $lines[$i], $line))
+                continue;
+
+            if (preg_match('/^(BEGIN|END)$/i', $line[1]))
+                continue;
+
+            // convert 2.1-style "EMAIL;internet;home:" to 3.0-style "EMAIL;TYPE=internet;TYPE=home:"
+            if ($data['VERSION'][0] == "2.1"
+                && preg_match('/^([^;]+);([^:]+)/', $line[1], $regs2)
+                && !preg_match('/^TYPE=/i', $regs2[2])
+            ) {
+                $line[1] = $regs2[1];
+                foreach (explode(';', $regs2[2]) as $prop) {
+                    $line[1] .= ';' . (strpos($prop, '=') ? $prop : 'TYPE='.$prop);
+                }
+            }
+
+            if (preg_match_all('/([^\\;]+);?/', $line[1], $regs2)) {
+                $entry = array();
+                $field = strtoupper($regs2[1][0]);
+                $enc   = null;
+
+                foreach($regs2[1] as $attrid => $attr) {
+                    if ((list($key, $value) = explode('=', $attr)) && $value) {
+                        $value = trim($value);
+                        if ($key == 'ENCODING') {
+                            $value = strtoupper($value);
+                            // add next line(s) to value string if QP line end detected
+                            if ($value == 'QUOTED-PRINTABLE') {
+                                while (preg_match('/=$/', $lines[$i])) {
+                                    $line[2] .= "\n" . $lines[++$i];
+                                }
+                            }
+                            $enc = $value;
+                        }
+                        else {
+                            $lc_key = strtolower($key);
+                            $entry[$lc_key] = array_merge((array)$entry[$lc_key], (array)self::vcard_unquote($value, ','));
+                        }
+                    }
+                    else if ($attrid > 0) {
+                        $entry[strtolower($key)] = true;  // true means attr without =value
+                    }
+                }
+
+                // decode value
+                if ($enc || !empty($entry['base64'])) {
+                    // save encoding type (#1488432)
+                    if ($enc == 'B') {
+                        $entry['encoding'] = 'B';
+                        // should we use vCard 3.0 instead?
+                        // $entry['base64'] = true;
+                    }
+                    $line[2] = self::decode_value($line[2], $enc ? $enc : 'base64');
+                }
+
+                if ($enc != 'B' && empty($entry['base64'])) {
+                    $line[2] = self::vcard_unquote($line[2]);
+                }
+
+                $entry = array_merge($entry, (array) $line[2]);
+                $data[$field][] = $entry;
+            }
         }
 
-        $entry = array_merge($entry, (array) $line[2]);
-        $data[$field][] = $entry;
-      }
+        unset($data['VERSION']);
+        return $data;
     }
 
-    unset($data['VERSION']);
-    return $data;
-  }
-
-
-  /**
-   * Decode a given string with the encoding rule from ENCODING attributes
-   *
-   * @param string String to decode
-   * @param string Encoding type (quoted-printable and base64 supported)
-   * @return string Decoded 8bit value
-   */
-  private static function decode_value($value, $encoding)
-  {
-    switch (strtolower($encoding)) {
-      case 'quoted-printable':
-        self::$values_decoded = true;
-        return quoted_printable_decode($value);
-
-      case 'base64':
-      case 'b':
-        self::$values_decoded = true;
-        return base64_decode($value);
-
-      default:
-        return $value;
+    /**
+     * Decode a given string with the encoding rule from ENCODING attributes
+     *
+     * @param string String to decode
+     * @param string Encoding type (quoted-printable and base64 supported)
+     *
+     * @return string Decoded 8bit value
+     */
+    private static function decode_value($value, $encoding)
+    {
+        switch (strtolower($encoding)) {
+        case 'quoted-printable':
+            self::$values_decoded = true;
+            return quoted_printable_decode($value);
+
+        case 'base64':
+        case 'b':
+            self::$values_decoded = true;
+            return base64_decode($value);
+
+        default:
+            return $value;
+        }
     }
-  }
-
-
-  /**
-   * Encodes an entry for storage in our database (vcard 3.0 format, unfolded)
-   *
-   * @param array Raw data structure to encode
-   * @return string vCard encoded string
-   */
-  static function vcard_encode($data)
-  {
-    foreach((array)$data as $type => $entries) {
-      /* valid N has 5 properties */
-      while ($type == "N" && is_array($entries[0]) && count($entries[0]) < 5)
-        $entries[0][] = "";
-
-      // make sure FN is not empty (required by RFC2426)
-      if ($type == "FN" && empty($entries))
-        $entries[0] = $data['EMAIL'][0][0];
-
-      foreach((array)$entries as $entry) {
-        $attr = '';
-        if (is_array($entry)) {
-          $value = array();
-          foreach($entry as $attrname => $attrvalues) {
-            if (is_int($attrname)) {
-              if (!empty($entry['base64']) || $entry['encoding'] == 'B') {
-                $attrvalues = base64_encode($attrvalues);
-              }
-              $value[] = $attrvalues;
+
+    /**
+     * Encodes an entry for storage in our database (vcard 3.0 format, unfolded)
+     *
+     * @param array Raw data structure to encode
+     *
+     * @return string vCard encoded string
+     */
+    static function vcard_encode($data)
+    {
+        foreach ((array)$data as $type => $entries) {
+            // valid N has 5 properties
+            while ($type == "N" && is_array($entries[0]) && count($entries[0]) < 5) {
+                $entries[0][] = "";
             }
-            else if (is_bool($attrvalues)) {
-              if ($attrvalues) {
-                $attr .= strtoupper(";$attrname");    // true means just tag, not tag=value, as in PHOTO;BASE64:...
-              }
+
+            // make sure FN is not empty (required by RFC2426)
+            if ($type == "FN" && empty($entries)) {
+                $entries[0] = $data['EMAIL'][0][0];
             }
-            else {
-              foreach((array)$attrvalues as $attrvalue)
-                $attr .= strtoupper(";$attrname=") . self::vcard_quote($attrvalue, ',');
+
+            foreach ((array)$entries as $entry) {
+                $attr = '';
+                if (is_array($entry)) {
+                    $value = array();
+                    foreach ($entry as $attrname => $attrvalues) {
+                        if (is_int($attrname)) {
+                            if (!empty($entry['base64']) || $entry['encoding'] == 'B') {
+                                $attrvalues = base64_encode($attrvalues);
+                            }
+                            $value[] = $attrvalues;
+                        }
+                        else if (is_bool($attrvalues)) {
+                            // true means just tag, not tag=value, as in PHOTO;BASE64:...
+                            if ($attrvalues) {
+                                $attr .= strtoupper(";$attrname");
+                            }
+                        }
+                        else {
+                            foreach((array)$attrvalues as $attrvalue) {
+                                $attr .= strtoupper(";$attrname=") . self::vcard_quote($attrvalue, ',');
+                            }
+                        }
+                    }
+                }
+                else {
+                    $value = $entry;
+                }
+
+                // skip empty entries
+                if (self::is_empty($value)) {
+                    continue;
+                }
+
+                $vcard .= self::vcard_quote($type) . $attr . ':' . self::vcard_quote($value) . self::$eol;
             }
-          }
         }
-        else {
-          $value = $entry;
-        }
-
-        // skip empty entries
-        if (self::is_empty($value))
-          continue;
 
-        $vcard .= self::vcard_quote($type) . $attr . ':' . self::vcard_quote($value) . self::$eol;
-      }
+        return 'BEGIN:VCARD' . self::$eol . 'VERSION:3.0' . self::$eol . $vcard . 'END:VCARD';
     }
 
-    return 'BEGIN:VCARD' . self::$eol . 'VERSION:3.0' . self::$eol . $vcard . 'END:VCARD';
-  }
-
-
-  /**
-   * Join indexed data array to a vcard quoted string
-   *
-   * @param array Field data
-   * @param string Separator
-   * @return string Joined and quoted string
-   */
-  private static function vcard_quote($s, $sep = ';')
-  {
-    if (is_array($s)) {
-      foreach($s as $part) {
-        $r[] = self::vcard_quote($part, $sep);
-      }
-      return(implode($sep, (array)$r));
-    }
-    else {
-      return strtr($s, array('\\' => '\\\\', "\r" => '', "\n" => '\n', ',' => '\,', ';' => '\;'));
-    }
-  }
-
-
-  /**
-   * Split quoted string
-   *
-   * @param string vCard string to split
-   * @param string Separator char/string
-   * @return array List with splited values
-   */
-  private static function vcard_unquote($s, $sep = ';')
-  {
-    // break string into parts separated by $sep, but leave escaped $sep alone
-    if (count($parts = explode($sep, strtr($s, array("\\$sep" => "\007")))) > 1) {
-      foreach($parts as $s) {
-        $result[] = self::vcard_unquote(strtr($s, array("\007" => "\\$sep")), $sep);
-      }
-      return $result;
+    /**
+     * Join indexed data array to a vcard quoted string
+     *
+     * @param array Field data
+     * @param string Separator
+     *
+     * @return string Joined and quoted string
+     */
+    private static function vcard_quote($s, $sep = ';')
+    {
+        if (is_array($s)) {
+            foreach($s as $part) {
+                $r[] = self::vcard_quote($part, $sep);
+            }
+            return(implode($sep, (array)$r));
+        }
+
+        return strtr($s, array('\\' => '\\\\', "\r" => '', "\n" => '\n', ',' => '\,', ';' => '\;'));
     }
-    else {
-      return strtr($s, array("\r" => '', '\\\\' => '\\', '\n' => "\n", '\N' => "\n", '\,' => ',', '\;' => ';', '\:' => ':'));
+
+    /**
+     * Split quoted string
+     *
+     * @param string vCard string to split
+     * @param string Separator char/string
+     *
+     * @return array List with splited values
+     */
+    private static function vcard_unquote($s, $sep = ';')
+    {
+        // break string into parts separated by $sep
+        if (!empty($sep)) {
+            // Handle properly backslash escaping (#1488896)
+            $rep1 = array("\\\\" => "\010", "\\$sep" => "\007");
+            $rep2 = array("\007" => "\\$sep", "\010" => "\\\\");
+
+            if (count($parts = explode($sep, strtr($s, $rep1))) > 1) {
+                foreach ($parts as $s) {
+                    $result[] = self::vcard_unquote(strtr($s, $rep2));
+                }
+                return $result;
+            }
+        }
+
+        return strtr($s, array("\r" => '', '\\\\' => '\\', '\n' => "\n", '\N' => "\n", '\,' => ',', '\;' => ';'));
     }
-  }
-
-
-  /**
-   * Check if vCard entry is empty: empty string or an array with
-   * all entries empty.
-   *
-   * @param mixed $value Attribute value (string or array)
-   *
-   * @return bool True if the value is empty, False otherwise
-   */
-  private static function is_empty($value)
-  {
-    foreach ((array)$value as $v) {
-      if (((string)$v) !== '') {
-        return false;
-      }
+
+    /**
+     * Check if vCard entry is empty: empty string or an array with
+     * all entries empty.
+     *
+     * @param mixed $value Attribute value (string or array)
+     *
+     * @return bool True if the value is empty, False otherwise
+     */
+    private static function is_empty($value)
+    {
+        foreach ((array)$value as $v) {
+            if (((string)$v) !== '') {
+                return false;
+            }
+        }
+
+        return true;
     }
 
-    return true;
-  }
-
-  /**
-   * Extract array values by a filter
-   *
-   * @param array Array to filter
-   * @param keys Array or comma separated list of values to keep
-   * @param boolean Invert key selection: remove the listed values
-   * @return array The filtered array
-   */
-  private static function array_filter($arr, $values, $inverse = false)
-  {
-    if (!is_array($values))
-      $values = explode(',', $values);
-
-    $result = array();
-    $keep = array_flip((array)$values);
-    foreach ($arr as $key => $val)
-      if ($inverse != isset($keep[strtolower($val)]))
-        $result[$key] = $val;
-
-    return $result;
-  }
-
-  /**
-   * Returns UNICODE type based on BOM (Byte Order Mark)
-   *
-   * @param string Input string to test
-   * @return string Detected encoding
-   */
-  private static function detect_encoding($string)
-  {
-    $fallback = rcube::get_instance()->config->get('default_charset', 'ISO-8859-1'); // fallback to Latin-1
-
-    return rcube_charset::detect($string, $fallback);
-  }
+    /**
+     * Extract array values by a filter
+     *
+     * @param array Array to filter
+     * @param keys Array or comma separated list of values to keep
+     * @param boolean Invert key selection: remove the listed values
+     *
+     * @return array The filtered array
+     */
+    private static function array_filter($arr, $values, $inverse = false)
+    {
+        if (!is_array($values)) {
+            $values = explode(',', $values);
+        }
+
+        $result = array();
+        $keep   = array_flip((array)$values);
 
+        foreach ($arr as $key => $val) {
+            if ($inverse != isset($keep[strtolower($val)])) {
+                $result[$key] = $val;
+            }
+        }
+
+        return $result;
+    }
+
+    /**
+     * Returns UNICODE type based on BOM (Byte Order Mark)
+     *
+     * @param string Input string to test
+     *
+     * @return string Detected encoding
+     */
+    private static function detect_encoding($string)
+    {
+        $fallback = rcube::get_instance()->config->get('default_charset', 'ISO-8859-1'); // fallback to Latin-1
+
+        return rcube_charset::detect($string, $fallback);
+    }
 }
diff --git a/program/lib/Roundcube/rcube_washtml.php b/program/lib/Roundcube/rcube_washtml.php
new file mode 100644
index 000000000..27dff9f48
--- /dev/null
+++ b/program/lib/Roundcube/rcube_washtml.php
@@ -0,0 +1,453 @@
+<?php
+
+/**
+ +-----------------------------------------------------------------------+
+ | This file is part of the Roundcube Webmail client                     |
+ | Copyright (C) 2008-2012, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the 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:                                                              |
+ |   Utility class providing HTML sanityzer (based on Washtml class)     |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas Bruederli <roundcube@gmail.com>                        |
+ | Author: Aleksander Machniak <alec@alec.pl>                            |
+ | Author: Frederic Motte <fmotte@ubixis.com>                            |
+ +-----------------------------------------------------------------------+
+ */
+
+/**
+ *                Washtml, a HTML sanityzer.
+ *
+ * Copyright (c) 2007 Frederic Motte <fmotte@ubixis.com>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * OVERVIEW:
+ *
+ * Wahstml take an untrusted HTML and return a safe html string.
+ *
+ * SYNOPSIS:
+ *
+ * $washer = new washtml($config);
+ * $washer->wash($html);
+ * It return a sanityzed string of the $html parameter without html and head tags.
+ * $html is a string containing the html code to wash.
+ * $config is an array containing options:
+ *   $config['allow_remote'] is a boolean to allow link to remote images.
+ *   $config['blocked_src'] string with image-src to be used for blocked remote images
+ *   $config['show_washed'] is a boolean to include washed out attributes as x-washed
+ *   $config['cid_map'] is an array where cid urls index urls to replace them.
+ *   $config['charset'] is a string containing the charset of the HTML document if it is not defined in it.
+ * $washer->extlinks is a reference to a boolean that is set to true if remote images were removed. (FE: show remote images link)
+ *
+ * INTERNALS:
+ *
+ * Only tags and attributes in the static lists $html_elements and $html_attributes
+ * are kept, inline styles are also filtered: all style identifiers matching
+ * /[a-z\-]/i are allowed. Values matching colors, sizes, /[a-z\-]/i and safe
+ * urls if allowed and cid urls if mapped are kept.
+ *
+ * Roundcube Changes:
+ * - added $block_elements
+ * - changed $ignore_elements behaviour
+ * - added RFC2397 support
+ * - base URL support
+ * - invalid HTML comments removal before parsing
+ * - "fixing" unitless CSS values for XHTML output
+ * - base url resolving
+ */
+
+/**
+ * Utility class providing HTML sanityzer
+ *
+ * @package    Framework
+ * @subpackage Utils
+ */
+class rcube_washtml
+{
+    /* Allowed HTML elements (default) */
+    static $html_elements = array('a', 'abbr', 'acronym', 'address', 'area', 'b',
+        'basefont', 'bdo', 'big', 'blockquote', 'br', 'caption', 'center',
+        'cite', 'code', 'col', 'colgroup', 'dd', 'del', 'dfn', 'dir', 'div', 'dl',
+        'dt', 'em', 'fieldset', 'font', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'hr', 'i',
+        'ins', 'label', 'legend', 'li', 'map', 'menu', 'nobr', 'ol', 'p', 'pre', 'q',
+        's', 'samp', 'small', 'span', 'strike', 'strong', 'sub', 'sup', 'table',
+        'tbody', 'td', 'tfoot', 'th', 'thead', 'tr', 'tt', 'u', 'ul', 'var', 'wbr', 'img',
+        // form elements
+        'button', 'input', 'textarea', 'select', 'option', 'optgroup'
+    );
+
+    /* Ignore these HTML tags and their content */
+    static $ignore_elements = array('script', 'applet', 'embed', 'object', 'style');
+
+    /* Allowed HTML attributes */
+    static $html_attribs = array('name', 'class', 'title', 'alt', 'width', 'height',
+        'align', 'nowrap', 'col', 'row', 'id', 'rowspan', 'colspan', 'cellspacing',
+        'cellpadding', 'valign', 'bgcolor', 'color', 'border', 'bordercolorlight',
+        'bordercolordark', 'face', 'marginwidth', 'marginheight', 'axis', 'border',
+        'abbr', 'char', 'charoff', 'clear', 'compact', 'coords', 'vspace', 'hspace',
+        'cellborder', 'size', 'lang', 'dir', 'usemap', 'shape', 'media',
+        // attributes of form elements
+        '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',
+    );
+
+    /* State for linked objects in HTML */
+    public $extlinks = false;
+
+    /* Current settings */
+    private $config = array();
+
+    /* Registered callback functions for tags */
+    private $handlers = array();
+
+    /* Allowed HTML elements */
+    private $_html_elements = array();
+
+    /* 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();
+
+    /* Allowed HTML attributes */
+    private $_html_attribs = array();
+
+
+    /**
+     * Class constructor
+     */
+    public function __construct($p = array())
+    {
+        $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);
+
+        unset($p['html_elements'], $p['html_attribs'], $p['ignore_elements'], $p['block_elements']);
+
+        $this->config = $p + array('show_washed' => true, 'allow_remote' => false, 'cid_map' => array());
+    }
+
+    /**
+     * Register a callback function for a certain tag
+     */
+    public function add_callback($tagName, $callback)
+    {
+        $this->handlers[$tagName] = $callback;
+    }
+
+    /**
+     * Check CSS style
+     */
+    private function wash_style($style)
+    {
+        $s = '';
+
+        foreach (explode(';', $style) as $declaration) {
+            if (preg_match('/^\s*([a-z\-]+)\s*:\s*(.*)\s*$/i', $declaration, $match)) {
+                $cssid = $match[1];
+                $str   = $match[2];
+                $value = '';
+
+                while (sizeof($str) > 0 &&
+                    preg_match('/^(url\(\s*[\'"]?([^\'"\)]*)[\'"]?\s*\)'./*1,2*/
+                        '|rgb\(\s*[0-9]+\s*,\s*[0-9]+\s*,\s*[0-9]+\s*\)'.
+                        '|-?[0-9.]+\s*(em|ex|px|cm|mm|in|pt|pc|deg|rad|grad|ms|s|hz|khz|%)?'.
+                        '|#[0-9a-f]{3,6}'.
+                        '|[a-z0-9", -]+'.
+                        ')\s*/i', $str, $match)
+                ) {
+                    if ($match[2]) {
+                        if (($src = $this->config['cid_map'][$match[2]])
+                            || ($src = $this->config['cid_map'][$this->config['base_url'].$match[2]])
+                        ) {
+                            $value .= ' url('.htmlspecialchars($src, ENT_QUOTES) . ')';
+                        }
+                        else if (preg_match('!^(https?:)?//[a-z0-9/._+-]+$!i', $match[2], $url)) {
+                            if ($this->config['allow_remote']) {
+                                $value .= ' url('.htmlspecialchars($url[0], ENT_QUOTES).')';
+                            }
+                            else {
+                                $this->extlinks = true;
+                            }
+                        }
+                        else if (preg_match('/^data:.+/i', $match[2])) { // RFC2397
+                            $value .= ' url('.htmlspecialchars($match[2], ENT_QUOTES).')';
+                        }
+                    }
+                    else {
+                        // whitelist ?
+                        $value .= ' ' . $match[0];
+
+                        // #1488535: Fix size units, so width:800 would be changed to width:800px
+                        if (preg_match('/(left|right|top|bottom|width|height)/i', $cssid)
+                            && preg_match('/^[0-9]+$/', $match[0])
+                        ) {
+                            $value .= 'px';
+                        }
+                    }
+
+                    $str = substr($str, strlen($match[0]));
+                }
+
+                if (isset($value[0])) {
+                    $s .= ($s?' ':'') . $cssid . ':' . $value . ';';
+                }
+            }
+        }
+
+        return $s;
+    }
+
+    /**
+     * Take a node and return allowed attributes and check values
+     */
+    private function wash_attribs($node)
+    {
+        $t = '';
+        $washed = '';
+
+        foreach ($node->attributes as $key => $plop) {
+            $key   = strtolower($key);
+            $value = $node->getAttribute($key);
+
+            if (isset($this->_html_attribs[$key]) ||
+                ($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) . '"';
+            }
+            else if ($key == 'style' && ($style = $this->wash_style($value))) {
+                $quot = strpos($style, '"') !== false ? "'" : '"';
+                $t .= ' style=' . $quot . $style . $quot;
+            }
+            else if ($key == 'background' || ($key == 'src' && strtolower($node->tagName) == 'img')) { //check tagName anyway
+                if (($src = $this->config['cid_map'][$value])
+                    || ($src = $this->config['cid_map'][$this->config['base_url'].$value])
+                ) {
+                    $t .= ' ' . $key . '="' . htmlspecialchars($src, ENT_QUOTES) . '"';
+                }
+                else if (preg_match('/^(http|https|ftp):.+/i', $value)) {
+                    if ($this->config['allow_remote']) {
+                        $t .= ' ' . $key . '="' . htmlspecialchars($value, ENT_QUOTES) . '"';
+                    }
+                    else {
+                        $this->extlinks = true;
+                        if ($this->config['blocked_src']) {
+                            $t .= ' ' . $key . '="' . htmlspecialchars($this->config['blocked_src'], ENT_QUOTES) . '"';
+                        }
+                    }
+                }
+                else if (preg_match('/^data:.+/i', $value)) { // RFC2397
+                    $t .= ' ' . $key . '="' . htmlspecialchars($value, ENT_QUOTES) . '"';
+                }
+            }
+            else {
+                $washed .= ($washed ? ' ' : '') . $key;
+            }
+        }
+
+        return $t . ($washed && $this->config['show_washed'] ? ' x-washed="'.$washed.'"' : '');
+    }
+
+    /**
+     * The main loop that recurse on a node tree.
+     * It output only allowed tags with allowed attributes
+     * and allowed inline styles
+     */
+    private function dumpHtml($node)
+    {
+        if (!$node->hasChildNodes()) {
+            return '';
+        }
+
+        $node = $node->firstChild;
+        $dump = '';
+
+        do {
+            switch($node->nodeType) {
+            case XML_ELEMENT_NODE: //Check element
+                $tagName = strtolower($node->tagName);
+                if ($callback = $this->handlers[$tagName]) {
+                    $dump .= call_user_func($callback, $tagName,
+                        $this->wash_attribs($node), $this->dumpHtml($node), $this);
+                }
+                else if (isset($this->_html_elements[$tagName])) {
+                    $content = $this->dumpHtml($node);
+                    $dump .= '<' . $tagName . $this->wash_attribs($node) .
+                        ($content != '' || isset($this->_block_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
+                }
+                break;
+
+            case XML_CDATA_SECTION_NODE:
+                $dump .= $node->nodeValue;
+                break;
+
+            case XML_TEXT_NODE:
+                $dump .= htmlspecialchars($node->nodeValue);
+                break;
+
+            case XML_HTML_DOCUMENT_NODE:
+                $dump .= $this->dumpHtml($node);
+                break;
+
+            case XML_DOCUMENT_TYPE_NODE:
+                break;
+
+            default:
+                $dump . '<!-- node type ' . $node->nodeType . ' -->';
+            }
+        } while($node = $node->nextSibling);
+
+        return $dump;
+    }
+
+    /**
+     * Main function, give it untrusted HTML, tell it if you allow loading
+     * remote images and give it a map to convert "cid:" urls.
+     */
+    public function wash($html)
+    {
+        // Charset seems to be ignored (probably if defined in the HTML document)
+        $node = new DOMDocument('1.0', $this->config['charset']);
+        $this->extlinks = false;
+
+        $html = $this->cleanup($html);
+
+        // Find base URL for images
+        if (preg_match('/<base\s+href=[\'"]*([^\'"]+)/is', $html, $matches)) {
+            $this->config['base_url'] = $matches[1];
+        }
+        else {
+            $this->config['base_url'] = '';
+        }
+
+        @$node->loadHTML($html);
+        return $this->dumpHtml($node);
+    }
+
+    /**
+     * Getter for config parameters
+     */
+    public function get_config($prop)
+    {
+        return $this->config[$prop];
+    }
+
+    /**
+     * Clean HTML input
+     */
+    private function cleanup($html)
+    {
+        // special replacements (not properly handled by washtml class)
+        $html_search = array(
+            '/(<\/nobr>)(\s+)(<nobr>)/i',       // space(s) between <NOBR>
+            '/<title[^>]*>[^<]*<\/title>/i',    // PHP bug #32547 workaround: remove title tag
+            '/^(\0\0\xFE\xFF|\xFF\xFE\0\0|\xFE\xFF|\xFF\xFE|\xEF\xBB\xBF)/',    // byte-order mark (only outlook?)
+            '/<html\s[^>]+>/i',                 // washtml/DOMDocument cannot handle xml namespaces
+        );
+
+        $html_replace = array(
+            '\\1'.' &nbsp; '.'\\3',
+            '',
+            '',
+            '<html>',
+        );
+        $html = preg_replace($html_search, $html_replace, trim($html));
+
+        // PCRE errors handling (#1486856), should we use something like for every preg_* use?
+        if ($html === null && ($preg_error = preg_last_error()) != PREG_NO_ERROR) {
+            $errstr = "Could not clean up HTML message! PCRE Error: $preg_error.";
+
+            if ($preg_error == PREG_BACKTRACK_LIMIT_ERROR) {
+                $errstr .= " Consider raising pcre.backtrack_limit!";
+            }
+            if ($preg_error == PREG_RECURSION_LIMIT_ERROR) {
+                $errstr .= " Consider raising pcre.recursion_limit!";
+            }
+
+            rcube::raise_error(array('code' => 620, 'type' => 'php',
+                'line' => __LINE__, 'file' => __FILE__,
+                'message' => $errstr), true, false);
+            return '';
+        }
+
+        // fix (unknown/malformed) HTML tags before "wash"
+        $html = preg_replace_callback('/(<[\/]*)([^\s>]+)/', array($this, 'html_tag_callback'), $html);
+
+        // Remove invalid HTML comments (#1487759)
+        // Don't remove valid conditional comments
+        // Don't remove MSOutlook (<!-->) conditional comments (#1489004)
+        $html = preg_replace('/<!--[^->\[\n]+>/', '', $html);
+
+        // turn relative into absolute urls
+        $html = self::resolve_base($html);
+
+        return $html;
+    }
+
+    /**
+     * Callback function for HTML tags fixing
+     */
+    public static function html_tag_callback($matches)
+    {
+        $tagname = $matches[2];
+        $tagname = preg_replace(array(
+            '/:.*$/',               // Microsoft's Smart Tags <st1:xxxx>
+            '/[^a-z0-9_\[\]\!-]/i', // forbidden characters
+        ), '', $tagname);
+
+        return $matches[1] . $tagname;
+    }
+
+    /**
+     * Convert all relative URLs according to a <base> in HTML
+     */
+    public static function resolve_base($body)
+    {
+        // check for <base href=...>
+        if (preg_match('!(<base.*href=["\']?)([hftps]{3,5}://[a-z0-9/.%-]+)!i', $body, $regs)) {
+            $replacer = new rcube_base_replacer($regs[2]);
+            $body     = $replacer->replace($body);
+        }
+
+        return $body;
+    }
+}
+
diff --git a/program/lib/enriched.inc b/program/lib/enriched.inc
deleted file mode 100644
index e3abd8c4f..000000000
--- a/program/lib/enriched.inc
+++ /dev/null
@@ -1,114 +0,0 @@
-<?php
-/*
-	File:		read_enriched.inc
-	Author: 	Ryo Chijiiwa
-	License:	GPL (part of IlohaMail)
-	Purpose: 	functions for handling text/enriched messages
-	Reference: 	RFC 1523, 1896
-*/
-
-
-function enriched_convert_newlines($str){
-	//remove single newlines, convert N newlines to N-1
-	
-	$str = str_replace("\r\n","\n",$str);
-	$len = strlen($str);
-	
-	$nl = 0;
-	$out = '';
-	for($i=0;$i<$len;$i++){
-		$c = $str[$i];
-		if (ord($c)==10) $nl++;
-		if ($nl && ord($c)!=10) $nl = 0;
-		if ($nl!=1) $out.=$c;
-		else $out.=' ';		
-	}
-	return $out;
-}
-
-function enriched_convert_formatting($body){
-	$a=array('<bold>'=>'<b>','</bold>'=>'</b>','<italic>'=>'<i>',
-			'</italic>'=>'</i>','<fixed>'=>'<tt>','</fixed>'=>'</tt>',
-			'<smaller>'=>'<font size=-1>','</smaller>'=>'</font>',
-			'<bigger>'=>'<font size=+1>','</bigger>'=>'</font>',
-			'<underline>'=>'<span style="text-decoration: underline">',
-			'</underline>'=>'</span>',
-			'<flushleft>'=>'<span style="text-align:left">',
-			'</flushleft>'=>'</span>',
-			'<flushright>'=>'<span style="text-align:right">',
-			'</flushright>'=>'</span>',
-			'<flushboth>'=>'<span style="text-align:justified">',
-			'</flushboth>'=>'</span>',
-			'<indent>'=>'<span style="padding-left: 20px">',
-			'</indent>'=>'</span>',
-			'<indentright>'=>'<span style="padding-right: 20px">',
-			'</indentright>'=>'</span>');
-	
-	while(list($find,$replace)=each($a)){
-		$body = preg_replace('#'.$find.'#i', $replace, $body);
-	}
-	return $body;
-}
-
-function enriched_font($body){
-	$pattern = '/(.*)\<fontfamily\>\<param\>(.*)\<\/param\>(.*)\<\/fontfamily\>(.*)/ims';
-	while(preg_match($pattern,$body,$a)){
-		//print_r($a);
-		if (count($a)!=5) continue;
-		$body=$a[1].'<span style="font-family: '.$a[2].'">'.$a[3].'</span>'.$a[4];
-	}
-
-	return $body;
-}
-
-
-function enriched_color($body){
-	$pattern = '/(.*)\<color\>\<param\>(.*)\<\/param\>(.*)\<\/color\>(.*)/ims';
-	while(preg_match($pattern,$body,$a)){
-		//print_r($a);
-		if (count($a)!=5) continue;
-
-		//extract color (either by name, or ####,####,####)
-		if (strpos($a[2],',')){
-			$rgb = explode(',',$a[2]);
-			$color ='#';
-			for($i=0;$i<3;$i++) $color.=substr($rgb[$i],0,2); //just take first 2 bytes
-		}else{
-			$color = $a[2];
-		}
-		
-		//put it all together
-		$body = $a[1].'<span style="color: '.$color.'">'.$a[3].'</span>'.$a[4];
-	}
-
-	return $body;
-}
-
-function enriched_excerpt($body){
-
-	$pattern = '/(.*)\<excerpt\>(.*)\<\/excerpt\>(.*)/i';
-	while(preg_match($pattern,$body,$a)){
-		//print_r($a);
-		if (count($a)!=4) continue;
-		$quoted = '';
-		$lines = explode('<br>',$a[2]);
-		foreach($lines as $n=>$line) $quoted.='&gt;'.$line.'<br>';
-		$body=$a[1].'<span class="quotes">'.$quoted.'</span>'.$a[3];
-	}
-
-	return $body;
-}
-
-function enriched_to_html($body){
-	$body = str_replace('<<','&lt;',$body);
-	$body = enriched_convert_newlines($body);
-	$body = str_replace("\n", '<br>', $body);
-	$body = enriched_convert_formatting($body);
-	$body = enriched_color($body);
-	$body = enriched_font($body);
-	$body = enriched_excerpt($body);
-	//$body = nl2br($body);
-	return $body;
-}
-
-?>
\ No newline at end of file
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/washtml.php b/program/lib/washtml.php
deleted file mode 100644
index 0d4ffdb4b..000000000
--- a/program/lib/washtml.php
+++ /dev/null
@@ -1,330 +0,0 @@
-<?php
-/*                Washtml, a HTML sanityzer.
- *
- * Copyright (c) 2007 Frederic Motte <fmotte@ubixis.com>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* Please send me your comments about this code if you have some, thanks, Fred. */
-
-/* OVERVIEW:
- *
- * Wahstml take an untrusted HTML and return a safe html string.
- *
- * SYNOPSIS:
- *
- * $washer = new washtml($config);
- * $washer->wash($html);
- * It return a sanityzed string of the $html parameter without html and head tags.
- * $html is a string containing the html code to wash.
- * $config is an array containing options:
- *   $config['allow_remote'] is a boolean to allow link to remote images.
- *   $config['blocked_src'] string with image-src to be used for blocked remote images
- *   $config['show_washed'] is a boolean to include washed out attributes as x-washed
- *   $config['cid_map'] is an array where cid urls index urls to replace them.
- *   $config['charset'] is a string containing the charset of the HTML document if it is not defined in it.
- * $washer->extlinks is a reference to a boolean that is set to true if remote images were removed. (FE: show remote images link)
- *
- * INTERNALS:
- *
- * Only tags and attributes in the static lists $html_elements and $html_attributes
- * are kept, inline styles are also filtered: all style identifiers matching
- * /[a-z\-]/i are allowed. Values matching colors, sizes, /[a-z\-]/i and safe
- * urls if allowed and cid urls if mapped are kept.
- *
- * BUGS: It MUST be safe !
- *  - Check regexp
- *  - urlencode URLs instead of htmlspecials
- *  - Check is a 3 bytes utf8 first char can eat '">'
- *  - Update PCRE: CVE-2007-1659 - CVE-2007-1660 - CVE-2007-1661 - CVE-2007-1662 
- *                 CVE-2007-4766 - CVE-2007-4767 - CVE-2007-4768  
- *    http://lists.debian.org/debian-security-announce/debian-security-announce-2007/msg00177.html 
- *  - ...
- *
- * MISSING:
- *  - relative links, can be implemented by prefixing an absolute path, ask me
- *    if you need it...
- *  - ...
- *
- * Dont be a fool:
- *  - Dont alter data on a GET: '<img src="http://yourhost/mail?action=delete&uid=3267" />'
- *  - ...
- *
- * Roundcube Changes:
- * - added $block_elements
- * - changed $ignore_elements behaviour
- * - added RFC2397 support
- * - base URL support
- * - invalid HTML comments removal before parsing
- * - "fixing" unitless CSS values for XHTML output
- */
-
-class washtml
-{
-  /* Allowed HTML elements (default) */
-  static $html_elements = array('a', 'abbr', 'acronym', 'address', 'area', 'b',
-    'basefont', 'bdo', 'big', 'blockquote', 'br', 'caption', 'center',
-    'cite', 'code', 'col', 'colgroup', 'dd', 'del', 'dfn', 'dir', 'div', 'dl',
-    'dt', 'em', 'fieldset', 'font', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'hr', 'i',
-    'ins', 'label', 'legend', 'li', 'map', 'menu', 'nobr', 'ol', 'p', 'pre', 'q',
-    's', 'samp', 'small', 'span', 'strike', 'strong', 'sub', 'sup', 'table',
-    'tbody', 'td', 'tfoot', 'th', 'thead', 'tr', 'tt', 'u', 'ul', 'var', 'wbr', 'img',
-    // form elements
-    'button', 'input', 'textarea', 'select', 'option', 'optgroup'
-  );
-
-  /* Ignore these HTML tags and their content */
-  static $ignore_elements = array('script', 'applet', 'embed', 'object', 'style');
-
-  /* Allowed HTML attributes */
-  static $html_attribs = array('name', 'class', 'title', 'alt', 'width', 'height',
-    'align', 'nowrap', 'col', 'row', 'id', 'rowspan', 'colspan', 'cellspacing',
-    'cellpadding', 'valign', 'bgcolor', 'color', 'border', 'bordercolorlight',
-    'bordercolordark', 'face', 'marginwidth', 'marginheight', 'axis', 'border',
-    'abbr', 'char', 'charoff', 'clear', 'compact', 'coords', 'vspace', 'hspace',
-    'cellborder', 'size', 'lang', 'dir', 'usemap', 'shape', 'media',
-    // attributes of form elements
-    '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');
-
-  /* State for linked objects in HTML */
-  public $extlinks = false;
-
-  /* Current settings */
-  private $config = array();
-
-  /* Registered callback functions for tags */
-  private $handlers = array();
-
-  /* Allowed HTML elements */
-  private $_html_elements = array();
-
-  /* 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();
-
-  /* Allowed HTML attributes */
-  private $_html_attribs = array();
-
-
-  /* Constructor */
-  public function __construct($p = array())
-  {
-    $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);
-    unset($p['html_elements'], $p['html_attribs'], $p['ignore_elements'], $p['block_elements']);
-    $this->config = $p + array('show_washed'=>true, 'allow_remote'=>false, 'cid_map'=>array());
-  }
-
-  /* Register a callback function for a certain tag */
-  public function add_callback($tagName, $callback)
-  {
-    $this->handlers[$tagName] = $callback;
-  }
-
-  /* Check CSS style */
-  private function wash_style($style)
-  {
-    $s = '';
-
-    foreach (explode(';', $style) as $declaration) {
-      if (preg_match('/^\s*([a-z\-]+)\s*:\s*(.*)\s*$/i', $declaration, $match)) {
-        $cssid = $match[1];
-        $str   = $match[2];
-        $value = '';
-
-        while (sizeof($str) > 0 &&
-          preg_match('/^(url\(\s*[\'"]?([^\'"\)]*)[\'"]?\s*\)'./*1,2*/
-                 '|rgb\(\s*[0-9]+\s*,\s*[0-9]+\s*,\s*[0-9]+\s*\)'.
-                 '|-?[0-9.]+\s*(em|ex|px|cm|mm|in|pt|pc|deg|rad|grad|ms|s|hz|khz|%)?'.
-                 '|#[0-9a-f]{3,6}'.
-                 '|[a-z0-9", -]+'.
-                 ')\s*/i', $str, $match)
-        ) {
-          if ($match[2]) {
-            if (($src = $this->config['cid_map'][$match[2]])
-                || ($src = $this->config['cid_map'][$this->config['base_url'].$match[2]])) {
-              $value .= ' url('.htmlspecialchars($src, ENT_QUOTES) . ')';
-            }
-            else if (preg_match('!^(https?:)?//[a-z0-9/._+-]+$!i', $match[2], $url)) {
-              if ($this->config['allow_remote'])
-                $value .= ' url('.htmlspecialchars($url[0], ENT_QUOTES).')';
-              else
-                $this->extlinks = true;
-            }
-            else if (preg_match('/^data:.+/i', $match[2])) { // RFC2397
-              $value .= ' url('.htmlspecialchars($match[2], ENT_QUOTES).')';
-            }
-          }
-          else { //whitelist ?
-            $value .= ' ' . $match[0];
-
-            // #1488535: Fix size units, so width:800 would be changed to width:800px
-            if (preg_match('/(left|right|top|bottom|width|height)/i', $cssid) && preg_match('/^[0-9]+$/', $match[0])) {
-              $value .= 'px';
-            }
-          }
-
-          $str = substr($str, strlen($match[0]));
-        }
-
-        if (isset($value[0])) {
-          $s .= ($s?' ':'') . $cssid . ':' . $value . ';';
-        }
-      }
-    }
-    return $s;
-  }
-
-  /* Take a node and return allowed attributes and check values */
-  private function wash_attribs($node)
-  {
-    $t = '';
-    $washed;
-
-    foreach ($node->attributes as $key => $plop) {
-      $key = strtolower($key);
-      $value = $node->getAttribute($key);
-      if (isset($this->_html_attribs[$key]) ||
-         ($key == 'href' && !preg_match('!^javascript!i', $value)
-           && preg_match('!^([a-z][a-z0-9.+-]+:|//|#).+!i', $value))
-      ) {
-        $t .= ' ' . $key . '="' . htmlspecialchars($value, ENT_QUOTES) . '"';
-      }
-      else if ($key == 'style' && ($style = $this->wash_style($value))) {
-        $quot = strpos($style, '"') !== false ? "'" : '"';
-        $t .= ' style=' . $quot . $style . $quot;
-      }
-      else if ($key == 'background' || ($key == 'src' && strtolower($node->tagName) == 'img')) { //check tagName anyway
-        if (($src = $this->config['cid_map'][$value])
-            || ($src = $this->config['cid_map'][$this->config['base_url'].$value])) {
-          $t .= ' ' . $key . '="' . htmlspecialchars($src, ENT_QUOTES) . '"';
-        }
-        else if (preg_match('/^(http|https|ftp):.+/i', $value)) {
-          if ($this->config['allow_remote'])
-            $t .= ' ' . $key . '="' . htmlspecialchars($value, ENT_QUOTES) . '"';
-          else {
-            $this->extlinks = true;
-            if ($this->config['blocked_src'])
-              $t .= ' ' . $key . '="' . htmlspecialchars($this->config['blocked_src'], ENT_QUOTES) . '"';
-          }
-        }
-        else if (preg_match('/^data:.+/i', $value)) { // RFC2397
-          $t .= ' ' . $key . '="' . htmlspecialchars($value, ENT_QUOTES) . '"';
-        }
-      }
-      else
-        $washed .= ($washed?' ':'') . $key;
-    }
-    return $t . ($washed && $this->config['show_washed']?' x-washed="'.$washed.'"':'');
-  }
-
-  /* The main loop that recurse on a node tree.
-   * It output only allowed tags with allowed attributes
-   * and allowed inline styles */
-  private function dumpHtml($node)
-  {
-    if(!$node->hasChildNodes())
-      return '';
-
-    $node = $node->firstChild;
-    $dump = '';
-
-    do {
-      switch($node->nodeType) {
-      case XML_ELEMENT_NODE: //Check element
-        $tagName = strtolower($node->tagName);
-        if ($callback = $this->handlers[$tagName]) {
-          $dump .= call_user_func($callback, $tagName, $this->wash_attribs($node), $this->dumpHtml($node), $this);
-        }
-        else if (isset($this->_html_elements[$tagName])) {
-          $content = $this->dumpHtml($node);
-          $dump .= '<' . $tagName . $this->wash_attribs($node) .
-            ($content != '' || isset($this->_block_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
-        }
-        break;
-      case XML_CDATA_SECTION_NODE:
-        $dump .= $node->nodeValue;
-        break;
-      case XML_TEXT_NODE:
-        $dump .= htmlspecialchars($node->nodeValue);
-        break;
-      case XML_HTML_DOCUMENT_NODE:
-        $dump .= $this->dumpHtml($node);
-        break;
-      case XML_DOCUMENT_TYPE_NODE:
-        break;
-      default:
-        $dump . '<!-- node type ' . $node->nodeType . ' -->';
-      }
-    } while($node = $node->nextSibling);
-
-    return $dump;
-  }
-
-  /* Main function, give it untrusted HTML, tell it if you allow loading
-   * remote images and give it a map to convert "cid:" urls. */
-  public function wash($html)
-  {
-    // Charset seems to be ignored (probably if defined in the HTML document)
-    $node = new DOMDocument('1.0', $this->config['charset']);
-    $this->extlinks = false;
-
-    // Find base URL for images
-    if (preg_match('/<base\s+href=[\'"]*([^\'"]+)/is', $html, $matches))
-      $this->config['base_url'] = $matches[1];
-    else
-      $this->config['base_url'] = '';
-
-    // Remove invalid HTML comments (#1487759)
-    // Don't remove valid conditional comments
-    $html = preg_replace('/<!--[^->[\n]*>/', '', $html);
-
-    @$node->loadHTML($html);
-    return $this->dumpHtml($node);
-  }
-
-  /**
-   * Getter for config parameters
-   */
-  public function get_config($prop)
-  {
-      return $this->config[$prop];
-  }
-
-}
diff --git a/program/localization/ar_SA/labels.inc b/program/localization/ar_SA/labels.inc
index 0fe7214d6..7dc8c15ad 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,74 +81,83 @@ $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'] = 'موسوم';
@@ -141,12 +172,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,178 +188,218 @@ $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['previewpane'] = 'إظهار قسم المعاينة';
 $labels['skin'] = 'شكل الواجهة';
@@ -345,14 +418,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,12 +439,15 @@ $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'] = 'إزالة التوقيع من الرسالة عند الرد';
@@ -380,26 +458,33 @@ $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 +494,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 +536,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..e10c83228 100644
--- a/program/localization/ar_SA/messages.inc
+++ b/program/localization/ar_SA/messages.inc
@@ -2,31 +2,38 @@
 
 /*
  +-----------------------------------------------------------------------+
- | 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['invalidrequest'] = 'طلب غير صالح! لم تح�ظ أية بيانات.';
+$messages['invalidhost'] = 'Invalid server name.';
 $messages['nomessagesfound'] = 'لم يعثر على أية رسائل �ي صندوق البريد هذا';
 $messages['loggedout'] = 'قمت بإنهاء هذه الجلسة بنجاح. إلى اللقاء!';
 $messages['mailboxempty'] = 'صندوق البريد �ارغ';
+$messages['refreshing'] = 'Refreshing...';
 $messages['loading'] = 'جاري العمل...';
 $messages['uploading'] = 'جاري ر�ع المل�...';
 $messages['uploadingmany'] = 'جاري تحميل المل�ات...';
@@ -53,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'] = 'جاري حذ� المجلد...';
@@ -66,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 للبحث �يه';
@@ -105,13 +112,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 +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/ast/labels.inc b/program/localization/ast/labels.inc
index fedc40019..996c6043f 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,161 +81,325 @@ $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['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['previewpane'] = 'Entever';
 $labels['skin'] = 'Estilu';
@@ -222,45 +411,129 @@ $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['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['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..135f70b73 100644
--- a/program/localization/ast/messages.inc
+++ b/program/localization/ast/messages.inc
@@ -2,29 +2,41 @@
 
 /*
  +-----------------------------------------------------------------------+
- | 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['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 +46,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 +104,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 +134,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 15d1bb56c..60e861177 100644
--- a/program/localization/az_AZ/labels.inc
+++ b/program/localization/az_AZ/labels.inc
@@ -2,58 +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']     = 'Open';
+$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'] = 'Ç';
@@ -61,74 +81,83 @@ $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';
@@ -143,12 +172,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';
@@ -157,176 +188,213 @@ $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'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
+
+// 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']      = 'Export all';
+$labels['exportsel']      = 'Export selected';
+$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:';
 $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';
@@ -355,10 +423,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['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 +458,12 @@ $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';
-$labels['defaultaddressbook'] = 'Yeni konktaktları seçilmiş ünvan kitabçasına əlavə et';
+$labels['defaultabook'] = 'Öz qurğulu ünvan kitabçası';
 $labels['autocompletesingle'] = 'Avtobitmədə əlavə ünvanları burax';
 $labels['listnamedisplay'] = 'Kontaklar siyahısı bu cür göstər';
 $labels['spellcheckbeforesend'] = 'Göndərməzdən əvvəl orfoqrafiyanı yoxla';
@@ -407,13 +476,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';
@@ -423,23 +494,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';
@@ -459,3 +536,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 10c885bc5..939827247 100644
--- a/program/localization/az_AZ/messages.inc
+++ b/program/localization/az_AZ/messages.inc
@@ -2,20 +2,23 @@
 
 /*
  +-----------------------------------------------------------------------+
- | 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['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ı';
@@ -30,6 +33,7 @@ $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ə...';
 $messages['loading'] = 'Yüklənir...';
 $messages['uploading'] = 'Fayl yüklənir...';
 $messages['uploadingmany'] = 'Fayllar yüklənir...';
@@ -56,11 +60,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...';
@@ -69,11 +73,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';
@@ -117,6 +121,7 @@ $messages['contactaddedtogroup'] = 'Ünvanlar qrupa əlavə edildi';
 $messages['contactremovedfromgroup'] = 'Ãœnvanlar qrupdan silindi';
 $messages['nogroupassignmentschanged'] = 'Qruplar arası bölgü dəyişməyib.';
 $messages['importwait'] = 'İdxal gedir, lütfən gözləyin...';
+$messages['importformaterror'] = 'İdxal xətası. Yüklənilən fayl naməlum məlumat formatına malikdir.';
 $messages['importconfirm'] = '<b>$inserted ünvanlar müvəffəqiyyətlə idxal edildi, mövcud $skipped buraxılıb</b>:<p><em>$names</em></p>';
 $messages['importconfirmskipped'] = '<b>Buraxılmış $skipped mövcud daxillər</b>';
 $messages['opnotpermitted'] = '�məliyyat qadağandır!';
@@ -158,4 +163,7 @@ $messages['invalidimageformat'] = 'Şəkil formatı düzgün deyil';
 $messages['mispellingsfound'] = 'Məktubda orfoqrafik səhvlər tapılıb';
 $messages['parentnotwritable'] = 'Qovluğu seçilmiş ana qovluğa köçürmək/yaratmaq alınmır. Giriş hüququ yoxdur.';
 $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..db3893ced 100644
--- a/program/localization/be_BE/labels.inc
+++ b/program/localization/be_BE/labels.inc
@@ -2,43 +2,538 @@
 
 /*
  +-----------------------------------------------------------------------+
- | 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['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['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['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['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..0aaa4d4d7 100644
--- a/program/localization/be_BE/messages.inc
+++ b/program/localization/be_BE/messages.inc
@@ -2,26 +2,168 @@
 
 /*
  +-----------------------------------------------------------------------+
- | 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['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/ber/labels.inc b/program/localization/ber/labels.inc
new file mode 100644
index 000000000..1128b0d4b
--- /dev/null
+++ b/program/localization/ber/labels.inc
@@ -0,0 +1,18 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization//labels.inc                                         |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Madghis <mbuzakhar@armas.ly>                                  |
+ +-----------------------------------------------------------------------+
+*/
+
+$labels = array();
+$labels['username'] = 'Izwel n';
+
diff --git a/program/localization/bg_BG/labels.inc b/program/localization/bg_BG/labels.inc
index 3a81a9f33..fa92ec042 100644
--- a/program/localization/bg_BG/labels.inc
+++ b/program/localization/bg_BG/labels.inc
@@ -2,56 +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: 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'] = 'Вход�щи';
+$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['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,89 @@ $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'] = 'Отговори на пи�мото';
-$labels['replytoallmessage'] = 'Отговор до изпращача и в�ички получатели';
-$labels['replyall'] = 'Отговор на в�ички';
-$labels['replylist'] = 'Спи�ък за отговор';
-$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['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['none'] = '��ма';
 $labels['currpage'] = 'Страница';
 $labels['unread'] = '�ови';
 $labels['flagged'] = 'Отбел�зано';
-$labels['unanswered'] = '�еотговорено';
+$labels['unanswered'] = 'Без отговор';
 $labels['deleted'] = 'Изтрито';
+$labels['undeleted'] = '�е е изтрит';
 $labels['invert'] = 'Инвертирай';
 $labels['filter'] = 'Филтър';
 $labels['list'] = 'Спи�ък';
@@ -133,12 +172,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,168 +188,218 @@ $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['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'] = 'Винаги показвай изображени� от $';
-$labels['isdraft'] = 'Това �ъобщение е чернова';
+$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['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 (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['previewpane'] = 'Панел за преглед';
 $labels['skin'] = 'См�на изгледа на интерфей�а';
@@ -317,24 +408,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['never'] = 'никога';
-$labels['immediately'] = 'веднага';
+$labels['autosavedraft']  = '�втоматично запи�вай чернова';
+$labels['everynminutes']  = 'в�еки $n минути';
+$labels['refreshinterval']  = 'Опре�н�ване (проверка за нови �ъобщени� и т.н.)';
+$labels['never']  = 'никога';
+$labels['immediately']  = 'Веднага';
 $labels['messagesdisplaying'] = 'Показване на �ъбщени�та';
 $labels['messagescomposition'] = 'Пи�ане на �ъобщени�';
 $labels['mimeparamfolding'] = 'Добав�не име на прикрепените файлове';
@@ -346,12 +439,15 @@ $labels['advancedoptions'] = '�а�тройки за напреднали';
 $labels['focusonnewmessage'] = 'Премигване на прозореца при ново пи�мо';
 $labels['checkallfolders'] = 'Провери в�ички папки за нови пи�ма';
 $labels['displaynext'] = 'След изтриване / премини към �ледващото пи�мо';
+$labels['defaultfont'] = 'Шрифт по подразбиране за HTML �ъобщени�та';
 $labels['mainoptions'] = 'О�новни на�тройки';
-$labels['section'] = 'Раздел';
+$labels['browseroptions'] = '�а�тройки на четеца';
+$labels['section'] = 'Секци�';
 $labels['maintenance'] = 'Поддръжка';
 $labels['newmessage'] = '�ово �ъобщение';
 $labels['signatureoptions'] = '�а�тройки на подпи�';
 $labels['whenreplying'] = 'При отговор';
+$labels['replyempty'] = 'да не �е цитира оригиналното �ъобщение';
 $labels['replytopposting'] = 'започване на ново �ъобщение преди получени� тек�т';
 $labels['replybottomposting'] = 'започване на ново �ъобщение �лед получени� тек�т';
 $labels['replyremovesignature'] = 'Премахване на предишни� подпи� от �ъобщението при отговор';
@@ -362,26 +458,33 @@ $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'] = 'Провери за правопи�ни грешки преди изпращане на �ъобщението';
 $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'] = 'Свой�тва на папката';
@@ -391,17 +494,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'] = 'Западна Европа';
@@ -421,3 +536,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..ead68921c 100644
--- a/program/localization/bg_BG/messages.inc
+++ b/program/localization/bg_BG/messages.inc
@@ -2,35 +2,41 @@
 
 /*
  +-----------------------------------------------------------------------+
- | 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['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 +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'] = 'Изтриване на папка...';
@@ -67,11 +73,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 +112,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 +162,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..0f20bba37 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,154 +81,325 @@ $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['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['previewpane'] = 'ছোটোকরে দেখার জায়গা';
 $labels['skin'] = 'মেইলবক�স �র প�রোটার চেহারা';
@@ -214,39 +411,129 @@ $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['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['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..eaa4024b1 100644
--- a/program/localization/bn_BD/messages.inc
+++ b/program/localization/bn_BD/messages.inc
@@ -2,27 +2,41 @@
 
 /*
  +-----------------------------------------------------------------------+
- | 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['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 +46,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 +104,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 98add04c5..95756e393 100644
--- a/program/localization/br/labels.inc
+++ b/program/localization/br/labels.inc
@@ -2,52 +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: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
-$labels['welcome'] = 'Degemer mat war $product';
-$labels['username'] = 'Implijer';
-$labels['password'] = 'Ger-Tremen';
-$labels['server'] = 'Servijer';
-$labels['login'] = 'Dilesadur';
-$labels['logout'] = 'Kuitaat';
-$labels['mail'] = 'Postel elektronek';
-$labels['settings'] = 'Dibarzhioù';
+
+// 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'] = 'Kemennadoù resevet';
+
+// mailbox names
+$labels['inbox']  = 'Boest degemer';
 $labels['drafts'] = 'Brouilhedoù';
-$labels['sent'] = 'Kemennadoù 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'] = 'Ouzh';
-$labels['cc'] = 'Cc';
-$labels['bcc'] = 'Cci';
-$labels['replyto'] = 'Respont ouzh';
-$labels['date'] = 'Deiz';
-$labels['size'] = 'Ment';
+$labels['from']    = 'Eus';
+$labels['sender']  = 'Sender';
+$labels['to']      = 'Da';
+$labels['cc']      = 'Cc';
+$labels['bcc']     = 'Cci';
+$labels['replyto'] = 'Respont-da';
+$labels['followupto'] = 'Followup-To';
+$labels['date']    = 'Deiz';
+$labels['size']    = 'Ment';
 $labels['priority'] = 'Kentwir';
 $labels['organization'] = 'Aozadur';
-$labels['mailboxlist'] = 'Renkelloù';
-$labels['folders'] = 'Renkelloù';
-$labels['messagesfromto'] = 'Kemennadoù eus $from ouzh $to war $count';
+$labels['readstatus'] = 'Stad al lenn';
+$labels['listoptions'] = 'Dibarzhioù ar roll...';
+
+$labels['mailboxlist'] = '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['copy'] = 'Cc';
-$labels['moveto'] = 'Dilec\'hiañ ouzh...';
+$labels['fromtoshort'] = '$from - $to war $count';
+
+$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';
@@ -55,114 +81,459 @@ $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['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['checkmail'] = 'Gwiriañ kemennadoù nevez';
-$labels['compose'] = 'Skrivañ ur c\'hemennad nevez';
-$labels['writenewmessage'] = 'Skrivañ ur c\'hemennad nevez';
-$labels['replytomessage'] = 'Respont kemennad';
+
+// 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['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['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['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['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['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 adfcfbab5..425dad996 100644
--- a/program/localization/br/messages.inc
+++ b/program/localization/br/messages.inc
@@ -2,27 +2,41 @@
 
 /*
  +-----------------------------------------------------------------------+
- | 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: Thomas <Unknown>                                              |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['loginfailed'] = 'Fazi dilesadur';
+$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'] = 'Direizh eo hoc\'h dalc\'h pe echu eo';
-$messages['storageerror'] = 'Fazi kevreadur ouzh ar servijer IMAP';
+$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['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...';
@@ -32,34 +46,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';
@@ -69,4 +103,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 9ceda61fd..f2a871cdd 100644
--- a/program/localization/bs_BA/labels.inc
+++ b/program/localization/bs_BA/labels.inc
@@ -2,58 +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';
@@ -61,74 +81,83 @@ $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'] = 'Napiši poruku';
-$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';
@@ -143,12 +172,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';
@@ -157,176 +188,213 @@ $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'] = 'Skraćeno';
+$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'] = 'Izvezi';
-$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:';
 $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';
@@ -355,10 +423,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['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 +458,12 @@ $labels['replysignaturepos'] = 'Prilikom odgovaranja ili prosljeđivanja potpis
 $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';
-$labels['defaultaddressbook'] = 'DOdaj nove kontakte u odabrani adresar';
+$labels['defaultabook'] = 'Osnovni adresar';
 $labels['autocompletesingle'] = 'Presko�i alternativne email adrese prilikom automatskog popunjavanja';
 $labels['listnamedisplay'] = 'Izlistaj kontakte kao';
 $labels['spellcheckbeforesend'] = 'Provjeri pravopis prije slanja poruke';
@@ -407,13 +476,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';
@@ -423,23 +494,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';
@@ -459,3 +536,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 b331ee900..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,11 +28,14 @@ $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.';
 $messages['loggedout'] = 'Uspješno ste se odjavili. Doviđenja!';
 $messages['mailboxempty'] = 'Sandu�e je prazno.';
+$messages['refreshing'] = 'Osvježavam...';
 $messages['loading'] = 'U�itavanje...';
 $messages['uploading'] = 'Dodajem datoteku...';
 $messages['uploadingmany'] = 'Dodajem datoteke...';
@@ -56,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...';
@@ -69,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.';
@@ -117,6 +123,7 @@ $messages['contactaddedtogroup'] = 'Kontakti su uspješno dodani u ovu grupu.';
 $messages['contactremovedfromgroup'] = 'Kontakti su uspješno uklonjeni iz ove grupe.';
 $messages['nogroupassignmentschanged'] = 'Grupni zadaci nisu mijenjani.';
 $messages['importwait'] = 'Uvoz u toku, molimo sa�ekajte...';
+$messages['importformaterror'] = 'Uvoz nije uspio! Dodana datoteka nije u ispravnom formatu za uvoz podataka.';
 $messages['importconfirm'] = '<b>Uspješno je uvezeno $inserted kontakata</b>';
 $messages['importconfirmskipped'] = '<b>Presko�eno $skipped postojećih unosa</b>';
 $messages['opnotpermitted'] = 'Operacija nije dozvoljena!';
@@ -158,4 +165,7 @@ $messages['invalidimageformat'] = 'Format slike nije ispravan.';
 $messages['mispellingsfound'] = 'Pronađene su pravopisne greške u ovoj poruci.';
 $messages['parentnotwritable'] = 'Nije moguće kreirati/premjestiti folder u odabrani mati�ni folder. Nemate prava pristupa.';
 $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 536085b1e..1bcb526ea 100644
--- a/program/localization/ca_ES/labels.inc
+++ b/program/localization/ca_ES/labels.inc
@@ -2,58 +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: Jordi Sanfeliu <jordi@fibranet.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['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';
@@ -61,74 +81,83 @@ $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';
@@ -143,12 +172,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';
@@ -157,176 +188,218 @@ $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['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'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
+
+// 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['previewpane'] = 'Mostra el panell de previsualització';
 $labels['skin'] = 'Aparença d\'interfície';
@@ -350,10 +423,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['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';
@@ -373,6 +447,7 @@ $labels['maintenance'] = 'Manteniment';
 $labels['newmessage'] = 'Missatge nou';
 $labels['signatureoptions'] = 'Opcions de signatura';
 $labels['whenreplying'] = 'Quan es respon';
+$labels['replyempty'] = 'do citis el missatge original';
 $labels['replytopposting'] = 'comença el missatge nou per sobre de l\'original';
 $labels['replybottomposting'] = 'comença el missatge nou per sota de l\'original';
 $labels['replyremovesignature'] = 'Quan es contesti, suprimeix la signatura original del missatge';
@@ -383,12 +458,12 @@ $labels['replysignaturepos'] = 'Quan es contesti o reenviï, posa-hi la signatur
 $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';
-$labels['defaultaddressbook'] = 'Afegeix contactes nous a la llibreta d\'adreces seleccionada';
+$labels['defaultabook'] = 'Llibreta d\'adreces per defecte';
 $labels['autocompletesingle'] = 'Omet adreces alternatives quan s\'autocompleti';
 $labels['listnamedisplay'] = 'Llista contactes com a';
 $labels['spellcheckbeforesend'] = 'Comprova l\'ortografia abans d\'enviar un missatge';
@@ -398,15 +473,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';
@@ -416,22 +494,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';
@@ -451,3 +536,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 5be0ae68f..5f0e1d609 100644
--- a/program/localization/ca_ES/messages.inc
+++ b/program/localization/ca_ES/messages.inc
@@ -2,20 +2,23 @@
 
 /*
  +-----------------------------------------------------------------------+
- | 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: Jordi Sanfeliu <jordi@fibranet.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['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';
@@ -30,6 +33,7 @@ $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['mailboxempty'] = 'La bústia és buida.';
+$messages['refreshing'] = 'Refrescant...';
 $messages['loading'] = 'S\'està carregant…';
 $messages['uploading'] = 'S\'està pujant el fitxer...';
 $messages['uploadingmany'] = 'S\'està pujant els fitxers...';
@@ -56,11 +60,11 @@ $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['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['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['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...';
@@ -69,11 +73,11 @@ $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['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.';
@@ -117,6 +121,7 @@ $messages['contactaddedtogroup'] = 'S\'han afegit correctament els contactes a a
 $messages['contactremovedfromgroup'] = 'S\'han suprimit correctament els contactes d\'aquest grup.';
 $messages['nogroupassignmentschanged'] = 'No s\'ha canviat cap assignació de grup.';
 $messages['importwait'] = 'S\'està important, espereu si us plau...';
+$messages['importformaterror'] = 'La importació ha fallat. El fitxer pujat no és un fitxer de dades vàlid.';
 $messages['importconfirm'] = '<b>S\'han importat $inserted contactes correctament</b>';
 $messages['importconfirmskipped'] = '<b>S\'han descartat $skipped entrades ja existents</b>';
 $messages['opnotpermitted'] = 'Operació no permesa!';
@@ -158,4 +163,7 @@ $messages['invalidimageformat'] = 'No és un format d\'imatge vàlid.';
 $messages['mispellingsfound'] = 'S\'han detectat errors d\'ortografia al misstage.';
 $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.';
 
+?>
diff --git a/program/localization/cs_CZ/labels.inc b/program/localization/cs_CZ/labels.inc
index a30867a9b..2240065e7 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,74 +81,83 @@ $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é';
@@ -143,12 +172,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,177 +188,215 @@ $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';
@@ -354,10 +423,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';
@@ -388,12 +458,12 @@ $labels['replysignaturepos'] = 'Při odpovídání nebo přeposílání zprávy
 $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 +476,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 +494,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 +536,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..cee1bd09a 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';
@@ -30,6 +33,7 @@ $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 +60,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 +73,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 +119,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 +163,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 d9887416a..9b695e140 100644
--- a/program/localization/cy_GB/labels.inc
+++ b/program/localization/cy_GB/labels.inc
@@ -2,58 +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']     = 'Open';
+$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';
@@ -61,74 +81,83 @@ $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';
@@ -143,12 +172,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';
@@ -157,176 +188,213 @@ $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'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
+
+// 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']      = 'Export all';
+$labels['exportsel']      = 'Export selected';
+$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:';
 $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';
@@ -355,10 +423,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['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 +458,12 @@ $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';
-$labels['defaultaddressbook'] = 'Ychwanegu cysylltiadau newydd i\'r llyfr cyfeiriad dewiswyd';
+$labels['defaultabook'] = 'Llyfr cyfeiriadau diofyn';
 $labels['autocompletesingle'] = 'Hepgor cyfeiriadau ebost amgen wrth awto-gwblhau';
 $labels['listnamedisplay'] = 'Rhestrwch cysylltiadau fel';
 $labels['spellcheckbeforesend'] = 'Gwirio sillafu cyn danfon neges';
@@ -407,13 +476,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';
@@ -423,22 +494,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';
@@ -458,3 +536,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 26f120b84..553422948 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';
@@ -30,6 +33,7 @@ $messages['invalidhost'] = 'Enw gweinydd annilys.';
 $messages['nomessagesfound'] = 'Dim negeseuon wedi eu canfod yn y blwch hwn';
 $messages['loggedout'] = 'Rydych wedi gorffen y sesiwn yn llwyddianus. Hwyl fawr!';
 $messages['mailboxempty'] = 'Blwch yn wag';
+$messages['refreshing'] = 'Yn adnewyddu...';
 $messages['loading'] = 'Yn llwytho...';
 $messages['uploading'] = 'Yn llwytho ffeil i fyny...';
 $messages['uploadingmany'] = 'Yn llwytho fyny ffeiliau...';
@@ -56,11 +60,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...';
@@ -69,11 +73,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';
@@ -117,6 +121,7 @@ $messages['contactaddedtogroup'] = 'Ychwanegwyd y cysylltiadau i\'r grŵp yma yn
 $messages['contactremovedfromgroup'] = 'Dilëwyd y cysylltiadau o\'r grŵp yma yn llwyddiannus';
 $messages['nogroupassignmentschanged'] = 'Ni newidwyd aseiniadiau grŵp.';
 $messages['importwait'] = 'Yn mewnforio, arhoswch os gwelwch yn dda...';
+$messages['importformaterror'] = 'Methwyd mewnforio! Nid yw\'r ffeil a lwythwyd yn ffeil ddata dilys.';
 $messages['importconfirm'] = '<b>Fe mewnforiwyd $inserted cyswllt yn llwyddiannus, anwybyddwyd $skipped cofnod presennol</b>:<p><em>$names</em></p>';
 $messages['importconfirmskipped'] = '<b>Neidiwyd $skipped cofnod oedd yn bodoli</b>';
 $messages['opnotpermitted'] = 'Ni chaniateir y weithred!';
@@ -158,4 +163,7 @@ $messages['invalidimageformat'] = 'Ddim yn fformat llun dilys.';
 $messages['mispellingsfound'] = 'Gwelwyd camsillafu yn y neges.';
 $messages['parentnotwritable'] = 'Methwyd creu/symud ffolder i\'r ffolder rhiant ddewiswyd. Dim hawl mynediad.';
 $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..cb4e3b55c 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,89 @@ $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['deleted'] = 'Slettede';
+$labels['undeleted'] = 'Ikke slettet';
 $labels['invert'] = 'Invertér';
 $labels['filter'] = 'Filtrer';
 $labels['list'] = 'Liste';
@@ -142,12 +172,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,174 +188,218 @@ $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'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in 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['previewpane'] = 'Forhåndsvisning';
 $labels['skin'] = 'Brugerflade';
@@ -347,10 +423,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,6 +447,7 @@ $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';
@@ -380,12 +458,12 @@ $labels['replysignaturepos'] = 'NÃ¥r beskeder besvares eller videresendes; indsÃ
 $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 +473,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 +494,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 +536,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..6b8ce1928 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.';
@@ -26,9 +29,11 @@ $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['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 +60,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 +73,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 +119,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 +163,7 @@ $messages['invalidimageformat'] = 'Ikke et gyldigt billedformat.';
 $messages['mispellingsfound'] = 'Der er fundet stavefejl i beskeden.';
 $messages['parentnotwritable'] = 'Kan ikke oprette/flytte mappe ind i valgt mappe. Ingen adgangsrettigheder.';
 $messages['messagetoobig'] = 'Denne del af beskeden er for stor til at blive behandlet.';
+$messages['attachmentvalidationerror'] = 'WARNING! This attachment is suspicious because its type doesn\'t match the type declared in the message. If you do not trust the sender, you shouldn\'t open it in the browser because it may contain malicious contents.<br/><br/><em>Expected: $expected; found: $detected</em>';
+$messages['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 5d9200267..98bbd8837 100644
--- a/program/localization/de_CH/labels.inc
+++ b/program/localization/de_CH/labels.inc
@@ -2,58 +2,78 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/de_CH/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'] = 'Willkommen bei $product';
-$labels['username'] = 'Benutzername';
-$labels['password'] = 'Passwort';
-$labels['server'] = 'Server';
-$labels['login'] = 'Login';
-$labels['logout'] = 'Logout';
-$labels['mail'] = 'E-Mail';
+
+// login page
+$labels['welcome']   = 'Willkommen bei $product';
+$labels['username']  = 'Benutzername';
+$labels['password']  = 'Passwort';
+$labels['server']    = 'Server';
+$labels['login']     = 'Login';
+
+// taskbar
+$labels['logout']   = 'Logout';
+$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 (CC)';
-$labels['bcc'] = 'Blind-Kopie';
+$labels['from']    = 'Absender';
+$labels['sender']  = 'Absender';
+$labels['to']      = 'Empfänger';
+$labels['cc']      = 'Kopie (CC)';
+$labels['bcc']     = 'Blind-Kopie';
 $labels['replyto'] = 'Antwort an';
 $labels['followupto'] = 'Followup-To';
-$labels['date'] = 'Datum';
-$labels['size'] = 'Grösse';
+$labels['date']    = 'Datum';
+$labels['size']    = 'Grösse';
 $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'] = 'Download';
+$labels['open']     = 'Öffnen';
+$labels['showattachment'] = 'Anzeigen';
+$labels['showanyway'] = 'Trotzdem anzeigen';
+
 $labels['filename'] = 'Dateiname';
 $labels['filesize'] = 'Dateigrösse';
+
 $labels['addtoaddressbook'] = 'Ins Adressbuch übernehmen';
+
+// weekdays short
 $labels['sun'] = 'So';
 $labels['mon'] = 'Mo';
 $labels['tue'] = 'Di';
@@ -61,74 +81,83 @@ $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 prü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 prüfen';
+$labels['compose']          = 'Schreiben';
+$labels['writenewmessage']  = 'Neue Nachricht schreiben';
+$labels['reply']            = 'Antworten';
+$labels['replytomessage']   = 'Antwort verfassen';
 $labels['replytoallmessage'] = 'Antwort an Absender und alle Empfänger verfassen';
-$labels['replyall'] = 'Allen antworten';
-$labels['replylist'] = 'Liste antworten';
-$labels['forward'] = 'Weiterleiten';
-$labels['forwardinline'] = 'Eingebunden weiterleiten';
+$labels['replyall']         = 'Allen antworten';
+$labels['replylist']        = 'Liste antworten';
+$labels['forward']          = 'Weiterleiten';
+$labels['forwardinline']    = 'Eingebunden weiterleiten';
 $labels['forwardattachment'] = 'Als Anhang weiterleiten';
-$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'] = 'Auswählen';
 $labels['all'] = 'Alle';
 $labels['none'] = 'Keine';
-$labels['nonesort'] = 'Keine';
 $labels['currpage'] = 'Aktuelle Seite';
 $labels['unread'] = 'Ungelesene';
 $labels['flagged'] = 'Markierte';
@@ -143,12 +172,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['flag'] = 'Markierung';
 $labels['attachment'] = 'Anhang';
+$labels['nonesort'] = 'Keine';
 $labels['sentdate'] = 'Sendedatum';
 $labels['arrival'] = 'Empfangsdatum';
 $labels['asc'] = 'aufsteigend';
@@ -157,176 +188,213 @@ $labels['listcolumns'] = 'Spalten';
 $labels['listsorting'] = 'Sortierung';
 $labels['listorder'] = 'Ordnung';
 $labels['listmode'] = 'Anzeigemodus';
+
 $labels['folderactions'] = 'Ordneraktionen...';
 $labels['compact'] = 'Packen';
 $labels['empty'] = 'Leeren';
+
 $labels['quota'] = 'Verwendeter Speicherplatz';
-$labels['unknown'] = 'unbekannt';
-$labels['unlimited'] = 'unlimitiert';
-$labels['quicksearch'] = 'Schnellsuche';
-$labels['resetsearch'] = 'Löschen';
-$labels['searchmod'] = 'Suchkriterien ändern';
-$labels['msgtext'] = 'Ganze Nachricht';
+$labels['unknown']  = 'unbekannt';
+$labels['unlimited']  = 'unlimitiert';
+
+$labels['quicksearch']  = 'Schnellsuche';
+$labels['resetsearch']  = 'Löschen';
+$labels['searchmod']  = 'Suchkriterien ändern';
+$labels['msgtext']  = 'Ganze Nachricht';
+$labels['body']  = 'Inhalt';
+
 $labels['openinextwin'] = 'In neuem Fenster öffnen';
 $labels['emlsave'] = 'Herunterladen (.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 bearbeiten';
-$labels['spellcheck'] = 'Rechtschreibung';
+
+$labels['editidents']    = 'Absender bearbeiten';
+$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'] = 'Schliessen';
-$labels['messageoptions'] = 'Optionen...';
-$labels['low'] = 'Niedrig';
-$labels['lowest'] = 'Niedrigste';
-$labels['normal'] = 'Normal';
-$labels['high'] = 'Hoch';
+$labels['close']  = 'Schliessen';
+$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'] = 'Weitere Kopfzeilen anzeigen';
 $labels['togglefullheaders'] = 'Original-Kopfzeilen ein-/ausblenden';
+
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Klartext';
 $labels['savesentmessagein'] = 'Nachricht speichern in';
 $labels['dontsave'] = 'nicht speichern';
 $labels['maxuploadsize'] = 'Maximal erlaubte Dateigrösse 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 hat eine Empfangsbestätigung angefordert. Möchten Sie diese jetzt senden?';
 $labels['receiptread'] = 'Empfangsbestätigung (gelesen)';
 $labels['yourmessage'] = 'Dieses ist eine Empfangsbestätigung für Ihre Nachricht';
 $labels['receiptnote'] = 'Hinweis: Der Empfänger hat den Empfang der Nachricht bestätigt. Dieses ist keine Garantie, dass die Nachricht gelesen und verstanden wurde.';
-$labels['name'] = 'Anzeigename';
-$labels['firstname'] = 'Vorname';
-$labels['surname'] = 'Nachname';
-$labels['middlename'] = '2. Vorname';
-$labels['nameprefix'] = 'Präfix';
-$labels['namesuffix'] = 'Suffix';
-$labels['nickname'] = 'Spitzname';
-$labels['jobtitle'] = 'Titel';
-$labels['department'] = 'Abteilung';
-$labels['gender'] = 'Geschlecht';
-$labels['maidenname'] = 'Mädchenname';
-$labels['email'] = 'E-Mail';
-$labels['phone'] = 'Telefon';
-$labels['address'] = 'Adresse';
-$labels['street'] = 'Strasse';
-$labels['locality'] = 'Ort';
-$labels['zipcode'] = 'PLZ';
-$labels['region'] = 'Region';
-$labels['country'] = 'Land';
-$labels['birthday'] = 'Geburtstag';
-$labels['anniversary'] = 'Jahrestag';
-$labels['website'] = 'Website';
+
+// address boook
+$labels['name']         = 'Anzeigename';
+$labels['firstname']    = 'Vorname';
+$labels['surname']      = 'Nachname';
+$labels['middlename']   = '2. Vorname';
+$labels['nameprefix']   = 'Präfix';
+$labels['namesuffix']   = 'Suffix';
+$labels['nickname']     = 'Spitzname';
+$labels['jobtitle']     = 'Titel';
+$labels['department']   = 'Abteilung';
+$labels['gender']       = 'Geschlecht';
+$labels['maidenname']   = 'Mädchenname';
+$labels['email']        = 'E-Mail';
+$labels['phone']        = 'Telefon';
+$labels['address']      = 'Adresse';
+$labels['street']       = 'Strasse';
+$labels['locality']     = 'Ort';
+$labels['zipcode']      = 'PLZ';
+$labels['region']       = 'Region';
+$labels['country']      = 'Land';
+$labels['birthday']     = 'Geburtstag';
+$labels['anniversary']  = 'Jahrestag';
+$labels['website']      = 'Website';
 $labels['instantmessenger'] = 'IM';
 $labels['notes'] = 'Notizen';
-$labels['male'] = 'männlich';
+$labels['male']   = 'männlich';
 $labels['female'] = 'weiblich';
 $labels['manager'] = 'Vorgesetzte/r';
 $labels['assistant'] = 'Assistent';
-$labels['typeassistant'] = 'Assistent';
 $labels['spouse'] = 'Partner/in';
 $labels['allfields'] = 'Alle Felder';
 $labels['search'] = 'Suche';
 $labels['advsearch'] = 'Erweiterte Suche';
 $labels['advanced'] = 'Erweitert';
 $labels['other'] = 'Andere';
-$labels['typeother'] = 'Andere';
-$labels['typehome'] = 'Zuhause';
-$labels['typework'] = 'Arbeit';
-$labels['typemobile'] = 'Mobiltelefon';
-$labels['typemain'] = 'Hauptnummer';
-$labels['typehomefax'] = 'Fax Zuhause';
-$labels['typeworkfax'] = 'Fax Arbeit';
-$labels['typecar'] = 'Auto';
-$labels['typepager'] = 'Pager';
-$labels['typevideo'] = 'Video';
-$labels['typehomepage'] = 'Homepage';
+
+$labels['typehome']   = 'Zuhause';
+$labels['typework']   = 'Arbeit';
+$labels['typeother']  = 'Andere';
+$labels['typemobile']  = 'Mobiltelefon';
+$labels['typemain']  = 'Hauptnummer';
+$labels['typehomefax']  = 'Fax Zuhause';
+$labels['typeworkfax']  = 'Fax Arbeit';
+$labels['typecar']  = 'Auto';
+$labels['typepager']  = 'Pager';
+$labels['typevideo']  = 'Video';
+$labels['typeassistant']  = 'Assistent';
+$labels['typehomepage']  = 'Homepage';
 $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'] = 'Hinzufügen';
 $labels['replacephoto'] = 'Ersetzen';
 $labels['uploadphoto'] = 'Bild hochladen';
-$labels['newcontact'] = 'Neuen Kontakt erfassen';
-$labels['deletecontact'] = 'Gewählte Kontakte löschen';
-$labels['composeto'] = 'Nachricht verfassen';
+
+$labels['newcontact']     = 'Neuen Kontakt erfassen';
+$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']      = 'Alle exportieren';
+$labels['exportsel']      = 'Ausgewählte exportieren';
+$labels['exportvcards']   = 'Kontakte im vCard-Format exportieren';
 $labels['newcontactgroup'] = 'Neue Adressgruppe 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'] = 'Eine Seite zurück';
-$labels['firstpage'] = 'Erste Seite';
-$labels['nextpage'] = 'Nächste Seite';
-$labels['lastpage'] = 'Letzte Seite';
+
+$labels['previouspage']   = 'Eine 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'] = 'Suche speichern';
 $labels['searchdelete'] = 'Suche löschen';
+
 $labels['import'] = 'Importieren';
 $labels['importcontacts'] = 'Adressen importieren';
 $labels['importfromfile'] = 'Import aus Datei:';
 $labels['importtarget'] = 'Neue Kontakte speichern in:';
 $labels['importreplace'] = 'Bestehendes Adressbuch komplett ersetzen';
+$labels['importdesc'] = 'Sie können Kontakte aus einem bestehenden Adressbuch hochladen.rnEs können Adressbücher im <a href="http://de.wikipedia.org/wiki/VCard">vCard</a>- oder CSV-Format importiert werden.';
 $labels['done'] = 'Fertig';
+
+// settings
 $labels['settingsfor'] = 'Einstellungen für';
 $labels['about'] = 'Ãœber';
 $labels['preferences'] = 'Einstellungen';
 $labels['userpreferences'] = 'Benutzereinstellungen';
 $labels['editpreferences'] = 'Einstellungen bearbeiten';
+
 $labels['identities'] = 'Absender';
 $labels['manageidentities'] = 'Absender für dieses Konto verwalten';
 $labels['newidentity'] = 'Neuer Absender';
+
 $labels['newitem'] = 'Neuer Eintrag';
 $labels['edititem'] = 'Eintrag bearbeiten';
+
 $labels['preferhtml'] = 'HTML bevorzugen';
 $labels['defaultcharset'] = 'Standard-Zeichensatz';
 $labels['htmlmessage'] = 'HTML Nachricht';
+$labels['messagepart'] = 'Abschnitt';
+$labels['digitalsig'] = 'Digitale Signatur';
 $labels['dateformat'] = 'Datumsformat';
 $labels['timeformat'] = 'Zeitformat';
 $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';
@@ -355,10 +423,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 autom. speichern';
-$labels['everynminutes'] = '$n Minute(n)';
-$labels['never'] = 'nie';
-$labels['immediately'] = 'sofort';
+$labels['autosavedraft']  = 'Entwurf autom. speichern';
+$labels['everynminutes']  = '$n Minute(n)';
+$labels['refreshinterval']  = 'Refresh (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 +458,12 @@ $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';
+$labels['previewpanemarkread']  = 'Nachricht in Vorschau als gelesen markieren';
+$labels['afternseconds']  = 'nach $n Sekunden';
 $labels['reqmdn'] = 'Empfangsbestätigung (MSN) immer anfordern';
 $labels['reqdsn'] = 'Übermittlungsbestätigung (DSN) immer anfordern';
 $labels['replysamefolder'] = 'Antworten im selben Ordner wie Original speichern';
-$labels['defaultaddressbook'] = 'Neue Kontakte speichern in';
+$labels['defaultabook'] = 'Standard-Adressbuch';
 $labels['autocompletesingle'] = 'Keine alternativen E-Mail-Adressen in Autovervollständigung';
 $labels['listnamedisplay'] = 'Kontakte auflisten als';
 $labels['spellcheckbeforesend'] = 'Rechtscheibung vor dem Senden prüfen';
@@ -407,13 +476,15 @@ $labels['mailtoprotohandler'] = 'Als Empfänger für mailto: Links einrichten';
 $labels['forwardmode'] = 'Weiterleiten einer Nachricht';
 $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';
@@ -423,22 +494,29 @@ $labels['info'] = 'Informationen';
 $labels['getfoldersize'] = 'Ordnergrösse anzeigen';
 $labels['changesubscription'] = 'Abonnieren';
 $labels['foldertype'] = 'Ordnertyp';
-$labels['personalfolder'] = 'Privater Ordner';
-$labels['otherfolder'] = 'Order eines anderen Benutzers';
-$labels['sharedfolder'] = 'Öffentlicher Ordner';
+$labels['personalfolder']  = 'Privater Ordner';
+$labels['otherfolder']  = 'Order 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';
+
+$labels['installedplugins'] = 'Installierte Plugins';
 $labels['plugin'] = 'Plugin';
 $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'] = 'Westeuropäisch';
@@ -458,3 +536,4 @@ $labels['japanese'] = 'Japanisch';
 $labels['korean'] = 'Koreanisch';
 $labels['chinese'] = 'Chinesisch';
 
+?>
diff --git a/program/localization/de_CH/messages.inc b/program/localization/de_CH/messages.inc
index 68a7c8967..f3697a825 100644
--- a/program/localization/de_CH/messages.inc
+++ b/program/localization/de_CH/messages.inc
@@ -2,20 +2,23 @@
 
 /*
  +-----------------------------------------------------------------------+
- | localization/de_CH/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['errortitle'] = 'Fehlermeldung';
-$messages['loginfailed'] = 'Login fehlgeschlagen';
+$messages['errortitle']  = 'Fehlermeldung';
+$messages['loginfailed']  = 'Login fehlgeschlagen';
 $messages['cookiesdisabled'] = 'Ihr Browser akzeptiert keine Cookies';
 $messages['sessionerror'] = 'Ihre Session ist ungültig oder abgelaufen';
 $messages['storageerror'] = 'Keine Verbindung zum IMAP Server';
@@ -25,11 +28,14 @@ $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';
 $messages['loggedout'] = 'Sie haben Ihre Session erfolgreich beendet. Auf Wiedersehen!';
 $messages['mailboxempty'] = 'Ordner ist leer';
+$messages['refreshing'] = 'Aktualisiere...';
 $messages['loading'] = 'Daten werden geladen...';
 $messages['uploading'] = 'Datei wird hochgeladen...';
 $messages['uploadingmany'] = 'Dateien werden hochgeladen...';
@@ -56,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'] = 'Kontakte werden gelöscht...';
 $messages['groupdeleting'] = 'Gruppe wird gelöscht...';
 $messages['folderdeleting'] = 'Order wird gelöscht...';
@@ -69,11 +75,11 @@ $messages['foldersubscribing'] = 'Ordner wird abonniert...';
 $messages['folderunsubscribing'] = 'Ordner wird abbestellt...';
 $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'] = 'Wollen Sie 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';
@@ -117,6 +123,7 @@ $messages['contactaddedtogroup'] = 'Kontakte wurden dieser Gruppe hinzugefügt.'
 $messages['contactremovedfromgroup'] = 'Kontakte wurden aus dieser Gruppe entfernt.';
 $messages['nogroupassignmentschanged'] = 'Es wurde keine Gruppenzuweisung verändert.';
 $messages['importwait'] = 'Daten werden importiert, bitte warten...';
+$messages['importformaterror'] = 'Import fehlgeschlagen! Die hochgeladene Datei enthält keines der unterstützten Datenformate.';
 $messages['importconfirm'] = '<b>Es wurden $inserted Adressen erfolgreich importiert</b>';
 $messages['importconfirmskipped'] = '<b>$skipped bestehende Einträge wurden übersprungen</b>';
 $messages['opnotpermitted'] = 'Operation nicht erlaubt!';
@@ -158,4 +165,7 @@ $messages['invalidimageformat'] = 'Kein gültiges Bildformat.';
 $messages['mispellingsfound'] = 'Es wurden noch Rechtschreibfehler in der Nachricht gefunden.';
 $messages['parentnotwritable'] = 'Konnte den Ordner nicht erstellen/verschieben. Keine Berechtigung.';
 $messages['messagetoobig'] = 'Die Nachricht ist zu gross und kann nicht verarbeitet werden.';
+$messages['attachmentvalidationerror'] = 'WARNUNG! Dieser Anhang ist verdächtig, da sein Dateityp nicht dem entspricht, was in der Nachricht angegeben wird. Wenn Sie dem Absender nicht vertrauen, sollten Sie diesen Anhang nicht im Browser öffnen, da er Ihrem Computer Schaden zuführen könnte. <br/><br/><em>Erwartet: $expected; gefunden: $detected</em>';
+$messages['noscriptwarning'] = 'Achtung! Dieser Webmail-Service erfordert Javascript. Um ihn zu benutzten aktivieren Sie Javascript in ihren Browser-Einstellungen.';
 
+?>
diff --git a/program/localization/de_DE/labels.inc b/program/localization/de_DE/labels.inc
index f1e12dc95..956e32aa4 100644
--- a/program/localization/de_DE/labels.inc
+++ b/program/localization/de_DE/labels.inc
@@ -2,58 +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: SimonFS <simonschuette@arcor.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']    = 'Absender';
+$labels['sender']  = 'Absender';
+$labels['to']      = 'Empfänger';
+$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';
@@ -61,74 +81,83 @@ $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';
@@ -143,12 +172,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['flag'] = 'Markierung';
 $labels['attachment'] = 'Anhang';
+$labels['nonesort'] = 'Keine';
 $labels['sentdate'] = 'Sendedatum';
 $labels['arrival'] = 'Empfangsdatum';
 $labels['asc'] = 'aufsteigend';
@@ -157,177 +188,218 @@ $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 (MSN)';
-$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['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:';
 $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['previewpane'] = 'Nachrichtenvorschau anzeigen';
 $labels['skin'] = 'Oberflächendesign';
@@ -351,10 +423,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['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';
@@ -374,6 +447,7 @@ $labels['maintenance'] = 'Wartung';
 $labels['newmessage'] = 'Neue Nachricht';
 $labels['signatureoptions'] = 'Signatur';
 $labels['whenreplying'] = 'Beantworten einer Nachricht';
+$labels['replyempty'] = 'die Originalnachricht nicht zitieren';
 $labels['replytopposting'] = 'Antwort über der Originalnachricht';
 $labels['replybottomposting'] = 'Antwort unter der Originalnachricht';
 $labels['replyremovesignature'] = 'Beim Antworten Signatur der Originalnachricht entfernen';
@@ -384,12 +458,12 @@ $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['reqmdn'] = 'Empfangsbestätigung (MSN) immer anfordern';
+$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';
-$labels['defaultaddressbook'] = 'Neue Kontakte zum ausgewählten Adressbuch hinzufügen';
+$labels['defaultabook'] = 'Standard Adressbuch';
 $labels['autocompletesingle'] = 'Alternative E-Mailadressen bei der Auto-Vervollständigung nicht berücksichtigen';
 $labels['listnamedisplay'] = 'Kontakte auflisten als';
 $labels['spellcheckbeforesend'] = 'Rechtschreibprüfung vor dem Absenden der Nachricht';
@@ -399,13 +473,18 @@ $labels['spellcheckignorenums'] = 'Wörter mit Ziffern überspringen';
 $labels['spellcheckignorecaps'] = 'Wörter überspringen, die nur aus Großbuchstaben bestehen';
 $labels['addtodict'] = 'Zum Wörterbuch hinzufügen';
 $labels['mailtoprotohandler'] = 'Als Empfänger für mailto: Links einrichten';
-$labels['folder'] = 'Ordner';
-$labels['foldername'] = 'Ordnername';
-$labels['subscribed'] = 'Abonniert';
+$labels['forwardmode'] = 'Nachrichtenweiterleitung';
+$labels['inline'] = 'eingebettet';
+$labels['asattachment'] = 'als Anhang';
+
+$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';
@@ -415,23 +494,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';
@@ -451,3 +536,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 6c8e58fd1..eeaba7db2 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: Dennis Baudys                                                 |
- +-----------------------------------------------------------------------+
+
+ 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.';
@@ -30,7 +33,8 @@ $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['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...';
@@ -56,11 +60,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...';
@@ -69,11 +73,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.';
@@ -117,6 +121,7 @@ $messages['contactaddedtogroup'] = 'Kontakte wurden dieser Gruppe hinzugefügt.'
 $messages['contactremovedfromgroup'] = 'Kontakte wurden aus dieser Gruppe entfernt.';
 $messages['nogroupassignmentschanged'] = 'Es wurden keine Gruppenzuordnungen geändert.';
 $messages['importwait'] = 'Daten werden importiert, bitte warten...';
+$messages['importformaterror'] = 'Import fehlgeschlagen! Die hochgeladene Datei ist keine gültige Importdatei.';
 $messages['importconfirm'] = '<b>Es wurden $inserted Adressen erfolgreich importiert.</b>';
 $messages['importconfirmskipped'] = '<b>$skipped bestehende Einträge wurden übersprungen.</b>';
 $messages['opnotpermitted'] = 'Operation nicht erlaubt!';
@@ -158,4 +163,7 @@ $messages['invalidimageformat'] = 'Kein gültiges Bildformat.';
 $messages['mispellingsfound'] = 'Es wurden noch Rechtschreibfehler in der Nachricht gefunden.';
 $messages['parentnotwritable'] = 'Konnte den Ordner nicht erstellen/verschieben. Keine Berechtigung.';
 $messages['messagetoobig'] = 'Die Nachricht ist zu gross und kann nicht verarbeitet werden.';
+$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..b3166730f 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']     = 'Open';
+$labels['showattachment'] = 'Εμφάνιση';
+$labels['showanyway'] = 'Εμφάνιση';
+
 $labels['filename'] = 'Όνομα α�χείου';
 $labels['filesize'] = 'Μέγεθος α�χείου';
+
 $labels['addtoaddressbook'] = 'Π�οσθήκη στο βιβλίο διευθ�νσεων';
+
+// weekdays short
 $labels['sun'] = 'Κυ�';
 $labels['mon'] = 'Δευτ';
 $labels['tue'] = 'Τ�ι';
@@ -61,79 +81,89 @@ $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['deleted'] = 'Διεγ�αμμένο';
+$labels['undeleted'] = 'Μη διεγ�αμμένο';
 $labels['invert'] = 'Αναστ�οφή';
 $labels['filter'] = 'Φίλτ�ο';
 $labels['list'] = 'Λίστα';
@@ -142,12 +172,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,173 +188,218 @@ $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'] = '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['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['previewpane'] = 'Εμφάνιση π�οεπισκόπησης';
 $labels['skin'] = 'Θέμα εμφάνισης';
@@ -341,14 +418,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,6 +447,7 @@ $labels['maintenance'] = 'Συντή�ηση';
 $labels['newmessage'] = '�έο Μήνυμα';
 $labels['signatureoptions'] = 'Επιλογές υπογ�αφής';
 $labels['whenreplying'] = 'Στις απαντήσεις';
+$labels['replyempty'] = 'χω�ίς πα�άθεση του α�χικο� μην�ματος';
 $labels['replytopposting'] = 'το νέο μήνυμα να είναι πάνω από το α�χικό';
 $labels['replybottomposting'] = 'το νέο μήνυμα να είναι κάτω από το α�χικό';
 $labels['replyremovesignature'] = 'Όταν το μήνυμα είναι απάντηση, να αφαι�είται η υπογ�αφή του α�χικο� μην�ματος';
@@ -378,12 +458,12 @@ $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 +473,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 +494,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 +536,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..542066efa 100644
--- a/program/localization/el_GR/messages.inc
+++ b/program/localization/el_GR/messages.inc
@@ -2,33 +2,38 @@
 
 /*
  +-----------------------------------------------------------------------+
- | 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['invalidrequest'] = 'Λανθασμένο αίτημα! Δεν αποθηκε�τηκαν δεδομένα.';
+$messages['invalidhost'] = 'Άκυ�ο όνομα εξυπη�ετητή.';
 $messages['nomessagesfound'] = 'Δε β�έθηκαν μην�ματα σε αυτή τη θυ�ίδα';
 $messages['loggedout'] = 'Έχετε τε�ματίσει επιτυχώς τη συνεδ�ία. Αντίο!';
 $messages['mailboxempty'] = 'Η θυ�ίδα είναι άδεια';
+$messages['refreshing'] = 'Ανανέωση....';
 $messages['loading'] = 'Φό�τωση...';
 $messages['uploading'] = 'Το α�χείο φο�τώνεται...';
 $messages['uploadingmany'] = 'Φό�τωση α�χείων...';
@@ -55,22 +60,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 +90,8 @@ $messages['searching'] = 'Αναζήτηση...';
 $messages['checking'] = 'Έλεγχος...';
 $messages['nospellerrors'] = 'Δε β�έθηκαν ο�θογ�αφικά λάθη';
 $messages['folderdeleted'] = 'Ο φάκελος διαγ�άφηκε επιτυχώς';
+$messages['foldersubscribed'] = 'Folder successfully subscribed.';
+$messages['folderunsubscribed'] = 'Folder successfully unsubscribed.';
 $messages['folderpurged'] = 'Ο φάκελος καθα�ίστηκε με επιτυχία.';
 $messages['folderexpunged'] = 'Ο φάκελος συμπιέστηκε με επιτυχία.';
 $messages['deletedsuccessfully'] = 'Διαγ�αφή Επιτυχώς';
@@ -110,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'] = 'Η λειτου�γία δεν επιτ�έπεται!';
@@ -130,4 +140,30 @@ $messages['maxgroupmembersreached'] = 'Ο αÏ�ιθμός των μελών τηÏ
 $messages['internalerror'] = 'Π�οέκυψε ένα εσωτε�ικό σφάλμα. Πα�ακαλώ δοκιμάστε πάλι.';
 $messages['contactdelerror'] = 'Δεν είναι δυνατή η διαγ�αφή της επαφής/ων';
 $messages['contactdeleted'] = 'Η επαφή/ές διαγ�άφηκαν με επιτυχία.';
+$messages['contactrestoreerror'] = 'Could not restore deleted contact(s).';
+$messages['contactrestored'] = 'Contact(s) restored successfully.';
+$messages['groupdeleted'] = 'Group deleted successfully.';
+$messages['grouprenamed'] = 'Group renamed successfully.';
+$messages['groupcreated'] = 'Group created successfully.';
+$messages['savedsearchdeleted'] = 'Saved search deleted successfully.';
+$messages['savedsearchdeleteerror'] = 'Could not delete saved search.';
+$messages['savedsearchcreated'] = 'Saved search created successfully.';
+$messages['savedsearchcreateerror'] = 'Could not create saved search.';
+$messages['messagedeleted'] = 'Message(s) deleted successfully.';
+$messages['messagemoved'] = 'Message(s) moved successfully.';
+$messages['messagecopied'] = 'Message(s) copied successfully.';
+$messages['messagemarked'] = 'Message(s) marked successfully.';
+$messages['autocompletechars'] = 'Enter at least $min characters for autocompletion.';
+$messages['autocompletemore'] = 'More matching entries found. Please type more characters.';
+$messages['namecannotbeempty'] = 'Name cannot be empty.';
+$messages['nametoolong'] = 'Name is too long.';
+$messages['folderupdated'] = 'Folder updated successfully.';
+$messages['foldercreated'] = 'Folder created successfully.';
+$messages['invalidimageformat'] = 'Not a valid image format.';
+$messages['mispellingsfound'] = 'Spelling errors detected in the message.';
+$messages['parentnotwritable'] = 'Unable to create/move folder into selected parent folder. No access rights.';
+$messages['messagetoobig'] = 'The message part is too big to process it.';
+$messages['attachmentvalidationerror'] = 'WARNING! This attachment is suspicious because its type doesn\'t match the type declared in the message. If you do not trust the sender, you shouldn\'t open it in the browser because it may contain malicious contents.<br/><br/><em>Expected: $expected; found: $detected</em>';
+$messages['noscriptwarning'] = 'Warning: This webmail service requires Javascript! In order to use it please enable Javascript in your browser\'s settings.';
 
+?>
diff --git a/program/localization/en_GB/labels.inc b/program/localization/en_GB/labels.inc
index 6db0bd716..49b6be519 100644
--- a/program/localization/en_GB/labels.inc
+++ b/program/localization/en_GB/labels.inc
@@ -2,58 +2,78 @@
 
 /*
  +-----------------------------------------------------------------------+
- | 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: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ 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';
+
+// 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';
@@ -61,79 +81,89 @@ $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['deleted'] = 'Deleted';
+$labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'Invert';
 $labels['filter'] = 'Filter';
 $labels['list'] = 'List';
@@ -142,12 +172,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';
@@ -156,174 +188,218 @@ $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['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['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:';
 $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['previewpane'] = 'Show preview pane';
 $labels['skin'] = 'Interface skin';
@@ -347,10 +423,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['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';
@@ -370,6 +447,7 @@ $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 original';
 $labels['replybottomposting'] = 'start new message below original';
 $labels['replyremovesignature'] = 'When replying remove original signature from message';
@@ -380,12 +458,12 @@ $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';
-$labels['defaultaddressbook'] = 'Add new contacts to the selected addressbook';
+$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';
@@ -395,13 +473,18 @@ $labels['spellcheckignorenums'] = 'Ignore words with numbers';
 $labels['spellcheckignorecaps'] = 'Ignore words with all letters capitalised';
 $labels['addtodict'] = 'Add to dictionary';
 $labels['mailtoprotohandler'] = 'Register protocol handler for mailto: links';
-$labels['folder'] = 'Folder';
-$labels['foldername'] = 'Folder name';
-$labels['subscribed'] = 'Subscribed';
+$labels['forwardmode'] = 'Messages forwarding';
+$labels['inline'] = 'inline';
+$labels['asattachment'] = 'as attachment';
+
+$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';
@@ -411,22 +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';
@@ -446,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 daa44d1bb..f819147b0 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: Kevin Beynon                                                  |
- +-----------------------------------------------------------------------+
+
+ 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.';
@@ -26,9 +29,11 @@ $messages['requesttimedout'] = 'Request timed out';
 $messages['errorreadonly'] = 'Unable to perform operation. Folder is read-only.';
 $messages['errornoperm'] = 'Unable to perform operation. Permission denied.';
 $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'] = 'Loading...';
 $messages['uploading'] = 'Uploading file...';
 $messages['uploadingmany'] = 'Uploading files...';
@@ -55,11 +60,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...';
@@ -68,11 +73,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.';
@@ -114,8 +119,9 @@ $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['importerror'] = 'Import failed! The uploaded file is not a valid vCard file.';
+$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!';
@@ -157,4 +163,7 @@ $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/en_US/csv2vcard.inc b/program/localization/en_US/csv2vcard.inc
index caf192aea..5412f7e20 100644
--- a/program/localization/en_US/csv2vcard.inc
+++ b/program/localization/en_US/csv2vcard.inc
@@ -2,10 +2,10 @@
 
 /*
  +-----------------------------------------------------------------------+
- | language/en_US/csv2vcard.inc                                          |
+ | localization/<lang>/csv2vcard.inc                                     |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2005-2012, The Roundcube Dev Team                       |
+ | 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.                |
diff --git a/program/localization/en_US/labels.inc b/program/localization/en_US/labels.inc
index abb0dca5d..0a4e329e5 100644
--- a/program/localization/en_US/labels.inc
+++ b/program/localization/en_US/labels.inc
@@ -2,18 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | language/en_US/labels.inc                                             |
+ | localization/<lang>/labels.inc                                        |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2005-2011, The Roundcube Dev Team                       |
+ | 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 Bruederli <roundcube@gmail.com>                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
 */
 
 $labels = array();
@@ -41,6 +41,7 @@ $labels['junk']   = 'Junk';
 // message listing
 $labels['subject'] = 'Subject';
 $labels['from']    = 'From';
+$labels['sender']  = 'Sender';
 $labels['to']      = 'To';
 $labels['cc']      = 'Cc';
 $labels['bcc']     = 'Bcc';
@@ -63,6 +64,7 @@ $labels['copy']     = 'Copy';
 $labels['move']     = 'Move';
 $labels['moveto']   = 'Move to...';
 $labels['download'] = 'Download';
+$labels['open']     = 'Open';
 $labels['showattachment'] = 'Show';
 $labels['showanyway'] = 'Show it anyway';
 
@@ -199,9 +201,12 @@ $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';
@@ -333,6 +338,8 @@ $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';
@@ -376,6 +383,8 @@ $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';
@@ -445,9 +454,6 @@ $labels['replyremovesignature'] = 'When replying remove original signature from
 $labels['autoaddsignature'] = 'Automatically add signature';
 $labels['newmessageonly'] = 'new message only';
 $labels['replyandforwardonly'] = 'replies and forwards only';
-$labels['replysignaturepos'] = 'When replying or forwarding place signature';
-$labels['belowquote'] = 'below the quote';
-$labels['abovequote'] = 'above the quote';
 $labels['insertsignature'] = 'Insert signature';
 $labels['previewpanemarkread']  = 'Mark previewed messages as read';
 $labels['afternseconds']  = 'after $n seconds';
diff --git a/program/localization/en_US/messages.inc b/program/localization/en_US/messages.inc
index 68cf314e7..f9b5e00a6 100644
--- a/program/localization/en_US/messages.inc
+++ b/program/localization/en_US/messages.inc
@@ -2,18 +2,18 @@
 
 /*
  +-----------------------------------------------------------------------+
- | language/en_US/messages.inc                                           |
+ | localization/<lang>/messages.inc                                      |
  |                                                                       |
- | Language file of the Roundcube Webmail client                         |
- | Copyright (C) 2005-2012, The Roundcube Dev Team                       |
+ | 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 Bruederli <roundcube@gmail.com>                        |
- +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
@@ -28,6 +28,8 @@ $messages['dberror'] = 'Database Error!';
 $messages['requesttimedout'] = 'Request timed out';
 $messages['errorreadonly'] = 'Unable to perform operation. Folder is read-only.';
 $messages['errornoperm'] = 'Unable to perform operation. Permission denied.';
+$messages['erroroverquota'] = 'Unable to perform operation. No free disk space.';
+$messages['erroroverquotadelete'] = 'No free disk space. Use SHIFT+DEL to delete a message.';
 $messages['invalidrequest'] = 'Invalid request! No data was saved.';
 $messages['invalidhost'] = 'Invalid server name.';
 $messages['nomessagesfound'] = 'No messages found in this mailbox.';
diff --git a/program/localization/eo/labels.inc b/program/localization/eo/labels.inc
index a9a76e2fc..823fc25cb 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: Michael Moroni <michael.moroni@mailoo.org>                    |
- +-----------------------------------------------------------------------+
+
+ 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,89 @@ $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['deleted'] = 'Forigita';
+$labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'Inversigu';
 $labels['filter'] = 'Filtru';
 $labels['list'] = 'Listo';
@@ -142,12 +172,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,152 +187,219 @@ $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'] = 'Alinomigu';
+$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['previewpane'] = 'Montru antaÅ­rigardejon';
 $labels['skin'] = 'Interfaco-etoso';
@@ -312,22 +411,129 @@ $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['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['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..32771733d 100644
--- a/program/localization/eo/messages.inc
+++ b/program/localization/eo/messages.inc
@@ -2,33 +2,41 @@
 
 /*
  +-----------------------------------------------------------------------+
- | 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['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 +46,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 +104,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..3e6793e51 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']  = 'Sender';
+$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'] = 'List options...';
+
 $labels['mailboxlist'] = 'Carpetas';
-$labels['folders'] = 'Carpetas';
 $labels['messagesfromto'] = 'Mensajes $from a $to de $count';
+$labels['threadsfromto'] = 'Threads $from to $to of $count';
 $labels['messagenrof'] = 'Mensaje $nr de $count';
-$labels['copy'] = 'Copiar';
-$labels['move'] = 'Mover';
-$labels['moveto'] = 'Mover a...';
+$labels['fromtoshort'] = '$from – $to of $count';
+
+$labels['copy']     = 'Copiar';
+$labels['move']     = 'Mover';
+$labels['moveto']   = 'Mover a...';
 $labels['download'] = 'Descargar';
+$labels['open']     = 'Open';
+$labels['showattachment'] = 'Show';
+$labels['showanyway'] = 'Show it anyway';
+
 $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,173 +81,325 @@ $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']          = 'Refresh';
+$labels['checkmail']        = 'Revisar si hay nuevos mensajes';
+$labels['compose']          = 'Escribir un mensaje';
+$labels['writenewmessage']  = 'Crear nuevo mensaje';
+$labels['reply']            = 'Reply';
+$labels['replytomessage']   = 'Responder mensaje';
 $labels['replytoallmessage'] = 'Responder al emisor y a todos los destinatarios';
-$labels['forwardmessage'] = 'Reenviar mensaje';
-$labels['deletemessage'] = 'Eliminar mensaje';
+$labels['replyall']         = 'Reply all';
+$labels['replylist']        = 'Reply list';
+$labels['forward']          = 'Forward';
+$labels['forwardinline']    = 'Forward inline';
+$labels['forwardattachment'] = 'Forward as attachment';
+$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']             = 'Mark';
+$labels['markmessages']     = 'Marcar mensajes';
+$labels['markread']         = 'Como leído';
+$labels['markunread']       = 'Como no leído';
+$labels['markflagged']      = 'Como marcado';
+$labels['markunflagged']    = 'Como no marcado';
+$labels['moreactions']      = 'More actions...';
+$labels['more']             = 'More';
+$labels['back']             = 'Back';
+$labels['options']          = 'Options';
+
 $labels['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['deleted'] = 'Eliminado';
+$labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'Invertir';
 $labels['filter'] = 'Filtrar';
+$labels['list'] = 'List';
+$labels['threads'] = 'Threads';
 $labels['expand-all'] = 'Expandir Todos';
 $labels['expand-unread'] = 'Expandir No Leidos';
 $labels['collapse-all'] = 'Colapsar Todos';
+$labels['threaded'] = 'Threaded';
+
+$labels['autoexpand_threads'] = 'Expand message threads';
+$labels['do_expand'] = 'all threads';
 $labels['expand_only_unread'] = 'solo con mensajes no leídos';
+$labels['fromto'] = 'From/To';
+$labels['flag'] = 'Flag';
 $labels['attachment'] = 'Adjunto';
+$labels['nonesort'] = 'Ninguno';
 $labels['sentdate'] = 'Fecha de Enviado';
 $labels['arrival'] = 'Fecha de Recepción';
 $labels['asc'] = 'Ascendente';
 $labels['desc'] = 'Descendente';
+$labels['listcolumns'] = 'List columns';
+$labels['listsorting'] = 'Sorting column';
+$labels['listorder'] = 'Sorting order';
+$labels['listmode'] = 'List view mode';
+
+$labels['folderactions'] = 'Folder actions...';
 $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']           = 'Send';
+$labels['sendmessage']    = 'Enviar ahora el mensaje';
+$labels['savemessage']    = 'Guardar como borrador';
+$labels['addattachment']  = 'Añadir un archivo';
+$labels['charset']        = 'Codificación';
+$labels['editortype']     = 'Tipo de editor';
+$labels['returnreceipt']  = 'Acuse de recibo';
+$labels['dsn']            = 'Delivery status notification';
+$labels['mailreplyintro'] = 'On $date, $sender wrote:';
+$labels['originalmessage'] = 'Original Message';
+
+$labels['editidents']    = 'Edit identities';
+$labels['spellcheck']    = 'Spell';
 $labels['checkspelling'] = 'Revisar ortografía';
 $labels['resumeediting'] = 'Continuar edición';
-$labels['revertto'] = 'Revertir a';
+$labels['revertto']      = 'Revertir a';
+
+$labels['attach'] = 'Attach';
 $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 from $total)';
+$labels['close']  = 'Cerrar';
+$labels['messageoptions']  = 'Message options...';
+
+$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']    = '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';
 $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']   = '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']        = 'Correo';
+$labels['phone']        = 'Phone';
+$labels['address']      = 'Address';
+$labels['street']       = 'Street';
+$labels['locality']     = 'City';
+$labels['zipcode']      = 'ZIP Code';
+$labels['region']       = 'State/Province';
+$labels['country']      = 'Country';
+$labels['birthday']     = 'Birthday';
+$labels['anniversary']  = 'Anniversary';
+$labels['website']      = 'Website';
+$labels['instantmessenger'] = 'IM';
+$labels['notes'] = 'Notes';
+$labels['male']   = 'male';
+$labels['female'] = 'female';
+$labels['manager'] = 'Manager';
+$labels['assistant'] = 'Assistant';
+$labels['spouse'] = 'Spouse';
+$labels['allfields'] = 'All fields';
+$labels['search'] = 'Search';
+$labels['advsearch'] = 'Advanced Search';
+$labels['advanced'] = 'Advanced';
+$labels['other'] = 'Other';
+
+$labels['typehome']   = 'Home';
+$labels['typework']   = 'Work';
+$labels['typeother']  = 'Other';
+$labels['typemobile']  = 'Mobile';
+$labels['typemain']  = 'Main';
+$labels['typehomefax']  = 'Home Fax';
+$labels['typeworkfax']  = 'Work Fax';
+$labels['typecar']  = 'Car';
+$labels['typepager']  = 'Pager';
+$labels['typevideo']  = 'Video';
+$labels['typeassistant']  = 'Assistant';
+$labels['typehomepage']  = 'Home Page';
+$labels['typeblog'] = 'Blog';
+$labels['typeprofile'] = 'Profile';
+
+$labels['addfield'] = 'Add field...';
 $labels['addcontact'] = 'Añadir nuevo contacto';
 $labels['editcontact'] = 'Editar contacto';
-$labels['edit'] = 'Editar';
+$labels['contacts'] = 'Contacts';
+$labels['contactproperties'] = 'Contact properties';
+$labels['personalinfo'] = 'Personal information';
+
+$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'] = 'Rename';
+$labels['addphoto'] = 'Add';
+$labels['replacephoto'] = 'Replace';
+$labels['uploadphoto'] = 'Upload photo';
+
+$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']    = 'Rename group';
+$labels['groupdelete']    = 'Delete group';
+$labels['groupremoveselected'] = 'Remove selected contacts from group';
+
+$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'] = 'Save search';
+$labels['searchdelete'] = 'Delete search';
+
 $labels['import'] = 'Importar';
 $labels['importcontacts'] = 'Importar contactos';
 $labels['importfromfile'] = 'Importar desde el archivo:';
+$labels['importtarget'] = 'Add new contacts to address book:';
 $labels['importreplace'] = 'Reemplazar completamente la lista de contactos';
+$labels['importdesc'] = 'You can upload contacts from an existing address book.<br/>We currently support importing addresses from the <a href="http://en.wikipedia.org/wiki/VCard">vCard</a> or CSV (comma-separated) data format.';
 $labels['done'] = 'Hecho';
+
+// settings
 $labels['settingsfor'] = 'Configuración para';
+$labels['about'] = 'About';
 $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'] = 'Date format';
+$labels['timeformat'] = 'Time format';
 $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'] = 'Open message in a new window';
+$labels['composeextwin'] = 'Compose in a new window';
 $labels['htmleditor'] = 'Componer mensaje en HTML';
+$labels['htmlonreply'] = 'on reply to HTML message';
+$labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = 'Firma HTML';
 $labels['previewpane'] = 'Mostrar vista preliminar';
 $labels['skin'] = 'Apariencia de la interfaz';
@@ -234,19 +411,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,12 +439,15 @@ $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';
@@ -274,23 +458,65 @@ $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 +536,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..167fbe290 100644
--- a/program/localization/es_AR/messages.inc
+++ b/program/localization/es_AR/messages.inc
@@ -2,30 +2,41 @@
 
 /*
  +-----------------------------------------------------------------------+
- | 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['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 +46,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 +60,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 +105,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 +137,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 d0d7f7942..cbee58b6e 100644
--- a/program/localization/es_ES/labels.inc
+++ b/program/localization/es_ES/labels.inc
@@ -2,58 +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']     = 'Open';
+$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';
@@ -61,74 +81,83 @@ $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';
@@ -143,12 +172,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';
@@ -157,176 +188,213 @@ $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'] = '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']  = '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://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';
@@ -350,15 +418,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['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 +458,12 @@ $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';
-$labels['defaultaddressbook'] = 'Añadir nuevos contactos a la lista de contactos seleccionada';
+$labels['defaultabook'] = 'Libreta de direcciones predeterminada';
 $labels['autocompletesingle'] = 'Omitir direcciones de correo alternativas en autocompletado';
 $labels['listnamedisplay'] = 'Listar contactos como';
 $labels['spellcheckbeforesend'] = 'Comprobar ortografía antes de enviar un mensaje';
@@ -404,14 +473,18 @@ $labels['spellcheckignorenums'] = 'Ignorar palabras con números';
 $labels['spellcheckignorecaps'] = 'Ignorar palabras con todo mayúsculas';
 $labels['addtodict'] = 'Añadir al diccionario';
 $labels['mailtoprotohandler'] = 'Registrar controlador de protocolo para enlaces mailto:';
+$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';
@@ -421,22 +494,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['plugin'] = 'Plugin';
+
+$labels['installedplugins'] = 'Complementos instalados';
+$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';
@@ -456,3 +536,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 0cb075174..6c031df29 100644
--- a/program/localization/es_ES/messages.inc
+++ b/program/localization/es_ES/messages.inc
@@ -2,105 +2,111 @@
 
 /*
  +-----------------------------------------------------------------------+
- | 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: Jose Antonio Morales Santiago <cike@txsolutions.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...';
 $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)...';
@@ -108,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..cb184b086 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,74 +81,83 @@ $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';
@@ -143,12 +172,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,176 +188,213 @@ $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';
@@ -355,10 +423,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';
@@ -389,12 +458,12 @@ $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 +476,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 +494,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 +536,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..653b48be5 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';
@@ -30,6 +33,7 @@ $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 +60,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 +73,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 +121,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 +163,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..eb61f4c8c 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,155 +81,325 @@ $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['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['previewpane'] = 'Aurrebista panela ikusi';
 $labels['skin'] = 'Azal-interfazea';
@@ -221,23 +411,129 @@ $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['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['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..118f53ff6 100644
--- a/program/localization/eu_ES/messages.inc
+++ b/program/localization/eu_ES/messages.inc
@@ -2,27 +2,41 @@
 
 /*
  +-----------------------------------------------------------------------+
- | 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['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 +46,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 +104,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..6a4904d7e 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,154 +81,325 @@ $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['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['previewpane'] = 'چوکات پیشنما را نشان دهید';
 $labels['skin'] = 'تمپلیت محیط کاربری';
@@ -214,39 +411,129 @@ $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['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['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..aa479b9c6 100644
--- a/program/localization/fa_AF/messages.inc
+++ b/program/localization/fa_AF/messages.inc
@@ -2,27 +2,41 @@
 
 /*
  +-----------------------------------------------------------------------+
- | 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['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 +46,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 +104,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 d198b9e19..8bba66c26 100644
--- a/program/localization/fa_IR/labels.inc
+++ b/program/localization/fa_IR/labels.inc
@@ -2,58 +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['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'] = '۳ش';
@@ -61,74 +81,83 @@ $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'] = 'پرچم‌دار';
@@ -143,12 +172,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'] = 'صعودی';
@@ -157,181 +188,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'] = '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['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['previewpane'] = 'نمایش قاب پیش‌نمایش';
 $labels['skin'] = 'پوسته ظاهری';
-$labels['logoutclear'] = 'تمیز کردن زباله دان در هنگام خروچ';
+$labels['logoutclear'] = 'تمیز کردن زباله دان هنگام برون‌ر�ت';
 $labels['logoutcompact'] = '�شرده‌سازی صندوق در هنگام خروچ';
 $labels['uisettings'] = 'محیط کاربری';
 $labels['serversettings'] = 'تنظیمات سرور';
@@ -346,15 +418,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'] = 'عناوین پیوستی';
@@ -368,12 +441,13 @@ $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'] = 'هنگام پاسخ امضاء اصلی را از پیغام پاک کن';
@@ -384,12 +458,12 @@ $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['defaultaddressbook'] = 'ا�زودن تماس‌های جدید به د�تر نشانی انتخاب شده';
+$labels['defaultabook'] = 'د�ترچه آدرس پیش‌�رض';
 $labels['autocompletesingle'] = 'رد کردن نشانی‌های پست الکترونیک دیگر در تکمیل خودکار';
 $labels['listnamedisplay'] = '�هرست تماس‌ها به عنوان';
 $labels['spellcheckbeforesend'] = 'بررسی املایی قبل از ارسال پیغام';
@@ -399,13 +473,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'] = 'خصوصیات پوشه';
@@ -415,22 +494,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'] = 'اروپای غربی';
@@ -450,3 +536,4 @@ $labels['japanese'] = 'ژاپنی';
 $labels['korean'] = 'کره‌ای';
 $labels['chinese'] = 'چینی';
 
+?>
diff --git a/program/localization/fa_IR/messages.inc b/program/localization/fa_IR/messages.inc
index 2489676da..5db68b005 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'] = 'اتصال به سرور انباره نامو�ق بود.';
@@ -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'] = 'هیچ تکلی� گروهی تغییر نکرده است.';
 $messages['importwait'] = 'در حال وارد کردن، لط�ا صبر کنید...';
-$messages['importerror'] = 'وارد کردن نامو�ق بود! �ایل بارگذاری شده یک پرونده vCard معتبر نیست.';
+$messages['importformaterror'] = 'وارد کردن نامو�ق! �ایل بارگذاری شده یک �ایل اطلاعات معتبر نیست.';
 $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'] = 'هشدار! این پیوست مشکوک است زیرا نوع آن با نوعی که در پیغام اشاره شده مطابقت ندارد. اگر شما �رستنده را تایید نمی‌کنید، شما نباید آن را در مرورگر باز نمایید زیرا ممکن است که شامل محتوای مخرب باشد.<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..62c2d6b07 100644
--- a/program/localization/fi_FI/labels.inc
+++ b/program/localization/fi_FI/labels.inc
@@ -2,58 +2,77 @@
 
 /*
  +-----------------------------------------------------------------------+
- | 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['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 +80,89 @@ $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['deleted'] = 'Poistettu';
+$labels['undeleted'] = 'Ei poistettu';
 $labels['invert'] = 'Käännä';
 $labels['filter'] = 'Suodin';
 $labels['list'] = 'Listaus';
@@ -142,12 +171,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,174 +187,216 @@ $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';
+
+// 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'] = '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'] = '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['previewpane'] = 'Näytä esikatselulehti';
 $labels['skin'] = 'Käyttöliittymän teema';
@@ -347,10 +420,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,6 +444,7 @@ $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ä';
@@ -380,12 +455,12 @@ $labels['replysignaturepos'] = 'Vastattaessa tai välitettäessä laita allekirj
 $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 +470,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 +491,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 +533,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/labels.inc b/program/localization/fr_FR/labels.inc
index 38d5a63d8..4a78e565f 100644
--- a/program/localization/fr_FR/labels.inc
+++ b/program/localization/fr_FR/labels.inc
@@ -2,58 +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: Penegal                                                       |
- +-----------------------------------------------------------------------+
+
+ 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']     = 'Open';
+$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';
@@ -61,74 +81,83 @@ $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 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['select'] = 'Sélectionner';
 $labels['all'] = 'Tous';
 $labels['none'] = 'Aucun';
-$labels['nonesort'] = 'Aucun';
 $labels['currpage'] = 'Page courante';
 $labels['unread'] = 'Non lus';
 $labels['flagged'] = 'Marqué';
@@ -143,12 +172,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';
@@ -157,176 +188,213 @@ $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'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
+
+// 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';
@@ -355,10 +423,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['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é';
@@ -389,12 +458,12 @@ $labels['replysignaturepos'] = 'En répondant ou en transférant, placer la sign
 $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';
-$labels['defaultaddressbook'] = 'Ajouter de nouveaux contacts au carnet d’adresses sélectionné';
+$labels['defaultabook'] = 'Carnet d\'adresse par défaut';
 $labels['autocompletesingle'] = 'Ne pas tenir compte des adresses emails alternatives dans l\'autoremplissage';
 $labels['listnamedisplay'] = 'Lister les contacts comme';
 $labels['spellcheckbeforesend'] = 'Vérifier l’orthographe avant l’envoie d’un message';
@@ -407,13 +476,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';
@@ -423,22 +494,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';
@@ -458,3 +536,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 3566580bd..bd3fd2094 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: Anthony Prades <toony.github@chezouam.net>                    |
- +-----------------------------------------------------------------------+
+
+ 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';
@@ -30,6 +33,7 @@ $messages['invalidhost'] = 'Nom du serveur invalide.';
 $messages['nomessagesfound'] = 'Cette boîte aux lettres ne contient aucun message.';
 $messages['loggedout'] = 'Vous venez de vous déconnecter avec succès. Au revoir !';
 $messages['mailboxempty'] = 'La boîte aux lettres est vide.';
+$messages['refreshing'] = 'Rafraîchissement en cours...';
 $messages['loading'] = 'Chargement...';
 $messages['uploading'] = 'Envoi du fichier...';
 $messages['uploadingmany'] = 'Envoi des fichiers ...';
@@ -56,11 +60,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...';
@@ -69,11 +73,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';
@@ -117,6 +121,7 @@ $messages['contactaddedtogroup'] = 'Les contacts ont bien été ajoutés à ce g
 $messages['contactremovedfromgroup'] = 'Les contacts ont bien été supprimés de ce groupe';
 $messages['nogroupassignmentschanged'] = 'Appartenance aux groupes inchangée.';
 $messages['importwait'] = 'Importation, veuillez patienter...';
+$messages['importformaterror'] = 'Echec de l\'import ! Le fichier n\'est pas un fichier d\'import de données valide.';
 $messages['importconfirm'] = '<b>$inserted contacts importés avec succès, $skipped entrées existantes ignorées</b>:<p><em>$names</em></p>';
 $messages['importconfirmskipped'] = '<b>$skipped entrée(s) déjà existante(s)</b>';
 $messages['opnotpermitted'] = 'Cette opération n\'est pas permise !';
@@ -158,4 +163,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
new file mode 100644
index 000000000..d04d7e89c
--- /dev/null
+++ b/program/localization/fy_NL/labels.inc
@@ -0,0 +1,539 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/<lang>/labels.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.                     |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/labels/
+*/
+
+$labels = array();
+
+// 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['junk']   = 'Junk';
+
+// message listing
+$labels['subject'] = 'Ûnderwerp';
+$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['size']    = 'Size';
+$labels['priority'] = 'Priority';
+$labels['organization'] = 'Organisaasje';
+$labels['readstatus'] = 'Read status';
+$labels['listoptions'] = 'List options...';
+
+$labels['mailboxlist'] = 'Mappen';
+$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';
+$labels['wed'] = 'woa';
+$labels['thu'] = 'toa';
+$labels['fri'] = 'fre';
+$labels['sat'] = 'sno';
+
+// weekdays long
+$labels['sunday']    = 'snein';
+$labels['monday']    = 'moandei';
+$labels['tuesday']   = 'tiisdei';
+$labels['wednesday'] = 'woansdei';
+$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';
+
+// 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['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['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['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['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/fy_NL/messages.inc b/program/localization/fy_NL/messages.inc
new file mode 100644
index 000000000..1dacf4adc
--- /dev/null
+++ b/program/localization/fy_NL/messages.inc
@@ -0,0 +1,16 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/fy_NL/messages.inc                                       |
+ |                                                                       |
+ | Language file of the Roundcube Webmail client                         |
+ | Copyright (C) 2012, The Roundcube Dev Team                            |
+ | Licensed under the GNU General Public License                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: unknown                                                       |
+ +-----------------------------------------------------------------------+
+*/
+
+$messages = array();
\ No newline at end of file
diff --git a/program/localization/ga_IE/labels.inc b/program/localization/ga_IE/labels.inc
index 14a5cd1b4..7169a8800 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,459 @@ $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['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['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['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['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..140b88639 100755
--- a/program/localization/ga_IE/messages.inc
+++ b/program/localization/ga_IE/messages.inc
@@ -2,27 +2,41 @@
 
 /*
  +-----------------------------------------------------------------------+
- | 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['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 +46,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 +103,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..13fdfa793 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']  = 'Sender';
+$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 of $count';
+
+$labels['copy']     = 'Copiar';
+$labels['move']     = 'Mover';
+$labels['moveto']   = 'Mover a...';
 $labels['download'] = 'Descargar';
+$labels['open']     = 'Open';
+$labels['showattachment'] = 'Show';
+$labels['showanyway'] = 'Show it anyway';
+
 $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,89 @@ $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']          = 'Forward';
+$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']             = 'Mark';
+$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['deleted'] = 'Marcadas como eliminadas';
+$labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'Inverter';
 $labels['filter'] = 'Filtrar';
 $labels['list'] = 'Lista';
@@ -139,12 +172,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,171 +188,218 @@ $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']  = 'Body';
+
 $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'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
+
+// message compose
+$labels['editasnew']      = 'Editar como nova';
+$labels['send']           = 'Send';
+$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']    = 'Spell';
 $labels['checkspelling'] = 'Revisar a ortografía';
 $labels['resumeediting'] = 'Voltar á edición';
-$labels['revertto'] = 'Voltar a';
+$labels['revertto']      = 'Voltar a';
+
+$labels['attach'] = 'Attach';
 $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 more...';
+$labels['togglemoreheaders'] = 'Show more message headers';
+$labels['togglefullheaders'] = 'Toggle raw message headers';
+
 $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']      = 'Export all';
+$labels['exportsel']      = 'Export selected';
+$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'] = 'Remove selected contacts from group';
+
+$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'] = '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'] = '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'] = 'Part';
+$labels['digitalsig'] = 'Digital Signature';
 $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'] = 'Open message in a new window';
+$labels['composeextwin'] = 'Compose in a new window';
 $labels['htmleditor'] = 'Redactar mensaxes HTML';
 $labels['htmlonreply'] = 'só cando se resposte a unha mensaxe HTML';
+$labels['htmlonreplyandforward'] = 'on forward or reply to HTML message';
 $labels['htmlsignature'] = 'Sinatura HTML';
 $labels['previewpane'] = 'Amosar previsualización';
 $labels['skin'] = 'Aspecto da interface';
@@ -336,14 +418,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'] = 'Directly delete messages in Junk';
 $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']  = 'Refresh (check for new messages, 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,6 +447,7 @@ $labels['maintenance'] = 'Mantemento';
 $labels['newmessage'] = 'Mensaxes novas';
 $labels['signatureoptions'] = 'Opcións da firma';
 $labels['whenreplying'] = 'Ao respostar';
+$labels['replyempty'] = 'do not quote the original message';
 $labels['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';
@@ -373,26 +458,33 @@ $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'] = 'Default address book';
 $labels['autocompletesingle'] = 'Ignorar as direccións alternativas no autocompletado';
+$labels['listnamedisplay'] = 'List contacts as';
 $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'] = 'Register protocol handler for mailto: links';
+$labels['forwardmode'] = 'Messages forwarding';
+$labels['inline'] = 'inline';
+$labels['asattachment'] = 'as attachment';
+
+$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 +494,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'] = 'Installed plugins';
 $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 +536,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..6f230bc89 100644
--- a/program/localization/gl_ES/messages.inc
+++ b/program/localization/gl_ES/messages.inc
@@ -2,32 +2,38 @@
 
 /*
  +-----------------------------------------------------------------------+
- | 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']  = 'An error occurred!';
+$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'] = 'Request timed out';
 $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['invalidrequest'] = 'Petición inválida!. Non se gardou ningún dato.';
+$messages['invalidhost'] = 'Invalid server name.';
 $messages['nomessagesfound'] = 'Non se atoparon mensaxes nesta caixa de correo.';
 $messages['loggedout'] = 'Rematou correctamente a súa sesión. Ata logo!';
 $messages['mailboxempty'] = 'A caixa de correo está vacía.';
+$messages['refreshing'] = 'Refreshing...';
 $messages['loading'] = 'Cargando...';
 $messages['uploading'] = 'Cargando ficheiro...';
 $messages['uploadingmany'] = 'Cargando ficheiros...';
@@ -54,11 +60,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 +73,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 +112,16 @@ $messages['addingmember'] = 'Engadindo o(s) contacto(s) ao grupo...';
 $messages['removingmember'] = 'Eliminando o(s) contacto(s) do grupo...';
 $messages['receiptsent'] = 'A notificación da entrega enviouse correctamente.';
 $messages['errorsendingreceipt'] = 'Non foi posible enviar a notificación da entrega.';
+$messages['deleteidentityconfirm'] = 'Do you really want to delete this identity?';
 $messages['nodeletelastidentity'] = 'Non pode eliminar esta identidade, é a última.';
 $messages['forbiddencharacter'] = 'O nome do cartafol contén un carácter non válido.';
 $messages['selectimportfile'] = 'Por favor, escolla un ficheiro para cargar.';
 $messages['addresswriterror'] = 'Non se pode escribir no caderno de enderezos que escolleu.';
 $messages['contactaddedtogroup'] = 'Engadiuse correctamente o contacto a este grupo.';
 $messages['contactremovedfromgroup'] = 'Suprimiuse correctamente o contacto deste grupo.';
+$messages['nogroupassignmentschanged'] = 'No group assignments changed.';
 $messages['importwait'] = 'A importar. Por favor, agarde...';
-$messages['importerror'] = 'Produciuse un erro na importación. O ficheiro que cargou non é un vCard correcto.';
+$messages['importformaterror'] = 'Import failed! The uploaded file is not a valid import data file.';
 $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 +162,8 @@ $messages['foldercreated'] = 'O cartafol creouse correctamente.';
 $messages['invalidimageformat'] = 'O formato da imaxe non é válido.';
 $messages['mispellingsfound'] = 'Atopáronse erros ortográficos na mensaxe.';
 $messages['parentnotwritable'] = 'Non foi posible crear/mover o cartafol no cartafol padre escollido porque non ten permisos.';
+$messages['messagetoobig'] = 'The message part is too big to process it.';
+$messages['attachmentvalidationerror'] = 'WARNING! This attachment is suspicious because its type doesn\'t match the type declared in the message. If you do not trust the sender, you shouldn\'t open it in the browser because it may contain malicious contents.<br/><br/><em>Expected: $expected; found: $detected</em>';
+$messages['noscriptwarning'] = 'Warning: This webmail service requires Javascript! In order to use it please enable Javascript in your browser\'s settings.';
 
+?>
diff --git a/program/localization/he_IL/labels.inc b/program/localization/he_IL/labels.inc
index 22a163cd6..698b73493 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,74 +81,83 @@ $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'] = 'מסומן';
@@ -143,12 +172,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,176 +188,215 @@ $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'] = '( $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'] = 'יצירת הודעה מעוצבת';
@@ -355,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'] = 'שמות קבצי� מצורפי�';
@@ -389,12 +460,12 @@ $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 +478,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 +496,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 +538,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..be4ef2824 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'] = 'הקשר לשרת הדו�ר נכשל';
@@ -30,6 +33,7 @@ $messages['invalidhost'] = 'ש� שרת ל� חוקי';
 $messages['nomessagesfound'] = 'ל� נמצ�ו הודעות בתיבה זו';
 $messages['loggedout'] = 'הקשר הסתיי�. להתר�ות!';
 $messages['mailboxempty'] = 'רשימת ההודעות ריקה';
+$messages['refreshing'] = 'מרענן...';
 $messages['loading'] = 'טעינה...';
 $messages['uploading'] = 'קובץ עולה...';
 $messages['uploadingmany'] = 'מעלה קבצי�...';
@@ -56,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'] = 'התיקיה נמחקת...';
@@ -69,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'] = 'נ� לבחור שרת כתובות לחיפוש';
@@ -117,6 +121,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 +163,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..4564e1226 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,459 @@ $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['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['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['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['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..328dbe00e 100644
--- a/program/localization/hi_IN/messages.inc
+++ b/program/localization/hi_IN/messages.inc
@@ -2,27 +2,41 @@
 
 /*
  +-----------------------------------------------------------------------+
- | 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['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 +46,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..bf5364653 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,89 @@ $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['deleted'] = 'Obrisano';
+$labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'Obrni';
 $labels['filter'] = 'Filtriraj';
 $labels['list'] = 'Lista';
@@ -141,12 +172,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,172 +188,218 @@ $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['previewpane'] = 'Prikaži podru�je pregleda';
 $labels['skin'] = 'Tema izgleda';
@@ -339,14 +418,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,11 +441,13 @@ $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';
@@ -375,26 +458,33 @@ $labels['replysignaturepos'] = 'Kod downloada ili proslijeđivanja postavi potpi
 $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 +494,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 +536,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..c3a4f1779 100644
--- a/program/localization/hr_HR/messages.inc
+++ b/program/localization/hr_HR/messages.inc
@@ -2,32 +2,38 @@
 
 /*
  +-----------------------------------------------------------------------+
- | 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['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 +60,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 +73,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 +119,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 +163,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 b2d4c08b2..96c43d146 100644
--- a/program/localization/hu_HU/labels.inc
+++ b/program/localization/hu_HU/labels.inc
@@ -2,58 +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']     = 'Open';
+$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';
@@ -61,74 +81,83 @@ $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';
@@ -143,12 +172,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ő';
@@ -157,175 +188,215 @@ $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['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'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
+
+// 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:';
 $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';
@@ -347,15 +418,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['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';
@@ -386,13 +458,13 @@ $labels['replysignaturepos'] = 'Válasznál és továbbításnál kerüljön az
 $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['defaultaddressbook'] = 'Új kapcsolatok hozzáadása a kiválasztott címjegyzékhez';
-$labels['autocompletesingle'] = 'TRANSLATE!';
+$labels['defaultabook'] = 'Alapértelmezett címjegyzék';
+$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';
@@ -404,13 +476,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';
@@ -420,22 +494,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';
@@ -455,3 +536,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 aaf2968ce..ee3e8a9a5 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';
@@ -30,6 +33,7 @@ $messages['invalidhost'] = 'Hibás szerver hoszt név';
 $messages['nomessagesfound'] = 'A fiók nem tartalmaz leveleket';
 $messages['loggedout'] = 'Sikeres kijelentkezés. Viszontlátásra!';
 $messages['mailboxempty'] = 'A fiók üres';
+$messages['refreshing'] = 'Frissítés...';
 $messages['loading'] = 'Betöltés...';
 $messages['uploading'] = 'Fájl feltöltése...';
 $messages['uploadingmany'] = 'Fájlok feltöltése...';
@@ -56,11 +60,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...';
@@ -69,11 +73,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';
@@ -115,7 +119,9 @@ $messages['selectimportfile'] = 'Kérjük válassza ki a feltölteni kívánt fÃ
 $messages['addresswriterror'] = 'A kiválasztott címjegyzék nem írható';
 $messages['contactaddedtogroup'] = 'A kapcsolat hozzáadása a csoporthoz sikeresen megtörtént';
 $messages['contactremovedfromgroup'] = 'A kapcsolat törlése a csoportból sikeresen megtörtént';
+$messages['nogroupassignmentschanged'] = 'A csoport hozzárendelések nem változtak.';
 $messages['importwait'] = 'Importálás folyamatban, kérem várjon...';
+$messages['importformaterror'] = 'Az importálás sikertelen! A feltöltött fájl ismeretlen formátumú.';
 $messages['importconfirm'] = '<b>Sikeresen importálásra került $inserted kapcsolat, kihagyva $skipped már létező bejegyzés</b>:<p><em>$names</em></p>';
 $messages['importconfirmskipped'] = '<b>Kihagyva $skipped már létező bejegyzés</b>';
 $messages['opnotpermitted'] = 'A művelet nem megengedett!';
@@ -157,4 +163,7 @@ $messages['invalidimageformat'] = 'Érvénytelen képformátum';
 $messages['mispellingsfound'] = 'Az üzenetben helyesírási hibák találhatók';
 $messages['parentnotwritable'] = 'Nem sikerült a mappa létrehozása/mozgatása a kijelölt mappába. Nincs jogosultsága a művelethez!';
 $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..3612dc974 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,89 @@ $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['deleted'] = 'Õ‹Õ¶Õ»Õ¾Õ¡Õ®';
+$labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'Õ“Õ¸Õ­Õ¡Õ¿Õ¥Õ²Õ¥Õ¬';
 $labels['filter'] = 'Ô¶Õ¿Õ«Õ¹';
 $labels['list'] = 'Õ‘Õ¸Ö‚Ö�Õ¡Õ¯';
@@ -145,12 +172,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,171 +188,218 @@ $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['previewpane'] = 'Õ‘Õ¸Ö‚Ö�Õ¡Õ¤Ö€Õ¥Õ¬ ÕºÕ¡Õ¿Õ¸Ö‚Õ°Õ¡Õ¶Õ¨';
 $labels['skin'] = 'Õ�Õ¥Õ½Ö„Õ« Õ¿Õ¡Ö€Õ¢Õ¥Ö€Õ¡Õ¯';
@@ -347,10 +423,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,6 +447,7 @@ $labels['maintenance'] = 'Õ�ÕºÕ¡Õ½Õ¡Ö€Õ¯Õ¸Ö‚Õ´';
 $labels['newmessage'] = 'Õ†Õ¸Ö€ Õ°Õ¡Õ²Õ¸Ö€Õ¤Õ¡Õ£Ö€Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶';
 $labels['signatureoptions'] = 'Õ�Õ¿Õ¸Ö€Õ¡Õ£Ö€Õ¸Ö‚Õ©ÕµÕ¡Õ¶ Õ¨Õ¶Õ¿Ö€Õ¡Õ¶Ö„Õ¶Õ¥Ö€';
 $labels['whenreplying'] = 'ÕŠÕ¡Õ¿Õ¡Õ½Õ­Õ¡Õ¶Õ¥Õ¬Õ«Õ½';
+$labels['replyempty'] = 'do not quote the original message';
 $labels['replytopposting'] = 'Õ½Õ¯Õ½Õ¥Õ¬ Õ¶Õ¸Ö€ Õ°Õ¡Õ²Õ¸Ö€Õ¤Õ¡Õ£Ö€Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Õ¨ Õ¾Õ¥Ö€Ö‡Õ«Ö�';
 $labels['replybottomposting'] = 'Õ½Õ¯Õ½Õ¥Õ¬ Õ¶Õ¸Ö€ Õ°Õ¡Õ²Õ¸Ö€Õ¤Õ¡Õ£Ö€Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Õ¨ Õ¶Õ¥Ö€Ö„Ö‡Õ«Ö�';
 $labels['replyremovesignature'] = 'ÕŠÕ¡Õ¿Õ¡Õ½Õ­Õ¡Õ¶Õ¥Õ¬Õ«Õ½ Õ°Õ¥Õ¼Õ¡Ö�Õ¶Õ¥Õ¬ Õ°Õ¡Õ²Õ¸Ö€Õ¤Õ¡Õ£Ö€Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Õ«Ö� Õ¶Õ¡Õ­Õ¸Ö€Õ¤ Õ½Õ¿Õ¸Ö€Õ¡Õ£Ö€Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Õ¨';
@@ -380,12 +458,12 @@ $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 +473,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 +494,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 +536,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..bbb083a21 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 Õ½Õ¥Ö€Õ¾Õ¥Ö€Õ« Õ°Õ¥Õ¿ Õ¯Õ¡ÕºÕ¨ Õ±Õ¡Õ­Õ¸Õ²Õ¾Õ¥Ö�';
@@ -27,9 +29,12 @@ $messages['requesttimedout'] = 'Õ€Õ¡Ö€Ö�Õ´Õ¡Õ¶ Õ©Õ¸Ö‚ÕµÕ¬Õ¡Õ¿Ö€Õ¥Õ¬Õ« ÕªÕ¡Õ´Õ¡Õ¶
 $messages['errorreadonly'] = 'Ô³Õ¸Ö€Õ®Õ¸Õ²Õ¸Ö‚Õ©ÕµÕ¸Ö‚Õ¶Õ¨ Õ¡Õ¶Õ°Õ¶Õ¡Ö€ Õ§Ö‰ ÕŠÕ¡Õ¶Õ¡Õ¯Õ¨ Õ´Õ«Õ¡ÕµÕ¶ Õ¨Õ¶Õ©Õ¥Ö€Ö�Õ´Õ¡Õ¶ Õ°Õ¡Õ´Õ¡Ö€ Õ§Ö‰';
 $messages['errornoperm'] = 'Ô³Õ¸Ö€Õ®Õ¸Õ²Õ¸Ö‚Õ©ÕµÕ¡Õ¶ Õ¯Õ¡Õ¿Õ¡Ö€Õ´Õ¡Õ¶ Õ«Ö€Õ¡Õ¾Õ¸Ö‚Õ¶Ö„Õ¨ Õ´Õ¥Ö€ÕªÕ¾Õ¡Õ® Õ§Ö‰';
 $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 +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'] = '$inserted Õ¶Õ¸Ö€ Õ¶Õ¥Ö€Õ¯Ö€Õ¾Õ¡Õ® Õ°Õ¡Õ½Ö�Õ¥Õ¶Õ¥Ö€, $skipped Õ¡Ö€Õ¤Õ¥Õ¶ Õ¡Õ¼Õ¯Õ¡ Õ°Õ¡Õ½Ö�Õ¥Õ¶Õ¥Ö€Õ� <p><em>$names</em></p>';
 $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/ia/labels.inc b/program/localization/ia/labels.inc
index cae533fe1..89273c147 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,459 @@ $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['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['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['replysignaturepos'] = 'When replying or forwarding place signature';
+$labels['belowquote'] = 'below the quote';
+$labels['abovequote'] = 'above the quote';
 $labels['insertsignature'] = 'Insertar signatura';
+$labels['previewpanemarkread']  = 'Mark previewed messages as read';
+$labels['afternseconds']  = 'after $n seconds';
+$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..fca8404b2 100644
--- a/program/localization/ia/messages.inc
+++ b/program/localization/ia/messages.inc
@@ -2,40 +2,168 @@
 
 /*
  +-----------------------------------------------------------------------+
- | 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['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..4877434ed 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,89 @@ $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['deleted'] = 'Terhapus';
+$labels['undeleted'] = 'Tidak terhapus';
 $labels['invert'] = 'Sebaliknya';
 $labels['filter'] = 'Penyaringan';
 $labels['list'] = 'Daftar';
@@ -142,12 +172,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,174 +188,218 @@ $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['previewpane'] = 'Unjuk pratinjau';
 $labels['skin'] = 'Tampilan antarmuka';
@@ -347,20 +423,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,6 +447,7 @@ $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';
@@ -380,12 +458,12 @@ $labels['replysignaturepos'] = 'ketika membalas atau meneruskan pesan tambahkan
 $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 +473,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 +494,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 +536,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..b604d0242 100644
--- a/program/localization/id_ID/messages.inc
+++ b/program/localization/id_ID/messages.inc
@@ -2,89 +2,94 @@
 
 /*
  +-----------------------------------------------------------------------+
- | 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['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 +119,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 +143,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 +153,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 +163,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/index.inc b/program/localization/index.inc
index 83b9ad6eb..bfb770cac 100644
--- a/program/localization/index.inc
+++ b/program/localization/index.inc
@@ -97,6 +97,7 @@ $rcube_languages = array(
   'uk_UA' => 'Ukrainian (Україн�ька)',
   'vi_VN' => 'Vietnamese (Tiếng Việt)',
   'cy_GB' => 'Welsh (Cymraeg)',
+  'fy_NL' => 'West Frisian (Frysk)',
 );
 
 $rcube_language_aliases = array(
diff --git a/program/localization/is_IS/labels.inc b/program/localization/is_IS/labels.inc
index d768050fe..c8d49bf23 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,89 @@ $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['deleted'] = 'Eytt';
+$labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'Umhverfa';
 $labels['filter'] = 'Sía';
 $labels['list'] = 'Listi';
@@ -141,12 +172,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,172 +188,218 @@ $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['previewpane'] = 'Sýna forskoðunarglugga';
 $labels['skin'] = 'Sniðmát á viðmóti';
@@ -339,14 +418,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,11 +441,13 @@ $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';
@@ -375,12 +458,12 @@ $labels['replysignaturepos'] = 'Þegar skeytum er svarað eða áframsend setja
 $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 +472,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 +494,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 +536,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..530e8008f 100644
--- a/program/localization/is_IS/messages.inc
+++ b/program/localization/is_IS/messages.inc
@@ -2,58 +2,168 @@
 
 /*
  +-----------------------------------------------------------------------+
- | 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['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..97be929cf 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,74 +81,83 @@ $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';
@@ -143,12 +172,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,175 +188,213 @@ $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'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
+
+// 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';
@@ -354,10 +423,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';
@@ -388,12 +458,12 @@ $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 +476,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 +494,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 +536,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..66c248e74 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';
@@ -30,6 +33,7 @@ $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 +60,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 +73,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 +121,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 +163,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 34166cae8..685dba0b3 100644
--- a/program/localization/ja_JP/labels.inc
+++ b/program/localization/ja_JP/labels.inc
@@ -2,58 +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'] = '�';
@@ -61,74 +81,83 @@ $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'] = 'フラグ付�';
@@ -143,12 +172,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,176 +188,213 @@ $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'] = 'ファイル�らイン�ート';
 $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メッセージを使用';
@@ -355,10 +423,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'] = '添付ファイル���';
@@ -389,12 +458,12 @@ $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 +476,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'] = 'フォルダー�属性';
@@ -423,23 +494,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'] = '西ヨーロッパ言語';
@@ -459,3 +536,4 @@ $labels['japanese'] = '日本語';
 $labels['korean'] = '韓国語';
 $labels['chinese'] = '中国語';
 
+?>
diff --git a/program/localization/ja_JP/messages.inc b/program/localization/ja_JP/messages.inc
index 395f5e056..6c6008a55 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 サー�ー��接続�失敗����。';
@@ -30,6 +33,7 @@ $messages['invalidhost'] = '正����サー�ー���。';
 $messages['nomessagesfound'] = '��フォルダー��メッセージ��り��ん。';
 $messages['loggedout'] = 'ログアウト����。�よ��ら!';
 $messages['mailboxempty'] = 'メールボックス�空��。';
+$messages['refreshing'] = '�表示中...';
 $messages['loading'] = '読�込�中...';
 $messages['uploading'] = 'ファイルをアップロード中...';
 $messages['uploadingmany'] = 'ファイルをアップロード中...';
@@ -56,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'] = 'フォルダーを削除中...';
@@ -69,11 +73,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サー�ーを�択������。';
@@ -117,6 +121,7 @@ $messages['contactaddedtogroup'] = 'ã�“ã�®ã‚°ãƒ«ãƒ¼ãƒ—ã�«é€£çµ¡å…ˆã‚’追加ã�—ã�
 $messages['contactremovedfromgroup'] = '��グループ�ら連絡先を削除����。';
 $messages['nogroupassignmentschanged'] = 'グループ�割り当�を変更���ん���。';
 $messages['importwait'] = 'イン�ート中��。��ら��待�����...';
+$messages['importformaterror'] = 'イン�ート����ん���!  アップロード��ファイル�正��データをイン�ート�るファイル���り��ん。';
 $messages['importconfirm'] = '<b>$inserted件�連絡先をイン�ート����。</b>';
 $messages['importconfirmskipped'] = '<b>$skipped件�既存�る項目を飛���。</b>';
 $messages['opnotpermitted'] = '許��れ�����作��。';
@@ -158,4 +163,7 @@ $messages['invalidimageformat'] = '画��形��正���り��ん。
 $messages['mispellingsfound'] = 'メッセージ�スペルミスを見�����。';
 $messages['parentnotwritable'] = '�択��親フォルダー�作����移動を����ん���。アクセス権���り��ん。';
 $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..b3a712515 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,218 +81,325 @@ $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['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['previewpane'] = 'ჩვენებ�';
 $labels['skin'] = 'ინტერფეისი';
@@ -278,18 +411,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,12 +439,15 @@ $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'] = 'წ�იშ�ლ�ს ხელმ�წერ� პ�სუხის შემთხვევ�ში';
@@ -317,39 +458,77 @@ $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 +536,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..7ad0b665b 100755
--- a/program/localization/ka_GE/messages.inc
+++ b/program/localization/ka_GE/messages.inc
@@ -2,31 +2,38 @@
 
 /*
  +-----------------------------------------------------------------------+
- | 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['invalidrequest'] = '�რ�სწ�რი მ�თხ�ვნ�! მ�ნ�ცემების შენ�ხვ� �რ მ�ხერხდ�.';
+$messages['invalidhost'] = 'Invalid server name.';
 $messages['nomessagesfound'] = '�რ �რის �ხ�ლი შეტყ�ბინებ�';
 $messages['loggedout'] = 'წ�რმ�ტებით დ�იხურ� თქვენი სესი�';
 $messages['mailboxempty'] = 'ს�ფ�სტ� ყუთი ც�რიელი�';
+$messages['refreshing'] = 'Refreshing...';
 $messages['loading'] = 'იტვირთებ�...';
 $messages['uploading'] = 'ფ�ილი იტვირთებ�...';
 $messages['uploadingmany'] = 'ფ�ილების �ტვირთვ�...';
@@ -39,31 +46,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 +90,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 +104,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 +135,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..a344e60c2 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,89 @@ $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['deleted'] = 'បានលុបរួច';
+$labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'បញ្ច្រស់';
 $labels['filter'] = 'លក្���ណ្ឌ';
 $labels['list'] = '�ារាង';
@@ -130,12 +172,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,149 +188,218 @@ $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['previewpane'] = 'បង្ហាញប្រអប់សំរាប់មើលសំបុ�្រ';
 $labels['skin'] = 'ការរចនាទំព�រ';
@@ -305,14 +418,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,12 +439,15 @@ $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'] = 'នៅ​ព�ល​ឆ្លើយ​�ប​លុប​ហ�្�ល��ា​ច�ញ​ពីសំបុ�្រ';
@@ -340,18 +458,33 @@ $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 +493,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 +536,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..c9ede486e 100644
--- a/program/localization/km_KH/messages.inc
+++ b/program/localization/km_KH/messages.inc
@@ -2,33 +2,41 @@
 
 /*
  +-----------------------------------------------------------------------+
- | 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['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 +46,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 +60,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 +105,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 +140,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 8bdf96b1a..667fb422a 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: Kim, Woohyun <woohyun.kim@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'] = '�메�';
-$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,348 +81,459 @@ $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['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'] = '$data�, $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['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['replysignaturepos'] = '회신 �는 전달 시 서명 추가';
+$labels['belowquote'] = '�용문 하단';
+$labels['abovequote'] = '�용문 �단';
 $labels['insertsignature'] = '서명 삽입';
-$labels['previewpanemarkread'] = '미리 �힘 메시지를 ��으로 표시';
-$labels['afternseconds'] = '$n 초 �후';
-$labels['reqmdn'] = '항� 수신확� 요청 하기';
-$labels['defaultaddressbook'] = '선�한 주소�� 새로운 연�처를 추가';
-$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..4efd2f3d3 100644
--- a/program/localization/ko_KR/messages.inc
+++ b/program/localization/ko_KR/messages.inc
@@ -2,20 +2,23 @@
 
 /*
  +-----------------------------------------------------------------------+
- | 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['errortitle']  = '�러가 발�!';
+$messages['loginfailed']  = '로그�� 실패하였습니다.';
 $messages['cookiesdisabled'] = '브�우저가 쿠키를 지�하지 않습니다';
 $messages['sessionerror'] = '세션� 유효하지 않거나 종료�었습니다';
 $messages['storageerror'] = 'IMAP 서버 연결 실패';
@@ -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 서버를 선�하세요';
@@ -107,15 +112,18 @@ $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'] = '작업� 허가�지 않았습니다!';
 $messages['nofromaddress'] = '선�한 신�� �메� 주소가 없�';
 $messages['editorwarning'] = '�반 �스트 편집기로 바꾸면 모든 서�� 사�집니다. 계�할까요?';
@@ -137,11 +145,16 @@ $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'] = '��를 성공�으로 갱신 함.';
@@ -149,4 +162,8 @@ $messages['foldercreated'] = '��를 성공�으로 �성 함.';
 $messages['invalidimageformat'] = '올바른 �미지 �멧� 아님.';
 $messages['mispellingsfound'] = '메시지�서 맞춤법 오류를 �지 하였�.';
 $messages['parentnotwritable'] = '선�한 부모 ��� ��를 �성하거나 ��할 수 없�. 접근 권한� 없�.';
+$messages['messagetoobig'] = '처리하기� 너무 � 메시지 입니다.';
+$messages['attachmentvalidationerror'] = '경고! � 첨부 파�� 메시지� 선언 유형과 �치하지 않기때문� �심�니다. 보낸 사람� 믿� 수 없다면, 악성 코드를 �함하는지� 모르기 때문� 브�우저�서 열 수 없습니다. <br/><br/><em> 예측 한 종류 : $expected; 발견 한 종류 : $found</ em>';
+$messages['noscriptwarning'] = '경고: � 웹 메� 서비스는 Javascript가 필요합니다! 사용하려면 Javascript를 브�우저 설정�서 활성화하십시오.';
 
+?>
diff --git a/program/localization/ku/labels.inc b/program/localization/ku/labels.inc
index a6de26f94..5c6786502 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,459 @@ $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['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['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['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['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..6783209a3 100644
--- a/program/localization/ku/messages.inc
+++ b/program/localization/ku/messages.inc
@@ -2,27 +2,41 @@
 
 /*
  +-----------------------------------------------------------------------+
- | 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['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 +46,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 +104,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..376f9c771 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']     = 'Open';
+$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,89 @@ $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['deleted'] = 'pašalintus';
+$labels['undeleted'] = 'Neištrintas';
 $labels['invert'] = 'invertuoti';
 $labels['filter'] = 'Rodyti';
 $labels['list'] = 'Sąrašas';
@@ -142,12 +172,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,174 +188,218 @@ $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']  = 'Body';
+
 $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'] = 'Display in plain text format';
+$labels['changeformathtml'] = 'Display in HTML format';
+
+// 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']      = 'Export all';
+$labels['exportsel']      = 'Export selected';
+$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['previewpane'] = 'Rodyti laiško peržiūros polangį';
 $labels['skin'] = 'Grafinis apvalkalas';
@@ -347,10 +423,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,6 +447,7 @@ $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šą';
@@ -380,12 +458,12 @@ $labels['replysignaturepos'] = 'Atsakant ir persiun�iant laiškus, parašą pri
 $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 +473,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 +494,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 +536,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..6a8e00239 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.';
@@ -26,9 +29,11 @@ $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['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 +60,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 +73,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 +119,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 +163,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..a71d5e554 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,89 @@ $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['deleted'] = 'dzēst�s';
+$labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'invertēt';
 $labels['filter'] = 'Filtrēt';
 $labels['list'] = 'Saraksts';
@@ -133,12 +172,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,169 +188,218 @@ $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['previewpane'] = 'R�dīt priekšskatījuma paneli';
 $labels['skin'] = 'Interfeisa izskats';
@@ -328,14 +418,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,11 +441,13 @@ $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';
@@ -364,26 +458,33 @@ $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 +494,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 +536,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..d65976fa2 100644
--- a/program/localization/lv_LV/messages.inc
+++ b/program/localization/lv_LV/messages.inc
@@ -2,32 +2,38 @@
 
 /*
  +-----------------------------------------------------------------------+
- | 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']  = 'An error occurred!';
+$messages['loginfailed']  = 'Neizdev�s pieslēgties';
 $messages['cookiesdisabled'] = 'Jūsu p�rlūkprogramma neatbalsta sīkdatnes (cookies)';
 $messages['sessionerror'] = 'JÅ«su sessija ir beigusies';
 $messages['storageerror'] = 'Neizdev�s pieslēgties IMAP serverim';
 $messages['servererror'] = 'Servera kļūme.';
 $messages['servererrormsg'] = 'Servera kļūda: $msg';
 $messages['dberror'] = 'Datub�zes kļūda!';
+$messages['requesttimedout'] = 'Request timed out';
 $messages['errorreadonly'] = 'Neizdev�s veikt darbību: Mape ir tikai las�ma (read only).';
 $messages['errornoperm'] = 'Neizdev�s veikt darbību: Piekļuve liegta.';
 $messages['invalidrequest'] = 'Nederīgs pieprasījums. Dati netika saglab�ti.';
+$messages['invalidhost'] = 'Invalid server name.';
 $messages['nomessagesfound'] = 'Šaj� pastkastē nav vēstuļu';
 $messages['loggedout'] = 'Jūs esat veiksmīgi atslēdzies no sistēmas';
 $messages['mailboxempty'] = 'Pastkaste tukša';
+$messages['refreshing'] = 'Refreshing...';
 $messages['loading'] = 'Notiek iel�de...';
 $messages['uploading'] = 'Notiek faila augšupiel�de...';
 $messages['uploadingmany'] = 'Augšupiel�dē failus...';
@@ -54,11 +60,11 @@ $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['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['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['groupdeleting'] = 'Dzēš grupu...';
 $messages['folderdeleting'] = 'Dzēš mapi...';
@@ -67,11 +73,11 @@ $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['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['norecipientwarning'] = 'Lūdzu ievadiet vismaz vienu saņēmēju';
-$messages['nosubjectwarning'] = 'Lauks "temats" ir tukšs. Vai vēlaties to aizpildīt tagad?';
+$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';
@@ -113,8 +119,9 @@ $messages['selectimportfile'] = 'Lūdzu izvēlieties failu, ko vēlaties augšup
 $messages['addresswriterror'] = 'Izvēlēt�s adrešu gr�matas datus nevar labot';
 $messages['contactaddedtogroup'] = 'Kontakti tika veiksmīgi pievienoti šai grupai.';
 $messages['contactremovedfromgroup'] = 'Kontakti tika veiksmīgi atvienoti no šīs grupas.';
+$messages['nogroupassignmentschanged'] = 'No group assignments changed.';
 $messages['importwait'] = 'Importēju, lūdzu uzgaidiet...';
-$messages['importerror'] = 'Imports neizdev�s! Augšupiel�dētais fails nav korekts vCard fails';
+$messages['importformaterror'] = 'Import failed! The uploaded file is not a valid import data file.';
 $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 +163,7 @@ $messages['invalidimageformat'] = 'Nederīgs attēla form�ts.';
 $messages['mispellingsfound'] = 'Vēstulē atrastas pareizrakstības kļūdas.';
 $messages['parentnotwritable'] = 'Neizdev�s izveidot/p�rvietot mapi uz atzīmēto virsmapi. Nav piekļuves tiesību.';
 $messages['messagetoobig'] = 'Vēstule ir p�r�k liela, lai to varētu apstr�d�t.';
+$messages['attachmentvalidationerror'] = 'WARNING! This attachment is suspicious because its type doesn\'t match the type declared in the message. If you do not trust the sender, you shouldn\'t open it in the browser because it may contain malicious contents.<br/><br/><em>Expected: $expected; found: $detected</em>';
+$messages['noscriptwarning'] = 'Warning: This webmail service requires Javascript! In order to use it please enable Javascript in your browser\'s settings.';
 
+?>
diff --git a/program/localization/mk_MK/labels.inc b/program/localization/mk_MK/labels.inc
index 81aa13927..c8190276e 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,160 +81,325 @@ $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['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['previewpane'] = 'Прикажи прозорец за преглед';
 $labels['skin'] = 'Модел на изгледот';
@@ -220,33 +411,43 @@ $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'] = 'При одговарање от�трани го изворниот потпи� од пи�мото';
@@ -257,19 +458,82 @@ $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..c14370b14 100755
--- a/program/localization/mk_MK/messages.inc
+++ b/program/localization/mk_MK/messages.inc
@@ -2,30 +2,41 @@
 
 /*
  +-----------------------------------------------------------------------+
- | 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['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 +46,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 +104,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 +135,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..463256c0e 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,447 @@ $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['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['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['replyandforwardonly'] = 'replies and forwards only';
+$labels['replysignaturepos'] = 'When replying or forwarding place signature';
 $labels['belowquote'] = 'ഉദ�ധാരണത�തിന� താഴെ';
-$labels['afternseconds'] = '$n നിമിഷങ�ങള�� കഴിഞ�ഞ��';
+$labels['abovequote'] = 'above the quote';
+$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 +536,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..85dc43d77 100644
--- a/program/localization/ml_IN/messages.inc
+++ b/program/localization/ml_IN/messages.inc
@@ -2,25 +2,168 @@
 
 /*
  +-----------------------------------------------------------------------+
- | 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['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..804fb5651 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,89 @@ $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['deleted'] = 'काढून टाकलेला(ले)';
+$labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'उलट करा';
 $labels['filter'] = 'गाळणी';
 $labels['list'] = 'यादी';
@@ -136,12 +172,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,150 +188,218 @@ $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['previewpane'] = 'प�रक�रियापूर�व तावदान दाखवा';
 $labels['skin'] = 'दृष�य गोष�टी';
@@ -305,19 +411,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,12 +439,15 @@ $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'] = 'उत��तर देताना म�ळ सही संदेशातून काढून टाका';
@@ -345,25 +458,65 @@ $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 +536,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..98edd7efd 100755
--- a/program/localization/mr_IN/messages.inc
+++ b/program/localization/mr_IN/messages.inc
@@ -2,35 +2,41 @@
 
 /*
  +-----------------------------------------------------------------------+
- | 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['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 +51,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 +60,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 +105,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 +119,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 +138,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..43884e986 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,89 @@ $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['deleted'] = 'Telah dipadam';
+$labels['undeleted'] = 'Not deleted';
 $labels['invert'] = 'Songsangkan';
 $labels['filter'] = 'Tapis';
 $labels['list'] = 'Senarai';
@@ -142,12 +172,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 +188,221 @@ $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['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 +411,129 @@ $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['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['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..0cddd6749 100644
--- a/program/localization/ms_MY/messages.inc
+++ b/program/localization/ms_MY/messages.inc
@@ -2,27 +2,41 @@
 
 /*
  +-----------------------------------------------------------------------+
- | 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['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 +46,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 +104,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 7b36a1fde..ecbe8545e 100644
--- a/program/localization/nb_NO/labels.inc
+++ b/program/localization/nb_NO/labels.inc
@@ -2,58 +2,77 @@
 
 /*
  +-----------------------------------------------------------------------+
- | 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: Tobias V. Langhoff <spug@thespug.net>                         |
- +-----------------------------------------------------------------------+
+
+ 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']  = 'Sender';
+$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['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';
@@ -61,74 +80,83 @@ $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';
@@ -143,12 +171,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';
@@ -157,175 +187,213 @@ $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']  = 'Body';
+
 $labels['openinextwin'] = 'Ã…pne i nytt vindu';
 $labels['emlsave'] = 'Last ned (.eml)';
-$labels['editasnew'] = 'Rediger som ny';
-$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';
+
+// 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'] = 'Vis rå 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']      = 'Export all';
+$labels['exportsel']      = 'Export selected';
+$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:';
 $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'] = 'Part';
+$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';
@@ -352,10 +420,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['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';
@@ -386,12 +455,12 @@ $labels['replysignaturepos'] = 'Plassering av signatur ved svar eller videresend
 $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å';
-$labels['defaultaddressbook'] = 'Legg til nye kontakter i valgt adressebok';
+$labels['defaultabook'] = 'Standard adressebok';
 $labels['autocompletesingle'] = 'Hopp over alternative e-postadresser i autofullføring';
 $labels['listnamedisplay'] = 'Vis kontakter som';
 $labels['spellcheckbeforesend'] = 'Kontroller staving før en melding sendes';
@@ -401,15 +470,18 @@ $labels['spellcheckignorenums'] = 'Ignorer ord med tall';
 $labels['spellcheckignorecaps'] = 'Ignorer ord med kun store bokstaver';
 $labels['addtodict'] = 'Legg til i ordbok';
 $labels['mailtoprotohandler'] = 'Registrer protokollhåndtering for mailto-lenker';
+$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';
@@ -419,22 +491,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';
@@ -454,3 +533,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 273830335..939d1da76 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: Martin Bore                                                   |
- +-----------------------------------------------------------------------+
+
+ 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.';
@@ -30,6 +33,7 @@ $messages['invalidhost'] = 'Ugyldig servernavn.';
 $messages['nomessagesfound'] = 'Det ble ikke funnet noen meldinger i denne mappen';
 $messages['loggedout'] = 'Du er logget av webmail. Ha det bra!';
 $messages['mailboxempty'] = 'Mappen er tom!';
+$messages['refreshing'] = 'Oppdaterer …';
 $messages['loading'] = 'Laster...';
 $messages['uploading'] = 'Laster opp fil...';
 $messages['uploadingmany'] = 'Laster opp filer ...';
@@ -47,7 +51,7 @@ $messages['blockedimages'] = 'Av sikkerhetsgrunner er bilder lagret på eksterne
 $messages['encryptedmessage'] = 'Dette er en kryptert melding som ikke kan vises. Beklager!';
 $messages['nocontactsfound'] = 'Ingen kontakter ble funnet';
 $messages['contactnotfound'] = 'Den ønskede kontakten ble ikke funnet';
-$messages['contactsearchonly'] = 'Skriv inn noen søkeord for å finne kontater.';
+$messages['contactsearchonly'] = 'Skriv inn noen søkeord for å finne kontakter.';
 $messages['sendingfailed'] = 'Kunne ikke sende e-posten';
 $messages['senttooquickly'] = 'Vennligst vent $sec sekund(er) før du sender denne meldingen';
 $messages['errorsavingsent'] = 'En feil oppsto under lagring av sendt melding';
@@ -56,11 +60,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...';
@@ -69,11 +73,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';
@@ -101,8 +105,8 @@ $messages['sourceisreadonly'] = 'Denne adressekilden er skrivebeskyttet';
 $messages['errorsavingcontact'] = 'Kunne ikke lagre kontaktadressen.';
 $messages['movingmessage'] = 'Flytter e-post ...';
 $messages['copyingmessage'] = 'Kopierer e-post...';
-$messages['copyingcontact'] = 'Kopieerer kontakt(er) ...';
-$messages['deletingmessage'] = 'Sletter melding(er) ...';
+$messages['copyingcontact'] = 'Kopierer kontakt(er) …';
+$messages['deletingmessage'] = 'Sletter melding(er) …';
 $messages['markingmessage'] = 'Markerer melding(er) ...';
 $messages['addingmember'] = 'Legger til kontakt(er) i gruppa ...';
 $messages['removingmember'] = 'Fjerner kontakt(er) fra gruppa ...';
@@ -115,12 +119,14 @@ $messages['selectimportfile'] = 'Vennligst velg en fil for opplasting';
 $messages['addresswriterror'] = 'Den valgte adresseboken er ikke skrivbar';
 $messages['contactaddedtogroup'] = 'Lagt til kontakter til denne gruppen.';
 $messages['contactremovedfromgroup'] = 'Kontaktene ble vellykket fjernet fra denne gruppen';
+$messages['nogroupassignmentschanged'] = 'Ingen gruppetilordninger ble endret.';
 $messages['importwait'] = 'Importerer, vennligst vent...';
-$messages['importconfirm'] = '<b>Importerte $inserted kontakter, hoppet over $skipped oppføringer som allerede eksisterte</b>: <p><em>$names</em></p>';
-$messages['importconfirmskipped'] = '<b>Hoppen over $skipped existing entries</b>';
+$messages['importformaterror'] = 'Import feilet! Den opplastede filen er i feil format.';
+$messages['importconfirm'] = '<b>Importerte $inserted kontakter</b>';
+$messages['importconfirmskipped'] = '<b>Hoppet over $skipped eksisterende oppføringer</b>';
 $messages['opnotpermitted'] = 'Handling ikke tillatt!';
 $messages['nofromaddress'] = 'E-postadresse mangler i valgt identitet';
-$messages['editorwarning'] = 'Ved å bytte for mat til ren tekst vil all tekstformatering gå tapt. Ønsker du å fortsette?';
+$messages['editorwarning'] = 'Ved å bytte format til ren tekst vil all tekstformatering gå tapt. Ønsker du å fortsette?';
 $messages['httpreceivedencrypterror'] = 'En uopprettelig feil oppsto. Vennligst kontakt systemansvarlig umiddelbart. <b>Din melding kunne ikke sendes.</b>';
 $messages['smtpconnerror'] = 'SMTP-feil ($code): Klarte ikke koble til server';
 $messages['smtpautherror'] = 'SMTP-feil ($code): PÃ¥logging feilet';
@@ -156,5 +162,8 @@ $messages['foldercreated'] = 'Mappe opprettet.';
 $messages['invalidimageformat'] = 'Ikke et gyldig bildeformat.';
 $messages['mispellingsfound'] = 'Fant stavefeil i meldingen.';
 $messages['parentnotwritable'] = 'Kunne ikke opprette/flytte mappen i valgt overordnet mappe. Ingen tilgangsrettigheter.';
-$messages['messagetoobig'] = 'Meldingens delen er for stor til at den kan prosesseres.';
+$messages['messagetoobig'] = 'Meldingsdelen er for stor til at den kan prosesseres.';
+$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..26be68f35 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,459 @@ $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['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['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['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['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..0c764ba8a 100644
--- a/program/localization/ne_NP/messages.inc
+++ b/program/localization/ne_NP/messages.inc
@@ -2,27 +2,41 @@
 
 /*
  +-----------------------------------------------------------------------+
- | 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['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 +46,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 +103,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..82cf3a023 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,89 @@ $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['deleted'] = 'Verwijderd';
+$labels['undeleted'] = 'Niet verwijderd';
 $labels['invert'] = 'Selectie omkeren';
 $labels['filter'] = 'Filter';
 $labels['list'] = 'Lijst';
@@ -130,12 +172,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,110 +188,218 @@ $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['previewpane'] = 'Toon voorbeeldvenster';
 $labels['skin'] = 'Opmaakprofiel';
@@ -266,14 +418,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,12 +439,15 @@ $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';
@@ -301,18 +458,33 @@ $labels['replysignaturepos'] = 'Ondertekening plaatsen bij beantwoorden of doors
 $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 +493,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 +536,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..7e61c97c8 100644
--- a/program/localization/nl_BE/messages.inc
+++ b/program/localization/nl_BE/messages.inc
@@ -2,32 +2,38 @@
 
 /*
  +-----------------------------------------------------------------------+
- | 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['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 +42,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 +110,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 fa3e91cbe..2d34a5135 100644
--- a/program/localization/nl_NL/labels.inc
+++ b/program/localization/nl_NL/labels.inc
@@ -2,58 +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: Hendrik Maryns <hendrik@hendrikmaryns.name>                   |
- +-----------------------------------------------------------------------+
+
+ 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';
@@ -61,81 +81,90 @@ $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['deleted'] = 'Verwijderd';
 $labels['undeleted'] = 'Niet verwijderd';
-$labels['invert'] = 'Selectie omdraaien';
+$labels['invert'] = 'Selectie omkeren';
 $labels['filter'] = 'Filter';
 $labels['list'] = 'Lijst';
 $labels['threads'] = 'Conversaties';
@@ -143,190 +172,229 @@ $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'] = 'Contact eigenschappen';
+$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';
@@ -336,31 +404,32 @@ $labels['htmlsignature'] = 'HTML-ondertekening';
 $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['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 +458,12 @@ $labels['replysignaturepos'] = 'Ondertekening plaatsen bij antwoorden of doorstu
 $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';
-$labels['defaultaddressbook'] = 'Nieuwe contactpersonen toevoegen aan gekozen adresboek';
+$labels['defaultabook'] = 'Standaard adresboek';
 $labels['autocompletesingle'] = 'Alternatieve e-mailadressen niet gebruiken bij automatisch aanvullen';
 $labels['listnamedisplay'] = 'Contactpersonen weergeven als';
 $labels['spellcheckbeforesend'] = 'Controleer spelling voor het versturen van een bericht';
@@ -407,39 +476,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';
@@ -459,3 +536,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 bb8641fac..4a67e1590 100644
--- a/program/localization/nl_NL/messages.inc
+++ b/program/localization/nl_NL/messages.inc
@@ -2,51 +2,57 @@
 
 /*
  +-----------------------------------------------------------------------+
- | 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: Hendrik Maryns <hendrik@hendrikmaryns.name>                   |
- +-----------------------------------------------------------------------+
+
+ 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.';
 $messages['loggedout'] = 'Succesvol uitgelogd. Tot ziens!';
 $messages['mailboxempty'] = 'Mailbox is leeg.';
+$messages['refreshing'] = 'Vernieuwen...';
 $messages['loading'] = 'Laden...';
 $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.';
@@ -56,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...';
@@ -69,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.';
@@ -85,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.';
@@ -97,65 +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['importconfirm'] = '<b>Er zijn $inserted contactpersonen succesvol geïmporteerd, en $skipped bestaande overgeslagen</b>:<p><em>$names</em></p>';
+$messages['importformaterror'] = 'Importeren mislukt! Het geüploade bestand is geen geldig importbestand.';
+$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 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 b8cdb54a3..725919d14 100644
--- a/program/localization/nn_NO/labels.inc
+++ b/program/localization/nn_NO/labels.inc
@@ -2,55 +2,77 @@
 
 /*
  +-----------------------------------------------------------------------+
- | 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: Thomas                                                        |
- +-----------------------------------------------------------------------+
+
+ 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'] = 'Sende element';
-$labels['trash'] = 'Sletta element';
-$labels['junk'] = 'Søppel';
+$labels['sent']   = 'Sendt';
+$labels['trash']  = 'Sletta';
+$labels['junk']   = 'Søppel';
+
+// message listing
 $labels['subject'] = 'Emne';
-$labels['from'] = 'Sendar';
-$labels['to'] = 'Mottakar';
-$labels['cc'] = 'Kopi';
-$labels['bcc'] = 'Blindkopi';
-$labels['replyto'] = 'Svar-til';
-$labels['followupto'] = 'Oppfylging-til';
-$labels['date'] = 'Dato';
-$labels['size'] = 'Storleik';
+$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['priority'] = 'Prioritet';
 $labels['organization'] = 'Organisasjon';
+$labels['readstatus'] = 'Lesestatus';
+$labels['listoptions'] = 'Listeinnstillingar …';
+
 $labels['mailboxlist'] = 'Mapper';
-$labels['folders'] = 'Mapper';
-$labels['messagesfromto'] = 'Meldingar $from til $to av $count';
-$labels['threadsfromto'] = 'Trådar $from til $to ($count stk)';
+$labels['messagesfromto'] = 'Melding $from til $to av $count';
+$labels['threadsfromto'] = 'Tråd $from til $to ($count stk)';
 $labels['messagenrof'] = 'Melding $nr av $count';
-$labels['copy'] = 'Kopier';
-$labels['move'] = 'Flytt';
-$labels['moveto'] = 'flytt til...';
-$labels['download'] = 'last ned';
+$labels['fromtoshort'] = '$from-$to av $count';
+
+$labels['copy']     = 'Kopier';
+$labels['move']     = 'Flytt';
+$labels['moveto']   = 'flytt til …';
+$labels['download'] = 'Last ned';
+$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';
@@ -58,72 +80,89 @@ $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['checkmail'] = 'Sjå etter nye meldingar';
-$labels['compose'] = 'Skriv ei melding';
-$labels['writenewmessage'] = 'Skriv ei ny melding';
-$labels['replytomessage'] = 'Svar på meldinga';
-$labels['replytoallmessage'] = 'Svar til sendar og alle mottakarar';
-$labels['replyall'] = 'Svar til alle';
-$labels['replylist'] = 'Svar til liste';
-$labels['forwardinline'] = 'Send vidare innebygd';
-$labels['forwardattachment'] = 'Send vidare som vedlegg';
-$labels['forwardmessage'] = 'Vidaresend meldinga';
-$labels['deletemessage'] = 'Slett melding';
-$labels['movemessagetotrash'] = 'Flytt melding til «sletta element»';
-$labels['printmessage'] = 'Skriv ut meldinga';
-$labels['previousmessage'] = 'Vis føregåande melding';
-$labels['firstmessage'] = 'Vis den fyrste meldinga';
-$labels['nextmessage'] = 'Vis den neste meldinga';
-$labels['lastmessage'] = 'Vis den siste meldinga';
-$labels['backtolist'] = 'Tilbake til meldingslista';
-$labels['viewsource'] = 'Vis kjelde';
-$labels['markmessages'] = 'Marker meldingar';
-$labels['markread'] = 'Som lese';
-$labels['markunread'] = 'Som ulese';
-$labels['markflagged'] = 'Som flagga';
-$labels['markunflagged'] = 'Som uflagga';
-$labels['moreactions'] = 'Fleire handlingar';
+
+// 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['forwardattachment'] = 'Vidresend som vedlegg';
+$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['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['deleted'] = 'Sletta';
+$labels['undeleted'] = 'Ikkje sletta';
 $labels['invert'] = 'Inverter';
 $labels['filter'] = 'Filtrer';
 $labels['list'] = 'List opp';
@@ -132,12 +171,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';
@@ -146,158 +187,216 @@ $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['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';
+
+// 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['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['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['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['country'] = 'Land';
-$labels['birthday'] = 'Fødselsdag';
-$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['newcontact'] = 'Opprett nytt kontaktkort';
-$labels['deletecontact'] = 'Slett valde kontaktar';
-$labels['composeto'] = 'Ny melding til';
+$labels['uploadphoto'] = 'Last opp bilete';
+
+$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']      = 'Export all';
+$labels['exportsel']      = 'Export selected';
+$labels['exportvcards']   = 'Eksporter kontaktar i vCard-format';
 $labels['newcontactgroup'] = 'Lag ny kontaktgruppe';
-$labels['grouprename'] = 'Endre namn på gruppe';
-$labels['groupdelete'] = 'Slett gruppe';
-$labels['previouspage'] = 'Førre side';
-$labels['firstpage'] = 'Fyrste side';
-$labels['nextpage'] = 'Neste side';
-$labels['lastpage'] = 'Siste side';
+$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['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:';
 $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['previewpane'] = 'Vis førehandsvisningsboks';
 $labels['skin'] = 'Bunad';
@@ -309,19 +408,23 @@ $labels['mailboxview'] = 'Epostboksvisning';
 $labels['mdnrequests'] = 'Sender-notifisering';
 $labels['askuser'] = 'spør brukaren';
 $labels['autosend'] = 'send automatisk';
+$labels['autosendknown'] = 'send kvittering til kontaktane mine, ellers spør meg';
+$labels['autosendknownignore'] = 'send kvittering til kontaktane mine, ellers oversjå';
 $labels['ignore'] = 'ignorer';
 $labels['readwhendeleted'] = 'Marker melding som lese ved sletting';
 $labels['flagfordeletion'] = 'Flagg meldinga for sletting i staden for å sletta';
 $labels['skipdeleted'] = 'Ikkje vis sletta epostar';
 $labels['deletealways'] = 'Slett epostar som ikkje kan flyttast til søppelkorga';
+$labels['deletejunk'] = 'Slett meldingar i spam direkte';
 $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['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';
@@ -333,12 +436,15 @@ $labels['advancedoptions'] = 'Avanserte val';
 $labels['focusonnewmessage'] = 'Fokuser nettlesarvindauge på ny epost';
 $labels['checkallfolders'] = 'Sjekk alle mappar for nye epostar';
 $labels['displaynext'] = 'Etter sletting/flytting, vis neste epost';
+$labels['defaultfont'] = 'Standard skrifttype i HTML-melding';
 $labels['mainoptions'] = 'Hovudinnstillingar';
+$labels['browseroptions'] = 'Alternativ for nettlesar';
 $labels['section'] = 'Seksjon';
 $labels['maintenance'] = 'Vedlikehald';
 $labels['newmessage'] = 'Ny epost';
 $labels['signatureoptions'] = 'Signatur-innstillingar';
 $labels['whenreplying'] = 'NÃ¥r du svarar';
+$labels['replyempty'] = 'Ikkje siter den opphavlege meldinga';
 $labels['replytopposting'] = 'start ny epost oppante originalen';
 $labels['replybottomposting'] = 'start ny epost nedanfor originalen';
 $labels['replyremovesignature'] = 'Fjern den original signatur frå eposten når du svarar';
@@ -349,30 +455,65 @@ $labels['replysignaturepos'] = 'NÃ¥r du svarar eller sender vidare, plasser sign
 $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['folder'] = 'Mappe';
-$labels['foldername'] = 'Mappenamn';
-$labels['subscribed'] = 'Abonnert';
+$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å';
+$labels['defaultabook'] = 'Standard adressebok';
+$labels['autocompletesingle'] = 'Hopp over alternative e-postadresser i autofullføring';
+$labels['listnamedisplay'] = 'Vis kontaktar som';
+$labels['spellcheckbeforesend'] = 'Kontroller staving før ei melding sendast';
+$labels['spellcheckoptions'] = 'Alternativ for stavekontroll';
+$labels['spellcheckignoresyms'] = 'Ignorer ord med symbol';
+$labels['spellcheckignorenums'] = 'Ignorer ord med tal';
+$labels['spellcheckignorecaps'] = 'Ignorer ord med berre store bokstavar';
+$labels['addtodict'] = 'Legg til i ordliste';
+$labels['mailtoprotohandler'] = 'Registrer protokollhandsaming for mailto-lenkjer';
+$labels['forwardmode'] = 'Meldingar vidaresendast';
+$labels['inline'] = 'i teksten';
+$labels['asattachment'] = 'som vedlegg';
+
+$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';
+$labels['parentfolder'] = 'Mappa over';
+$labels['location'] = 'Stad';
+$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';
@@ -392,3 +533,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 b038f40e9..e82beaf93 100644
--- a/program/localization/nn_NO/messages.inc
+++ b/program/localization/nn_NO/messages.inc
@@ -2,108 +2,168 @@
 
 /*
  +-----------------------------------------------------------------------+
- | 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: Thomas <Unknown>                                              |
- +-----------------------------------------------------------------------+
- @version $Id$
+
+ For translation see https://www.transifex.com/projects/p/roundcube-webmail/resource/messages/
 */
 
 $messages = array();
-$messages['loginfailed'] = 'Feil ved innlogging';
-$messages['cookiesdisabled'] = 'Nettlesaren din tillet ikkje informasjonskapslar (cookies)';
-$messages['sessionerror'] = 'Sesjonen din er ulovleg eller har gått ut på tid';
-$messages['storageerror'] = 'Feil ved tilkopling til IMAP-tenar';
-$messages['servererror'] = 'Tenarfeil!';
+$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.';
+$messages['servererror'] = 'Tenarfeil.';
+$messages['servererrormsg'] = 'Tenarfeil: $msg';
+$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['invalidrequest'] = 'Eg forstår ingen ting! Ingen data lagra.';
-$messages['nomessagesfound'] = 'Ingen meldingar i denne postkassa';
-$messages['loggedout'] = 'Du har avslutta sesjonen. Ha det bra!';
-$messages['mailboxempty'] = 'Postkassa er tom';
-$messages['loading'] = 'Lastar...';
-$messages['uploading'] = 'Lastar opp fil...';
-$messages['loadingdata'] = 'Lastar inn data...';
-$messages['checkingmail'] = 'Ser etter nye meldingar...';
-$messages['sendingmessage'] = 'Sender melding...';
-$messages['messagesent'] = 'Meldinga vart send';
-$messages['savingmessage'] = 'Lagrar melding...';
-$messages['messagesaved'] = 'Melding lagra som kladd';
-$messages['successfullysaved'] = 'Meldinga vart lagra';
-$messages['addedsuccessfully'] = 'Kontakta vart lagt til i adresseboka';
-$messages['contactexists'] = 'Ei kontakt med denne e-postadressa eksisterer allereie';
-$messages['blockedimages'] = 'For å ta vare på privatlivet ditt er eksterne bilete blokkert i denne meldinga.';
+$messages['invalidhost'] = 'Ugyldig tenarnamn.';
+$messages['nomessagesfound'] = 'Ingen meldingar i denne postkassa.';
+$messages['loggedout'] = 'Du har avslutta økta. Ha det bra!';
+$messages['mailboxempty'] = 'Postkassa er tom.';
+$messages['refreshing'] = 'Oppdaterer …';
+$messages['loading'] = 'Hentar …';
+$messages['uploading'] = 'Lastar opp fil …';
+$messages['uploadingmany'] = 'Lastar opp filer …';
+$messages['loadingdata'] = 'Hentar data …';
+$messages['checkingmail'] = 'Ser etter nye meldingar …';
+$messages['sendingmessage'] = 'Sender melding …';
+$messages['messagesent'] = 'Meldinga vart sendt.';
+$messages['savingmessage'] = 'Lagrar melding …';
+$messages['messagesaved'] = 'Melding lagra som kladd.';
+$messages['successfullysaved'] = 'Meldinga vart lagra.';
+$messages['addedsuccessfully'] = 'Kontakta vart lagt til i adresseboka.';
+$messages['contactexists'] = 'Ei kontakt med denne e-postadressa finst frå før.';
+$messages['contactnameexists'] = 'Det finst allereie en kontakt med dette namnet.';
+$messages['blockedimages'] = 'Av omsyn til personvernet ditt er eksterne bilete blokkerte i denne meldinga.';
 $messages['encryptedmessage'] = 'Dette er ei kryptert melding og kan ikkje visast. Orsak!';
-$messages['nocontactsfound'] = 'Fann ingen kontaktar';
-$messages['contactnotfound'] = 'Fann ikkje kontakten du såg etter';
-$messages['sendingfailed'] = 'Kunne ikkje sende meldinga';
-$messages['senttooquickly'] = 'Du må venta $sec sekund for å senda meldinga';
-$messages['errorsavingsent'] = 'Klarte ikkje lagra den sende meldinga';
-$messages['errorsaving'] = 'Det skjedde ein feil ved lagring';
-$messages['errormoving'] = 'Kunne ikkje flytte meldinga';
-$messages['errorcopying'] = 'Kan ikkje kopiera epost';
-$messages['errordeleting'] = 'Kunne ikkje slette meldinga';
-$messages['errormarking'] = 'Kan ikkje markera epost';
-$messages['deletecontactconfirm'] = 'Sletta kontakt(ar)?';
+$messages['nocontactsfound'] = 'Fann ingen kontaktar.';
+$messages['contactnotfound'] = 'Fann ikkje kontakten du såg etter.';
+$messages['contactsearchonly'] = 'Skriv søkeord for å finna kontaktar';
+$messages['sendingfailed'] = 'Klarte ikkje senda meldinga.';
+$messages['senttooquickly'] = 'Du må venta $sec sekund for å senda meldinga.';
+$messages['errorsavingsent'] = 'Klarte ikkje lagra den sende meldinga.';
+$messages['errorsaving'] = 'Det skjedde ein feil ved lagring.';
+$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['deletemessagesconfirm'] = 'Sletta melding(ar)?';
-$messages['deletefolderconfirm'] = 'Sletta mappa?';
-$messages['purgefolderconfirm'] = 'Sletta alle meldingane i denne mappa?';
-$messages['folderdeleting'] = 'Slettar mappe...';
-$messages['foldermoving'] = 'Flyttar mappe...';
-$messages['formincomplete'] = 'Fyll ut skjema';
-$messages['noemailwarning'] = 'Skriv inn korrekt epostadresse';
-$messages['nonamewarning'] = 'Skriv inn namn';
-$messages['nopagesizewarning'] = 'Skriv inn sidestorleik';
+$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 …';
+$messages['foldermoving'] = 'Flyttar mappe …';
+$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['nopagesizewarning'] = 'Oppgje sidestorleik.';
 $messages['nosenderwarning'] = 'Skriv inn avsendar si e-postadresse';
-$messages['norecipientwarning'] = 'Skriv inn minst ein mottakar';
-$messages['nosubjectwarning'] = 'Emnefeltet er tomt. Vil du skriva inn eitt emne no?';
-$messages['nobodywarning'] = 'Senda melding utan tekst?';
+$messages['norecipientwarning'] = 'Skriv minst ein mottakar.';
+$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';
-$messages['nosearchname'] = 'Skriv inn kontaktnamn eller epostadressa';
-$messages['notuploadedwarning'] = 'Ikkje alle vedlegga er lasta opp. Vent eller avslutt opplastinga.';
-$messages['searchsuccessful'] = 'Fann $nr meldingar';
-$messages['searchnomatch'] = 'Søket fann ingenting';
-$messages['searching'] = 'Søkjer...';
-$messages['checking'] = 'Sjekkar...';
-$messages['nospellerrors'] = 'Fann ingen stavefeil';
-$messages['folderdeleted'] = 'Mappe sletta';
-$messages['deletedsuccessfully'] = 'Sletta';
-$messages['converting'] = 'Fjerner formattering frå melding...';
-$messages['messageopenerror'] = 'Kunne ikkje lasta meldinga frå tenaren';
-$messages['fileuploaderror'] = 'Filopplasting feila';
-$messages['filesizeerror'] = 'Fila du lasta opp, er større enn maksimumsstorleiken, $size';
-$messages['copysuccess'] = 'Kopierte $nr adresser';
-$messages['copyerror'] = 'Kunne ikkje kopiera adresser';
-$messages['sourceisreadonly'] = 'Denne adressekjelda er berre lesbar';
-$messages['errorsavingcontact'] = 'Kunne ikkje lagra kontaktadressa';
-$messages['movingmessage'] = 'Flyttar melding...';
-$messages['copyingmessage'] = 'Kopierer epost...';
-$messages['receiptsent'] = 'Sende melding-er-lest-kvittering';
-$messages['errorsendingreceipt'] = 'Kunne ikkje senda melding-er-lest-kvittering';
+$messages['noldapserver'] = 'Vel LDAP-tenar å søkja i.';
+$messages['nosearchname'] = 'Skriv kontaktnamn eller epostadresse.';
+$messages['notuploadedwarning'] = 'Ikkje alle vedlegga er ferdig opplasta enno. Vent litt til, eller avbryt opplastinga.';
+$messages['searchsuccessful'] = 'Fann $nr meldingar.';
+$messages['contactsearchsuccessful'] = '$nr kontaktar funne.';
+$messages['searchnomatch'] = 'Søket fann ingenting.';
+$messages['searching'] = 'Søkjer …';
+$messages['checking'] = 'Sjekkar …';
+$messages['nospellerrors'] = 'Fann ingen skrivefeil.';
+$messages['folderdeleted'] = 'Mappe sletta.';
+$messages['foldersubscribed'] = 'Abonnerte på mappa.';
+$messages['folderunsubscribed'] = 'Avslutta mappeabonnement.';
+$messages['folderpurged'] = 'Mappa vart tømt utan feil.';
+$messages['folderexpunged'] = 'Mappa vart komprimert utan feil.';
+$messages['deletedsuccessfully'] = 'Sletta.';
+$messages['converting'] = 'Fjernar formatering frå meldinga …';
+$messages['messageopenerror'] = 'Klarte ikkje lasta meldinga frå tenaren.';
+$messages['fileuploaderror'] = 'Filopplasting feila.';
+$messages['filesizeerror'] = 'Fila du lasta opp, er større enn største tillatne filstorleik, $size.';
+$messages['copysuccess'] = 'Kopierte $nr adresser.';
+$messages['copyerror'] = 'Klarte ikkje kopiera nokon adresser.';
+$messages['sourceisreadonly'] = 'Denne adressekjelda er berre lesbar.';
+$messages['errorsavingcontact'] = 'Klarte ikkje lagra kontaktadressa.';
+$messages['movingmessage'] = 'Flyttar melding(ar) …';
+$messages['copyingmessage'] = 'Kopierer melding(ar) …';
+$messages['copyingcontact'] = 'Kopierer kontakt(ar) …';
+$messages['deletingmessage'] = 'Slettar melding(ar) …';
+$messages['markingmessage'] = 'Merkar melding(ar) …';
+$messages['addingmember'] = 'Legg til kontakt(ar) i gruppa …';
+$messages['removingmember'] = 'Fjernar kontakt(ar) frå gruppa …';
+$messages['receiptsent'] = 'Har sendt lesekvittering.';
+$messages['errorsendingreceipt'] = 'Klarte ikkje senda lesekvittering.';
+$messages['deleteidentityconfirm'] = 'Vil du sletta denne identiteten?';
 $messages['nodeletelastidentity'] = 'Du kan ikkje sletta denne identiteten, det er den siste.';
-$messages['forbiddencharacter'] = 'Mappenamn inneheld eit teikn som ikkje er støtta';
-$messages['selectimportfile'] = 'Vel ei fil til å lasta opp';
-$messages['addresswriterror'] = 'Denne adresseboka er ikkje skrivbar';
-$messages['contactaddedtogroup'] = 'La til kontaktane til denne gruppa';
-$messages['contactremovedfromgroup'] = 'Tok vekk kontaktane frå denne gruppa';
-$messages['importwait'] = 'Importerer, vent...';
-$messages['importerror'] = 'Importering feila! Fila er ikkje ei korrekt vCard-file.';
-$messages['importconfirm'] = '<b>Importerte $inserted kontakar, hoppa over $skipped oppføringar</b>:<p><em>$names</em></p>';
+$messages['forbiddencharacter'] = 'Mappenamn inneheld eit teikn som ikkje er tillate.';
+$messages['selectimportfile'] = 'Vel ei fil til å lasta opp.';
+$messages['addresswriterror'] = 'Denne adresseboka kan ikkje skrivast til.';
+$messages['contactaddedtogroup'] = 'La kontaktane til denne gruppa.';
+$messages['contactremovedfromgroup'] = 'Tok vekk kontaktane frå denne gruppa.';
+$messages['nogroupassignmentschanged'] = 'Endra ikkje gruppetilordningane.';
+$messages['importwait'] = 'Importerer, vent …';
+$messages['importformaterror'] = 'Importering feila. Den opplasta fila er i feil format.';
+$messages['importconfirm'] = '<b>Importerte $inserted kontaktar</b>';
+$messages['importconfirmskipped'] = '<b>Hoppa over $skipped oppføringar som fanst frå før</b>';
 $messages['opnotpermitted'] = 'Ulovleg operasjon.';
-$messages['nofromaddress'] = 'Manglar epostadresse i denne identiteten';
-$messages['editorwarning'] = 'Du mistar all formatering når du bytar til rein tekst. Er det greit?';
-$messages['httpreceivedencrypterror'] = 'Noko er totalt feilkonfigurert, send ein sint epost til administrator. No. <b>Meldinga di kunne ikkje bli sendt.</b>';
-$messages['smtpconnerror'] = 'SMTP-feil ($code): Tilkopling til tenar feila';
-$messages['smtpautherror'] = 'SMTP-feil ($code): Autentisering feila';
-$messages['smtpfromerror'] = 'SMTP-feil ($code): Feila å setja sendar «$from» ($msg)';
-$messages['smtptoerror'] = 'SMTP-feil ($code): Feila å leggja til mottakar «$to» ($msg)';
-$messages['smtprecipientserror'] = 'SMTP-feil: Eg forstår ikkje mottakarlista (sjå over han...)';
+$messages['nofromaddress'] = 'Manglar e-postadresse i denne identiteten.';
+$messages['editorwarning'] = 'Ã… byta til rein tekst vil fjerna all tekstformateringa. Vil du halda fram?';
+$messages['httpreceivedencrypterror'] = 'En uopprettelig feil oppstod knytta til innstillingane. Kontakt systemansvarleg umiddelbart. <b>Meldinga kunne ikkje sendast.</b>';
+$messages['smtpconnerror'] = 'SMTP-feil ($code): Tilkopling til tenar feila.';
+$messages['smtpautherror'] = 'SMTP-feil ($code): Autentisering feila.';
+$messages['smtpfromerror'] = 'SMTP-feil ($code): Klarte ikkje å angje sendar «$from» ($msg).';
+$messages['smtptoerror'] = 'SMTP-feil ($code): Klarte ikkje å leggja til mottakar «$to» ($msg).';
+$messages['smtprecipientserror'] = 'SMTP-feil: Klarte ikkje tolka mottakarlista.';
 $messages['smtperror'] = 'SMTP-feil: $msg';
-$messages['emailformaterror'] = 'Ukorrekt e-postadresse: $email';
-$messages['toomanyrecipients'] = 'For mange mottakarar. Senk talet til maksimalt $max.';
-$messages['maxgroupmembersreached'] = 'Du kan berre ha $max grupper, du er over grensa søta.';
+$messages['emailformaterror'] = 'Ugyldig e-postadresse: $email';
+$messages['toomanyrecipients'] = 'For mange mottakarar. Senk talet til $max.';
+$messages['maxgroupmembersreached'] = 'Ei gruppe kan ikkje ha fleire enn $max medlemmer.';
+$messages['internalerror'] = 'Intern feil. Prøv igjen.';
+$messages['contactdelerror'] = 'Klarte ikkje sletta kontakt(ar).';
+$messages['contactdeleted'] = 'Kontakt(ar) sletta utan feil.';
+$messages['contactrestoreerror'] = 'Klarte ikkje gjenoppretta kontakt(ar).';
+$messages['contactrestored'] = 'Kontakt(ar) gjennomretta utan feil.';
+$messages['groupdeleted'] = 'Gruppa er sletta.';
+$messages['grouprenamed'] = 'Gruppa har bytta namn.';
+$messages['groupcreated'] = 'Gruppa er oppretta.';
+$messages['savedsearchdeleted'] = 'Lagra søk er sletta.';
+$messages['savedsearchdeleteerror'] = 'Klarte ikkje sletta lagra søk.';
+$messages['savedsearchcreated'] = 'Oppretta lagra søk.';
+$messages['savedsearchcreateerror'] = 'Klarte ikkje laga lagra søk.';
+$messages['messagedeleted'] = 'Melding(ar) vart sletta.';
+$messages['messagemoved'] = 'Melding(ar) vart flytta.';
+$messages['messagecopied'] = 'Melding(ar) vart kopiert.';
+$messages['messagemarked'] = 'Melding(ar) vart merka.';
+$messages['autocompletechars'] = 'Skriv minst $min teikn for autofullføring.';
+$messages['autocompletemore'] = 'Flere like oppføringar vart funne. Skriv fleire tegn.';
+$messages['namecannotbeempty'] = 'Namn kan ikkje vera tomt.';
+$messages['nametoolong'] = 'Namnet er for langt.';
+$messages['folderupdated'] = 'Mappa er oppdatert.';
+$messages['foldercreated'] = 'Mappa er oppretta.';
+$messages['invalidimageformat'] = 'Ikke et gyldig bileteformat.';
+$messages['mispellingsfound'] = 'Fann stavefeil i meldinga.';
+$messages['parentnotwritable'] = 'Klarte ikkje laga/flytte mappa i vald overordna mappe. Ingen tilgangsrettar.';
+$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 2220bc6b0..7a4248830 100644
--- a/program/localization/pl_PL/labels.inc
+++ b/program/localization/pl_PL/labels.inc
@@ -2,58 +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';
@@ -61,74 +81,83 @@ $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';
@@ -143,12 +172,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';
@@ -157,175 +188,215 @@ $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['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:';
 $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';
@@ -352,10 +423,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['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';
@@ -386,12 +458,12 @@ $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['defaultaddressbook'] = 'Nowe kontakty dodawaj do wybranej książki adresowej';
+$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ę';
@@ -404,13 +476,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';
@@ -420,22 +494,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';
@@ -455,3 +536,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 5cf7e5e36..68e33fa1b 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!';
@@ -30,6 +33,7 @@ $messages['invalidhost'] = 'Błędna nazwa serwera.';
 $messages['nomessagesfound'] = 'Brak wiadomości w skrzynce.';
 $messages['loggedout'] = 'Użytkownik wylogował się poprawnie.';
 $messages['mailboxempty'] = 'Skrzynka jest pusta!';
+$messages['refreshing'] = 'Odświeżanie...';
 $messages['loading'] = '�adowanie...';
 $messages['uploading'] = 'Zapisywanie pliku...';
 $messages['uploadingmany'] = 'Zapisywanie plików...';
@@ -56,11 +60,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...';
@@ -69,11 +73,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!';
@@ -117,6 +121,7 @@ $messages['contactaddedtogroup'] = 'Kontakty zostały pomyślnie dodane do grupy
 $messages['contactremovedfromgroup'] = 'Kontakty zostały pomyślnie usunięte z grupy.';
 $messages['nogroupassignmentschanged'] = 'Nie zmieniono żadnych powiązań z grupą.';
 $messages['importwait'] = 'Importowanie, proszę czekać...';
+$messages['importformaterror'] = 'Import nieudany! Użyty plik nie jest poprawnym plikiem importu danych.';
 $messages['importconfirm'] = '<b>Pomyślnie dodano $inserted kontaktów, pominięto $skipped istniejących wpisów</b>:<p><em>$names</em></p>.';
 $messages['importconfirmskipped'] = '<b>Pominięto $skipped istniejących wpisów.</b>';
 $messages['opnotpermitted'] = 'Niedozwolona operacja!';
@@ -158,4 +163,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..05f6c3d32 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,154 +81,325 @@ $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['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['previewpane'] = 'پخوانی چوکاټ وښييه';
 $labels['skin'] = 'انټر�يس بڼه';
@@ -214,39 +411,129 @@ $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['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['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..c133b8c0e 100755
--- a/program/localization/ps/messages.inc
+++ b/program/localization/ps/messages.inc
@@ -2,27 +2,41 @@
 
 /*
  +-----------------------------------------------------------------------+
- | 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['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 +46,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 +104,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 c0208eae5..55068df5b 100644
--- a/program/localization/pt_BR/labels.inc
+++ b/program/localization/pt_BR/labels.inc
@@ -2,58 +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.';
@@ -61,94 +81,105 @@ $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['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';
@@ -157,176 +188,213 @@ $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:';
 $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';
@@ -355,10 +423,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['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';
@@ -372,10 +441,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 +458,12 @@ $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';
-$labels['defaultaddressbook'] = 'Adicionar novos contatos para o catálogo de endereços selecionado';
+$labels['defaultabook'] = 'Catálogo de endereços padrão';
 $labels['autocompletesingle'] = 'Ignorar endereços alternativos no autocompletar';
 $labels['listnamedisplay'] = 'Listar contatos como';
 $labels['spellcheckbeforesend'] = 'Verificar ortografia antes de enviar uma mensagem';
@@ -407,13 +476,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';
@@ -423,23 +494,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';
@@ -459,3 +536,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 0eb07de3a..f734c7fbd 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: Victor Benincasa <vbenincasa@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.';
@@ -30,6 +33,7 @@ $messages['invalidhost'] = 'Endereço de servidor inválido.';
 $messages['nomessagesfound'] = 'Nenhuma mensagem encontrada nessa caixa de mensagens';
 $messages['loggedout'] = 'Sua sessão foi finalizada com sucesso. Até logo!';
 $messages['mailboxempty'] = 'A caixa de mensagens está vazia';
+$messages['refreshing'] = 'Atualizando...';
 $messages['loading'] = 'Carregando...';
 $messages['uploading'] = 'Enviando arquivo...';
 $messages['uploadingmany'] = 'Enviando arquivos...';
@@ -40,7 +44,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.';
@@ -56,11 +60,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...';
@@ -69,11 +73,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';
@@ -117,6 +121,7 @@ $messages['contactaddedtogroup'] = 'Contatos adicionados a este grupo com sucess
 $messages['contactremovedfromgroup'] = 'Contatos removidos deste grupo com sucesso.';
 $messages['nogroupassignmentschanged'] = 'Nenhuma atribuição do grupo foi alterada.';
 $messages['importwait'] = 'Importando, aguarde por favor...';
+$messages['importformaterror'] = 'Falha na importação! O arquivo enviado não está em um formato válido.';
 $messages['importconfirm'] = '<b>Foram importados com sucesso $inserted contatos</b>';
 $messages['importconfirmskipped'] = '<b>Ignorado(s) $skipped registro(s) já existente(s)</b>';
 $messages['opnotpermitted'] = 'Operação não permitida!';
@@ -158,4 +163,7 @@ $messages['invalidimageformat'] = 'Formato de imagem inválido.';
 $messages['mispellingsfound'] = 'Foram detectados erros de ortografia na mensagem.';
 $messages['parentnotwritable'] = 'Sem permissão para criar/mover a pasta dentro da pasta selecionada.';
 $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 c17dd7ea1..62fa8bbb4 100644
--- a/program/localization/pt_PT/labels.inc
+++ b/program/localization/pt_PT/labels.inc
@@ -2,58 +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';
@@ -61,74 +81,83 @@ $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';
@@ -143,12 +172,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';
@@ -157,176 +188,213 @@ $labels['listcolumns'] = 'Lista de colunas';
 $labels['listsorting'] = 'Ordenar por';
 $labels['listorder'] = 'Ordenação';
 $labels['listmode'] = 'Modo de visualização';
-$labels['folderactions'] = 'Acções das pastas...';
+
+$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:';
 $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';
@@ -355,10 +423,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['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 +458,12 @@ $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';
-$labels['defaultaddressbook'] = 'Adicionar novo contacto ao livro de endereços selecionado';
+$labels['defaultabook'] = 'Livro de endereços padrão';
 $labels['autocompletesingle'] = 'Ignorar endereços de email alternativos no preenchimento automático';
 $labels['listnamedisplay'] = 'Listar contactos como';
 $labels['spellcheckbeforesend'] = 'Verificar ortografia antes de enviar a mensagem';
@@ -407,13 +476,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';
@@ -423,23 +494,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';
@@ -459,3 +536,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 980fcd01c..638b0fcdd 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';
@@ -30,6 +33,7 @@ $messages['invalidhost'] = 'Nome do servidor inválido.';
 $messages['nomessagesfound'] = 'Não existem mensagens nesta pasta.';
 $messages['loggedout'] = 'A sua sessão foi encerrada com sucesso. Até breve!';
 $messages['mailboxempty'] = 'A caixa de entrada está vazia';
+$messages['refreshing'] = 'A actualizar...';
 $messages['loading'] = 'A carregar...';
 $messages['uploading'] = 'A enviar ficheiro...';
 $messages['uploadingmany'] = 'A enviar ficheiros...';
@@ -56,11 +60,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...';
@@ -69,11 +73,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';
@@ -117,6 +121,7 @@ $messages['contactaddedtogroup'] = 'Contacto adicionado com sucesso a este grupo
 $messages['contactremovedfromgroup'] = 'Contacto removido com sucesso deste grupo.';
 $messages['nogroupassignmentschanged'] = 'Não foi alterada nenhuma atribuição de grupo.';
 $messages['importwait'] = 'A importar, por favor aguarde...';
+$messages['importformaterror'] = 'A importação falhou! O ficheiro enviado não é um ficheiro de dados válido.';
 $messages['importconfirm'] = '<b>$inserted contactos importados com sucesso, $skipped contactos já existentes foram ignorados</b>:<p><em>$names</em></p>';
 $messages['importconfirmskipped'] = 'Ignoradas $skipped entradas já existentes.';
 $messages['opnotpermitted'] = 'Operação não permitida';
@@ -158,4 +163,7 @@ $messages['invalidimageformat'] = 'O formato da imagem não é suportado.';
 $messages['mispellingsfound'] = 'Foram detectados erros de ortografia nesta mensagem.';
 $messages['parentnotwritable'] = 'Não é possível criar/mover esta pasta para a pasta seleccionada. O acesso foi negado.';
 $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..0dcd97919 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,89 @@ $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['deleted'] = 'Åžterse';
+$labels['undeleted'] = 'Nu a fost șters';
 $labels['invert'] = 'Inversează';
 $labels['filter'] = 'Filtru';
 $labels['list'] = 'Listă';
@@ -142,12 +172,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,173 +188,218 @@ $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['previewpane'] = 'Previzualizare mail';
 $labels['skin'] = 'Temă interfaţă';
@@ -341,14 +418,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,6 +447,7 @@ $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';
@@ -378,12 +458,12 @@ $labels['replysignaturepos'] = 'Când răspundeţi sau trimiteţi mai departe, s
 $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 +473,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 +494,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 +536,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..68d1ab6a7 100644
--- a/program/localization/ro_RO/messages.inc
+++ b/program/localization/ro_RO/messages.inc
@@ -2,26 +2,30 @@
 
 /*
  +-----------------------------------------------------------------------+
- | 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['invalidrequest'] = 'Solicitare invalidă! Datele nu au fost salvate.';
@@ -29,6 +33,7 @@ $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 +60,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 +73,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 +119,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 +163,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 b7359b0f5..6b6d0c6bd 100644
--- a/program/localization/ru_RU/labels.inc
+++ b/program/localization/ru_RU/labels.inc
@@ -2,58 +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: Nkolay Parukhin <parukhin@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'] = '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'] = 'Ð’Ñ‚';
@@ -61,74 +81,83 @@ $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'] = 'Помеченные';
@@ -143,12 +172,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,175 +188,213 @@ $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'] = 'Импортировать из файла:';
 $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';
@@ -354,10 +423,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'] = 'Имена вложений';
@@ -388,12 +458,12 @@ $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'] = 'Провер�ть орфографию перед отправкой';
@@ -406,13 +476,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'] = 'Свой�тва папки';
@@ -422,22 +494,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['plugin'] = 'Модуль';
+
+$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'] = 'Западноевропей�кий';
@@ -457,3 +536,4 @@ $labels['japanese'] = 'Япон�кий';
 $labels['korean'] = 'Корей�кий';
 $labels['chinese'] = 'Китай�кий';
 
+?>
diff --git a/program/localization/ru_RU/messages.inc b/program/localization/ru_RU/messages.inc
index 4e3628405..0693887c0 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: Nkolay Parukhin <parukhin@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'] = 'Ваш броузер не принимает cookie';
 $messages['sessionerror'] = 'Ваша �е��и� у�тарела';
 $messages['storageerror'] = '�еудачное �оединение � IMAP �ервером';
@@ -30,6 +33,7 @@ $messages['invalidhost'] = '�еверное им� �ервера.';
 $messages['nomessagesfound'] = 'Сообщений не найдено';
 $messages['loggedout'] = 'Ваша �е��и� завершена. В�его доброго!';
 $messages['mailboxempty'] = 'Почтовый �щик пу�т';
+$messages['refreshing'] = 'Обновление...';
 $messages['loading'] = 'Загрузка...';
 $messages['uploading'] = 'Файл загружает��…';
 $messages['uploadingmany'] = 'Загрузка файлов...';
@@ -56,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'] = 'Удаление папки...';
@@ -69,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 �ервер дл� пои�ка';
@@ -117,6 +121,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 +163,7 @@ $messages['invalidimageformat'] = 'Ð�еверный формат изображÐ
 $messages['mispellingsfound'] = 'В �ообщении обнаружены орфографиче�кие ошибки';
 $messages['parentnotwritable'] = '�е удает�� �оздать/переме�тить папку в выбранную родитель�кую папку. �ет прав до�тупа.';
 $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..eddc01b57 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,449 @@ $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['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['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['replysignaturepos'] = 'When replying or forwarding place signature';
+$labels['belowquote'] = 'below the quote';
+$labels['abovequote'] = 'above the quote';
 $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 +536,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..b8ecab335 100644
--- a/program/localization/si_LK/messages.inc
+++ b/program/localization/si_LK/messages.inc
@@ -2,28 +2,41 @@
 
 /*
  +-----------------------------------------------------------------------+
- | 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['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 +46,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..7b993e77a 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,74 +81,83 @@ $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é';
@@ -143,12 +172,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,176 +188,213 @@ $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';
@@ -355,10 +423,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';
@@ -389,12 +458,12 @@ $labels['replysignaturepos'] = 'Pri odpovedaní alebo preposielanie správy vloÅ
 $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 +476,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 +494,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 +536,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..f0ee82978 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';
@@ -30,6 +33,7 @@ $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 +60,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 +73,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 +121,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 +163,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..70150e4d9 100644
--- a/program/localization/sl_SI/labels.inc
+++ b/program/localization/sl_SI/labels.inc
@@ -2,138 +2,168 @@
 
 /*
  +-----------------------------------------------------------------------+
- | 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['deleted'] = 'Izbrisano';
+$labels['undeleted'] = 'Ni izbrisano';
 $labels['invert'] = 'Zamenjaj';
 $labels['filter'] = 'Prikaži';
 $labels['list'] = 'Seznam';
@@ -142,12 +172,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,174 +188,218 @@ $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['previewpane'] = 'Prikaži predogled';
 $labels['skin'] = 'Tema uporabniškega vmesnika';
@@ -347,10 +423,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,6 +447,7 @@ $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';
@@ -380,12 +458,12 @@ $labels['replysignaturepos'] = 'Pri odgovoru ali posredovanju sporo�ila vstavi
 $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 +473,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 +494,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 +536,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..3fd113b0d 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.';
@@ -26,9 +29,11 @@ $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['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 +60,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 +73,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 +119,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'] = 'No group assignments changed.';
 $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 +163,7 @@ $messages['invalidimageformat'] = 'Neveljaven format slike';
 $messages['mispellingsfound'] = 'V sporo�ilu so bile najdene napake v �rkovanju';
 $messages['parentnotwritable'] = 'Podmape v tej mapi ni bilo mogo�e ustvariti/premakniti. Nimate pravic.';
 $messages['messagetoobig'] = 'Sporo�ilo je preveliko za obdelavo.';
+$messages['attachmentvalidationerror'] = 'WARNING! This attachment is suspicious because its type doesn\'t match the type declared in the message. If you do not trust the sender, you shouldn\'t open it in the browser because it may contain malicious contents.<br/><br/><em>Expected: $expected; found: $detected</em>';
+$messages['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..52ff45cd6 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,459 @@ $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['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['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['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['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..46e7197e0 100644
--- a/program/localization/sq_AL/messages.inc
+++ b/program/localization/sq_AL/messages.inc
@@ -2,27 +2,41 @@
 
 /*
  +-----------------------------------------------------------------------+
- | 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['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 +46,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 +104,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..1e84735e6 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,259 +81,325 @@ $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['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['previewpane'] = 'Прикажи панел за преглед';
 $labels['skin'] = 'Интерфеј�';
@@ -321,21 +408,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,6 +447,7 @@ $labels['maintenance'] = 'Поправке';
 $labels['newmessage'] = '�ова порука';
 $labels['signatureoptions'] = 'Опције потпи�а';
 $labels['whenreplying'] = 'При одговору';
+$labels['replyempty'] = 'do not quote the original message';
 $labels['replytopposting'] = 'Почни нову поруку преко оригинала';
 $labels['replybottomposting'] = 'Почни нову поруку и�под оригинала';
 $labels['replyremovesignature'] = 'При одговору од�трани оригинални потпи� из поруке';
@@ -358,25 +458,33 @@ $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 +494,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 +536,4 @@ $labels['japanese'] = 'Јапан�ки';
 $labels['korean'] = 'Кореан�ки';
 $labels['chinese'] = 'Кине�ки';
 
+?>
diff --git a/program/localization/sr_CS/messages.inc b/program/localization/sr_CS/messages.inc
index b87bcb4ec..7ffbbd34a 100644
--- a/program/localization/sr_CS/messages.inc
+++ b/program/localization/sr_CS/messages.inc
@@ -2,33 +2,41 @@
 
 /*
  +-----------------------------------------------------------------------+
- | 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: 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'] = 'Ваш интернет прегледач не подржава колачиће';
 $messages['sessionerror'] = 'Се�ија није валидна или је и�текла';
 $messages['storageerror'] = '�еу�пешна конекција на IMAP �ервер';
 $messages['servererror'] = 'Грешка на �ерверу!';
 $messages['servererrormsg'] = 'Грешка на �ерверу: $msg';
-$messages['errorreadonly'] = 'Операција неу�пела. Фа�ицкло је';
-$messages['errornoperm'] = 'Извршење операције није могуће. Одбијен захтев за дозволу..';
+$messages['dberror'] = 'Грешка у бази података!';
+$messages['requesttimedout'] = 'Захтев је и�текао';
+$messages['errorreadonly'] = '�е може да изврши операцију. Фа�цикла �е може �амо читати.';
+$messages['errornoperm'] = 'Извршење операције није могуће. Одбијен захтев за дозволу.';
 $messages['invalidrequest'] = 'Погрешан захтев! Подаци ни�у �ачувани.';
-$messages['nomessagesfound'] = '�емате порука у �андучету';
+$messages['invalidhost'] = 'Погрешно име �ервера.';
+$messages['nomessagesfound'] = '�емате порука у �андучету.';
 $messages['loggedout'] = 'У�пешно �те �е одјавили.';
-$messages['mailboxempty'] = 'Сандуче је празно';
-$messages['loading'] = 'Учитавање...';
-$messages['uploading'] = 'Оптремање датотеке...';
+$messages['mailboxempty'] = 'Сандуче је празно.';
+$messages['refreshing'] = 'О�вежавам...';
+$messages['loading'] = 'Учитавам...';
+$messages['uploading'] = 'Шаљем датотеку...';
+$messages['uploadingmany'] = 'Шаљем датотеке...';
 $messages['loadingdata'] = 'Учитавање података...';
 $messages['checkingmail'] = 'Провера нових порука у току...';
 $messages['sendingmessage'] = 'Порука �е шаље...';
@@ -37,11 +45,13 @@ $messages['savingmessage'] = 'Порука �е �нима...';
 $messages['messagesaved'] = 'Порука у�пешно �ачувана у Снимљене';
 $messages['successfullysaved'] = 'Снимање у�пешно обављено';
 $messages['addedsuccessfully'] = 'Контакт у�пешно додат у именик';
-$messages['contactexists'] = 'Контакт �а овом е-мејл адре�ом већ по�тоји у именику';
+$messages['contactexists'] = 'Контакт �а и�том адре�ом е-поште већ по�тоји.';
+$messages['contactnameexists'] = 'Контакт �а и�тим именом већ по�тоји.';
 $messages['blockedimages'] = 'Због заштите приватно�ти, �лике �а удаљених �ервера �у блокиране';
 $messages['encryptedmessage'] = 'Ова порука је шифрована, па �е не може приказати';
 $messages['nocontactsfound'] = '�ије пронађен ниједан контакт';
 $messages['contactnotfound'] = 'Жељени контакт није нађен';
+$messages['contactsearchonly'] = 'Уне�ите шта тражите да пронађете контакте';
 $messages['sendingfailed'] = 'Грешка при �лању поруке';
 $messages['senttooquickly'] = 'Молимо Ва� да �ачекате $sec �екунд(и) пре него пошаљете ову поруку';
 $messages['errorsavingsent'] = 'Приликом похрањивања по�лате поруке де�ила �е грешка';
@@ -50,27 +60,31 @@ $messages['errormoving'] = 'Грешка при премештању порукÐ
 $messages['errorcopying'] = 'Копирање поруке није било у�пешно';
 $messages['errordeleting'] = 'Грешка при бри�ању поруке';
 $messages['errormarking'] = 'Маркирање поруке неу�пешно';
-$messages['deletecontactconfirm'] = 'Да ли �тварно желите да обришете изабране контакте?';
+$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'] = 'Уне�ите валидну е-мејл адре�у';
-$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 контакта нађено.';
 $messages['searchnomatch'] = 'Тражена фраза није пронађена ни у једној поруци';
 $messages['searching'] = 'Претрага у току...';
 $messages['checking'] = 'Провера у току...';
@@ -91,18 +105,23 @@ $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['importerror'] = 'Увоз неу�пео! Отпремљена датотека није валидан vCard формат.';
+$messages['importformaterror'] = 'Увоз је неу�пешан! По�лата датотека није допуштена за увоз.';
 $messages['importconfirm'] = '<b>У�пешно увезжени $inserted контакти </b>';
 $messages['importconfirmskipped'] = '<b>Пре�кочени $skipped по�тојећи уно�и </b>';
 $messages['opnotpermitted'] = 'Операција није дозвољена!';
@@ -121,17 +140,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; нашао: $detected</em>';
+$messages['noscriptwarning'] = 'Упозорење: ова поштан�ка у�луга захтева Јава�крипт! Да би�те је кори�тили, укључите Јава�крипт у подешавањима вашег прегледача.';
 
+?>
diff --git a/program/localization/sv_SE/labels.inc b/program/localization/sv_SE/labels.inc
index de6884a95..c1a91cf82 100644
--- a/program/localization/sv_SE/labels.inc
+++ b/program/localization/sv_SE/labels.inc
@@ -2,58 +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';
@@ -61,74 +81,83 @@ $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';
@@ -143,12 +172,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';
@@ -157,181 +188,218 @@ $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'] = '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['previewpane'] = 'Visa meddelandefältet';
 $labels['skin'] = 'Stilmall för användargränssnitt';
@@ -355,10 +423,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['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';
@@ -370,7 +439,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 +458,12 @@ $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';
-$labels['defaultaddressbook'] = 'Lägg till nya kontakter i vald adressbok';
+$labels['defaultabook'] = 'Förvald adressbok';
 $labels['autocompletesingle'] = 'Hoppa över alternativa adresser vid automatisk komplettering';
 $labels['listnamedisplay'] = 'Lista kontakter som';
 $labels['spellcheckbeforesend'] = 'Kontrollera stavning innan meddelanden skickas';
@@ -407,13 +476,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';
@@ -423,23 +494,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';
@@ -459,3 +536,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 aaf5e2b50..65ee6827d 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';
@@ -30,6 +33,7 @@ $messages['invalidhost'] = 'Ogiltigt servernamn.';
 $messages['nomessagesfound'] = 'Inga meddelanden';
 $messages['loggedout'] = 'Du är utloggad. Välkommen åter!';
 $messages['mailboxempty'] = 'Katalogen är tom';
+$messages['refreshing'] = 'Uppdaterar...';
 $messages['loading'] = 'Laddar...';
 $messages['uploading'] = 'Överför fil...';
 $messages['uploadingmany'] = 'Överför filer...';
@@ -56,11 +60,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...';
@@ -69,16 +73,16 @@ $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';
 $messages['nosearchname'] = 'Ange ett kontaktnamn eller en adress';
-$messages['notuploadedwarning'] = 'Alla bilagor har inte överförts ännu. Vänligen vänta eller avbryt överföringen.';
+$messages['notuploadedwarning'] = 'Alla bilagor har inte överförts ännu. Vänta eller avbryt överföringen.';
 $messages['searchsuccessful'] = '$nr meddelanden hittades';
 $messages['contactsearchsuccessful'] = '$nr kontakter hittades';
 $messages['searchnomatch'] = 'Sökningen gav inget resultat';
@@ -117,6 +121,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'] = '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!';
@@ -158,4 +163,7 @@ $messages['invalidimageformat'] = 'Ogiltigt bildfilsformat';
 $messages['mispellingsfound'] = 'Stavfel hittades i meddelandet';
 $messages['parentnotwritable'] = 'Katalogen kunde inte skapas eller flyttas. Åtkomsträttighet saknas.';
 $messages['messagetoobig'] = 'Denna del av meddelandet är alltför stor för att hantera.';
+$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..1cbffb588 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,160 +81,325 @@ $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['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['previewpane'] = 'ம�ந�திய பாத�தியை காட�ட�';
 $labels['skin'] = 'ம�கப�ப� தோற�றம�';
@@ -220,33 +411,43 @@ $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'] = 'பதிலளிக�க�ம� போத� அசல� கையெழ�த�தை செய�தியிலிர�ந�த� நீக�கவ�ம�';
@@ -257,19 +458,82 @@ $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..c06765435 100644
--- a/program/localization/ta_IN/messages.inc
+++ b/program/localization/ta_IN/messages.inc
@@ -2,30 +2,41 @@
 
 /*
  +-----------------------------------------------------------------------+
- | 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['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 +46,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 +104,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 +135,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 df0f49376..93f2304e1 100644
--- a/program/localization/th_TH/labels.inc
+++ b/program/localization/th_TH/labels.inc
@@ -2,52 +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: 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['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['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'] = 'อ';
@@ -55,108 +81,459 @@ $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['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['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['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['replysignaturepos'] = 'When replying or forwarding place signature';
+$labels['belowquote'] = 'below the quote';
+$labels['abovequote'] = 'above the quote';
+$labels['insertsignature'] = '�ทร�ลายเซ็นต์';
+$labels['previewpanemarkread']  = 'Mark previewed messages as read';
+$labels['afternseconds']  = 'after $n seconds';
+$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..1b78b7d60 100644
--- a/program/localization/th_TH/messages.inc
+++ b/program/localization/th_TH/messages.inc
@@ -2,27 +2,41 @@
 
 /*
  +-----------------------------------------------------------------------+
- | 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['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 +46,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 +103,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 a61098393..d8e9e20cf 100644
--- a/program/localization/tr_TR/labels.inc
+++ b/program/localization/tr_TR/labels.inc
@@ -2,58 +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: Gökdeniz Karadağ                                            |
- +-----------------------------------------------------------------------+
+
+ 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';
@@ -61,74 +81,83 @@ $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';
@@ -143,12 +172,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';
@@ -157,176 +188,218 @@ $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['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['groupremoveselected'] = 'Seçili kontaktları gruptan sil';
-$labels['previouspage'] = 'Öncekileri göster';
-$labels['firstpage'] = 'İlkini göster';
-$labels['nextpage'] = 'Sonrakileri göster';
-$labels['lastpage'] = 'Sonuncuyu göster';
+$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['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:';
 $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['previewpane'] = 'Önizleme panelini göster';
 $labels['skin'] = 'Arayüz görünümü';
@@ -350,10 +423,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['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';
@@ -373,6 +447,7 @@ $labels['maintenance'] = 'Bakım';
 $labels['newmessage'] = 'Yeni Posta';
 $labels['signatureoptions'] = 'İmza Seçenekleri';
 $labels['whenreplying'] = 'Yanıtlarken';
+$labels['replyempty'] = 'özgün postayı alıntılama';
 $labels['replytopposting'] = 'yeni postayı alıntı metninin üstünden başlat';
 $labels['replybottomposting'] = 'yeni postayı alıntı metninden sonra başlat';
 $labels['replyremovesignature'] = 'Yanıtlarken önceki imzaları sil';
@@ -383,12 +458,12 @@ $labels['replysignaturepos'] = 'Yanıtlarken veya yönlendirirken imzayı yerleÅ
 $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';
-$labels['defaultaddressbook'] = 'Yeni kişileri seçili adres defterine ekle';
+$labels['defaultabook'] = 'Varsayılan adres defteri';
 $labels['autocompletesingle'] = 'Otomatik tamamlamalarda alternatif e-posta adreslerini atla';
 $labels['listnamedisplay'] = 'Kişiyi görüntüle';
 $labels['spellcheckbeforesend'] = 'Posta göndermeden önce yazım denetimi yap';
@@ -398,13 +473,18 @@ $labels['spellcheckignorenums'] = 'İçinde rakam geçen kelimleri göz ardı et
 $labels['spellcheckignorecaps'] = 'Tümü büyük harf olan kelimleri göz ardı et';
 $labels['addtodict'] = 'Sözlüğe Ekle';
 $labels['mailtoprotohandler'] = 'mailto: bağlantıları için protokol işleyici kayıt et';
-$labels['folder'] = 'Klasör';
-$labels['foldername'] = 'Klasör Adı';
-$labels['subscribed'] = 'Abonelik';
+$labels['forwardmode'] = 'Posta yönlendirme';
+$labels['inline'] = 'postanın içinde';
+$labels['asattachment'] = 'ek olarak';
+
+$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';
@@ -414,22 +494,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';
@@ -449,3 +536,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 69a8d135e..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: Gökdeniz Karadağ                                            |
- +-----------------------------------------------------------------------+
+
+ 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,11 +28,14 @@ $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ı';
 $messages['loggedout'] = 'Oturumu başarılı bir şekilde kapattınız. Güle güle!';
 $messages['mailboxempty'] = 'Posta kutusu boÅŸ';
+$messages['refreshing'] = 'Yenileniyor...';
 $messages['loading'] = 'Yükleniyor...';
 $messages['uploading'] = 'Dosya yükleniyor...';
 $messages['uploadingmany'] = 'Dosyalar yükleniyor...';
@@ -56,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...';
@@ -69,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';
@@ -115,7 +121,9 @@ $messages['selectimportfile'] = 'Lütfen yüklenecek dosyayı seçin';
 $messages['addresswriterror'] = 'Seçili adres defterine yazılamaz';
 $messages['contactaddedtogroup'] = 'KiÅŸiler bu gruba eklendi';
 $messages['contactremovedfromgroup'] = 'Kişiler bu gruptan çıkarıldı';
+$messages['nogroupassignmentschanged'] = 'Grup atamalarında bir değişiklik yapılmadı';
 $messages['importwait'] = 'Aktarılıyor, lütfen bekleyin...';
+$messages['importformaterror'] = 'İçe aktarım başarısız. Yüklenen dosya geçerli bir içe aktarım dosyası değil.';
 $messages['importconfirm'] = '<b>$inserted kişi başarıyla aktarıldı</b>';
 $messages['importconfirmskipped'] = '<b>Var olan $skipped girdi atlandı</b>';
 $messages['opnotpermitted'] = 'Bu iÅŸleme izin verilmedi!';
@@ -157,4 +165,7 @@ $messages['invalidimageformat'] = 'Geçerli bir resim biçimi değil.';
 $messages['mispellingsfound'] = 'Postada yazım hataları tespit edildi.';
 $messages['parentnotwritable'] = 'Klasör, seçilen üst klasöre taşınamıyor. Erişim izni yok.';
 $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..35be96cab 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,89 @@ $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['deleted'] = 'Видалені';
+$labels['undeleted'] = '�е видалено';
 $labels['invert'] = 'Інвертувати виділенн�';
 $labels['filter'] = 'Фільтр';
 $labels['list'] = 'Спи�ком';
@@ -133,12 +172,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,169 +188,218 @@ $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['previewpane'] = 'Показати панель перегл�ду';
 $labels['skin'] = 'Тема';
@@ -328,14 +418,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,11 +441,13 @@ $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'] = 'При відповіді видал�ти первинний підпи� з ли�та';
@@ -364,26 +458,33 @@ $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 +494,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 +536,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..522f1f4fc 100644
--- a/program/localization/uk_UA/messages.inc
+++ b/program/localization/uk_UA/messages.inc
@@ -2,32 +2,38 @@
 
 /*
  +-----------------------------------------------------------------------+
- | 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['invalidrequest'] = '�евірний запит! Дані не збережено.';
+$messages['invalidhost'] = '�евірне ім\'� �ерверу.';
 $messages['nomessagesfound'] = 'Ли�тів не знайдено';
 $messages['loggedout'] = 'Вашу �е�ію завершено. В�ього найкращого!';
 $messages['mailboxempty'] = 'Поштова �кринька порожн�';
+$messages['refreshing'] = 'Оновленн�...';
 $messages['loading'] = 'Завантаженн�...';
 $messages['uploading'] = 'Файл відправл�єть��...';
 $messages['uploadingmany'] = 'Завантаженн� файлів...';
@@ -54,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'] = 'Видаленн� папки...';
@@ -67,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 �ервер дл� пошуку';
@@ -106,14 +112,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 +163,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 495aeeea8..00d04b46b 100644
--- a/program/localization/vi_VN/labels.inc
+++ b/program/localization/vi_VN/labels.inc
@@ -2,58 +2,77 @@
 
 /*
  +-----------------------------------------------------------------------+
- | 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: Kenny Tran <kennethanh@gmail.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'] = 'Giữ liệu';
-$labels['folders'] = 'Giữ liệu';
+
+$labels['mailboxlist'] = '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['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,74 +80,83 @@ $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';
@@ -143,12 +171,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,176 +187,211 @@ $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ư';
+
+// 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']      = 'Export all';
+$labels['exportsel']      = 'Export selected';
+$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';
@@ -355,10 +420,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';
@@ -389,12 +455,12 @@ $labels['replysignaturepos'] = 'Khi trả l�i hoặc chuyển tiếp thư thê
 $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ư trả l�i nhận được vào cùng giữ liệu của thư mà bạn đã trả l�i';
-$labels['defaultaddressbook'] = 'Thêm thông tin liên lạc mới vào sổ địa chỉ đã ch�n';
+$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ư';
@@ -407,38 +473,47 @@ $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 giữ liệu';
-$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 giữ liệu mới';
-$labels['managefolders'] = 'Quản lý giữ liệu';
-$labels['specialfolders'] = 'Giữ liệu đặc biệt';
+$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 giữ liệu';
-$labels['parentfolder'] = 'Giữ liệu gốc';
+$labels['folderproperties'] = 'Thuộc tính thư mục';
+$labels['parentfolder'] = 'Thư mục cha';
 $labels['location'] = '�ịa điểm';
 $labels['info'] = 'Thông tin';
-$labels['getfoldersize'] = 'Nhấp chuột để xem kích thước giữ liệu';
+$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 giữ liệu';
-$labels['personalfolder'] = 'Giữ liệu cá nhân';
-$labels['otherfolder'] = 'Các giữ liệu khác của ngư�i dùng';
-$labels['sharedfolder'] = 'Giữ liệu chung';
+$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['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';
@@ -458,3 +533,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..1d5f5f84c 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,14 @@ $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['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 +60,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 +73,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 +121,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 +163,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..9b79283b1 100644
--- a/program/localization/zh_CN/labels.inc
+++ b/program/localization/zh_CN/labels.inc
@@ -2,151 +2,184 @@
 
 /*
  +-----------------------------------------------------------------------+
- | 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['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,174 +188,218 @@ $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['previewpane'] = '显示预览窗�';
 $labels['skin'] = '界�皮肤';
@@ -346,22 +423,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,6 +447,7 @@ $labels['maintenance'] = '维护';
 $labels['newmessage'] = '新邮件';
 $labels['signatureoptions'] = '签�选项';
 $labels['whenreplying'] = '当回�时';
+$labels['replyempty'] = '��引用原始邮件';
 $labels['replytopposting'] = '在原文上�开始新邮件';
 $labels['replybottomposting'] = '在原文下�开始新邮件';
 $labels['replyremovesignature'] = '当回�时从邮件移除原始签�';
@@ -379,26 +458,33 @@ $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 +494,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 +530,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/csv2vcard.inc b/program/localization/zh_TW/csv2vcard.inc
new file mode 100644
index 000000000..9fcacc818
--- /dev/null
+++ b/program/localization/zh_TW/csv2vcard.inc
@@ -0,0 +1,99 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | localization/zh_TW/csv2vcard.inc                                      |
+ |                                                                       |
+ | Localization file of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2012, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU 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'] = "紀念日";
+$map['assistants_name'] = "助�";
+$map['assistants_phone'] = "助�電話";
+$map['birthday'] = "生日";
+$map['business_city'] = "商務 - 市/鎮";
+$map['business_countryregion'] = "商務 - 國家/地�";
+$map['business_fax'] = "商務傳真";
+$map['business_phone'] = "商務電話";
+$map['business_phone_2'] = "商務電話 2";
+$map['business_postal_code'] = "商務 - 郵��號";
+$map['business_state'] = "商務 - 縣市";
+$map['business_street'] = "商務 - 街";
+$map['car_phone'] = "汽車電話";
+$map['categories'] = "類別";
+$map['company'] = "公�";
+$map['department'] = "部門";
+$map['email_address'] = "電�郵件地�";
+$map['first_name'] = "�字";
+$map['gender'] = "性別";
+$map['home_city'] = "�家 - 市/鎮";
+$map['home_countryregion'] = "�家 - 國家/地�";
+$map['home_fax'] = "�家傳真";
+$map['home_phone'] = "�家電話";
+$map['home_phone_2'] = "�家電話 2";
+$map['home_postal_code'] = "�家 - 郵��號";
+$map['home_state'] = "�家 - 縣/市";
+$map['home_street'] = "�家 - 街";
+$map['job_title'] = "�稱";
+$map['last_name'] = "姓�";
+$map['managers_name'] = "主管�稱";
+$map['middle_name'] = "中間�";
+$map['mobile_phone'] = "行動電話";
+$map['notes'] = "記事";
+$map['other_city'] = "其他 - 市/鎮";
+$map['other_countryregion'] = "其他 - 國家/地�";
+$map['other_fax'] = "其他傳真";
+$map['other_phone'] = "其他電話";
+$map['other_postal_code'] = "其他 - 郵��號";
+$map['other_state'] = "其他 - 縣/市";
+$map['other_street'] = "其他 - 街";
+$map['pager'] = "呼�器";
+$map['primary_phone'] = "代表電話";
+$map['spouse'] = "��";
+$map['suffix'] = "稱謂";
+$map['title'] = "頭銜";
+$map['web_page'] = "網�";
+
+// Thunderbird
+$map['last'] = "姓";
+$map['first'] = "�";
+$map['birth_day'] = "生日 (日)";
+$map['birth_month'] = "生日 (月)";
+$map['birth_year'] = "生日 (年)";
+$map['display_name'] = "顯示�稱";
+$map['fax_number'] = "傳真號碼";
+$map['home_address'] = "�家��";
+$map['home_country'] = "居�國家";
+$map['home_zipcode'] = "��郵��號";
+$map['mobile_number'] = "手機號碼";
+$map['nickname'] = "暱稱";
+$map['organization'] = "Organization";
+$map['pager_number'] = "呼�器號碼";
+$map['primary_email'] = "主� Email";
+$map['secondary_email'] = "次� Email";
+$map['web_page_1'] = "網� 1";
+$map['web_page_2'] = "網� 2";
+$map['work_phone'] = "商務電話";
+$map['work_address'] = "商務地�";
+$map['work_country'] = "商務國家";
+$map['work_zipcode'] = "商務郵��號";
+$map['work_city'] = "商務市鎮";
+$map['work_state'] = "商務縣市";
+$map['home_city_short'] = "居�市鎮";
+$map['home_state_short'] = "居�縣市";
diff --git a/program/localization/zh_TW/labels.inc b/program/localization/zh_TW/labels.inc
index cb4ef77ed..488a7ab2d 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,89 @@ $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['deleted'] = '已刪除的郵件';
+$labels['undeleted'] = '未刪除的郵件';
 $labels['invert'] = '��';
 $labels['filter'] = '篩�範�';
 $labels['list'] = '清單';
@@ -142,12 +172,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 +188,218 @@ $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['previewpane'] = '顯示�覽窗格';
 $labels['skin'] = '版�風格';
@@ -347,10 +423,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,6 +447,7 @@ $labels['maintenance'] = '管�';
 $labels['newmessage'] = '新郵件';
 $labels['signatureoptions'] = '簽�檔�項';
 $labels['whenreplying'] = '回覆時';
+$labels['replyempty'] = '��包�原來的信件內容';
 $labels['replytopposting'] = '在原來的上方開始新訊�';
 $labels['replybottomposting'] = '在原來的下方開始新訊�';
 $labels['replyremovesignature'] = '回覆時移除原有簽�檔';
@@ -380,12 +458,12 @@ $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 +473,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 +494,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 +536,4 @@ $labels['japanese'] = '日本';
 $labels['korean'] = '韓國';
 $labels['chinese'] = '國語';
 
+?>
diff --git a/program/localization/zh_TW/messages.inc b/program/localization/zh_TW/messages.inc
index 820978682..f0f92c848 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 伺�器失敗';
@@ -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'] = '群組資料沒有異動';
 $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'] = '��許的�作';
@@ -157,4 +163,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/delete.inc b/program/steps/addressbook/delete.inc
index 81b8a0970..56118583c 100644
--- a/program/steps/addressbook/delete.inc
+++ b/program/steps/addressbook/delete.inc
@@ -93,7 +93,7 @@ if (($search_request = $_REQUEST['_search']) && isset($_SESSION['search'][$searc
 
         while ($row = $result->next()) {
             $row['sourceid'] = $s;
-            $key = rcmail_contact_key($row, $sort_col);
+            $key = rcube_addressbook::compose_contact_key($row, $sort_col);
             $records[$key] = $row;
         }
         unset($result);
diff --git a/program/steps/addressbook/export.inc b/program/steps/addressbook/export.inc
index 850795c85..761f26b75 100644
--- a/program/steps/addressbook/export.inc
+++ b/program/steps/addressbook/export.inc
@@ -40,11 +40,31 @@ if (!empty($_REQUEST['_search']) && isset($_SESSION['search'][$_REQUEST['_search
         // get records
         $result = $source->list_records();
 
-        while ($row = $result->next()) {
-            $row['sourceid'] = $s;
-            $key = rcmail_contact_key($row, $sort_col);
-            $records[$key] = $row;
+        while ($record = $result->next()) {
+            // because vcard_map is per-source we need to create vcard here
+            if (empty($record['vcard']) || empty($record['name'])) {
+                $vcard = new rcube_vcard();
+                $vcard->extend_fieldmap($source->vcard_map);
+                $vcard->load($record['vcard']);
+                $vcard->reset();
+
+                foreach ($record as $key => $values) {
+                    list($field, $section) = explode(':', $key);
+                    foreach ((array)$values as $value) {
+                        if (is_array($value) || @strlen($value)) {
+                            $vcard->set($field, $value, strtoupper($section));
+                        }
+                    }
+                }
+
+                $record['vcard'] = $vcard->export(true);
+            }
+
+            $record['sourceid'] = $s;
+            $key = rcube_addressbook::compose_contact_key($record, $sort_col);
+            $records[$key] = $record;
         }
+
         unset($result);
     }
 
@@ -56,6 +76,51 @@ if (!empty($_REQUEST['_search']) && isset($_SESSION['search'][$_REQUEST['_search
     $result = new rcube_result_set($count);
     $result->records = array_values($records);
 }
+// selected contacts
+else if (!empty($_REQUEST['_cid'])) {
+    $sort_col = $RCMAIL->config->get('addressbook_sort_col', 'name');
+    $records  = array();
+
+    // Selected contact IDs (with multi-source support)
+    $cids = rcmail_get_cids();
+
+    foreach ($cids as $s => $ids) {
+        $source = $RCMAIL->get_address_book($s);
+        $result = $source->search('ID', $ids, 1, true, true);
+
+        while ($record = $result->next()) {
+            // because vcard_map is per-source we need to create vcard here
+            if (empty($record['vcard']) || empty($record['name'])) {
+                $vcard = new rcube_vcard();
+                $vcard->extend_fieldmap($source->vcard_map);
+                $vcard->load($record['vcard']);
+                $vcard->reset();
+
+                foreach ($record as $key => $values) {
+                    list($field, $section) = explode(':', $key);
+                    foreach ((array)$values as $value) {
+                        if (is_array($value) || @strlen($value)) {
+                            $vcard->set($field, $value, strtoupper($section));
+                        }
+                    }
+                }
+
+                $record['vcard'] = $vcard->export(true);
+            }
+
+            $record['sourceid'] = $s;
+            $key = rcube_addressbook::compose_contact_key($record, $sort_col);
+            $records[$key] = $record;
+        }
+    }
+
+    ksort($records, SORT_LOCALE_STRING);
+
+    // create resultset object
+    $count  = count($records);
+    $result = new rcube_result_set($count);
+    $result->records = array_values($records);
+}
 // selected directory/group
 else {
     $CONTACTS = rcmail_contact_source(null, true);
@@ -68,12 +133,14 @@ else {
 
 // send downlaod headers
 header('Content-Type: text/x-vcard; charset='.RCMAIL_CHARSET);
-header('Content-Disposition: attachment; filename="rcube_contacts.vcf"');
+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 fded9a819..ffc0b3b92 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'),
@@ -187,7 +187,7 @@ function rcmail_directory_list($attrib)
     $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 +213,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 +224,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 +246,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 +268,25 @@ function rcmail_contact_groups($args)
 {
     global $RCMAIL;
 
+    $groups_html = '';
     $groups = $RCMAIL->get_address_book($args['source'])->list_groups();
+    $js_id = $RCMAIL->JQ($args['source']);
 
     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'));
 
+        // 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;');
+
         $jsdata = array();
         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 +296,10 @@ function rcmail_contact_groups($args)
         }
     }
 
+    $args['out'] .= html::tag('ul',
+      array('class' => 'groups', 'style' => ($is_collapsed ? "display:none;" : null)),
+      $groups_html);
+
     return $args;
 }
 
@@ -733,30 +747,12 @@ function rcmail_format_date_col($val)
 }
 
 
-function rcmail_contact_key($row, $sort_col)
-{
-    $key = $row[$sort_col] . ':' . $row['sourceid'];
-
-    // add email to a key to not skip contacts with the same name (#1488375)
-    if (!empty($row['email'])) {
-         if (is_array($row['email'])) {
-             $key .= ':' . implode(':', $row['email']);
-         }
-         else {
-             $key .= ':' . $row['email'];
-         }
-     }
-
-     return $key;
-}
-
-
 /**
  * Returns contact ID(s) and source(s) from GET/POST data
  *
  * @return array List of contact IDs per-source
  */
-function rcmail_get_cids()
+function rcmail_get_cids($filter = null)
 {
     // contact ID (or comma-separated list of IDs) is provided in two
     // forms. If _source is an empty string then the ID is a string
@@ -765,6 +761,10 @@ function rcmail_get_cids()
     $cid    = get_input_value('_cid', RCUBE_INPUT_GPC);
     $source = (string) get_input_value('_source', RCUBE_INPUT_GPC);
 
+    if (is_array($cid)) {
+        return $cid;
+    }
+
     if (!preg_match('/^[a-zA-Z0-9\+\/=_-]+(,[a-zA-Z0-9\+\/=_-]+)*$/', $cid)) {
         return array();
     }
@@ -775,24 +775,29 @@ function rcmail_get_cids()
 
     // create per-source contact IDs array
     foreach ($cid as $id) {
-        // if _source is not specified we'll find it from decoded 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  = substr($id, $sep+1);
+                $source_id  = (string) substr($id, $sep+1);
                 if (strlen($source_id)) {
-                    $result[(string)$source_id][] = $contact_id;
+                    $result[$source_id][] = $contact_id;
                 }
             }
         }
         else {
+            if (substr($id, -($got_source+1)) == "-$source") {
+                $id = substr($id, 0, -($got_source+1));
+            }
             $result[$source][] = $id;
         }
     }
 
-    return $result;
+    return $filter !== null ? $result[$filter] : $result;
 }
 
+
 // register UI objects
 $OUTPUT->add_handlers(array(
     'directorylist' => 'rcmail_directory_list',
diff --git a/program/steps/addressbook/groups.inc b/program/steps/addressbook/groups.inc
index b70453889..3b9288a2b 100644
--- a/program/steps/addressbook/groups.inc
+++ b/program/steps/addressbook/groups.inc
@@ -20,7 +20,7 @@
 */
 
 $source = get_input_value('_source', RCUBE_INPUT_GPC);
-$CONTACTS = rcmail_contact_source($source, true);
+$CONTACTS = rcmail_contact_source($source);
 
 if ($CONTACTS->readonly || !$CONTACTS->groups) {
   $OUTPUT->show_message('sourceisreadonly', 'warning');
@@ -28,11 +28,11 @@ if ($CONTACTS->readonly || !$CONTACTS->groups) {
 }
 
 if ($RCMAIL->action == 'group-addmembers') {
-  if (($gid = get_input_value('_gid', RCUBE_INPUT_POST)) && ($ids = get_input_value('_cid', RCUBE_INPUT_POST))) {
+  if (($gid = get_input_value('_gid', RCUBE_INPUT_POST)) && ($ids = rcmail_get_cids($source))) {
     $plugin = $RCMAIL->plugins->exec_hook('group_addmembers', array('group_id' => $gid, 'ids' => $ids, 'source' => $source));
 
     $CONTACTS->set_group($gid);
-    $num2add = count(explode(',', $plugin['ids']));
+    $num2add = count($plugin['ids']);
 
     if (!$plugin['abort']) {
       if (($maxnum = $RCMAIL->config->get('max_group_members', 0)) && ($CONTACTS->count()->count + $num2add > $maxnum)) {
@@ -55,7 +55,7 @@ if ($RCMAIL->action == 'group-addmembers') {
 }
 
 else if ($RCMAIL->action == 'group-delmembers') {
-  if (($gid = get_input_value('_gid', RCUBE_INPUT_POST)) && ($ids = get_input_value('_cid', RCUBE_INPUT_POST))) {
+  if (($gid = get_input_value('_gid', RCUBE_INPUT_POST)) && ($ids = rcmail_get_cids($source))) {
     $plugin = $RCMAIL->plugins->exec_hook('group_delmembers', array('group_id' => $gid, 'ids' => $ids, 'source' => $source));
 
     if (!$plugin['abort'])
@@ -63,10 +63,11 @@ else if ($RCMAIL->action == 'group-delmembers') {
     else
       $result = $plugin['result'];
 
-    if ($result){
+    if ($result) {
       $OUTPUT->show_message('contactremovedfromgroup');
       $OUTPUT->command('remove_group_contacts',array('source' => $source, 'gid' => $gid));
-    }else{
+    }
+    else {
       $OUTPUT->show_message($plugin['message'] ? $plugin['message'] : 'errorsaving', 'error');
     }
   }
diff --git a/program/steps/addressbook/import.inc b/program/steps/addressbook/import.inc
index df07d64bc..72da15078 100644
--- a/program/steps/addressbook/import.inc
+++ b/program/steps/addressbook/import.inc
@@ -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/list.inc b/program/steps/addressbook/list.inc
index 06a1e10a3..1bb28658b 100644
--- a/program/steps/addressbook/list.inc
+++ b/program/steps/addressbook/list.inc
@@ -49,7 +49,7 @@ if (!empty($_REQUEST['_search']) && isset($_SESSION['search'][$_REQUEST['_search
 
         while ($row = $result->next()) {
             $row['sourceid'] = $s;
-            $key = rcmail_contact_key($row, $sort_col);
+            $key = rcube_addressbook::compose_contact_key($row, $sort_col);
             $records[$key] = $row;
         }
         unset($result);
diff --git a/program/steps/addressbook/save.inc b/program/steps/addressbook/save.inc
index 901ea0190..8cab6e817 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;
diff --git a/program/steps/addressbook/search.inc b/program/steps/addressbook/search.inc
index 851325070..d153c255a 100644
--- a/program/steps/addressbook/search.inc
+++ b/program/steps/addressbook/search.inc
@@ -184,7 +184,7 @@ function rcmail_contact_search()
 
         while ($row = $result->next()) {
             $row['sourceid'] = $s['id'];
-            $key = rcmail_contact_key($row, $sort_col);
+            $key = rcube_addressbook::compose_contact_key($row, $sort_col);
             $records[$key] = $row;
         }
 
@@ -300,9 +300,13 @@ function rcmail_contact_search_form($attrib)
             $label    = isset($colprop['label']) ? $colprop['label'] : rcube_label($col);
             $category = $colprop['category'] ? $colprop['category'] : 'other';
 
-            if ($ftype == 'text')
+            // load jquery UI datepicker for date fields 
+            if ($colprop['type'] == 'date')
+                $colprop['class'] .= ($colprop['class'] ? ' ' : '') . 'datepicker';
+            else if ($ftype == 'text')
                 $colprop['size'] = $i_size;
 
+
             $content  = html::div('row', html::div('contactfieldlabel label', Q($label))
                 . html::div('contactfieldcontent', rcmail_get_edit_field('search_'.$col, '', $colprop, $ftype)));
 
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/check_recent.inc b/program/steps/mail/check_recent.inc
index 90d17c15b..3649d148c 100644
--- a/program/steps/mail/check_recent.inc
+++ b/program/steps/mail/check_recent.inc
@@ -25,7 +25,7 @@ if (empty($_REQUEST['_folderlist']) && empty($_REQUEST['_list'])) {
     return;
 }
 
-$current = $RCMAIL->storage->get_folder();
+$current   = $RCMAIL->storage->get_folder();
 $check_all = $RCMAIL->action != 'refresh' || (bool)$RCMAIL->config->get('check_all_folders');
 
 // list of folders to check
@@ -34,10 +34,15 @@ if ($check_all) {
 }
 else {
     $a_mailboxes = (array) $current;
-    if ($a_mailboxes[0] != 'INBOX')
+    if ($current != 'INBOX') {
         $a_mailboxes[] = 'INBOX';
+    }
 }
 
+// Control folders list from a plugin
+$plugin      = $RCMAIL->plugins->exec_hook('check_recent', array('folders' => $a_mailboxes, 'all' => $check_all));
+$a_mailboxes = $plugin['folders'];
+
 // check recent/unseen counts
 foreach ($a_mailboxes as $mbox_name) {
     $is_current = $mbox_name == $current;
@@ -47,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,
@@ -70,13 +75,15 @@ foreach ($a_mailboxes as $mbox_name) {
         if (!empty($_GET['_quota']))
             $OUTPUT->command('set_quota', rcmail_quota_content());
 
+        $OUTPUT->set_env('exists', $RCMAIL->storage->count($mbox_name, 'EXISTS'));
+
         // "No-list" mode, don't get messages
         if (empty($_GET['_list']))
             continue;
 
         // get overall message count; allow caching because rcube_storage::folder_status() did a refresh
         $list_mode = $RCMAIL->storage->get_threading() ? 'THREADS' : 'ALL';
-        $all_count = $RCMAIL->storage->count(null, $list_mode, false, false);
+        $all_count = $RCMAIL->storage->count($mbox_name, $list_mode, false, false);
         $page      = $RCMAIL->storage->get_page();
         $page_size = $RCMAIL->storage->get_pagesize();
 
@@ -108,4 +115,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 92ec88f1b..36c6d9622 100644
--- a/program/steps/mail/compose.inc
+++ b/program/steps/mail/compose.inc
@@ -20,10 +20,10 @@
 */
 
 // define constants for message compose mode
-define('RCUBE_COMPOSE_REPLY', 0x0106);
-define('RCUBE_COMPOSE_FORWARD', 0x0107);
-define('RCUBE_COMPOSE_DRAFT', 0x0108);
-define('RCUBE_COMPOSE_EDIT', 0x0109);
+define('RCUBE_COMPOSE_REPLY', 'reply');
+define('RCUBE_COMPOSE_FORWARD', 'forward');
+define('RCUBE_COMPOSE_DRAFT', 'draft');
+define('RCUBE_COMPOSE_EDIT', 'edit');
 
 $MESSAGE_FORM = null;
 $COMPOSE_ID   = get_input_value('_id', RCUBE_INPUT_GET);
@@ -139,7 +139,6 @@ 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', ',')));
 
@@ -151,34 +150,51 @@ if ($font && !is_array($font)) {
 
 // get reference message and set compose mode
 if ($msg_uid = $COMPOSE['param']['draft_uid']) {
-  $RCMAIL->storage->set_folder($CONFIG['drafts_mbox']);
   $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'])
+else if ($msg_uid = $COMPOSE['param']['reply_uid']) {
   $compose_mode = RCUBE_COMPOSE_REPLY;
-else if ($msg_uid = $COMPOSE['param']['forward_uid'])
+}
+else if ($msg_uid = $COMPOSE['param']['forward_uid']) {
   $compose_mode = RCUBE_COMPOSE_FORWARD;
-else if ($msg_uid = $COMPOSE['param']['uid'])
+  $COMPOSE['forward_uid']   = $msg_uid;
+  $COMPOSE['as_attachment'] = !empty($COMPOSE['param']['attachment']);
+}
+else if ($msg_uid = $COMPOSE['param']['uid']) {
   $compose_mode = RCUBE_COMPOSE_EDIT;
+}
+$OUTPUT->set_env('compose_mode', $compose_mode);
 
 $config_show_sig = $RCMAIL->config->get('show_sig', 1);
-if ($config_show_sig == 1)
+if ($compose_mode == RCUBE_COMPOSE_EDIT || $compose_mode == RCUBE_COMPOSE_DRAFT) {
+  // don't add signature in draft/edit mode, we'll also not remove the old-one
+}
+else if ($config_show_sig == 1)
   $OUTPUT->set_env('show_sig', true);
-else if ($config_show_sig == 2 && (empty($compose_mode) || $compose_mode == RCUBE_COMPOSE_EDIT || $compose_mode == RCUBE_COMPOSE_DRAFT))
+else if ($config_show_sig == 2 && empty($compose_mode))
   $OUTPUT->set_env('show_sig', true);
 else if ($config_show_sig == 3 && ($compose_mode == RCUBE_COMPOSE_REPLY || $compose_mode == RCUBE_COMPOSE_FORWARD))
   $OUTPUT->set_env('show_sig', true);
-else
-  $OUTPUT->set_env('show_sig', false);
 
 // set line length for body wrapping
 $LINE_LENGTH = $RCMAIL->config->get('line_length', 72);
 
-if (!empty($msg_uid))
+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
@@ -188,8 +204,7 @@ if (!empty($msg_uid))
   if (!empty($MESSAGE->headers->charset))
     $RCMAIL->storage->set_charset($MESSAGE->headers->charset);
 
-  if ($compose_mode == RCUBE_COMPOSE_REPLY)
-  {
+  if ($compose_mode == RCUBE_COMPOSE_REPLY) {
     $COMPOSE['reply_uid'] = $msg_uid;
     $COMPOSE['reply_msgid'] = $MESSAGE->headers->messageID;
     $COMPOSE['references']  = trim($MESSAGE->headers->references . " " . $MESSAGE->headers->messageID);
@@ -197,8 +212,6 @@ if (!empty($msg_uid))
     if (!empty($COMPOSE['param']['all']))
       $MESSAGE->reply_all = $COMPOSE['param']['all'];
 
-    $OUTPUT->set_env('compose_mode', 'reply');
-
     // Save the sent message in the same folder of the message being replied to
     if ($RCMAIL->config->get('reply_same_folder') && ($sent_folder = $COMPOSE['mailbox'])
       && rcmail_check_sent_folder($sent_folder, false)
@@ -206,10 +219,8 @@ if (!empty($msg_uid))
       $COMPOSE['param']['sent_mbox'] = $sent_folder;
     }
   }
-  else if ($compose_mode == RCUBE_COMPOSE_DRAFT)
-  {
-    if ($MESSAGE->headers->others['x-draft-info'])
-    {
+  else if ($compose_mode == RCUBE_COMPOSE_DRAFT) {
+    if ($MESSAGE->headers->others['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']);
 
@@ -233,14 +244,6 @@ if (!empty($msg_uid))
 
     $COMPOSE['references']  = $MESSAGE->headers->references;
   }
-  else if ($compose_mode == RCUBE_COMPOSE_FORWARD)
-  {
-    $COMPOSE['forward_uid'] = $msg_uid;
-    $OUTPUT->set_env('compose_mode', 'forward');
-
-    if (!empty($COMPOSE['param']['attachment']))
-      $MESSAGE->forward_attachment = true;
-  }
 }
 else {
   $MESSAGE = new stdClass();
@@ -249,18 +252,7 @@ else {
 $MESSAGE->compose = array();
 
 // get user's identities
-$MESSAGE->identities = $RCMAIL->user->list_identities();
-if (count($MESSAGE->identities))
-{
-  foreach ($MESSAGE->identities as $idx => $ident) {
-    $ident['email'] = format_email($ident['email']);
-    $email = format_email(rcube_idn_to_utf8($ident['email']));
-
-    $MESSAGE->identities[$idx]['email_ascii'] = $ident['email'];
-    $MESSAGE->identities[$idx]['ident']       = format_email_recipient($ident['email'], $ident['name']);
-    $MESSAGE->identities[$idx]['email']       = $email;
-  }
-}
+$MESSAGE->identities = $RCMAIL->user->list_identities(null, true);
 
 // Set From field value
 if (!empty($_POST['_from'])) {
@@ -270,83 +262,10 @@ else if (!empty($COMPOSE['param']['from'])) {
   $MESSAGE->compose['from'] = $COMPOSE['param']['from'];
 }
 else if (count($MESSAGE->identities)) {
-  $a_recipients = array();
-  $a_names      = array();
-
-  // extract all recipients of the reply-message
-  if (is_object($MESSAGE->headers) && in_array($compose_mode, array(RCUBE_COMPOSE_REPLY, RCUBE_COMPOSE_FORWARD)))
-  {
-    $a_to = rcube_mime::decode_address_list($MESSAGE->headers->to, null, true, $MESSAGE->headers->charset);
-    foreach ($a_to as $addr) {
-      if (!empty($addr['mailto'])) {
-        $a_recipients[] = format_email($addr['mailto']);
-        $a_names[]      = $addr['name'];
-      }
-    }
-
-    if (!empty($MESSAGE->headers->cc)) {
-      $a_cc = rcube_mime::decode_address_list($MESSAGE->headers->cc, null, true, $MESSAGE->headers->charset);
-      foreach ($a_cc as $addr) {
-        if (!empty($addr['mailto'])) {
-          $a_recipients[] = format_email($addr['mailto']);
-          $a_names[]      = $addr['name'];
-        }
-      }
-    }
-  }
-
-  $from_idx         = null;
-  $found_idx        = null;
-  $default_identity = 0; // default identity is always first on the list
-  $return_path      = $MESSAGE->headers->others['return-path'];
-
-  // Select identity
-  foreach ($MESSAGE->identities as $idx => $ident) {
-    // use From header
-    if (in_array($compose_mode, array(RCUBE_COMPOSE_DRAFT, RCUBE_COMPOSE_EDIT))) {
-      if ($MESSAGE->headers->from == $ident['ident']) {
-        $from_idx = $idx;
-        break;
-      }
-    }
-    // reply to yourself
-    else if ($compose_mode == RCUBE_COMPOSE_REPLY && $MESSAGE->headers->from == $ident['ident']) {
-      $from_idx = $idx;
-      break;
-    }
-    // use replied message recipients
-    else if (($found = array_search($ident['email_ascii'], $a_recipients)) !== false) {
-      if ($found_idx === null) {
-        $found_idx = $idx;
-      }
-      // match identity name
-      if ($a_names[$found] && $ident['name'] && $a_names[$found] == $ident['name']) {
-        $from_idx = $idx;
-        break;
-      }
-    }
-  }
-
-  // If matching by name+address doesn't found any amtches, get first found address (identity)
-  if ($from_idx === null) {
-    $from_idx = $found_idx;
-  }
-
-  // Fallback using Return-Path
-  if ($from_idx === null && $return_path) {
-    foreach ($MESSAGE->identities as $idx => $ident) {
-      if (strpos($return_path, str_replace('@', '=', $ident['email_ascii']).'@') !== false) {
-        $from_idx = $idx;
-        break;
-      }
-    }
-  }
-
-  $ident   = $MESSAGE->identities[$from_idx !== null ? $from_idx : $default_identity];
-  $from_id = $ident['identity_id'];
+  $ident = rcmail_identity_select($MESSAGE, $MESSAGE->identities, $compose_mode);
 
   $MESSAGE->compose['from_email'] = $ident['email'];
-  $MESSAGE->compose['from']       = $from_id;
+  $MESSAGE->compose['from']       = $ident['identity_id'];
 }
 
 // Set other headers
@@ -542,7 +461,7 @@ function rcmail_compose_header_from($attrib)
   if (count($MESSAGE->identities))
   {
     $a_signatures = array();
-    $separator    = $RCMAIL->config->get('sig_above')
+    $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)";
@@ -560,7 +479,7 @@ function rcmail_compose_header_from($attrib)
         $text = $html = $sql_arr['signature'];
 
         if ($sql_arr['html_signature']) {
-            $h2t  = new html2text($sql_arr['signature'], false, false);
+            $h2t  = new rcube_html2text($sql_arr['signature'], false, false);
             $text = trim($h2t->get_text());
         }
         else {
@@ -599,7 +518,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)
@@ -611,13 +530,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);
@@ -626,6 +545,11 @@ 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()
 {
@@ -641,11 +565,10 @@ function rcmail_prepare_message_body()
     $isHtml = false;
   }
   // forward as attachment
-  else if ($compose_mode == RCUBE_COMPOSE_FORWARD && $MESSAGE->forward_attachment) {
+  else if ($compose_mode == RCUBE_COMPOSE_FORWARD && $COMPOSE['as_attachment']) {
     $isHtml = rcmail_compose_editor_mode();
     $body = '';
-    if (empty($COMPOSE['attachments']))
-      rcmail_write_forward_attachment($MESSAGE);
+    rcmail_write_forward_attachments();
   }
   // reply/edit/draft/forward
   else if ($compose_mode && ($compose_mode != RCUBE_COMPOSE_REPLY || $RCMAIL->config->get('reply_mode') != -1)) {
@@ -731,13 +654,14 @@ function rcmail_compose_part_body($part, $isHtml = false)
         if ($part->ctype_secondary == 'html') {
         }
         else if ($part->ctype_secondary == 'enriched') {
-            require_once(INSTALL_PATH . 'program/lib/enriched.inc');
-            $body = enriched_to_html($body);
+            $body = rcube_enriched::to_html($body);
         }
         else {
             // try to remove the signature
-            if ($RCMAIL->config->get('strip_existing_sig', true)) {
-                $body = rcmail_remove_signature($body);
+            if ($compose_mode != RCUBE_COMPOSE_DRAFT && $compose_mode != RCUBE_COMPOSE_EDIT) {
+                if ($RCMAIL->config->get('strip_existing_sig', true)) {
+                    $body = rcmail_remove_signature($body);
+                }
             }
             // add HTML formatting
             $body = rcmail_plain_body($body);
@@ -748,8 +672,7 @@ function rcmail_compose_part_body($part, $isHtml = false)
     }
     else {
         if ($part->ctype_secondary == 'enriched') {
-            require_once(INSTALL_PATH . 'program/lib/enriched.inc');
-            $body = enriched_to_html($body);
+            $body = rcube_enriched::to_html($body);
             $part->ctype_secondary = 'html';
         }
 
@@ -757,21 +680,19 @@ function rcmail_compose_part_body($part, $isHtml = false)
             // use html part if it has been used for message (pre)viewing
             // decrease line length for quoting
             $len = $compose_mode == RCUBE_COMPOSE_REPLY ? $LINE_LENGTH-2 : $LINE_LENGTH;
-            $txt = new html2text($body, false, true, $len);
+            $txt = new rcube_html2text($body, false, true, $len);
             $body = $txt->get_text();
         }
-        else if ($part->ctype_secondary == 'enriched') {
-            require_once(INSTALL_PATH . 'program/lib/enriched.inc');
-            $body = enriched_to_html($body);
-        }
         else {
             if ($part->ctype_secondary == 'plain' && $part->ctype_parameters['format'] == 'flowed') {
                 $body = rcube_mime::unfold_flowed($body);
             }
 
             // try to remove the signature
-            if ($RCMAIL->config->get('strip_existing_sig', true)) {
-                $body = rcmail_remove_signature($body);
+            if ($compose_mode != RCUBE_COMPOSE_DRAFT && $compose_mode != RCUBE_COMPOSE_EDIT) {
+                if ($RCMAIL->config->get('strip_existing_sig', true)) {
+                    $body = rcmail_remove_signature($body);
+                }
             }
         }
     }
@@ -1067,14 +988,21 @@ function rcmail_write_compose_attachments(&$message, $bodyIsHtml)
 {
   global $RCMAIL, $COMPOSE, $compose_mode;
 
+  $loaded_attachments = array();
+  foreach ((array)$COMPOSE['attachments'] as $id => $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
@@ -1094,7 +1022,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',
@@ -1136,55 +1065,95 @@ function rcmail_write_inline_attachments(&$message)
   return $cid_map;
 }
 
-// Creates an attachment from the forwarded message
-function rcmail_write_forward_attachment(&$message)
+// Creates attachment(s) from the forwarded message(s)
+function rcmail_write_forward_attachments()
 {
-  global $RCMAIL, $COMPOSE;
+  global $RCMAIL, $COMPOSE, $MESSAGE;
+
+  $storage   = $RCMAIL->get_storage();
+  $mem_limit = parse_bytes(ini_get('memory_limit'));
+  $curr_mem  = function_exists('memory_get_usage') ? memory_get_usage() : 16*1024*1024; // safe value: 16MB
+  $names     = array();
 
-  if (strlen($message->subject)) {
-    $name = mb_substr($message->subject, 0, 64) . '.eml';
+  $loaded_attachments = array();
+  foreach ((array)$COMPOSE['attachments'] as $id => $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();
   }
   else {
-    $name = 'message_rfc822.eml';
+    $COMPOSE['forward_uid'] = explode(',', $COMPOSE['forward_uid']);
   }
 
-  $mem_limit = parse_bytes(ini_get('memory_limit'));
-  $curr_mem = function_exists('memory_get_usage') ? memory_get_usage() : 16*1024*1024; // safe value: 16MB
-  $data = $path = null;
+  foreach ((array)$COMPOSE['forward_uid'] as $uid) {
+    $message = new rcube_message($uid);
 
-  // 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'));
-    $path = tempnam($temp_dir, 'rcmAttmnt');
-    if ($fp = fopen($path, 'w')) {
-      $RCMAIL->storage->get_raw_body($message->uid, $fp);
-      fclose($fp);
-    } else
-      return false;
-  } else {
-    $data = $RCMAIL->storage->get_raw_body($message->uid);
-  }
+    if (empty($message->headers)) {
+      continue;
+    }
 
-  $attachment = array(
-    'group' => $COMPOSE['id'],
-    'name' => $name,
-    'mimetype' => 'message/rfc822',
-    'data' => $data,
-    'path' => $path,
-    'size' => $path ? filesize($path) : strlen($data),
-  );
+    if (!empty($message->headers->charset)) {
+      $storage->set_charset($message->headers->charset);
+    }
 
-  $attachment = $RCMAIL->plugins->exec_hook('attachment_save', $attachment);
+    if (empty($MESSAGE->subject)) {
+      $MESSAGE->subject = $message->subject;
+    }
 
-  if ($attachment['status']) {
-    unset($attachment['data'], $attachment['status'], $attachment['content_id'], $attachment['abort']);
-    $COMPOSE['attachments'][$attachment['id']] = $attachment;
-    return true;
-  } else if ($path) {
-    @unlink($path);
-  }
+    // generate (unique) attachment name
+    $name = strlen($message->subject) ? mb_substr($message->subject, 0, 64) : 'message_rfc822';
+    if (!empty($names[$name])) {
+      $names[$name]++;
+      $name .= '_' . $names[$name];
+    }
+    $names[$name] = 1;
+    $name .= '.eml';
 
-  return false;
+    $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'));
+      $path = tempnam($temp_dir, 'rcmAttmnt');
+      if ($fp = fopen($path, 'w')) {
+        $storage->get_raw_body($message->uid, $fp);
+        fclose($fp);
+      }
+      else {
+        return false;
+      }
+    }
+    else {
+      $data = $storage->get_raw_body($message->uid);
+      $curr_mem += $message->size;
+    }
+
+    $attachment = array(
+      'group' => $COMPOSE['id'],
+      'name' => $name,
+      'mimetype' => 'message/rfc822',
+      'data' => $data,
+      'path' => $path,
+      'size' => $path ? filesize($path) : strlen($data),
+    );
+
+    $attachment = $RCMAIL->plugins->exec_hook('attachment_save', $attachment);
+
+    if ($attachment['status']) {
+      unset($attachment['data'], $attachment['status'], $attachment['content_id'], $attachment['abort']);
+      $COMPOSE['attachments'][$attachment['id']] = $attachment;
+    }
+    else if ($path) {
+      @unlink($path);
+    }
+  }
 }
 
 
@@ -1212,16 +1181,7 @@ function rcmail_save_attachment(&$message, $pid)
   }
 
   $mimetype = $part->ctype_primary . '/' . $part->ctype_secondary;
-  $filename = $part->filename;
-  if (!strlen($filename)) {
-    if ($mimetype == 'text/html') {
-      $filename = rcube_label('htmlmessage');
-    }
-    else {
-      $filename = 'Part_'.$pid;
-    }
-    $filename .= '.' . $part->ctype_secondary;
-  }
+  $filename = rcmail_attachment_name($part);
 
   $attachment = array(
     'group' => $COMPOSE['id'],
@@ -1625,7 +1585,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/folders.inc b/program/steps/mail/folders.inc
index c56c914cd..574d6e975 100644
--- a/program/steps/mail/folders.inc
+++ b/program/steps/mail/folders.inc
@@ -65,6 +65,7 @@ else if ($RCMAIL->action == 'purge')
             if (!empty($_REQUEST['_reload'])) {
                 $OUTPUT->set_env('messagecount', 0);
                 $OUTPUT->set_env('pagecount', 0);
+                $OUTPUT->set_env('exists', 0);
                 $OUTPUT->command('message_list.clear');
                 $OUTPUT->command('set_rowcount', rcmail_get_messagecount_text(), $mbox);
                 $OUTPUT->command('set_unread_count', $mbox, 0);
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index cb1a5ddae..274c40b5c 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -5,7 +5,7 @@
  | program/steps/mail/func.inc                                           |
  |                                                                       |
  | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2005-2010, The Roundcube Dev Team                       |
+ | Copyright (C) 2005-2012, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -89,11 +89,12 @@ if (empty($RCMAIL->action) || $RCMAIL->action == 'list') {
   }
 
   $threading = (bool) $RCMAIL->storage->get_threading();
+  $delimiter = $RCMAIL->storage->get_hierarchy_delimiter();
 
   // set current mailbox and some other vars in client environment
   $OUTPUT->set_env('mailbox', $mbox_name);
   $OUTPUT->set_env('pagesize', $RCMAIL->storage->get_pagesize());
-  $OUTPUT->set_env('delimiter', $RCMAIL->storage->get_hierarchy_delimiter());
+  $OUTPUT->set_env('delimiter', $delimiter);
   $OUTPUT->set_env('threading', $threading);
   $OUTPUT->set_env('threads', $threading || $RCMAIL->storage->get_capability('THREAD'));
   $OUTPUT->set_env('preview_pane_mark_read', $RCMAIL->config->get('preview_pane_mark_read', 0));
@@ -121,7 +122,10 @@ if (empty($RCMAIL->action) || $RCMAIL->action == 'list') {
       'movingmessage', 'copyingmessage', 'deletingmessage', 'markingmessage',
       'copy', 'move', 'quota');
 
-  $OUTPUT->set_pagetitle(rcmail_localize_foldername($RCMAIL->storage->mod_folder($mbox_name)));
+  $pagetitle = $RCMAIL->localize_foldername($RCMAIL->storage->mod_folder($mbox_name), true);
+  $pagetitle = str_replace($delimiter, " \xC2\xBB ", $pagetitle);
+
+  $OUTPUT->set_pagetitle($pagetitle);
 }
 
 /**
@@ -628,39 +632,6 @@ function rcmail_wash_html($html, $p, $cid_replaces)
 
   $p += array('safe' => false, 'inline_html' => true);
 
-  // special replacements (not properly handled by washtml class)
-  $html_search = array(
-    '/(<\/nobr>)(\s+)(<nobr>)/i',	// space(s) between <NOBR>
-    '/<title[^>]*>[^<]*<\/title>/i',	// PHP bug #32547 workaround: remove title tag
-    '/^(\0\0\xFE\xFF|\xFF\xFE\0\0|\xFE\xFF|\xFF\xFE|\xEF\xBB\xBF)/',	// byte-order mark (only outlook?)
-    '/<html\s[^>]+>/i',			// washtml/DOMDocument cannot handle xml namespaces
-  );
-  $html_replace = array(
-    '\\1'.' &nbsp; '.'\\3',
-    '',
-    '',
-    '<html>',
-  );
-  $html = preg_replace($html_search, $html_replace, trim($html));
-
-  // PCRE errors handling (#1486856), should we use something like for every preg_* use?
-  if ($html === null && ($preg_error = preg_last_error()) != PREG_NO_ERROR) {
-    $errstr = "Could not clean up HTML message! PCRE Error: $preg_error.";
-
-    if ($preg_error == PREG_BACKTRACK_LIMIT_ERROR)
-      $errstr .= " Consider raising pcre.backtrack_limit!";
-    if ($preg_error == PREG_RECURSION_LIMIT_ERROR)
-      $errstr .= " Consider raising pcre.recursion_limit!";
-
-    raise_error(array('code' => 620, 'type' => 'php',
-        'line' => __LINE__, 'file' => __FILE__,
-        'message' => $errstr), true, false);
-    return '';
-  }
-
-  // fix (unknown/malformed) HTML tags before "wash"
-  $html = preg_replace_callback('/(<[\/]*)([^\s>]+)/', 'rcmail_html_tag_callback', $html);
-
   // charset was converted to UTF-8 in rcube_storage::get_message_part(),
   // change/add charset specification in HTML accordingly,
   // washtml cannot work without that
@@ -674,9 +645,6 @@ function rcmail_wash_html($html, $p, $cid_replaces)
     $html = '<head>' . $meta . '</head>' . $html;
   }
 
-  // turn relative into absolute urls
-  $html = rcmail_resolve_base($html);
-
   // clean HTML with washhtml by Frederic Motte
   $wash_opts = array(
     'show_washed' => false,
@@ -702,7 +670,7 @@ function rcmail_wash_html($html, $p, $cid_replaces)
     $wash_opts['html_attribs'] = $p['html_attribs'];
 
   // initialize HTML washer
-  $washer = new washtml($wash_opts);
+  $washer = new rcube_washtml($wash_opts);
 
   if (!$p['skip_washer_form_callback'])
     $washer->add_callback('form', 'rcmail_washtml_callback');
@@ -739,8 +707,11 @@ 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']) {
-    $txt = new html2text($data['body'], false, true);
+  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';
   }
@@ -751,8 +722,7 @@ function rcmail_print_body($part, $p = array())
   }
   // text/enriched
   else if ($data['type'] == 'enriched') {
-    require_once(INSTALL_PATH . 'program/lib/enriched.inc');
-    $body = enriched_to_html($data['body']);
+    $body = rcube_enriched::to_html($data['body']);
     $body = rcmail_wash_html($body, $data, $part->replaces);
     $part->ctype_secondary = 'html';
   }
@@ -790,7 +760,8 @@ function rcmail_plain_body($body, $flowed=false)
   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);
@@ -922,31 +893,15 @@ function rcmail_washtml_callback($tagname, $attrib, $content, $washtml)
 
 
 /**
- * Callback function for HTML tags fixing
- */
-function rcmail_html_tag_callback($matches)
-{
-  $tagname = $matches[2];
-
-  $tagname = preg_replace(array(
-    '/:.*$/',			// Microsoft's Smart Tags <st1:xxxx>
-    '/[^a-z0-9_\[\]\!-]/i',	// forbidden characters
-    ), '', $tagname);
-
-  return $matches[1].$tagname;
-}
-
-
-/**
  * return table with message headers
  */
-function rcmail_message_headers($attrib, $headers=NULL)
+function rcmail_message_headers($attrib, $headers=null)
   {
   global $OUTPUT, $MESSAGE, $PRINT_MODE, $RCMAIL;
   static $sa_attrib;
 
   // keep header table attrib
-  if (is_array($attrib) && !$sa_attrib)
+  if (is_array($attrib) && !$sa_attrib && !$attrib['valueof'])
     $sa_attrib = $attrib;
   else if (!is_array($attrib) && is_array($sa_attrib))
     $attrib = $sa_attrib;
@@ -955,11 +910,20 @@ function rcmail_message_headers($attrib, $headers=NULL)
     return FALSE;
 
   // get associative array of headers object
-  if (!$headers)
-    $headers = is_object($MESSAGE->headers) ? get_object_vars($MESSAGE->headers) : $MESSAGE->headers;
+  if (!$headers) {
+    $headers_obj = $MESSAGE->headers;
+    $headers = get_object_vars($MESSAGE->headers);
+  }
+  else if (is_object($headers)) {
+    $headers_obj = $headers;
+    $headers = get_object_vars($headers_obj);
+  }
+  else {
+    $headers_obj = rcube_message_header::from_array($headers);
+  }
 
   // show these headers
-  $standard_headers = array('subject', 'from', 'to', 'cc', 'bcc', 'replyto',
+  $standard_headers = array('subject', 'from', 'sender', 'to', 'cc', 'bcc', 'replyto',
     'mail-reply-to', 'mail-followup-to', 'date', 'priority');
   $exclude_headers = $attrib['exclude'] ? explode(',', $attrib['exclude']) : array();
   $output_headers = array();
@@ -1010,6 +974,14 @@ function rcmail_message_headers($attrib, $headers=NULL)
       else
         continue;
     }
+    else if ($hkey == 'sender') {
+      if ($headers['sender'] != $headers['from']) {
+        $header_value = rcmail_address_string($value, $attrib['max'], true, $attrib['addicon'], $headers['charset'], $header_title);
+        $ishtml = true;
+      }
+      else
+        continue;
+    }
     else if ($hkey == 'mail-followup-to') {
       $header_value = rcmail_address_string($value, $attrib['max'], true, $attrib['addicon'], $headers['charset'], $header_title);
       $ishtml = true;
@@ -1032,7 +1004,7 @@ function rcmail_message_headers($attrib, $headers=NULL)
   }
 
   $plugin = $RCMAIL->plugins->exec_hook('message_headers_output',
-    array('output' => $output_headers, 'headers' => $MESSAGE->headers, 'exclude' => $exclude_headers));
+    array('output' => $output_headers, 'headers' => $headers_obj, 'exclude' => $exclude_headers));
 
   // single header value is requested
   if (!empty($attrib['valueof']))
@@ -1111,12 +1083,13 @@ function rcmail_message_body($attrib)
 
   if (!empty($MESSAGE->parts)) {
     foreach ($MESSAGE->parts as $i => $part) {
-      if ($part->type == 'headers')
-        $out .= rcmail_message_headers(sizeof($header_attrib) ? $header_attrib : NULL, $part->headers);
+      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;
@@ -1140,6 +1113,15 @@ function rcmail_message_body($attrib)
         if (!isset($part->body))
           $part->body = $MESSAGE->get_part_content($part->mime_id);
 
+        // extract headers from message/rfc822 parts
+        if ($part->mimetype == 'message/rfc822') {
+          $msgpart = rcube_mime::parse_message($part->body);
+          if (!empty($msgpart->headers)) {
+            $part = $msgpart;
+            $out .= html::div('message-partheaders', rcmail_message_headers(sizeof($header_attrib) ? $header_attrib : null, $part->headers));
+          }
+        }
+
         // message is cached but not exists (#1485443), or other error
         if ($part->body === false) {
           rcmail_message_error($MESSAGE->uid);
@@ -1204,10 +1186,9 @@ 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)),
@@ -1264,7 +1245,7 @@ function rcmail_part_image_type($part)
 
   // Content-Type: image/*...
   if (preg_match($mime_regex, $part->mimetype)) {
-    return $part->mimetype;
+    return rcmail_fix_mimetype($part->mimetype);
   }
 
   // Many clients use application/octet-stream, we'll detect mimetype
@@ -1293,20 +1274,6 @@ function rcmail_part_image_type($part)
   }
 }
 
-/**
- * Convert all relative URLs according to a <base> in HTML
- */
-function rcmail_resolve_base($body)
-{
-  // check for <base href=...>
-  if (preg_match('!(<base.*href=["\']?)([hftps]{3,5}://[a-z0-9/.%-]+)!i', $body, $regs)) {
-    $replacer = new rcube_base_replacer($regs[2]);
-    $body     = $replacer->replace($body);
-  }
-
-  return $body;
-}
-
 
 /**
  * modify a HTML message that it can be displayed inside a HTML page
@@ -1407,7 +1374,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)
 {
@@ -1416,9 +1383,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'])
@@ -1445,6 +1412,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');
@@ -1480,6 +1452,11 @@ function rcmail_address_string($input, $max=null, $linked=false, $addicon=null,
     $mailto = $part['mailto'];
     $string = $part['string'];
 
+    // phishing email prevention (#1488981), e.g. "valid@email.addr <phishing@email.addr>"
+    if ($name && $name != $mailto && strpos($name, '@')) {
+      $name = '';
+    }
+
     // IDNA ASCII to Unicode
     if ($name == $mailto)
       $name = rcube_idn_to_utf8($name);
@@ -1510,7 +1487,7 @@ function rcmail_address_string($input, $max=null, $linked=false, $addicon=null,
       if ($addicon && $_SESSION['writeable_abook']) {
         $address .= html::a(array(
             'href' => "#add",
-            'onclick' => sprintf("return %s.command('add-contact','%s',this)", JS_OBJECT_NAME, $string),
+            'onclick' => sprintf("return %s.command('add-contact','%s',this)", JS_OBJECT_NAME, JQ($string)),
             'title' => rcube_label('addtoaddressbook'),
             'class' => 'rcmaddcontact',
           ),
@@ -1638,10 +1615,7 @@ function rcmail_message_part_controls($attrib)
   $part  = $MESSAGE->mime_parts[$part];
   $table = new html_table(array('cols' => 3));
 
-  $filename = $part->filename;
-  if (empty($filename) && $attach_prop->mimetype == 'text/html') {
-    $filename = rcube_label('htmlmessage');
-  }
+  $filename = rcmail_attachment_name($part);
 
   if (!empty($filename)) {
     $table->add('title', Q(rcube_label('filename')));
@@ -1656,7 +1630,6 @@ function rcmail_message_part_controls($attrib)
 }
 
 
-
 function rcmail_message_part_frame($attrib)
 {
   global $MESSAGE;
@@ -1702,11 +1675,11 @@ function rcmail_send_mdn($message, &$smtp_error)
   if ($message->headers->mdn_to && empty($message->headers->flags['MDNSENT']) &&
     ($RCMAIL->storage->check_permflag('MDNSENT') || $RCMAIL->storage->check_permflag('*')))
   {
-    $identity = $RCMAIL->user->get_identity();
-    $sender = format_email_recipient($identity['email'], $identity['name']);
+    $identity  = rcmail_identity_select($message);
+    $sender    = format_email_recipient($identity['email'], $identity['name']);
     $recipient = array_shift(rcube_mime::decode_address_list(
       $message->headers->mdn_to, 1, true, $message->headers->charset));
-    $mailto = $recipient['mailto'];
+    $mailto    = $recipient['mailto'];
 
     $compose = new Mail_mime("\r\n");
 
@@ -1731,6 +1704,9 @@ function rcmail_send_mdn($message, &$smtp_error)
     if ($agent = $RCMAIL->config->get('useragent'))
       $headers['User-Agent'] = $agent;
 
+    if ($RCMAIL->config->get('mdn_use_from'))
+      $options['mdn_use_from'] = true;
+
     $body = rcube_label("yourmessage") . "\r\n\r\n" .
       "\t" . rcube_label("to") . ': ' . rcube_mime::decode_mime_string($message->headers->to, $message->headers->charset) . "\r\n" .
       "\t" . rcube_label("subject") . ': ' . $message->subject . "\r\n" .
@@ -1752,7 +1728,7 @@ function rcmail_send_mdn($message, &$smtp_error)
     $compose->setTXTBody(rc_wordwrap($body, 75, "\r\n"));
     $compose->addAttachment($report, 'message/disposition-notification', 'MDNPart2.txt', false, '7bit', 'inline');
 
-    $sent = rcmail_deliver_message($compose, $identity['email'], $mailto, $smtp_error, $body_file);
+    $sent = rcmail_deliver_message($compose, $identity['email'], $mailto, $smtp_error, $body_file, $options);
 
     if ($sent)
     {
@@ -1764,6 +1740,107 @@ function rcmail_send_mdn($message, &$smtp_error)
   return false;
 }
 
+/**
+ * Detect recipient identity from specified message
+ */
+function rcmail_identity_select($MESSAGE, $identities = null, $compose_mode = 'reply')
+{
+    $a_recipients = array();
+    $a_names      = array();
+
+    if ($identities === null) {
+        $identities = rcmail::get_instance()->user->list_identities(null, true);
+    }
+
+    // extract all recipients of the reply-message
+    if (is_object($MESSAGE->headers) && in_array($compose_mode, array('reply', 'forward'))) {
+        $a_to = rcube_mime::decode_address_list($MESSAGE->headers->to, null, true, $MESSAGE->headers->charset);
+        foreach ($a_to as $addr) {
+            if (!empty($addr['mailto'])) {
+                $a_recipients[] = format_email($addr['mailto']);
+                $a_names[]      = $addr['name'];
+            }
+        }
+
+        if (!empty($MESSAGE->headers->cc)) {
+            $a_cc = rcube_mime::decode_address_list($MESSAGE->headers->cc, null, true, $MESSAGE->headers->charset);
+            foreach ($a_cc as $addr) {
+                if (!empty($addr['mailto'])) {
+                    $a_recipients[] = format_email($addr['mailto']);
+                    $a_names[]      = $addr['name'];
+                }
+            }
+        }
+    }
+
+    $from_idx         = null;
+    $found_idx        = null;
+    $default_identity = 0; // default identity is always first on the list
+
+    // Select identity
+    foreach ($identities as $idx => $ident) {
+        // use From header
+        if (in_array($compose_mode, array('draft', 'edit'))) {
+            if ($MESSAGE->headers->from == $ident['ident']) {
+                $from_idx = $idx;
+                break;
+            }
+        }
+        // reply to yourself
+        else if ($compose_mode == 'reply' && $MESSAGE->headers->from == $ident['ident']) {
+            $from_idx = $idx;
+            break;
+        }
+        // use replied message recipients
+        else if (($found = array_search($ident['email_ascii'], $a_recipients)) !== false) {
+            if ($found_idx === null) {
+                $found_idx = $idx;
+            }
+            // match identity name
+            if ($a_names[$found] && $ident['name'] && $a_names[$found] == $ident['name']) {
+                $from_idx = $idx;
+                break;
+            }
+        }
+    }
+
+    // If matching by name+address doesn't found any matches, get first found address (identity)
+    if ($from_idx === null) {
+        $from_idx = $found_idx;
+    }
+
+    // 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;
+            }
+        }
+    }
+
+    // Fallback using Delivered-To
+    if ($from_idx === null && ($delivered_to = $MESSAGE->headers->others['delivered-to'])) {
+        foreach ($identities as $idx => $ident) {
+            if (in_array($ident['email_ascii'], (array)$delivered_to)) {
+                $from_idx = $idx;
+                break;
+            }
+        }
+    }
+
+    // Fallback using Envelope-To
+    if ($from_idx === null && ($envelope_to = $MESSAGE->headers->others['envelope-to'])) {
+        foreach ($identities as $idx => $ident) {
+            if (in_array($ident['email_ascii'], (array)$envelope_to)) {
+                $from_idx = $idx;
+                break;
+            }
+        }
+    }
+
+    return $identities[$from_idx !== null ? $from_idx : $default_identity];
+}
 
 // Fixes some content-type names
 function rcmail_fix_mimetype($name)
@@ -1773,9 +1850,44 @@ function rcmail_fix_mimetype($name)
   if (preg_match('/^application\/pdf.+/', $name))
     $name = 'application/pdf';
 
+  // treat image/pjpeg as image/jpeg
+  else if (preg_match('/^image\/p?jpe?g$/', $name))
+    $name = 'image/jpeg';
+
   return $name;
 }
 
+// return attachment filename, handle empty filename case
+function rcmail_attachment_name($attachment, $display = false)
+{
+    $filename = $attachment->filename;
+
+    if ($filename === null || $filename === '') {
+        if ($attachment->mimetype == 'text/html') {
+            $filename = rcube_label('htmlmessage');
+        }
+        else {
+            $ext      = (array) rcube_mime::get_mime_extensions($attachment->mimetype);
+            $ext      = array_shift($ext);
+            $filename = rcube_label('messagepart') . ' ' . $attachment->mime_id;
+            if ($ext) {
+                $filename .= '.' . $ext;
+            }
+        }
+    }
+
+    $filename = preg_replace('[\r\n]', '', $filename);
+
+    // Display smart names for some known mimetypes
+    if ($display) {
+        if (preg_match('/application\/(pgp|pkcs7)-signature/i', $attachment->mimetype)) {
+            $filename = rcube_label('digitalsig');
+        }
+    }
+
+    return $filename;
+}
+
 function rcmail_search_filter($attrib)
 {
   global $OUTPUT, $CONFIG;
diff --git a/program/steps/mail/get.inc b/program/steps/mail/get.inc
index 71a5e1b02..23dc22b7c 100644
--- a/program/steps/mail/get.inc
+++ b/program/steps/mail/get.inc
@@ -35,6 +35,7 @@ if (!empty($_GET['_preload'])) {
 
 ob_end_clean();
 
+
 // similar code as in program/steps/mail/show.inc
 if (!empty($_GET['_uid'])) {
   $RCMAIL->config->set('prefer_html', true);
@@ -47,13 +48,7 @@ check_storage_status();
 // show part page
 if (!empty($_GET['_frame'])) {
   if (($part_id = get_input_value('_part', RCUBE_INPUT_GPC)) && ($part = $MESSAGE->mime_parts[$part_id])) {
-    $filename = $part->filename;
-    if (empty($filename) && $part->mimetype == 'text/html') {
-      $filename = rcube_label('htmlmessage');
-    }
-    if (!empty($filename)) {
-      $OUTPUT->set_pagetitle($filename);
-    }
+    $OUTPUT->set_pagetitle(rcmail_attachment_name($part));
   }
 
   $OUTPUT->send('messagepart');
@@ -65,11 +60,11 @@ 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);
+    $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;
+    $cache_file     = $cache_basename . '.' . $ext;
+    $mimetype       = $part->mimetype;
 
     // render thumbnail image if not done yet
     if (!is_file($cache_file)) {
@@ -78,7 +73,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);
       }
@@ -126,7 +121,7 @@ else if (strlen($pid = get_input_value('_part', RCUBE_INPUT_GET))) {
       $valid = $file_extension && in_array($file_extension, (array)$extensions);
 
       // 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
@@ -138,6 +133,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;
@@ -159,19 +158,20 @@ 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', array('style' => 'font-family:sans-serif; margin:1em'),
-          html::div(array('class' => 'warning', 'style' => 'border:2px solid #ffdf0e; background:#fef893; padding:1em 1em 0 1em;'),
+        $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])")
+              'vars' => array(
+                'expected' => $mimetype . ($file_extension ? "(.$file_extension)" : ''),
+                'detected' => $real_mimetype . ($extensions[0] ? "(.$extensions[0])" : ''),
+              )
             )) .
-            html::p('buttons',
-              html::tag('button', null,
-                html::a(array(
-                  'href' => $RCMAIL->url(array_merge($_GET, array('_nocheck' => 1))),
-                  'style' => 'text-decoration:none;color:#000',
-                ), rcube_label('showanyway')))
-            ))
+            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;
       }
@@ -222,7 +222,27 @@ else if (strlen($pid = get_input_value('_part', RCUBE_INPUT_GET))) {
         if (!$part->body)
           $part->body = $MESSAGE->get_part_content($part->mime_id);
 
+        // show images?
+        rcmail_check_safe($MESSAGE);
+
+        // render HTML body
         $out = rcmail_print_body($part, array('safe' => $MESSAGE->is_safe, 'inline_html' => false));
+
+        // insert remote objects warning into HTML body
+        if ($REMOTE_OBJECTS) {
+          $body_start = 0;
+          if ($body_pos = strpos($out, '<body')) {
+            $body_start = strpos($out, '>', $body_pos) + 1;
+          }
+          $out = substr($out, 0, $body_start) .
+            html::div(array('class' => 'rcmail-inline-message rcmail-inline-warning'),
+              Q(rcube_label('blockedimages')) . '&nbsp;' .
+              html::tag('button',
+                array('onclick' => "location.href='" . $RCMAIL->url(array_merge($_GET, array('_safe' => 1))) . "'"),
+                Q(rcube_label('showimages')))
+            ) .
+            substr($out, $body_start);
+        }
       }
 
       // check connection status
@@ -237,18 +257,7 @@ else if (strlen($pid = get_input_value('_part', RCUBE_INPUT_GET))) {
       // don't kill the connection if download takes more than 30 sec.
       @set_time_limit(0);
 
-      if ($part->filename) {
-        $filename = $part->filename;
-      }
-      else if ($part->mimetype == 'text/html') {
-        $filename = rcube_label('htmlmessage');
-      }
-      else {
-        $ext = '.' . ($mimetype == 'text/plain' ? 'txt' : $ctype_secondary);
-        $filename = ($MESSAGE->subject ? $MESSAGE->subject : 'roundcube') . $ext;
-      }
-
-      $filename = preg_replace('[\r\n]', '', $filename);
+      $filename = rcmail_attachment_name($part);
 
       if ($browser->ie && $browser->ver < 7)
         $filename = rawurlencode(abbreviate_string($filename, 55));
@@ -259,6 +268,18 @@ else if (strlen($pid = get_input_value('_part', RCUBE_INPUT_GET))) {
 
       $disposition = !empty($plugin['download']) ? 'attachment' : 'inline';
 
+      // Workaround for nasty IE bug (#1488844)
+      // If Content-Disposition header contains string "attachment" e.g. in filename
+      // IE handles data as attachment not inline
+      if ($disposition == 'inline' && $browser->ie && $browser->ver < 9) {
+        $filename = str_ireplace('attachment', 'attach', $filename);
+      }
+
+      // add filename extension if missing
+      if (!pathinfo($filename, PATHINFO_EXTENSION) && ($extensions = rcube_mime::get_mime_extensions($mimetype))) {
+        $filename .= '.' . $extensions[0];
+      }
+
       header("Content-Disposition: $disposition; filename=\"$filename\"");
 
       // handle tiff to jpeg conversion
@@ -302,7 +323,7 @@ else if (strlen($pid = get_input_value('_part', RCUBE_INPUT_GET))) {
       // send part as-it-is
       else {
         if ($part->body) {
-          header("Content-Length: " . sizeof($part->body));
+          header("Content-Length: " . strlen($part->body));
           echo $part->body;
           $sent = true;
         }
diff --git a/program/steps/mail/list.inc b/program/steps/mail/list.inc
index b433f81fc..a2380131a 100644
--- a/program/steps/mail/list.inc
+++ b/program/steps/mail/list.inc
@@ -95,8 +95,8 @@ $OUTPUT->set_env('messagecount', $count);
 $OUTPUT->set_env('pagecount', $pages);
 $OUTPUT->set_env('threading', $threading);
 $OUTPUT->set_env('current_page', $count ? $RCMAIL->storage->get_page() : 1);
+$OUTPUT->set_env('exists', $RCMAIL->storage->count($mbox_name, 'EXISTS'));
 $OUTPUT->command('set_rowcount', rcmail_get_messagecount_text($count), $mbox_name);
-$OUTPUT->command('set_mailboxname', rcmail_get_mailbox_name_text());
 
 // add message rows
 rcmail_js_message_list($a_headers, FALSE, $cols);
diff --git a/program/steps/mail/list_contacts.inc b/program/steps/mail/list_contacts.inc
index 9347190da..7e3b349cd 100644
--- a/program/steps/mail/list_contacts.inc
+++ b/program/steps/mail/list_contacts.inc
@@ -5,7 +5,7 @@
  | program/steps/mail/list_contacts.inc                                  |
  |                                                                       |
  | This file is part of the Roundcube Webmail client                     |
- | 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.                |
@@ -19,72 +19,117 @@
  +-----------------------------------------------------------------------+
 */
 
-$jsenv = array();
-$source = get_input_value('_source', RCUBE_INPUT_GPC);
-$CONTACTS = $RCMAIL->get_address_book($source);
-$PAGE_SIZE = $RCMAIL->config->get('addressbook_pagesize', $RCMAIL->config->get('pagesize', 50));
-
-if ($CONTACTS && $CONTACTS->ready) {
-    // set list properties
-    $CONTACTS->set_pagesize($PAGE_SIZE);
-    $CONTACTS->set_page(max(1, intval($_GET['_page'])));
-
-    // list groups of this source (on page one)
-    if ($CONTACTS->groups && $CONTACTS->list_page == 1) {
-        foreach ($CONTACTS->list_groups() as $group) {
-            $CONTACTS->reset();
-            $CONTACTS->set_group($group['ID']);
-            $group_prop = $CONTACTS->get_group($group['ID']);
-
-            // group (distribution list) with email address(es)
-            if ($group_prop['email']) {
-                foreach ((array)$group_prop['email'] as $email) {
-                    $row_id = 'G'.$group['ID'];
-                    $jsresult[$row_id] = format_email_recipient($email, $group['name']);
+$afields = $RCMAIL->config->get('contactlist_fields');
+$sort_col = $RCMAIL->config->get('addressbook_sort_col', 'name');
+$page_size = $RCMAIL->config->get('addressbook_pagesize', $RCMAIL->config->get('pagesize', 50));
+$page = max(1, intval($_GET['_page']));
+
+// Use search result
+if (!empty($_REQUEST['_search']) && isset($_SESSION['search'][$_REQUEST['_search']])) {
+    $search  = (array)$_SESSION['search'][$_REQUEST['_search']];
+
+    // get records from all sources
+    foreach ($search as $s => $set) {
+        $CONTACTS = $RCMAIL->get_address_book($s);
+
+        // reset page
+        $CONTACTS->set_page(1);
+        $CONTACTS->set_pagesize(9999);
+        $CONTACTS->set_search_set($set);
+
+        // get records
+        $result = $CONTACTS->list_records($afields);
+
+        while ($row = $result->next()) {
+            $row['sourceid'] = $s;
+            $key = rcube_addressbook::compose_contact_key($row, $sort_col);
+            $records[$key] = $row;
+        }
+        unset($result);
+    }
+
+    // sort the records
+    ksort($records, SORT_LOCALE_STRING);
+
+    // create resultset object
+    $count  = count($records);
+    $first  = ($page-1) * $page_size;
+    $result = new rcube_result_set($count, $first);
+
+    // we need only records for current page
+    if ($page_size < $count) {
+        $records = array_slice($records, $first, $page_size);
+    }
+
+    $result->records = array_values($records);
+}
+// list contacts from selected source
+else {
+    $source = get_input_value('_source', RCUBE_INPUT_GPC);
+    $CONTACTS = $RCMAIL->get_address_book($source);
+
+    if ($CONTACTS && $CONTACTS->ready) {
+        // set list properties
+        $CONTACTS->set_pagesize($page_size);
+        $CONTACTS->set_page($page);
+
+        // list groups of this source (on page one)
+        if ($CONTACTS->groups && $CONTACTS->list_page == 1) {
+            foreach ($CONTACTS->list_groups() as $group) {
+                $CONTACTS->reset();
+                $CONTACTS->set_group($group['ID']);
+                $group_prop = $CONTACTS->get_group($group['ID']);
+
+                // group (distribution list) with email address(es)
+                if ($group_prop['email']) {
+                    foreach ((array)$group_prop['email'] as $email) {
+                        $row_id = 'G'.$group['ID'];
+                        $jsresult[$row_id] = format_email_recipient($email, $group['name']);
+                        $OUTPUT->command('add_contact_row', $row_id, array(
+                            'contactgroup' => html::span(array('title' => $email), Q($group['name']))), 'group');
+                    }
+                }
+                // show group with count
+                else if (($result = $CONTACTS->count()) && $result->count) {
+                    $row_id = 'E'.$group['ID'];
+                    $jsresult[$row_id] = $group['name'];
                     $OUTPUT->command('add_contact_row', $row_id, array(
-                        'contactgroup' => html::span(array('title' => $email), Q($group['name']))), 'group');
+                        'contactgroup' => Q($group['name'] . ' (' . intval($result->count) . ')')), 'group');
                 }
             }
-            // show group with count
-            else if (($result = $CONTACTS->count()) && $result->count) {
-                $row_id = 'E'.$group['ID'];
-                $jsresult[$row_id] = $group['name'];
-                $OUTPUT->command('add_contact_row', $row_id, array(
-                    'contactgroup' => Q($group['name'] . ' (' . intval($result->count) . ')')), 'group');
-            }
         }
+
+        // get contacts for this user
+        $CONTACTS->set_group(0);
+        $result = $CONTACTS->list_records($afields);
     }
+}
 
-    // get contacts for this user
-    $CONTACTS->set_group(0);
-    $afields = $RCMAIL->config->get('contactlist_fields');
-    $result = $CONTACTS->list_records($afields);
+if (!empty($result) && !$result->count && $result->searchonly) {
+    $OUTPUT->show_message('contactsearchonly', 'notice');
+}
+else if (!empty($result) && $result->count > 0) {
+    // create javascript list
+    while ($row = $result->next()) {
+        $name = rcube_addressbook::compose_list_name($row);
 
-    if (!$result->count && $result->searchonly) {
-        $OUTPUT->show_message('contactsearchonly', 'notice');
-    }
-    else if (!empty($result) && $result->count > 0) {
-        // create javascript list
-        while ($row = $result->next()) {
-            $name = rcube_addressbook::compose_list_name($row);
-
-            // add record for every email address of the contact
-            $emails = $CONTACTS->get_col_values('email', $row, true);
-            foreach ($emails as $i => $email) {
-                $row_id = $row['ID'].$i;
-                $jsresult[$row_id] = format_email_recipient($email, $name);
-                $OUTPUT->command('add_contact_row', $row_id, array(
-                    'contact' => html::span(array('title' => $email), Q($name ? $name : $email) .
-                        ($name && count($emails) > 1 ? '&nbsp;' . html::span('email', Q($email)) : '')
-                    )), 'person');
-            }
+        // add record for every email address of the contact
+        $emails = $CONTACTS->get_col_values('email', $row, true);
+        foreach ($emails as $i => $email) {
+            $row_id = $row['ID'].$i;
+            $jsresult[$row_id] = format_email_recipient($email, $name);
+            $OUTPUT->command('add_contact_row', $row_id, array(
+                'contact' => html::span(array('title' => $email), Q($name ? $name : $email) .
+                    ($name && count($emails) > 1 ? '&nbsp;' . html::span('email', Q($email)) : '')
+                )), 'person');
         }
     }
 }
 
+
 // update env
 $OUTPUT->set_env('contactdata', $jsresult);
-$OUTPUT->set_env('pagecount', ceil($result->count / $PAGE_SIZE));
+$OUTPUT->set_env('pagecount', ceil($result->count / $page_size));
 $OUTPUT->command('set_page_buttons');
 
 // send response
diff --git a/program/steps/mail/move_del.inc b/program/steps/mail/move_del.inc
index da43b4000..3fc6ac5a7 100644
--- a/program/steps/mail/move_del.inc
+++ b/program/steps/mail/move_del.inc
@@ -29,18 +29,19 @@ $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);
 
     if (!$moved) {
         // send error message
-	    if ($_POST['_from'] != 'show')
+        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;
     }
@@ -59,7 +60,7 @@ else if ($RCMAIL->action=='delete' && !empty($_POST['_uid'])) {
 
     if (!$del) {
         // send error message
-	    if ($_POST['_from'] != 'show')
+        if ($_POST['_from'] != 'show')
             $OUTPUT->command('list_mailbox');
         rcmail_display_server_error('errordeleting');
         $OUTPUT->send();
@@ -111,6 +112,7 @@ else
   $OUTPUT->set_env('messagecount', $msg_count);
   $OUTPUT->set_env('current_page', $page);
   $OUTPUT->set_env('pagecount', $pages);
+  $OUTPUT->set_env('exists', $RCMAIL->storage->count($mbox, 'EXISTS', true));
 
   // update mailboxlist
   $mbox = $RCMAIL->storage->get_folder();
@@ -144,5 +146,3 @@ else
 
 // send response
 $OUTPUT->send();
-
-
diff --git a/program/steps/mail/search.inc b/program/steps/mail/search.inc
index db5424b3b..fb1b48797 100644
--- a/program/steps/mail/search.inc
+++ b/program/steps/mail/search.inc
@@ -69,7 +69,7 @@ else if (preg_match("/^subject:.*/i", $str))
 else if (preg_match("/^body:.*/i", $str))
 {
   list(,$srch) = explode(":", $str);
-  $subject['text'] = "TEXT";
+  $subject['body'] = "BODY";
 }
 else if (strlen(trim($str)))
 {
@@ -81,7 +81,7 @@ else if (strlen(trim($str)))
         break;
       }
       else {
-        $subject[$header] = 'HEADER '.strtoupper($header);
+        $subject[$header] = ($header != 'body' ? 'HEADER ' : '') . strtoupper($header);
       }
     }
 
@@ -89,7 +89,8 @@ else if (strlen(trim($str)))
     $search_mods = $RCMAIL->config->get('search_mods', $SEARCH_MODS_DEFAULT);
     $search_mods[$mbox] = array_fill_keys(array_keys($subject), 1);
     $RCMAIL->user->save_prefs(array('search_mods' => $search_mods));
-  } else {
+  }
+  else {
     // search in subject by default
     $subject['subject'] = 'HEADER SUBJECT';
   }
@@ -143,5 +144,6 @@ else {
 $OUTPUT->set_env('search_request', $search_str ? $search_request : '');
 $OUTPUT->set_env('messagecount', $count);
 $OUTPUT->set_env('pagecount', ceil($count/$RCMAIL->storage->get_pagesize()));
+$OUTPUT->set_env('exists', $RCMAIL->storage->count($mbox_name, 'EXISTS'));
 $OUTPUT->command('set_rowcount', rcmail_get_messagecount_text($count, 1), $mbox);
 $OUTPUT->send();
diff --git a/program/steps/mail/search_contacts.inc b/program/steps/mail/search_contacts.inc
new file mode 100644
index 000000000..2e6bb12f8
--- /dev/null
+++ b/program/steps/mail/search_contacts.inc
@@ -0,0 +1,112 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | program/steps/mail/search_contacts.inc                                |
+ |                                                                       |
+ | 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:                                                              |
+ |   Search contacts from the adress book widget                         |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas Bruederli <roundcube@gmail.com>                        |
+ +-----------------------------------------------------------------------+
+*/
+
+$search  = get_input_value('_q', RCUBE_INPUT_GPC, true);
+$sources = $RCMAIL->get_address_sources();
+$search_mode = (int) $RCMAIL->config->get('addressbook_search_mode');
+$sort_col = $RCMAIL->config->get('addressbook_sort_col', 'name');
+$afields = $RCMAIL->config->get('contactlist_fields');
+
+$page = 1;
+$page_size = $RCMAIL->config->get('addressbook_pagesize', $RCMAIL->config->get('pagesize', 50));
+
+$records = $search_set = array();
+foreach ($sources as $s) {
+    $source = $RCMAIL->get_address_book($s['id']);
+    $source->set_page(1);
+    $source->set_pagesize(9999);
+
+    // get contacts count
+    $result = $source->search($afields, $search, $search_mode, true, true, 'email');
+
+    if (!$result->count) {
+        continue;
+    }
+
+    // get records
+    $result = $source->list_records($afields);
+
+    while ($row = $result->next()) {
+        $row['sourceid'] = $s['id'];
+        $key = rcube_addressbook::compose_contact_key($row, $sort_col);
+        $records[$key] = $row;
+    }
+
+    $search_set[$s['id']] = $source->get_search_set();
+    unset($result);
+}
+
+// sort the records
+ksort($records, SORT_LOCALE_STRING);
+
+// create resultset object
+$count  = count($records);
+$result = new rcube_result_set($count);
+
+// select the requested page
+if ($page_size < $count) {
+    $records = array_slice($records, $result->first, $page_size);
+}
+
+$result->records = array_values($records);
+
+if (!empty($result) && $result->count > 0) {
+    // create javascript list
+    while ($row = $result->next()) {
+        $name = rcube_addressbook::compose_list_name($row);
+
+        // add record for every email address of the contact
+        // (same as in list_contacts.inc)
+        $emails = $source->get_col_values('email', $row, true);
+        foreach ($emails as $i => $email) {
+            $row_id = $row['ID'].$i;
+            $jsresult[$row_id] = format_email_recipient($email, $name);
+            $OUTPUT->command('add_contact_row', $row_id, array(
+                'contact' => html::span(array('title' => $email), Q($name ? $name : $email) .
+                    ($name && count($emails) > 1 ? '&nbsp;' . html::span('email', Q($email)) : '')
+                )), 'person');
+        }
+    }
+
+    // search request ID
+    $search_request = md5('composeaddr' . $search);
+
+    // save search settings in session
+    $_SESSION['search'][$search_request] = $search_set;
+    $_SESSION['search_params'] = array('id' => $search_request, 'data' => array($afields, $search));
+
+    $OUTPUT->show_message('contactsearchsuccessful', 'confirmation', array('nr' => $result->count));
+
+    $OUTPUT->command('set_env', 'search_request', $search_request);
+    $OUTPUT->command('set_env', 'source', '');
+    $OUTPUT->command('unselect_directory');
+}
+else {
+    $OUTPUT->show_message('nocontactsfound', 'notice');
+}
+
+// update env
+$OUTPUT->set_env('contactdata', $jsresult);
+$OUTPUT->set_env('pagecount', ceil($result->count / $page_size));
+$OUTPUT->command('set_page_buttons');
+
+// send response
+$OUTPUT->send();
diff --git a/program/steps/mail/sendmail.inc b/program/steps/mail/sendmail.inc
index c26d774a2..2f96e930f 100644
--- a/program/steps/mail/sendmail.inc
+++ b/program/steps/mail/sendmail.inc
@@ -219,11 +219,11 @@ function rcmail_email_input_format($mailto, $count=false, $check=true)
     // address in brackets without name (do nothing)
     if (preg_match('/^<'.$email_regexp.'>$/', $item)) {
       $item = rcube_idn_to_ascii(trim($item, '<>'));
-      $result[] = '<' . $item . '>';
+      $result[] = $item;
     // address without brackets and without name (add brackets)
     } else if (preg_match('/^'.$email_regexp.'$/', $item)) {
       $item = rcube_idn_to_ascii($item);
-      $result[] = '<' . $item . '>';
+      $result[] = $item;
     // address with name (handle name)
     } else if (preg_match('/<*'.$email_regexp.'>*$/', $item, $matches)) {
       $address = $matches[0];
@@ -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)
@@ -466,7 +493,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 +517,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) {
@@ -559,7 +577,7 @@ if ($isHtml) {
   $plugin['body'] = rcmail_replace_emoticons($plugin['body']);
 
   // add a plain text version of the e-mail as an alternative part.
-  $h2t = new html2text($plugin['body'], false, true, 0, $message_charset);
+  $h2t = new rcube_html2text($plugin['body'], false, true, 0, $message_charset);
   $plainTextPart = rc_wordwrap($h2t->get_text(), $LINE_LENGTH, "\r\n", false, $message_charset);
   $plainTextPart = wordwrap($plainTextPart, 998, "\r\n", true);
 
@@ -617,13 +635,12 @@ if (is_array($COMPOSE['attachments']))
       $ctype = str_replace('image/pjpeg', 'image/jpeg', $attachment['mimetype']); // #1484914
       $file = $attachment['data'] ? $attachment['data'] : $attachment['path'];
 
-      // .eml attachments send inline
       $MAIL_MIME->addAttachment($file,
         $ctype,
         $attachment['name'],
         ($attachment['data'] ? false : true),
         ($ctype == 'message/rfc822' ? '8bit' : 'base64'),
-        ($ctype == 'message/rfc822' ? 'inline' : 'attachment'),
+        'attachment',
         '', '', '',
         $CONFIG['mime_param_folding'] ? 'quoted-printable' : NULL,
         $CONFIG['mime_param_folding'] == 2 ? 'quoted-printable' : NULL,
@@ -821,6 +838,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 82594f3e4..552c180f5 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);
@@ -79,7 +91,7 @@ if ($uid = get_input_value('_uid', RCUBE_INPUT_GET)) {
     }
   }
 
-  $OUTPUT->set_env('mimetypes', $mimetypes);
+  $OUTPUT->set_env('mimetypes', array_values($mimetypes));
 
   if ($CONFIG['drafts_mbox'])
     $OUTPUT->set_env('drafts_mailbox', $CONFIG['drafts_mbox']);
@@ -106,6 +118,11 @@ if ($uid = get_input_value('_uid', RCUBE_INPUT_GET)) {
     $OUTPUT->add_label('checkingmail', 'deletemessage', 'movemessagetotrash',
       'movingmessage', 'deletingmessage', 'markingmessage');
 
+  $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
       && empty($MESSAGE->headers->flags['MDNSENT'])
@@ -147,13 +164,11 @@ function rcmail_message_attachments($attrib)
   global $PRINT_MODE, $MESSAGE, $RCMAIL;
 
   $out = $ol = '';
+  $attachments = array();
 
   if (sizeof($MESSAGE->attachments)) {
     foreach ($MESSAGE->attachments as $attach_prop) {
-      $filename = $attach_prop->filename;
-      if (empty($filename) && $attach_prop->mimetype == 'text/html') {
-        $filename = rcube_label('htmlmessage');
-      }
+      $filename = rcmail_attachment_name($attach_prop, true);
 
       if ($PRINT_MODE) {
         $size = $RCMAIL->message_part_size($attach_prop);
@@ -161,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;
@@ -288,9 +305,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/edit_identity.inc b/program/steps/settings/edit_identity.inc
index 39076f408..d70a7aef7 100644
--- a/program/steps/settings/edit_identity.inc
+++ b/program/steps/settings/edit_identity.inc
@@ -99,6 +99,13 @@ function rcube_identity_form($attrib)
     $form['addressing']['content']['email']['class'] = 'disabled';
   }
 
+  if (IDENTITIES_LEVEL == 4) {
+    foreach($form['addressing']['content'] as $formfield => $value){
+      $form['addressing']['content'][$formfield]['disabled'] = true;
+      $form['addressing']['content'][$formfield]['class'] = 'disabled';
+    }
+  }
+
   $IDENTITY_RECORD['email'] = rcube_idn_to_utf8($IDENTITY_RECORD['email']);
 
   // Allow plugins to modify identity form content
diff --git a/program/steps/settings/func.inc b/program/steps/settings/func.inc
index 3bcca21bf..319c58db9 100644
--- a/program/steps/settings/func.inc
+++ b/program/steps/settings/func.inc
@@ -483,8 +483,8 @@ function rcmail_user_prefs($current=null)
 
     $blocks = array(
       'main'       => array('name' => Q(rcube_label('mainoptions'))),
-      'spellcheck' => array('name' => Q(rcube_label('spellcheckoptions'))),
       'sig'        => array('name' => Q(rcube_label('signatureoptions'))),
+      'spellcheck' => array('name' => Q(rcube_label('spellcheckoptions'))),
     );
 
     // show checkbox to compose messages in a new window
@@ -581,8 +581,7 @@ function rcmail_user_prefs($current=null)
 
     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 = new html_select(array('name' => '_reply_mode', 'id' => $field_id));
       $select_replymode->add(rcube_label('replyempty'), -1);
       $select_replymode->add(rcube_label('replybottomposting'), 0);
       $select_replymode->add(rcube_label('replytopposting'), 1);
@@ -631,18 +630,6 @@ function rcmail_user_prefs($current=null)
       );
     }
 
-    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));
diff --git a/program/steps/settings/save_identity.inc b/program/steps/settings/save_identity.inc
index d579ee61f..34d8be268 100644
--- a/program/steps/settings/save_identity.inc
+++ b/program/steps/settings/save_identity.inc
@@ -26,17 +26,14 @@ $a_boolean_cols = array('standard', 'html_signature');
 $updated = $default_id = false;
 
 // check input
-if (empty($_POST['_name']) || (empty($_POST['_email']) && IDENTITIES_LEVEL != 1 && IDENTITIES_LEVEL != 3))
-{
+if (IDENTITIES_LEVEL != 4 && (empty($_POST['_name']) || (empty($_POST['_email']) && IDENTITIES_LEVEL != 1 && IDENTITIES_LEVEL != 3))) {
   $OUTPUT->show_message('formincomplete', 'warning');
   rcmail_overwrite_action('edit-identity');
   return;
 }
 
-
 $save_data = array();
-foreach ($a_save_cols as $col)
-{
+foreach ($a_save_cols as $col) {
   $fname = '_'.$col;
   if (isset($_POST[$fname]))
     $save_data[$col] = get_input_value($fname, RCUBE_INPUT_POST, true);
@@ -44,16 +41,24 @@ foreach ($a_save_cols as $col)
 
 // set "off" values for checkboxes that were not checked, and therefore
 // not included in the POST body.
-foreach ($a_boolean_cols as $col)
-{
+foreach ($a_boolean_cols as $col) {
   $fname = '_' . $col;
   if (!isset($_POST[$fname]))
     $save_data[$col] = 0;
 }
 
 // unset email address if user has no rights to change it
-if (IDENTITIES_LEVEL == 1 || IDENTITIES_LEVEL == 3)
+if (IDENTITIES_LEVEL == 1 || IDENTITIES_LEVEL == 3) {
   unset($save_data['email']);
+}
+// unset all fields except signature
+else if (IDENTITIES_LEVEL == 4) {
+  foreach ($save_data as $idx => $value) {
+    if ($idx != 'signature' && $idx != 'html_signature') {
+      unset($save_data[$idx]);
+    }
+  }
+}
 
 // Validate e-mail addresses
 $email_checks = array(rcube_idn_to_ascii($save_data['email']));
@@ -72,9 +77,16 @@ foreach ($email_checks as $email) {
 }
 
 // update an existing contact
-if ($_POST['_iid'])
-{
+if ($_POST['_iid']) {
   $iid = get_input_value('_iid', RCUBE_INPUT_POST);
+
+  if (in_array(IDENTITIES_LEVEL, array(1,3,4))) {
+    // merge with old identity data, fixes #1488834
+    $identity  = $RCMAIL->user->get_identity($iid);
+    $save_data = array_merge($identity, $save_data);
+    unset($save_data['changed'], $save_data['del'], $save_data['user_id'], $save_data['identity_id']);
+  }
+
   $plugin = $RCMAIL->plugins->exec_hook('identity_update', array('id' => $iid, 'record' => $save_data));
   $save_data = $plugin['record'];
 
@@ -88,8 +100,8 @@ if ($_POST['_iid'])
   if ($updated) {
     $OUTPUT->show_message('successfullysaved', 'confirmation');
 
-    if (!empty($_POST['_standard']))
-      $default_id = get_input_value('_iid', RCUBE_INPUT_POST);
+    if (!empty($save_data['standard']))
+      $default_id = $iid;
 
     if ($_POST['_framed']) {
       // update the changed col in list
@@ -105,8 +117,7 @@ if ($_POST['_iid'])
 }
 
 // insert a new identity record
-else if (IDENTITIES_LEVEL < 2)
-{
+else if (IDENTITIES_LEVEL < 2) {
   if (IDENTITIES_LEVEL == 1) {
     $save_data['email'] = $RCMAIL->get_user_email();
   }
@@ -127,7 +138,7 @@ else if (IDENTITIES_LEVEL < 2)
 
     $_GET['_iid'] = $insert_id;
 
-    if (!empty($_POST['_standard']))
+    if (!empty($save_data['standard']))
       $default_id = $insert_id;
 
     if ($_POST['_framed']) {
diff --git a/program/steps/settings/save_prefs.inc b/program/steps/settings/save_prefs.inc
index 5daab0d24..140f173c6 100644
--- a/program/steps/settings/save_prefs.inc
+++ b/program/steps/settings/save_prefs.inc
@@ -86,7 +86,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']),
     );
diff --git a/program/steps/utils/html2text.inc b/program/steps/utils/html2text.inc
index e17665fec..c6481b197 100644
--- a/program/steps/utils/html2text.inc
+++ b/program/steps/utils/html2text.inc
@@ -24,10 +24,8 @@ $html = $HTTP_RAW_POST_DATA;
 // Replace emoticon images with its text representation
 $html = rcmail_replace_emoticons($html);
 
-$converter = new html2text($html, false, true, 0);
+$converter = new rcube_html2text($html, false, true, 0);
 
 header('Content-Type: text/plain; charset=UTF-8');
 print rtrim($converter->get_text());
 exit;
-
-
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/skins/classic/addressbook.css b/skins/classic/addressbook.css
index a398325b4..5afa4592f 100644
--- a/skins/classic/addressbook.css
+++ b/skins/classic/addressbook.css
@@ -21,7 +21,7 @@
   width: 32px;
   height: 32px;
   padding: 0;
-  margin-right: 10px;
+  margin: 0 5px;
   overflow: hidden;
   background: url(images/abook_toolbar.png) 0 0 no-repeat transparent;
   opacity: 0.99; /* this is needed to make buttons appear correctly in Chrome */
@@ -67,6 +67,14 @@
   background-position: -128px -32px;
 }
 
+#abooktoolbar a.exportAll {
+  background-position: -128px 0;
+}
+
+#abooktoolbar a.exportAllSel {
+  background-position: -128px -32px;
+}
+
 #abooktoolbar span.separator {
   width: 5px;
   background-position: -162px 0;
@@ -110,7 +118,7 @@
 
 #directorylistbox input
 {
-  margin: 0px;
+  margin: 0 0 0 20px;
   font-size: 11px;
   width: 90%;
 }
@@ -136,7 +144,8 @@
   width: 280px;
 }
 
-#directorylist
+#directorylist,
+#directorylist li ul
 {
   list-style: none;
   margin: 0;
@@ -144,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;
 }
@@ -160,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.selected a
+#directorylist li.contactsearch a
+{
+  background-position: 6px -162px;
+}
+
+#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 8115c1bfc..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;
@@ -145,6 +145,14 @@ img
   color: #999999;
 }
 
+/* fixes vertical alignment of checkboxes and labels */
+label input,
+label span
+{
+  vertical-align: middle;
+}
+
+
 /** common user interface objects */
 
 #mainscreen
@@ -614,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 *****/
 
@@ -658,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
new file mode 100644
index 000000000..6d2c63c6a
--- /dev/null
+++ b/skins/classic/embed.css
@@ -0,0 +1,39 @@
+/**
+ * Roundcube webmail "embedded" stylesheets
+ *
+ * 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
+ * by keeping credits to the original autors in the README file.
+ * See http://creativecommons.org/licenses/by-sa/3.0/ for details.
+ */
+
+.rcmail-inline-message {
+  font-family: sans-serif;
+  font-size: 14px;
+  color: #000;
+  margin-bottom: .8em;
+  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;
+}
+
+.rcmail-inline-message em {
+  font-size: 90%;
+  color: #666;
+}
+
+.rcmail-inline-buttons {
+  margin-bottom: 0;
+}
diff --git a/skins/classic/functions.js b/skins/classic/functions.js
index 1742150f3..499783b3f 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();
 },
@@ -355,7 +356,7 @@ spellmenu: function(show)
 
     for (i in rcmail.env.spell_langs) {
       li = $('<li>');
-      link = $('<a href="#">').text(rcmail.env.spell_langs[i])
+      link = $('<a href="#"></a>').text(rcmail.env.spell_langs[i])
         .addClass('active').data('lang', i)
         .click(function() {
           rcmail.spellcheck_lang_set($(this).data('lang'));
@@ -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);
@@ -491,17 +521,26 @@ 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)
+      rcmail.command('search');
+  });
 },
 
 resize_compose_body: function()
 {
-  var div = $('#compose-div .boxlistcontent'), w = div.width(), h = div.height();
-  w -= 8;  // 2 x 3px padding + 2 x 1px border
-  h -= 4;
+  var div = $('#compose-div .boxlistcontent'),
+    w = div.width() - 2, h = div.height(),
+    x = bw.ie || bw.opera ? 4 : 0;
 
-  $('#compose-body_tbl').width((w+6)+'px').height('');
-  $('#compose-body_ifr').width((w+6)+'px').height((h-54)+'px');
-  $('#compose-body').width(w+'px').height(h+'px');
+  $('#compose-body_tbl').width((w+3)+'px').height('');
+  $('#compose-body_ifr').width((w+3)+'px').height((h-54)+'px');
+  $('#compose-body').width((w-x)+'px').height(h+'px');
   $('#googie_edit_layer').height(h+'px');
 },
 
@@ -791,8 +830,8 @@ 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('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,6 +847,11 @@ function rcube_init_mail_ui()
 
     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/googiespell.css b/skins/classic/googiespell.css
index 8adadc256..b4fab5bdb 100644
--- a/skins/classic/googiespell.css
+++ b/skins/classic/googiespell.css
@@ -12,7 +12,6 @@
   padding: 0 4px;
   font-size: 9pt;
   font-family: monospace;
-  border: 1px solid #999;
 }
 
 .googie_edit_layer span {
diff --git a/skins/classic/ie6hacks.css b/skins/classic/ie6hacks.css
index ac953867a..a431ee45e 100644
--- a/skins/classic/ie6hacks.css
+++ b/skins/classic/ie6hacks.css
@@ -3,6 +3,7 @@
 #taskbar
 {
   background: url(images/taskbar.gif) top right no-repeat;
+  width: expression((parseInt(document.documentElement.clientWidth)-250)+'px');
 }
 
 img
@@ -38,11 +39,6 @@ body > #message div.confirmation,
   background-image: url(images/icons/folders.gif);
 }
 
-#attachment-list
-{
-  height: expression(Math.min(16, parseInt(document.documentElement.clientHeight))+'px');
-}
-
 #messagetoolbar a
 {
   display: block;
@@ -124,6 +120,11 @@ ul.toolbarmenu li.separator_below
   height: expression((parseInt(this.parentNode.offsetHeight)-23-parseInt(this.style.top?this.style.top:21))+'px');
 }
 
+#compose-body-div
+{
+  height: expression(parseInt(this.parentNode.offsetHeight)+'px');
+}
+
 #folder-manager
 {
   height: expression((parseInt(document.documentElement.clientHeight)-105)+'px');
@@ -176,3 +177,8 @@ body.iframe .boxtitle
 {
   zoom: 1;
 }
+
+#abookactions a
+{
+  background-image: url("images/icons/groupactions.gif");
+}
diff --git a/skins/classic/iehacks.css b/skins/classic/iehacks.css
index 2bd3ce865..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,
@@ -116,6 +116,7 @@ body.iframe div.messageheaderbox
 #mailrightcontainer,
 #compose-container,
 #compose-attachments,
+#compose-contacts,
 #mailcontframe,
 #mailboxlist-container,
 #mailrightcontent,
@@ -184,13 +185,7 @@ body.iframe div.messageheaderbox
   overflow: hidden;
 }
 
-#countcontrols
-{
-  width: 24em;
-  padding-right: 10px;
-}
-
-body.iframe 
+body.iframe
 {
   width: expression((parseInt(document.documentElement.clientWidth))+'px');
 }
@@ -207,11 +202,6 @@ div.message-part div.pre
   width: expression((parseInt(document.documentElement.clientWidth)-245)+'px');
 }
 
-#contacts-table
-{
-  width: expression(document.getElementById('addresslist').clientWidth);
-}
-
 #contacts-box,
 #prefs-box,
 #folder-box
@@ -294,8 +284,8 @@ table.records-table thead tr td
 
 .contactfieldgroup legend
 {
-	padding: 0 0 0.5em 0;
-	margin-left: -4px;
+  padding: 0 0 0.5em 0;
+  margin-left: -4px;
 }
 
 /* fix "jumping" login form in IE7 */
diff --git a/skins/classic/images/icons/groupactions.gif b/skins/classic/images/icons/groupactions.gif
index a399d106e..eba6a6caf 100644
--- a/skins/classic/images/icons/groupactions.gif
+++ b/skins/classic/images/icons/groupactions.gif
diff --git a/skins/classic/images/icons/groupactions.png b/skins/classic/images/icons/groupactions.png
index 43c34a438..f29a36a0e 100644
--- a/skins/classic/images/icons/groupactions.png
+++ b/skins/classic/images/icons/groupactions.png
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/includes/messagetoolbar.html b/skins/classic/includes/messagetoolbar.html
index eebb55708..bd14f490f 100644
--- a/skins/classic/includes/messagetoolbar.html
+++ b/skins/classic/includes/messagetoolbar.html
@@ -5,8 +5,8 @@
 <roundcube:button command="list" type="link" class="button back" classAct="button back" classSel="button backSel" title="backtolist" content=" " />
 <roundcube:else />
 <roundcube:button command="checkmail" type="link" class="button checkmail" classAct="button checkmail" classSel="button checkmailSel" title="checkmail" content=" " />
-<roundcube:button command="compose" type="link" class="button compose" classAct="button compose" classSel="button composeSel" title="writenewmessage" content=" " />
 <roundcube:endif />
+<roundcube:button command="compose" type="link" class="button compose" classAct="button compose" classSel="button composeSel" title="writenewmessage" content=" " />
 <roundcube:button command="reply" type="link" class="buttonPas reply" classAct="button reply" classSel="button replySel" title="replytomessage" content=" " />
 <span class="dropbutton">
 <roundcube:button command="reply-all" type="link" class="buttonPas replyAll" classAct="button replyAll" classSel="button replyAllSel" title="replytoallmessage" content=" " />
@@ -27,7 +27,7 @@
 
 <div id="forwardmenu" class="popupmenu">
     <ul>
-        <li><roundcube:button command="forward" label="forwardinline" prop="sub" classAct="forwardlink active" class="forwardlink" /></li>
+        <li><roundcube:button command="forward-inline" label="forwardinline" prop="sub" classAct="forwardlink active" class="forwardlink" /></li>
         <li><roundcube:button command="forward-attachment" label="forwardattachment" prop="sub" classAct="forwardattachmentlink active" class="forwardattachmentlink" /></li>
         <roundcube:container name="forwardmenu" id="forwardmenu" />
     </ul>
diff --git a/skins/classic/mail.css b/skins/classic/mail.css
index 85c53d569..7c350ca3d 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;
 }
@@ -255,7 +259,7 @@
   top: 0;
   left: 0;
   bottom: 0;
-  width: 195px;
+  width: 160px;
 }
 
 #mailrightcontainer
@@ -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;
@@ -1070,6 +1048,17 @@ table.headers-table
   background-color: #F4F4F4;
 }
 
+#messagebody table.headers-table
+{
+  margin: 16px 6px 6px 6px;
+}
+
+div.message-partheaders + div.message-part
+{
+  border-top: 0;
+  padding-top: 4px;
+}
+
 table.headers-table tr td
 {
   font-size: 11px;
@@ -1150,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;
@@ -1313,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
@@ -1381,7 +1387,7 @@ div.hide-headers
 {
   position: absolute;
   top: 0;
-  left: 185px;
+  left: 205px;
   right: 0;
   bottom: 0;
   margin: 0;
@@ -1391,16 +1397,20 @@ div.hide-headers
 {
   position: absolute;
   top: 85px;
+  right: 0;
+  left: 0;
   bottom: 0;
   margin: 0;
-  width: 100%;
 }
 
-#compose-div .boxfooter
+#compose-body-div
 {
-  height: 22px;
-  background: none;
-  border-top: 0;
+  position: absolute;
+  top: 0;
+  left: 0;
+  bottom: 0;
+  right: 175px;
+  border: 1px solid #999;
 }
 
 #compose-div .boxlistcontent
@@ -1418,15 +1428,12 @@ div.hide-headers
   margin: 0;
   font-size: 9pt;
   font-family: monospace;
-  border: 1px solid #999;
   resize: none;
+  border: none;
+  outline: none;
 }
 
-#compose-body_tbl
-{
-  border: 1px solid #999;
-}
-
+#compose-body_tbl,
 #compose-body_tbl td
 {
   border: none;
@@ -1493,9 +1500,10 @@ input.from_address
 #compose-editorfooter
 {
   position: absolute;
-  right: 0;
+  right: 5px;
   bottom: 0;
   text-align: right;
+  line-height: 20px;
 }
 
 #compose-editorfooter label
@@ -1508,9 +1516,20 @@ input.from_address
 #compose-buttons
 {
   position: absolute;
+  left: 5px;
+  bottom: 1px;
+  width: auto;
+}
+
+#compose-contacts
+{
+  position: absolute;
+  top: 0;
   left: 0;
   bottom: 0;
-  width: auto;
+  width: 195px;
+  border: 1px solid #999;
+  background-color: #F9F9F9;
 }
 
 #compose-attachments
@@ -1518,8 +1537,8 @@ input.from_address
   position: absolute;
   top: 0;
   left: 0;
+  right: 0;
   bottom: 0;
-  width: 175px;
   border: 1px solid #999;
   background-color: #F9F9F9;
 }
@@ -1611,3 +1630,112 @@ input.from_address
   right: 6px;
   z-index: 101;
 }
+
+/* addressbook in compose - copy from addressbook.css */
+
+#directorylist
+{
+  list-style: none;
+  margin: 0;
+  padding: 0;
+  background-color: #FFFFFF;
+}
+
+#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;
+}
+
+#directorylist li a
+{
+  cursor: default;
+  display: block;
+  padding-left: 25px;
+  padding-top: 2px;
+  padding-bottom: 2px;
+  text-decoration: none;
+  white-space: nowrap;
+  height: 15px;
+}
+
+#directorylist li.selected
+{
+  background-color: #929292;
+  border-bottom: 1px solid #898989;
+}
+
+#directorylist li.selected a
+{
+  color: #FFF;
+  font-weight: bold;
+}
+
+#contacts-table
+{
+  width: 100%;
+  table-layout: fixed;
+}
+
+#contacts-table tbody td
+{
+  cursor: default;
+  text-overflow: ellipsis;
+  -o-text-overflow: ellipsis;
+}
+
+#abookcountbar
+{
+  margin-top: 4px;
+  margin-left: 4px;
+  position: absolute;
+  margin-right: 5px;
+  right: 0;
+}
+
+#abookactions
+{
+  position: absolute;
+  text-underline: none;
+}
+
+#abookactions a
+{
+  font-weight: bold;
+  line-height: 22px;
+  height: 22px;
+  width: auto;
+  margin: 0;
+  padding-left: 5px;
+  padding-right: 5px;
+  text-shadow: 1px 1px white;
+  background: url("images/icons/groupactions.png") no-repeat right -70px;
+}
+
+#abookactions a.disabled
+{
+  color: #999;
+}
+
+#compose-contacts #quicksearchbar
+{
+  top: 2px;
+  left: 7px;
+}
+
+#compose-contacts #directorylist
+{
+  width: 100%;
+  top: 23px;
+  position: absolute;
+  border-top: 1px solid #eee;
+}
+
+#compose-contacts #contacts-table
+{
+  top: 45px;
+  position: absolute;
+}
diff --git a/skins/classic/splitter.js b/skins/classic/splitter.js
index 3f1c97302..72ada5719 100644
--- a/skins/classic/splitter.js
+++ b/skins/classic/splitter.js
@@ -28,13 +28,13 @@ function rcube_splitter(attrib)
 
     if (this.horizontal) {
       var top = this.p1pos.top + this.p1.offsetHeight;
-      this.layer = new rcube_layer(this.id, {x: 0, y: top, height: 10, 
-    	    width: '100%', vis: 1, parent: this.p1.parentNode});
+      this.layer = new rcube_layer(this.id, {x: 0, y: top, height: 10,
+        width: '100%', vis: 1, parent: this.p1.parentNode});
     }
     else {
       var left = this.p1pos.left + this.p1.offsetWidth;
-      this.layer = new rcube_layer(this.id, {x: left, y: 0, width: 10, 
-    	    height: '100%', vis: 1,  parent: this.p1.parentNode});
+      this.layer = new rcube_layer(this.id, {x: left, y: 0, width: 10,
+        height: '100%', vis: 1,  parent: this.p1.parentNode});
     }
 
     this.elm = this.layer.elm;
@@ -147,6 +147,7 @@ function rcube_splitter(attrib)
 
     this.p1pos = this.relative ? $(this.p1).position() : $(this.p1).offset();
     this.p2pos = this.relative ? $(this.p2).position() : $(this.p2).offset();
+
     return false;
   };
 
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 d77bb38d9..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\\');') : ''" />
@@ -27,7 +28,10 @@
 <roundcube:button command="delete" type="link" class="buttonPas delete" classAct="button delete" classSel="button deleteSel" title="deletecontact" content=" " />
 <span class="separator">&nbsp;</span>
 <roundcube:button command="import" type="link" class="buttonPas import" classAct="button import" classSel="button importSel" title="importcontacts" content=" " />
+<span class="dropbutton">
 <roundcube:button command="export" type="link" class="buttonPas export" classAct="button export" classSel="button exportSel" title="exportvcards" content=" " />
+<span id="exportmenulink" onclick="rcmail_ui.show_popup('exportmenu');return false"></span>
+</span>
 <roundcube:button command="advanced-search" type="link" class="buttonPas search" classAct="button search" classSel="button searchSel" title="advsearch" content=" " />
 <roundcube:container name="toolbar" id="abooktoolbar" />
 </div>
@@ -38,13 +42,20 @@
 <roundcube:button command="reset-search" id="searchreset" image="/images/icons/reset.gif" title="resetsearch" width="13" height="13" />
 </div>
 
+<div id="exportmenu" class="popupmenu">
+    <ul>
+        <li><roundcube:button command="export" label="exportall" prop="sub" classAct="exportalllink active" class="exportalllink" /></li>
+        <li><roundcube:button command="export-selected" label="exportsel" prop="sub" classAct="exportsellink active" class="exportsellink" /></li>
+    </ul>
+</div>
+
 <div id="searchmenu" class="popupmenu">
   <ul class="toolbarmenu">
-    <li><input type="checkbox" name="s_mods[]" value="name" id="s_mod_name" onclick="rcmail_ui.set_searchmod(this)" /><label for="s_mod_name"><roundcube:label name="name" /></label></li>
-    <li><input type="checkbox" name="s_mods[]" value="firstname" id="s_mod_firstname" onclick="rcmail_ui.set_searchmod(this)" /><label for="s_mod_firstname"><roundcube:label name="firstname" /></label></li>
-    <li><input type="checkbox" name="s_mods[]" value="surname" id="s_mod_surname" onclick="rcmail_ui.set_searchmod(this)" /><label for="s_mod_surname"><roundcube:label name="surname" /></label></li>
-    <li><input type="checkbox" name="s_mods[]" value="email" id="s_mod_email" onclick="rcmail_ui.set_searchmod(this)" /><label for="s_mod_email"><roundcube:label name="email" /></label></li>
-    <li><input type="checkbox" name="s_mods[]" value="*" id="s_mod_all" onclick="rcmail_ui.set_searchmod(this)" /><label for="s_mod_all"><roundcube:label name="allfields" /></label></li>
+    <li><label><input type="checkbox" name="s_mods[]" value="name" id="s_mod_name" onclick="rcmail_ui.set_searchmod(this)" /> <span><roundcube:label name="name" /></span></label></li>
+    <li><label><input type="checkbox" name="s_mods[]" value="firstname" id="s_mod_firstname" onclick="rcmail_ui.set_searchmod(this)" /> <span><roundcube:label name="firstname" /></span></label></li>
+    <li><label><input type="checkbox" name="s_mods[]" value="surname" id="s_mod_surname" onclick="rcmail_ui.set_searchmod(this)" /> <span><roundcube:label name="surname" /></span></label></li>
+    <li><label><input type="checkbox" name="s_mods[]" value="email" id="s_mod_email" onclick="rcmail_ui.set_searchmod(this)" /> <span><roundcube:label name="email" /></span></label></li>
+    <li><label><input type="checkbox" name="s_mods[]" value="*" id="s_mod_all" onclick="rcmail_ui.set_searchmod(this)" /> <span><roundcube:label name="allfields" /></span></label></li>
   </ul>
 </div>
 
@@ -53,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 f764d6bb8..5b0b47924 100644
--- a/skins/classic/templates/compose.html
+++ b/skins/classic/templates/compose.html
@@ -9,9 +9,9 @@
 <script type="text/javascript" src="/functions.js"></script>
 <script type="text/javascript" src="/splitter.js"></script>
 <style type="text/css">
-#compose-attachments { width: <roundcube:exp expression="!empty(cookie:composesplitterv) ? cookie:composesplitterv-5 : 175" />px; }
-#compose-container { left: <roundcube:exp expression="!empty(cookie:composesplitterv) ? cookie:composesplitterv+5 : 185" />px;
-<roundcube:exp expression="browser:ie ? ('width: expression((parseInt(this.parentNode.offsetWidth)-'.(!empty(cookie:composesplitterv) ? cookie:composesplitterv+5 : 180).')+\\'px\\');') : ''" />
+#compose-contacts { width: <roundcube:exp expression="!empty(cookie:composesplitterv1) ? cookie:composesplitterv1-5 : 195" />px; }
+#compose-container { left: <roundcube:exp expression="!empty(cookie:composesplitterv1) ? cookie:composesplitterv1+5 : 205" />px;
+<roundcube:exp expression="browser:ie ? ('width: expression((parseInt(this.parentNode.offsetWidth)-'.(!empty(cookie:composesplitterv1) ? cookie:composesplitterv1+5 : 200).')+\\'px\\');') : ''" />
 }
 </style>
 </head>
@@ -24,8 +24,6 @@
 <roundcube:include file="/includes/header.html" />
 <roundcube:endif />
 
-<form name="form" action="./" method="post">
-
 <div id="messagetoolbar">
 <roundcube:if condition="env:extwin" />
     <roundcube:button command="close" type="link" class="button back" classAct="button back" classSel="button backSel" title="close" content=" " />
@@ -33,35 +31,53 @@
     <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>
 
+<form name="form" action="./" method="post">
+
 <div id="mainscreen">
 
-<div id="compose-attachments">
-<div class="boxtitle"><roundcube:label name="attachments" /></div>
+<div id="compose-contacts">
+<div class="boxtitle"><roundcube:label name="contacts" /></div>
 <div class="boxlistcontent">
-    <roundcube:object name="composeAttachmentList" id="attachmentslist" loadingIcon="/images/display/loading_blue.gif" />
+    <div id="quicksearchbar">
+        <img id="searchmenulink" src="/images/icons/glass.png" width="16" height="16" />
+        <roundcube:object name="searchform" id="quicksearchbox" form="true" tabindex="13" />
+        <roundcube:button command="reset-search" id="searchreset" image="/images/icons/reset.gif" title="resetsearch" width="13" height="13" />
+    </div>
+    <roundcube:object name="addressbooks" id="directorylist" />
+    <roundcube:object name="addresslist" id="contacts-table" class="records-table" cellspacing="0" noheader="true" />
 </div>
 <div class="boxfooter">
-  <roundcube:button name="uploadmenulink" id="uploadmenulink" type="link" title="addattachment" class="button addgroup" onclick="rcmail_ui.show_popup('uploadmenu', true);return false" content=" " />
+    <div id="abookactions" class="pagenav">
+        <roundcube:button command="add-recipient" prop="to" type="link" title="to" class="button disabled" classAct="button" content="To &amp;raquo;" />
+        <roundcube:button command="add-recipient" prop="cc" type="link" title="cc" class="button disabled" classAct="button" content="Cc &amp;raquo;" />
+        <roundcube:button command="add-recipient" prop="bcc" type="link" title="bcc" class="button disabled" classAct="button" content="Bcc &amp;raquo;" />
+    </div>
+    <div id="abookcountbar" class="pagenav">
+        <roundcube:button command="firstpage" type="link" class="buttonPas firstpage" classAct="button firstpage" classSel="button firstpageSel" title="firstpage" content=" " />
+        <roundcube:button command="previouspage" type="link" class="buttonPas prevpage" classAct="button prevpage" classSel="button prevpageSel" title="previouspage" content=" " />
+        <span style="float:left">&nbsp;</span>
+        <roundcube:button command="nextpage" type="link" class="buttonPas nextpage" classAct="button nextpage" classSel="button nextpageSel" title="nextpage" content=" " />
+        <roundcube:button command="lastpage" type="link" class="buttonPas lastpage" classAct="button lastpage" classSel="button lastpageSel" title="lastpage" content=" " />
+    </div>
 </div>
 </div>
-<roundcube:object name="fileDropArea" id="compose-attachments" />
 
 <script type="text/javascript">
-  var composesplitv = new rcube_splitter({id:'composesplitterv', p1: 'compose-attachments', p2: 'compose-container', orientation: 'v', relative: true, start: 175});
-  rcmail.add_onload('composesplitv.init()');
+  var composesplitv1 = new rcube_splitter({id:'composesplitterv1', p1: 'compose-contacts', p2: 'compose-container', orientation: 'v', relative: true, start: 200});
+  rcmail.add_onload('composesplitv1.init()');
 </script>
 
 <div id="compose-container">
@@ -119,23 +135,39 @@
         </table>
     </div>
     <div id="compose-div">
-        <div class="boxlistcontent" style="overflow: hidden; top: 0">
-            <roundcube:object name="composeBody" id="compose-body" form="form" cols="70" rows="20" tabindex="9" />
+        <div id="compose-body-div">
+            <div class="boxlistcontent" style="overflow: hidden; top: 0">
+                <roundcube:object name="composeBody" id="compose-body" form="form" cols="70" rows="20" tabindex="9" />
+            </div>
+            <div class="boxfooter">
+                <div id="compose-buttons">
+                    <roundcube:button type="input" command="send" class="button mainaction" label="sendmessage" tabindex="10" />
+                    <roundcube:button type="input" command="list" class="button" label="cancel" tabindex="11" />
+                </div>
+                <div id="compose-editorfooter" class="pagenav">
+                    <roundcube:if condition="!in_array('htmleditor', (array)config:dont_override)" />
+                    <span>
+                        <label><roundcube:label name="editortype" /></label>
+                        <roundcube:object name="editorSelector" editorid="compose-body" tabindex="12" />
+                    </span>
+                    <roundcube:endif />
+                </div>
+            </div>
         </div>
-        <div class="boxfooter">
-            <div id="compose-buttons">
-                <roundcube:button type="input" command="send" class="button mainaction" label="sendmessage" tabindex="10" />
-                <roundcube:button type="input" command="list" class="button" label="cancel" tabindex="11" />
+<script type="text/javascript">
+  var composesplitv2 = new rcube_splitter({id:'composesplitterv2', p1: 'compose-body-div', p2: 'compose-attachments', orientation: 'v', relative: true, start: $('#compose-headers-div').width() - 175});
+  rcmail.add_onload('composesplitv2.init()');
+</script>
+        <div id="compose-attachments">
+            <div class="boxtitle"><roundcube:label name="attachments" /></div>
+            <div class="boxlistcontent">
+                <roundcube:object name="composeAttachmentList" id="attachmentslist" loadingIcon="/images/display/loading_blue.gif" />
             </div>
-            <div id="compose-editorfooter">
-                <roundcube:if condition="!in_array('htmleditor', (array)config:dont_override)" />
-                <span>
-                    <label><roundcube:label name="editortype" /></label>
-                    <roundcube:object name="editorSelector" editorid="compose-body" tabindex="12" />
-                </span>
-                <roundcube:endif />
+            <div class="boxfooter">
+                <roundcube:button name="uploadmenulink" id="uploadmenulink" type="link" title="addattachment" class="button addgroup" onclick="rcmail_ui.show_popup('uploadmenu', true);return false" content=" " />
             </div>
         </div>
+        <roundcube:object name="fileDropArea" id="compose-attachments" />
     </div>
 </div>
 
diff --git a/skins/classic/templates/mail.html b/skins/classic/templates/mail.html
index 96fe72ecd..c7010e87c 100644
--- a/skins/classic/templates/mail.html
+++ b/skins/classic/templates/mail.html
@@ -12,9 +12,9 @@
 <roundcube:exp expression="browser:ie ? ('height: expression((parseInt(this.parentNode.offsetHeight)-'.(!empty(cookie:mailviewsplitter) ? cookie:mailviewsplitter+25 : 245).')+\\'px\\');') : ''" />
 }
 <roundcube:endif />
-#mailleftcontainer { width: <roundcube:exp expression="!empty(cookie:mailviewsplitterv) ? cookie:mailviewsplitterv-5 : 175" />px; }
-#mailrightcontainer { left: <roundcube:exp expression="!empty(cookie:mailviewsplitterv) ? cookie:mailviewsplitterv+5 : 185" />px;
-<roundcube:exp expression="browser:ie ? ('width: expression((parseInt(this.parentNode.offsetWidth)-'.(!empty(cookie:mailviewsplitterv) ? cookie:mailviewsplitterv+5 : 180).')+\\'px\\');') : ''" />
+#mailleftcontainer { width: <roundcube:exp expression="!empty(cookie:mailviewsplitterv) ? cookie:mailviewsplitterv-5 : 160" />px; }
+#mailrightcontainer { left: <roundcube:exp expression="!empty(cookie:mailviewsplitterv) ? cookie:mailviewsplitterv+5 : 170" />px;
+<roundcube:exp expression="browser:ie ? ('width: expression((parseInt(this.parentNode.offsetWidth)-'.(!empty(cookie:mailviewsplitterv) ? cookie:mailviewsplitterv+5 : 165).')+\\'px\\');') : ''" />
 }
 </style>
 </head>
@@ -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=" " />
@@ -76,7 +76,7 @@
         <roundcube:button command="collapse-all" type="link" title="collapse-all" class="buttonPas collapse-all" classAct="button collapse-all" classSel="button collapse-allsel" content=" " />
     <roundcube:endif />
     <roundcube:if condition="!in_array('preview_pane', (array)config:dont_override)" />
-        <span style="margin-left: 12px"><label for="prevpaneswitch"><roundcube:label name="previewpane" />:</label>
+        <span style="margin-left: 12px"><label for="prevpaneswitch"><span><roundcube:label name="previewpane" />:</span></label>
             <input type="checkbox" id="prevpaneswitch" onclick="rcmail_ui.switch_preview_pane(this)"<roundcube:exp expression="config:preview_pane == true ? ' checked=checked' : ''" /> />
         </span>
     <roundcube:endif />
@@ -110,12 +110,13 @@
 
 <div id="searchmenu" class="popupmenu">
   <ul class="toolbarmenu">
-    <li><input type="checkbox" name="s_mods[]" value="subject" id="s_mod_subject" onclick="rcmail_ui.set_searchmod(this)" /><label for="s_mod_subject"><roundcube:label name="subject" /></label></li>
-    <li><input type="checkbox" name="s_mods[]" value="from" id="s_mod_from" onclick="rcmail_ui.set_searchmod(this)" /><label for="s_mod_from"><roundcube:label name="from" /></label></li>
-    <li><input type="checkbox" name="s_mods[]" value="to" id="s_mod_to" onclick="rcmail_ui.set_searchmod(this)" /><label for="s_mod_to"><roundcube:label name="to" /></label></li>
-    <li><input type="checkbox" name="s_mods[]" value="cc" id="s_mod_cc" onclick="rcmail_ui.set_searchmod(this)" /><label for="s_mod_cc"><roundcube:label name="cc" /></label></li>
-    <li><input type="checkbox" name="s_mods[]" value="bcc" id="s_mod_bcc" onclick="rcmail_ui.set_searchmod(this)" /><label for="s_mod_bcc"><roundcube:label name="bcc" /></label></li>
-    <li><input type="checkbox" name="s_mods[]" value="text" id="s_mod_text" onclick="rcmail_ui.set_searchmod(this)" /><label for="s_mod_text"><roundcube:label name="msgtext" /></label></li>
+    <li><label><input type="checkbox" name="s_mods[]" value="subject" id="s_mod_subject" onclick="rcmail_ui.set_searchmod(this)" /> <span><roundcube:label name="subject" /></span></label></li>
+    <li><label><input type="checkbox" name="s_mods[]" value="from" id="s_mod_from" onclick="rcmail_ui.set_searchmod(this)" /> <span><roundcube:label name="from" /></span></label></li>
+    <li><label><input type="checkbox" name="s_mods[]" value="to" id="s_mod_to" onclick="rcmail_ui.set_searchmod(this)" /> <span><roundcube:label name="to" /></span></label></li>
+    <li><label><input type="checkbox" name="s_mods[]" value="cc" id="s_mod_cc" onclick="rcmail_ui.set_searchmod(this)" /> <span><roundcube:label name="cc" /></span></label></li>
+    <li><label><input type="checkbox" name="s_mods[]" value="bcc" id="s_mod_bcc" onclick="rcmail_ui.set_searchmod(this)" /> <span><roundcube:label name="bcc" /></span></label></li>
+    <li><label><input type="checkbox" name="s_mods[]" value="body" id="s_mod_body" onclick="rcmail_ui.set_searchmod(this)" /> <span><roundcube:label name="body" /></span></label></li>
+    <li><label><input type="checkbox" name="s_mods[]" value="text" id="s_mod_text" onclick="rcmail_ui.set_searchmod(this)" /> <span><roundcube:label name="msgtext" /></span></label></li>
   </ul>
 </div>
 
@@ -149,52 +150,52 @@
 <roundcube:if condition="env:threads" />
 <fieldset class="thinbordered"><legend><roundcube:label name="listmode" /></legend>
   <ul class="toolbarmenu">
-    <li><input type="radio" name="view" value="list" id="view_default" /><label for="view_default"><roundcube:label name="list" /></label></li>
-    <li><input type="radio" name="view" value="thread" id="view_thread" /><label for="view_thread"><roundcube:label name="threads" /></label></li>
+    <li><label><input type="radio" name="view" value="list" id="view_default" /> <span><roundcube:label name="list" /></span></label></li>
+    <li><label><input type="radio" name="view" value="thread" id="view_thread" /> <span><roundcube:label name="threads" /></span></label></li>
   </ul>
 </fieldset>
 <roundcube:endif />
 <roundcube:if condition="!in_array('list_cols', (array)config:dont_override)" />
 <fieldset class="thinbordered"><legend><roundcube:label name="listcolumns" /></legend>
   <ul class="toolbarmenu">
-    <li><input type="checkbox" name="list_col[]" value="threads" id="cols_threads" checked="checked" disabled="disabled" /><label for="cols_threads" class="disabled"><roundcube:label name="threads" /></label></li>
-    <li><input type="checkbox" name="list_col[]" value="subject" id="cols_subject" checked="checked" disabled="disabled" /><label for="cols_subject" class="disabled"><roundcube:label name="subject" /></label></li>
-    <li><input type="checkbox" name="list_col[]" value="fromto" id="cols_fromto" /><label for="cols_fromto"><roundcube:label name="fromto" /></label></li>
-    <li><input type="checkbox" name="list_col[]" value="from" id="cols_from" /><label for="cols_from"><roundcube:label name="from" /></label></li>
-    <li><input type="checkbox" name="list_col[]" value="to" id="cols_to" /><label for="cols_to"><roundcube:label name="to" /></label></li>
-    <li><input type="checkbox" name="list_col[]" value="replyto" id="cols_replyto" /><label for="cols_replyto"><roundcube:label name="replyto" /></label></li>
-    <li><input type="checkbox" name="list_col[]" value="cc" id="cols_cc" /><label for="cols_cc"><roundcube:label name="cc" /></label></li>
-    <li><input type="checkbox" name="list_col[]" value="date" id="cols_date" /><label for="cols_date"><roundcube:label name="date" /></label></li>
-    <li><input type="checkbox" name="list_col[]" value="size" id="cols_size" /><label for="cols_size"><roundcube:label name="size" /></label></li>
-    <li><input type="checkbox" name="list_col[]" value="status" id="cols_status" /><label for="cols_status"><roundcube:label name="readstatus" /></label></li>
-    <li><input type="checkbox" name="list_col[]" value="attachment" id="cols_attachment" /><label for="cols_attachment"><roundcube:label name="attachment" /></label></li>
-    <li><input type="checkbox" name="list_col[]" value="flag" id="cols_flag" /><label for="cols_flag"><roundcube:label name="flag" /></label></li>
-    <li><input type="checkbox" name="list_col[]" value="priority" id="cols_priority" /><label for="cols_priority"><roundcube:label name="priority" /></label></li>
+    <li><label><input type="checkbox" name="list_col[]" value="threads" id="cols_threads" checked="checked" disabled="disabled" /> <span class="disabled"><roundcube:label name="threads" /></span></label></li>
+    <li><label><input type="checkbox" name="list_col[]" value="subject" id="cols_subject" checked="checked" disabled="disabled" /> <span class="disabled"><roundcube:label name="subject" /></span></label></li>
+    <li><label><input type="checkbox" name="list_col[]" value="fromto" id="cols_fromto" /> <span><roundcube:label name="fromto" /></span></label></li>
+    <li><label><input type="checkbox" name="list_col[]" value="from" id="cols_from" /> <span><roundcube:label name="from" /></span></label></li>
+    <li><label><input type="checkbox" name="list_col[]" value="to" id="cols_to" /> <span><roundcube:label name="to" /></span></label></li>
+    <li><label><input type="checkbox" name="list_col[]" value="replyto" id="cols_replyto" /> <span><roundcube:label name="replyto" /></span></label></li>
+    <li><label><input type="checkbox" name="list_col[]" value="cc" id="cols_cc" /> <span><roundcube:label name="cc" /></span></label></li>
+    <li><label><input type="checkbox" name="list_col[]" value="date" id="cols_date" /> <span><roundcube:label name="date" /></span></label></li>
+    <li><label><input type="checkbox" name="list_col[]" value="size" id="cols_size" /> <span><roundcube:label name="size" /></span></label></li>
+    <li><label><input type="checkbox" name="list_col[]" value="status" id="cols_status" /> <span><roundcube:label name="readstatus" /></span></label></li>
+    <li><label><input type="checkbox" name="list_col[]" value="attachment" id="cols_attachment" /> <span><roundcube:label name="attachment" /></span></label></li>
+    <li><label><input type="checkbox" name="list_col[]" value="flag" id="cols_flag" /> <span><roundcube:label name="flag" /></span></label></li>
+    <li><label><input type="checkbox" name="list_col[]" value="priority" id="cols_priority" /> <span><roundcube:label name="priority" /></span></label></li>
   </ul>
 </fieldset>
 <roundcube:endif />
 <roundcube:if condition="!in_array('message_sort_col', (array)config:dont_override)" />
 <fieldset class="thinbordered"><legend><roundcube:label name="listsorting" /></legend>
   <ul class="toolbarmenu">
-    <li><input type="radio" name="sort_col" value="" id="sort_default" /><label for="sort_default"><roundcube:label name="nonesort" /></label></li>
-    <li><input type="radio" name="sort_col" value="arrival" id="sort_arrival" /><label for="sort_arrival"><roundcube:label name="arrival" /></label></li>
-    <li><input type="radio" name="sort_col" value="date" id="sort_date" /><label for="sort_date"><roundcube:label name="sentdate" /></label></li>
-    <li><input type="radio" name="sort_col" value="subject" id="sort_subject" /><label for="sort_subject"><roundcube:label name="subject" /></label></li>
-    <li><input type="radio" name="sort_col" value="fromto" id="sort_fromto" /><label for="sort_fromto"><roundcube:label name="fromto" /></label></li>
-    <li><input type="radio" name="sort_col" value="from" id="sort_from" /><label for="sort_from"><roundcube:label name="from" /></label></li>
-    <li><input type="radio" name="sort_col" value="to" id="sort_to" /><label for="sort_to"><roundcube:label name="to" /></label></li>
-    <li><input type="radio" name="sort_col" value="to" id="sort_replyto" /><label for="sort_replyto"><roundcube:label name="replyto" /></label></li>
-    <li><input type="radio" name="sort_col" value="cc" id="sort_cc" /><label for="sort_cc"><roundcube:label name="cc" /></label></li>
-    <li><input type="radio" name="sort_col" value="size" id="sort_size" /><label for="sort_size"><roundcube:label name="size" /></label></li>
+    <li><label><input type="radio" name="sort_col" value="" id="sort_default" /> <span><roundcube:label name="nonesort" /></span></label></li>
+    <li><label><input type="radio" name="sort_col" value="arrival" id="sort_arrival" /> <span><roundcube:label name="arrival" /></span></label></li>
+    <li><label><input type="radio" name="sort_col" value="date" id="sort_date" /> <span><roundcube:label name="sentdate" /></span></label></li>
+    <li><label><input type="radio" name="sort_col" value="subject" id="sort_subject" /> <span><roundcube:label name="subject" /></span></label></li>
+    <li><label><input type="radio" name="sort_col" value="fromto" id="sort_fromto" /> <span><roundcube:label name="fromto" /></span></label></li>
+    <li><label><input type="radio" name="sort_col" value="from" id="sort_from" /> <span><roundcube:label name="from" /></span></label></li>
+    <li><label><input type="radio" name="sort_col" value="to" id="sort_to" /> <span><roundcube:label name="to" /></span></label></li>
+    <li><label><input type="radio" name="sort_col" value="to" id="sort_replyto" /> <span><roundcube:label name="replyto" /></span></label></li>
+    <li><label><input type="radio" name="sort_col" value="cc" id="sort_cc" /> <span><roundcube:label name="cc" /></span></label></li>
+    <li><label><input type="radio" name="sort_col" value="size" id="sort_size" /> <span><roundcube:label name="size" /></span></label></li>
   </ul>
 </fieldset>
 <roundcube:endif />
 <roundcube:if condition="!in_array('message_sort_order', (array)config:dont_override)" />
 <fieldset><legend><roundcube:label name="listorder" /></legend> 
-	  <ul class="toolbarmenu"> 
-	    <li><input type="radio" name="sort_ord" value="ASC" id="sort_asc" /><label for="sort_asc"><roundcube:label name="asc" /></label></li> 
-	    <li><input type="radio" name="sort_ord" value="DESC" id="sort_desc" /><label for="sort_desc"><roundcube:label name="desc" /></label></li> 
-	  </ul> 
+  <ul class="toolbarmenu"> 
+    <li><label><input type="radio" name="sort_ord" value="ASC" id="sort_asc" /> <span><roundcube:label name="asc" /></span></label></li>
+    <li><label><input type="radio" name="sort_ord" value="DESC" id="sort_desc" /> <span><roundcube:label name="desc" /></span></label></li>
+  </ul>
 </fieldset>
 <roundcube:endif />
 <div>
diff --git a/skins/classic/templates/message.html b/skins/classic/templates/message.html
index fcf0b22c8..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" />
@@ -58,10 +66,20 @@
 
 </div>
 
+<roundcube:if condition="!env:extwin" />
 <script type="text/javascript">
     var mailviewsplitv = new rcube_splitter({id:'mailviewsplitterv', p1: 'mailboxlist-container', p2: 'messageframe', orientation: 'v', relative: true, start: 165});
     rcmail.add_onload('mailviewsplitv.init()');
 </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 74bc0d7d8..ff3951497 100644
--- a/skins/larry/addressbook.css
+++ b/skins/larry/addressbook.css
@@ -8,8 +8,6 @@
  * License. It is allowed to copy, distribute, transmit and to adapt the work
  * by keeping credits to the original autors in the README file.
  * See http://creativecommons.org/licenses/by-sa/3.0/ for details.
- *
- * $Id$
  */
 
 #addressview-left {
@@ -85,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;
@@ -114,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;
 }
@@ -319,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/embed.css b/skins/larry/embed.css
new file mode 100644
index 000000000..2c8ba39dc
--- /dev/null
+++ b/skins/larry/embed.css
@@ -0,0 +1,34 @@
+/**
+ * Roundcube webmail "embedded" stylesheets
+ *
+ * Copyright (c) 2012, 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
+ * by keeping credits to the original autors in the README file.
+ * See http://creativecommons.org/licenses/by-sa/3.0/ for details.
+ */
+
+.rcmail-inline-message {
+	font-family: sans-serif;
+	font-size: 11px;
+	font-weight: bold;
+	color: #996600;
+	border: 1px solid #ffdf0e;
+	background: url("images/messages.png") no-repeat scroll 5px -83px #fef893;
+	padding: 6px 12px 4px 30px;
+	margin-bottom: 0.8em;
+}
+
+.rcmail-inline-message > button {
+	margin-left: 1em;
+	vertical-align: baseline;
+}
+
+.rcmail-inline-message em {
+	font-size: 90%;
+}
+
+.rcmail-inline-buttons {
+	margin-bottom: 0;
+}
diff --git a/skins/larry/ie7hacks.css b/skins/larry/ie7hacks.css
index f07d79a65..6d7af4787 100644
--- a/skins/larry/ie7hacks.css
+++ b/skins/larry/ie7hacks.css
@@ -17,6 +17,18 @@
   height: expression((parseInt(document.documentElement.clientHeight)-150)+'px');
 }
 
+.minimal #mainscreen {
+  height: expression((parseInt(document.documentElement.clientHeight)-82)+'px');
+}
+
+.minimal #mainscreen.offset {
+  height: expression((parseInt(document.documentElement.clientHeight)-120)+'px');
+}
+
+#messagepartframe {
+	height: expression((parseInt(this.parentNode.offsetHeight)-1)+'px');
+}
+
 input.button {
 	display: inline;
 	font-size: 90%;
@@ -29,7 +41,8 @@ a.deletebutton,
 .boxfooter .listbutton .inner,
 .attachmentslist li a.delete,
 .attachmentslist li a.cancelupload,
-.previewheader .iconlink {
+.previewheader .iconlink,
+.minimal #taskbar .button-inner {
 	/* workaround for text-indent which also offsets the background image */
 	text-indent: 0;
 	font-size: 0;
@@ -125,7 +138,7 @@ ul.toolbarmenu li label {
 	padding: 3px 8px;
 }
 
-#quicksearchbar input {
+.searchbox input {
 	padding-top: 4px;
 	padding-bottom: 2px;
 }
@@ -183,3 +196,16 @@ ul.toolbarmenu li label {
 	padding: 0 1px 0 0;
 }
 
+.minimal #topline {
+	width: 100%;
+	height: 18px;
+	box-sizing: border-box;
+}
+
+
+.minimal #taskbar a:hover .tooltip {
+	right: 34px;
+	top: 1px;
+}
+
+
diff --git a/skins/larry/iehacks.css b/skins/larry/iehacks.css
index 83ea946fa..960ce7648 100644
--- a/skins/larry/iehacks.css
+++ b/skins/larry/iehacks.css
@@ -7,8 +7,6 @@
  * License. It is allowed to copy, distribute, transmit and to adapt the work
  * by keeping credits to the original autors in the README file.
  * See http://creativecommons.org/licenses/by-sa/3.0/ for details.
- *
- * $Id$
  */
 
 input.button {
@@ -31,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);
 }
 
@@ -49,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);
 }
@@ -65,6 +68,12 @@ input.button:active {
 	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#404040', endColorstr='#060606', GradientType=0);
 }
 
+#toplogo {
+	position: absolute;
+	top: 0px;
+	left: 10px;
+}
+
 .records-table tr.selected td {
 	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#019bc6', endColorstr='#017cb4', 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 7d042cb23..54bee0156 100644
--- a/skins/larry/images/buttons.png
+++ b/skins/larry/images/buttons.png
diff --git a/skins/larry/images/filetypes.png b/skins/larry/images/filetypes.png
index 0e197d55a..53b2eee9a 100644
--- a/skins/larry/images/filetypes.png
+++ b/skins/larry/images/filetypes.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 4be475bac..f2efb8e06 100644
--- a/skins/larry/includes/header.html
+++ b/skins/larry/includes/header.html
@@ -1,31 +1,33 @@
 <div id="header">
 <div id="topline">
 	<div class="topleft">
+		<roundcube:container name="topline-left" id="topline-left" />
 		<roundcube:button name="about" type="link" label="about" class="about-link" onclick="UI.show_about(this);return false" />
 		<roundcube:if condition="config:support_url" />
 		<a href="<roundcube:var name='config:support_url' />" target="_blank" class="support-link" id="supportlink"><roundcube:label name="support" /></a>
 		<roundcube:endif />
 	</div>
-
+	<roundcube:container name="topline-center" id="topline-center" />
 	<div class="topright">
-	<roundcube:if condition="!env:extwin" />
+	<roundcube:container name="topline-right" id="topline-right" />
+	<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>
-
-	<roundcube:container name="topline" id="topline" />
 </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" />
 	<roundcube:button command="addressbook" label="addressbook" class="button-addressbook" classSel="button-addressbook button-selected" innerClass="button-inner" />
 	<roundcube:container name="taskbar" id="taskbar" />
 	<roundcube:button command="settings" label="settings" class="button-settings" classSel="button-settings button-selected" innerClass="button-inner" />
+	<roundcube:button command="logout" label="logout" class="button-logout" classSel="button-logout" innerClass="button-inner" />
+	<span class="minmodetoggle"></span>
 	</div>
 	<roundcube:object name="logo" src="/images/roundcube_logo.png" id="toplogo" border="0" alt="Logo" onclick="rcmail.command('switch-task','mail');return false;" />
 </div>
diff --git a/skins/larry/includes/mailtoolbar.html b/skins/larry/includes/mailtoolbar.html
index 31472cbb3..59f2d581a 100644
--- a/skins/larry/includes/mailtoolbar.html
+++ b/skins/larry/includes/mailtoolbar.html
@@ -1,3 +1,5 @@
+<roundcube:button command="compose" type="link" class="button compose disabled" classAct="button compose" classSel="button compose pressed" label="compose" title="writenewmessage" />
+<span class="spacer"></span>
 <roundcube:button command="reply" type="link" class="button reply disabled" classAct="button reply" classSel="button reply pressed" label="reply" title="replytomessage" />
 <span class="dropbutton">
 	<roundcube:button command="reply-all" type="link" class="button reply-all disabled" classAct="button reply-all" classSel="button reply-all pressed" label="replyall" title="replytoallmessage" />
@@ -17,7 +19,7 @@
 
 <div id="forwardmenu" class="popupmenu">
 	<ul class="toolbarmenu">
-		<li><roundcube:button command="forward" label="forwardinline" prop="sub" classAct="forwardlink active" class="forwardlink" /></li>
+		<li><roundcube:button command="forward-inline" label="forwardinline" prop="sub" classAct="forwardlink active" class="forwardlink" /></li>
 		<li><roundcube:button command="forward-attachment" label="forwardattachment" prop="sub" classAct="forwardattachmentlink active" class="forwardattachmentlink" /></li>
 		<roundcube:container name="forwardmenu" id="forwardmenu" />
 	</ul>
diff --git a/skins/larry/mail.css b/skins/larry/mail.css
index 48eba6e02..b5f0822a3 100644
--- a/skins/larry/mail.css
+++ b/skins/larry/mail.css
@@ -2,14 +2,12 @@
  * 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
  * by keeping credits to the original autors in the README file.
  * See http://creativecommons.org/licenses/by-sa/3.0/ for details.
- *
- * $Id$
  */
 
 #mailview-left {
@@ -143,7 +141,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;
 }
@@ -158,7 +156,7 @@ a.iconbutton.threadmode.selected {
 	background-position: 6px 3px;
 }
 
-#mailboxlist li.mailbox.unread a {
+#mailboxlist li.mailbox.unread > a {
 	padding-right: 36px;
 }
 
@@ -226,6 +224,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;
@@ -233,50 +242,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 {
@@ -332,7 +348,7 @@ a.iconbutton.threadmode.selected {
 	position: absolute;
 	right: 256px;
 	width: auto;
-	top: 7px;
+	top: 2px;
 }
 
 #searchfilter select {
@@ -440,7 +456,7 @@ a.iconbutton.threadmode.selected {
 }
 
 #messagelist tr td.date {
-	width: 125px;
+	width: 135px;
 }
 
 #messagelist tr.message {
@@ -729,7 +745,7 @@ h2.subject {
 
 h3.subject {
 	font-size: 14px;
-	margin: 0 8em 0 0;
+	margin: 0 12em 0 0;
 	padding: 8px 8px 4px 8px;
 	white-space: nowrap;
 	overflow: hidden;
@@ -852,7 +868,7 @@ div.more-headers {
 }
 
 div.hide-headers {
-	background-position: center -1589px;
+	background-position: center -1600px;
 }
 
 #all-headers {
@@ -934,15 +950,20 @@ div.hide-headers {
 	border-radius: 4px;
 }
 
-#messageheader #countcontrols {
+#messageheader #countcontrols,
+#messageheader #formatcontrols {
 	position: absolute;
 	top: 8px;
 	right: 8px;
-	width: 20em;
 	text-align: right;
 	white-space: nowrap;
 }
 
+#messageheader #formatcontrols {
+	top: 38px;
+	right: 8px;
+}
+
 #messageheader .pagenav .countdisplay {
 	min-width: 0;
 	padding-right: 0.5em;
@@ -988,7 +1009,7 @@ div.hide-headers {
 	color: #960;
 	border: 1px solid #ffdf0e;
 	background-color: #fef893;
-	background-position: 5px -85px;
+	background-position: 5px -83px;
 	padding: 6px 12px 4px 30px;
 	white-space: normal;
 }
@@ -999,20 +1020,22 @@ div.hide-headers {
 }
 
 div.message-part,
-div.message-htmlpart {
-	padding: 0 2px 10px 2px;
-	border-top: 2px solid #f0f0f0;
+div.message-htmlpart,
+div.message-partheaders {
+	padding: 10px 2px;
+	border-top: 1px solid #ccc;
 }
 
 #messagebody div:first-child {
+	padding-top: 0;
 	border-top: 0;
 }
 
 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;
@@ -1021,7 +1044,7 @@ div.message-part div.pre {
 }
 
 div.message-part span.sig {
-	color: #666666;
+	color: #666;
 }
 
 div.message-part blockquote {
@@ -1029,7 +1052,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;
 }
 
@@ -1040,9 +1063,27 @@ 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 {
+	margin-top: 8px;
+	padding: 8px 0;
+}
+
+div.message-partheaders .headers-table {
+	width: 100%;
+}
+
+div.message-partheaders .headers-table td.header-title {
+	width: auto;
+	padding-left: 0;
+}
+
+div.message-partheaders .headers-table td.header {
+	width: 88%;
 }
 
 #messagebody > hr {
@@ -1100,13 +1141,15 @@ div.message-part blockquote blockquote blockquote {
 #messagepartcontainer {
 	position: absolute;
 	top: 60px;
-	left: 0px;
-	right: 0px;
-	bottom: 0px;
+	left: 0;
+	right: 0;
+	bottom: 0;
 }
 
 #messagepartframe {
 	border: 0;
+	width: 100%;
+	height: 100%;
 }
 
 /*** message composition ***/
@@ -1135,6 +1178,23 @@ div.message-part blockquote blockquote blockquote {
 	bottom: 0;
 }
 
+#composequicksearch {
+	position: relative;
+	padding: 4px;
+	background: #c7e3ef;
+}
+
+#composequicksearch .searchbox input {
+	width: 100%;
+	height: 26px;
+	-moz-box-sizing: border-box;
+	box-sizing: border-box;
+}
+
+#composequicksearch #searchmenulink {
+	width: 15px;
+}
+
 #compose-contacts #directorylist {
 	border-bottom: 4px solid #c7e3ef;
 }
diff --git a/skins/larry/print.css b/skins/larry/print.css
index fa256746b..6481ea9e6 100644
--- a/skins/larry/print.css
+++ b/skins/larry/print.css
@@ -7,8 +7,6 @@
  * License. It is allowed to copy, distribute, transmit and to adapt the work
  * by keeping credits to the original autors in the README file.
  * See http://creativecommons.org/licenses/by-sa/3.0/ for details.
- *
- * $Id$
  */
 body {
 	font-family: "Lucida Grande", Verdana, Arial, Helvetica, sans-serif;
diff --git a/skins/larry/styles.css b/skins/larry/styles.css
index b4a4d81e1..cfbf9ac5f 100644
--- a/skins/larry/styles.css
+++ b/skins/larry/styles.css
@@ -8,8 +8,6 @@
  * License. It is allowed to copy, distribute, transmit and to adapt the work
  * by keeping credits to the original autors in the README file.
  * See http://creativecommons.org/licenses/by-sa/3.0/ for details.
- *
- * $Id$
  */
 
 body {
@@ -71,6 +69,12 @@ textarea.placeholder {
 	font-weight: bold;
 }
 
+/* fixes vertical alignment of checkboxes and labels */
+label input,
+label span {
+	vertical-align: middle;
+}
+
 /*** buttons ***/
 
 input.button {
@@ -173,7 +177,8 @@ input.mainaction {
 
 /** link buttons **/
 
-a.button {
+a.button,
+.buttongroup {
 	display: inline-block;
 	margin: 0 2px;
 	padding: 2px 5px;
@@ -194,6 +199,11 @@ a.button {
 	text-decoration: none;
 }
 
+.buttongroup {
+	padding: 0;
+	white-space: nowrap;
+}
+
 a.button:focus,
 input.button:focus {
 	border-color: #4fadd5;
@@ -227,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 {
@@ -262,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;
@@ -269,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;
@@ -314,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;
@@ -504,15 +572,21 @@ a.iconlink.upload {
 
 /*** basic page layout ***/
 
+#header {
+	overflow-x: hidden; /* Chrome bug #1488851 */
+}
+
 #topline {
 	height: 18px;
 	background: url(images/linen_header.jpg) repeat #666;
 	border-bottom: 1px solid #4f4f4f;
 	padding: 2px 0 2px 10px;
 	color: #aaa;
+	text-align: center;
 }
 
 #topnav {
+	position: relative;
 	height: 46px;
 	margin-bottom: 10px;
 	padding: 0 0 0 10px;
@@ -569,9 +643,157 @@ a.iconlink.upload {
 	color: #fff;
 }
 
+#taskbar .button-logout {
+	display: none;
+}
+
+#taskbar a.button-logout span.button-inner {
+	background-position: -2px -1791px;
+}
+
+#taskbar a.button-logout:hover span.button-inner {
+	background-position: -2px -1829px;
+}
+
+
+/*** minimal version of the page header ***/
+
+.minimal #topline {
+	position: fixed;
+	top: -18px;
+	background: #444;
+	z-index: 5000;
+	width: 100%;
+	height: 22px;
+	-moz-box-sizing: border-box;
+	box-sizing: border-box;
+}
+
+.minimal #topline:hover {
+	top: 0px;
+	opacity: 0.94;
+	filter: alpha(opacity=94);
+	-webkit-transition: top 0.3s ease-in-out;
+	-moz-transition: top 0.3s ease-in-out;
+	-o-transition: top 0.3s ease-in-out;
+	transition: top 0.3s ease-in-out;
+}
+
+.extwin #topline,
+.extwin #topline:hover {
+	position: static;
+	top: 0px;
+	height: 18px;
+	width: auto;
+	-moz-box-sizing: content-box;
+	box-sizing: content-box;
+	opacity: 0.999;
+}
+
+.partwin #topline {
+	position: absolute;
+	right: 6px;
+	top: 18px;
+	width: auto;
+	z-index: 100;
+	background: transparent;
+	background: none;
+	border: 0;
+}
+
+.minimal #topline a.button-logout {
+	display: none;
+}
+
+.minimal #topline span.username {
+	display: inline-block;
+	padding-top: 2px;
+}
+
+.minimal #topnav {
+	position: relative;
+	top: 4px;
+	height: 42px;
+}
+
+.minimal #taskbar a {
+	position: relative;
+	padding: 10px 10px 0 6px;
+	height: 32px;
+}
+
+.minimal #taskbar .button-logout {
+	display: inline-block;
+}
+
+.minimal #taskbar .button-inner {
+	top: -4px;
+	padding: 0;
+	height: 24px !important;
+	width: 27px;
+	text-indent: -5000px;
+}
+
+#taskbar .tooltip {
+	display: none;
+}
+
+.minimal #taskbar .tooltip {
+	position: absolute;
+	top: -500px;
+	right: 2px;
+	display: inline-block;
+	padding: 2px 8px 3px 8px;
+	background: #444;
+	background: -moz-linear-gradient(top, #444 0%, #333 100%);
+	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#444), color-stop(100%,#333));
+	background: -o-linear-gradient(top, #444 0%, #333 100%);
+	background: -ms-linear-gradient(top, #444 0%, #333 100%);
+	background: linear-gradient(top, #444 0%, #333 100%);
+	color: #eee;
+	font-weight: bold;
+	white-space: nowrap;
+	border: 1px solid #777;
+	box-shadow: 0 1px 5px 0 #333;
+	-moz-box-shadow: 0 1px 5px 0 #333;
+	-webkit-box-shadow: 0 1px 5px 0 #333;
+	-o-box-shadow: 0 1px 5px 0 #333;
+	z-index: 200;
+	white-space: nowrap;
+	text-shadow: 0px 1px 1px #000;
+}
+
+.minimal #taskbar .tooltip:after {
+	content: "";
+	position: absolute;
+	top: -4px;
+	right: 15px;
+	border-style: solid;
+	border-width: 0 4px 4px;
+	border-color: #888 transparent;
+	/* reduce the damage in FF3.0 */
+	display: block; 
+	width: 0;
+	z-index: 251;
+}
+
+.ie8 .minimal #taskbar .tooltip:after {
+	top: -6px;
+}
+
+.minimal #taskbar a:hover .tooltip {
+	display: block;
+	top: 39px;
+}
+
 
 /*** taskbar ***/
 
+#taskbar {
+	position: relative;
+	padding-right: 18px;
+}
+
 #taskbar a {
 	display: inline-block;
 	height: 34px;
@@ -629,6 +851,22 @@ a.iconlink.upload {
 	background-position: 0 -168px;
 }
 
+#taskbar .minmodetoggle {
+	position: absolute;
+	top: 0;
+	right: 0;
+	display: block;
+	width: 19px;
+	height: 46px;
+	cursor: pointer;
+	background: url(images/buttons.png) -35px -1778px no-repeat;
+}
+
+.minimal #taskbar .minmodetoggle {
+	height: 42px;
+	background-position: -35px -1820px;
+}
+
 #mainscreen {
 	position: absolute;
 	top: 88px;
@@ -637,12 +875,24 @@ a.iconlink.upload {
 	bottom: 20px;
 }
 
+.minimal #mainscreen {
+	top: 62px;
+}
+
+.minimal #mainscreen.offset {
+	top: 102px;
+}
+
+.partwin #mainscreen {
+	top: 60px
+}
+
 .extwin #mainscreen {
 	top: 40px;
 }
 
 #mainscreen.offset {
-	top: 130px;
+	top: 132px;
 }
 
 #mainscreen .offset {
@@ -800,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;
@@ -816,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;
@@ -1060,6 +1340,10 @@ body.iframe {
 	margin: 38px 0 10px 0;
 }
 
+body.iframe.error {
+	background: #ededed;
+}
+
 body.iframe.floatingbuttons {
 	margin-bottom: 40px;
 }
@@ -1328,17 +1612,21 @@ ul.proplist li {
 
 /*** quicksearch **/
 
+.searchbox {
+	position: relative;
+}
+
 #quicksearchbar {
 	position: absolute;
 	right: 1px;
-	top: 0;
+	top: 2px;
 	width: 240px;
 }
 
+.searchbox input,
 #quicksearchbar input {
 	width: 176px;
 	margin: 0;
-	margin-top: 7px;
 	padding: 3px 30px 3px 34px;
 	height: 18px;
 	background: #f1f1f1;
@@ -1347,15 +1635,17 @@ ul.proplist li {
 	font-size: 11px;
 }
 
+.searchbox #searchmenulink,
 #quicksearchbar #searchmenulink {
 	position: absolute;
-	top: 12px;
+	top: 5px;
 	left: 6px;
 }
 
+.searchbox #searchreset,
 #quicksearchbar #searchreset {
 	position: absolute;
-	top: 11px;
+	top: 4px;
 	right: 1px;
 }
 
@@ -1507,6 +1797,7 @@ ul.proplist li {
 }
 
 .toolbar a.button.export {
+	min-width: 74px;
 	background-position: center -1054px;
 }
 
@@ -1522,7 +1813,6 @@ ul.proplist li {
 	background-position: 0 -1745px;
 }
 
-
 a.menuselector {
 	display: inline-block;
 	border: 1px solid #ababab;
@@ -1973,16 +2263,27 @@ ul.toolbarmenu li span.conversation {
 	background-position: 0 -390px;
 }
 
-.attachmentslist li.html {
+.attachmentslist li.sig,
+.attachmentslist li.pgp-signature,
+.attachmentslist li.pkcs7-signature {
 	background-position: 0 -442px;
 }
 
+.attachmentslist li.html {
+	background-position: 0 -468px;
+}
+
+.attachmentslist li.eml,
+.attachmentslist li.rfc822 {
+	background-position: 0 -494px;
+}
+
 .attachmentslist li a,
 #compose-attachments ul li {
 	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;
@@ -1990,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 06c6f4732..c40d44f4b 100644
--- a/skins/larry/svggradients.css
+++ b/skins/larry/svggradients.css
@@ -7,8 +7,6 @@
  * License. It is allowed to copy, distribute, transmit and to adapt the work
  * by keeping credits to the original autors in the README file.
  * See http://creativecommons.org/licenses/by-sa/3.0/ for details.
- *
- * $Id$
  */
 
 input.button {
@@ -31,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);
 }
 
@@ -49,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/about.html b/skins/larry/templates/about.html
index 2c18e8889..301c301a9 100644
--- a/skins/larry/templates/about.html
+++ b/skins/larry/templates/about.html
@@ -10,7 +10,7 @@
 <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/larry/templates/addressbook.html b/skins/larry/templates/addressbook.html
index c39c2fe87..401640f1f 100644
--- a/skins/larry/templates/addressbook.html
+++ b/skins/larry/templates/addressbook.html
@@ -13,7 +13,11 @@
 <!-- toolbar -->
 <div id="addressbooktoolbar" class="toolbar">
 	<roundcube:button command="import" type="link" class="button import disabled" classAct="button import" classSel="button import pressed" label="import" title="importcontacts" />
-	<roundcube:button command="export" type="link" class="button export disabled" classAct="button export" classSel="button export pressed" label="export" title="exportvcards" />
+	<span class="dropbutton">
+		<roundcube:button command="export" type="link" class="button export disabled" classAct="button export" classSel="button export pressed" label="export" title="exportvcards" />
+		<span class="dropbuttontip" id="exportmenulink" onclick="UI.show_popup('exportmenu');return false"></span>
+	</span>
+
 	<span class="spacer"></span>
 	<roundcube:button command="compose" type="link" class="button compose disabled" classAct="button compose" classSel="button compose pressed" label="compose" title="writenewmessage" />
 	<roundcube:button command="advanced-search" type="link" class="button search disabled" classAct="button search" classSel="button search pressed" label="advanced" title="advsearch" />
@@ -26,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;" />
@@ -38,7 +42,7 @@
 <div id="addressview-right">
 
 <!-- search box -->
-<div id="quicksearchbar">
+<div id="quicksearchbar" class="searchbox">
 <roundcube:object name="searchform" id="quicksearchbox" />
 <roundcube:button name="searchmenulink" id="searchmenulink" class="iconbutton searchoptions" onclick="UI.show_popup('searchmenu');return false" title="searchmod" content=" " />
 <roundcube:button command="reset-search" id="searchreset" class="iconbutton reset" title="resetsearch" content=" " />
@@ -75,14 +79,20 @@
 
 </div><!-- end mainscreen -->
 
+<div id="exportmenu" class="popupmenu">
+	<ul class="toolbarmenu">
+		<li><roundcube:button command="export" label="exportall" prop="sub" class="exportalllink" classAct="exportalllink active" /></li>
+		<li><roundcube:button command="export-selected" label="exportsel" prop="sub" class="exportsellink" classAct="exportsellink active" /></li>
+	</ul>
+</div>
 
 <div id="searchmenu" class="popupmenu">
 	<ul class="toolbarmenu">
-		<li><label><input type="checkbox" name="s_mods[]" value="name" id="s_mod_name" onclick="UI.set_searchmod(this)" /> <roundcube:label name="name" /></label></li>
-		<li><label><input type="checkbox" name="s_mods[]" value="firstname" id="s_mod_firstname" onclick="UI.set_searchmod(this)" /> <roundcube:label name="firstname" /></label></li>
-		<li><label><input type="checkbox" name="s_mods[]" value="surname" id="s_mod_surname" onclick="UI.set_searchmod(this)" /> <roundcube:label name="surname" /></label></li>
-		<li><label><input type="checkbox" name="s_mods[]" value="email" id="s_mod_email" onclick="UI.set_searchmod(this)" /> <roundcube:label name="email" /></label></li>
-		<li><label><input type="checkbox" name="s_mods[]" value="*" id="s_mod_all" onclick="UI.set_searchmod(this)" /> <roundcube:label name="allfields" /></label></li>
+		<li><label><input type="checkbox" name="s_mods[]" value="name" id="s_mod_name" onclick="UI.set_searchmod(this)" /> <span><roundcube:label name="name" /></span></label></li>
+		<li><label><input type="checkbox" name="s_mods[]" value="firstname" id="s_mod_firstname" onclick="UI.set_searchmod(this)" /> <span><roundcube:label name="firstname" /></span></label></li>
+		<li><label><input type="checkbox" name="s_mods[]" value="surname" id="s_mod_surname" onclick="UI.set_searchmod(this)" /> <span><roundcube:label name="surname" /></span></label></li>
+		<li><label><input type="checkbox" name="s_mods[]" value="email" id="s_mod_email" onclick="UI.set_searchmod(this)" /> <span><roundcube:label name="email" /></span></label></li>
+		<li><label><input type="checkbox" name="s_mods[]" value="*" id="s_mod_all" onclick="UI.set_searchmod(this)" /> <span><roundcube:label name="allfields" /></span></label></li>
 	</ul>
 </div>
 
diff --git a/skins/larry/templates/compose.html b/skins/larry/templates/compose.html
index de3b5bfff..9cfe7fe4c 100644
--- a/skins/larry/templates/compose.html
+++ b/skins/larry/templates/compose.html
@@ -39,6 +39,13 @@
 <!-- inline address book -->
 <div id="compose-contacts" class="uibox listbox">
 <h2 class="boxtitle"><roundcube:label name="contacts" /></h2>
+	<div id="composequicksearch">
+		<div class="searchbox">
+			<roundcube:object name="searchform" id="contactsearchbox" />
+			<a id="searchmenulink" class="iconbutton searchoptions"> </a>
+			<roundcube:button command="reset-search" id="searchreset" class="iconbutton reset" title="resetsearch" content=" " />
+		</div>
+	</div>
 	<roundcube:object name="addressbooks" id="directorylist" class="listing" />
 	<div class="scroller withfooter">
 		<roundcube:object name="addresslist" id="contacts-table" class="listing" noheader="true" />
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 8b205efbe..85cd5203b 100644
--- a/skins/larry/templates/mail.html
+++ b/skins/larry/templates/mail.html
@@ -21,8 +21,6 @@
 <!-- toolbar -->
 <div id="messagetoolbar" class="toolbar">
 	<roundcube:button command="checkmail" type="link" class="button checkmail disabled" classAct="button checkmail" classSel="button checkmail pressed" label="refresh" title="checkmail" />
-	<roundcube:button command="compose" type="link" class="button compose disabled" classAct="button compose" classSel="button compose pressed" label="compose" title="writenewmessage" />
-	<span class="spacer"></span>
 	<roundcube:include file="/includes/mailtoolbar.html" />
 </div>
 
@@ -32,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;" />
@@ -54,7 +52,7 @@
 </div>
 
 <!-- search box -->
-<div id="quicksearchbar">
+<div id="quicksearchbar" class="searchbox">
 <roundcube:object name="searchform" id="quicksearchbox" />
 <roundcube:button name="searchmenulink" id="searchmenulink" class="iconbutton searchoptions" onclick="UI.show_popup('searchmenu');return false" title="searchmod" content=" " />
 <roundcube:button command="reset-search" id="searchreset" class="iconbutton reset" title="resetsearch" content=" " />
@@ -130,12 +128,13 @@
 
 <div id="searchmenu" class="popupmenu">
 	<ul class="toolbarmenu">
-		<li><label><input type="checkbox" name="s_mods[]" value="subject" id="s_mod_subject" onclick="UI.set_searchmod(this)" /> <roundcube:label name="subject" /></label></li>
-		<li><label><input type="checkbox" name="s_mods[]" value="from" id="s_mod_from" onclick="UI.set_searchmod(this)" /> <roundcube:label name="from" /></label></li>
-		<li><label><input type="checkbox" name="s_mods[]" value="to" id="s_mod_to" onclick="UI.set_searchmod(this)" /> <roundcube:label name="to" /></label></li>
-		<li><label><input type="checkbox" name="s_mods[]" value="cc" id="s_mod_cc" onclick="UI.set_searchmod(this)" /> <roundcube:label name="cc" /></label></li>
-		<li><label><input type="checkbox" name="s_mods[]" value="bcc" id="s_mod_bcc" onclick="UI.set_searchmod(this)" /> <roundcube:label name="bcc" /></label></li>
-		<li><label><input type="checkbox" name="s_mods[]" value="text" id="s_mod_text" onclick="UI.set_searchmod(this)" /> <roundcube:label name="msgtext" /></label></li>
+		<li><label><input type="checkbox" name="s_mods[]" value="subject" id="s_mod_subject" onclick="UI.set_searchmod(this)" /> <span><roundcube:label name="subject" /></span></label></li>
+		<li><label><input type="checkbox" name="s_mods[]" value="from" id="s_mod_from" onclick="UI.set_searchmod(this)" /> <span><roundcube:label name="from" /></span></label></li>
+		<li><label><input type="checkbox" name="s_mods[]" value="to" id="s_mod_to" onclick="UI.set_searchmod(this)" /> <span><roundcube:label name="to" /></span></label></li>
+		<li><label><input type="checkbox" name="s_mods[]" value="cc" id="s_mod_cc" onclick="UI.set_searchmod(this)" /> <span><roundcube:label name="cc" /></span></label></li>
+		<li><label><input type="checkbox" name="s_mods[]" value="bcc" id="s_mod_bcc" onclick="UI.set_searchmod(this)" /> <span><roundcube:label name="bcc" /></span></label></li>
+		<li><label><input type="checkbox" name="s_mods[]" value="body" id="s_mod_body" onclick="UI.set_searchmod(this)" /> <span><roundcube:label name="body" /></span></label></li>
+		<li><label><input type="checkbox" name="s_mods[]" value="text" id="s_mod_text" onclick="UI.set_searchmod(this)" /> <span><roundcube:label name="msgtext" /></span></label></li>
 	</ul>
 </div>
 
@@ -179,19 +178,19 @@
 	<fieldset class="floating">
 		<legend><roundcube:label name="listcolumns" /></legend>
 		<ul class="proplist">
-			<li><label class="disabled"><input type="checkbox" name="list_col[]" value="threads" checked="checked" disabled="disabled" /> <roundcube:label name="threads" /></label></li>
-			<li><label class="disabled"><input type="checkbox" name="list_col[]" value="subject" checked="checked" disabled="disabled" /> <roundcube:label name="subject" /></label></li>
-			<li><label><input type="checkbox" name="list_col[]" value="fromto" /> <roundcube:label name="fromto" /></label></li>
-			<li><label><input type="checkbox" name="list_col[]" value="from" /> <roundcube:label name="from" /></label></li>
-			<li><label><input type="checkbox" name="list_col[]" value="to" /> <roundcube:label name="to" /></label></li>
-			<li><label><input type="checkbox" name="list_col[]" value="replyto" /> <roundcube:label name="replyto" /></label></li>
-			<li><label><input type="checkbox" name="list_col[]" value="cc" /> <roundcube:label name="cc" /></label></li>
-			<li><label><input type="checkbox" name="list_col[]" value="date" /> <roundcube:label name="date" /></label></li>
-			<li><label><input type="checkbox" name="list_col[]" value="size" /> <roundcube:label name="size" /></label></li>
-			<li><label><input type="checkbox" name="list_col[]" value="status" /> <roundcube:label name="readstatus" /></label></li>
-			<li><label><input type="checkbox" name="list_col[]" value="attachment" /> <roundcube:label name="attachment" /></label></li>
-			<li><label><input type="checkbox" name="list_col[]" value="flag" /> <roundcube:label name="flag" /></label></li>
-			<li><label><input type="checkbox" name="list_col[]" value="priority" /> <roundcube:label name="priority" /></label></li>
+			<li><label class="disabled"><input type="checkbox" name="list_col[]" value="threads" checked="checked" disabled="disabled" /> <span><roundcube:label name="threads" /></span></label></li>
+			<li><label class="disabled"><input type="checkbox" name="list_col[]" value="subject" checked="checked" disabled="disabled" /> <span><roundcube:label name="subject" /></span></label></li>
+			<li><label><input type="checkbox" name="list_col[]" value="fromto" /> <span><roundcube:label name="fromto" /></span></label></li>
+			<li><label><input type="checkbox" name="list_col[]" value="from" /> <span><roundcube:label name="from" /></span></label></li>
+			<li><label><input type="checkbox" name="list_col[]" value="to" /> <span><roundcube:label name="to" /></span></label></li>
+			<li><label><input type="checkbox" name="list_col[]" value="replyto" /> <span><roundcube:label name="replyto" /></span></label></li>
+			<li><label><input type="checkbox" name="list_col[]" value="cc" /> <span><roundcube:label name="cc" /></span></label></li>
+			<li><label><input type="checkbox" name="list_col[]" value="date" /> <span><roundcube:label name="date" /></span></label></li>
+			<li><label><input type="checkbox" name="list_col[]" value="size" /> <span><roundcube:label name="size" /></span></label></li>
+			<li><label><input type="checkbox" name="list_col[]" value="status" /> <span><roundcube:label name="readstatus" /></span></label></li>
+			<li><label><input type="checkbox" name="list_col[]" value="attachment" /> <span><roundcube:label name="attachment" /></span></label></li>
+			<li><label><input type="checkbox" name="list_col[]" value="flag" /> <span><roundcube:label name="flag" /></span></label></li>
+			<li><label><input type="checkbox" name="list_col[]" value="priority" /> <span><roundcube:label name="priority" /></span></label></li>
 		</ul>
 	</fieldset>
 	<roundcube:endif />
@@ -199,15 +198,15 @@
 	<fieldset class="floating">
 		<legend><roundcube:label name="listsorting" /></legend>
 		<ul class="proplist">
-			<li><label><input type="radio" name="sort_col" value="" /> <roundcube:label name="nonesort" /></label></li>
-			<li><label><input type="radio" name="sort_col" value="arrival" /> <roundcube:label name="arrival" /></label></li>
-			<li><label><input type="radio" name="sort_col" value="date" /> <roundcube:label name="sentdate" /></label></li>
-			<li><label><input type="radio" name="sort_col" value="subject" /> <roundcube:label name="subject" /></label></li>
-			<li><label><input type="radio" name="sort_col" value="fromto" /> <roundcube:label name="fromto" /></label></li>
-			<li><label><input type="radio" name="sort_col" value="from" /> <roundcube:label name="from" /></label></li>
-			<li><label><input type="radio" name="sort_col" value="to" /> <roundcube:label name="to" /></label></li>
-			<li><label><input type="radio" name="sort_col" value="cc" /> <roundcube:label name="cc" /></label></li>
-			<li><label><input type="radio" name="sort_col" value="size" /> <roundcube:label name="size" /></label></li>
+			<li><label><input type="radio" name="sort_col" value="" /> <span><roundcube:label name="nonesort" /></span></label></li>
+			<li><label><input type="radio" name="sort_col" value="arrival" /> <span><roundcube:label name="arrival" /></span></label></li>
+			<li><label><input type="radio" name="sort_col" value="date" /> <span><roundcube:label name="sentdate" /></span></label></li>
+			<li><label><input type="radio" name="sort_col" value="subject" /> <span><roundcube:label name="subject" /></span></label></li>
+			<li><label><input type="radio" name="sort_col" value="fromto" /> <span><roundcube:label name="fromto" /></span></label></li>
+			<li><label><input type="radio" name="sort_col" value="from" /> <span><roundcube:label name="from" /></span></label></li>
+			<li><label><input type="radio" name="sort_col" value="to" /> <span><roundcube:label name="to" /></span></label></li>
+			<li><label><input type="radio" name="sort_col" value="cc" /> <span><roundcube:label name="cc" /></span></label></li>
+			<li><label><input type="radio" name="sort_col" value="size" /> <span><roundcube:label name="size" /></span></label></li>
 		</ul>
 	</fieldset>
 	<roundcube:endif />
@@ -215,8 +214,8 @@
 	<fieldset class="floating">
 		<legend><roundcube:label name="listorder" /></legend>
 		<ul class="proplist">
-			<li><label><input type="radio" name="sort_ord" value="ASC" /> <roundcube:label name="asc" /></label></li>
-			<li><label><input type="radio" name="sort_ord" value="DESC" /> <roundcube:label name="desc" /></label></li>
+			<li><label><input type="radio" name="sort_ord" value="ASC" /> <span><roundcube:label name="asc" /></span></label></li>
+			<li><label><input type="radio" name="sort_ord" value="DESC" /> <span><roundcube:label name="desc" /></span></label></li>
 		</ul>
 	</fieldset>
 	<roundcube:endif />
diff --git a/skins/larry/templates/message.html b/skins/larry/templates/message.html
index f7e188f5f..0e19afa40 100644
--- a/skins/larry/templates/message.html
+++ b/skins/larry/templates/message.html
@@ -14,7 +14,6 @@
 <div id="messagetoolbar" class="toolbar fullwidth">
 <roundcube:if condition="!env:extwin" />
 	<roundcube:button command="list" type="link" class="button back disabled" classAct="button back" classSel="button back pressed" label="back" />
-	<span class="spacer"></span>
 <roundcube:endif />
 	<roundcube:include file="/includes/mailtoolbar.html" />
 	<div class="toolbarselect">
@@ -29,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>
 
@@ -55,6 +54,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>
 
@@ -64,7 +78,7 @@
 </div>
 <div class="leftcol">
 <roundcube:object name="messageObjects" id="message-objects" />
-<roundcube:object name="messageBody" id="messagebody" />
+<roundcube:object name="messageBody" id="messagebody" headertableclass="message-partheaders headers-table" />
 </div>
 </div>
 
@@ -74,6 +88,14 @@
 
 </div><!-- end mainscreen -->
 
+<div id="attachmentmenu" class="popupmenu dropdown">
+	<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/messagepart.html b/skins/larry/templates/messagepart.html
index e029973a8..dbb4940de 100644
--- a/skins/larry/templates/messagepart.html
+++ b/skins/larry/templates/messagepart.html
@@ -27,7 +27,7 @@
 </div>
 
 <div id="messagepartcontainer" class="uibox">
-<roundcube:object name="messagePartFrame" id="messagepartframe" style="width:100%; height:100%" />
+<roundcube:object name="messagePartFrame" id="messagepartframe" frameborder="0" />
 </div>
 
 </div>
diff --git a/skins/larry/templates/messagepreview.html b/skins/larry/templates/messagepreview.html
index 9eb4d1e00..b2af03485 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;-" />
@@ -47,10 +58,18 @@
 </div>
 <div class="leftcol">
 <roundcube:object name="messageObjects" id="message-objects" />
-<roundcube:object name="messageBody" id="messagebody" />
+<roundcube:object name="messageBody" id="messagebody" headertableclass="message-partheaders headers-table" />
 </div>
 </div>
 
+<div id="attachmentmenu" class="popupmenu dropdown">
+	<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 da4f2300e..75d38d9aa 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,12 +38,22 @@ 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;
 
 
+  // set minimal mode on small screens (don't wait for document.ready)
+  if (window.$ && document.body) {
+    var minmode = rcmail.get_cookie('minimalmode');
+    if (parseInt(minmode) || (minmode === null && $(window).height() < 850)) {
+      $(document.body).addClass('minimal');
+    }
+  }
+
+
   /**
    *
    */
@@ -59,10 +70,21 @@ function rcube_mail_ui()
   {
     rcmail.addEventListener('message', message_displayed);
 
+    /*** prepare minmode functions ***/
+    $('#taskbar a').each(function(i,elem){
+      $(elem).append('<span class="tooltip">' + $('.button-inner', this).html() + '</span>')
+    });
+
+    $('#taskbar .minmodetoggle').click(function(e){
+      var ismin = $(document.body).toggleClass('minimal').hasClass('minimal');
+      rcmail.set_cookie('minimalmode', ismin?1:0);
+      $(window).resize();
+    });
+
     /***  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');
@@ -75,6 +97,11 @@ function rcube_mail_ui()
         rcmail.addEventListener('aftershow-headers', function() { layout_messageview(); });
         rcmail.addEventListener('afterhide-headers', function() { layout_messageview(); });
         $('#previewheaderstoggle').click(function(e){ toggle_preview_headers(this); 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); });
@@ -97,7 +124,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',
@@ -260,28 +288,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;
 
-    // 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');
+    if (rcmail.resize_timeout)
+      window.clearTimeout(rcmail.resize_timeout);
+
+    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);
   }
 
   /**
@@ -395,13 +431,25 @@ function rcube_mail_ui()
 
 
   /**
+   * 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
    */
   function show_popup(popup, show, config)
   {
     // 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];
@@ -416,7 +464,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) {
@@ -432,7 +480,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;
@@ -555,6 +603,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) {
@@ -585,6 +646,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)
   {
@@ -920,11 +996,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/Bootstrap.php b/tests/Framework/Bootstrap.php
index d18fd371b..904be7e3b 100644
--- a/tests/Framework/Bootstrap.php
+++ b/tests/Framework/Bootstrap.php
@@ -207,4 +207,12 @@ class Framework_Bootstrap extends PHPUnit_Framework_TestCase
         $this->assertFalse($result, "Invalid ASCII (UTF-8 character [2])");
     }
 
+    /**
+     * bootstrap.php: version_parse()
+     */
+    function test_version_parse()
+    {
+        $this->assertEquals('0.9.0', version_parse('0.9-stable'));
+        $this->assertEquals('0.9.99', version_parse('0.9-git'));
+    }
 }
diff --git a/tests/Framework/Charset.php b/tests/Framework/Charset.php
index 1fd1654dc..d3d3e88dd 100644
--- a/tests/Framework/Charset.php
+++ b/tests/Framework/Charset.php
@@ -159,4 +159,22 @@ class Framework_Charset extends PHPUnit_Framework_TestCase
         $this->assertEquals($output, rcube_charset::detect($input, $fallback));
     }
 
+    /**
+     * Data for test_detect()
+     */
+    function data_detect_with_lang()
+    {
+        return array(
+            array('Åã¥Ü¦WºÙ,¥D­n', 'zh_TW', 'BIG-5'),
+        );
+    }
+
+    /**
+     * @dataProvider data_detect_with_lang
+     */
+    function test_detect_with_lang($input, $lang, $output)
+    {
+        $this->assertEquals($output, rcube_charset::detect($input, $output, $lang));
+    }
+
 }
diff --git a/tests/Framework/Csv2vcard.php b/tests/Framework/Csv2vcard.php
index 6fa3e163c..5d52efc58 100644
--- a/tests/Framework/Csv2vcard.php
+++ b/tests/Framework/Csv2vcard.php
@@ -31,6 +31,7 @@ class Framework_Csv2vcard extends PHPUnit_Framework_TestCase
 
         $vcf_text = trim(str_replace("\r\n", "\n", $vcf_text));
         $vcard    = trim(str_replace("\r\n", "\n", $vcard));
+
         $this->assertEquals($vcf_text, $vcard);
     }
 
diff --git a/tests/Framework/Enriched.php b/tests/Framework/Enriched.php
new file mode 100644
index 000000000..26bbc3b4e
--- /dev/null
+++ b/tests/Framework/Enriched.php
@@ -0,0 +1,74 @@
+<?php
+
+/**
+ * Test class to test rcube_enriched class
+ *
+ * @package Tests
+ */
+class Framework_Enriched extends PHPUnit_Framework_TestCase
+{
+
+    /**
+     * Class constructor
+     */
+    function test_class()
+    {
+        $object = new rcube_enriched();
+
+        $this->assertInstanceOf('rcube_enriched', $object, "Class constructor");
+    }
+
+    /**
+     * Test to_html()
+     */
+    function test_to_html()
+    {
+        $enriched = '<bold><italic>the-text</italic></bold>';
+        $expected = '<b><i>the-text</i></b>';
+        $result   = rcube_enriched::to_html($enriched);
+
+        $this->assertSame($expected, $result);
+    }
+
+    /**
+     * Data for test_formatting()
+     */
+    function data_formatting()
+    {
+        return array(
+            array('<bold>', '<b>'),
+            array('</bold>', '</b>'),
+            array('<italic>', '<i>'),
+            array('</italic>', '</i>'),
+            array('<fixed>', '<tt>'),
+            array('</fixed>', '</tt>'),
+            array('<smaller>', '<font size=-1>'),
+            array('</smaller>', '</font>'),
+            array('<bigger>', '<font size=+1>'),
+            array('</bigger>', '</font>'),
+            array('<underline>', '<span style="text-decoration: underline">'),
+            array('</underline>', '</span>'),
+            array('<flushleft>', '<span style="text-align: left">'),
+            array('</flushleft>', '</span>'),
+            array('<flushright>', '<span style="text-align: right">'),
+            array('</flushright>', '</span>'),
+            array('<flushboth>', '<span style="text-align: justified">'),
+            array('</flushboth>', '</span>'),
+            array('<indent>', '<span style="padding-left: 20px">'),
+            array('</indent>', '</span>'),
+            array('<indentright>', '<span style="padding-right: 20px">'),
+            array('</indentright>', '</span>'),
+        );
+    }
+
+    /**
+     * Test formatting conversion
+     * @dataProvider data_formatting
+     */
+    function test_formatting($enriched, $expected)
+    {
+        $result = rcube_enriched::to_html($enriched);
+
+        $this->assertSame($expected, $result);
+    }
+}
diff --git a/tests/HtmlToText.php b/tests/Framework/Html2text.php
index b90c61adf..3e0df48d9 100644
--- a/tests/HtmlToText.php
+++ b/tests/Framework/Html2text.php
@@ -1,11 +1,11 @@
 <?php
 
 /**
- * Test class to test html2text class
+ * Test class to test rcube_html2text class
  *
  * @package Tests
  */
-class HtmlToText extends PHPUnit_Framework_TestCase
+class rc_html2text extends PHPUnit_Framework_TestCase
 {
 
     function data_html2text()
@@ -49,11 +49,30 @@ class HtmlToText extends PHPUnit_Framework_TestCase
      */
     function test_html2text($title, $in, $out)
     {
-        $ht = new html2text(null, false, false);
+        $ht = new rcube_html2text(null, false, false);
 
         $ht->set_html($in);
         $res = $ht->get_text();
 
         $this->assertEquals($out, $res, $title);
     }
+
+    /**
+     *
+     */
+    function test_multiple_blockquotes()
+    {
+        $html = <<<EOF
+<br>Begin<br><blockquote>OUTER BEGIN<blockquote>INNER 1<br></blockquote><div><br></div><div>Par 1</div>
+<blockquote>INNER 2</blockquote><div><br></div><div>Par 2</div>
+<div><br></div><div>Par 3</div><div><br></div>
+<blockquote>INNER 3</blockquote>OUTER END</blockquote>
+EOF;
+        $ht = new rcube_html2text($html, false, false);
+        $res = $ht->get_text();
+
+        $this->assertContains('>> INNER 1', $res, 'Quote inner');
+        $this->assertContains('>> INNER 3', $res, 'Quote inner');
+        $this->assertContains('> OUTER END', $res, 'Quote outer');
+    }
 }
diff --git a/tests/Framework/Mime.php b/tests/Framework/Mime.php
index dcd55992a..1f9a8c58f 100644
--- a/tests/Framework/Mime.php
+++ b/tests/Framework/Mime.php
@@ -120,4 +120,26 @@ class Framework_Mime extends PHPUnit_Framework_TestCase
             $this->assertEquals($item['out'], $res, "Header decoding for: " . $idx);
         }
     }
+
+    /**
+     * Test format=flowed unfolding
+     */
+    function test_format_flowed()
+    {
+        $raw = file_get_contents(TESTS_DIR . 'src/format-flowed-unfolded.txt');
+        $flowed = file_get_contents(TESTS_DIR . 'src/format-flowed.txt');
+
+        $this->assertEquals($flowed, rcube_mime::format_flowed($raw, 80), "Test correct folding and space-stuffing");
+    }
+
+    /**
+     * Test format=flowed unfolding
+     */
+    function test_unfold_flowed()
+    {
+        $flowed = file_get_contents(TESTS_DIR . 'src/format-flowed.txt');
+        $unfolded = file_get_contents(TESTS_DIR . 'src/format-flowed-unfolded.txt');
+
+        $this->assertEquals($unfolded, rcube_mime::unfold_flowed($flowed), "Test correct unfolding of quoted lines");
+    }
 }
diff --git a/tests/Framework/StringReplacer.php b/tests/Framework/StringReplacer.php
index a76ba00ee..95c59221b 100644
--- a/tests/Framework/StringReplacer.php
+++ b/tests/Framework/StringReplacer.php
@@ -24,11 +24,19 @@ 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://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://'),
         );
     }
 
diff --git a/tests/Framework/VCard.php b/tests/Framework/VCard.php
index 79d297664..15aa5d816 100644
--- a/tests/Framework/VCard.php
+++ b/tests/Framework/VCard.php
@@ -50,6 +50,21 @@ class Framework_VCard extends PHPUnit_Framework_TestCase
         $this->assertRegExp('/TEL;TYPE=CELL:\+987654321/', $vcf, "Return CELL instead of MOBILE (set)");
     }
 
+    /**
+     * Backslash escaping test (#1488896)
+     */
+    function test_parse_four()
+    {
+        $vcard = "BEGIN:VCARD\nVERSION:3.0\nN:last\\;;first\\\\;middle\\\\\\;\\\\;prefix;\nFN:test\nEND:VCARD";
+        $vcard = new rcube_vcard($vcard, null);
+        $vcard = $vcard->get_assoc();
+
+        $this->assertEquals("last;", $vcard['surname'], "Decode backslash character");
+        $this->assertEquals("first\\", $vcard['firstname'], "Decode backslash character");
+        $this->assertEquals("middle\\;\\", $vcard['middlename'], "Decode backslash character");
+        $this->assertEquals("prefix", $vcard['prefix'], "Decode 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
new file mode 100644
index 000000000..cd443266f
--- /dev/null
+++ b/tests/Framework/Washtml.php
@@ -0,0 +1,58 @@
+<?php
+
+/**
+ * Test class to test rcube_washtml class
+ *
+ * @package Tests
+ */
+class Framework_Washtml extends PHPUnit_Framework_TestCase
+{
+
+    /**
+     * Test the elimination of some XSS vulnerabilities
+     */
+    function test_html_xss3()
+    {
+        // #1488850
+        $html = '<p><a href="data:text/html,&lt;script&gt;alert(document.cookie)&lt;/script&gt;">Firefox</a>'
+            .'<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('<!-- 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)");
+    }
+
+}
diff --git a/tests/MailFunc.php b/tests/MailFunc.php
index 967277c2a..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
@@ -97,6 +97,20 @@ class MailFunc extends PHPUnit_Framework_TestCase
     }
 
     /**
+     * Test the elimination of some XSS vulnerabilities
+     */
+    function test_html_xss3()
+    {
+        // #1488850
+        $html = '<p><a href="data:text/html,&lt;script&gt;alert(document.cookie)&lt;/script&gt;">Firefox</a>'
+            .'<a href="vbscript:alert(document.cookie)">Internet Explorer</a></p>';
+        $washed = rcmail_wash_html($html, array('safe' => true), array());
+
+        $this->assertNotRegExp('/data:text/', $washed, "Remove data:text/html links");
+        $this->assertNotRegExp('/vbscript:/', $washed, "Remove vbscript: links");
+    }
+
+    /**
      * Test washtml class on non-unicode characters (#1487813)
      */
     function test_washtml_utf8()
@@ -119,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");
     }
 
     /**
@@ -134,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");
     }
@@ -159,7 +173,7 @@ class MailFunc extends PHPUnit_Framework_TestCase
     function test_resolve_base()
     {
         $html = file_get_contents(TESTS_DIR . 'src/htmlbase.txt');
-        $html = rcmail_resolve_base($html);
+        $html = rcube_washtml::resolve_base($html);
 
         $this->assertRegExp('|src="http://alec\.pl/dir/img1\.gif"|', $html, "URI base resolving [1]");
         $this->assertRegExp('|src="http://alec\.pl/dir/img2\.gif"|', $html, "URI base resolving [2]");
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/bootstrap.php b/tests/bootstrap.php
index a9e25610c..40659ebf0 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -33,3 +33,9 @@ if (@is_dir(TESTS_DIR . 'config')) {
 require_once(INSTALL_PATH . 'program/include/iniset.php');
 
 rcmail::get_instance()->config->set('devel_mode', false);
+
+// 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.");
+}
diff --git a/tests/phpunit.xml b/tests/phpunit.xml
index 36ab6d714..da0f899a9 100644
--- a/tests/phpunit.xml
+++ b/tests/phpunit.xml
@@ -10,7 +10,9 @@
             <file>Framework/Charset.php</file>
             <file>Framework/ContentFilter.php</file>
             <file>Framework/Csv2vcard.php</file>
+            <file>Framework/Enriched.php</file>
             <file>Framework/Html.php</file>
+            <file>Framework/Html2text.php</file>
             <file>Framework/Imap.php</file>
             <file>Framework/ImapGeneric.php</file>
             <file>Framework/Image.php</file>
@@ -27,12 +29,41 @@
             <file>Framework/User.php</file>
             <file>Framework/Utils.php</file>
             <file>Framework/VCard.php</file>
-            <file>HtmlToText.php</file>
+            <file>Framework/Washtml.php</file>
             <file>MailFunc.php</file>
         </testsuite>
-        <testsuite name="Managesieve Tests">
+        <testsuite name="Plugins Tests">
+            <file>./../plugins/acl/tests/Acl.php</file>
+            <file>./../plugins/additional_message_headers/tests/AdditionalMessageHeaders.php</file>
+            <file>./../plugins/archive/tests/Archive.php</file>
+            <file>./../plugins/autologon/tests/Autologon.php</file>
+            <file>./../plugins/database_attachments/tests/DatabaseAttachments.php</file>
+            <file>./../plugins/debug_logger/tests/DebugLogger.php</file>
+            <file>./../plugins/emoticons/tests/Emoticons.php</file>
+            <file>./../plugins/enigma/tests/Enigma.php</file>
+            <file>./../plugins/example_addressbook/tests/ExampleAddressbook.php</file>
+            <file>./../plugins/filesystem_attachments/tests/FilesystemAttachments.php</file>
+            <file>./../plugins/help/tests/Help.php</file>
+            <file>./../plugins/hide_blockquote/tests/HideBlockquote.php</file>
+            <file>./../plugins/http_authentication/tests/HttpAuthentication.php</file>
+            <file>./../plugins/jqueryui/tests/Jqueryui.php</file>
+            <file>./../plugins/managesieve/tests/Managesieve.php</file>
             <file>./../plugins/managesieve/tests/Parser.php</file>
             <file>./../plugins/managesieve/tests/Tokenizer.php</file>
+            <file>./../plugins/markasjunk/tests/Markasjunk.php</file>
+            <file>./../plugins/new_user_dialog/tests/NewUserDialog.php</file>
+            <file>./../plugins/new_user_identity/tests/NewUserIdentity.php</file>
+            <file>./../plugins/newmail_notifier/tests/NewmailNotifier.php</file>
+            <file>./../plugins/password/tests/Password.php</file>
+            <file>./../plugins/redundant_attachments/tests/RedundantAttachments.php</file>
+            <file>./../plugins/show_additional_headers/tests/ShowAdditionalHeaders.php</file>
+            <file>./../plugins/squirrelmail_usercopy/tests/Squirrelmail_usercopy.php</file>
+            <file>./../plugins/subscriptions_option/tests/SubscriptionsOption.php</file>
+            <file>./../plugins/userinfo/tests/Userinfo.php</file>
+            <file>./../plugins/vcard_attachments/tests/VcardAttachments.php</file>
+            <file>./../plugins/virtuser_file/tests/VirtuserFile.php</file>
+            <file>./../plugins/virtuser_query/tests/VirtuserQuery.php</file>
+            <file>./../plugins/zipdownload/tests/Zipdownload.php</file>
         </testsuite>
     </testsuites>
 </phpunit>
diff --git a/tests/src/Csv2vcard/tb_plain.vcf b/tests/src/Csv2vcard/tb_plain.vcf
index aace259d8..b001c3924 100644
--- a/tests/src/Csv2vcard/tb_plain.vcf
+++ b/tests/src/Csv2vcard/tb_plain.vcf
@@ -15,4 +15,6 @@ ORG:Organization
 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
 END:VCARD
diff --git a/tests/src/format-flowed-unfolded.txt b/tests/src/format-flowed-unfolded.txt
new file mode 100644
index 000000000..14e526be4
--- /dev/null
+++ b/tests/src/format-flowed-unfolded.txt
@@ -0,0 +1,19 @@
+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.

+

+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

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

+> 

+> The above empty line should persist after unfolding.

+> xxxxxxxxxx. xxxx xxxxx xxxxx xxxx xx xx.xx. xxxxxx xxxxxxxxxxxx, xxxx xx

+> 

+> ... and this one as well.

+

+> > text

+

+-- 

+Sig

diff --git a/tests/src/format-flowed.txt b/tests/src/format-flowed.txt
new file mode 100644
index 000000000..359a41aec
--- /dev/null
+++ b/tests/src/format-flowed.txt
@@ -0,0 +1,21 @@
+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.

+

+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

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

+> 

+> The above empty line should persist after unfolding.

+> xxxxxxxxxx. xxxx xxxxx xxxxx xxxx xx xx.xx. xxxxxx xxxxxxxxxxxx, xxxx xx

+> 

+> ... and this one as well.

+

+> > text

+

+-- 

+Sig