Applied message threading patch from Chris January: http://www.atomice.com/blog/?p=33

2 files changed, 13 insertions, 0 deletions

diff --git a/roundcubemail/program/localization/en_GB/labels.inc b/roundcubemail/program/localization/en_GB/labels.inc
index fae87c558..b46db1528 100644
--- a/roundcubemail/program/localization/en_GB/labels.inc
+++ b/roundcubemail/program/localization/en_GB/labels.inc
@@ -45,6 +45,7 @@ $labels['organization'] = 'Organisation';
 $labels['reply-to'] = 'Reply-To';
 $labels['mailboxlist'] = 'Folders';
 $labels['messagesfromto'] = 'Messages $from to $to of $count';
+$labels['threadsfromto'] = 'Threads $from to $to of $count';
 $labels['messagenrof'] = 'Message $nr of $count';
 $labels['moveto'] = 'Move to...';
 $labels['download'] = 'Download';
@@ -122,6 +123,9 @@ $labels['none'] = 'None';
 $labels['unread'] = 'Unread';
 $labels['flagged'] = 'Flagged';
 $labels['unanswered'] = 'Unanswered';
+$labels['threads'] = 'Threads';
+$labels['expand-all'] = 'Expand All';
+$labels['collapse-all'] = 'Collapse All';
 $labels['filter'] = 'Filter';
 $labels['compact'] = 'Compact';
 $labels['empty'] = 'Empty';
@@ -242,6 +246,7 @@ $labels['2231folding'] = 'Full RFC 2231 (Thunderbird)';
 $labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
 $labels['2047folding'] = 'Full RFC 2047 (other)';
 $labels['advancedoptions'] = 'Advanced options';
+$labels['messagethreading'] = 'Show messages in threads';
 $labels['focusonnewmessage'] = 'Focus browser window on new message';
 $labels['checkallfolders'] = 'Check all folders for new messages';
 $labels['folder'] = 'Folder';
@@ -249,6 +254,7 @@ $labels['folders'] = 'Folders';
 $labels['foldername'] = 'Folder name';
 $labels['subscribed'] = 'Subscribed';
 $labels['messagecount'] = 'Messages';
+$labels['threaded'] = 'Threaded';
 $labels['create'] = 'Create';
 $labels['createfolder'] = 'Create new folder';
 $labels['rename'] = 'Rename';
diff --git a/roundcubemail/program/localization/en_US/labels.inc b/roundcubemail/program/localization/en_US/labels.inc
index 7f0538703..39b145c1b 100644
--- a/roundcubemail/program/localization/en_US/labels.inc
+++ b/roundcubemail/program/localization/en_US/labels.inc
@@ -56,6 +56,7 @@ $labels['reply-to'] = $labels['replyto'];
 
 $labels['mailboxlist'] = 'Folders';
 $labels['messagesfromto'] = 'Messages $from to $to of $count';
+$labels['threadsfromto'] = 'Threads $from to $to of $count';
 $labels['messagenrof'] = 'Message $nr of $count';
 
 $labels['moveto']   = 'Move to...';
@@ -151,6 +152,10 @@ $labels['flagged'] = 'Flagged';
 $labels['unanswered'] = 'Unanswered';
 $labels['filter'] = 'Filter';
 
+$labels['threads'] = 'Threads';
+$labels['expand-all'] = 'Expand All';
+$labels['collapse-all'] = 'Collapse All';
+
 $labels['compact'] = 'Compact';
 $labels['empty'] = 'Empty';
 $labels['purge'] = 'Purge';
@@ -297,6 +302,7 @@ $labels['2231folding'] = 'Full RFC 2231 (Thunderbird)';
 $labels['miscfolding'] = 'RFC 2047/2231 (MS Outlook)';
 $labels['2047folding'] = 'Full RFC 2047 (other)';
 $labels['advancedoptions'] = 'Advanced options';
+$labels['messagethreading'] = 'Show messages in threads';
 $labels['focusonnewmessage'] = 'Focus browser window on new message';
 $labels['checkallfolders'] = 'Check all folders for new messages';
 
@@ -305,6 +311,7 @@ $labels['folders']  = 'Folders';
 $labels['foldername']  = 'Folder name';
 $labels['subscribed']  = 'Subscribed';
 $labels['messagecount'] = 'Messages';
+$labels['threaded'] = 'Threaded';
 $labels['create']  = 'Create';
 $labels['createfolder']  = 'Create new folder';
 $labels['rename'] = 'Rename';